Return-Path: 
 <scm-return-6350-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 84821 invoked from network); 17 Mar 2005 23:54:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 17 Mar 2005 23:54:22 -0000
Received: (qmail 84046 invoked by uid 500); 17 Mar 2005 23:54:22 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 84023 invoked by uid 500); 17 Mar 2005 23:54:21 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 84010 invoked by uid 99); 17 Mar 2005 23:54:21 -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; Thu, 17 Mar 2005 15:54:20 -0800
Received: (qmail 84811 invoked by uid 65534); 17 Mar 2005 23:54:19 -0000
Message-ID: <20050317235419.84810.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: Thu, 17 Mar 2005 23:54:19 -0000
Subject: svn commit: r157992 - in geronimo/trunk/modules: axis-builder/
 axis-builder/src/java/org/apache/geronimo/axis/builder/
 axis/src/java/org/apache/geronimo/axis/server/
 j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/
 jetty-builder/src/java/org/apache/geronimo/jetty/deployment/
 jetty/src/java/org/apache/geronimo/jetty/
 jetty/src/test/org/apache/geronimo/jetty/app/
 webservices/src/java/org/apache/geronimo/webservices/
To: scm@geronimo.apache.org
From: dblevins@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: dblevins
Date: Thu Mar 17 15:54:16 2005
New Revision: 157992

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157992
Log:
Delay deserialization of WebServiceContainer till gbean startup.  Make webc=
lassloader available from JettyServletRegistration.

Modified:
    geronimo/trunk/modules/axis-builder/project.xml
    geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b=
uilder/AxisBuilder.java
    geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b=
uilder/HeavyweightOperationDescBuilder.java
    geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/Ax=
isWebServiceContainer.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d=
eployment/POJOWebServiceBuilder.java
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty=
/deployment/JettyModuleBuilder.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyEJ=
BWebServiceContext.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyPO=
JOWebServiceHolder.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettySe=
rvletRegistration.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWe=
bAppContext.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/POJOWeb=
ServiceServlet.java
    geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/app/Moc=
kWebServiceContainer.java
    geronimo/trunk/modules/webservices/src/java/org/apache/geronimo/webserv=
ices/WebServiceContainer.java

Modified: geronimo/trunk/modules/axis-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/proj=
ect.xml?view=3Ddiff&r1=3D157991&r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/project.xml (original)
+++ geronimo/trunk/modules/axis-builder/project.xml Thu Mar 17 15:54:16 2005
@@ -49,13 +49,6 @@
             <type>plugin</type>
         </dependency>
=20
-<!--
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <version>${openejb_version}</version>
-        </dependency>
--->
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
@@ -85,6 +78,18 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-axis</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-webservices</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
=20

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?view=3Ddiff&r1=3D157=
991&r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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 Mar 17 15:54:16 2005
@@ -63,6 +63,9 @@
 import org.apache.geronimo.j2ee.deployment.POJOWebServiceBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.ClassLoading;
+import org.apache.geronimo.kernel.ObjectInputStreamExt;
+import org.apache.geronimo.kernel.ClassLoaderReference;
+import org.apache.geronimo.kernel.StoredObject;
 import org.apache.geronimo.naming.reference.DeserializingReference;
 import org.apache.geronimo.xbeans.j2ee.JavaWsdlMappingType;
 import org.apache.geronimo.xbeans.j2ee.JavaXmlTypeMappingType;
@@ -80,11 +83,9 @@
=20
=20
     //WebServiceBuilder
