Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 69950 invoked from network); 21 Mar 2007 04:51:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Mar 2007 04:51:05 -0000 Received: (qmail 91814 invoked by uid 500); 21 Mar 2007 04:51:10 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 91761 invoked by uid 500); 21 Mar 2007 04:51:10 -0000 Mailing-List: contact dev-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 dev@geronimo.apache.org Received: (qmail 91750 invoked by uid 99); 21 Mar 2007 04:51:10 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Mar 2007 21:51:10 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: domain of jason.dillon@gmail.com designates 64.233.184.226 as permitted sender) Received: from [64.233.184.226] (HELO wr-out-0506.google.com) (64.233.184.226) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Mar 2007 21:51:01 -0700 Received: by wr-out-0506.google.com with SMTP id i21so145597wra for ; Tue, 20 Mar 2007 21:50:40 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:in-reply-to:references:mime-version:content-type:message-id:cc:content-transfer-encoding:from:subject:date:to:x-mailer:sender; b=VPheXU0fTbmpNW+ugV2KXfX5berNode77n2d8fqIo2Rs1LAYO3dBucxBJsjTeEDcFqsAai2Yh6FkhNUKg9xLPasGdxjQsNn3myuNh/zynZy3DKlPdy83bzrJKUs4tvvr53HaZ0mYQpxBwCviu5DTJYCSP1nTTR7gIHBwD1VjG2A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:in-reply-to:references:mime-version:content-type:message-id:cc:content-transfer-encoding:from:subject:date:to:x-mailer:sender; b=EbmDlZs3m+LxXijGUrb1rq8k2C8otpQVDMEyvon9piMeG3RklH24t5JJ6K1fiNGJDpeGD3eXTht+MDuo/xOl5kXayLsPq7nWY1MCj00YFH9BNbbX0gBMjVzzu6D1Gj2MH/KMq7/hnQbLWb+VhTv7vpW1QnhGRsVwk2yOyO+rlQk= Received: by 10.35.65.17 with SMTP id s17mr714151pyk.1174452640363; Tue, 20 Mar 2007 21:50:40 -0700 (PDT) Received: from ?10.0.1.2? ( [24.7.69.241]) by mx.google.com with ESMTP id z52sm2558884pyg.2007.03.20.21.50.38; Tue, 20 Mar 2007 21:50:39 -0700 (PDT) In-Reply-To: <20070321044756.1E1731A9838@eris.apache.org> References: <20070321044756.1E1731A9838@eris.apache.org> Mime-Version: 1.0 (Apple Message framework v752.3) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <0A17CA09-36E9-48F1-83CD-2910FB6B1422@planet57.com> Cc: scm@geronimo.apache.org Content-Transfer-Encoding: 7bit From: Jason Dillon Subject: Re: svn commit: r520746 - in /geronimo/server/trunk/modules: geronimo-axis2/ geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/ geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/... Date: Tue, 20 Mar 2007 21:50:34 -0700 To: dev@geronimo.apache.org X-Mailer: Apple Mail (2.752.3) Sender: Jason Dillon X-Virus-Checked: Checked by ClamAV on apache.org Oh, and thanks for fixing this too :-) --jason On Mar 20, 2007, at 9:47 PM, dims@apache.org wrote: > Author: dims > Date: Tue Mar 20 21:47:54 2007 > New Revision: 520746 > > URL: http://svn.apache.org/viewvc?view=rev&rev=520746 > Log: > Get failing test to work. When trying to load HandlerChainsType, we > have to use HandlerChainsDocument's Factory to parse the xml > > Modified: > geronimo/server/trunk/modules/geronimo-axis2/pom.xml > geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ > apache/geronimo/axis2/AnnotationHandlerChainBuilder.java > geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ > apache/geronimo/axis2/client/Axis2ServiceReference.java > geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ > apache/geronimo/axis2/pojo/POJOWebServiceContainer.java > geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/ > apache/geronimo/axis2/Axis2HandlerResolverTest.java > geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/ > apache/geronimo/jaxws/PortInfo.java > > Modified: geronimo/server/trunk/modules/geronimo-axis2/pom.xml > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ > geronimo-axis2/pom.xml?view=diff&rev=520746&r1=520745&r2=520746 > ====================================================================== > ======== > --- geronimo/server/trunk/modules/geronimo-axis2/pom.xml (original) > +++ geronimo/server/trunk/modules/geronimo-axis2/pom.xml Tue Mar 20 > 21:47:54 2007 > @@ -186,15 +186,12 @@ > > > > - > > org.apache.maven.plugins > maven-surefire-plugin > > > - **/Axis2HandlerResolverTest.java exclude> > + > > > > > Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/ > java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ > geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ > AnnotationHandlerChainBuilder.java? > view=diff&rev=520746&r1=520745&r2=520746 > ====================================================================== > ======== > --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ > apache/geronimo/axis2/AnnotationHandlerChainBuilder.java (original) > +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ > apache/geronimo/axis2/AnnotationHandlerChainBuilder.java Tue Mar 20 > 21:47:54 2007 > @@ -22,6 +22,7 @@ > import org.apache.geronimo.xbeans.javaee.HandlerChainType; > import org.apache.geronimo.xbeans.javaee.HandlerChainsType; > import org.apache.geronimo.xbeans.javaee.PortComponentHandlerType; > +import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument; > > import javax.jws.HandlerChain; > import javax.xml.ws.WebServiceException; > @@ -59,7 +60,7 @@ > HandlerChainType hc = null; > try { > URL handlerFileURL = clz.getResource > (hcAnn.getFileName()); > - HandlerChainsType handlerChainsType = > HandlerChainsType.Factory.parse(handlerFileURL); > + HandlerChainsType handlerChainsType = > HandlerChainsDocument.Factory.parse(handlerFileURL).getHandlerChains > (); > > if (null == handlerChainsType || > handlerChainsType.getHandlerChainArray() == null) { > throw new WebServiceException("Chain not > specified"); > > Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/ > java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ > geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/ > Axis2ServiceReference.java?view=diff&rev=520746&r1=520745&r2=520746 > ====================================================================== > ======== > --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ > apache/geronimo/axis2/client/Axis2ServiceReference.java (original) > +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ > apache/geronimo/axis2/client/Axis2ServiceReference.java Tue Mar 20 > 21:47:54 2007 > @@ -22,14 +22,14 @@ > import org.apache.commons.logging.LogFactory; > import org.apache.geronimo.axis2.Axis2HandlerResolver; > import org.apache.geronimo.gbean.AbstractName; > -import org.apache.geronimo.jaxws.HandlerChainsUtils; > import org.apache.geronimo.jaxws.JAXWSAnnotationProcessor; > import org.apache.geronimo.jaxws.JNDIResolver; > import org.apache.geronimo.jaxws.client.EndpointInfo; > import org.apache.geronimo.jaxws.client.JAXWSServiceReference; > +import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument; > import org.apache.geronimo.xbeans.javaee.HandlerChainsType; > +import org.apache.xmlbeans.XmlException; > > -import javax.xml.bind.JAXBException; > import javax.xml.namespace.QName; > import javax.xml.ws.handler.HandlerResolver; > import java.net.URI; > @@ -55,9 +55,8 @@ > > protected HandlerChainsType getHandlerChains() { > try { > - return HandlerChainsUtils.toHandlerChains > (this.handlerChainsXML, HandlerChainsType.class); > - } catch (JAXBException e) { > - // this should not happen > + return HandlerChainsDocument.Factory.parse > (this.handlerChainsXML).getHandlerChains(); > + } catch (XmlException e) { > log.warn("Failed to deserialize handler chains", e); > return null; > } > > Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/ > java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainer.java > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ > geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/ > POJOWebServiceContainer.java?view=diff&rev=520746&r1=520745&r2=520746 > ====================================================================== > ======== > --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ > apache/geronimo/axis2/pojo/POJOWebServiceContainer.java (original) > +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/ > apache/geronimo/axis2/pojo/POJOWebServiceContainer.java Tue Mar 20 > 21:47:54 2007 > @@ -35,6 +35,7 @@ > import org.apache.geronimo.jaxws.PortInfo; > import org.apache.geronimo.jaxws.annotations.AnnotationException; > import org.apache.geronimo.xbeans.javaee.HandlerChainsType; > +import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument; > > import javax.naming.Context; > import javax.xml.ws.WebServiceException; > @@ -115,7 +116,8 @@ > * performs injection. > */ > protected void configureHandlers() throws Exception { > - HandlerChainsType handlerChains = this.portInfo.getHandlers > (HandlerChainsType.class); > + String xml = this.portInfo.getHandlersAsXML(); > + HandlerChainsType handlerChains = xml == null ? null : > HandlerChainsDocument.Factory.parse(xml).getHandlerChains(); > Axis2HandlerResolver handlerResolver = > new Axis2HandlerResolver(endpointInstance.getClass > ().getClassLoader(), > endpointInstance.getClass(), > > Modified: geronimo/server/trunk/modules/geronimo-axis2/src/test/ > java/org/apache/geronimo/axis2/Axis2HandlerResolverTest.java > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ > geronimo-axis2/src/test/java/org/apache/geronimo/axis2/ > Axis2HandlerResolverTest.java?view=diff&rev=520746&r1=520745&r2=520746 > ====================================================================== > ======== > --- geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/ > apache/geronimo/axis2/Axis2HandlerResolverTest.java (original) > +++ geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/ > apache/geronimo/axis2/Axis2HandlerResolverTest.java Tue Mar 20 > 21:47:54 2007 > @@ -16,22 +16,17 @@ > */ > package org.apache.geronimo.axis2; > > -import java.io.InputStream; > -import java.util.List; > +import org.apache.geronimo.testsupport.TestSupport; > +import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument; > +import org.apache.geronimo.xbeans.javaee.HandlerChainsType; > +import org.apache.xmlbeans.XmlException; > > -import javax.xml.bind.JAXBContext; > -import javax.xml.bind.JAXBElement; > -import javax.xml.bind.JAXBException; > -import javax.xml.bind.Unmarshaller; > import javax.xml.namespace.QName; > -import javax.xml.transform.stream.StreamSource; > - > import javax.xml.ws.handler.Handler; > import javax.xml.ws.handler.PortInfo; > - > -import org.apache.geronimo.xbeans.javaee.HandlerChainsType; > - > -import org.apache.geronimo.testsupport.TestSupport; > +import java.io.IOException; > +import java.io.InputStream; > +import java.util.List; > > public class Axis2HandlerResolverTest extends TestSupport { > > @@ -53,7 +48,7 @@ > public void testServiceMatching() throws Exception { > InputStream in = getClass().getResourceAsStream("/ > handlers_service.xml"); > assertTrue(in != null); > - HandlerChainsType handlerChains = toHandlerChains(in); > + HandlerChainsType handlerChains = toHandlerChains(in); > assertEquals(3, handlerChains.getHandlerChainArray().length); > > Axis2HandlerResolver resolver = > @@ -166,15 +161,8 @@ > assertEquals(1, handlers.size()); > } > > - private static HandlerChainsType toHandlerChains(InputStream > input) > - throws JAXBException { > - JAXBContext ctx = JAXBContext.newInstance > (HandlerChainsType.class); > - Unmarshaller unmarshaller = ctx.createUnmarshaller(); > - StreamSource in = new StreamSource(input); > - JAXBElement handlerElement = unmarshaller.unmarshal(in, > - HandlerChainsType.class); > - > - return (HandlerChainsType) handlerElement.getValue(); > + private static HandlerChainsType toHandlerChains(InputStream > input) throws IOException, XmlException { > + return HandlerChainsDocument.Factory.parse > (input).getHandlerChains(); > } > > private static class TestPortInfo implements PortInfo { > > Modified: geronimo/server/trunk/modules/geronimo-jaxws/src/main/ > java/org/apache/geronimo/jaxws/PortInfo.java > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ > geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/ > PortInfo.java?view=diff&rev=520746&r1=520745&r2=520746 > ====================================================================== > ======== > --- geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/ > apache/geronimo/jaxws/PortInfo.java (original) > +++ geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/ > apache/geronimo/jaxws/PortInfo.java Tue Mar 20 21:47:54 2007 > @@ -164,4 +164,12 @@ > return "[" + serviceName + ":" + portName + ":" + > seiInterfaceName > + ":" + wsdlFile + "]"; > } > + > + public String getHandlersAsXML() { > + return handlersAsXML; > + } > + > + public void setHandlersAsXML(String handlersAsXML) { > + this.handlersAsXML = handlersAsXML; > + } > } > >