Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 9225 invoked from network); 24 Jul 2007 20:18:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Jul 2007 20:18:52 -0000 Received: (qmail 81516 invoked by uid 500); 24 Jul 2007 20:18:53 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 81392 invoked by uid 500); 24 Jul 2007 20:18:52 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 81383 invoked by uid 99); 24 Jul 2007 20:18:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jul 2007 13:18:52 -0700 X-ASF-Spam-Status: No, hits=-98.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jul 2007 13:18:50 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6F61E1A981A; Tue, 24 Jul 2007 13:18:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Tue, 24 Jul 2007 20:18:30 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070724201830.6F61E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 {@link DestinationFactory}s and {@link ConduitInitiator}s. */ -public class AbstractTransportFactory { +public abstract class AbstractTransportFactory implements DestinationFactory { private List transportIds; public List 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 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() {