You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2020/05/03 20:09:54 UTC
[incubator-streampipes-extensions] 01/01: Remove package connect
adapter
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch s7
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit 91d1963a7774d183dd99aa308751dafa3436b1a3
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Sun May 3 22:09:29 2020 +0200
Remove package connect adapter
---
.../{streampipes-connect-adapter => }/Dockerfile | 4 +-
.../aarch64.Dockerfile | 0
.../arm.Dockerfile | 0
streampipes-connect-adapters/pom.xml | 56 ++++++-
.../streampipes/connect/ConnectAdapterInit.java | 0
.../streampipes/connect/adapters/PullAdapter.java | 0
.../connect/adapters/PullRestAdapter.java | 0
.../adapters/coindesk/CoindeskBitcoinAdapter.java | 0
.../connect/adapters/coindesk/Currency.java | 0
.../connect/adapters/coindesk/model/Bpi.java | 0
.../adapters/coindesk/model/CoindeskRawModel.java | 0
.../connect/adapters/coindesk/model/EUR.java | 0
.../connect/adapters/coindesk/model/GBP.java | 0
.../connect/adapters/coindesk/model/Time.java | 0
.../connect/adapters/coindesk/model/USD.java | 0
.../connect/adapters/gdelt/GdeltAdapter.java | 0
.../connect/adapters/iex/IexCloudAdapter.java | 0
.../connect/adapters/iex/IexCloudNewsAdapter.java | 0
.../connect/adapters/iex/IexCloudStockAdapter.java | 0
.../connect/adapters/iex/model/IexNewsData.java | 0
.../connect/adapters/iex/model/IexStockData.java | 0
.../connect/adapters/influxdb/InfluxDbClient.java | 0
.../adapters/influxdb/InfluxDbSetAdapter.java | 0
.../adapters/influxdb/InfluxDbStreamAdapter.java | 0
.../connect/adapters/iss/IssAdapter.java | 0
.../connect/adapters/iss/model/IssModel.java | 0
.../connect/adapters/iss/model/IssPosition.java | 0
.../streampipes/connect/adapters/mysql/Column.java | 0
.../connect/adapters/mysql/MySqlAdapter.java | 0
.../connect/adapters/mysql/MySqlClient.java | 0
.../connect/adapters/mysql/MySqlSetAdapter.java | 0
.../connect/adapters/mysql/MySqlStreamAdapter.java | 0
.../connect/adapters/netio/NetioMQTTAdapter.java | 0
.../connect/adapters/netio/NetioRestAdapter.java | 0
.../connect/adapters/netio/NetioUtils.java | 0
.../adapters/netio/model/NetioAllPowerOutputs.java | 0
.../adapters/netio/model/NetioGlobalMeasure.java | 0
.../adapters/netio/model/NetioPowerOutput.java | 0
.../trafficcamera/CameraDataHttpExecutor.java | 0
.../trafficcamera/CameraFeatureTransformer.java | 0
.../trafficcamera/CameraInfoHttpExecutor.java | 0
.../trafficcamera/NswTrafficCameraAdapter.java | 0
.../trafficcamera/TrafficCameraSensorNames.java | 0
.../nswaustralia/trafficcamera/model/Feature.java | 0
.../trafficcamera/model/FeatureCollection.java | 0
.../nswaustralia/trafficcamera/model/Geometry.java | 0
.../trafficcamera/model/Properties.java | 0
.../nswaustralia/trafficcamera/model/Rights.java | 0
.../connect/adapters/opcua/OpcNode.java | 0
.../streampipes/connect/adapters/opcua/OpcUa.java | 0
.../connect/adapters/opcua/OpcUaAdapter.java | 0
.../connect/adapters/opcua/OpcUaTypes.java | 0
.../plc4x/passive/Plc4xPassiveAdapter.java | 0
.../connect/adapters/plc4x/s7/Plc4xS7Adapter.java | 8 +
.../connect/adapters/ros/RosBridgeAdapter.java | 0
.../adapters/sensemap/OpenSenseMapAdapter.java | 0
.../connect/adapters/sensemap/SensorNames.java | 0
.../adapters/sensemap/model/CurrentLocation.java | 0
.../connect/adapters/sensemap/model/Geometry.java | 0
.../adapters/sensemap/model/LastMeasurement.java | 0
.../connect/adapters/sensemap/model/Loc.java | 0
.../connect/adapters/sensemap/model/SenseBox.java | 0
.../connect/adapters/sensemap/model/Sensor.java | 0
.../adapters/simulator/RandomDataSetAdapter.java | 0
.../adapters/simulator/RandomDataSimulator.java | 0
.../simulator/RandomDataSimulatorUtils.java | 0
.../simulator/RandomDataStreamAdapter.java | 0
.../connect/adapters/slack/SlackAdapter.java | 0
.../connect/adapters/slack/SlackConsumer.java | 0
.../connect/adapters/ti/TISensorTag.java | 0
.../adapters/wikipedia/WikipediaAdapter.java | 0
.../wikipedia/WikipediaEditedArticlesAdapter.java | 0
.../wikipedia/WikipediaModelConverter.java | 0
.../wikipedia/WikipediaNewArticlesAdapter.java | 0
.../adapters/wikipedia/WikipediaSseConsumer.java | 0
.../connect/adapters/wikipedia/model/Length.java | 0
.../connect/adapters/wikipedia/model/Meta.java | 0
.../connect/adapters/wikipedia/model/Revision.java | 0
.../adapters/wikipedia/model/WikipediaModel.java | 0
.../streampipes/connect/config/ConfigKeys.java | 0
.../connect/config/ConnectWorkerConfig.java | 0
.../connect/protocol/set/FileProtocol.java | 0
.../connect/protocol/set/HttpProtocol.java | 0
.../connect/protocol/stream/BrokerProtocol.java | 0
.../protocol/stream/FileStreamProtocol.java | 0
.../connect/protocol/stream/HDFSProtocol.java | 0
.../protocol/stream/HttpStreamProtocol.java | 0
.../connect/protocol/stream/KafkaProtocol.java | 0
.../connect/protocol/stream/MqttConfig.java | 0
.../connect/protocol/stream/MqttConsumer.java | 0
.../connect/protocol/stream/MqttProtocol.java | 0
.../connect/protocol/stream/PullProtocol.java | 0
.../connect/protocol/stream/WebsocketClient.java | 0
.../connect/protocol/stream/WebsocketProtocol.java | 0
.../protocol/stream/pulsar/PulsarConsumer.java | 0
.../protocol/stream/pulsar/PulsarProtocol.java | 0
.../protocol/stream/pulsar/PulsarUtils.java | 0
.../connect/utils/MqttConnectUtils.java | 0
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 0
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 0
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 0
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 0
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 0
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 0
.../connect/adapters/PullAdapterTest.java | 0
.../streampipes/connect/adapters/generic/Mock.java | 0
.../connect/adapters/generic/UtilTest.java | 0
.../generic/elements/AddTimestampTest.java | 0
.../generic/elements/DuplicateFilterTest.java | 0
.../generic/protocol/set/HttpProtocolTest.java | 0
.../generic/protocol/stream/HttpProtocolTest.java | 0
.../adapters/sensemap/OpenSenseMapAdapterTest.java | 0
.../connect/adapters/sensemap/SensorNamesTest.java | 0
.../connect/adapters/ti/TISensorTagTest.java | 0
.../streampipes-connect-adapter/pom.xml | 165 ---------------------
127 files changed, 61 insertions(+), 172 deletions(-)
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/Dockerfile b/streampipes-connect-adapters/Dockerfile
similarity index 86%
rename from streampipes-connect-adapters/streampipes-connect-adapter/Dockerfile
rename to streampipes-connect-adapters/Dockerfile
index ab449ae..f6ef3a7 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/Dockerfile
+++ b/streampipes-connect-adapters/Dockerfile
@@ -20,6 +20,6 @@ ENV CONSUL_LOCATION consul
EXPOSE 8099
-COPY target/streampipes-connect-adapter.jar /streampipes-connect-adapter.jar
+COPY target/streampipes-connect-adapters.jar /streampipes-connect-adapters.jar
-ENTRYPOINT ["java", "-jar", "/streampipes-connect-adapter.jar"]
+ENTRYPOINT ["java", "-jar", "/streampipes-connect-adapters.jar"]
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/aarch64.Dockerfile b/streampipes-connect-adapters/aarch64.Dockerfile
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/aarch64.Dockerfile
rename to streampipes-connect-adapters/aarch64.Dockerfile
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/arm.Dockerfile b/streampipes-connect-adapters/arm.Dockerfile
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/arm.Dockerfile
rename to streampipes-connect-adapters/arm.Dockerfile
diff --git a/streampipes-connect-adapters/pom.xml b/streampipes-connect-adapters/pom.xml
index 3725f00..c83e82b 100644
--- a/streampipes-connect-adapters/pom.xml
+++ b/streampipes-connect-adapters/pom.xml
@@ -24,17 +24,12 @@
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-extensions</artifactId>
<version>0.67.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
</parent>
<artifactId>streampipes-connect-adapters</artifactId>
<packaging>pom</packaging>
- <modules>
- <module>streampipes-connect-adapter</module>
- </modules>
-
<properties>
<animal-sniffer-annotations.version>1.17</animal-sniffer-annotations.version>
<bcprov.version>1.61</bcprov.version>
@@ -82,6 +77,11 @@
<version>${mysql-binlog-connector.version}</version>
</dependency>
<dependency>
+ <groupId>org.influxdb</groupId>
+ <artifactId>influxdb-java</artifactId>
+ <version>${influxdb.java.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>${errorprone-annotations.version}</version>
@@ -132,6 +132,10 @@
<version>${netty.version}</version>
</dependency>
<dependency>
+ <groupId>org.fusesource.mqtt-client</groupId>
+ <artifactId>mqtt-client</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
<version>${javax-websocket-client-api.version}</version>
@@ -142,6 +146,10 @@
<version>${mysql-connector-java.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>fluent-hc</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-milo</artifactId>
<version>${camel.version}</version>
@@ -273,6 +281,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -315,6 +328,39 @@
</plugin>
</plugins>
</pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <classifier>embed</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ <configuration>
+ <mainClass>org.apache.streampipes.connect.ConnectAdapterInit</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <finalName>streampipes-connect-adapters</finalName>
</build>
</project>
\ No newline at end of file
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/PullAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/PullAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/PullAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/PullAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/PullRestAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/PullRestAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/PullRestAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/PullRestAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/CoindeskBitcoinAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/CoindeskBitcoinAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/CoindeskBitcoinAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/CoindeskBitcoinAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/Currency.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/Currency.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/Currency.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/Currency.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/Bpi.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/Bpi.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/Bpi.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/Bpi.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/CoindeskRawModel.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/CoindeskRawModel.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/CoindeskRawModel.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/CoindeskRawModel.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/EUR.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/EUR.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/EUR.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/EUR.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/GBP.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/GBP.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/GBP.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/GBP.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/Time.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/Time.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/Time.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/Time.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/USD.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/USD.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/USD.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/coindesk/model/USD.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudNewsAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudNewsAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudNewsAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudNewsAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudStockAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudStockAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudStockAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudStockAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/model/IexNewsData.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iex/model/IexNewsData.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/model/IexNewsData.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iex/model/IexNewsData.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/model/IexStockData.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iex/model/IexStockData.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/model/IexStockData.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iex/model/IexStockData.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbClient.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbClient.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbClient.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbClient.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbSetAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbSetAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbSetAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbSetAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbStreamAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbStreamAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbStreamAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbStreamAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iss/model/IssModel.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iss/model/IssModel.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iss/model/IssModel.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iss/model/IssModel.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iss/model/IssPosition.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iss/model/IssPosition.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iss/model/IssPosition.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iss/model/IssPosition.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/Column.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/Column.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/Column.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/Column.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlClient.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlClient.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlClient.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlClient.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlSetAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlSetAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlSetAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlSetAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlStreamAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlStreamAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlStreamAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlStreamAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioMQTTAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioMQTTAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioMQTTAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioMQTTAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioRestAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioRestAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioRestAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioRestAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioUtils.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioUtils.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioUtils.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioUtils.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioAllPowerOutputs.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioAllPowerOutputs.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioAllPowerOutputs.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioAllPowerOutputs.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioGlobalMeasure.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioGlobalMeasure.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioGlobalMeasure.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioGlobalMeasure.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioPowerOutput.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioPowerOutput.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioPowerOutput.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/model/NetioPowerOutput.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraDataHttpExecutor.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraDataHttpExecutor.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraDataHttpExecutor.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraDataHttpExecutor.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraFeatureTransformer.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraFeatureTransformer.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraFeatureTransformer.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraFeatureTransformer.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraInfoHttpExecutor.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraInfoHttpExecutor.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraInfoHttpExecutor.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/CameraInfoHttpExecutor.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/TrafficCameraSensorNames.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/TrafficCameraSensorNames.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/TrafficCameraSensorNames.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/TrafficCameraSensorNames.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Feature.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Feature.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Feature.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Feature.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/FeatureCollection.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/FeatureCollection.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/FeatureCollection.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/FeatureCollection.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Geometry.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Geometry.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Geometry.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Geometry.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Properties.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Properties.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Properties.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Properties.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Rights.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Rights.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Rights.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/model/Rights.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcNode.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcNode.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcNode.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcNode.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUa.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUa.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUa.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUa.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaTypes.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaTypes.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaTypes.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaTypes.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/plc4x/passive/Plc4xPassiveAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/passive/Plc4xPassiveAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/plc4x/passive/Plc4xPassiveAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/passive/Plc4xPassiveAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
similarity index 95%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
index 4ad7a14..37a286b 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
@@ -29,6 +29,7 @@ import org.apache.streampipes.connect.adapter.exception.AdapterException;
import org.apache.streampipes.connect.adapter.sdk.ParameterExtractor;
import org.apache.streampipes.connect.adapter.util.PollingSettings;
import org.apache.streampipes.connect.adapters.PullAdapter;
+import org.apache.streampipes.connect.utils.MqttConnectUtils;
import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
import org.apache.streampipes.model.connect.guess.GuessSchema;
@@ -97,6 +98,13 @@ public class Plc4xS7Adapter extends PullAdapter {
.iconUrl("plc4x.png")
.category(AdapterType.Manufacturing)
.requiredTextParameter(Labels.from(PLC_IP, "PLC Address", "Example: 192.168.34.56"))
+
+// .requiredAlternatives(Labels.withId(ACCESS_MODE),
+// Alternatives.from(Labels.withId(ANONYMOUS_ACCESS)),
+// Alternatives.from(Labels.withId(USERNAME_ACCESS),
+// StaticProperties.group(Labels.withId(USERNAME_GROUP),
+// StaticProperties.stringFreeTextProperty(Labels.withId(USERNAME)),
+// StaticProperties.secretValue(Labels.withId(PASSWORD))))
.requiredCollection(Labels.from(PLC_NODES, "Nodes", "The PLC Nodes"),
StaticProperties.stringFreeTextProperty(Labels.from(PLC_NODE_RUNTIME_NAME, "Runtime Name", "example: temperatur")),
StaticProperties.stringFreeTextProperty(Labels.from(PLC_NODE_NAME, "Node Name", "example: %Q0.4")),
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/SensorNames.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/SensorNames.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/SensorNames.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/SensorNames.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/CurrentLocation.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/CurrentLocation.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/CurrentLocation.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/CurrentLocation.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Geometry.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Geometry.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Geometry.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Geometry.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/LastMeasurement.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/LastMeasurement.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/LastMeasurement.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/LastMeasurement.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Loc.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Loc.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Loc.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Loc.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/SenseBox.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/SenseBox.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/SenseBox.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/SenseBox.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Sensor.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Sensor.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Sensor.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/sensemap/model/Sensor.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSetAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSetAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSetAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSetAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSimulator.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSimulator.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSimulator.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSimulator.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSimulatorUtils.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSimulatorUtils.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSimulatorUtils.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSimulatorUtils.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataStreamAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataStreamAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataStreamAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataStreamAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackConsumer.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackConsumer.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackConsumer.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackConsumer.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ti/TISensorTag.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/ti/TISensorTag.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ti/TISensorTag.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/ti/TISensorTag.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaEditedArticlesAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaEditedArticlesAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaEditedArticlesAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaEditedArticlesAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaModelConverter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaModelConverter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaModelConverter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaModelConverter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaNewArticlesAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaNewArticlesAdapter.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaNewArticlesAdapter.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaNewArticlesAdapter.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaSseConsumer.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaSseConsumer.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaSseConsumer.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaSseConsumer.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Length.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Length.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Length.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Length.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Meta.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Meta.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Meta.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Meta.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Revision.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Revision.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Revision.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/Revision.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/WikipediaModel.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/WikipediaModel.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/WikipediaModel.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/model/WikipediaModel.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/config/ConfigKeys.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConfigKeys.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/config/ConfigKeys.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConfigKeys.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/BrokerProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/BrokerProtocol.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/BrokerProtocol.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/BrokerProtocol.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/KafkaProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/KafkaProtocol.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/KafkaProtocol.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/KafkaProtocol.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttConfig.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttConfig.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttConfig.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttConfig.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttConsumer.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttConsumer.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttConsumer.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttConsumer.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttProtocol.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttProtocol.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttProtocol.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/PullProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/PullProtocol.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/PullProtocol.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/PullProtocol.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketClient.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketClient.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketClient.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketClient.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketProtocol.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketProtocol.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketProtocol.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarConsumer.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarConsumer.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarConsumer.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarConsumer.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarProtocol.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarProtocol.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarProtocol.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarProtocol.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarUtils.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarUtils.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarUtils.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarUtils.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/utils/MqttConnectUtils.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/utils/MqttConnectUtils.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/utils/MqttConnectUtils.java
rename to streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/utils/MqttConnectUtils.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.iss/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.iss/documentation.md
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.iss/documentation.md
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.iss/documentation.md
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.iss/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.iss/icon.png
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.iss/icon.png
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.iss/icon.png
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.iss/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.iss/strings.en
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.iss/strings.en
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.iss/strings.en
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/documentation.md
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/documentation.md
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/documentation.md
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/icon.png
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/icon.png
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/icon.png
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/strings.en
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/strings.en
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/strings.en
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/documentation.md
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/documentation.md
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/documentation.md
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/icon.png
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.mqtt/icon.png
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/icon.png
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/strings.en
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/strings.en
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.netio.rest/strings.en
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ros/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/documentation.md
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ros/documentation.md
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/documentation.md
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ros/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/icon.png
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ros/icon.png
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/icon.png
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ros/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/strings.en
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ros/strings.en
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ros/strings.en
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ti/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ti/documentation.md
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ti/documentation.md
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ti/documentation.md
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ti/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ti/icon.png
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ti/icon.png
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ti/icon.png
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ti/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ti/strings.en
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ti/strings.en
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.ti/strings.en
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/documentation.md b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/documentation.md
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/documentation.md
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/documentation.md
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/icon.png b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/icon.png
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/icon.png
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/icon.png
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/strings.en b/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/strings.en
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/strings.en
rename to streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.protocol.stream.mqtt/strings.en
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/PullAdapterTest.java b/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/PullAdapterTest.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/PullAdapterTest.java
rename to streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/PullAdapterTest.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/Mock.java b/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/Mock.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/Mock.java
rename to streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/Mock.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/UtilTest.java b/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/UtilTest.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/UtilTest.java
rename to streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/UtilTest.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/elements/AddTimestampTest.java b/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/elements/AddTimestampTest.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/elements/AddTimestampTest.java
rename to streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/elements/AddTimestampTest.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/elements/DuplicateFilterTest.java b/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/elements/DuplicateFilterTest.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/elements/DuplicateFilterTest.java
rename to streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/elements/DuplicateFilterTest.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/set/HttpProtocolTest.java b/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/set/HttpProtocolTest.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/set/HttpProtocolTest.java
rename to streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/set/HttpProtocolTest.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/stream/HttpProtocolTest.java b/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/stream/HttpProtocolTest.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/stream/HttpProtocolTest.java
rename to streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/stream/HttpProtocolTest.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapterTest.java b/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapterTest.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapterTest.java
rename to streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapterTest.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/sensemap/SensorNamesTest.java b/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/sensemap/SensorNamesTest.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/sensemap/SensorNamesTest.java
rename to streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/sensemap/SensorNamesTest.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/ti/TISensorTagTest.java b/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/ti/TISensorTagTest.java
similarity index 100%
rename from streampipes-connect-adapters/streampipes-connect-adapter/src/test/java/org/apache/streampipes/connect/adapters/ti/TISensorTagTest.java
rename to streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/ti/TISensorTagTest.java
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/pom.xml b/streampipes-connect-adapters/streampipes-connect-adapter/pom.xml
deleted file mode 100644
index 184039e..0000000
--- a/streampipes-connect-adapters/streampipes-connect-adapter/pom.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>streampipes-connect-adapters</artifactId>
- <groupId>org.apache.streampipes</groupId>
- <version>0.67.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
-
- <artifactId>streampipes-connect-adapter</artifactId>
-
- <dependencies>
- <!-- StreamPipes dependencies -->
- <dependency>
- <groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-connect-container-worker</artifactId>
- </dependency>
-
- <!-- External dependencies -->
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.shyiko</groupId>
- <artifactId>mysql-binlog-connector-java</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </dependency>
- <dependency>
- <groupId>com.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- </dependency>
- <dependency>
- <groupId>com.ullink.slack</groupId>
- <artifactId>simpleslackapi</artifactId>
- </dependency>
- <dependency>
- <groupId>edu.wpi.rail</groupId>
- <artifactId>jrosbridge</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.websocket</groupId>
- <artifactId>javax.websocket-api</artifactId>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
- <dependency>
- <groupId>org.influxdb</groupId>
- <artifactId>influxdb-java</artifactId>
- <version>${influxdb.java.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>fluent-hc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-driver-s7</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fusesource.mqtt-client</groupId>
- <artifactId>mqtt-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-sse</artifactId>
- </dependency>
- <dependency>
- <groupId>org.java-websocket</groupId>
- <artifactId>Java-WebSocket</artifactId>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <classifier>embed</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- <configuration>
- <mainClass>org.apache.streampipes.connect.ConnectAdapterInit</mainClass>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <finalName>streampipes-connect-adapter</finalName>
- </build>
-</project>