svn commit: r1043649 - in /cxf/trunk/rt/frontend/jaxws/src: main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/ test/jaxws22/org/apache/cxf/transport/http_jaxws_spi/

[cschneider]

Author: cschneider
Date: Wed Dec  8 20:04:44 2010
New Revision: 1043649

URL: http://svn.apache.org/viewvc?rev=1043649&view=rev
Log:
CXF-3160 Reduce Code duplication between http transport variants - fixing bug 
with jaxws 2.2

Modified:
    
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
    
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactory.java
    
cxf/trunk/rt/frontend/jaxws/src/test/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java?rev=1043649&r1=1043648&r2=1043649&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
 Wed Dec  8 20:04:44 2010
@@ -36,6 +36,7 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
+import org.apache.cxf.transport.http.DestinationRegistry;
 import org.apache.cxf.transport.http.HTTPSession;
 import org.apache.cxf.transports.http.QueryHandler;
 import org.apache.cxf.transports.http.QueryHandlerRegistry;
@@ -47,9 +48,10 @@ public class JAXWSHttpSpiDestination ext
 
     private static final long serialVersionUID = 1L;
 
-    public JAXWSHttpSpiDestination(Bus b, EndpointInfo ei)
-        throws IOException {
-        super(b, ei, false);
+    public JAXWSHttpSpiDestination(Bus b, 
+                                   DestinationRegistry registry,
+                                   EndpointInfo ei) throws IOException {
+        super(b, registry, ei, ei.getAddress(), false);
     }
 
     @Override

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactory.java?rev=1043649&r1=1043648&r2=1043649&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactory.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactory.java
 Wed Dec  8 20:04:44 2010
@@ -41,7 +41,7 @@ public class JAXWSHttpSpiTransportFactor
 
     public Destination getDestination(EndpointInfo endpointInfo) throws 
IOException {
         if (destination == null) { 
-            destination = new JAXWSHttpSpiDestination(getBus(), endpointInfo);
+            destination = new JAXWSHttpSpiDestination(getBus(), registry, 
endpointInfo);
             // set handler into the provided HttpContext, our Destination hook 
into the server container
             HttpHandlerImpl handler = new HttpHandlerImpl(destination);
             context.setHandler(handler);

Modified: 
cxf/trunk/rt/frontend/jaxws/src/test/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java?rev=1043649&r1=1043648&r2=1043649&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxws/src/test/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/test/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
 Wed Dec  8 20:04:44 2010
@@ -32,6 +32,7 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.transport.http.DestinationRegistryImpl;
 import org.apache.cxf.transport.http.WSDLQueryHandler;
 import org.apache.cxf.transports.http.QueryHandler;
 import org.apache.cxf.transports.http.QueryHandlerRegistry;
@@ -77,7 +78,7 @@ public class JAXWSHttpSpiDestinationTest
     @Test
     public void testCtor() throws Exception {
         JAXWSHttpSpiDestination destination = 
-            new JAXWSHttpSpiDestination(bus, endpoint);
+            new JAXWSHttpSpiDestination(bus, new DestinationRegistryImpl(), 
endpoint);
 
         assertNull(destination.getMessageObserver());
         assertNotNull(destination.getAddress());
@@ -93,7 +94,7 @@ public class JAXWSHttpSpiDestinationTest
         control.replay();
 
         JAXWSHttpSpiDestination destination = 
-            new JAXWSHttpSpiDestination(bus, endpoint);
+            new JAXWSHttpSpiDestination(bus, new DestinationRegistryImpl(), 
endpoint);
         destination.setMessageObserver(observer);
 
         destination.doService(new HttpServletRequestAdapter(exchange),
@@ -117,7 +118,7 @@ public class JAXWSHttpSpiDestinationTest
         control.replay();
 
         JAXWSHttpSpiDestination destination = 
-            new JAXWSHttpSpiDestination(bus, endpoint);
+            new JAXWSHttpSpiDestination(bus, new DestinationRegistryImpl(), 
endpoint);
         destination.setMessageObserver(observer);
 
         destination.doService(new HttpServletRequestAdapter(exchange),