cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r738265 - in /cxf/trunk: rt/transports/http/src/main/java/org/apache/cxf/transport/http/ systests/src/test/java/org/apache/cxf/systest/handlers/ systests/src/test/java/org/apache/cxf/systest/jaxrs/ systests/src/test/java/org/apache/cxf/syst...
Date Tue, 27 Jan 2009 22:07:11 GMT
Author: dkulp
Date: Tue Jan 27 22:07:10 2009
New Revision: 738265

URL: http://svn.apache.org/viewvc?rev=738265&view=rev
Log:
Cleanup stuff printed to console in systest
Cleanup HTTP conduit http<-->https stuff

Modified:
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/Book.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java

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=738265&r1=738264&r2=738265&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
Tue Jan 27 22:07:10 2009
@@ -252,13 +252,16 @@
             if (address == null) {
                 address = configuredConduit.getAddress();
             }
-            if (address != null 
-                && address.startsWith(HttpsURLConnectionFactory.HTTPS_URL_PROTOCOL_ID
+ ":/")) {
-                useHttps = true;
-            }
         } catch (MalformedURLException e) {
             //ignore, just use info based on Tls
         }
+        if (address != null 
+            && address.startsWith(HttpsURLConnectionFactory.HTTPS_URL_PROTOCOL_ID
+ ":/")) {
+            useHttps = true;
+        }
+        if (address == null) {
+            useHttps = configuredConduit.getTlsClientParameters() != null;
+        }
         if (useHttps) {
             TLSClientParameters params = configuredConduit.getTlsClientParameters();
             if (params == null) {

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=738265&r1=738264&r2=738265&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Tue Jan 27 22:07:10 2009
@@ -696,9 +696,6 @@
                 || result.startsWith(connectionFactory.getProtocol() + ":/")) {
             
                 connectionFactory = null;
-                if (!result.startsWith("https:/")) {
-                    tlsClientParameters = null;
-                }
                 retrieveConnectionFactory(result);
             }
         }

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java?rev=738265&r1=738264&r2=738265&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
(original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
Tue Jan 27 22:07:10 2009
@@ -55,7 +55,7 @@
             List<String> handlerInfoList = getHandlersInfo(context.getMessageContext());
             handlerInfoList.add("servant");
             context.getMessageContext().remove("handler.info");
-            System.out.println(">> servant returning list: " + handlerInfoList);
+            //System.out.println(">> servant returning list: " + handlerInfoList);
             return handlerInfoList;
 
         } catch (Exception e) {

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/Book.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/Book.java?rev=738265&r1=738264&r2=738265&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/Book.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/Book.java Tue Jan 27 22:07:10
2009
@@ -37,7 +37,7 @@
     
     public Book() {
         init();
-        System.out.println("----chapters: " + chapters.size());
+        //System.out.println("----chapters: " + chapters.size());
     }
     
     public Book(String name, long id) {

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=738265&r1=738264&r2=738265&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Tue Jan 27
22:07:10 2009
@@ -223,7 +223,7 @@
     }
     
     private Book doGetBook(String id) throws BookNotFoundFault {
-        System.out.println("----invoking getBook with id: " + id);
+        //System.out.println("----invoking getBook with id: " + id);
         Book book = books.get(Long.parseLong(id));
         if (book != null) {
             return book;

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=738265&r1=738264&r2=738265&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
(original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Tue Jan 27 22:07:10 2009
@@ -409,20 +409,17 @@
         RequestEntity entity = new FileRequestEntity(input, "text/xml; charset=ISO-8859-1");
         put.setRequestEntity(entity);
         HttpClient httpclient = new HttpClient();
-
         try {
             int result = httpclient.executeMethod(put);
             assertEquals(200, result);
-            System.out.println(put.getResponseBodyAsString());
+            String resp = put.getResponseBodyAsString();
+            InputStream expected = getClass().getResourceAsStream("resources/update_book.txt");
+            assertTrue(resp.indexOf(getStringFromInputStream(expected)) >= 0);
         } finally {
             // Release current connection to the connection pool once you are
             // done
             put.releaseConnection();
         }
-        
-        InputStream expected = getClass().getResourceAsStream("resources/update_book.txt");
-
-        assertTrue(put.getResponseBodyAsString().indexOf(getStringFromInputStream(expected))
>= 0);
     }
     
     @Test
@@ -505,7 +502,7 @@
 
         InputStream expected124 = getClass().getResourceAsStream("resources/expected_get_cds124.txt");
         String result = getStringFromInputStream(in);
-        System.out.println("---" + result);
+        //System.out.println("---" + result);
         assertTrue(result.indexOf(getStringFromInputStream(expected124)) >= 0);
     }
     

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java?rev=738265&r1=738264&r2=738265&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java
(original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java
Tue Jan 27 22:07:10 2009
@@ -41,7 +41,7 @@
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class, true));
+        assertTrue("server did not launch correctly", launchServer(Server.class));
     }
     
     @Test

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java?rev=738265&r1=738264&r2=738265&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java
(original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java
Tue Jan 27 22:07:10 2009
@@ -55,7 +55,7 @@
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(BookServer.class, true));
+        assertTrue("server did not launch correctly", launchServer(BookServer.class));
     }
 
     @Test



Mime
View raw message