cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r714172 - in /cxf/branches/2.0.x-fixes: ./ 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/ systests/...
Date Fri, 14 Nov 2008 22:34:41 GMT
Author: dkulp
Date: Fri Nov 14 14:34:41 2008
New Revision: 714172

URL: http://svn.apache.org/viewvc?rev=714172&view=rev
Log:
Merged revisions 714169,714171 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r714169 | dkulp | 2008-11-14 17:33:00 -0500 (Fri, 14 Nov 2008) | 10 lines
  
  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
  ........
................
  r714171 | dkulp | 2008-11-14 17:33:34 -0500 (Fri, 14 Nov 2008) | 9 lines
  
  Merged revisions 714168 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r714168 | dkulp | 2008-11-14 17:32:32 -0500 (Fri, 14 Nov 2008) | 2 lines
    
    Fix possible NPE
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
  (props changed)

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 14 14:34:41 2008
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168
 /incubator/cxf/trunk:434594-651668

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java?rev=714172&r1=714171&r2=714172&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
Fri Nov 14 14:34:41 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 != null && 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.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=714172&r1=714171&r2=714172&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Fri Nov 14 14:34:41 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.0.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.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml?rev=714172&r1=714171&r2=714172&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
Fri Nov 14 14:34:41 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" 

Propchange: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 14 14:34:41 2008
@@ -1 +1 @@
-/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java:712600,713083,713410,713413,713594,713599,713808,713901
+/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java:712600,713083,713410,713413,713594,713599,713808,713901,714169-714171



Mime
View raw message