cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ashaki...@apache.org
Subject [1/2] git commit: [CXF-5780]: JMS pubsub: support different parameters for clientID and durableSubscriptionName
Date Thu, 05 Jun 2014 14:08:46 GMT
Repository: cxf
Updated Branches:
  refs/heads/master e44fba741 -> 68c318678


[CXF-5780]: JMS pubsub: support different parameters for clientID and durableSubscriptionName


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

Branch: refs/heads/master
Commit: 710990c44b052554126495b78c9e3e741d711164
Parents: 2d0d606
Author: Andrei Shakirin <andrei.shakirin@gmail.com>
Authored: Thu Jun 5 16:08:03 2014 +0200
Committer: Andrei Shakirin <andrei.shakirin@gmail.com>
Committed: Thu Jun 5 16:08:03 2014 +0200

----------------------------------------------------------------------
 .../org/apache/cxf/transport/jms/JMSConfigFactory.java    |  4 ++--
 .../org/apache/cxf/transport/jms/JMSConfiguration.java    | 10 +++++-----
 .../java/org/apache/cxf/transport/jms/JMSFactory.java     |  4 ++--
 .../org/apache/cxf/transport/jms/uri/JMSEndpoint.java     | 10 ++++++++++
 4 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/710990c4/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java
index a4f0679..01de9ab 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java
@@ -74,8 +74,8 @@ public final class JMSConfigFactory {
         jmsConfig.setPubSubDomain(pubSubDomain);
 
         jmsConfig.setDurableSubscriptionName(endpoint.getDurableSubscriptionName());
-        // TODO We might need a separate config here
-        jmsConfig.setDurableSubscriptionClientId(endpoint.getDurableSubscriptionName());
+
+        jmsConfig.setClientID(endpoint.getClientID());
 
         jmsConfig.setReceiveTimeout(endpoint.getReceiveTimeout());
         jmsConfig.setTimeToLive(endpoint.getTimeToLive());

http://git-wip-us.apache.org/repos/asf/cxf/blob/710990c4/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 e1b51aa..4c895cb 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
@@ -58,7 +58,7 @@ public class JMSConfiguration {
 
     private volatile String messageSelector;
     private boolean subscriptionDurable;
-    private String durableSubscriptionClientId;
+    private String clientID;
     private String durableSubscriptionName;
 
     private String targetDestination;
@@ -354,12 +354,12 @@ public class JMSConfiguration {
         return factory;
     }
     
-    public String getDurableSubscriptionClientId() {
-        return durableSubscriptionClientId;
+    public String getClientID() {
+        return clientID;
     }
 
-    public void setDurableSubscriptionClientId(String durableSubscriptionClientId) {
-        this.durableSubscriptionClientId = durableSubscriptionClientId;
+    public void setClientID(String clientID) {
+        this.clientID = clientID;
     }
 
     public void setTargetService(String targetService) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/710990c4/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
index 4eaf083..8a4af81 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
@@ -102,8 +102,8 @@ public final class JMSFactory {
         Connection connection = username != null 
             ? cf.createConnection(username, jmsConfig.getPassword())
             : cf.createConnection();
-        if (jmsConfig.getDurableSubscriptionClientId() != null) {
-            connection.setClientID(jmsConfig.getDurableSubscriptionClientId());
+        if (jmsConfig.getClientID() != null) {
+            connection.setClientID(jmsConfig.getClientID());
         }
         return connection;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/710990c4/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
index ffd7e57..5c3f062 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
@@ -65,6 +65,7 @@ public class JMSEndpoint {
      */
     private String conduitIdSelectorPrefix;
     private DeliveryModeType deliveryMode;
+    private String clientID;
     private String durableSubscriptionName;
     private String jndiConnectionFactoryName = "ConnectionFactory";
     private String jndiInitialContextFactory;
@@ -347,6 +348,15 @@ public class JMSEndpoint {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getClientID() {
+        return clientID;
+    }
+
+    public void setClientID(String clientID) {
+        this.clientID = clientID;
+    }
+
     public String getDurableSubscriptionName() {
         return durableSubscriptionName;
     }


Mime
View raw message