Author: richard.opalka(a)jboss.com Date: 2008-05-16 14:59:44 -0400 (Fri, 16 May 2008) New Revision: 7066 Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java Log: sync with 501 integration Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java 2008-05-16 17:58:17 UTC (rev 7065) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java 2008-05-16 18:59:44 UTC (rev 7066) @@ -23,15 +23,12 @@ import org.jboss.logging.Logger; import org.jboss.wsf.spi.ComposableRuntime; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.WSFRuntime; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspectManager; import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; import org.jboss.wsf.spi.invocation.RequestHandlerFactory; import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; import org.jboss.wsf.spi.transport.TransportManagerFactory; /** @@ -53,8 +50,6 @@ private TransportManagerFactory transportManagerFactory; - boolean initialized; - public String getRuntimeName() { return runtimeName; @@ -70,22 +65,9 @@ public void create(Deployment deployment) { - init(); deploymentManager.create(deployment, this); } - private void init() - { - if(!initialized) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - this.endpointRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - this.requestHandlerFactory = spiProvider.getSPI(RequestHandlerFactory.class); - this.invocationHandlerFactory = spiProvider.getSPI(InvocationHandlerFactory.class); - initialized = true; - } - } - public void start(Deployment deployment) { deploymentManager.start(deployment, this); @@ -107,7 +89,7 @@ public void setTransportManagerFactory(TransportManagerFactory factory) { assert factory!=null; - log.info(runtimeName + " -> TransportManagerFactory: " + factory); + log.debug(runtimeName + " -> TransportManagerFactory: " + factory); this.transportManagerFactory = factory; } @@ -119,7 +101,7 @@ public void setEndpointRegistry(EndpointRegistry endpointRegistry) { assert endpointRegistry!=null; - log.info(runtimeName + " -> EndpointRegistry: " + endpointRegistry); + log.debug(runtimeName + " -> EndpointRegistry: " + endpointRegistry); this.endpointRegistry = endpointRegistry; } @@ -131,7 +113,7 @@ public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager) { assert deploymentManager!=null; - log.info(runtimeName + " -> DeploymentAspectManager: " + deploymentManager); + log.debug(runtimeName + " -> DeploymentAspectManager: " + deploymentManager); this.deploymentManager = deploymentManager; } @@ -143,7 +125,7 @@ public void setRequestHandlerFactory(RequestHandlerFactory factory) { assert factory!=null; - log.info(runtimeName + " -> RequestHandlerFactory: "+ factory); + log.debug(runtimeName + " -> RequestHandlerFactory: "+ factory); this.requestHandlerFactory = factory; } @@ -156,7 +138,7 @@ public void setInvocationHandlerFactory(InvocationHandlerFactory factory) { assert factory!=null; - log.info(runtimeName + " -> InvocationHandlerFactory: "+ factory); + log.debug(runtimeName + " -> InvocationHandlerFactory: "+ factory); this.invocationHandlerFactory = factory; } Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2008-05-16 17:58:17 UTC (rev 7065) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2008-05-16 18:59:44 UTC (rev 7066) @@ -38,30 +38,25 @@ */ public class RuntimeLoaderDeploymentAspect extends DeploymentAspect { - public void start(Deployment dep, WSFRuntime runtime) { - - // JSE endpoints - if (dep.getAttachment(JBossWebMetaData.class) != null) - { - JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class); - ClassLoader classLoader = webMetaData.getContextLoader(); - dep.setRuntimeClassLoader(classLoader); - } - // EJB3 endpoints - else if (dep.getAttachment(Ejb3Deployment.class) != null) + if (dep.getAttachment(Ejb3Deployment.class) != null) { dep.setRuntimeClassLoader(dep.getInitialClassLoader()); } - // EJB21 endpoints else if (dep.getAttachment(JBossMetaData.class) != null) { dep.setRuntimeClassLoader(dep.getInitialClassLoader()); } - + // JSE endpoints + else if (dep.getAttachment(JBossWebMetaData.class) != null) + { + JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class); + ClassLoader classLoader = webMetaData.getContextLoader(); + dep.setRuntimeClassLoader(classLoader); + } else { throw new IllegalArgumentException("Unable to determine runtime loader"); Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java 2008-05-16 17:58:17 UTC (rev 7065) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java 2008-05-16 18:59:44 UTC (rev 7066) @@ -23,19 +23,19 @@ //$Id$ -import java.net.URL; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.logging.Logger; import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.wsf.container.jboss50.WebAppDesciptorModifier; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; +import org.jboss.wsf.spi.transport.HttpSpec; +import java.net.URL; + /** * Build container independent deployment info. * @@ -82,7 +82,7 @@ if (dep instanceof ArchiveDeployment) { URL webURL = ((ArchiveDeployment)dep).getRootFile().toURL(); - dep.setProperty(WebAppDesciptorModifier.PROPERTY_WEBAPP_URL, webURL); + dep.setProperty(HttpSpec.PROPERTY_WEBAPP_URL, webURL); } }