Skip to content

Commit

Permalink
Merge pull request #355 from IBMStreams/develop
Browse files Browse the repository at this point in the history 
Merge latest changes
  • Loading branch information
@schubon
schubon authored Mar 22, 2019
2 parents dbca707 + dd32516 commit 7ddeead
Show file tree
Hide file tree
Showing 6 changed files with 414 additions and 28 deletions.
4 changes: 2 additions & 2 deletions com.ibm.streamsx.messaging/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<classpathentry kind="src" output="impl/java/bin" path="impl/java/src"/>
<classpathentry exported="true" kind="con" path="com.ibm.streams.java/com.ibm.streams.operator"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="opt/downloaded/kafka-clients-0.10.0.0.jar"/>
<classpathentry kind="lib" path="opt/downloaded/lz4-1.3.0.jar"/>
<classpathentry kind="lib" path="opt/downloaded/org.eclipse.paho.client.mqttv3-1.0.1.jar"/>
<classpathentry kind="lib" path="opt/downloaded/slf4j-api-1.7.21.jar"/>
<classpathentry kind="lib" path="opt/downloaded/geronimo-jms_1.1_spec-1.1.1.jar"/>
<classpathentry kind="lib" path="opt/downloaded/snappy-java-1.1.2.4.jar"/>
<classpathentry kind="lib" path="opt/downloaded/amqp-client-5.4.3.jar"/>
<classpathentry kind="lib" path="opt/downloaded/snappy-java-1.1.2.6.jar"/>
<classpathentry kind="lib" path="opt/downloaded/kafka-clients-0.10.2.2.jar"/>
<classpathentry kind="output" path="impl/java/bin"/>
</classpath>
102 changes: 101 additions & 1 deletion com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.jms/JMSSource/JMSSource.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,16 @@ The following types of exceptions can occur:
* The **connectionsDocument** parameter refers to an file that does not exist.
* The **connectionsDocument** parameter is not specified and the `connections.xml` file is not present in the default location.
* The **messageIDOutAttrName** parameter is specified but the attribute is not found in output schema or the type of attribute is not a rstring type.
* The **jmsDestinationOutAttrName** parameter is specified but the attribute is not found in output schema or the type of attribute is not a rstring type.
* The **jmsDeliveryModeOutAttrName** parameter is specified but the attribute is not found in output schema or the type of attribute is not a int32 type.
* The **jmsExpirationOutAttrName** parameter is specified but the attribute is not found in output schema or the type of attribute is not a int64 type.
* The **jmsPriorityOutAttrName** parameter is specified but the attribute is not found in output schema or the type of attribute is not a int32 type.
* The **jmsMessageIDOutAttrName** parameter is specified but the attribute is not found in output schema or the type of attribute is not a rstring type.
* The **jmsTimestampOutAttrName** parameter is specified but the attribute is not found in output schema or the type of attribute is not a int64 type.
* The **jmsCorrelationIDOutAttrName** parameter is specified but the attribute is not found in output schema or the type of attribute is not a rstring type.
* The **jmsReplyToOutAttrName** parameter is specified but the attribute is not found in output schema or the type of attribute is not a rstring type.
* The **jmsTypeOutAttrName** parameter is specified but the attribute is not found in output schema or the type of attribute is not a rstring type.
* The **jmsRedeliveredOutAttrName** parameter is specified but the attribute is not found in output schema or the type of attribute is not a boolean type.
* Run time errors that cause a message to be dropped and an error message to be logged.
* The `JMSSource` operator throws an exception and discards the message in the following cases.
The trace and log information for these exceptions is logged in the console logs
Expand Down Expand Up @@ -319,13 +329,103 @@ This parameter must be greater than zero and must be set if the JMSSource operat
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>messageIDOutAttrName</name>
<name>messageIDOutAttrName</name>
<description>
Output attribute on output data stream to assign message ID to, the specified attribute in output stream must be of type rstring.
</description>
<optional>true</optional>
<type>rstring</type>
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>jmsDestinationOutAttrName</name>
<description>
Output attribute on output data stream to assign JMSDestination to, the specified attribute in output stream must be of type rstring.
</description>
<optional>true</optional>
<type>rstring</type>
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>jmsDeliveryModeOutAttrName</name>
<description>
Output attribute on output data stream to assign JMSDeliveryMode to, the specified attribute in output stream must be of type int32.
</description>
<optional>true</optional>
<type>rstring</type>
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>jmsExpirationOutAttrName</name>
<description>
Output attribute on output data stream to assign JMSExpiration to, the specified attribute in output stream must be of type int64.
</description>
<optional>true</optional>
<type>rstring</type>
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>jmsPriorityOutAttrName</name>
<description>
Output attribute on output data stream to assign JMSPriority to, the specified attribute in output stream must be of type int32.
</description>
<optional>true</optional>
<type>rstring</type>
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>jmsMessageIDOutAttrName</name>
<description>
Output attribute on output data stream to assign JMSMessageID to, the specified attribute in output stream must be of type rstring.
</description>
<optional>true</optional>
<type>rstring</type>
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>jmsTimestampOutAttrName</name>
<description>
Output attribute on output data stream to assign JMSTimestamp to, the specified attribute in output stream must be of type int64.
</description>
<optional>true</optional>
<type>rstring</type>
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>jmsCorrelationIDOutAttrName</name>
<description>
Output attribute on output data stream to assign JMSCorrelationID to, the specified attribute in output stream must be of type rstring.
</description>
<optional>true</optional>
<type>rstring</type>
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>jmsReplyToOutAttrName</name>
<description>
Output attribute on output data stream to assign JMSReplyTo to, the specified attribute in output stream must be of type rstring.
</description>
<optional>true</optional>
<type>rstring</type>
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>jmsTypeOutAttrName</name>
<description>
Output attribute on output data stream to assign JMSType to, the specified attribute in output stream must be of type rstring.
</description>
<optional>true</optional>
<type>rstring</type>
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>jmsRedeliveredOutAttrName</name>
<description>
Output attribute on output data stream to assign JMSRedelivered to, the specified attribute in output stream must be of type boolean.
</description>
<optional>true</optional>
<type>rstring</type>
<cardinality>1</cardinality>
</parameter>
<parameter>
<name>appConfigName</name>
Expand Down
Loading

0 comments on commit 7ddeead

Please sign in to comment.