[jbossws-commits] JBossWS SVN: r6462 - in container/jboss42/branches/jbossws-jboss423/src/main: resources and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-04-17 05:37:37 -0400 (Thu, 17 Apr 2008)
New Revision: 6462

Modified:
   container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java
   container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java
   container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
   container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
   container/jboss42/branches/jbossws-jboss423/src/main/resources/jbossws-jboss42-config.xml
Log:
Fix remaining EJb3 deployment errors

Modified: container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java
===================================================================
--- container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java	2008-04-17 08:38:57 UTC (rev 6461)
+++ container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java	2008-04-17 09:37:37 UTC (rev 6462)
@@ -22,16 +22,36 @@
 package org.jboss.wsf.container.jboss42;
 
 import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.DeploymentException;
 
 //$Id$
 
 /**
- * An abstract deployer for EJB Endpoints
+ * An abstract deployer for EJB Endpoints.
+ * Enganges the START lifecylcle of an endpoint.
  *
  * @author Thomas.Diesler at jboss.org
+ * @author Heiko.Braun at jboss.com
+ * 
  * @since 25-Apr-2007
  */
 public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook
 {
-   
+   public void deploy(DeploymentInfo unit) throws DeploymentException
+   {
+      if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
+      {
+         super.deploy(unit); // Calls create
+         
+         log.debug("deploy: " + unit.shortName);
+         Deployment dep = getDeployment(unit);
+         if (dep == null  || (dep.getState() != Deployment.DeploymentState.CREATED) )
+            throw new DeploymentException("Create step failed");
+
+         getRuntime().start(dep);         
+
+         unit.context.put(Deployment.class, dep);
+      }
+   }
 }

Modified: container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java
===================================================================
--- container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java	2008-04-17 08:38:57 UTC (rev 6461)
+++ container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java	2008-04-17 09:37:37 UTC (rev 6462)
@@ -43,6 +43,9 @@
  * A deployer JAXRPC JSE Endpoints
  *
  * @author Thomas.Diesler at jboss.org
+ * @author Heiko.Braun at jboss.com
+ *
+ * @see org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect#create(org.jboss.wsf.spi.deployment.Deployment, org.jboss.wsf.spi.WSFRuntime) 
  * @since 25-Apr-2007
  */
 public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE
@@ -101,7 +104,8 @@
                ClassLoader loader = dep.getInitialClassLoader();
                Class<?> epBean = loader.loadClass(servletClass.trim());
 
-               // If this is a servlet we defer the the bean creation 
+               // If this is a servlet we defer the the bean creation
+               // See ModifyWebMetaDataDeploymentAspect#create(Deployment dep, WSFRuntime runtime)
                if (javax.servlet.Servlet.class.isAssignableFrom(epBean))
                   servletClass = null;
             }

Modified: container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java	2008-04-17 08:38:57 UTC (rev 6461)
+++ container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java	2008-04-17 09:37:37 UTC (rev 6462)
@@ -120,18 +120,4 @@
       }
       return isWebServiceBean;
    }
-
-
-   public void deploy(DeploymentInfo unit) throws DeploymentException
-   {
-      super.deploy(unit);
-
-      Deployment dep = getDeployment(unit);
-      if (dep == null)
-      {
-         throw new IllegalStateException("Deployment missing in start phase");
-      }
-
-      getRuntime().start(dep);
-   }
 }
\ No newline at end of file

Modified: container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
===================================================================
--- container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java	2008-04-17 08:38:57 UTC (rev 6461)
+++ container/jboss42/branches/jbossws-jboss423/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java	2008-04-17 09:37:37 UTC (rev 6462)
@@ -23,10 +23,10 @@
 
 //$Id$
 
+import org.jboss.wsf.spi.WSFRuntime;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.DeploymentAspect;
 import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.WSFRuntime;
 
 /**
  * A deployer that modifies the web.xml meta data 

Modified: container/jboss42/branches/jbossws-jboss423/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss423/src/main/resources/jbossws-jboss42-config.xml	2008-04-17 08:38:57 UTC (rev 6461)
+++ container/jboss42/branches/jbossws-jboss423/src/main/resources/jbossws-jboss42-config.xml	2008-04-17 09:37:37 UTC (rev 6462)
@@ -7,7 +7,9 @@
  <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/>
 
  <!-- The HTTPServer used by the JAXWS Endpoint API -->
- <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/>
+ <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer">
+    <property name="runtimeName">EndpointAPIRuntime</property>
+ </bean>
 
  <!-- Bind Service objects in client environment context  -->
  <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>