Author: heiko.braun(a)jboss.com Date: 2008-05-06 07:55:41 -0400 (Tue, 06 May 2008) New Revision: 6903 Modified: container/jboss50/branches/jbossws-jboss500/pom.xml container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java Log: added missing ejb3-core dependency Modified: container/jboss50/branches/jbossws-jboss500/pom.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/pom.xml 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/pom.xml 2008-05-06 11:55:41 UTC (rev 6903) @@ -19,7 +19,7 @@ <properties> <!-- JBoss component versions taken from - http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-ma... + https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_Beta4/webservices/po... --> </properties> @@ -27,8 +27,12 @@ <!-- DependencyManagement --> <dependencyManagement> <dependencies> - <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>5.0.0.Beta4</version> + </dependency> + <dependency> <groupId>org.jboss.security</groupId> <artifactId>jboss-security-spi-bare</artifactId> <version></version> @@ -43,6 +47,7 @@ <artifactId>jboss-common-core</artifactId> <version>2.2.3.GA</version> </dependency> + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> @@ -54,6 +59,12 @@ <version>0.1.2.Beta1</version> </dependency> <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3-core</artifactId> + <version>0.1.2.Beta1</version> + </dependency> + + <dependency> <groupId>org.jboss.aop</groupId> <artifactId>jboss-aop</artifactId> <version>2.0.0.CR7</version> @@ -78,6 +89,7 @@ <artifactId>jboss-as-j2se</artifactId> <version>5.0.0.Beta4</version> </dependency> + <dependency> <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> @@ -88,11 +100,23 @@ <artifactId>jboss-saaj</artifactId> <version>2.0.3.GA</version> </dependency> + <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> - <version>2.0.3.GA</version> + <version>3.0.2-SNAPSHOT</version> </dependency> + <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-deployers-spi</artifactId> @@ -113,17 +137,8 @@ <artifactId>jboss-deployers-core-spi</artifactId> <version>2.0.0.Beta10</version> </dependency> + <dependency> - <groupId>jboss</groupId> - <artifactId>jbossws-spi</artifactId> - <version>1.0.1.GA</version> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jbossws-common</artifactId> - <version>1.0.3.GA</version> - </dependency> - <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbosssx-client</artifactId> <version>2.0.2.Beta4</version> @@ -133,11 +148,6 @@ <artifactId>jboss-deployers-vfs-spi</artifactId> <version>2.0.0.Beta10</version> </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-server</artifactId> - <version>5.0.0.Beta4</version> - </dependency> </dependencies> </dependencyManagement> @@ -146,11 +156,11 @@ <!-- jbossws dependencies --> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common</artifactId> </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> </dependency> @@ -168,20 +178,22 @@ <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3-ext-API</artifactId> - <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3-core</artifactId> + </dependency> + <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbosssx-client</artifactId> </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> </dependency> Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -31,7 +31,6 @@ import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.WSFDeploymentException; import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; @@ -92,7 +91,7 @@ dep.addAttachment(DeploymentUnit.class, unit); } - getDeploymentAspectManager().deploy(dep); + getDeploymentAspectManager().create(dep, null); unit.addAttachment(Deployment.class, dep); } } @@ -106,7 +105,8 @@ if (dep != null) { log.debug("undeploy: " + unit.getName()); - getDeploymentAspectManager().undeploy(dep); + getDeploymentAspectManager().stop(dep, null); + getDeploymentAspectManager().destroy(dep, null); } } Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -26,6 +26,7 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that builds the UnifiedDeploymentInfo @@ -43,7 +44,7 @@ } @Override - public void create(Deployment dep) + public void create(Deployment dep, WSFRuntime runtime) { DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class); if (unit == null) Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -86,7 +86,8 @@ // Deploy using deployment aspects DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class); DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI"); - depManager.deploy(dep); + depManager.create(dep, null); + depManager.start(dep, null); } catch (RuntimeException rte) { Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -34,6 +34,7 @@ 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 @@ -44,7 +45,7 @@ public class ModifyWebMetaDataDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void create(Deployment dep, WSFRuntime runtime) { String servletClass = (String)dep.getProperty(WebAppDesciptorModifier.PROPERTY_WEBAPP_SERVLET_CLASS); if (servletClass == null) Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -27,6 +27,7 @@ import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.WSFRuntime; import org.jboss.ejb3.Ejb3Deployment; /** @@ -38,7 +39,7 @@ public class RuntimeLoaderDeploymentAspect extends DeploymentAspect { - public void create(Deployment dep) + public void start(Deployment dep, WSFRuntime runtime) { // JSE endpoints Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -36,6 +36,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.spi.WSFRuntime; /** * Publish the HTTP service endpoint to Tomcat @@ -62,7 +63,7 @@ this.webXMLRewriter = serviceEndpointPublisher; } - public void create(Deployment dep) + public void create(Deployment dep, WSFRuntime runtime) { URL warURL = (URL)dep.getProperty(WebAppDesciptorModifier.PROPERTY_WEBAPP_URL); if (warURL == null) @@ -88,7 +89,7 @@ } } - public void destroy(Deployment dep) + public void destroy(Deployment dep, WSFRuntime runtime) { URL warURL = (URL)dep.getProperty(WebAppDesciptorModifier.PROPERTY_WEBAPP_URL); if (warURL == null)