[RELEASE] [skip-ci]merging 'release-0.63.0' into 'master'

apache · Sep 5, 2019 · 909dcc7 · 909dcc7
2 parents 6042055 + 63fa0da
commit 909dcc7
Show file tree

Hide file tree

Showing 524 changed files with 11,792 additions and 15,118 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,10 +1,7 @@
 variables:
-  REGISTRY_HOST: ipe-wim-gitlab.fzi.de:5000
-  HARBOR_REGISTRY_HOST: laus.fzi.de:8201
   IMAGE_NAME: $REGISTRY_HOST/$CI_PROJECT_PATH
   HARBOR_IMAGE_NAME: $HARBOR_REGISTRY_HOST/$CI_PROJECT_PATH
   MAVEN_CLI_OPTS: -DskipTests --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true
-  GIT_REPO_ORIGIN: ssh://git@ipe-wim-gitlab.fzi.de:2222
   GIT_STRATEGY: clone
 
 stages:
@@ -31,8 +28,8 @@ build:
     - "echo $MVN_VERSION >> ./target/mvn_version"
   artifacts:
     paths:
-      - ./streampipes-backend/target/*.war
-      - ./streampipes-connect-container/target/*.jar
+      - ./streampipes-backend/target/streampipes-backend.jar
+      - ./streampipes-connect-container-master/target/streampipes-connect-container-master.jar
       - ./target/site/apidocs/**
       - ./target/mvn_version
     expire_in:  1 week
@@ -47,7 +44,7 @@ github:
     - git config --global user.name 'zehnder'
     - git checkout $CI_COMMIT_REF_NAME
     - git pull
-    - git remote add github https://$GITHUB_TOKEN:x-oauth-basic@github.com/streampipes/streampipes-ce.git
+    - git remote add github https://$GITHUB_TOKEN:x-oauth-basic@github.com/streampipes/streampipes.git
     - git push github $CI_COMMIT_REF_NAME
   only:
     - dev
@@ -62,9 +59,8 @@ docker-backend:
    script: 
      - export MVN_VERSION=$(cat ./target/mvn_version)
      - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $REGISTRY_HOST
-     - docker login -u riemer -p $HARBOR_PASSWORD laus.fzi.de:8201
+     - docker login -u zehnder -p $HARBOR_PASSWORD ipe-harbor.fzi.de
      - docker build --pull -t $IMAGE_NAME/backend:latest -t $IMAGE_NAME/backend:$MVN_VERSION -t $HARBOR_IMAGE_NAME/backend:latest -t $HARBOR_IMAGE_NAME/backend:$MVN_VERSION ./streampipes-backend/
-     - docker build --pull -t $IMAGE_NAME/backend:latest -t $IMAGE_NAME/backend:$MVN_VERSION ./streampipes-backend/
      - docker push $IMAGE_NAME/backend:$MVN_VERSION
      - docker push $IMAGE_NAME/backend:latest
      - docker push $HARBOR_IMAGE_NAME/backend:$MVN_VERSION
@@ -80,9 +76,8 @@ docker-connect-container:
    script:
      - export MVN_VERSION=$(cat ./target/mvn_version)
      - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $REGISTRY_HOST
-     - docker login -u riemer -p $HARBOR_PASSWORD laus.fzi.de:8201
-     - docker build --pull -t $IMAGE_NAME/streampipes-connect-container:latest -t $IMAGE_NAME/streampipes-connect-container:$MVN_VERSION -t $HARBOR_IMAGE_NAME/streampipes-connect-container:latest -t $HARBOR_IMAGE_NAME/streampipes-connect-container:$MVN_VERSION ./streampipes-connect-container/
-     - docker build --pull -t $IMAGE_NAME/streampipes-connect-container:latest -t $IMAGE_NAME/streampipes-connect-container:$MVN_VERSION  ./streampipes-connect-container/
+     - docker login -u zehnder -p $HARBOR_PASSWORD ipe-harbor.fzi.de
+     - docker build --pull -t $IMAGE_NAME/streampipes-connect-container:latest -t $IMAGE_NAME/streampipes-connect-container:$MVN_VERSION -t $HARBOR_IMAGE_NAME/streampipes-connect-container:latest -t $HARBOR_IMAGE_NAME/streampipes-connect-container:$MVN_VERSION ./streampipes-connect-container-master/
      - docker push $IMAGE_NAME/streampipes-connect-container:$MVN_VERSION
      - docker push $IMAGE_NAME/streampipes-connect-container:latest
      - docker push $HARBOR_IMAGE_NAME/streampipes-connect-container:$MVN_VERSION
@@ -151,7 +146,7 @@ finish release:
     - echo "$GPG_PRIVATE_KEY" | gpg --batch --import --passphrase "$GPG_PASSPHRASE"
     - echo "$MAVEN_CREDENTIALS" > /root/.m2/settings.xml
     - git remote set-url origin $GIT_REPO_ORIGIN/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME.git
-    - git remote add github https://$GITHUB_TOKEN:x-oauth-basic@github.com/streampipes/streampipes-ce.git
+    - git remote add github https://$GITHUB_TOKEN:x-oauth-basic@github.com/streampipes/streampipes.git
     - eval $(ssh-agent -s)
     - ssh-add <(echo "$SSH")
     - mkdir ~/.ssh
@@ -185,7 +180,7 @@ docker hub:
     - docker push streampipes/backend:$MVN_VERSION
     - docker build --pull -t streampipes/backend ./streampipes-backend/
     - docker push streampipes/backend
-    - docker build --pull -t streampipes/streampipes-connect-container:latest -t streampipes/streampipes-connect-container:$MVN_VERSION ./streampipes-connect-container/
+    - docker build --pull -t streampipes/streampipes-connect-container:latest -t streampipes/streampipes-connect-container:$MVN_VERSION ./streampipes-connect-container-master/
     - docker push streampipes/streampipes-connect-container:$MVN_VERSION
     - docker push streampipes/streampipes-connect-container:latest
   when: manual

diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: java
+jdk: openjdk8
 
 addons:
   sonarcloud:

diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.streampipes</groupId>
         <artifactId>streampipes-parent</artifactId>
-        <version>0.62.0</version>
+        <version>0.63.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>streampipes-archetype-pe-processors-flink</artifactId>

diff --git a/...es-archetype-pe-processors-flink/src/main/resources/META-INF/maven/archetype-metadata.xml b/...es-archetype-pe-processors-flink/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -29,6 +29,19 @@
                 <include>deployment/docker-compose.yml</include>
             </includes>
         </fileSet>
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>**/*.en</include>
+                <include>**/*.md</include>
+            </includes>
+        </fileSet>
+        <!--<binaries>-->
+            <!--<directory>src/main/resources</directory>-->
+            <!--<includes>-->
+                <!--<include>**/*.png</include>-->
+            <!--</includes>-->
+        <!--</binaries>-->
         <fileSet filtered="true" packaged="false" encoding="UTF-8">
             <directory/>
             <includes>

