Author: dblevins
Date: Tue Apr  5 01:03:00 2005
New Revision: 160141

URL: http://svn.apache.org/viewcvs?view=rev&rev=160141
Log:
Remainder of rewritten POJO WebService support

Modified:
    
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java
    geronimo/trunk/modules/webservices/project.xml
    
geronimo/trunk/modules/webservices/src/java/org/apache/geronimo/webservices/WebServiceContainer.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?view=diff&r1=160140&r2=160141
==============================================================================
--- 
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java
 (original)
+++ 
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java
 Tue Apr  5 01:03:00 2005
@@ -117,7 +117,9 @@
             throw new DeploymentException("Unable to load servlet class for 
pojo webservice: "+seiClassName, e);
         }
 
-        RPCProvider provider = new POJOProvider(pojoClass);
+        targetGBean.setAttribute("pojoClassName", seiClassName);
+        RPCProvider provider = new POJOProvider();
+
         SOAPService service = new SOAPService(null, provider, null);
         service.setServiceDescription(serviceDesc);
         service.setOption("className", seiClassName);

Modified: geronimo/trunk/modules/webservices/project.xml
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/webservices/project.xml?view=diff&r1=160140&r2=160141
==============================================================================
--- geronimo/trunk/modules/webservices/project.xml (original)
+++ geronimo/trunk/modules/webservices/project.xml Tue Apr  5 01:03:00 2005
@@ -69,6 +69,18 @@
             <version>${geronimo_version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jaxrpc</artifactId>
+            <version>${geronimo_spec_jaxrpc_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-servlet</artifactId>
+            <version>${geronimo_spec_servlet_version}</version>
+        </dependency>
+
         <!-- Thirdparty -->
 
         <dependency>

Modified: 
geronimo/trunk/modules/webservices/src/java/org/apache/geronimo/webservices/WebServiceContainer.java
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/webservices/src/java/org/apache/geronimo/webservices/WebServiceContainer.java?view=diff&r1=160140&r2=160141
==============================================================================
--- 
geronimo/trunk/modules/webservices/src/java/org/apache/geronimo/webservices/WebServiceContainer.java
 (original)
+++ 
geronimo/trunk/modules/webservices/src/java/org/apache/geronimo/webservices/WebServiceContainer.java
 Tue Apr  5 01:03:00 2005
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2005 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.
@@ -28,6 +28,20 @@
  */
 public interface WebServiceContainer extends Serializable {
 
+    /**
+     * Used when this WebServiceContainer is servicing a POJO, in which case
+     * the pojo instance is held by the enclosing servlet/invoker and passed in
+     * the Request instance to the container.
+     */
+    public static final String POJO_INSTANCE = 
WebServiceContainer.class.getName()+"@pojoInstance";
+
+    /**
+     * Used when this WebServiceContainer is servicing a POJO implementing the
+     * ServiceLifecycle interface, in which case the WebServiceContainer is 
expected
+     * to put the JAX-RPC MessageContext it creates in the Request instance.
+     */
+    public static final String MESSAGE_CONTEXT = 
WebServiceContainer.class.getName()+"@MessageContext";
+
     void invoke(Request request, Response response) throws Exception;
 
     void getWsdl(Request req, Response res) throws Exception;
@@ -89,6 +103,10 @@
         String getParameter(String name);
 
         Map getParameters();
+
+        Object getAttribute(String name);
+
+        void setAttribute(String name, Object value);
     }
 
     public interface Response {


Reply via email to