[jbossws-commits] JBossWS SVN: r8353 - stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-10-06 12:38:52 -0400 (Mon, 06 Oct 2008)
New Revision: 8353

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] removed useless startEndpoint method + improved javadoc

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java	2008-10-06 16:37:22 UTC (rev 8352)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java	2008-10-06 16:38:52 UTC (rev 8353)
@@ -28,7 +28,7 @@
 import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
 
 /**
- * Endpoint servlet that has WS framework aspects support
+ * Endpoint servlet with WS framework aspects support called on servlet lifecycle methods
  * @author richard.opalka at jboss.com
  */
 public class AspectizedEndpointServlet extends EndpointServlet

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java	2008-10-06 16:37:22 UTC (rev 8352)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java	2008-10-06 16:38:52 UTC (rev 8353)
@@ -29,9 +29,7 @@
 import org.jboss.wsf.spi.SPIProviderResolver;
 import org.jboss.wsf.spi.invocation.RequestHandler;
 import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
 import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
 import org.jboss.wsf.spi.management.EndpointRegistry;
 import org.jboss.wsf.spi.management.EndpointRegistryFactory;
 
@@ -49,7 +47,6 @@
  * A servlet that is installed for every web service endpoint.
  * @author richard.opalka at jboss.com
  * @author Thomas.Diesler at jboss.org
- * @since 25-Apr-2007
  */
 public class EndpointServlet extends HttpServlet
 {
@@ -65,7 +62,7 @@
       this.initRegistry();
       this.initDeploymentAspectManager();
       String contextPath = servletConfig.getServletContext().getContextPath();
-      initServiceEndpoint(contextPath);
+      this.initServiceEndpoint(contextPath);
    }
    
    protected void initRegistry()
@@ -74,22 +71,6 @@
       epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
    }
    
-   /**
-    * Template method
-    */
-   protected void initDeploymentAspectManager()
-   {
-      // does nothing (because of BC)
-   }
-   
-   /**
-    * Template method
-    */
-   protected void callRuntimeAspects()
-   {
-      // does nothing (because of BC)
-   }
-   
    public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
    {
       try
@@ -112,7 +93,6 @@
       this.setRuntimeLoader();
       this.callRuntimeAspects();
       this.initEndpointConfig();
-      this.startEndpoint();
    }
    
    private void setRuntimeLoader()
@@ -126,17 +106,6 @@
       }
    }
 
-   private void startEndpoint()
-   {
-      // Start the endpoint
-      Deployment dep = endpoint.getService().getDeployment();
-      if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE)
-      {
-         if (endpoint.getState() == EndpointState.CREATED)
-            endpoint.getLifecycleHandler().start(endpoint);
-      }
-   }
-
    private void initEndpointConfig()
    {
       // read the config name/file from web.xml
@@ -169,4 +138,21 @@
       }
 
    }
+
+   /**
+    * Template method
+    */
+   protected void initDeploymentAspectManager()
+   {
+      // does nothing (because of BC)
+   }
+   
+   /**
+    * Template method
+    */
+   protected void callRuntimeAspects()
+   {
+      // does nothing (because of BC)
+   }
+   
 }