Author: dkulp
Date: Fri Nov 14 14:33:00 2008
New Revision: 714169
URL: http://svn.apache.org/viewvc?rev=714169&view=rev
Log:
Merged revisions 714167 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r714167 | dkulp | 2008-11-14 17:26:27 -0500 (Fri, 14 Nov 2008) | 3 lines
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/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 14 14:33:00 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354,709425,710076,710150,710154,71138
8,711410,711490,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713804,713899
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354,709425,710076,710150,710154,71138
8,711410,711490,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713804,713899,714167
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java?rev=714169&r1=714168&r2=714169&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
Fri Nov 14 14:33:00 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/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=714169&r1=714168&r2=714169&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Fri Nov 14 14:33:00 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/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml?rev=714169&r1=714168&r2=714169&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
(original)
+++
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
Fri Nov 14 14:33:00 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"
