cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r733886 - in /cxf/branches/2.1.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/ etc/eclipse/ rt/transports/http/src/main/java/org/apache/cxf/transport/http/ rt/transports/http/src/main/java/org/apache/cxf/transport/https/ s...
Date Mon, 12 Jan 2009 20:11:27 GMT
Author: dkulp
Date: Mon Jan 12 12:11:06 2009
New Revision: 733886

URL: http://svn.apache.org/viewvc?rev=733886&view=rev
Log:
Merged revisions 732450 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r732450 | dkulp | 2009-01-07 14:59:15 -0500 (Wed, 07 Jan 2009) | 2 lines
  
  Fix problem of using ENDPOINT_ADDRESS setting to change from https to http
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
    cxf/branches/2.1.x-fixes/etc/eclipse/template.checkstyle-config.xml
    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/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpURLConnectionFactory.java
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpURLConnectionFactoryImpl.java
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/BusServer.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
    cxf/branches/2.1.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 12:11:06 2009
@@ -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,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,733582
+/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,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,733582

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

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java?rev=733886&r1=733885&r2=733886&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
Mon Jan 12 12:11:06 2009
@@ -270,7 +270,13 @@
         if (attr.isId()) {
             return "ID";
         }
-        TypeInfo schemaType = attr.getSchemaTypeInfo();
+        TypeInfo schemaType = null;
+        try {
+            schemaType = attr.getSchemaTypeInfo();
+        } catch (Throwable t) {
+            //DOM level 2?
+            schemaType = null;
+        }
         return (schemaType == null) ? "CDATA" 
             : schemaType.getTypeName() == null ? "CDATA" : schemaType.getTypeName();
     }

Modified: cxf/branches/2.1.x-fixes/etc/eclipse/template.checkstyle-config.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/etc/eclipse/template.checkstyle-config.xml?rev=733886&r1=733885&r2=733886&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/etc/eclipse/template.checkstyle-config.xml (original)
+++ cxf/branches/2.1.x-fixes/etc/eclipse/template.checkstyle-config.xml Mon Jan 12 12:11:06
2009
@@ -18,10 +18,6 @@
   under the License.
 -->
 <checkstyle-configurations file-format-version="5.0.0">
-    <check-configuration name="CXF Checks" location="@CHECKSTYLE_CONFIG_FILE@" type="external"
description="">
-        <property name="apache.header.file" value="@APACHE_HEADER_FILE@"/>
-    </check-configuration>
-    <check-configuration name="CXF CORBA Checks" location="@CHECKSTYLE_CORBA_CONFIG_FILE@"
type="external" description="">
-        <property name="apache.header.file" value="@APACHE_HEADER_FILE@"/>
-    </check-configuration>
+    <check-configuration name="CXF Checks" location="@CHECKSTYLE_CONFIG_FILE@" type="external"
description=""/>
+    <check-configuration name="CXF CORBA Checks" location="@CHECKSTYLE_CORBA_CONFIG_FILE@"
type="external" description=""/>
 </checkstyle-configurations>
\ No newline at end of file

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=733886&r1=733885&r2=733886&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
Mon Jan 12 12:11:06 2009
@@ -237,14 +237,21 @@
      * This static call creates a connection factory based on
      * the existence of the SSL (TLS) client side configuration. 
      */
