You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/11/14 23:26:27 UTC
svn commit: r714167 - in /cxf/trunk:
rt/transports/http/src/main/java/org/apache/cxf/transport/http/
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/
systests/src/test/java/org/apache/cxf/systest/http/resources/
Author: dkulp
Date: Fri Nov 14 14:26:27 2008
New Revision: 714167
URL: http://svn.apache.org/viewvc?rev=714167&view=rev
Log:
Fix problems with JMS 1.0.2 providers and "topic" style not working
Change the URL style config for http conduits to not consider the params as part of the URL so you don't need to use wildcard for things like ?wsdl
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java?rev=714167&r1=714166&r2=714167&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java Fri Nov 14 14:26:27 2008
@@ -159,7 +159,11 @@
? new HTTPConduit(bus, endpointInfo)
: new HTTPConduit(bus, endpointInfo, target);
// Spring configure the conduit.
- configure(conduit, conduit.getAddress());
+ String address = conduit.getAddress();
+ if (address.indexOf('?') != -1) {
+ address = address.substring(0, address.indexOf('?'));
+ }
+ configure(conduit, conduit.getBeanName(), address);
conduit.finalizeConfig();
return conduit;
}
@@ -217,12 +221,12 @@
* @param bean
*/
protected void configure(Object bean) {
- configure(bean, null);
+ configure(bean, null, null);
}
- protected void configure(Object bean, String extraName) {
+ protected void configure(Object bean, String name, String extraName) {
Configurer configurer = bus.getExtension(Configurer.class);
if (null != configurer) {
- configurer.configureBean(bean);
+ configurer.configureBean(name, bean);
if (extraName != null) {
configurer.configureBean(extraName, bean);
}
Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=714167&r1=714166&r2=714167&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java (original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java Fri Nov 14 14:26:27 2008
@@ -49,7 +49,8 @@
private ConnectionFactory getConnectionFactoryFromJndi(String connectionFactoryName, String userName,
String password, JndiTemplate jt,
- boolean use11) {
+ boolean use11,
+ boolean pubSubDomain) {
if (connectionFactoryName == null) {
return null;
}
@@ -60,14 +61,10 @@
uccf.setPassword(password);
uccf.setTargetConnectionFactory(connectionFactory);
- SingleConnectionFactory scf = null;
if (use11) {
- scf = new SingleConnectionFactory();
- } else {
- scf = new SingleConnectionFactory102();
+ return new SingleConnectionFactory(uccf);
}
- scf.setTargetConnectionFactory(uccf);
- return scf;
+ return new SingleConnectionFactory102(uccf, pubSubDomain);
} catch (NamingException e) {
throw new RuntimeException(e);
}
@@ -98,14 +95,15 @@
JndiTemplate jt = new JndiTemplate();
jt.setEnvironment(JMSOldConfigHolder.getInitialContextEnv(address));
- ConnectionFactory cf = getConnectionFactoryFromJndi(address.getJndiConnectionFactoryName(), address
- .getConnectionUserName(), address.getConnectionPassword(), jt,
- address.isSetUseJms11() ? address.isUseJms11() : JMSConfiguration.DEFAULT_USEJMS11);
-
boolean pubSubDomain = false;
if (address.isSetDestinationStyle()) {
pubSubDomain = DestinationStyleType.TOPIC == address.getDestinationStyle();
}
+ ConnectionFactory cf = getConnectionFactoryFromJndi(address.getJndiConnectionFactoryName(), address
+ .getConnectionUserName(), address.getConnectionPassword(), jt,
+ address.isSetUseJms11() ? address.isUseJms11() : JMSConfiguration.DEFAULT_USEJMS11,
+ pubSubDomain);
+
jmsConfig.setConnectionFactory(cf);
jmsConfig.setDurableSubscriptionName(serverBehavior.getDurableSubscriberName());
jmsConfig.setExplicitQosEnabled(true);
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml?rev=714167&r1=714166&r2=714167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml Fri Nov 14 14:26:27 2008
@@ -80,7 +80,7 @@
<!-- -->
<!-- This test exercises the resource attribute in a keyStore and certStore element -->
<!-- -->
- <http:conduit name="https://localhost:9005/SoapContext/HttpsPort.*">
+ <http:conduit name="https://localhost:9005/SoapContext/HttpsPort">
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
<sec:keyStore type="pkcs12" password="password"