Author: heiko.braun(a)jboss.com Date: 2008-04-17 06:24:39 -0400 (Thu, 17 Apr 2008) New Revision: 6464 Modified: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml Log: Fix Ejb3 deployment errors and EndpoitnAPI calls Modified: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java =================================================================== --- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2008-04-17 09:39:24 UTC (rev 6463) +++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2008-04-17 10:24:39 UTC (rev 6464) @@ -22,6 +22,8 @@ package org.jboss.wsf.container.jboss42; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; //$Id$ @@ -33,5 +35,20 @@ */ 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-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2008-04-17 09:39:24 UTC (rev 6463) +++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2008-04-17 10:24:39 UTC (rev 6464) @@ -23,11 +23,8 @@ //$Id$ -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.deployment.DeploymentInfo; import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.mdb.MessagingContainer; @@ -35,10 +32,13 @@ import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; 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.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + /** * A deployer JAXWS EJB3 Endpoints * @@ -121,17 +121,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); - } } Modified: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml 2008-04-17 09:39:24 UTC (rev 6463) +++ container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml 2008-04-17 10:24:39 UTC (rev 6464) @@ -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"/>