-    public void configurePOJO(GBeanData targetGBean, Object portInfoObject=
, String seiClassName) throws DeploymentException {
+    public void configurePOJO(GBeanData targetGBean, Object portInfoObject=
, String seiClassName, ClassLoader classLoader) throws DeploymentException {
         PortInfo portInfo =3D (PortInfo) portInfoObject;
-        System.out.println("NOT CONFIGURING WEB SERVICE " + portInfo.getPo=
rtComponentName());
=20
-        ClassLoader classLoader =3D this.getClass().getClassLoader(); // T=
ODO need the actual classloader
         JavaServiceDesc serviceDesc =3D AxisServiceBuilder.createServiceDe=
sc(portInfo, classLoader);
         RPCProvider provider =3D new RPCProvider();
         SOAPService service =3D new SOAPService(null, provider, null);
@@ -105,8 +106,14 @@
             throw new DeploymentException("Invalid webservice endpoint URI=
", e);
         }
=20
+        classLoader =3D new ClassLoaderReference(classLoader);
         AxisWebServiceContainer axisWebServiceContainer =3D new AxisWebSer=
viceContainer(location, wsdlURL, service, classLoader);
-        targetGBean.setAttribute("webServiceContainer", axisWebServiceCont=
ainer);
+        //targetGBean.setAttribute("webServiceContainer", axisWebServiceCo=
ntainer);
+        try {
+            targetGBean.setAttribute("webServiceContainer", new StoredObje=
ct(axisWebServiceContainer)); // Hack!
+        } catch (IOException e) {
+            throw new DeploymentException("Unable to serialize the AxisWeb=
ServiceContainer", e);
+        }
     }
=20
     public void configureEJB(GBeanData targetGBean, Object portInfoObject,=
 String seiClassName) throws DeploymentException {

Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/=
axis/builder/HeavyweightOperationDescBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/=
java/org/apache/geronimo/axis/builder/HeavyweightOperationDescBuilder.java?=
view=3Ddiff&r1=3D157991&r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/HeavyweightOperationDescBuilder.java (original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/b=
uilder/HeavyweightOperationDescBuilder.java Thu Mar 17 15:54:16 2005
@@ -351,7 +351,7 @@
             if (!wsdlMessageQName.equals(output.getQName())) {
                 throw new DeploymentException("QName of output message: " =
+ output.getQName() +
                         " does not match mapping message QName: " + wsdlMe=
ssageQName + " for operation " + operationName);
-            }
+             }
             part =3D output.getPart(wsdlMessagePartName);
             if (part =3D=3D null) {
                 throw new DeploymentException("No part for wsdlMessagePart=
Name " + wsdlMessagePartName + " in output message for operation " + operat=
ionName);
@@ -375,4 +375,17 @@
         ParameterDesc parameterDesc =3D new ParameterDesc(partQName, mode,=
 partTypeQName, actualParamJavaType, inHeader, outHeader);
         return parameterDesc;
     }
+
+    /**
+     * Supporting the Document/Literal Wrapped pattern
+     *
+     * See http://www-106.ibm.com/developerworks/webservices/library/ws-wh=
ichwsdl/ for a nice explanation and example
+     *=20
+     * wrapped-element tag is used
+     * WSDL message with a single part
+     * part uses the 'element' attribute to point to an elemement in the t=
ypes section
+     * the element type and the element's name match the operation name
+     */
+
+
 }

Modified: geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/ser=
ver/AxisWebServiceContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/java/org=
/apache/geronimo/axis/server/AxisWebServiceContainer.java?view=3Ddiff&r1=3D=
157991&r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/java/org/apache/geronimo/axis/server/Ax=
isWebServiceContainer.java (original)
+++ geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/Ax=
isWebServiceContainer.java Thu Mar 17 15:54:16 2005
@@ -173,7 +173,8 @@
         return responseMessage;
     }