+    static HttpURLConnectionFactory getConnectionFactory(HTTPConduit configuredConduit) {
+        return getConnectionFactory(configuredConduit, null);
+    }
+    
     static HttpURLConnectionFactory getConnectionFactory(
-        HTTPConduit configuredConduit
+        HTTPConduit configuredConduit,
+        String address
     ) {
         HttpURLConnectionFactory fac = null;
         boolean useHttps = false;
 
         try {
-            String address = configuredConduit.getAddress();
+            if (address == null) {
+                address = configuredConduit.getAddress();
+            }
             if (address != null 
                 && address.startsWith(HttpsURLConnectionFactory.HTTPS_URL_PROTOCOL_ID
+ ":/")) {
                 useHttps = true;
@@ -252,9 +259,7 @@
         } catch (MalformedURLException e) {
             //ignore, just use info based on Tls
         }
-        if (useHttps 
-            || configuredConduit.getTlsClientParameters() != null) {
-            
+        if (useHttps) {
             TLSClientParameters params = configuredConduit.getTlsClientParameters();
             if (params == null) {
                 params = new TLSClientParameters(); //use defaults

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=733886&r1=733885&r2=733886&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Mon Jan 12 12:11:06 2009
@@ -444,6 +444,9 @@
     protected void retrieveConnectionFactory() {
         connectionFactory = AbstractHTTPTransportFactory.getConnectionFactory(this);
     }
+    protected void retrieveConnectionFactory(String url) {
+        connectionFactory = AbstractHTTPTransportFactory.getConnectionFactory(this, url);
+    }
     
     /**
      * Prepare to send an outbound HTTP message over this http conduit to a 
@@ -683,6 +686,16 @@
                 return getURL();
             }
             result = getURL().toString();
+        } else {
+            if (connectionFactory == null 
+                || result.startsWith(connectionFactory.getProtocol() + ":/")) {
+            
+                connectionFactory = null;
+                if (!result.startsWith("https:/")) {
+                    tlsClientParameters = null;
+                }
+                retrieveConnectionFactory(result);
+            }
         }
         
         // REVISIT: is this really correct?

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpURLConnectionFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpURLConnectionFactory.java?rev=733886&r1=733885&r2=733886&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpURLConnectionFactory.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpURLConnectionFactory.java
Mon Jan 12 12:11:06 2009
@@ -51,4 +51,9 @@
     HttpURLConnectionInfo getConnectionInfo(
             HttpURLConnection connnection
     ) throws IOException;
+    
+    /**
+     * @return the protocol that this connection supports (http or https)
+     */
+    String getProtocol();
 }

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpURLConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpURLConnectionFactoryImpl.java?rev=733886&r1=733885&r2=733886&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpURLConnectionFactoryImpl.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpURLConnectionFactoryImpl.java
Mon Jan 12 12:11:06 2009
@@ -63,4 +63,8 @@
         // to represent for an HttpURLConnection.
         return new HttpURLConnectionInfo(connection);
     }
+
+    public String getProtocol() {
+        return "http";
+    }
 }

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java?rev=733886&r1=733885&r2=733886&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
Mon Jan 12 12:11:06 2009
@@ -223,6 +223,11 @@
     ) throws IOException {  
         return new HttpsURLConnectionInfo((HttpsURLConnection)connection);
     }
+    
+    public String getProtocol() {
+        return "https";
+    }
+
 }
 
 

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/BusServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/BusServer.java?rev=733886&r1=733885&r2=733886&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/BusServer.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/BusServer.java
Mon Jan 12 12:11:06 2009
@@ -29,19 +29,18 @@
  */
 public class BusServer extends AbstractBusTestServerBase {
 
-
     protected void run()  {
         //
         // Just instantiate the Bus; services will be instantiated
         // and published automatically through Spring
         //
         final BusFactory factory = BusFactory.newInstance();
-        final Bus bus = factory.createBus();
+        Bus bus = factory.createBus();
+        setBus(bus);
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);
     }
 
-
     public static void main(String[] args) {
         try {
             BusServer s = new BusServer();

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java?rev=733886&r1=733885&r2=733886&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
Mon Jan 12 12:11:06 2009
@@ -108,7 +108,11 @@
         testSuccessfulCall("resources/jaxws-server.xml", 
                            "https://localhost:9002/SoapContext/HttpsPort");        
     }
-    
+    @Test
+    public final void testJaxwsServerChangeHttpsToHttp() throws Exception {
+        testSuccessfulCall("resources/jaxws-server.xml", 
+                            "http://localhost:9003/SoapContext/HttpPort");        
+    }    
     @Test
     public final void testJaxwsEndpoint() throws Exception {
         testSuccessfulCall("resources/jaxws-publish.xml",

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml?rev=733886&r1=733885&r2=733886&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
Mon Jan 12 12:11:06 2009
@@ -56,7 +56,20 @@
         <jaxws:serviceBean>
            <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
         </jaxws:serviceBean>
-    </jaxws:server>    
+    </jaxws:server>   
+    
+    <!--  Non http endpoint -->
+    <jaxws:server 
+        id="JaxwsHttpEndpoint"        
+        address="http://localhost:9003/SoapContext/HttpPort"
+        serviceName="s:SOAPService"
+        endpointName="e:HttpsPort"
+        xmlns:e="http://apache.org/hello_world/services"
+        xmlns:s="http://apache.org/hello_world/services">
+        <jaxws:serviceBean>
+           <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+        </jaxws:serviceBean>
+    </jaxws:server> 
 
     <!-- -->
     <!-- TLS Port configuration parameters for port 9002 -->

Modified: cxf/branches/2.1.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java?rev=733886&r1=733885&r2=733886&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java
(original)
+++ cxf/branches/2.1.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java
Mon Jan 12 12:11:06 2009
@@ -51,6 +51,7 @@
     
     public boolean stopInProcess() throws Exception {
         boolean ret = true;
+        tearDown();
         if (verify(getLog())) {
             if (!inProcess) {
                 System.out.println("server passed");



Mime
View raw message