diff --git a/.../streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml b/.../streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml
@@ -7,7 +7,7 @@
     <version>${version}</version>
 
     <properties>
-        <sp.version>0.62.0</sp.version>
+        <sp.version>0.63.0</sp.version>
     </properties>
 
     <dependencies>
@@ -80,6 +80,36 @@
             <groupId>org.streampipes</groupId>
             <artifactId>streampipes-config</artifactId>
             <version>${sp.version}</version>
+        </dependency>
+                <dependency>
+            <groupId>org.streampipes</groupId>
+            <artifactId>streampipes-dataformat-json</artifactId>
+            <version>${sp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.streampipes</groupId>
+            <artifactId>streampipes-dataformat-cbor</artifactId>
+            <version>${sp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.streampipes</groupId>
+            <artifactId>streampipes-dataformat-smile</artifactId>
+            <version>${sp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.streampipes</groupId>
+            <artifactId>streampipes-dataformat-fst</artifactId>
+            <version>${sp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.streampipes</groupId>
+            <artifactId>streampipes-messaging-jms</artifactId>
+            <version>${sp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.streampipes</groupId>
+            <artifactId>streampipes-messaging-kafka</artifactId>
+            <version>${sp.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/...e-pe-processors-flink/src/main/resources/archetype-resources/src/main/java/main/Init.java b/...e-pe-processors-flink/src/main/resources/archetype-resources/src/main/java/main/Init.java
@@ -9,12 +9,27 @@
 import ${package}.config.Config;
 import ${package}.pe.processor.${packageName}.${classNamePrefix}Controller;
 
+import org.streampipes.dataformat.cbor.CborDataFormatFactory;
+import org.streampipes.dataformat.fst.FstDataFormatFactory;
+import org.streampipes.dataformat.json.JsonDataFormatFactory;
+import org.streampipes.dataformat.smile.SmileDataFormatFactory;
+import org.streampipes.messaging.jms.SpJmsProtocolFactory;
+import org.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+
 public class Init extends StandaloneModelSubmitter {
 
   public static void main(String[] args) throws Exception {
     DeclarersSingleton.getInstance()
             .add(new ${classNamePrefix}Controller());
 
+    DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+            new CborDataFormatFactory(),
+            new SmileDataFormatFactory(),
+            new FstDataFormatFactory());
+
+    DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+            new SpJmsProtocolFactory());
+
     new Init().init(Config.INSTANCE);
 
   }

diff --git a/...e-resources/src/main/java/pe/processor/__packageName__/__classNamePrefix__Controller.java b/...e-resources/src/main/java/pe/processor/__packageName__/__classNamePrefix__Controller.java
@@ -16,6 +16,8 @@
 import org.streampipes.sdk.helpers.OutputStrategies;
 import org.streampipes.sdk.helpers.SupportedFormats;
 import org.streampipes.sdk.helpers.SupportedProtocols;
+import org.streampipes.sdk.helpers.*;
+import org.streampipes.sdk.utils.Assets;
 import org.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
 import org.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
 
@@ -26,8 +28,9 @@ public class ${classNamePrefix}Controller extends
 
 	@Override
 	public DataProcessorDescription declareModel() {
-		return ProcessingElementBuilder.create("${package}-${packageName}", "${classNamePrefix}",
-				"Description")
+		return ProcessingElementBuilder.create("${package}.pe.processor.${packageName}")
+        		.withAssets(Assets.DOCUMENTATION, Assets.ICON)
+						.withLocales(Locales.EN)
 						.category(DataProcessorType.ENRICH)
 						.requiredStream(StreamRequirementsBuilder
 							.create()
@@ -36,8 +39,7 @@ public DataProcessorDescription declareModel() {
 						.supportedFormats(SupportedFormats.jsonFormat())
 						.supportedProtocols(SupportedProtocols.kafka())
 						.outputStrategy(OutputStrategies.keep())
-						.requiredTextParameter(Labels.from(EXAMPLE_KEY, "Example Text Parameter", "Example " +
-				"Text Parameter Description"))
+						.requiredTextParameter(Labels.withId(EXAMPLE_KEY))
 						.build();
 	}
 

diff --git a/...es/src/main/resources/__package__.pe.processor.__packageName__/documentation.md b/...es/src/main/resources/__package__.pe.processor.__packageName__/documentation.md
@@ -0,0 +1,24 @@
+## ${classNamePrefix}
+
+<p align="center"> 
+    <img src="icon.png" width="150px;" class="pe-image-documentation"/>
+</p>
+
+***
+
+## Description
+
+Describe your new processor here!
+
+***
+
+## Required input
+What are the input requirements of your processor?
+
+***
+
+## Configuration
+What are the configurations a user has to provide
+
+## Output
+How do the events your processor emits look like.
diff --git a/...-resources/src/main/resources/__package__.pe.processor.__packageName__/icon.png b/...-resources/src/main/resources/__package__.pe.processor.__packageName__/icon.png
diff --git a/...rchetype-resources/src/main/resources/__package__.pe.processor.__packageName__/strings.en b/...rchetype-resources/src/main/resources/__package__.pe.processor.__packageName__/strings.en
@@ -0,0 +1,5 @@
+${package}.pe.processor.${packageName}.title=${classNamePrefix}
+${package}.pe.processor.${packageName}.description=Description of processor
+
+example-key.title=Example Text Parameter
+example-key.description=Example Text Parameter Description
diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.streampipes</groupId>
         <artifactId>streampipes-parent</artifactId>
-        <version>0.62.0</version>
+        <version>0.63.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>streampipes-archetype-pe-processors-jvm</artifactId>

diff --git a/...ipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml b/...ipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -29,6 +29,20 @@
                 <include>deployment/docker-compose.yml</include>
             </includes>
         </fileSet>
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+            <directory>src/main/resources</directory>
+            <includes>
+                <!--<include>**/*.png</include>-->
+                <include>**/*.en</include>
+                <include>**/*.md</include>
+            </includes>
+        </fileSet>
+        <!--<binaries filtered="true" packaged="false" >-->
+            <!--<outputDirectory>src/main/resources</outputDirectory>-->
+             <!--<includes>-->
+                <!--<include>**/icon.png</include>-->
+            <!--</includes>-->
+        <!--</binaries>-->
         <fileSet filtered="true" packaged="false" encoding="UTF-8">
             <directory/>
             <includes>

diff --git a/...es/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml b/...es/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml
@@ -7,7 +7,7 @@
     <version>${version}</version>
 
     <properties>
-        <sp.version>0.62.0</sp.version>
+        <sp.version>0.63.0</sp.version>
     </properties>
 
     <dependencies>
@@ -38,14 +38,29 @@
         </dependency>
         <dependency>
             <groupId>org.streampipes</groupId>
-            <artifactId>streampipes-messaging-kafka</artifactId>
+            <artifactId>streampipes-dataformat-cbor</artifactId>
+            <version>${sp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.streampipes</groupId>
+            <artifactId>streampipes-dataformat-smile</artifactId>
+            <version>${sp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.streampipes</groupId>
+            <artifactId>streampipes-dataformat-fst</artifactId>
             <version>${sp.version}</version>
         </dependency>
         <dependency>
             <groupId>org.streampipes</groupId>
             <artifactId>streampipes-messaging-jms</artifactId>
             <version>${sp.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.streampipes</groupId>
+            <artifactId>streampipes-messaging-kafka</artifactId>
+            <version>${sp.version}</version>
+        </dependency>
     </dependencies>
 
     <repositories>

diff --git a/...ype-pe-processors-jvm/src/main/resources/archetype-resources/src/main/java/main/Init.java b/...ype-pe-processors-jvm/src/main/resources/archetype-resources/src/main/java/main/Init.java
@@ -5,7 +5,11 @@
 
 import org.streampipes.container.init.DeclarersSingleton;
 import org.streampipes.container.standalone.init.StandaloneModelSubmitter;
+import org.streampipes.dataformat.cbor.CborDataFormatFactory;
+import org.streampipes.dataformat.fst.FstDataFormatFactory;
 import org.streampipes.dataformat.json.JsonDataFormatFactory;
+import org.streampipes.dataformat.smile.SmileDataFormatFactory;
+import org.streampipes.messaging.jms.SpJmsProtocolFactory;
 import org.streampipes.messaging.kafka.SpKafkaProtocolFactory;
 
 import ${package}.config.Config;
@@ -20,8 +24,13 @@ public static void main(String[] args) throws Exception {
     DeclarersSingleton.getInstance().setPort(Config.INSTANCE.getPort());
     DeclarersSingleton.getInstance().setHostName(Config.INSTANCE.getHost());
 
-    DeclarersSingleton.getInstance().registerDataFormat(new JsonDataFormatFactory());
-    DeclarersSingleton.getInstance().registerProtocol(new SpKafkaProtocolFactory());
+    DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
+            new CborDataFormatFactory(),
+            new SmileDataFormatFactory(),
+            new FstDataFormatFactory());
+
+    DeclarersSingleton.getInstance().registerProtocols(new SpKafkaProtocolFactory(),
+            new SpJmsProtocolFactory());
 
     new Init().init(Config.INSTANCE);
 

diff --git a/...e-resources/src/main/java/pe/processor/__packageName__/__classNamePrefix__Controller.java b/...e-resources/src/main/java/pe/processor/__packageName__/__classNamePrefix__Controller.java
@@ -14,6 +14,8 @@
 import org.streampipes.sdk.helpers.OutputStrategies;
 import org.streampipes.sdk.helpers.SupportedFormats;
 import org.streampipes.sdk.helpers.SupportedProtocols;
+import org.streampipes.sdk.helpers.*;
+import org.streampipes.sdk.utils.Assets;
 import org.streampipes.wrapper.standalone.ConfiguredEventProcessor;
 import org.streampipes.wrapper.standalone.declarer.StandaloneEventProcessingDeclarer;
 
@@ -23,17 +25,17 @@ public class ${classNamePrefix}Controller extends StandaloneEventProcessingDecla
 
 	@Override
 	public DataProcessorDescription declareModel() {
-		return ProcessingElementBuilder.create("${package}-${packageName}", "${classNamePrefix}",
-				"Description")
+		return ProcessingElementBuilder.create("${package}.pe.processor.${packageName}")
+						.withAssets(Assets.DOCUMENTATION, Assets.ICON)
+						.withLocales(Locales.EN)
 						.category(DataProcessorType.AGGREGATE)
 						.requiredStream(StreamRequirementsBuilder
 							.create()
 							.requiredProperty(EpRequirements.anyProperty())
 							.build())
 						.supportedFormats(SupportedFormats.jsonFormat())
 						.supportedProtocols(SupportedProtocols.kafka())
-						.requiredTextParameter(Labels.from(EXAMPLE_KEY, "Example Text Parameter", "Example " +
-				"Text Parameter Description"))
+						.requiredTextParameter(Labels.withId(EXAMPLE_KEY))
 						.outputStrategy(OutputStrategies.keep())
 						.build();
 	}

diff --git a/...es/src/main/resources/__package__.pe.processor.__packageName__/documentation.md b/...es/src/main/resources/__package__.pe.processor.__packageName__/documentation.md
@@ -0,0 +1,24 @@
+## ${classNamePrefix}
+
+<p align="center"> 
+    <img src="icon.png" width="150px;" class="pe-image-documentation"/>
+</p>
+
+***
+
+## Description
+
+Describe your new processor here!
+
+***
+
+## Required input
+What are the input requirements of your processor?
+
+***
+
+## Configuration
+What are the configurations a user has to provide
+
+## Output
+How do the events your processor emits look like.
diff --git a/...-resources/src/main/resources/__package__.pe.processor.__packageName__/icon.png b/...-resources/src/main/resources/__package__.pe.processor.__packageName__/icon.png