Repository: cxf Updated Branches: refs/heads/master 8d001611e -> 12d19ffe7
[CXF-5780]: clientID is renamed to durableSubscriptionClientId to keep compability with CXF 2.X.X Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/12d19ffe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/12d19ffe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/12d19ffe Branch: refs/heads/master Commit: 12d19ffe7af4b18472aa571c5bb9531c8a68e9b0 Parents: 8d00161 Author: Andrei Shakirin <[email protected]> Authored: Mon Jun 16 11:46:03 2014 +0200 Committer: Andrei Shakirin <[email protected]> Committed: Mon Jun 16 11:46:03 2014 +0200 ---------------------------------------------------------------------- .../org/apache/cxf/transport/jms/JMSConfigFactory.java | 3 +-- .../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, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/12d19ffe/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 01de9ab..e5ec995 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,7 @@ public final class JMSConfigFactory { jmsConfig.setPubSubDomain(pubSubDomain); jmsConfig.setDurableSubscriptionName(endpoint.getDurableSubscriptionName()); - - jmsConfig.setClientID(endpoint.getClientID()); + jmsConfig.setDurableSubscriptionClientId(endpoint.getDurableSubscriptionClientId()); jmsConfig.setReceiveTimeout(endpoint.getReceiveTimeout()); jmsConfig.setTimeToLive(endpoint.getTimeToLive()); http://git-wip-us.apache.org/repos/asf/cxf/blob/12d19ffe/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 4c895cb..e1b51aa 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 clientID; + private String durableSubscriptionClientId; private String durableSubscriptionName; private String targetDestination; @@ -354,12 +354,12 @@ public class JMSConfiguration { return factory; } - public String getClientID() { - return clientID; + public String getDurableSubscriptionClientId() { + return durableSubscriptionClientId; } - public void setClientID(String clientID) { - this.clientID = clientID; + public void setDurableSubscriptionClientId(String durableSubscriptionClientId) { + this.durableSubscriptionClientId = durableSubscriptionClientId; } public void setTargetService(String targetService) { http://git-wip-us.apache.org/repos/asf/cxf/blob/12d19ffe/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 8a4af81..4eaf083 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.getClientID() != null) { - connection.setClientID(jmsConfig.getClientID()); + if (jmsConfig.getDurableSubscriptionClientId() != null) { + connection.setClientID(jmsConfig.getDurableSubscriptionClientId()); } return connection; } http://git-wip-us.apache.org/repos/asf/cxf/blob/12d19ffe/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 5c3f062..885c1f8 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,7 +65,7 @@ public class JMSEndpoint { */ private String conduitIdSelectorPrefix; private DeliveryModeType deliveryMode; - private String clientID; + private String durableSubscriptionClientId; private String durableSubscriptionName; private String jndiConnectionFactoryName = "ConnectionFactory"; private String jndiInitialContextFactory; @@ -349,12 +349,12 @@ public class JMSEndpoint { this.password = password; } - public String getClientID() { - return clientID; + public String getDurableSubscriptionClientId() { + return durableSubscriptionClientId; } - public void setClientID(String clientID) { - this.clientID = clientID; + public void setDurableSubscriptionClientId(String durableSubscriptionClientId) { + this.durableSubscriptionClientId = durableSubscriptionClientId; } public String getDurableSubscriptionName() {
