Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 51774 invoked from network); 18 Dec 2006 03:22:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Dec 2006 03:22:22 -0000 Received: (qmail 98836 invoked by uid 500); 18 Dec 2006 03:22:29 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 98801 invoked by uid 500); 18 Dec 2006 03:22:29 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 98785 invoked by uid 99); 18 Dec 2006 03:22:29 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Dec 2006 19:22:29 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,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; Sun, 17 Dec 2006 19:22:20 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 8CA1F1A981A; Sun, 17 Dec 2006 19:21:33 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r488107 - in /geronimo/server/trunk/modules: geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java Date: Mon, 18 Dec 2006 03:21:33 -0000 To: scm@geronimo.apache.org From: dims@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061218032133.8CA1F1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dims Date: Sun Dec 17 19:21:32 2006 New Revision: 488107 URL: http://svn.apache.org/viewvc?view=rev&rev=488107 Log: drilldown into JAXBElement to extract the WebservicesType object, set default transport id (causes NPE if absent) Modified: geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java Modified: geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java?view=diff&rev=488107&r1=488106&r2=488107 ============================================================================== --- geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java (original) +++ geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java Sun Dec 17 19:21:32 2006 @@ -99,7 +99,11 @@ } Unmarshaller unmarshaller = ctx.createUnmarshaller(); - Object obj = unmarshaller.unmarshal(in); + Object obj = unmarshaller.unmarshal(new javax.xml.transform.stream.StreamSource(in), WebservicesType.class); + + if (obj instanceof JAXBElement) { + obj = ((JAXBElement)obj).getValue(); + } if (!(obj instanceof WebservicesType)) { return map; Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java?view=diff&rev=488107&r1=488106&r2=488107 ============================================================================== --- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java (original) +++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java Sun Dec 17 19:21:32 2006 @@ -23,6 +23,9 @@ import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.geronimo.webservices.WebServiceContainer; +import java.util.List; +import java.util.ArrayList; + //TODO consider putting most of this in the CXFWebServiceContaInerFactoryGBean public class CXFWebServiceContainer implements WebServiceContainer { @@ -33,8 +36,13 @@ public CXFWebServiceContainer(PortInfo portInfo, Object target, Bus bus) { //TODO actually use portInfo this.bus = bus; + + List ids = new ArrayList(); + ids.add("http://schemas.xmlsoap.org/wsdl/soap/http"); + DestinationFactoryManager destinationFactoryManager = bus.getExtension(DestinationFactoryManager.class); - DestinationFactory factory = new GeronimoDestinationFactory(bus); + GeronimoDestinationFactory factory = new GeronimoDestinationFactory(bus); + factory.setTransportIds(ids); destinationFactoryManager.registerDestinationFactory("http://cxf.apache.org/transports/http/configuration", factory); destinationFactoryManager.registerDestinationFactory("http://www.w3.org/2003/05/soap/bindings/HTTP/", factory); destinationFactoryManager.registerDestinationFactory("http://schemas.xmlsoap.org/soap/http", factory);