streampipes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [incubator-streampipes-extensions] 02/02: [STREAMPIPES-17] rename adapter/protocol ids to package names
Date Thu, 09 Jan 2020 17:36:08 GMT
This is an automated email from the ASF dual-hosted git repository.

tex pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git

commit 80cba99d4fc0cd341f02b87e749978dca6499574
Author: tex <tex@fzi.de>
AuthorDate: Thu Jan 9 18:30:33 2020 +0100

    [STREAMPIPES-17] rename adapter/protocol ids to package names
---
 .../apache/streampipes/connect/ConnectAdapterInit.java    |  14 +++++++-------
 .../connect/adapters/coindesk/CoindeskBitcoinAdapter.java |   2 +-
 .../streampipes/connect/adapters/gdelt/GdeltAdapter.java  |   2 +-
 .../connect/adapters/iex/IexCloudNewsAdapter.java         |   2 +-
 .../connect/adapters/iex/IexCloudStockAdapter.java        |   2 +-
 .../connect/adapters/influxdb/InfluxDbStreamAdapter.java  |   2 +-
 .../connect/adapters/mysql/MySqlSetAdapter.java           |   2 +-
 .../connect/adapters/mysql/MySqlStreamAdapter.java        |   2 +-
 .../trafficcamera/NswTrafficCameraAdapter.java            |   2 +-
 .../streampipes/connect/adapters/opcua/OpcUaAdapter.java  |   2 +-
 .../adapters/plc4x/passive/Plc4xPassiveAdapter.java       |   2 +-
 .../connect/adapters/plc4x/s7/Plc4xS7Adapter.java         |   2 +-
 .../connect/adapters/ros/RosBridgeAdapter.java            |   2 +-
 .../connect/adapters/sensemap/OpenSenseMapAdapter.java    |   2 +-
 .../connect/adapters/simulator/RandomDataSetAdapter.java  |   2 +-
 .../adapters/simulator/RandomDataStreamAdapter.java       |   2 +-
 .../streampipes/connect/adapters/slack/SlackAdapter.java  |   2 +-
 .../streampipes/connect/adapters/ti/TISensorTag.java      |   2 +-
 .../wikipedia/WikipediaEditedArticlesAdapter.java         |   2 +-
 .../adapters/wikipedia/WikipediaNewArticlesAdapter.java   |   2 +-
 .../streampipes/connect/protocol/set/FileProtocol.java    |   1 -
 .../streampipes/connect/protocol/set/HttpProtocol.java    |   1 -
 .../connect/protocol/stream/FileStreamProtocol.java       |   2 +-
 .../streampipes/connect/protocol/stream/HDFSProtocol.java |   2 +-
 .../connect/protocol/stream/HttpStreamProtocol.java       |   3 ++-
 .../connect/protocol/stream/KafkaProtocol.java            |   2 +-
 .../streampipes/connect/protocol/stream/MqttProtocol.java |   2 +-
 .../connect/protocol/stream/WebsocketProtocol.java        |   2 +-
 .../connect/protocol/stream/pulsar/PulsarProtocol.java    |   2 +-
 .../strings.en                                            |  11 -----------
 .../documentation.md                                      |   0
 .../icon.png                                              | Bin
 .../strings.en                                            |  11 +++++++++++
 33 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
