Merge pull request #11 from IBMStreams/master

Pull latest from main
conglisc · Nov 5, 2015 · 7b112ab · 7b112ab
2 parents 460d5d0 + dc3c612
commit 7b112ab
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 33 deletions.
diff --git a/build.xml b/build.xml
@@ -121,16 +121,16 @@
 	</target>
 
 	<!-- Targets to build releases -->
-	<target name="release" depends="clean, all, spldoc, toolkitIndexOnly">		
-		<mkdir dir="${tmp}" />
-		<property name="releasefilename" value="${tmp}/streamsx.messaging.toolkits-${tkinfo.info:identity.info:version}-${DSTAMP}-${TSTAMP}.tgz" />
-		<tar compression="gzip" longfile="gnu"
-             destfile="${releasefilename}"
-    	     basedir="${basedir}"
-             includes="${tkinfo.info:identity.info:name}/** samples/**"
-             excludes="**/.gitignore **/.settings/** **/.settings **/.project **/.classpath"
-    	/>		
-		<checksum file="${releasefilename}" />
-		<checksum algorithm="sha1" file="${releasefilename}" />
-	</target>
+		<target name="release" depends="clean, all, spldoc, toolkitIndexOnly">		
+			<mkdir dir="${tmp}" />
+			<property name="releasefilename" value="${tmp}/streamsx.messaging.toolkits-${tkinfo.info:identity.info:version}-${DSTAMP}-${TSTAMP}.tgz" />
+			<tar compression="gzip" longfile="gnu"
+	             destfile="${releasefilename}"
+	    	     basedir="${basedir}"
+	             includes="${tkinfo.info:identity.info:name}/** samples/** samples/**/.settings/**"
+	             excludes="**/.gitignore **/.project **/.classpath ${tkinfo.info:identity.info:name}/.settings/**"
+	    	/>		
+			<checksum file="${releasefilename}" />
+			<checksum algorithm="sha1" file="${releasefilename}" />
+		</target>
 </project>
diff --git a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/kafka/KafkaBaseOper.java b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/kafka/KafkaBaseOper.java
@@ -114,7 +114,7 @@ public String getPropertiesFile() {
 		return propertiesFile;
 	}
 
-	@Parameter(optional = true, description = "Name of the attribute for the message. This attribute is required. Default is \\\"message\\\".")
+	@Parameter(optional = true, description = "Name of the attribute for the message. If this parameter is not specified, then by default the operator will look for an attribute named \\\"message\\\". If the \\\"message\\\" attribute is not found, messages will not be sent. Default is \\\"message\\\".")
 	public void setMessageAttribute(String value) {
 		messageAH.setName(value);
 	}

diff --git a/...reamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/kafka/SimpleConsumerClient.java b/...reamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/kafka/SimpleConsumerClient.java
@@ -58,7 +58,6 @@ public class SimpleConsumerClient implements StateHandler {
 	private int fetchSize;
 	private String clientName;
 	protected Properties finalProperties = new Properties();
-	private String charSet = "UTF-8";
 	private AttributeHelper topicAH = null, keyAH = null, messageAH = null;
 	private int leaderConnectionRetries = 3;
 	private int connectionRetryInterval = 1000;

diff --git a/samples/JMSSample/info.xml b/samples/JMSSample/info.xml
@@ -13,7 +13,7 @@ others. All Rights Reserved.
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.messaging</common:name>
-      <common:version>[2.0.0,3.0.0)</common:version>
+      <common:version>[2.0.0,4.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>
diff --git a/samples/JmsWithXmlParse/info.xml b/samples/JmsWithXmlParse/info.xml
@@ -9,7 +9,7 @@
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.messaging</common:name>
-      <common:version>[2.0.0,3.0.0)</common:version>
+      <common:version>[2.0.0,4.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>
diff --git a/samples/JmsWithXmlParseBytes/info.xml b/samples/JmsWithXmlParseBytes/info.xml
@@ -9,7 +9,7 @@
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.messaging</common:name>
-      <common:version>[2.0.0,3.0.0)</common:version>
+      <common:version>[2.0.0,4.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>
diff --git a/samples/KafkaConsistentRegionConsumerParallel/Makefile b/samples/KafkaConsistentRegionConsumerParallel/Makefile
@@ -3,11 +3,7 @@
 
 .PHONY: all clean 
 
-TOOLKIT_NAME=com.ibm.streamsx.messaging
-STREAMS_MESSAGING_TOOLKIT ?= $(shell  ([ -e ../../$(TOOLKIT_NAME)/toolkit.xml ] && echo ../../$(TOOLKIT_NAME)) ||\
-						          echo $(STREAMS_STUDIO_SPL_PATH) ||\
-						          ([ -e "../$(TOOLKIT_NAME)" ] && echo ../$(TOOLKIT_NAME)) ||\
-									echo $(STREAMS_INSTALL)/toolkits/$(TOOLKIT_NAME))
+STREAMS_MESSAGING_TOOLKIT ?= ../../com.ibm.streamsx.messaging:${STREAMS_INSTALL}/toolkits/com.ibm.streamsx.messaging
 
 
 SPLC_FLAGS ?= -a --data-directory data 

diff --git a/samples/KafkaConsistentRegionConsumerSimple/Makefile b/samples/KafkaConsistentRegionConsumerSimple/Makefile
@@ -3,11 +3,7 @@
 
 .PHONY: all clean 
 
-TOOLKIT_NAME=com.ibm.streamsx.messaging
-STREAMS_MESSAGING_TOOLKIT ?= $(shell  ([ -e ../../$(TOOLKIT_NAME)/toolkit.xml ] && echo ../../$(TOOLKIT_NAME)) ||\
-						          echo $(STREAMS_STUDIO_SPL_PATH) ||\
-						          ([ -e "../$(TOOLKIT_NAME)" ] && echo ../$(TOOLKIT_NAME)) ||\
-									echo $(STREAMS_INSTALL)/toolkits/$(TOOLKIT_NAME))
+STREAMS_MESSAGING_TOOLKIT ?= ../../com.ibm.streamsx.messaging:${STREAMS_INSTALL}/toolkits/com.ibm.streamsx.messaging
 
 
 SPLC_FLAGS ?= -a --data-directory data 

diff --git a/samples/KafkaParallelConsumers/Makefile b/samples/KafkaParallelConsumers/Makefile
@@ -3,11 +3,7 @@
 
 .PHONY: all clean 
 
-TOOLKIT_NAME=com.ibm.streamsx.messaging
-STREAMS_MESSAGING_TOOLKIT ?= $(shell  ([ -e ../../$(TOOLKIT_NAME)/toolkit.xml ] && echo ../../$(TOOLKIT_NAME)) ||\
-						          echo $(STREAMS_STUDIO_SPL_PATH) ||\
-						          ([ -e "../$(TOOLKIT_NAME)" ] && echo ../$(TOOLKIT_NAME)) ||\
-									echo $(STREAMS_INSTALL)/toolkits/$(TOOLKIT_NAME))
+STREAMS_MESSAGING_TOOLKIT ?= ../../com.ibm.streamsx.messaging:${STREAMS_INSTALL}/toolkits/com.ibm.streamsx.messaging
 
 
 SPLC_FLAGS ?= -a --data-directory data 

diff --git a/samples/MqttSample/info.xml b/samples/MqttSample/info.xml
@@ -9,7 +9,7 @@
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.messaging</common:name>
-      <common:version>[2.0.0,3.0.0)</common:version>
+      <common:version>[2.0.0,4.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>