[jboss-cvs] JBossAS SVN: r79134 - trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer.

[jboss-cvs-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-10-06 05:46:01 -0400 (Mon, 06 Oct 2008)
New Revision: 79134

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] touching deployer hooks to accept Endpoint.START lifecycle methods too

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java	2008-10-06 09:44:40 UTC (rev 79133)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java	2008-10-06 09:46:01 UTC (rev 79134)
@@ -24,6 +24,8 @@
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentState;
+
 import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState;
 
 /**
@@ -41,7 +43,8 @@
          super.deploy(unit); // Calls create 
 
          Deployment dep = unit.getAttachment(Deployment.class);
-         if(null==dep || DeploymentState.CREATED != dep.getState())
+         boolean expectedState = DeploymentState.CREATED == dep.getState() || DeploymentState.STARTED == dep.getState(); 
+         if (null == dep || !expectedState)
             throw new DeploymentException("Create step failed");
 
          // execute the 'start' step

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java	2008-10-06 09:44:40 UTC (rev 79133)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java	2008-10-06 09:46:01 UTC (rev 79134)
@@ -24,6 +24,7 @@
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentState;
 import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
 import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState;
 
@@ -47,7 +48,8 @@
       if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
       {
          Deployment dep = getDeployment(unit);
-         if(null==dep || DeploymentState.CREATED != dep.getState())
+         boolean expectedState = DeploymentState.CREATED == dep.getState() || DeploymentState.STARTED == dep.getState(); 
+         if (null == dep || !expectedState)
             throw new DeploymentException("Create step is missing");
 
          // execute the 'start' step

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java	2008-10-06 09:44:40 UTC (rev 79133)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java	2008-10-06 09:46:01 UTC (rev 79134)
@@ -44,7 +44,8 @@
       if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
       {
          Deployment dep = getDeployment(unit);
-         if (null == dep || DeploymentState.CREATED != dep.getState())
+         boolean expectedState = DeploymentState.CREATED == dep.getState() || DeploymentState.STARTED == dep.getState(); 
+         if (null == dep || !expectedState)
             throw new DeploymentException("Create step failed");
 
          // execute the 'start' step