Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 14782 invoked from network); 21 Apr 2005 18:27:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Apr 2005 18:27:48 -0000 Received: (qmail 6493 invoked by uid 500); 21 Apr 2005 18:27:59 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 6353 invoked by uid 500); 21 Apr 2005 18:27:58 -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 6153 invoked by uid 99); 21 Apr 2005 18:27:56 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=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; Thu, 21 Apr 2005 11:27:56 -0700 Received: (qmail 14036 invoked by uid 65534); 21 Apr 2005 18:27:36 -0000 Message-ID: <20050421182736.14035.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r164095 - in /geronimo/trunk/modules: axis-builder/src/java/org/apache/geronimo/axis/builder/ j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ jetty-builder/ jetty-builder/src/java/org/apache/geronimo/jetty/deployment/ jetty-builder/src/test/org/apache/geronimo/jetty/deployment/ Date: Thu, 21 Apr 2005 18:27:35 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Thu Apr 21 11:27:34 2005 New Revision: 164095 URL: http://svn.apache.org/viewcvs?rev=3D164095&view=3Drev Log: geronimo-635. make jetty usable without web services Added: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/UnavailableServiceReferenceBuilder.java geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/UnavailableWebServiceBuilder.java geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/WebServiceBuilder.java - copied, changed from r164082, geronimo/trunk/modules/j2ee-builder/s= rc/java/org/apache/geronimo/j2ee/deployment/POJOWebServiceBuilder.java Removed: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/POJOWebServiceBuilder.java Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b= uilder/AxisBuilder.java geronimo/trunk/modules/jetty-builder/project.xml geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty= /deployment/JettyModuleBuilder.java geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty= /deployment/JettyModuleBuilderTest.java geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty= /deployment/PlanParsingTest.java Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/= axis/builder/AxisBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/= java/org/apache/geronimo/axis/builder/AxisBuilder.java?rev=3D164095&r1=3D16= 4094&r2=3D164095&view=3Ddiff =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/AxisBuilder.java (original) +++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b= uilder/AxisBuilder.java Thu Apr 21 11:27:34 2005 @@ -79,8 +79,8 @@ import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.j2ee.deployment.Module; -import org.apache.geronimo.j2ee.deployment.POJOWebServiceBuilder; import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder; +import org.apache.geronimo.j2ee.deployment.WebServiceBuilder; import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; import org.apache.geronimo.kernel.ClassLoaderReference; import org.apache.geronimo.kernel.StoredObject; @@ -93,13 +93,17 @@ /** * @version $Rev: $ $Date: $ */ -public class AxisBuilder implements ServiceReferenceBuilder, POJOWebServic= eBuilder { +public class AxisBuilder implements ServiceReferenceBuilder, WebServiceBui= lder { private static final Class[] SERVICE_CONSTRUCTOR_TYPES =3D new Class[]= {Map.class, Map.class}; =20 private static final SOAPConstants SOAP_VERSION =3D SOAPConstants.SOAP= 11_CONSTANTS; =20 - //WebServiceBuilder + + public Map parseWebServiceDescriptor(URL wsDDUrl, JarFile moduleFile, = boolean isEJB) throws DeploymentException { + return WSDescriptorParser.parseWebServiceDescriptor(wsDDUrl, modul= eFile, isEJB); + } + public void configurePOJO(GBeanData targetGBean, JarFile moduleFile, O= bject portInfoObject, String seiClassName, ClassLoader classLoader) throws = DeploymentException { PortInfo portInfo =3D (PortInfo) portInfoObject; ServiceInfo serviceInfo =3D AxisServiceBuilder.createServiceInfo(p= ortInfo, classLoader); @@ -346,7 +350,7 @@ } HeavyweightTypeInfoBuilder builder =3D new HeavyweightTypeInfoBuil= der(classLoader, schemaInfoBuilder.getSchemaTypeKeyToSchemaTypeMap(), wrapp= erElementQNames); List typeInfo =3D builder.buildTypeInfo(mapping); - =20 + seiFactory =3D createSEIFactory(serviceName, portName, enhancedSer= viceEndpointClass, serviceImpl, typeInfo, location, operationInfos, handler= Infos, credentialsName, context, classLoader); seiPortNameToFactoryMap.put(portName, seiFactory); seiClassNameToFactoryMap.put(serviceEndpointInterface.getName(), s= eiFactory); @@ -369,12 +373,12 @@ } LightweightTypeInfoBuilder builder =3D new LightweightTypeInfoBuil= der(classLoader, schemaInfoBuilder.getSchemaTypeKeyToSchemaTypeMap(), Colle= ctions.EMPTY_SET); List typeInfo =3D builder.buildTypeInfo(mapping); - =20 + seiFactory =3D createSEIFactory(serviceName, portName, enhancedSer= viceEndpointClass, serviceImpl, typeInfo, location, operationInfos, handler= Infos, credentialsName, context, classLoader); seiPortNameToFactoryMap.put(portName, seiFactory); seiClassNameToFactoryMap.put(serviceEndpointInterface.getName(), s= eiFactory); } - + private Class getServiceEndpointInterfaceLightweight(PortType portType= , JavaWsdlMappingType mappings, ClassLoader classLoader) throws DeploymentE= xception { QName portTypeQName =3D portType.getQName(); String portTypeNamespace =3D portTypeQName.getNamespaceURI(); @@ -463,7 +467,7 @@ static { GBeanInfoBuilder infoBuilder =3D new GBeanInfoBuilder(AxisBuilder.= class, NameFactory.MODULE_BUILDER); infoBuilder.addInterface(ServiceReferenceBuilder.class); - infoBuilder.addInterface(POJOWebServiceBuilder.class); + infoBuilder.addInterface(WebServiceBuilder.class); =20 GBEAN_INFO =3D infoBuilder.getBeanInfo(); } Added: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2e= e/deployment/UnavailableServiceReferenceBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/= java/org/apache/geronimo/j2ee/deployment/UnavailableServiceReferenceBuilder= .java?rev=3D164095&view=3Dauto =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/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/UnavailableServiceReferenceBuilder.java (added) +++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/UnavailableServiceReferenceBuilder.java Thu Apr 21 11:27:34 2005 @@ -0,0 +1,50 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implie= d=2E + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.geronimo.j2ee.deployment; + +import java.net.URI; +import java.util.Map; +import java.util.List; +import javax.xml.namespace.QName; + +import org.apache.geronimo.deployment.DeploymentContext; +import org.apache.geronimo.common.DeploymentException; +import org.apache.geronimo.gbean.GBeanInfo; +import org.apache.geronimo.gbean.GBeanInfoBuilder; + +/** + * @version $Rev: $ $Date: $ + */ +public class UnavailableServiceReferenceBuilder implements ServiceReferenc= eBuilder { + + public Object createService(Class serviceInterface, URI wsdlURI, URI j= axrpcMappingURI, QName serviceQName, Map portComponentRefMap, List handlerI= nfos, Map portLocationMap, Map credentialsNameMap, DeploymentContext deploy= mentContext, Module module, ClassLoader classLoader) throws DeploymentExcep= tion { + throw new DeploymentException("Service references are not availabl= e in this configuration"); + } + + public static final GBeanInfo GBEAN_INFO; + + static { + GBeanInfoBuilder infoBuilder =3D new GBeanInfoBuilder(UnavailableS= erviceReferenceBuilder.class); + infoBuilder.addInterface(ServiceReferenceBuilder.class); + GBEAN_INFO =3D infoBuilder.getBeanInfo(); + } + + public static GBeanInfo getGBeanInfo() { + return GBEAN_INFO; + } + +} Added: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2e= e/deployment/UnavailableWebServiceBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/= java/org/apache/geronimo/j2ee/deployment/UnavailableWebServiceBuilder.java?= rev=3D164095&view=3Dauto =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/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/UnavailableWebServiceBuilder.java (added) +++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/UnavailableWebServiceBuilder.java Thu Apr 21 11:27:34 2005 @@ -0,0 +1,58 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implie= d=2E + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.geronimo.j2ee.deployment; + +import java.util.jar.JarFile; +import java.util.Map; +import java.util.HashMap; +import java.net.URL; + +import org.apache.geronimo.gbean.GBeanData; +import org.apache.geronimo.gbean.GBeanInfo; +import org.apache.geronimo.gbean.GBeanInfoBuilder; +import org.apache.geronimo.common.DeploymentException; + +/** + * @version $Rev: $ $Date: $ + */ +public class UnavailableWebServiceBuilder implements WebServiceBuilder { + + public Map parseWebServiceDescriptor(URL wsDDUrl, JarFile moduleFile, = boolean isEJB) throws DeploymentException { + return new HashMap(); + } + + public void configurePOJO(GBeanData targetGBean, JarFile moduleFile, O= bject portInfo, String seiClassName, ClassLoader classLoader) throws Deploy= mentException { + throw new DeploymentException("Web services are not available in t= his configuration"); + } + + public void configureEJB(GBeanData targetGBean, Object portInfoObject,= String seiClassName) throws DeploymentException { + throw new DeploymentException("Web services are not available in t= his configuration"); + } + + public static final GBeanInfo GBEAN_INFO; + + static { + GBeanInfoBuilder infoBuilder =3D new GBeanInfoBuilder(UnavailableW= ebServiceBuilder.class); + infoBuilder.addInterface(WebServiceBuilder.class); + GBEAN_INFO =3D infoBuilder.getBeanInfo(); + } + + public static GBeanInfo getGBeanInfo() { + return GBEAN_INFO; + } + +} Copied: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2= ee/deployment/WebServiceBuilder.java (from r164082, geronimo/trunk/modules/= j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/POJOWebServiceBui= lder.java) URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/= java/org/apache/geronimo/j2ee/deployment/WebServiceBuilder.java?p2=3Dgeroni= mo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/= WebServiceBuilder.java&p1=3Dgeronimo/trunk/modules/j2ee-builder/src/java/or= g/apache/geronimo/j2ee/deployment/POJOWebServiceBuilder.java&r1=3D164082&r2= =3D164095&rev=3D164095&view=3Ddiff =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/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/POJOWebServiceBuilder.java (original) +++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/WebServiceBuilder.java Thu Apr 21 11:27:34 2005 @@ -19,11 +19,15 @@ import org.apache.geronimo.common.DeploymentException; import org.apache.geronimo.gbean.GBeanData; import java.util.jar.JarFile; +import java.util.Map; +import java.net.URL; =20 /** * @version $Rev: $ $Date: $ */ -public interface POJOWebServiceBuilder { +public interface WebServiceBuilder { + + Map parseWebServiceDescriptor(URL wsDDUrl, JarFile moduleFile, boolean= isEJB) throws DeploymentException; =20 //obviously these need the deployment descriptors, but I'm not sure in= what form yet. /** Modified: geronimo/trunk/modules/jetty-builder/project.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/pro= ject.xml?rev=3D164095&r1=3D164094&r2=3D164095&view=3Ddiff =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/jetty-builder/project.xml (original) +++ geronimo/trunk/modules/jetty-builder/project.xml Thu Apr 21 11:27:34 20= 05 @@ -172,13 +172,6 @@ ${pom.currentVersion} =20 - - - geronimo - geronimo-axis-builder - ${pom.currentVersion} - - geronimo-spec geronimo-spec-jta Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo= /jetty/deployment/JettyModuleBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src= /java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=3D16= 4095&r1=3D164094&r2=3D164095&view=3Ddiff =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/jetty-builder/src/java/org/apache/geronimo/jetty= /deployment/JettyModuleBuilder.java (original) +++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty= /deployment/JettyModuleBuilder.java Thu Apr 21 11:27:34 2005 @@ -47,8 +47,6 @@ import javax.servlet.Servlet; import javax.transaction.UserTransaction; =20 -import org.apache.geronimo.axis.builder.PortInfo; -import org.apache.geronimo.axis.builder.WSDescriptorParser; import org.apache.geronimo.common.DeploymentException; import org.apache.geronimo.deployment.service.ServiceConfigBuilder; import org.apache.geronimo.deployment.util.DeploymentUtil; @@ -60,7 +58,7 @@ import org.apache.geronimo.j2ee.deployment.EARContext; import org.apache.geronimo.j2ee.deployment.Module; import org.apache.geronimo.j2ee.deployment.ModuleBuilder; -import org.apache.geronimo.j2ee.deployment.POJOWebServiceBuilder; +import org.apache.geronimo.j2ee.deployment.WebServiceBuilder; import org.apache.geronimo.j2ee.deployment.WebModule; import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext; import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl; @@ -128,7 +126,7 @@ private final ObjectName defaultFilterMappings; private final ObjectName pojoWebServiceTemplate; =20 - private final POJOWebServiceBuilder pojoWebServiceBuilder; + private final WebServiceBuilder webServiceBuilder; =20 private final List defaultWelcomeFiles; private final Integer defaultSessionTimeoutSeconds; @@ -144,7 +142,7 @@ ObjectName defaultFilters, ObjectName defaultFilterMappings, ObjectName pojoWebServiceTemplate, - POJOWebServiceBuilder pojoWebServiceBuilder, + WebServiceBuilder webServiceBuilder, Repository repository, Kernel kernel) { this.defaultParentId =3D defaultParentId; @@ -154,7 +152,7 @@ this.defaultFilters =3D defaultFilters; this.defaultFilterMappings =3D defaultFilterMappings; this.pojoWebServiceTemplate =3D pojoWebServiceTemplate; - this.pojoWebServiceBuilder =3D pojoWebServiceBuilder; + this.webServiceBuilder =3D webServiceBuilder; this.repository =3D repository; this.kernel =3D kernel; =20 @@ -206,7 +204,7 @@ Map portMap =3D Collections.EMPTY_MAP; try { URL wsDDUrl =3D DeploymentUtil.createJarURL(moduleFile, "WEB-I= NF/webservices.xml"); - portMap =3D WSDescriptorParser.parseWebServiceDescriptor(wsDDU= rl, moduleFile, false); + portMap =3D webServiceBuilder.parseWebServiceDescriptor(wsDDUr= l, moduleFile, false); } catch (MalformedURLException e) { //no descriptor } @@ -802,11 +800,11 @@ } servletData.setName(servletObjectName); //let the web service builder deal with configuring the gb= ean with the web service stack - PortInfo portInfo =3D (PortInfo) portMap.get(servletName); + Object portInfo =3D portMap.get(servletName); if (portInfo =3D=3D null) { throw new DeploymentException("No web service deployme= nt info for servlet name " + servletName); } - pojoWebServiceBuilder.configurePOJO(servletData, moduleFil= e, portInfo, servletClassName, webClassLoader); + webServiceBuilder.configurePOJO(servletData, moduleFile, p= ortInfo, servletClassName, webClassLoader); } } else if (servletType.isSetJspFile()) { servletData =3D new GBeanData(servletObjectName, JettyServletH= older.GBEAN_INFO); @@ -1227,7 +1225,7 @@ infoBuilder.addAttribute("defaultFilters", ObjectName.class, true); infoBuilder.addAttribute("defaultFilterMappings", ObjectName.class= , true); infoBuilder.addAttribute("pojoWebServiceTemplate", ObjectName.clas= s, true); - infoBuilder.addReference("WebServiceBuilder", POJOWebServiceBuilde= r=2Eclass, NameFactory.MODULE_BUILDER); + infoBuilder.addReference("WebServiceBuilder", WebServiceBuilder.cl= ass, NameFactory.MODULE_BUILDER); infoBuilder.addReference("Repository", Repository.class, NameFacto= ry.GERONIMO_SERVICE); infoBuilder.addAttribute("kernel", Kernel.class, false); infoBuilder.addInterface(ModuleBuilder.class); Modified: geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo= /jetty/deployment/JettyModuleBuilderTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src= /test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev= =3D164095&r1=3D164094&r2=3D164095&view=3Ddiff =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/jetty-builder/src/test/org/apache/geronimo/jetty= /deployment/JettyModuleBuilderTest.java (original) +++ geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty= /deployment/JettyModuleBuilderTest.java Thu Apr 21 11:27:34 2005 @@ -47,7 +47,7 @@ import org.apache.geronimo.j2ee.deployment.RefContext; import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder; import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder; -import org.apache.geronimo.j2ee.deployment.POJOWebServiceBuilder; +import org.apache.geronimo.j2ee.deployment.WebServiceBuilder; import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext; import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl; import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; @@ -241,7 +241,7 @@ =20 ObjectName defaultServlets =3D ObjectName.getInstance("test:name= =3Dtest,type=3Dnone,*"); ObjectName pojoWebServiceTemplate =3D null; - POJOWebServiceBuilder pojoWebServiceBuilder =3D null; + WebServiceBuilder webServiceBuilder =3D null; =20 serverInfoName =3D new ObjectName("geronimo.system:name=3DServerIn= fo"); serverInfoGBean =3D new GBeanData(serverInfoName, ServerInfo.GBEAN= _INFO); @@ -257,7 +257,7 @@ start(securityServiceGBean); =20 =20 - builder =3D new JettyModuleBuilder(new URI("null"), new Integer(18= 00), Collections.EMPTY_LIST, containerName, defaultServlets, null, null, po= joWebServiceTemplate, pojoWebServiceBuilder, null, kernel); + builder =3D new JettyModuleBuilder(new URI("null"), new Integer(18= 00), Collections.EMPTY_LIST, containerName, defaultServlets, null, null, po= joWebServiceTemplate, webServiceBuilder, null, kernel); =20 container =3D new GBeanData(containerName, JettyContainerImpl.GBEA= N_INFO); =20 Modified: geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo= /jetty/deployment/PlanParsingTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src= /test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java?rev=3D16409= 5&r1=3D164094&r2=3D164095&view=3Ddiff =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/jetty-builder/src/test/org/apache/geronimo/jetty= /deployment/PlanParsingTest.java (original) +++ geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty= /deployment/PlanParsingTest.java Thu Apr 21 11:27:34 2005 @@ -9,15 +9,15 @@ import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppDocument; import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppType; import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType; -import org.apache.geronimo.j2ee.deployment.POJOWebServiceBuilder; +import org.apache.geronimo.j2ee.deployment.WebServiceBuilder; =20 /** */ public class PlanParsingTest extends TestCase { ObjectName jettyContainerObjectName =3D JMXUtil.getObjectName("test:ty= pe=3DJettyContainer"); ObjectName pojoWebServiceTemplate =3D null; - POJOWebServiceBuilder pojoWebServiceBuilder =3D null; - private JettyModuleBuilder builder =3D new JettyModuleBuilder(null, ne= w Integer(1800), null, jettyContainerObjectName, null, null, null, pojoWebS= erviceTemplate, pojoWebServiceBuilder, null, null); + WebServiceBuilder webServiceBuilder =3D null; + private JettyModuleBuilder builder =3D new JettyModuleBuilder(null, ne= w Integer(1800), null, jettyContainerObjectName, null, null, null, pojoWebS= erviceTemplate, webServiceBuilder, null, null); private File basedir =3D new File(System.getProperty("basedir", ".")); =20 public void testResourceRef() throws Exception {