index 75bef15..00d2572 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
@@ -56,15 +56,15 @@ public class ConnectAdapterInit extends AdapterWorkerContainer {
             // Protocols
             .add(new FileProtocol())
             .add(new HttpProtocol())
-   /*         .add(new FileStreamProtocol())
+            .add(new FileStreamProtocol())
             .add(new HDFSProtocol())
             .add(new KafkaProtocol())
             .add(new MqttProtocol())
             .add(new HttpStreamProtocol())
-            .add(new PulsarProtocol()) */
+            .add(new PulsarProtocol())
 
             // Specific Adapters
-   /*         .add(new GdeltAdapter())
+            .add(new GdeltAdapter())
             .add(new CoindeskBitcoinAdapter())
             .add(new IexCloudNewsAdapter())
             .add(new IexCloudStockAdapter())
@@ -74,13 +74,13 @@ public class ConnectAdapterInit extends AdapterWorkerContainer {
             .add(new RandomDataStreamAdapter())
             .add(new SlackAdapter())
             .add(new WikipediaEditedArticlesAdapter())
-            .add(new WikipediaNewArticlesAdapter()) */
-            .add(new RosBridgeAdapter());
-    /*        .add(new OpcUaAdapter())
+            .add(new WikipediaNewArticlesAdapter())
+            .add(new RosBridgeAdapter())
+            .add(new OpcUaAdapter())
             .add(new InfluxDbStreamAdapter())
             .add(new InfluxDbSetAdapter())
             .add(new TISensorTag())
-            .add(new Plc4xS7Adapter()); */
+            .add(new Plc4xS7Adapter());
 
     String workerUrl = ConnectWorkerConfig.INSTANCE.getConnectContainerWorkerUrl();
     String masterUrl = ConnectWorkerConfig.INSTANCE.getConnectContainerMasterUrl();
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/CoindeskBitcoinAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/CoindeskBitcoinAdapter.java
index 9bb047e..2027bce 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/CoindeskBitcoinAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/coindesk/CoindeskBitcoinAdapter.java
@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 
 public class CoindeskBitcoinAdapter extends PullAdapter {
 
-  public static final String ID = "http://streampipes.org/adapter/specific/coindesk/bitcoin";
+  public static final String ID = "org.apache.streampipes.connect.adapters.coindesk";
 
   private static final String CoindeskUrl = "https://api.coindesk.com/v1/bpi/currentprice.json";
 
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
index 8a825d1..fd88c34 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
@@ -43,7 +43,7 @@ import java.util.zip.ZipInputStream;
 
 public class GdeltAdapter extends PullAdapter {
 
-    public static final String ID = "http://streampipes.org/adapter/specific/gdelt";
+    public static final String ID = "org.apache.streampipes.connect.adapters.gdelt";
     private String url = "http://data.gdeltproject.org/gdeltv2/lastupdate.txt";
 
     public GdeltAdapter() {
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudNewsAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudNewsAdapter.java
index a27ef21..a51525e 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudNewsAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudNewsAdapter.java
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
 
 public class IexCloudNewsAdapter extends IexCloudAdapter {
 
-  public static final String ID = "http://streampipes.org/adapter/specific/iexcloud/news";
+  public static final String ID = "org.apache.streampipes.connect.adapters.iex.news";
   private static final String News = "/news";
 
   private static final String Timestamp = "timestamp";
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudStockAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudStockAdapter.java
index c1dd929..f9390ec 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudStockAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iex/IexCloudStockAdapter.java
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
 
 public class IexCloudStockAdapter extends IexCloudAdapter {
 
-  public static final String ID = "http://streampipes.org/adapter/specific/iexcloud/stocks";
+  public static final String ID = "org.apache.streampipes.connect.adapters.iex.stocks";
 
   private static final String Quotes = "/quote";
   private static final String LatestUpdate = "latestUpdate";
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbStreamAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbStreamAdapter.java
index 5a06a7e..c5a49df 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbStreamAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/influxdb/InfluxDbStreamAdapter.java
@@ -38,7 +38,7 @@ import static org.apache.streampipes.connect.adapters.influxdb.InfluxDbClient.ge
 
 public class InfluxDbStreamAdapter extends SpecificDataStreamAdapter {
 
-    public static final String ID = "http://streampipes.org/adapter/specific/influxdbstream";
+    public static final String ID = "org.apache.streampipes.connect.adapters.influxdb";
 
     private static final String POLLING_INTERVAL = "pollingInterval";
 
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlSetAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlSetAdapter.java
index 3ee2beb..bf8414a 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlSetAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlSetAdapter.java
@@ -38,7 +38,7 @@ import java.util.Map;
 
 public class MySqlSetAdapter extends SpecificDataSetAdapter {
 
-    public static final String ID = "http://streampipes.org/adapter/specific/mysqlset";
+    public static final String ID = "org.apache.streampipes.connect.adapters.mysql.set";
 
     private MySqlClient mySqlClient;
     private Thread fetchDataThread;
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlStreamAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlStreamAdapter.java
index fb69a4e..aa7f2a0 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlStreamAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/mysql/MySqlStreamAdapter.java
@@ -40,7 +40,7 @@ import java.util.Map;
 
 public class MySqlStreamAdapter extends SpecificDataStreamAdapter {
 
-    public static final String ID = "http://streampipes.org/adapter/specific/mysqlstream";
+    public static final String ID = "org.apache.streampipes.connect.adapters.mysql.stream";
 
     private MySqlClient mySqlClient;
     private BinaryLogClient binaryLogClient;
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/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java
index 4c52757..72b1364 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/nswaustralia/trafficcamera/NswTrafficCameraAdapter.java
@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 
 public class NswTrafficCameraAdapter extends PullAdapter {
 
-  public static final String ID = "http://streampipes.org/adapter/specific/nswtrafficcamera";
+  public static final String ID = "org.apache.streampipes.connect.adapters.nswaustralia.trafficcamera";
   private static final String API_KEY = "";
 
   public NswTrafficCameraAdapter() {
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaAdapter.java
index 952274e..7deb38a 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/opcua/OpcUaAdapter.java
@@ -43,7 +43,7 @@ import java.util.*;
 
 public class OpcUaAdapter extends SpecificDataStreamAdapter {
 
-    public static final String ID = "http://streampipes.org/adapter/specific/opcua";
+    public static final String ID = "org.apache.streampipes.connect.adapters.opcua";
 
     private static final String OPC_HOST_OR_URL = "OPC_HOST_OR_URL";
     private static final String OPC_URL = "OPC_URL";
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/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/plc4x/passive/Plc4xPassiveAdapter.java
index de04f15..b738839 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/plc4x/passive/Plc4xPassiveAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/plc4x/passive/Plc4xPassiveAdapter.java
@@ -39,7 +39,7 @@ public class Plc4xPassiveAdapter extends SpecificDataStreamAdapter {
     /**
      * A unique id to identify the adapter
      */
-    public static final String ID = "http://streampipes.org/adapter/specific/plc4xpassive";
+    public static final String ID = " org.apache.streampipes.connect.adapters.plc4x.passive";
 
     public Plc4xPassiveAdapter() {
     }
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/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
index 00f25d7..e347e8a 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java
@@ -53,7 +53,7 @@ public class Plc4xS7Adapter extends PullAdapter {
     /**
      * A unique id to identify the Plc4xS7Adapter
       */
-    public static final String ID = "http://streampipes.org/adapter/specific/plc4xs7";
+    public static final String ID = "org.apache.streampipes.connect.adapters.plc4x.s7";
 
     /**
      * Keys of user configuration parameters
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java
index eb624a8..0044af3 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ros/RosBridgeAdapter.java
@@ -57,7 +57,7 @@ import java.util.stream.Collectors;
 
 public class RosBridgeAdapter extends SpecificDataStreamAdapter  implements ResolvesContainerProvidedOptions
{
 
-    public static final String ID = "org.apache.streampipes.adapters.specific.ros";
+    public static final String ID = "org.apache.streampipes.connect.adapters.ros";
 
     private static final String ROS_HOST_KEY = "ROS_HOST_KEY";
     private static final String ROS_PORT_KEY = "ROS_PORT_KEY";
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java
index a9556ff..526abb4 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/sensemap/OpenSenseMapAdapter.java
@@ -52,7 +52,7 @@ public class OpenSenseMapAdapter extends PullRestAdapter {
 
     private Logger logger = LoggerFactory.getLogger(OpenSenseMapAdapter.class);
 
-    public static final String ID = "http://streampipes.org/adapter/specific/opensensemap";
+    public static final String ID = "org.apache.streampipes.connect.adapters.sensemap";
     public static final int POLLING_INTERVALL = 5;
 
     private List<String> selectedSensors;
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSetAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSetAdapter.java
index 677ebbd..f231acf 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSetAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataSetAdapter.java
@@ -30,7 +30,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 
 public class RandomDataSetAdapter extends SpecificDataSetAdapter {
 
-  public static final String ID = "http://streampipes.org/adapter/specific/randomdataset";
+  public static final String ID = "org.apache.streampipes.connect.adapters.simulator.randomdataset";
 
   private static final String WaitTimeMs = "wait-time-ms";
   private static final String NumberOfEvents = "number-of-events";
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataStreamAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataStreamAdapter.java
index c2cc21f..ac883c7 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataStreamAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/simulator/RandomDataStreamAdapter.java
@@ -30,7 +30,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 
 public class RandomDataStreamAdapter extends SpecificDataStreamAdapter {
 
-  public static final String ID = "http://streampipes.org/adapter/specific/randomdatastream";
+  public static final String ID = "org.apache.streampipes.connect.adapters.simulator.randomdatastream";
 
   private final static String WaitTimeMs = "wait-time-ms";
 
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackAdapter.java
index ecf8451..18c6a06 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/slack/SlackAdapter.java
@@ -35,7 +35,7 @@ import static org.apache.streampipes.sdk.helpers.EpProperties.timestampProperty;
 
 public class SlackAdapter extends SpecificDataStreamAdapter {
 
-  public static final String ID = "http://streampipes.org/adapter/specific/slack";
+  public static final String ID = "org.apache.streampipes.connect.adapters.slack";
 
   private static final String SlackToken = "slack-token";
   private static final String Timestamp = "timestamp";
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ti/TISensorTag.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ti/TISensorTag.java
index b0c51f1..0fd9ccf 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ti/TISensorTag.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/ti/TISensorTag.java
@@ -48,7 +48,7 @@ public class TISensorTag extends SpecificDataStreamAdapter {
 
     private Logger logger = LoggerFactory.getLogger(TISensorTag.class);
 
-    public static final String ID = "http://streampipes.org/adapter/specific/tisensortag";
+    public static final String ID = "org.apache.streampipes.connect.adapters.ti";
 
     private static final String ACCESS_MODE = "access_mode";
     private static final String ANONYMOUS_ACCESS = "anonymous-alternative";
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaEditedArticlesAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaEditedArticlesAdapter.java
index 9d4aca4..1828e35 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaEditedArticlesAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaEditedArticlesAdapter.java
@@ -24,7 +24,7 @@ import org.apache.streampipes.sdk.builder.adapter.SpecificDataStreamAdapterBuild
 
 public class WikipediaEditedArticlesAdapter extends WikipediaAdapter {
 
-  public static final String ID = "http://streampipes.org/adapter/specific/wikipedia/edit";
+  public static final String ID = "org.apache.streampipes.connect.adapters.wikipedia.edit";
 
   private static final String Type = "edit";
 
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaNewArticlesAdapter.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaNewArticlesAdapter.java
index d71278f..3916c2f 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaNewArticlesAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/wikipedia/WikipediaNewArticlesAdapter.java
@@ -24,7 +24,7 @@ import org.apache.streampipes.sdk.builder.adapter.SpecificDataStreamAdapterBuild
 
 public class WikipediaNewArticlesAdapter extends WikipediaAdapter {
 
-  public static final String ID = "http://streampipes.org/adapter/specific/wikipedia/new";
+  public static final String ID = "org.apache.streampipes.connect.adapters.wikipedia.new";
 
   private static final String Type = "new";
 
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java
index 4ff8056..76d918f 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/FileProtocol.java
@@ -47,7 +47,6 @@ public class FileProtocol extends Protocol {
 
     private static Logger logger = LoggerFactory.getLogger(FileProtocol.class);
 
-   // public static final String ID = "https://streampipes.org/vocabulary/v1/protocol/set/file";
     public static final String ID = "org.apache.streampipes.protocol.set.file";
 
     private String fileUri;
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java
index b07ab72..492626e 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/set/HttpProtocol.java
@@ -47,7 +47,6 @@ public class HttpProtocol extends Protocol {
 
     Logger logger = LoggerFactory.getLogger(Protocol.class);
 
-    //public static final String ID = "https://streampipes.org/vocabulary/v1/protocol/set/http";
     public static final String ID = "org.apache.streampipes.protocol.set.http";
 
     private String url;
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
index d71c446..d8ff199 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/FileStreamProtocol.java
@@ -47,7 +47,7 @@ public class FileStreamProtocol extends Protocol {
 
   private static Logger logger = LoggerFactory.getLogger(FileStreamProtocol.class);
 
-  public static final String ID = "https://streampipes.org/vocabulary/v1/protocol/stream/file";
+  public static final String ID = "org.apache.streampipes.connect.protocol.stream.file";
 
   private String filePath;
  // private String timestampKey;
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
index 1cd8c86..e324705 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
@@ -50,7 +50,7 @@ import java.util.stream.Collectors;
 
 public class HDFSProtocol extends Protocol {
 
-    public static final String ID = "https://streampipes.org/vocabulary/v1/protocol/stream/HDFS";
+    public static final String ID = "org.apache.streampipes.connect.protocol.stream.HDFS";
 
     private static String INTERVAL_PROPERTY = "intervalProperty";
     private static String URL_PROPERTY = "urlProperty";
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java
index f6c0c88..c17adfa 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/HttpStreamProtocol.java
@@ -44,7 +44,8 @@ public class HttpStreamProtocol extends PullProtocol {
 
     Logger logger = LoggerFactory.getLogger(HttpStreamProtocol.class);
 
-    public static final String ID = "https://streampipes.org/vocabulary/v1/protocol/stream/http";
+    public static final String ID = "org.apache.streampipes.connect.protocol.stream.http";
+
     private static String URL_PROPERTY ="url";
     private static String INTERVAL_PROPERTY ="interval";
     private static String ACCESS_TOKEN_PROPERTY ="access_token";
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/KafkaProtocol.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/KafkaProtocol.java
index 286bdfb..be5da3d 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/KafkaProtocol.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/KafkaProtocol.java
@@ -53,7 +53,7 @@ public class KafkaProtocol extends BrokerProtocol implements ResolvesContainerPr
 
     Logger logger = LoggerFactory.getLogger(KafkaProtocol.class);
 
-    public static final String ID = "https://streampipes.org/vocabulary/v1/protocol/stream/kafka";
+    public static final String ID = "rg.apache.streampipes.connect.protocol.stream.kafka";
 
     private Thread thread;
     private SpKafkaConsumer kafkaConsumer;
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttProtocol.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttProtocol.java
index b31c549..3ede601 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttProtocol.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/MqttProtocol.java
@@ -40,7 +40,7 @@ import java.util.List;
 
 public class MqttProtocol extends BrokerProtocol {
 
-  public static final String ID = "https://streampipes.org/vocabulary/v1/protocol/stream/mqtt";
+  public static final String ID = "org.apache.streampipes.connect.protocol.stream.mqtt";
 
   private static final String ACCESS_MODE = "access_mode";
   private static final String ANONYMOUS_ACCESS = "anonymous-alternative";
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketProtocol.java
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketProtocol.java
index dcc2812..b74b543 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketProtocol.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/WebsocketProtocol.java
@@ -37,7 +37,7 @@ import java.net.URISyntaxException;
 
 public class WebsocketProtocol extends SpecificDataStreamAdapter {
 
-  public static final String ID = "http://streampipes.org/adapter/specific/turtlebot";
+  public static final String ID = "org.apache.streampipes.connect.protocol.stream.turtlebot";
 
   private WebsocketClient websocketClient;
 
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/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarProtocol.java
index 4d61357..9c1276c 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarProtocol.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/protocol/stream/pulsar/PulsarProtocol.java
@@ -46,7 +46,7 @@ public class PulsarProtocol extends BrokerProtocol implements ResolvesContainerP
 
   private static final Logger LOG = LoggerFactory.getLogger(PulsarProtocol.class);
 
-  public static final String ID = "https://streampipes.org/vocabulary/v1/protocol/stream/pulsar";
+  public static final String ID = "org.apache.streampipes.connect.protocol.stream.pulsar";
 
   private static final String PULSAR_BROKER_HOST = "pulsar-broker-host";
   private static final String PULSAR_BROKER_PORT = "pulsar-broker-port";
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.adapters.specific.ros/strings.en
b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.adapters.specific.ros/strings.en
deleted file mode 100644
index 25e4e0a..0000000
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.adapters.specific.ros/strings.en
+++ /dev/null
@@ -1,11 +0,0 @@
-org.apache.streampipes.adapters.specific.ros.title=ROS Bridge
-org.apache.streampipes.adapters.specific.ros.description=Connect Robots running on ROS.
-
-ROS_HOST_KEY.title=Ros Bridge
-ROS_HOST_KEY.description=Example: test-server.com (No protocol)
-
-ROS_PORT_KEY.title=Port
-ROS_PORT_KEY.description=Example: 9090
-
-TOPIC_KEY.title=Topic
-TOPIC_KEY.description=Example: /battery (Starts with /)
\ No newline at end of file
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.adapters.specific.ros/documentation.md
b/streampipes-connect-adapters/streampipes-connect-adapter/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.adapters.specific.ros/documentation.md
rename to streampipes-connect-adapters/streampipes-connect-adapter/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.adapters.specific.ros/icon.png
b/streampipes-connect-adapters/streampipes-connect-adapter/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.adapters.specific.ros/icon.png
rename to streampipes-connect-adapters/streampipes-connect-adapter/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/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ros/strings.en
new file mode 100644
index 0000000..3dbb467
--- /dev/null
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/resources/org.apache.streampipes.connect.adapters.ros/strings.en
@@ -0,0 +1,11 @@
+org.apache.streampipes.connect.adapters.ros.title=ROS Bridge
+org.apache.streampipes.connect.adapters.ros.description=Connect Robots running on ROS.
+
+ROS_HOST_KEY.title=Ros Bridge
+ROS_HOST_KEY.description=Example: test-server.com (No protocol)
+
+ROS_PORT_KEY.title=Port
+ROS_PORT_KEY.description=Example: 9090
+
+TOPIC_KEY.title=Topic
+TOPIC_KEY.description=Example: /battery (Starts with /)
\ No newline at end of file


Mime
View raw message