Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Munilla2019-06-25 10:42:30 -0400
committerChristophe Munilla2019-06-25 10:42:30 -0400
commit022dba1c7f16cd6ce909c1c99580c693f9002c3a (patch)
tree66dc3f6b7f8cdb279471830501daeba51b6e26a7
parent25a39327116436cae2dabe4f79929420ea0d2309 (diff)
downloadorg.eclipse.sensinact.gateway-022dba1c7f16cd6ce909c1c99580c693f9002c3a.tar.gz
org.eclipse.sensinact.gateway-022dba1c7f16cd6ce909c1c99580c693f9002c3a.tar.xz
org.eclipse.sensinact.gateway-022dba1c7f16cd6ce909c1c99580c693f9002c3a.zip
Update distribution
use consistent set of dependencies to generate profiles and distribution accoding to modules in use's dependencies Add missing necessary configuration files
-rw-r--r--distribution/generator/pom.xml141
-rw-r--r--distribution/generator/profile/jsonpath-profile/pom.xml87
-rw-r--r--distribution/generator/profile/rest-profile/pom.xml57
-rw-r--r--distribution/template/conf/config.properties35
-rw-r--r--platform/sensinact-generic/src/test/resources/sensinact.config3
-rw-r--r--platform/southbound/http/http-device/src/test/resources/sensinact.config3
6 files changed, 156 insertions, 170 deletions
diff --git a/distribution/generator/pom.xml b/distribution/generator/pom.xml
index d54c8ded..5fd01b52 100644
--- a/distribution/generator/pom.xml
+++ b/distribution/generator/pom.xml
@@ -24,7 +24,7 @@
<artifactId>sensinact-distribution-generator</artifactId>
<packaging>pom</packaging>
<name>sensiNact IoT Gateway - Distribution Generator</name>
-
+
<build>
<plugins>
<plugin>
@@ -75,28 +75,14 @@
</goals>
<configuration>
<artifactItems>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>osgi-over-slf4j</artifactId>
- <version>1.7.25</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- </artifactItem>
<!-- felix 4.4.1 bundles -->
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework.security</artifactId>
- <version>2.6.1</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- </artifactItem>
- <artifactItem>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.log</artifactId>
- <version>1.3.0</version>
+ <artifactItem>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework.security</artifactId>
+ <version>2.6.1</version>
<type>jar</type>
<overWrite>true</overWrite>
- </artifactItem>
+ </artifactItem>
<artifactItem>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
@@ -138,7 +124,7 @@
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.25</version>
+ <version>1.7.16</version>
<type>jar</type>
<overWrite>true</overWrite>
</artifactItem>
@@ -167,46 +153,74 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <version>${felix.fileinstall.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- </artifactItem>
- <artifactItem>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>${osgi.compendium.version}</version>
+ <groupId>org.eclipse.sensinact.gateway.sthbnd.mqtt</groupId>
+ <artifactId>mqtt-utils</artifactId>
+ <version>${project.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.9.10</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.event</artifactId>
- <version>1.4.0</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.sensinact.gateway</groupId>
- <artifactId>sensinact-framework-extension</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>${felix.fileinstall.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
</artifactItem>
<artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>2.0.10</version>
- </artifactItem>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.9.12</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <version>1.4.0</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.0</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype</artifactId>
+ <version>1.3.0</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.namespace.extender</artifactId>
+ <version>1.0.1</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.promise</artifactId>
+ <version>1.0.0</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.function</artifactId>
+ <version>1.0.0</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.3.0</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>1.2.0</version>
+ </artifactItem>
<artifactItem>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>2.1.14</version>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>2.0.10</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>2.1.16</version>
+ </artifactItem>
<artifactItem>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component</artifactId>
@@ -218,21 +232,6 @@
<version>1.1.0</version>
</artifactItem>
<artifactItem>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
- <version>1.1.0</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.promise</artifactId>
- <version>1.1.1</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.sensinact.gateway.sthbnd.mqtt</groupId>
- <artifactId>mqtt-utils</artifactId>
- <version>${project.version}</version>
- </artifactItem>
- <artifactItem>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.2.0</version>
@@ -242,7 +241,7 @@
</configuration>
</execution>
<execution>
- <id>copy-dependencies-profile3</id>
+ <id>ext-copy-dependencies-profile3</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
@@ -269,18 +268,6 @@
<artifactId>sensinact-signature-validator</artifactId>
<version>${project.version}</version>
</artifactItem>
- <!-- SECURITY -->
- <!--<artifactItem>
- <groupId>org.eclipse.sensinact.gateway</groupId>
- <artifactId>sensinact-sqlite-connector</artifactId>
- <version>${project.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.eclipse.sensinact.gateway</groupId>
- <artifactId>sensinact-security-core</artifactId>
- <version>${project.version}</version>
- </artifactItem>-->
- <!-- NO SECURITY -->
<artifactItem>
<groupId>org.eclipse.sensinact.gateway</groupId>
<artifactId>sensinact-security-none</artifactId>
diff --git a/distribution/generator/profile/jsonpath-profile/pom.xml b/distribution/generator/profile/jsonpath-profile/pom.xml
index ff78675a..ae5d8cb2 100644
--- a/distribution/generator/profile/jsonpath-profile/pom.xml
+++ b/distribution/generator/profile/jsonpath-profile/pom.xml
@@ -27,11 +27,11 @@
<name>sensiNact IoT Gateway - sensiNact Runtime (${project.artifactId} bridge dependencies)</name>
<dependencies>
- <dependency>
- <groupId>org.eclipse.sensinact.gateway.nthbnd</groupId>
- <artifactId>jsonpath-filter</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.sensinact.gateway.nthbnd</groupId>
+ <artifactId>jsonpath-filter</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<scm>
@@ -39,14 +39,14 @@
</scm>
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
<version>1.9.4</version>
<executions>
<execution>
- <id>checkout-jpath</id>
+ <id>checkout-jpath</id>
<phase>validate</phase>
<goals>
<goal>checkout</goal>
@@ -67,7 +67,7 @@
jpath-assert
</excludes>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.fortasoft</groupId>
<artifactId>gradle-maven-plugin</artifactId>
@@ -83,7 +83,7 @@
</configuration>
<executions>
<execution>
- <id>jpath-build-libs</id>
+ <id>jpath-build-libs</id>
<phase>validate</phase>
<goals>
<goal>invoke</goal>
@@ -92,41 +92,41 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependency</id>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependency</id>
<phase>validate</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>
- String basedir = project.basedir.absolutePath.replace('\\','/');
- File jpathDependencyFile = new File(new File(basedir),'target/JsonPath/jpath/build/libs/jpath-1.0.0.jar');
- File dir = new File(new File(basedir),'target/sensinact/load/json-path');
- if(!dir.exists()){
- dir.mkdirs();
- }
- def newFile = new File(dir,'jpath-1.0.0.jar');
- newFile.createNewFile();
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ String basedir = project.basedir.absolutePath.replace('\\','/');
+ File jpathDependencyFile = new File(new File(basedir),'target/JsonPath/jpath/build/libs/jpath-1.0.0.jar');
+ File dir = new File(new File(basedir),'target/sensinact/load/json-path');
+ if(!dir.exists()){
+ dir.mkdirs();
+ }
+ def newFile = new File(dir,'jpath-1.0.0.jar');
+ newFile.createNewFile();
output = newFile.newOutputStream();
- jpathDependencyFile.newInputStream().eachByte(1024, {data, lenth -> output.write(data, 0, lenth)});
- output.close();
-
- File providerDependencyFile = new File(new File(basedir),'target/JsonPath/json-provider-jsonorg/build/libs/json-provider-jsonorg-1.0.0.jar');
- newFile = new File(dir,'json-provider-jsonorg-1.0.0.jar');
- newFile.createNewFile();
+ jpathDependencyFile.newInputStream().eachByte(1024, {data, lenth -> output.write(data, 0, lenth)});
+ output.close();
+
+ File providerDependencyFile = new File(new File(basedir),'target/JsonPath/json-provider-jsonorg/build/libs/json-provider-jsonorg-1.0.0.jar');
+ newFile = new File(dir,'json-provider-jsonorg-1.0.0.jar');
+ newFile.createNewFile();
output = newFile.newOutputStream();
- providerDependencyFile.newInputStream().eachByte(1024, {data, lenth -> output.write(data, 0, lenth)});
- output.close();
- </source>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
+ providerDependencyFile.newInputStream().eachByte(1024, {data, lenth -> output.write(data, 0, lenth)});
+ output.close();
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<inherited>false</inherited>
<executions>
@@ -147,8 +147,7 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
</project>
-
diff --git a/distribution/generator/profile/rest-profile/pom.xml b/distribution/generator/profile/rest-profile/pom.xml
index c514b9d5..58661764 100644
--- a/distribution/generator/profile/rest-profile/pom.xml
+++ b/distribution/generator/profile/rest-profile/pom.xml
@@ -27,43 +27,36 @@
<name>sensiNact IoT Gateway - sensiNact Runtime (${project.artifactId} bridge dependencies)</name>
<dependencies>
- <!-- BEGIN: HTTP Dependencies -->
- <dependency>
- <groupId>org.eclipse.sensinact.gateway.protocol</groupId>
- <artifactId>http</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.sensinact.gateway.nthbnd</groupId>
- <artifactId>http-tools</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.sensinact.gateway.sthbnd.http</groupId>
- <artifactId>http-device</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
- <version>2.3.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- </dependency>
- <!-- END: HTTP Dependencies -->
<dependency>
<groupId>org.eclipse.sensinact.gateway.nthbnd</groupId>
<artifactId>rest-access</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>4.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sensinact.gateway.protocol</groupId>
+ <artifactId>http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sensinact.gateway.nthbnd</groupId>
+ <artifactId>http-tools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sensinact.gateway.sthbnd.http</groupId>
+ <artifactId>http-device</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/distribution/template/conf/config.properties b/distribution/template/conf/config.properties
index ddfe5d68..cbc47706 100644
--- a/distribution/template/conf/config.properties
+++ b/distribution/template/conf/config.properties
@@ -87,37 +87,38 @@ felix.auto.deploy.action=install,start
# component is the target start level. Any number of these properties
# may be specified for different start levels.
# file:bundle/1/org.apache.felix.gogo.shell-${gogo.version}.jar \
+
+felix.auto.install.1= \
+ file:bundle/1/slf4j-simple-${slf4j.simple.version}.jar
+
felix.auto.start.1= \
file:bundle/1/logback-classic-1.2.3.jar \
file:bundle/1/logback-core-1.2.3.jar \
- file:bundle/1/org.osgi.service.log-1.3.0.jar \
file:bundle/1/jline-${org.jline.version}.jar \
file:bundle/1/jansi-${org.fusesource.jansi.version}.jar \
file:bundle/1/org.apache.felix.framework.security-2.6.1.jar \
file:bundle/1/org.apache.felix.gogo.runtime-${org.apache.felix.gogo.runtime.version}.jar \
file:bundle/1/org.apache.felix.gogo.command-${org.apache.felix.gogo.command.version}.jar \
file:bundle/1/org.apache.felix.gogo.jline-${org.apache.felix.gogo.jline.version}.jar \
- file:bundle/1/osgi-over-slf4j-1.7.25.jar \
- file:bundle/1/slf4j-api-${slf4j.version}.jar \
- file:bundle/1/slf4j-simple-${slf4j.version}.jar
-
-felix.auto.install.2= \
- file:bundle/2/osgi.cmpn-${osgi.compendium.version}.jar
-
+ file:bundle/1/slf4j-api-${slf4j.version}.jar
+
felix.auto.start.2= \
file:bundle/2/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar \
- file:bundle/2/org.apache.felix.configadmin-1.9.10.jar \
- file:bundle/2/org.osgi.service.event-1.4.0.jar \
- file:bundle/2/sensinact-framework-extension-${project.version}.jar \
+ file:bundle/2/org.apache.felix.configadmin-1.9.12.jar \
file:bundle/2/org.apache.felix.bundlerepository-2.0.10.jar \
- file:bundle/2/org.apache.felix.scr-2.1.14.jar \
+ file:bundle/2/org.apache.felix.scr-2.1.16.jar \
file:bundle/2/org.osgi.service.component-1.4.0.jar \
file:bundle/2/org.osgi.service.remoteserviceadmin-1.1.0.jar \
- file:bundle/2/org.osgi.util.function-1.1.0.jar \
- file:bundle/2/org.osgi.util.promise-1.1.1.jar \
+ file:bundle/2/org.osgi.util.function-1.0.0.jar \
+ file:bundle/2/org.osgi.util.promise-1.0.0.jar \
file:bundle/2/mqtt-utils-${project.version}.jar \
- file:bundle/2/org.eclipse.paho.client.mqttv3-1.2.0.jar
-
+ file:bundle/2/org.eclipse.paho.client.mqttv3-1.2.0.jar \
+ file:bundle/2/org.apache.felix.log-1.2.0.jar \
+ file:bundle/2/org.osgi.namespace.extender-1.0.1.jar \
+ file:bundle/2/org.osgi.service.cm-1.6.0.jar \
+ file:bundle/2/org.osgi.service.log-1.3.0.jar \
+ file:bundle/2/org.osgi.service.metatype-1.3.0.jar
+
felix.auto.install.3= \
file:bundle/3/sensinact-common-${project.version}.jar \
file:bundle/3/sensinact-datastore-api-${project.version}.jar \
@@ -134,7 +135,7 @@ felix.auto.start.3= \
felix.auto.start.4= \
file:bundle/4/org.apache.felix.shell.remote-1.1.2.jar
-
+
felix.log.level=3
# Sets the initial start level of the framework upon startup.
diff --git a/platform/sensinact-generic/src/test/resources/sensinact.config b/platform/sensinact-generic/src/test/resources/sensinact.config
new file mode 100644
index 00000000..7b88e10e
--- /dev/null
+++ b/platform/sensinact-generic/src/test/resources/sensinact.config
@@ -0,0 +1,3 @@
+namespace=SERVER
+broker=tcp://sensinact-cea.ddns.net:5269
+broker.topic.prefix=/ \ No newline at end of file
diff --git a/platform/southbound/http/http-device/src/test/resources/sensinact.config b/platform/southbound/http/http-device/src/test/resources/sensinact.config
new file mode 100644
index 00000000..c545da5b
--- /dev/null
+++ b/platform/southbound/http/http-device/src/test/resources/sensinact.config
@@ -0,0 +1,3 @@
+namespace=SERVER
+broker=tcp://127.0.0.1:1883
+broker.topic.prefix=/ \ No newline at end of file

Back to the top