You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2015/05/21 23:29:45 UTC
[1/2] cxf git commit: [CXF-6419]: Update JMSEndpoint properties using
EndpointInfo
Repository: cxf
Updated Branches:
refs/heads/master 67f165611 -> 580366ccf
[CXF-6419]: Update JMSEndpoint properties using EndpointInfo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/988caadb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/988caadb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/988caadb
Branch: refs/heads/master
Commit: 988caadb6f2eed12456dc576704d4b118c98995f
Parents: 0eb7eb1
Author: Andrei Shakirin <an...@gmail.com>
Authored: Thu May 21 23:29:19 2015 +0200
Committer: Andrei Shakirin <an...@gmail.com>
Committed: Thu May 21 23:29:19 2015 +0200
----------------------------------------------------------------------
.../cxf/transport/jms/uri/JMSEndpoint.java | 24 +++++++++++++++++---
.../cxf/transport/jms/uri/JMSEndpointTest.java | 12 ++++++++++
2 files changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/988caadb/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 1c7e126..f5e9d03 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
@@ -51,6 +51,8 @@ public class JMSEndpoint {
*/
public static final String JNDI_PARAMETER_NAME_PREFIX = "jndi-";
+ public static final String JAXWS_PROPERTY_PREFIX = "jms.";
+
private Map<String, String> jndiParameters = new HashMap<String, String>();
private Map<String, String> parameters = new HashMap<String, String>();
@@ -119,9 +121,25 @@ public class JMSEndpoint {
Map<String, Object> query = parsed.parseQuery();
configureProperties(query);
- // Use the properties like e.g. from JAXWS properties
- if (ei != null && ei.getBinding() != null && ei.getBinding().getProperties() != null) {
- configureProperties(ei.getBinding().getProperties());
+ // Use the properties like e.g. from JAXWS properties with "jms." prefix
+ Map<String, Object> jmsProps = new HashMap<String, Object>();
+ if (ei != null) {
+ getJaxWsJmsProps(ei.getProperties(), jmsProps);
+ }
+ if (ei != null && ei.getBinding() != null) {
+ getJaxWsJmsProps(ei.getBinding().getProperties(), jmsProps);
+ }
+ configureProperties(jmsProps);
+ }
+ }
+
+ private void getJaxWsJmsProps(Map<String, Object> jaxwsProps, Map<String, Object> jmsProps) {
+ if (jaxwsProps == null) {
+ return;
+ }
+ for (String key : jaxwsProps.keySet()) {
+ if (key.startsWith(JAXWS_PROPERTY_PREFIX)) {
+ jmsProps.put(key.substring(JAXWS_PROPERTY_PREFIX.length()), jaxwsProps.get(key));
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/988caadb/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
index f52f28e..53b1492 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
@@ -21,12 +21,15 @@ package org.apache.cxf.transport.jms.uri;
import java.util.Map;
+import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.jms.uri.JMSEndpoint.DeliveryModeType;
import org.junit.Assert;
import org.junit.Test;
public class JMSEndpointTest extends Assert {
+ private static final String TEST_VALUE = "testValue";
+
@Test
public void testBasicQueue() throws Exception {
JMSEndpoint endpoint = new JMSEndpoint("jms:queue:Foo.Bar?concurrentConsumers=21");
@@ -192,4 +195,13 @@ public class JMSEndpointTest extends Assert {
JMSEndpoint endpoint = new JMSEndpoint("jms:queue:Foo.Bar?jndiTransactionManagerName=test");
assertEquals("test", endpoint.getJndiTransactionManagerName());
}
+
+ @Test
+ public void testJaxWsProps() throws Exception {
+ EndpointInfo ei = new EndpointInfo();
+ ei.setProperty(JMSEndpoint.JAXWS_PROPERTY_PREFIX + "durableSubscriptionName", TEST_VALUE);
+ JMSEndpoint endpoint = new JMSEndpoint(ei, "jms:queue:Foo.Bar");
+ assertEquals(endpoint.getDurableSubscriptionName(), TEST_VALUE);
+ }
+
}
[2/2] cxf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf
Posted by as...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/580366cc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/580366cc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/580366cc
Branch: refs/heads/master
Commit: 580366ccfbee2690fd9e9ac82f4552d0e214b04a
Parents: 988caad 67f1656
Author: Andrei Shakirin <an...@gmail.com>
Authored: Thu May 21 23:29:38 2015 +0200
Committer: Andrei Shakirin <an...@gmail.com>
Committed: Thu May 21 23:29:38 2015 +0200
----------------------------------------------------------------------
.../cxf/internal/CXFAPINamespaceHandler.java | 15 ++++++-------
parent/pom.xml | 2 +-
.../blueprint/ClusteringBPNamespaceHandler.java | 3 +--
.../blueprint/JAXRSBPNamespaceHandler.java | 3 +--
.../cxf/jaxrs/ext/MessageContextImpl.java | 4 ++++
.../blueprint/JAXWSBPNamespaceHandler.java | 3 +--
.../blueprint/SimpleBPNamespaceHandler.java | 3 +--
.../blueprint/JAXRSBPNamespaceHandler.java | 3 +--
.../HTTPJettyTransportNamespaceHandler.java | 4 ++--
.../HttpNettyTransportNamespaceHandler.java | 4 ++--
.../transport/http/blueprint/HttpBPHandler.java | 3 +--
.../org/apache/cxf/systest/jaxrs/BookStore.java | 23 ++++++++++++++++++++
.../jaxrs/JAXRSClientServerBookTest.java | 13 +++++++++++
.../jaxrs/JAXRSSoapRestBlueprintTest.java | 18 +++++++--------
14 files changed, 66 insertions(+), 35 deletions(-)
----------------------------------------------------------------------