Merge pull request #349 from IBMStreams/develop

Merge latest changes to master
IBMStreams · Oct 23, 2018 · 045bb7d · 045bb7d
2 parents 2b08d0b + d5c0325
commit 045bb7d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/com.ibm.streamsx.messaging/.classpath b/com.ibm.streamsx.messaging/.classpath
@@ -3,15 +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/activemq-client-5.14.1.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/amqp-client-3.6.2.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/geronimo-j2ee-management_1.1_spec-1.0.1.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/geronimo-jms_1.1_spec-1.1.1.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/hawtbuf-1.11.jar"/>
 	<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="output" path="impl/java/bin"/>
 </classpath>
diff --git a/....streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSConnectionHelper.java b/....streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSConnectionHelper.java
@@ -387,10 +387,14 @@ private boolean connect(boolean isProducer) throws JMSException {
 
 		// Create connection.
 		if (userPrincipal != null && !userPrincipal.isEmpty() && 
-				userCredential != null && !userCredential.isEmpty() )
+				userCredential != null && !userCredential.isEmpty() ) {
+			tracer.log(TraceLevel.TRACE, "Create connection for user: " + userPrincipal); //$NON-NLS-1$
 			setConnect(connFactory.createConnection(userPrincipal, userCredential));
-		else
+		}
+		else {
+			tracer.log(TraceLevel.TRACE, "Create connection with empty credentials"); //$NON-NLS-1$
 			setConnect(connFactory.createConnection());
+		}
 		getConnect().setExceptionListener (this);
 
 		// Create session from connection; false means

diff --git a/...msx.messaging/impl/java/src/com/ibm/streamsx/messaging/rabbitmq/AutoRecoveryListener.java b/...msx.messaging/impl/java/src/com/ibm/streamsx/messaging/rabbitmq/AutoRecoveryListener.java
@@ -22,4 +22,9 @@ public void handleRecovery(Recoverable arg0) {
 		isConnected.setValue(1);
 	}
 
+	@Override
+	public void handleRecoveryStarted(Recoverable arg0) {
+		trace.log(TraceLevel.INFO, "Starting to recover RabbitMQ connection."); //$NON-NLS-1$
+	}
+
 }
diff --git a/...impl/java/src/com/ibm/streamsx/messaging/rabbitmq/RabbitMQConnectionExceptionHandler.java b/...impl/java/src/com/ibm/streamsx/messaging/rabbitmq/RabbitMQConnectionExceptionHandler.java
@@ -50,12 +50,6 @@ public void handleConsumerException(Channel arg0, Throwable arg1, Consumer arg2,
 		trace.log(TraceLevel.ERROR, Messages.getString("SEE_STDOUT_FOR_FULL_STACK_TRACE", arg1.getMessage())); //$NON-NLS-1$
 	}
 
-	@Override
-	public void handleFlowListenerException(Channel arg0, Throwable arg1) {
-		arg1.printStackTrace();
-		trace.log(TraceLevel.ERROR, Messages.getString("SEE_STDOUT_FOR_FULL_STACK_TRACE", arg1.getMessage())); //$NON-NLS-1$
-	}
-
 	@Override
 	public void handleReturnListenerException(Channel arg0, Throwable arg1) {
 		arg1.printStackTrace();

diff --git a/com.ibm.streamsx.messaging/info.xml b/com.ibm.streamsx.messaging/info.xml
@@ -684,7 +684,7 @@ The &lt;attribute> element has three possible attributes:
      * composite types
      * xml
 </info:description>
-    <info:version>5.3.10</info:version>
+    <info:version>5.3.11</info:version>
     <info:requiredProductVersion>4.2.0.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies/>

diff --git a/com.ibm.streamsx.messaging/pom.xml b/com.ibm.streamsx.messaging/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.ibm.streamsx.messaging</groupId>
     <artifactId>streamsx.messaging</artifactId>
     <packaging>jar</packaging>
-    <version>5.3.10</version>
+    <version>5.3.11</version>
     <name>com.ibm.streamsx.messaging</name>
     <repositories>
         <repository>
@@ -25,20 +25,20 @@
     <properties>
     </properties>
     <dependencies>
+    	<dependency>
+    		<groupId>org.apache.geronimo.specs</groupId>
+    		<artifactId>geronimo-jms_1.1_spec</artifactId>
+    		<version>1.1.1</version>
+    	</dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
             <version>0.10.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-client</artifactId>
-            <version>5.14.1</version>
-        </dependency>
         <dependency>
             <groupId>com.rabbitmq</groupId>
             <artifactId>amqp-client</artifactId>
-            <version>3.6.2</version>
+            <version>5.4.3</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.paho</groupId>