You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2011/05/19 04:51:26 UTC
svn commit: r1124523 - in /cxf/branches/2.3.x-fixes: ./
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/OldConfigTest.java
Author: ffang
Date: Thu May 19 02:51:26 2011
New Revision: 1124523
URL: http://svn.apache.org/viewvc?rev=1124523&view=rev
Log:
Merged revisions 1124521 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1124521 | ffang | 2011-05-19 10:43:22 +0800 (四, 19 5 2011) | 1 line
[CXF-3532]jms set username/password missmatch
........
Added:
cxf/branches/2.3.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/OldConfigTest.java
- copied unchanged from r1124521, cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/OldConfigTest.java
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=1124523&r1=1124522&r2=1124523&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java Thu May 19 02:51:26 2011
@@ -124,7 +124,7 @@ public class JMSOldConfigHolder {
* then be used to configure the JMSConfiguration object
* @param target
*/
- private JMSEndpoint getExtensorsAndConfig(Bus bus,
+ protected JMSEndpoint getExtensorsAndConfig(Bus bus,
EndpointInfo endpointInfo,
EndpointReferenceType target,
boolean isConduit) throws IOException {
@@ -184,6 +184,10 @@ public class JMSOldConfigHolder {
throws IOException {
JMSEndpoint endpoint = getExtensorsAndConfig(bus, endpointInfo, target, isConduit);
+ return configureEndpoint(isConduit, endpoint);
+ }
+
+ protected JMSConfiguration configureEndpoint(boolean isConduit, JMSEndpoint endpoint) {
if (address != null) {
mapAddressToEndpoint(address, endpoint);
}
@@ -197,7 +201,7 @@ public class JMSOldConfigHolder {
? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT;
jmsConfig.setDeliveryMode(deliveryMode);
}
-
+
if (endpoint.isSetPriority()) {
int priority = endpoint.getPriority();
jmsConfig.setPriority(priority);
@@ -210,10 +214,10 @@ public class JMSOldConfigHolder {
JNDIConfiguration jndiConfig = new JNDIConfiguration();
jndiConfig.setJndiConnectionFactoryName(endpoint.getJndiConnectionFactoryName());
jmsConfig.setJndiTemplate(jt);
-
+
jndiConfig.setConnectionUserName(endpoint.getUsername());
jndiConfig.setConnectionPassword(endpoint.getPassword());
-
+
jmsConfig.setJndiConfig(jndiConfig);
if (endpoint.isSetReconnectOnException()) {
jmsConfig.setReconnectOnException(endpoint.isReconnectOnException());
@@ -281,7 +285,7 @@ public class JMSOldConfigHolder {
}
}
}
-
+
String requestURI = endpoint.getRequestURI();
jmsConfig.setRequestURI(requestURI);
@@ -289,7 +293,7 @@ public class JMSOldConfigHolder {
jmsConfig.setTargetService(targetService);
return jmsConfig;
}
-
+
private static void setReplyDestination(JMSConfiguration jmsConfig, JMSEndpoint endpoint) {
if (endpoint.getReplyToName() != null) {
jmsConfig.setReplyDestination(endpoint.getReplyToName());
@@ -314,7 +318,7 @@ public class JMSOldConfigHolder {
endpoint.setUsername(address.getConnectionUserName());
}
if (address.isSetConnectionPassword()) {
- endpoint.setPassword(address.getConnectionUserName());
+ endpoint.setPassword(address.getConnectionPassword());
}
if (address.isSetReconnectOnException()) {
endpoint.setReconnectOnException(address.isReconnectOnException());