Merge pull request #239 from Daespen/development

Adds default config for mqtt to docker images

Author: FrankSchnicke

basyx.components/basyx.components.docker/basyx.components.AASServer/Dockerfile

@@ -19,6 +19,7 @@ COPY target/${JAR_FILE} /usr/share/basyxExecutable.jar
 COPY target/lib /usr/share/lib
 COPY src/main/resources/aas.properties /usr/share/config/aas.properties
 COPY src/main/resources/context.properties /usr/share/config/context.properties
+COPY src/main/resources/mqtt.properties /usr/share/config/mqtt.properties
 COPY src/test/resources/dockerMongodb.properties /usr/share/config/mongodb.properties
 
 # Expose the appropriate port. In case of Tomcat, this is 8080.

basyx.components/basyx.components.docker/basyx.components.AASServer/src/main/resources/mqtt.properties

@@ -41,8 +41,6 @@ server=tcp://localhost:1883
 # ##################
 # Whitelist for filtering mqtt events for specific submodels / submodelelements
 
-whitelist.patientTemplate=true
-whitelist.element.patientTemplate.active=true
 # whitelist.element.{mySmIdentifier}.{elementIdShort}=true
 
 # ##################

basyx.components/basyx.components.docker/basyx.components.registry/Dockerfile

@@ -10,6 +10,7 @@ COPY target/lib /usr/share/lib
 COPY src/main/resources/context.properties /usr/share/config/context.properties
 COPY src/main/resources/registry.properties /usr/share/config/registry.properties
 COPY src/test/resources/dockerSQL.properties /usr/share/config/sql.properties
+COPY src/main/resources/mqtt.properties /usr/share/config/mqtt.properties
 COPY src/test/resources/dockerMongodb.properties /usr/share/config/mongodb.properties 
 
 # Expose the appropriate port. In case of Tomcat, this is 8080.