[jbossws-commits] JBossWS SVN: r7140 - in container/jboss50/branches/jbossws-jboss500/src/main: resources/jbossws-jboss50-container.jar/META-INF and 1 other directory.

Author: richard.opalka(a)jboss.com Date: 2008-05-22 11:27:38 -0400 (Thu, 22 May 2008) New Revision: 7140 Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml Log: [JBWS-2188] implement missing bits - deployment factory must be called in endpoint API transport Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-05-22 14:58:31 UTC (rev 7139) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-05-22 15:27:38 UTC (rev 7140) @@ -35,6 +35,7 @@ import java.net.URI; import java.net.URISyntaxException; +import java.net.URL; import java.util.Map; import java.util.HashMap; @@ -44,6 +45,7 @@ public class EndpointAPIHttpTransportManager implements TransportManager { private static final String PROCESSED_BY_DEPLOYMENT_FACTORY = "processed.by.deployment.factory"; + private WebAppDeploymentFactory deploymentFactory; private WebAppGenerator generator; private Map<String, Deployment> deploymentRegistry = new HashMap<String, Deployment>(); @@ -63,7 +65,8 @@ Boolean alreadyDeployed = (Boolean)topLevelDeployment.getProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); if ((alreadyDeployed == null) || (false == alreadyDeployed)) { - generator.create(topLevelDeployment); + URL webAppURL = generator.create(topLevelDeployment); + deploymentFactory.create(topLevelDeployment, webAppURL); topLevelDeployment.setProperty(PROCESSED_BY_DEPLOYMENT_FACTORY, Boolean.TRUE); } @@ -102,12 +105,24 @@ Boolean alreadyDeployed = (Boolean)dep.getProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); if ((alreadyDeployed != null) && (true == alreadyDeployed)) { - deploymentRegistry.remove(ref.getUUID()); + try + { + deploymentFactory.destroy(dep); + } + finally + { + deploymentRegistry.remove(ref.getUUID()); + } dep.removeProperty(PROCESSED_BY_DEPLOYMENT_FACTORY); } } } + public void setDeploymentFactory(WebAppDeploymentFactory deploymentFactory) + { + this.deploymentFactory = deploymentFactory; + } + public void setGenerator(WebAppGenerator generator) { this.generator = generator; Modified: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-05-22 14:58:31 UTC (rev 7139) +++ container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-05-22 15:27:38 UTC (rev 7140) @@ -83,6 +83,7 @@ <bean name="EndpointAPIHttpTransport" class="org.jboss.wsf.container.jboss50.transport.EndpointAPIHttpTransportManager"> <property name="generator"><inject bean="WSWebAppGenerator"/></property> + <property name="deploymentFactory"><inject bean="WSWebAppDeploymentFactory"/></property> </bean> <!-- Dynamically creates web apps in memory -->