Merge branch 'develop' of github.com:IBMStreams/streamsx.messagehub into develop

RolefH · RolefH · commit 4fb22438a175 · 2020-02-28T08:27:18.000+01:00
diff --git a/samples/AppConfigSample/.gitignore b/samples/AppConfigSample/.gitignore
@@ -2,3 +2,4 @@
 /.apt_generated/
 /output/
 /.toolkitList
+toolkit.xml
diff --git a/samples/AppConfigSample/com.ibm.streamsx.messagehub.sample/AppConfigSample.spl b/samples/AppConfigSample/com.ibm.streamsx.messagehub.sample/AppConfigSample.spl
@@ -4,7 +4,7 @@ use com.ibm.streamsx.messagehub::MessageHubProducer ;
 use com.ibm.streamsx.messagehub::MessageHubConsumer ;
 use com.ibm.streamsx.messagehub::MessageType;
 
-composite AppConfigSample
+public composite AppConfigSample
 {
     graph
         (stream<MessageType.StringMessage> Beacon_1_out0) as Beacon_1 = Beacon()
diff --git a/samples/AppConfigSample/toolkit.xml b/samples/AppConfigSample/toolkit.xml
diff --git a/samples/ConsumerGroupInputPortSample/com.ibm.streamsx.messagehub.sample/KafkaConsumerGroupInputPortSample.spl b/samples/ConsumerGroupInputPortSample/com.ibm.streamsx.messagehub.sample/KafkaConsumerGroupInputPortSample.spl
@@ -2,7 +2,7 @@ namespace com.ibm.streamsx.messagehub.sample ;
 
 use com.ibm.streamsx.messagehub::* ;
 
-composite ConsumerGroupInputPortSample {
+public composite ConsumerGroupInputPortSample {
 
     graph
         // ================ producers that continuously populate the topics t1 and t2
diff --git a/samples/ConsumerGroupWithConsistentRegion/.gitignore b/samples/ConsumerGroupWithConsistentRegion/.gitignore
@@ -2,3 +2,4 @@
 /.apt_generated/
 /output/
 /.toolkitList
+toolkit.xml
diff --git a/samples/ConsumerGroupWithConsistentRegion/com.ibm.streamsx.messagehub.sample/ConsumerGroupWithConsistentRegion.spl b/samples/ConsumerGroupWithConsistentRegion/com.ibm.streamsx.messagehub.sample/ConsumerGroupWithConsistentRegion.spl
@@ -7,7 +7,7 @@ use com.ibm.streamsx.messagehub::MessageHubProducer ;
  * This sample is a Consistent Region sample that demonstrates the use of multiple consumers in a consumer group.
  * You can kill any of the PEs in the graph that produces Kafka messages. The result file should always be the same.
  */
-composite ConsumerGroupWithConsistentRegion {
+public composite ConsumerGroupWithConsistentRegion {
     param
         // settings for the consumer group
         expression <int32> $nConsumers: 3;   // number of consumers in the consumer group; can be different than number of partitions
@@ -75,6 +75,6 @@ composite ConsumerGroupWithConsistentRegion {
 //                keyAttribute: key;            // 'key' is default value
 //                messageAttribute: message;    // 'message' is default value
                 partitionAttribute: targetPartition;
-                messageHubCredentialsFile: "etc/eventstreams.json";
+                credentialsFile: "etc/eventstreams.json";
         }
 }
diff --git a/samples/ConsumerGroupWithConsistentRegion/toolkit.xml b/samples/ConsumerGroupWithConsistentRegion/toolkit.xml
diff --git a/samples/ConsumerInputPortSample/.gitignore b/samples/ConsumerInputPortSample/.gitignore
@@ -2,4 +2,4 @@
 /.apt_generated/
 /output/
 /.toolkitList
-
+toolkit.xml
diff --git a/samples/ConsumerInputPortSample/com.ibm.streamsx.messagehub.sample/ConsumerInputPortSample.spl b/samples/ConsumerInputPortSample/com.ibm.streamsx.messagehub.sample/ConsumerInputPortSample.spl
@@ -2,7 +2,7 @@ namespace com.ibm.streamsx.messagehub.sample ;
 
 use com.ibm.streamsx.messagehub::* ;
 
-composite ConsumerInputPortSample
+public composite ConsumerInputPortSample
 {
     graph
         (stream<rstring jsonString> TopicPartitionUpdateStream) as TopicPartitionUpdater = Custom() {
diff --git a/samples/ConsumerInputPortSample/toolkit.xml b/samples/ConsumerInputPortSample/toolkit.xml
diff --git a/samples/CredentialsFileSample/.gitignore b/samples/CredentialsFileSample/.gitignore
@@ -2,4 +2,5 @@
 /.apt_generated/
 /output/
 /.toolkitList
+toolkit.xml
 
diff --git a/samples/CredentialsFileSample/com.ibm.streamsx.messagehub.sample/CredentialsFileSample.spl b/samples/CredentialsFileSample/com.ibm.streamsx.messagehub.sample/CredentialsFileSample.spl
@@ -4,7 +4,7 @@ use com.ibm.streamsx.messagehub::MessageHubProducer ;
 use com.ibm.streamsx.messagehub::MessageHubConsumer ;
 use com.ibm.streamsx.messagehub::MessageType;
 
-composite CredentialsFileSample {
+public composite CredentialsFileSample {
     graph
         (stream<MessageType.StringMessage> Beacon_1_out0) as Beacon_1 = Beacon()
         {
diff --git a/samples/CredentialsFileSample/toolkit.xml b/samples/CredentialsFileSample/toolkit.xml
diff --git a/samples/CredentialsParamSample/.gitignore b/samples/CredentialsParamSample/.gitignore
@@ -2,4 +2,4 @@
 /.apt_generated/
 /output/
 /.toolkitList
-
+toolkit.xml
diff --git a/samples/CredentialsParamSample/com.ibm.streamsx.messagehub.sample/CredentialsParamSample.spl b/samples/CredentialsParamSample/com.ibm.streamsx.messagehub.sample/CredentialsParamSample.spl
@@ -4,7 +4,7 @@ use com.ibm.streamsx.messagehub::MessageHubProducer ;
 use com.ibm.streamsx.messagehub::MessageHubConsumer ;
 use com.ibm.streamsx.messagehub::MessageType;
 
-composite CredentialsParamSample {
+public composite CredentialsParamSample {
     graph
         (stream<MessageType.StringMessage> Beacon_1_out0) as Beacon_1 = Beacon() {
             param
diff --git a/samples/CredentialsParamSample/toolkit.xml b/samples/CredentialsParamSample/toolkit.xml
diff --git a/samples/Makefile b/samples/Makefile
@@ -0,0 +1,12 @@
+.PHONY: all clean
+
+all: 
+	for dir in $(shell ls -d -1 */); do\
+		make -C $$dir || exit 1; \
+	done
+
+clean:
+	for dir in $(shell ls -d -1 */); do\
+		make -C $$dir clean || exit 1; \
+	done
+

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ use com.ibm.streamsx.messagehub::MessageHubProducer ;`
`4`	`4`	`use com.ibm.streamsx.messagehub::MessageHubConsumer ;`
`5`	`5`	`use com.ibm.streamsx.messagehub::MessageType;`
`6`	`6`
`7`		`-composite AppConfigSample`
	`7`	`+public composite AppConfigSample`
`8`	`8`	`{`
`9`	`9`	`graph`
`10`	`10`	`(stream<MessageType.StringMessage> Beacon_1_out0) as Beacon_1 = Beacon()`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ namespace com.ibm.streamsx.messagehub.sample ;`
`2`	`2`
`3`	`3`	`use com.ibm.streamsx.messagehub::* ;`
`4`	`4`
`5`		`-composite ConsumerInputPortSample`
	`5`	`+public composite ConsumerInputPortSample`
`6`	`6`	`{`
`7`	`7`	`graph`
`8`	`8`	`(stream<rstring jsonString> TopicPartitionUpdateStream) as TopicPartitionUpdater = Custom() {`