From 6a5ee853bd30203a7c60a9c13c7513f04f558e39 Mon Sep 17 00:00:00 2001 From: chanskw Date: Fri, 12 Sep 2014 17:24:25 -0400 Subject: [PATCH 01/14] Set root of relative path as application directory for these parameters: connecitonDocument, trustStore, keyStore --- .../messaging/mqtt/AbstractMqttOperator.java | 30 +++++++++---------- .../messaging/mqtt/SPLDocConstants.java | 8 ++++- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/AbstractMqttOperator.java b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/AbstractMqttOperator.java index 75b72ee..85b3ef9 100644 --- a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/AbstractMqttOperator.java +++ b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/AbstractMqttOperator.java @@ -86,7 +86,7 @@ public String getConnection() { return connection; } - @Parameter(name = PARAMNAME_CONNECTION, description = "Name of the connection specification of the MQTT element in the connection document.", optional = true) + @Parameter(name = PARAMNAME_CONNECTION, description = SPLDocConstants.PARAM_CONNECTION_DESC, optional = true) public void setConnection(String connection) { this.connection = connection; } @@ -95,7 +95,7 @@ public String getConnectionDocument() { return connectionDocument; } - @Parameter(name = PARAMNAME_CONNDOC, description = "Path to connection document. If unspecified, default to ../etc/connections.xml", optional = true) + @Parameter(name = PARAMNAME_CONNDOC, description = SPLDocConstants.PARAM_CONNDOC_DESC, optional = true) public void setConnectionDocument(String connectionDocument) { this.connectionDocument = connectionDocument; } @@ -115,18 +115,18 @@ protected void initFromConnectionDocument() throws Exception { // if connection document is not specified, default to // ../etc/connections.xml if (connDoc == null) { - File dataDirectory = getOperatorContext().getPE() - .getDataDirectory(); - connDoc = dataDirectory.getAbsolutePath() - + "/../etc/connections.xml"; //$NON-NLS-1$ + File appDir = getOperatorContext().getPE() + .getApplicationDirectory(); + connDoc = appDir.getAbsolutePath() + + "/etc/connections.xml"; //$NON-NLS-1$ } // convert from relative path to absolute path is necessary if (!connDoc.startsWith("/")) //$NON-NLS-1$ { - File dataDirectory = getOperatorContext().getPE() - .getDataDirectory(); - connDoc = dataDirectory.getAbsolutePath() + "/" + connDoc; //$NON-NLS-1$ + File appDir = getOperatorContext().getPE() + .getApplicationDirectory(); + connDoc = appDir.getAbsolutePath() + "/" + connDoc; //$NON-NLS-1$ } try { @@ -211,7 +211,7 @@ public String getTrustStore() { return toAbsolute(trustStore); } - @Parameter(name = PARAMNAME_TRUST_STORE, optional = true, description = "The parameter of type rstring specifies the name of the file that contains the public certificate of the trusted MQTT server") + @Parameter(name = PARAMNAME_TRUST_STORE, optional = true, description = SPLDocConstants.PARAM_TRUSTORE_DESC) public void setTrustStore(String trustStore) { this.trustStore = trustStore; } @@ -220,7 +220,7 @@ public String getKeyStore() { return toAbsolute(keyStore); } - @Parameter(name = PARAMNAME_KEY_STORE, optional = true, description = "This optional parameter of type rstring specifies the file that contains the public and private key certificates of the MQTT client.") + @Parameter(name = PARAMNAME_KEY_STORE, optional = true, description = SPLDocConstants.PARAM_KEYSTORE_DESC) public void setKeyStore(String keyStore) { this.keyStore = keyStore; } @@ -229,7 +229,7 @@ public String getKeyStorePassword() { return keyStorePassword; } - @Parameter(name = PARAMNAME_KEY_STORE_PASSWORD, optional = true, description = "This optional parameter of type rstring specifies keystore password.") + @Parameter(name = PARAMNAME_KEY_STORE_PASSWORD, optional = true, description = SPLDocConstants.PARAM_KEYSTORE_PW_DESC) public void setKeyStorePassword(String keyStorePassword) { this.keyStorePassword = keyStorePassword; } @@ -238,7 +238,7 @@ public String getTrustStorePassword() { return trustStorePassword; } - @Parameter(name = PARAMNAME_TRUST_STORE_PASSWORD, optional = true, description = "This optional parameter of type rstring specifies the truststore password.") + @Parameter(name = PARAMNAME_TRUST_STORE_PASSWORD, optional = true, description = SPLDocConstants.PARAM_TRUSTORE_PW_DESC) public void setTrustStorePassword(String trustStorePassword) { this.trustStorePassword = trustStorePassword; } @@ -295,8 +295,8 @@ protected static void validateSchemaForErrorOutputPort( protected String toAbsolute(String path) { if (path != null && !path.startsWith("/")) //$NON-NLS-1$ { - File dataDir = getOperatorContext().getPE().getDataDirectory(); - return dataDir.getAbsolutePath() + "/" + path; //$NON-NLS-1$ + File appDir = getOperatorContext().getPE().getApplicationDirectory(); + return appDir.getAbsolutePath() + "/" + path; //$NON-NLS-1$ } return path; } diff --git a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/SPLDocConstants.java b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/SPLDocConstants.java index 700f2f5..340d398 100644 --- a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/SPLDocConstants.java +++ b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/SPLDocConstants.java @@ -42,6 +42,12 @@ public class SPLDocConstants { public static final String MQTTSINK_INPUTPORT1 = "Optional input ports"; - public static final String MQTTSINK_INPUTPORT0 = "Port that ingests tuples."; + public static final String MQTTSINK_INPUTPORT0 = "Port that ingests tuples."; + public static final String PARAM_CONNECTION_DESC = "Name of the connection specification of the MQTT element in the connection document."; + public static final String PARAM_CONNDOC_DESC = "Path to connection document. If unspecified, default to applicationDir/etc/connections.xml. If a relative path is specified, the path is relative to the application directory."; + public static final String PARAM_TRUSTORE_PW_DESC = "This optional parameter of type rstring specifies the truststore password."; + public static final String PARAM_KEYSTORE_PW_DESC = "This optional parameter of type rstring specifies keystore password."; + public static final String PARAM_KEYSTORE_DESC = "This optional parameter of type rstring specifies the file that contains the public and private key certificates of the MQTT client. If a relative path is specified, the path is relative to the application directory."; + public static final String PARAM_TRUSTORE_DESC = "The parameter of type rstring specifies the name of the file that contains the public certificate of the trusted MQTT server. If a relative path is specified, the path is relative to the application directory."; } From f815c46f524ac8e231cbc8f89b82949beaaa6cd1 Mon Sep 17 00:00:00 2001 From: chanskw Date: Tue, 16 Sep 2014 10:55:13 -0400 Subject: [PATCH 02/14] - externalized docs for MQTT parameters - application bundle support for JMSSink and JMSSource operators --- .../ibm/streamsx/messaging/jms/JMSSink.java | 22 +++++++++++++++--- .../ibm/streamsx/messaging/jms/JMSSource.java | 23 ++++++++++++++++--- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSink.java b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSink.java index 3e37736..9412513 100644 --- a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSink.java +++ b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSink.java @@ -5,6 +5,7 @@ package com.ibm.streamsx.messaging.jms; +import java.io.File; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.logging.Logger; @@ -114,7 +115,7 @@ public void setnReconnectionAttempts(Metric nReconnectionAttempts) { // If present, it must have exactly one value that is a String constant. // If the parameter is absent, the operator will use the default location // filepath ../etc/connections.xml (with respect to the data directory) - private String connectionDocument = "../etc/connections.xml"; + private String connectionDocument = null; // This optional parameter reconnectionBound specifies the number of // successive connections that // will be attempted for this operator. @@ -184,10 +185,25 @@ public void setPeriod(double period) { } // Optional parameter connectionDocument - @Parameter(optional = true) + @Parameter(optional = true, description="Connection document containing connection information to connect to messaging servers. If not specified, the connection document is assumed to be application_dir/etc/connections.xml.") public void setConnectionDocument(String connectionDocument) { this.connectionDocument = connectionDocument; } + + public String getConnectionDocument() { + + if (connectionDocument == null) + { + connectionDocument = getOperatorContext().getPE().getApplicationDirectory() + "/etc/connections.xml"; + } + + if (!connectionDocument.startsWith("/")) + { + connectionDocument = getOperatorContext().getPE().getApplicationDirectory() + File.separator + connectionDocument; + } + + return connectionDocument; + } // Add the context checks @@ -320,7 +336,7 @@ public synchronized void initialize(OperatorContext context) ConnectionDocumentParser connectionDocumentParser = new ConnectionDocumentParser(); connectionDocumentParser.parseAndValidateConnectionDocument( - connectionDocument, connection, access, streamSchema, true); + getConnectionDocument(), connection, access, streamSchema, true); // codepage parameter can come only if message class is bytes // Since the message class is extracted runtime during the parsing of diff --git a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSource.java b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSource.java index f8cced2..8b39f91 100644 --- a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSource.java +++ b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSource.java @@ -4,6 +4,7 @@ *******************************************************************************/ package com.ibm.streamsx.messaging.jms; +import java.io.File; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.logging.Logger; @@ -116,7 +117,7 @@ public void setnReconnectionAttempts(Metric nReconnectionAttempts) { // If present, it must have exactly one value that is a String constant. // If the parameter is absent, the operator will use the default location // filepath ../etc/connections.xml (with respect to the data directory) - private String connectionDocument = "../etc/connections.xml"; + private String connectionDocument = null; // This optional parameter reconnectionBound specifies the number of // successive connections that // will be attempted for this operator. @@ -183,10 +184,26 @@ public void setPeriod(double period) { } // Optional parameter connectionDocument - @Parameter(optional = true) + @Parameter(optional = true, description="Connection document containing connection information to connect to messaging servers. If not specified, the connection document is assumed to be application_dir/etc/connections.xml.") public void setConnectionDocument(String connectionDocument) { this.connectionDocument = connectionDocument; } + + public String getConnectionDocument() { + + if (connectionDocument == null) + { + connectionDocument = getOperatorContext().getPE().getApplicationDirectory() + "/etc/connections.xml"; + } + + // if relative path, convert to absolute path + if (!connectionDocument.startsWith("/")) + { + connectionDocument = getOperatorContext().getPE().getApplicationDirectory() + File.separator + connectionDocument; + } + + return connectionDocument; + } // Add the context checks @@ -306,7 +323,7 @@ public synchronized void initialize(OperatorContext context) // the operator throws a runtime error and abort connectionDocumentParser.parseAndValidateConnectionDocument( - connectionDocument, connection, access, streamSchema, false); + getConnectionDocument(), connection, access, streamSchema, false); // codepage parameter can come only if message class is bytes From f6f207d08d503aa25acfc47427e0698b8c141ce2 Mon Sep 17 00:00:00 2001 From: chanskw Date: Thu, 18 Sep 2014 14:41:13 -0400 Subject: [PATCH 03/14] application bundle for XMS, added ability to resolve compile time expression for connection document --- .../Common/Edge.pm | 2 +- .../XMSSink/XMSSink.xml | 81 ++++++++++--------- .../XMSSource/XMSSource.xml | 60 +++++++------- 3 files changed, 73 insertions(+), 70 deletions(-) diff --git a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/Common/Edge.pm b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/Common/Edge.pm index bfcc848..899e0ef 100644 --- a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/Common/Edge.pm +++ b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/Common/Edge.pm @@ -34,7 +34,7 @@ sub connectionSetup { my $connDocName; my $connDocParam = $model->getParameterByName('connectionDocument'); if (defined $connDocParam) { - my $quotedConnDoc = $connDocParam->getValueAt(0)->getSPLExpression(); + my $quotedConnDoc = SPL::CodeGen::compileTimeExpression($model, $connDocParam->getValueAt(0)); @splitted = split(/"/, $quotedConnDoc); if (@splitted != 2) { SPL::CodeGen::exitln("Value of parameter \'connectionDocument\' has unexpected format: $quotedConnDoc"); diff --git a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSink/XMSSink.xml b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSink/XMSSink.xml index 5cdad0f..0e05b6b 100644 --- a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSink/XMSSink.xml +++ b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSink/XMSSink.xml @@ -1,4 +1,4 @@ - + - - - com.ibm.streamsx.messaging - + + + com.ibm.streamsx.messaging + The Messaging toolkit project is an open source IBM InfoSphere Streams toolkit project. It is focused on the development of operators and functions that help you use InfoSphere Streams to interact with messaging systems such as JMS, XMS, and MQTT. The operators provide the ability for InfoSphere Streams applications to send and receive data from a queue or topic that is posted on WebSphere MQ, Apache ActiveMQ or MQ Telemetry Transport (MQTT) server. @@ -27,13 +26,13 @@ The following figure shows how the JMSSource and JMSSink operators in the Messag The Messaging Toolkit operators must be configured to connect to messaging systems. This configuration information is specified in an XML document, called a connection specifications document. The connection specifications document is similar to but separate from the document that is used by the Database Toolkit. -0.8.0 -3.2.0 - - - - -en_US/MessagingResource.xlf - - - + 0.9.0 + 3.2.2 + + + + + en_US/MessagingResource.xlf + + + \ No newline at end of file From bda1650f868cf96c63e77b46d8ab4f63dab2852a Mon Sep 17 00:00:00 2001 From: chanskw Date: Fri, 24 Oct 2014 14:36:48 -0400 Subject: [PATCH 12/14] Updated version numbers and samples --- .../JMSSource/JMSSource.xml | 4 +-- com.ibm.streamsx.messaging/info.xml | 2 +- samples/JMSSink/info.xml | 4 +-- samples/JMSSource/info.xml | 4 +-- .../application/JmsWithXmlParse.spl | 2 +- samples/JmsWithXmlParse/info.xml | 27 +++++++++---------- .../application/JmsWithXmlParseBytes.spl | 2 +- samples/JmsWithXmlParseBytes/info.xml | 27 +++++++++---------- 8 files changed, 35 insertions(+), 37 deletions(-) diff --git a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.jms/JMSSource/JMSSource.xml b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.jms/JMSSource/JMSSource.xml index 34abc1a..7c5df30 100644 --- a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.jms/JMSSource/JMSSource.xml +++ b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.jms/JMSSource/JMSSource.xml @@ -53,7 +53,7 @@ The following example shows the use of multiple `JMSSource` operators with diffe composite Main { graph - // JMSSource operator with the default ../etc/connections.xml(relative to the data directory) + // JMSSource operator with the default etc/connections.xml(relative to the application directory) // connections document stream <int32 id, rstring fname, rstring lname> MyPersonNamesStream = JMSSource() @@ -220,7 +220,7 @@ This mandatory parameter identifies the name of the connection specification tha connectionDocument -This optional parameter specifies the path name of the file that contains the connection and access specifications, which are identified by the **connection** and **access** parameters. If this parameter is not specified, the operator uses the file that is in the default location `../etc/connections.xml`. +This optional parameter specifies the path name of the file that contains the connection and access specifications, which are identified by the **connection** and **access** parameters. If this parameter is not specified, the operator uses the file that is in the default location `./etc/connections.xml`. true rstring 1 diff --git a/com.ibm.streamsx.messaging/info.xml b/com.ibm.streamsx.messaging/info.xml index 56ed564..ad05e30 100644 --- a/com.ibm.streamsx.messaging/info.xml +++ b/com.ibm.streamsx.messaging/info.xml @@ -26,7 +26,7 @@ The following figure shows how the JMSSource and JMSSink operators in the Messag The Messaging Toolkit operators must be configured to connect to messaging systems. This configuration information is specified in an XML document, called a connection specifications document. The connection specifications document is similar to but separate from the document that is used by the Database Toolkit. - 0.9.0 + 2.0.0 3.2.2 diff --git a/samples/JMSSink/info.xml b/samples/JMSSink/info.xml index e4b3795..8ebf8b9 100644 --- a/samples/JMSSink/info.xml +++ b/samples/JMSSink/info.xml @@ -8,12 +8,12 @@ others. All Rights Reserved. JMSSinkMain Sample demonstrating JMSSink 1.0.0 - 3.1.0 + 3.2.2 com.ibm.streamsx.messaging - [0.7.0,2.0.0) + [0.7.0,2.0.0] \ No newline at end of file diff --git a/samples/JMSSource/info.xml b/samples/JMSSource/info.xml index 73b5b5c..27eaf8a 100644 --- a/samples/JMSSource/info.xml +++ b/samples/JMSSource/info.xml @@ -8,12 +8,12 @@ others. All Rights Reserved. JMSSourceMain Sample demonstrating JMSSource 1.0.0 - 3.1.0 + 3.2.2 com.ibm.streamsx.messaging - [0.7.0,2.0.0) + [0.7.0,2.0.0] \ No newline at end of file diff --git a/samples/JmsWithXmlParse/application/JmsWithXmlParse.spl b/samples/JmsWithXmlParse/application/JmsWithXmlParse.spl index 5081d7d..59ae69a 100644 --- a/samples/JmsWithXmlParse/application/JmsWithXmlParse.spl +++ b/samples/JmsWithXmlParse/application/JmsWithXmlParse.spl @@ -18,7 +18,7 @@ composite JmsWithXmlParse { param expression $connectionDoc : getSubmissionTimeValue("connectionDoc", - "../etc/connections.xml") ; + "./etc/connections.xml") ; expression $connection : getSubmissionTimeValue("connection", "conn") ; expression $access : getSubmissionTimeValue("access", diff --git a/samples/JmsWithXmlParse/info.xml b/samples/JmsWithXmlParse/info.xml index c4e5243..5362e91 100644 --- a/samples/JmsWithXmlParse/info.xml +++ b/samples/JmsWithXmlParse/info.xml @@ -1,16 +1,15 @@ - - - JmsWithXmlParse - - 1.0.0 - 3.2.1.0 - - - - com.ibm.streamsx.messaging - 0.7.0 - - + + + JmsWithXmlParse + + 1.0.0 + 3.2.2 + + + + com.ibm.streamsx.messaging + [0.7.0,2.0.0] + + \ No newline at end of file diff --git a/samples/JmsWithXmlParseBytes/application/JmsWithXmlParseBytes.spl b/samples/JmsWithXmlParseBytes/application/JmsWithXmlParseBytes.spl index cf2fcd8..242231c 100644 --- a/samples/JmsWithXmlParseBytes/application/JmsWithXmlParseBytes.spl +++ b/samples/JmsWithXmlParseBytes/application/JmsWithXmlParseBytes.spl @@ -10,7 +10,7 @@ use com.ibm.streamsx.messaging.jms::*; composite JmsWithXmlParseBytes { param expression $connectionDoc : getSubmissionTimeValue("connectionDoc", - "../etc/connections.xml") ; + "./etc/connections.xml") ; expression $connection : getSubmissionTimeValue("connection", "conn") ; expression $access : getSubmissionTimeValue("access", diff --git a/samples/JmsWithXmlParseBytes/info.xml b/samples/JmsWithXmlParseBytes/info.xml index 84d064f..75d6698 100644 --- a/samples/JmsWithXmlParseBytes/info.xml +++ b/samples/JmsWithXmlParseBytes/info.xml @@ -1,16 +1,15 @@ - - - JmsWithXmlParseBytes - - 1.0.0 - 3.2.1.0 - - - - com.ibm.streamsx.messaging - 0.7.0 - - + + + JmsWithXmlParseBytes + + 1.0.0 + 3.2.2 + + + + com.ibm.streamsx.messaging + [0.7.0,2.0.0] + + \ No newline at end of file From 81e2bb191d0e506075fe3a11837eaa7c7a5af206 Mon Sep 17 00:00:00 2001 From: chanskw Date: Fri, 24 Oct 2014 17:32:01 -0400 Subject: [PATCH 13/14] updated version and dependency for samples --- .../org.eclipse.m2e.core.maven2Builder.launch | 6 ----- samples/JMSSink/info.xml | 2 +- samples/JMSSource/info.xml | 2 +- samples/JmsWithXmlParse/info.xml | 2 +- samples/JmsWithXmlParseBytes/info.xml | 2 +- samples/KafkaConsumerSample/info.xml | 4 +-- samples/KafkaProducerSample/info.xml | 4 +-- samples/MqttSample/info.xml | 4 +-- samples/XMSSink/info.xml | 4 +-- ...ple.xms.XMSSourceMain-Distributed.splbuild | 25 +++++++++++++++++++ samples/XMSSource/info.xml | 4 +-- 11 files changed, 39 insertions(+), 20 deletions(-) delete mode 100644 com.ibm.streamsx.messaging/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch create mode 100644 samples/XMSSource/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSourceMain-Distributed.splbuild diff --git a/com.ibm.streamsx.messaging/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch b/com.ibm.streamsx.messaging/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch deleted file mode 100644 index 9c18354..0000000 --- a/com.ibm.streamsx.messaging/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/samples/JMSSink/info.xml b/samples/JMSSink/info.xml index 8ebf8b9..7fd068c 100644 --- a/samples/JMSSink/info.xml +++ b/samples/JMSSink/info.xml @@ -13,7 +13,7 @@ others. All Rights Reserved. com.ibm.streamsx.messaging - [0.7.0,2.0.0] + [0.7.0,3.0.0) \ No newline at end of file diff --git a/samples/JMSSource/info.xml b/samples/JMSSource/info.xml index 27eaf8a..70cb9a2 100644 --- a/samples/JMSSource/info.xml +++ b/samples/JMSSource/info.xml @@ -13,7 +13,7 @@ others. All Rights Reserved. com.ibm.streamsx.messaging - [0.7.0,2.0.0] + [0.7.0,3.0.0) \ No newline at end of file diff --git a/samples/JmsWithXmlParse/info.xml b/samples/JmsWithXmlParse/info.xml index 5362e91..f9644b8 100644 --- a/samples/JmsWithXmlParse/info.xml +++ b/samples/JmsWithXmlParse/info.xml @@ -9,7 +9,7 @@ com.ibm.streamsx.messaging - [0.7.0,2.0.0] + [0.7.0,3.0.0) \ No newline at end of file diff --git a/samples/JmsWithXmlParseBytes/info.xml b/samples/JmsWithXmlParseBytes/info.xml index 75d6698..1775eef 100644 --- a/samples/JmsWithXmlParseBytes/info.xml +++ b/samples/JmsWithXmlParseBytes/info.xml @@ -9,7 +9,7 @@ com.ibm.streamsx.messaging - [0.7.0,2.0.0] + [0.7.0,3.0.0) \ No newline at end of file diff --git a/samples/KafkaConsumerSample/info.xml b/samples/KafkaConsumerSample/info.xml index c15941b..b958253 100644 --- a/samples/KafkaConsumerSample/info.xml +++ b/samples/KafkaConsumerSample/info.xml @@ -4,12 +4,12 @@ KafkaConsumerSample Sample application showing a Streams Kafka Consumer 1.0.0 - 3.2.0 + 3.2.2 com.ibm.streamsx.messaging - [0.7.0,2.0.0) + [0.7.0,3.0.0) \ No newline at end of file diff --git a/samples/KafkaProducerSample/info.xml b/samples/KafkaProducerSample/info.xml index 813c875..d3439a1 100644 --- a/samples/KafkaProducerSample/info.xml +++ b/samples/KafkaProducerSample/info.xml @@ -4,12 +4,12 @@ KafkaProducerSample Sample application showing a Streams Kafka Producer 1.0.0 - 3.2.0 + 3.2.2 com.ibm.streamsx.messaging - [0.7.0,2.0.0) + [0.7.0,3.0.0) \ No newline at end of file diff --git a/samples/MqttSample/info.xml b/samples/MqttSample/info.xml index be3a2ae..5f4d3b6 100644 --- a/samples/MqttSample/info.xml +++ b/samples/MqttSample/info.xml @@ -4,12 +4,12 @@ MqttSample 1.0.0 - 3.2.1.0 + 3.2.2 com.ibm.streamsx.messaging - [0.7.0,2.0.0) + [0.7.0,3.0.0) \ No newline at end of file diff --git a/samples/XMSSink/info.xml b/samples/XMSSink/info.xml index 76b190a..320ad5b 100644 --- a/samples/XMSSink/info.xml +++ b/samples/XMSSink/info.xml @@ -8,12 +8,12 @@ others. All Rights Reserved. XMSSinkMain Sample demonstrating XMSSink 1.0.0 - 3.0.0 + 3.2.2 com.ibm.streamsx.messaging - [0.7.0,2.0.0) + [0.7.0,3.0.0) \ No newline at end of file diff --git a/samples/XMSSource/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSourceMain-Distributed.splbuild b/samples/XMSSource/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSourceMain-Distributed.splbuild new file mode 100644 index 0000000..06def2e --- /dev/null +++ b/samples/XMSSource/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSourceMain-Distributed.splbuild @@ -0,0 +1,25 @@ + + + +SPL Build Configuration: Distributed +F +F +FDEF +com.ibm.streamsx.messaging.sample.xms::XMSSourceMain +Distributed + + +T + + + + +F +T + +F + +Distributed + +F + \ No newline at end of file diff --git a/samples/XMSSource/info.xml b/samples/XMSSource/info.xml index 17df620..aa9e3e7 100644 --- a/samples/XMSSource/info.xml +++ b/samples/XMSSource/info.xml @@ -8,12 +8,12 @@ others. All Rights Reserved. XMSSourceMain Sample demonstrating XMSSource 1.0.0 - 3.0.0 + 3.2.2 com.ibm.streamsx.messaging - [0.7.0,2.0.0) + [0.7.0,3.0.0) \ No newline at end of file From 4404a1b6644d0151b8b57073f8e2dba5aeea748e Mon Sep 17 00:00:00 2001 From: chanskw Date: Fri, 24 Oct 2014 17:41:25 -0400 Subject: [PATCH 14/14] added copy image file option for spldoc --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index f312db9..4ef34d2 100644 --- a/build.xml +++ b/build.xml @@ -116,6 +116,7 @@ +