Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 72651 invoked from network); 31 Mar 2007 04:29:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Mar 2007 04:29:19 -0000 Received: (qmail 54950 invoked by uid 500); 31 Mar 2007 04:29:26 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 54909 invoked by uid 500); 31 Mar 2007 04:29:26 -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 54898 invoked by uid 99); 31 Mar 2007 04:29:26 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Mar 2007 21:29:26 -0700 X-ASF-Spam-Status: No, hits=-99.5 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; Fri, 30 Mar 2007 21:29:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 806491A9838; Fri, 30 Mar 2007 21:28:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524369 - /geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java Date: Sat, 31 Mar 2007 04:28:58 -0000 To: scm@geronimo.apache.org From: dims@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070331042858.806491A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dims Date: Fri Mar 30 21:28:56 2007 New Revision: 524369 URL: http://svn.apache.org/viewvc?view=rev&rev=524369 Log: remove system property. remove unnecessary method that returns a generated type Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java 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=524369&r1=524368&r2=524369 ============================================================================== --- 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 Fri Mar 30 21:28:56 2007 @@ -49,26 +49,21 @@ String handlerChainsXML, Map seiInfoMap) { super(handlerChainsXML, seiInfoMap, name, serviceQName, wsdlURI, referenceClassName, serviceClassName); - System.setProperty("javax.xml.ws.spi.Provider", "org.apache.axis2.jaxws.spi.Provider"); } - protected HandlerChainsType getHandlerChains() { + protected HandlerResolver getHandlerResolver(Class serviceClass) { + HandlerChainsType types = null; try { - if (this.handlerChainsXML == null) //handlerChains could be null if they are not specified. - return null; - else - return HandlerChainsDocument.Factory.parse(this.handlerChainsXML).getHandlerChains(); + if (this.handlerChainsXML != null){ + types = HandlerChainsDocument.Factory.parse(this.handlerChainsXML).getHandlerChains(); + } } catch (Exception e) { log.warn("Failed to deserialize handler chains", e); - return null; } - } - - protected HandlerResolver getHandlerResolver(Class serviceClass) { JAXWSAnnotationProcessor annotationProcessor = new JAXWSAnnotationProcessor(new JNDIResolver(), new WebServiceContextImpl()); Axis2HandlerResolver handlerResolver = - new Axis2HandlerResolver(classLoader, serviceClass, getHandlerChains(), annotationProcessor); + new Axis2HandlerResolver(classLoader, serviceClass, types, annotationProcessor); return handlerResolver; } }