svn commit: r559191 - in /incubator/cxf/trunk/rt: core/src/main/java/org/apache/cxf/transport/ frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ transports/http/src/main/java/org/apache/cxf/transport/servlet/

[dkulp]

Author: dkulp
Date: Tue Jul 24 13:18:29 2007
New Revision: 559191

URL: http://svn.apache.org/viewvc?view=rev&rev=559191
Log:
Fix issue of transportId's not being found in ServletTransport if it's created 
programatically instead of via spring

Modified:
    
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
    
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
    
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
    
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java

Modified: 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java?view=diff&rev=559191&r1=559190&r2=559191
==============================================================================
--- 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
 (original)
+++ 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
 Tue Jul 24 13:18:29 2007
@@ -27,7 +27,7 @@
 /**
  * Helper methods for [EMAIL PROTECTED] DestinationFactory}s and [EMAIL 
PROTECTED] ConduitInitiator}s.
  */
-public class AbstractTransportFactory {
+public abstract class AbstractTransportFactory implements DestinationFactory {
     private List<String> transportIds;
 
     public List<String> getTransportIds() {

Modified: 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?view=diff&rev=559191&r1=559190&r2=559191
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
 Tue Jul 24 13:18:29 2007
@@ -138,7 +138,6 @@
             }
             
             message.setContent(List.class, newParams);
-            message.setContent(MessageContentsList.class, newParams);
         }
     }
     

Modified: 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java?view=diff&rev=559191&r1=559190&r2=559191
==============================================================================
--- 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
 (original)
+++ 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
 Tue Jul 24 13:18:29 2007
@@ -226,14 +226,12 @@
             // why are we throwing a busexception if the DF isn't found?
         }
 
-        DestinationFactory factory = createServletTransportFactory();
         
-        registerTransport(factory, 
"http://schemas.xmlsoap.org/wsdl/soap/http";);
-        registerTransport(factory, "http://schemas.xmlsoap.org/soap/http";);
-        registerTransport(factory, 
"http://www.w3.org/2003/05/soap/bindings/HTTP/";);
-        registerTransport(factory, "http://schemas.xmlsoap.org/wsdl/http/";);
-        registerTransport(factory, 
"http://cxf.apache.org/transports/http/configuration";);
-        registerTransport(factory, "http://cxf.apache.org/bindings/xformat";); 
+        DestinationFactory factory = createServletTransportFactory();
+
+        for (String s : factory.getTransportIds()) {
+            registerTransport(factory, s);
+        }
         LOG.info("REPLACED_HTTP_DESTIONFACTORY");
     }
 

Modified: 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java?view=diff&rev=559191&r1=559190&r2=559191
==============================================================================
--- 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
 (original)
+++ 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
 Tue Jul 24 13:18:29 2007
@@ -21,8 +21,10 @@
 package org.apache.cxf.transport.servlet;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -44,6 +46,15 @@
     
     public ServletTransportFactory(Bus b) {
         bus = b;
+        List<String> ids = Arrays.asList(new String[] {
+            "http://schemas.xmlsoap.org/wsdl/soap/http";,
+            "http://schemas.xmlsoap.org/soap/http";,
+            "http://www.w3.org/2003/05/soap/bindings/HTTP/";,
+            "http://schemas.xmlsoap.org/wsdl/http/";,
+            "http://cxf.apache.org/transports/http/configuration";,
+            "http://cxf.apache.org/bindings/xformat";,         
+        });
+        this.setTransportIds(ids);
     }
 
     public ServletTransportFactory() {