=20
-    public void getWsdl(OutputStream out) throws Exception {
+    public void getWsdl(Request req, Response res) throws Exception {
+        OutputStream out =3D res.getOutputStream();
         InputStream in =3D null;
         try {
             in =3D wsdlURL.openStream();

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/=
j2ee/deployment/POJOWebServiceBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/=
java/org/apache/geronimo/j2ee/deployment/POJOWebServiceBuilder.java?view=3D=
diff&r1=3D157991&r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/POJOWebServiceBuilder.java Thu Mar 17 15:54:16 2005
@@ -34,7 +34,7 @@
      * @param seiClassName
      * @throws DeploymentException
      */
-    void configurePOJO(GBeanData targetGBean, Object portInfo, String seiC=
lassName) throws DeploymentException;
+    void configurePOJO(GBeanData targetGBean, Object portInfo, String seiC=
lassName, ClassLoader classLoader) throws DeploymentException;
=20
     /**
      * configure the supplied EJBContainer gbeandata to implement the ejb =
web service described in the deployment descriptor

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?view=3Dd=
iff&r1=3D157991&r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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 Mar 17 15:54:16 2005
@@ -772,7 +772,7 @@
                 if (portInfo =3D=3D null) {
                     throw new DeploymentException("No web service deployme=
nt info for servlet name " + servletName);
                 }
-                pojoWebServiceBuilder.configurePOJO(servletData, portInfo,=
 servletClassName);
+                pojoWebServiceBuilder.configurePOJO(servletData, portInfo,=
 servletClassName, webClassLoader);
             }
         } else if (servletType.isSetJspFile()) {
             servletData =3D new GBeanData(servletObjectName, JettyServletH=
older.GBEAN_INFO);

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/J=
ettyEJBWebServiceContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/or=
g/apache/geronimo/jetty/JettyEJBWebServiceContext.java?view=3Ddiff&r1=3D157=
991&r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/java/org/apache/geronimo/jetty/JettyEJ=
BWebServiceContext.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyEJ=
BWebServiceContext.java Thu Mar 17 15:54:16 2005
@@ -86,7 +86,7 @@
         response.setContentType("text/xml");
=20
         if (request.getParameter("wsdl") !=3D null) {
-            doGetWsdl(response);
+            doGetWsdl(request, response);
         } else {
             doInvoke(request, response);
         }
@@ -104,10 +104,9 @@
         }
     }
=20
-    private void doGetWsdl(HttpResponse response) throws IOException {
-        OutputStream out =3D response.getOutputStream();
+    private void doGetWsdl(HttpRequest request, HttpResponse response) thr=
ows IOException {
         try {
-            webServiceContainer.getWsdl(out);
+            webServiceContainer.getWsdl(new RequestAdapter(request), new R=
esponseAdapter(response));
         } catch (IOException e) {
             throw e;
         } catch (Exception e) {

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/J=
ettyPOJOWebServiceHolder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/or=
g/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java?view=3Ddiff&r1=3D157=
991&r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/java/org/apache/geronimo/jetty/JettyPO=
JOWebServiceHolder.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyPO=
JOWebServiceHolder.java Thu Mar 17 15:54:16 2005
@@ -16,12 +16,16 @@
  */
 package org.apache.geronimo.jetty;
=20
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.util.Map;
 import java.util.Set;
 import java.util.Collections;
+import java.security.SignedObject;
+import java.security.PrivateKey;
+import java.security.Signature;
+import java.security.InvalidKeyException;
+import java.security.SignatureException;
+import java.security.PublicKey;
 import javax.security.jacc.PolicyContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
@@ -29,11 +33,15 @@
 import javax.servlet.UnavailableException;
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
+import javax.crypto.SealedObject;
=20
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.webservices.WebServiceContainer;
+import org.apache.geronimo.kernel.ObjectInputStreamExt;
+import org.apache.geronimo.kernel.StoredObject;
 import org.mortbay.jetty.servlet.ServletHolder;
 import org.mortbay.jetty.servlet.ServletHttpRequest;
=20
@@ -44,8 +52,10 @@
  *
  * @version $Rev: 154436 $ $Date: 2005-02-19 10:22:02 -0800 (Sat, 19 Feb 2=
005) $
  */
-public class JettyPOJOWebServiceHolder extends ServletHolder {
+public class JettyPOJOWebServiceHolder extends ServletHolder implements GB=
eanLifecycle {
     private WebServiceContainer webServiceContainer;
+    private StoredObject storedWebServiceContainer;
+    private ClassLoader webClassLoader;
=20
     //todo consider interface instead of this constructor for endpoint use.
     public JettyPOJOWebServiceHolder() {
@@ -57,13 +67,14 @@
                               Integer loadOnStartup,
                               Set servletMappings,
                               Map webRoleRefPermissions,
-                              WebServiceContainer webServiceContainer,
+                              StoredObject storedWebServiceContainer,
                               JettyServletRegistration context) throws Exc=
eption {
         super(context =3D=3D null? null: context.getServletHandler(), serv=
letName, POJOWebServiceServlet.class.getName(), null);
         //context will be null only for use as "default servlet info holde=
r" in deployer.
=20
-        this.webServiceContainer =3D webServiceContainer;
+        this.storedWebServiceContainer =3D storedWebServiceContainer;
         if (context !=3D null) {
+            this.webClassLoader =3D context.getWebClassLoader();
             putAll(initParams);
             if (loadOnStartup !=3D null) {
                 setInitOrder(loadOnStartup.intValue());
@@ -109,7 +120,7 @@
         infoBuilder.addAttribute("loadOnStartup", Integer.class, true);
         infoBuilder.addAttribute("servletMappings", Set.class, true);
         infoBuilder.addAttribute("webRoleRefPermissions", Map.class, true);
-        infoBuilder.addAttribute("webServiceContainer", WebServiceContaine=
r=2Eclass, true);
+        infoBuilder.addAttribute("webServiceContainer", StoredObject.class=
, true);
         infoBuilder.addReference("JettyServletRegistration", JettyServletR=
egistration.class);
=20
         infoBuilder.setConstructor(new String[] {"servletName",
@@ -126,4 +137,19 @@
     public static GBeanInfo getGBeanInfo() {
         return GBEAN_INFO;
     }
+
+    public void doStart() throws Exception {
+        if (webClassLoader !=3D null){
+            webServiceContainer =3D (WebServiceContainer) storedWebService=
Container.getObject(webClassLoader);
+        }
+    }
+
+    public void doStop() throws Exception {
+    }
+
+    public void doFail() {
+    }
+
+
+
 }

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/J=
ettyServletRegistration.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/or=
g/apache/geronimo/jetty/JettyServletRegistration.java?view=3Ddiff&r1=3D1579=
91&r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/java/org/apache/geronimo/jetty/JettySe=
rvletRegistration.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettySe=
rvletRegistration.java Thu Mar 17 15:54:16 2005
@@ -32,4 +32,6 @@
=20
     ServletHandler getServletHandler();
=20
+    ClassLoader getWebClassLoader();
+
 }

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/J=
ettyWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/or=
g/apache/geronimo/jetty/JettyWebAppContext.java?view=3Ddiff&r1=3D157991&r2=
=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/java/org/apache/geronimo/jetty/JettyWe=
bAppContext.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWe=
bAppContext.java Thu Mar 17 15:54:16 2005
@@ -268,6 +268,11 @@
         chain.after(context, httpRequest, httpResponse);
     }
=20
+
+    public ClassLoader getWebClassLoader() {
+        return webClassLoader;
+    }
+
     public void doStart() throws Exception {
         // reset the classsloader... jetty likes to set it to null when st=
opping
         setClassLoader(webClassLoader);

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/P=
OJOWebServiceServlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/or=
g/apache/geronimo/jetty/POJOWebServiceServlet.java?view=3Ddiff&r1=3D157991&=
r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/java/org/apache/geronimo/jetty/POJOWeb=
ServiceServlet.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/POJOWeb=
ServiceServlet.java Thu Mar 17 15:54:16 2005
@@ -57,6 +57,7 @@
  */
 public class POJOWebServiceServlet implements Servlet {
     public static final String WEBSERVICE_CONTAINER =3D "webServiceContain=
er";
+    public static final String WEBSERVICE_CONTAINER_BYTES =3D "webServiceC=
ontainerBytes";
=20
     public void init(ServletConfig config) throws ServletException {
=20

Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/a=
pp/MockWebServiceContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/test/or=
g/apache/geronimo/jetty/app/MockWebServiceContainer.java?view=3Ddiff&r1=3D1=
57991&r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/test/org/apache/geronimo/jetty/app/Moc=
kWebServiceContainer.java (original)
+++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/app/Moc=
kWebServiceContainer.java Thu Mar 17 15:54:16 2005
@@ -33,7 +33,7 @@
         response.getOutputStream().write("Hello World".getBytes());
     }
=20
-    public void getWsdl(OutputStream out) throws Exception {
+    public void getWsdl(Request req, Response res) throws Exception {
=20
     }
=20

Modified: geronimo/trunk/modules/webservices/src/java/org/apache/geronimo/w=
ebservices/WebServiceContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/webservices/src/j=
ava/org/apache/geronimo/webservices/WebServiceContainer.java?view=3Ddiff&r1=
=3D157991&r2=3D157992
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/webservices/src/java/org/apache/geronimo/webserv=
ices/WebServiceContainer.java (original)
+++ geronimo/trunk/modules/webservices/src/java/org/apache/geronimo/webserv=
ices/WebServiceContainer.java Thu Mar 17 15:54:16 2005
@@ -19,6 +19,7 @@
 import java.io.OutputStream;
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Serializable;
 import java.net.URI;
 import java.net.URL;
 import java.util.Map;
@@ -26,11 +27,11 @@
 /**
  * @version $Rev:  $ $Date:  $
  */
-public interface WebServiceContainer {
+public interface WebServiceContainer extends Serializable {
=20
     void invoke(Request request, Response response) throws Exception;
=20
-    void getWsdl(OutputStream out) throws Exception;
+    void getWsdl(Request req, Response res) throws Exception;
=20
     public interface Request {
         /** the HTTP OPTIONS type */