[1/5] cxf git commit: CXF-6199 Adding concurrentConsumers

2015-01-26 Thread cschneider 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 3c874549a - fbfc4b3cb


CXF-6199 Adding concurrentConsumers


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5ae70f42
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5ae70f42
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5ae70f42

Branch: refs/heads/3.0.x-fixes
Commit: 5ae70f42be238e5c4947d2cefc93dad1773ba0c8
Parents: 3c87454
Author: Christian Schneider ch...@die-schneider.net
Authored: Fri Jan 16 16:47:36 2015 +0100
Committer: Christian Schneider ch...@die-schneider.net
Committed: Mon Jan 26 10:41:18 2015 +0100

--
 .../cxf/transport/jms/JMSConfiguration.java |  9 +++
 .../cxf/transport/jms/JMSDestination.java   | 17 +++--
 .../cxf/transport/jms/uri/JMSEndpoint.java  | 14 
 .../util/AbstractMessageListenerContainer.java  | 22 ---
 .../jms/util/MessageListenerContainer.java  | 68 +---
 .../util/PollingMessageListenerContainer.java   | 42 
 .../cxf/transport/jms/uri/JMSEndpointTest.java  |  3 +-
 7 files changed, 67 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5ae70f42/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
index b4ec3f0..5dc0e31 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
@@ -54,6 +54,7 @@ public class JMSConfiguration {
 private boolean sessionTransacted;
 private boolean createSecurityContext = true;
 
+private int concurrentConsumers = 1;
 private int maxSuspendedContinuations = DEFAULT_VALUE;
 private int reconnectPercentOfMax = 70;
 
@@ -320,6 +321,14 @@ public class JMSConfiguration {
 public void setTransactionManager(Object transactionManager) {
 }
 
+public int getConcurrentConsumers() {
+return concurrentConsumers;
+}
+
+public void setConcurrentConsumers(int concurrentConsumers) {
+this.concurrentConsumers = concurrentConsumers;
+}
+
 public int getMaxSuspendedContinuations() {
 return maxSuspendedContinuations;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/5ae70f42/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
index e4127d3..9f0fcbc 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
@@ -48,10 +48,8 @@ import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.AbstractMultiplexDestination;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.jms.continuations.JMSContinuationProvider;
-import org.apache.cxf.transport.jms.util.AbstractMessageListenerContainer;
 import org.apache.cxf.transport.jms.util.JMSListenerContainer;
 import org.apache.cxf.transport.jms.util.JMSUtil;
-import org.apache.cxf.transport.jms.util.MessageListenerContainer;
 import org.apache.cxf.transport.jms.util.PollingMessageListenerContainer;
 import org.apache.cxf.transport.jms.util.ResourceCloser;
 
@@ -125,15 +123,18 @@ public class JMSDestination extends 
AbstractMultiplexDestination implements Mess
 connection = JMSFactory.createConnection(jmsConfig);
 connection.setExceptionListener(new ExceptionListener() {
 public void onException(JMSException exception) {
-LOG.log(Level.WARNING, Exception on JMS connection. 
Trying to reconnect, exception);
-restartConnection();
+if (!shutdown) {
+LOG.log(Level.WARNING, Exception on JMS connection. 
Trying to reconnect, exception);
+restartConnection();
+}
 }
 });
 session = connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
 Destination destination = jmsConfig.getTargetDestination(session);
-AbstractMessageListenerContainer container = 
jmsConfig.getTransactionManager() != null
-? new PollingMessageListenerContainer(connection, destination, 
this)
-: new

cxf git commit: CXF-6199 Adding concurrentConsumers

2015-01-16 Thread cschneider 
Repository: cxf
Updated Branches:
  refs/heads/master 88a658195 - 41f3f6beb


CXF-6199 Adding concurrentConsumers


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/41f3f6be
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/41f3f6be
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/41f3f6be

Branch: refs/heads/master
Commit: 41f3f6beb5b090ff72a9cf19b0b1d1d23986f5cd
Parents: 88a6581
Author: Christian Schneider ch...@die-schneider.net
Authored: Fri Jan 16 16:47:36 2015 +0100
Committer: Christian Schneider ch...@die-schneider.net
Committed: Fri Jan 16 16:47:53 2015 +0100

--
 .../cxf/transport/jms/JMSConfiguration.java |  9 +++
 .../cxf/transport/jms/JMSDestination.java   | 17 +++--
 .../cxf/transport/jms/uri/JMSEndpoint.java  | 14 
 .../util/AbstractMessageListenerContainer.java  | 22 ---
 .../jms/util/MessageListenerContainer.java  | 68 +---
 .../util/PollingMessageListenerContainer.java   | 42 
 .../cxf/transport/jms/uri/JMSEndpointTest.java  |  3 +-
 7 files changed, 67 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/41f3f6be/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
index b4ec3f0..5dc0e31 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
@@ -54,6 +54,7 @@ public class JMSConfiguration {
 private boolean sessionTransacted;
 private boolean createSecurityContext = true;
 
+private int concurrentConsumers = 1;
 private int maxSuspendedContinuations = DEFAULT_VALUE;
 private int reconnectPercentOfMax = 70;
 
@@ -320,6 +321,14 @@ public class JMSConfiguration {
 public void setTransactionManager(Object transactionManager) {
 }
 
+public int getConcurrentConsumers() {
+return concurrentConsumers;
+}
+
+public void setConcurrentConsumers(int concurrentConsumers) {
+this.concurrentConsumers = concurrentConsumers;
+}
+
 public int getMaxSuspendedContinuations() {
 return maxSuspendedContinuations;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/41f3f6be/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
index e4127d3..9f0fcbc 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
@@ -48,10 +48,8 @@ import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.AbstractMultiplexDestination;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.jms.continuations.JMSContinuationProvider;
-import org.apache.cxf.transport.jms.util.AbstractMessageListenerContainer;
 import org.apache.cxf.transport.jms.util.JMSListenerContainer;
 import org.apache.cxf.transport.jms.util.JMSUtil;
-import org.apache.cxf.transport.jms.util.MessageListenerContainer;
 import org.apache.cxf.transport.jms.util.PollingMessageListenerContainer;
 import org.apache.cxf.transport.jms.util.ResourceCloser;
 
@@ -125,15 +123,18 @@ public class JMSDestination extends 
AbstractMultiplexDestination implements Mess
 connection = JMSFactory.createConnection(jmsConfig);
 connection.setExceptionListener(new ExceptionListener() {
 public void onException(JMSException exception) {
-LOG.log(Level.WARNING, Exception on JMS connection. 
Trying to reconnect, exception);
-restartConnection();
+if (!shutdown) {
+LOG.log(Level.WARNING, Exception on JMS connection. 
Trying to reconnect, exception);
+restartConnection();
+}
 }
 });
 session = connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
 Destination destination = jmsConfig.getTargetDestination(session);
-AbstractMessageListenerContainer container = 
jmsConfig.getTransactionManager() != null
-? new PollingMessageListenerContainer(connection, destination, 
this)
-: new MessageListenerContainer(connection,