lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'eclipse/master'

Browse Source
This commit is contained in:
Kai Zimmermann
2016-01-26 11:37:33 +01:00
parent 70360ff303 b1f753b291
commit dae1aeabc6
19 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -10,6 +10,12 @@ Want to chat with the team behind hawkBit? [![Join the chat at https://gitter.im
mvn install mvn install
``` ```
# Releases
* We are currently working on the first formal release under the Eclipse banner: 0.1 (see [Release 0.1 branch](https://github.com/eclipse/hawkbit/tree/release-train-0.1))
* The master branch contains future development towards 0.2
## Try out examples ## Try out examples
#### Standalone Test Application Server #### Standalone Test Application Server
[Example Application](examples/hawkbit-example-app) [Example Application](examples/hawkbit-example-app)

2
examples/pom.xml
View File

@@ -15,7 +15,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-examples-parent</artifactId> <artifactId>hawkbit-examples-parent</artifactId>

2
hawkbit-artifact-repository-mongo/pom.xml
View File

@@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
</parent> </parent>
<artifactId>hawkbit-artifact-repository-mongo</artifactId> <artifactId>hawkbit-artifact-repository-mongo</artifactId>

2
hawkbit-autoconfigure/pom.xml
View File

@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-autoconfigure</artifactId> <artifactId>hawkbit-autoconfigure</artifactId>
<name>hawkBit :: Spring Boot Autoconfigure</name> <name>hawkBit :: Spring Boot Autoconfigure</name>

2
hawkbit-cache-redis/pom.xml
View File

@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-cache-redis</artifactId> <artifactId>hawkbit-cache-redis</artifactId>
<name>hawkBit :: Redis Cache Manager</name> <name>hawkBit :: Redis Cache Manager</name>

2
hawkbit-core/pom.xml
View File

@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-core</artifactId> <artifactId>hawkbit-core</artifactId>
<name>hawkBit :: Core</name> <name>hawkBit :: Core</name>

2
hawkbit-dmf-amqp/pom.xml
View File

@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-dmf-amqp</artifactId> <artifactId>hawkbit-dmf-amqp</artifactId>
<name>hawkBit :: DMF Amqp</name> <name>hawkBit :: DMF Amqp</name>

1
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java
View File

@@ -139,6 +139,7 @@ public class AmqpConfiguration {
final SimpleRabbitListenerContainerFactory containerFactory = new SimpleRabbitListenerContainerFactory(); final SimpleRabbitListenerContainerFactory containerFactory = new SimpleRabbitListenerContainerFactory();
containerFactory.setDefaultRequeueRejected(false); containerFactory.setDefaultRequeueRejected(false);
containerFactory.setConnectionFactory(connectionFactory); containerFactory.setConnectionFactory(connectionFactory);
containerFactory.setMissingQueuesFatal(amqpProperties.isMissingQueuesFatal());
return containerFactory; return containerFactory;
} }

21
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.java
View File

@@ -8,6 +8,7 @@
*/ */
package org.eclipse.hawkbit.amqp; package org.eclipse.hawkbit.amqp;
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
/** /**
@@ -24,6 +25,26 @@ public class AmqpProperties {
private String deadLetterQueue = "dmf_connector_deadletter"; private String deadLetterQueue = "dmf_connector_deadletter";
private String deadLetterExchange = "dmf.connector.deadletter"; private String deadLetterExchange = "dmf.connector.deadletter";
private String receiverQueue = "dmf_receiver"; private String receiverQueue = "dmf_receiver";
private boolean missingQueuesFatal = false;
/**
* Is missingQueuesFatal enabled
*
* @see SimpleMessageListenerContainer#setMissingQueuesFatal
* @return the missingQueuesFatal <true> enabled <false> disabled
*/
public boolean isMissingQueuesFatal() {
return missingQueuesFatal;
}
/**
* @param missingQueuesFatal
* the missingQueuesFatal to set.
* @see SimpleMessageListenerContainer#setMissingQueuesFatal
*/
public void setMissingQueuesFatal(final boolean missingQueuesFatal) {
this.missingQueuesFatal = missingQueuesFatal;
}
/** /**
* Returns the dead letter exchange. * Returns the dead letter exchange.

2
hawkbit-dmf-api/pom.xml
View File

@@ -15,7 +15,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-dmf-api</artifactId> <artifactId>hawkbit-dmf-api</artifactId>
<name>hawkBit :: Device Management Federation API</name> <name>hawkBit :: Device Management Federation API</name>

2
hawkbit-http-security/pom.xml
View File

@@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
</parent> </parent>
<artifactId>hawkbit-http-security</artifactId> <artifactId>hawkbit-http-security</artifactId>

2
hawkbit-repository/pom.xml
View File

@@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
</parent> </parent>
<artifactId>hawkbit-repository</artifactId> <artifactId>hawkbit-repository</artifactId>

2
hawkbit-rest-api/pom.xml
View File

@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-rest-api</artifactId> <artifactId>hawkbit-rest-api</artifactId>
<name>hawkBit :: REST API</name> <name>hawkBit :: REST API</name>

2
hawkbit-rest-resource/pom.xml
View File

@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-rest-resource</artifactId> <artifactId>hawkbit-rest-resource</artifactId>
<name>hawkBit :: REST Resources</name> <name>hawkBit :: REST Resources</name>

2
hawkbit-security-core/pom.xml
View File

@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-security-core</artifactId> <artifactId>hawkbit-security-core</artifactId>
<name>hawkBit :: Core Security</name> <name>hawkBit :: Core Security</name>

2
hawkbit-security-integration/pom.xml
View File

@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-security-integration</artifactId> <artifactId>hawkbit-security-integration</artifactId>
<name>hawkBit :: Security Integration</name> <name>hawkBit :: Security Integration</name>

2
hawkbit-test-report/pom.xml
View File

@@ -15,7 +15,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-test-report</artifactId> <artifactId>hawkbit-test-report</artifactId>
<name>Hawkbit :: Test Report</name> <name>Hawkbit :: Test Report</name>

2
hawkbit-ui/pom.xml
View File

@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hawkbit-ui</artifactId> <artifactId>hawkbit-ui</artifactId>
<name>hawkBit :: UI</name> <name>hawkBit :: UI</name>

2
pom.xml
View File

@@ -20,7 +20,7 @@
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId> <artifactId>hawkbit-parent</artifactId>
<version>0.1.0-SNAPSHOT</version> <version>0.2.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>hawkBit :: Parent</name> <name>hawkBit :: Parent</name>