Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 72984 invoked from network); 16 Apr 2005 02:57:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Apr 2005 02:57:10 -0000 Received: (qmail 54767 invoked by uid 500); 16 Apr 2005 02:57:10 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 54756 invoked by uid 500); 16 Apr 2005 02:57:09 -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 Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 54737 invoked by uid 99); 16 Apr 2005 02:57:09 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 15 Apr 2005 19:57:09 -0700 Received: (qmail 72976 invoked by uid 65534); 16 Apr 2005 02:57:08 -0000 Message-ID: <20050416025708.72975.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sat, 16 Apr 2005 02:57:08 -0000 Subject: svn commit: r161537 - in geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder: AxisServiceBuilder.java WSDescriptorParser.java To: scm@geronimo.apache.org From: dblevins@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dblevins Date: Fri Apr 15 19:57:07 2005 New Revision: 161537 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161537 Log: Slightly rearranging method signatures Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b= uilder/AxisServiceBuilder.java geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b= uilder/WSDescriptorParser.java Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/= axis/builder/AxisServiceBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/= java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java?view=3Ddiff&r= 1=3D161536&r2=3D161537 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b= uilder/AxisServiceBuilder.java (original) +++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b= uilder/AxisServiceBuilder.java Fri Apr 15 19:57:07 2005 @@ -121,49 +121,9 @@ return createServiceDesc(portInfo, classLoader); } =20 - private static List createHandlerInfos(PortInfo portInfo, ClassLoader = classLoader) throws DeploymentException { - List list =3D new ArrayList(); - - PortComponentHandlerType[] handlers =3D portInfo.getHandlers(); - - for (int i =3D 0; i < handlers.length; i++) { - PortComponentHandlerType handler =3D handlers[i]; - - // Get handler class - Class handlerClass =3D null; - String className =3D handler.getHandlerClass().getStringValue(= )=2Etrim(); - try { - handlerClass =3D classLoader.loadClass(className); - } catch (ClassNotFoundException e) { - throw new DeploymentException("Unable to load handler clas= s: " + className, e); - } - - // config data for the handler - Map config =3D new HashMap(); - ParamValueType[] paramValues =3D handler.getInitParamArray(); - for (int j =3D 0; j < paramValues.length; j++) { - ParamValueType paramValue =3D paramValues[j]; - String paramName =3D paramValue.getParamName().getStringVa= lue().trim(); - String paramStringValue =3D paramValue.getParamValue().get= StringValue().trim(); - config.put(paramName, paramStringValue); - } - - // QName array of headers it processes - XsdQNameType[] soapHeaderQNames =3D handler.getSoapHeaderArray= (); - QName[] headers =3D new QName[soapHeaderQNames.length]; - for (int j =3D 0; j < soapHeaderQNames.length; j++) { - XsdQNameType soapHeaderQName =3D soapHeaderQNames[j]; - headers[j] =3D soapHeaderQName.getQNameValue(); - } - - list.add(new HandlerInfo(handlerClass, config, headers)); - } - return list; - } - public static ServiceInfo createServiceInfo(PortInfo portInfo, ClassLo= ader classLoader) throws DeploymentException { JavaServiceDesc serviceDesc =3D createServiceDesc(portInfo, classL= oader); - List handlerInfos =3D createHandlerInfos(portInfo, classLoader); + List handlerInfos =3D WSDescriptorParser.createHandlerInfoList(por= tInfo.getHandlers(), classLoader); SchemaInfoBuilder schemaInfoBuilder =3D portInfo.getSchemaInfoBuil= der(); Map rawWsdlMap =3D schemaInfoBuilder.getWsdlMap(); Map wsdlMap =3D rewriteWsdlMap(portInfo, rawWsdlMap); Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/= axis/builder/WSDescriptorParser.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/= java/org/apache/geronimo/axis/builder/WSDescriptorParser.java?view=3Ddiff&r= 1=3D161536&r2=3D161537 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b= uilder/WSDescriptorParser.java (original) +++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b= uilder/WSDescriptorParser.java Fri Apr 15 19:57:07 2005 @@ -28,6 +28,8 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; +import java.util.List; +import java.util.ArrayList; import java.util.jar.JarFile; import javax.wsdl.Definition; import javax.wsdl.Operation; @@ -55,6 +57,7 @@ import javax.xml.rpc.holders.ShortHolder; import javax.xml.rpc.holders.ShortWrapperHolder; import javax.xml.rpc.holders.StringHolder; +import javax.xml.rpc.handler.HandlerInfo; =20 import org.apache.geronimo.common.DeploymentException; import org.apache.geronimo.kernel.ClassLoading; @@ -71,6 +74,8 @@ import org.apache.geronimo.xbeans.j2ee.WebserviceDescriptionType; import org.apache.geronimo.xbeans.j2ee.WebservicesDocument; import org.apache.geronimo.xbeans.j2ee.WebservicesType; +import org.apache.geronimo.xbeans.j2ee.ParamValueType; +import org.apache.geronimo.xbeans.j2ee.XsdQNameType; import org.apache.xmlbeans.XmlException; =20 /** @@ -371,5 +376,42 @@ return null; } =20 + } + + public static List createHandlerInfoList(PortComponentHandlerType[] ha= ndlers, ClassLoader classLoader) throws DeploymentException { + List list =3D new ArrayList(); + for (int i =3D 0; i < handlers.length; i++) { + PortComponentHandlerType handler =3D handlers[i]; + + // Get handler class + Class handlerClass =3D null; + String className =3D handler.getHandlerClass().getStringValue(= )=2Etrim(); + try { + handlerClass =3D classLoader.loadClass(className); + } catch (ClassNotFoundException e) { + throw new DeploymentException("Unable to load handler clas= s: " + className, e); + } + + // config data for the handler + Map config =3D new HashMap(); + ParamValueType[] paramValues =3D handler.getInitParamArray(); + for (int j =3D 0; j < paramValues.length; j++) { + ParamValueType paramValue =3D paramValues[j]; + String paramName =3D paramValue.getParamName().getStringVa= lue().trim(); + String paramStringValue =3D paramValue.getParamValue().get= StringValue().trim(); + config.put(paramName, paramStringValue); + } + + // QName array of headers it processes + XsdQNameType[] soapHeaderQNames =3D handler.getSoapHeaderArray= (); + QName[] headers =3D new QName[soapHeaderQNames.length]; + for (int j =3D 0; j < soapHeaderQNames.length; j++) { + XsdQNameType soapHeaderQName =3D soapHeaderQNames[j]; + headers[j] =3D soapHeaderQName.getQNameValue(); + } + + list.add(new HandlerInfo(handlerClass, config, headers)); + } + return list; } }