Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull latest from main #11

Merged
merged 4 commits into from
Nov 5, 2015
Merged

Pull latest from main #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef2179b
Merge pull request #132 from conglisc/master
conglisc Oct 15, 2015
4b36080
Update Makefiles to match other Messaging Toolkit samples.
Alex-Cook4 Oct 15, 2015
39958e1
Updating docs on messageAttribute, Makefile unused name removed.
Alex-Cook4 Oct 16, 2015
dc3c612
Merge pull request #133 from Alex-Cook4/master
conglisc Oct 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/kafka/KafkaBaseOper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 0 additions & 1 deletion ...reamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/kafka/SimpleConsumerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion samples/JMSSample/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion samples/JmsWithXmlParse/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion samples/JmsWithXmlParseBytes/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 1 addition & 5 deletions samples/KafkaConsistentRegionConsumerParallel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions samples/KafkaConsistentRegionConsumerSimple/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions samples/KafkaParallelConsumers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion samples/MqttSample/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>