[jbossws-commits] JBossWS SVN: r8640 - in container/jboss42/trunk: src/main/java/org/jboss/wsf/container/jboss42 and 1 other directories.

Author: richard.opalka(a)jboss.com Date: 2008-11-03 10:04:22 -0500 (Mon, 03 Nov 2008) New Revision: 8640 Removed: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/transport/ Modified: container/jboss42/trunk/pom.xml container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml Log: [JBWS-2338] removing WSFRuntime abstraction Modified: container/jboss42/trunk/pom.xml =================================================================== --- container/jboss42/trunk/pom.xml 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/pom.xml 2008-11-03 15:04:22 UTC (rev 8640) @@ -24,8 +24,8 @@ <!-- Properties --> <properties> - <jbossws.common.version>1.0.7.GA</jbossws.common.version> - <jbossws.spi.version>1.0.6.GA</jbossws.spi.version> + <jbossws.common.version>1.0.8-SNAPSHOT</jbossws.common.version> + <jbossws.spi.version>1.0.7-SNAPSHOT</jbossws.spi.version> <!-- To deploy-file to snapshot repo do: Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -28,7 +28,6 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.WSFRuntime; import org.jboss.wsf.spi.deployment.*; import javax.management.MBeanServer; @@ -37,11 +36,8 @@ /** * An abstract web service deployer. - * Lazily adds deployer hooks to the deployment interceptors. - * Otherwise the dependency management at boot time doesn't work. - * + * * @author Thomas.Diesler(a)jboss.org - * @author Heiko.Braun(a)jboss.com * @since 25-Apr-2007 */ public abstract class AbstractDeployerHook implements DeployerHook @@ -49,24 +45,29 @@ // provide logging protected final Logger log = Logger.getLogger(getClass()); - private WSFRuntime runtime; + private DeploymentAspectManager deploymentAspectManager; private DeploymentModelFactory deploymentModelFactory; private List<ObjectName> phaseOneInterceptors; private List<ObjectName> phaseTwoInterceptors; - /** - * MC injected - * @param runtime - */ - public void setRuntime(WSFRuntime runtime) + protected String deploymentManagerName; + + /** MC provided property **/ + public void setDeploymentManagerName(String deploymentManagerName) { - this.runtime = runtime; + this.deploymentManagerName = deploymentManagerName; } + + public DeploymentAspectManager getDeploymentAspectManager() + { + if(null == deploymentAspectManager) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager( deploymentManagerName ); + } - public WSFRuntime getRuntime() - { - return this.runtime; + return deploymentAspectManager; } public DeploymentModelFactory getDeploymentModelFactory() @@ -133,6 +134,7 @@ */ public void start() { + MBeanServer server = MBeanServerLocator.locateJBoss(); try { Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -22,34 +22,14 @@ package org.jboss.wsf.container.jboss42; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.DeploymentException; /** - * An abstract deployer for EJB Endpoints. - * Enganges the START lifecylcle of an endpoint. + * An abstract deployer for EJB Endpoints * * @author Thomas.Diesler(a)jboss.org - * @author Heiko.Braun(a)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/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -92,8 +92,7 @@ dep.addAttachment(DeploymentInfo.class, unit); } - getRuntime().create(dep); - + getDeploymentAspectManager().deploy(dep); unit.context.put(Deployment.class, dep); } } @@ -107,8 +106,7 @@ if (dep != null) { log.debug("undeploy: " + unit.shortName); - getRuntime().stop(dep); - getRuntime().destroy(dep); + getDeploymentAspectManager().undeploy(dep); } } Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -24,7 +24,6 @@ import org.jboss.deployment.DeploymentInfo; 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 @@ -42,7 +41,7 @@ } @Override - public void create(Deployment dep, WSFRuntime runtime) + public void create(Deployment dep) { DeploymentInfo di = dep.getAttachment(DeploymentInfo.class); if (di == null) Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -22,7 +22,6 @@ package org.jboss.wsf.container.jboss42; import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.DeploymentException; import org.jboss.wsf.spi.deployment.Deployment; /** Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -21,21 +21,21 @@ */ package org.jboss.wsf.container.jboss42; +import javax.xml.ws.Endpoint; +import javax.xml.ws.WebServiceException; + import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.WSFRuntime; -import org.jboss.wsf.spi.WSFRuntimeLocator; import org.jboss.wsf.spi.deployment.AbstractExtensible; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspectManager; +import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.http.HttpContext; import org.jboss.wsf.spi.http.HttpContextFactory; import org.jboss.wsf.spi.http.HttpServer; -import javax.xml.ws.Endpoint; -import javax.xml.ws.WebServiceException; - /** * A HTTP Server that uses DeploymentAspects * @@ -44,14 +44,6 @@ */ public class DeploymentAspectHttpServer extends AbstractExtensible implements HttpServer { - private String runtimeName; - - - public void setRuntimeName(String runtimeName) - { - this.runtimeName = runtimeName; - } - /** Start an instance of this HTTP server */ public void start() { @@ -90,11 +82,9 @@ service.addEndpoint(ep); // Deploy using deployment aspects - WSFRuntimeLocator locator = spiProvider.getSPI(WSFRuntimeLocator.class); - WSFRuntime runtime = locator.locateRuntime(runtimeName); - - runtime.create(dep); - runtime.start(dep); + DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class); + DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI"); + depManager.deploy(dep); } catch (RuntimeException rte) { Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -24,7 +24,6 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.DeploymentException; /** * A deployer JAXRPC JSE Endpoints @@ -35,22 +34,6 @@ public class JAXRPCDeployerHookPostJSE extends DeployerHookPostJSE { - public void deploy(DeploymentInfo unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - if (!ignoreDeployment(unit) && isWebServiceDeployment(unit)) - { - log.debug("deploy: " + unit.shortName); - Deployment dep = getDeployment(unit); - if(null==dep || Deployment.DeploymentState.CREATED != dep.getState()) - throw new DeploymentException("Create step is missing"); - - getRuntime().start(dep); - } - } - /** Get the deployment type this deployer can handle */ public Deployment.DeploymentType getDeploymentType() Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -39,21 +39,12 @@ /** * A deployer JAXRPC JSE Endpoints - * * @author Thomas.Diesler(a)jboss.org - * @author Heiko.Braun(a)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 { - public void undeploy(DeploymentInfo unit) - { - // the post hook deals with undeployment - } - /** Get the deployemnt type this deployer can handle */ public DeploymentType getDeploymentType() @@ -103,7 +94,6 @@ Class<?> epBean = loader.loadClass(servletClass.trim()); // 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/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -25,7 +25,6 @@ import javax.xml.ws.WebServiceProvider; import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.DeploymentException; import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.mdb.MessagingContainer; Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -22,7 +22,6 @@ package org.jboss.wsf.container.jboss42; import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.DeploymentException; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; @@ -32,24 +31,6 @@ public class JAXWSDeployerHookPostJSE extends DeployerHookPostJSE { - - public void deploy(DeploymentInfo unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - if (!ignoreDeployment(unit) && isWebServiceDeployment(unit)) - { - log.debug("deploy: " + unit.shortName); - Deployment dep = getDeployment(unit); - - if (null == dep || Deployment.DeploymentState.CREATED != dep.getState()) - throw new DeploymentException("Create step failed"); - - getRuntime().start(dep); - } - } - /** Get the deployment type this deployer can handle */ public Deployment.DeploymentType getDeploymentType() Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -50,12 +50,6 @@ public class JAXWSDeployerHookPreJSE extends AbstractDeployerHookJSE { - - public void undeploy(DeploymentInfo unit) - { - // let the post deployer hook deal with undeployment - } - /** Get the deployemnt type this deployer can handle */ public DeploymentType getDeploymentType() Deleted: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -1,143 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.container.jboss42; - -import org.jboss.wsf.spi.WSFRuntime; -import org.jboss.wsf.spi.ComposableRuntime; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.invocation.RequestHandlerFactory; -import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.transport.TransportManagerFactory; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspectManager; - -/** - * Lazy assembly required because MC 1.0.x doesn't support IOC - * across different beans configurations. - * - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class LazyAssemblyWSFRuntime implements WSFRuntime, ComposableRuntime -{ - - private boolean assembled; - private String runtimeName; - private TransportManagerFactory tmf; - private RequestHandlerFactory rhf; - private InvocationHandlerFactory ihf; - private DeploymentAspectManager dam; - private EndpointRegistry reg; - - public void setRuntimeName(String runtimeName) - { - this.runtimeName = runtimeName; - } - - public void create(Deployment deployment) - { - assemble(); - dam.create(deployment, this); - } - - public void start(Deployment deployment) - { - assemble(); - dam.start(deployment, this); - } - - public void stop(Deployment deployment) - { - assemble(); - dam.stop(deployment, this); - } - - public void destroy(Deployment deployment) - { - assemble(); - dam.destroy(deployment, this); - } - - - public void setTransportManagerFactory(TransportManagerFactory factory) - { - this.tmf = factory; - } - - public TransportManagerFactory getTransportManagerFactory() - { - return this.tmf; - } - - public void setEndpointRegistry(EndpointRegistry endpointRegistry) - { - this.reg = endpointRegistry; - } - - public EndpointRegistry getEndpointRegistry() - { - return this.reg; - } - - public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager) - { - this.dam = deploymentManager; - } - - public DeploymentAspectManager getDeploymentAspectManager() - { - return this.dam; - } - - public void setRequestHandlerFactory(RequestHandlerFactory factory) - { - this.rhf = factory; - } - - public RequestHandlerFactory getRequestHandlerFactory() - { - return this.rhf; - } - - public void setInvocationHandlerFactory(InvocationHandlerFactory factory) - { - this.ihf = factory; - } - - public InvocationHandlerFactory getInvocationHandlerFactory() - { - return this.ihf; - } - - private void assemble() - { - if(!assembled) - { - SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); - RequestHandlerFactory rhFactory = provider.getSPI(RequestHandlerFactory.class); - setRequestHandlerFactory(rhFactory); - - assembled = true; - } - } -} Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -21,7 +21,6 @@ */ package org.jboss.wsf.container.jboss42; -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; @@ -41,7 +40,7 @@ this.webXMLRewriter = serviceEndpointPublisher; } - public void create(Deployment dep, WSFRuntime runtime) + public void create(Deployment dep) { RewriteResults results = webXMLRewriter.rewriteWebXml(dep); Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -25,7 +25,6 @@ import org.jboss.metadata.WebMetaData; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.WSFRuntime; /** * Determines the correct runtime loader for per deployment type @@ -36,7 +35,7 @@ public class RuntimeLoaderDeploymentAspect extends DeploymentAspect { - public void start(Deployment dep, WSFRuntime runtime) + public void create(Deployment dep) { // JSE endpoints Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2008-11-03 15:04:22 UTC (rev 8640) @@ -34,7 +34,6 @@ 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 @@ -54,7 +53,7 @@ this.webXMLRewriter = serviceEndpointPublisher; } - public void create(Deployment dep, WSFRuntime runtime) + public void create(Deployment dep) { URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url"); if (warURL == null) Modified: container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-11-03 14:34:48 UTC (rev 8639) +++ container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-11-03 15:04:22 UTC (rev 8640) @@ -1,324 +1,287 @@ -<!-- Locate the single instance of the kernel --> - <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> + <!-- Locate the single instance of the kernel --> + <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - </bean> + </bean> + + <!-- Locate the single instance of the MBeanServer --> + <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"/> - <!-- Locate the single instance of the MBeanServer --> - <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/> + <!-- Bind Service objects in client environment context --> + <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/> - <!-- The HTTPServer used by the JAXWS Endpoint API --> - <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"> - <property name="runtimeName">EndpointAPIRuntime</property> - </bean> + <!-- JBoss_4_2_0_GA uses this hardcoded bean name --> + <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/> - <!-- Bind Service objects in client environment context --> - <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/> + <!-- + ********************************************************************************************************************* + Web Service deployment + + There are three deployer interceptors registered with the JBoss Deployers. + + 1) DeployerInterceptorJSE + 2) DeployerInterceptorEJB21 + 3) DeployerInterceptorEJB3 + + Each interceptor has a number of DeployerHooks registerd with it + + Conceptually, each of these hooks implements the following pattern: + + DployerHook.deploy(unit) + if(isWebServiceDeployment) + Deployment dep = createDeployment(unit) + DeploymentAspectManager.deploy(dep) + + DeployerHook.undeploy(unit) + Deployment dep = getDeployment(unit) + DeploymentAspectManager.undeploy(dep) + + Each deployer hook has a web service DeployerManager injected into it. + A web service DeployerManager maintains a list of Deployers, each of which + handles a single aspect of web service deployment. + + Finally, each Endpoint is registered with the EndpointRegistry. + + ********************************************************************************************************************* + --> + + <!-- + Register DeployerHooks with JBoss deployers + --> - <!-- JBoss_4_2_0_GA uses this hardcoded bean name --> - <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/> - - <!-- - ********************************************************************************************************************* - Web Service deployment - - There are three deployer interceptors registered with the JBoss Deployers. - - 1) DeployerInterceptorJSE - 2) DeployerInterceptorEJB21 - 3) DeployerInterceptorEJB3 - - Each interceptor has a number of DeployerHooks registerd with it - - Conceptually, each of these hooks implements the following pattern: - - DployerHook.deploy(unit) - if(isWebServiceDeployment) - Deployment dep = createDeployment(unit) - DeploymentAspectManager.deploy(dep) - - DeployerHook.undeploy(unit) - Deployment dep = getDeployment(unit) - DeploymentAspectManager.undeploy(dep) - - Each deployer hook has a web service DeployerManager injected into it. - A web service DeployerManager maintains a list of Deployers, each of which - handles a single aspect of web service deployment. - - Finally, each Endpoint is registered with the EndpointRegistry. - - ********************************************************************************************************************* - --> - - <!-- - Register DeployerHooks with JBoss deployers - --> - - <!-- Phase 1 --> - <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE"> - <property name="runtime"><inject bean="WebserviceJSERuntime"/></property> + <!-- Phase 1 --> + <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> <property name="phaseOneInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorJSE</value> - </list> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> </property> - </bean> + </bean> - <!-- Phase 2 --> - <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE"> - <property name="runtime"><inject bean="WebserviceJSERuntime"/></property> + <!-- Phase 2 --> + <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> <property name="phaseTwoInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorJSE</value> - </list> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> </property> - </bean> + </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> - <property name="runtime"><inject bean="WebserviceEJBRuntime"/></property> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> <property name="phaseTwoInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorEJB21</value> - </list> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + </list> </property> - </bean> + </bean> - <!-- Phase 1 --> - <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE"> - <property name="runtime"><inject bean="WebserviceJSERuntime"/></property> + <!-- Phase 1 --> + <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> <property name="phaseOneInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorJSE</value> - </list> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> </property> - </bean> + </bean> - <!-- Phase 2 --> - <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE"> - <property name="runtime"><inject bean="WebserviceJSERuntime"/></property> + <!-- Phase 2 --> + <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> <property name="phaseTwoInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorJSE</value> - </list> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> </property> - </bean> + </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> - <property name="runtime"><inject bean="WebserviceEJBRuntime"/></property> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> <property name="phaseTwoInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorEJB3</value> - </list> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB3</value> + </list> </property> - </bean> - - <!-- - ********************************************************************************************************************* - Main WSFRuntimes. - --> - - <bean name="WebserviceJSERuntime" class="org.jboss.wsf.container.jboss42.LazyAssemblyWSFRuntime"> - <property name="runtimeName">WebserviceJSERuntime</property> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> - <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property> - - <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property> - </bean> - - <bean name="WebserviceEJBRuntime" class="org.jboss.wsf.container.jboss42.LazyAssemblyWSFRuntime"> - <property name="runtimeName">WebserviceEJBRuntime</property> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> - <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property> - - <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property> - </bean> - - <bean name="EndpointAPIRuntime" class="org.jboss.wsf.container.jboss42.LazyAssemblyWSFRuntime"> - <property name="runtimeName">EndpointAPIRuntime</property> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> - <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property> - - <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property> - </bean> - - - <!-- - ********************************************************************************************************************* - WSFRuntimes Components - --> - - <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> - - <!-- invcocation handling --> - <bean name="InvocationHandlerFactory" class="org.jboss.wsf.container.jboss42.InvocationHandlerFactoryImpl"/> - - <!-- - ********************************************************************************************************************* - Each DeploymentAspectManger maintains a list of DeploymentAspects - --> - <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerJSE</property> - </bean> - <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + </bean> + + <!-- + Each DeploymentAspectManger maintains a list of DeploymentAspects + --> + <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerPreJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="name">WSDeploymentAspectManagerPostJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerEJB</property> - </bean> - <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + </bean> + <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerEndpointAPI</property> - </bean> - - <!-- - The container deployment aspects - --> - <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect"> - <property name="provides">ContainerMetaData,VFSRoot</property> + </bean> + + <!-- + The container deployment aspects + --> + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData, VFSRoot</property> <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> - </bean> - - <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> + </bean> + + <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">ContextRoot</property> - </bean> + </bean> + + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property> + </bean> - <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> - <property name="provides">ContainerMetaData,RuntimeLoader,URLPattern,VFSRoot</property> - </bean> - - <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> - </bean> - - <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + </bean> + + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> <property name="requires">ContainerMetaData</property> - <property name="provides">ContainerEndpointHandler</property> - </bean> - - <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <property name="provides">ContainerEndpointHandler</property> + </bean> + + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> <property name="requires">LAST_DEPLOYMENT_ASPECT</property> - </bean> + </bean> - <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect"> - <property name="provides">EndpointMetrics</property> - </bean> - - <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect"> + <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect"> + <property name="provides">EndpointMetrics</property> + </bean> + + <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointName</property> - </bean> - - <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> + </bean> + + <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> <property name="requires">EndpointName</property> <property name="provides">RegisteredEndpoint</property> - <depends>WSEndpointRegistry</depends> - </bean> - - <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect"> - <property name="requires">ContextProperties,ContainerMetaData,StackDescriptor,WebMetaData</property> + </bean> + + <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect"> + <property name="requires">ContextProperties, ContainerMetaData, StackDescriptor</property> <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> - </bean> - - <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect"> + </bean> + + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">RuntimeLoader</property> - </bean> - - <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> - <property name="requires">ContextRoot,ContainerMetaData</property> + </bean> + + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> + <property name="requires">ContextRoot, ContainerMetaData</property> <property name="provides">URLPattern</property> - </bean> - - <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect"> - <property name="requires">WebMetaData,ContextProperties</property> + </bean> + + <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect"> + <property name="requires">WebMetaData, ContextProperties</property> <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> - </bean> - - <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect"> + </bean> + + <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">WebMetaData</property> <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> - </bean> + </bean> - <bean name="WSFakeWebMetaDataDeploymentAspect" class="org.jboss.wsf.framework.deployment.IdentityDeploymentAspect"> - <property name="provides">WebMetaData</property> - </bean> - - <!-- Deployment aspect helper beans --> - <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/> - <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/> - <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter"> + <!-- Deployment aspect helper beans --> + <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/> + <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/> + <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter"> <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property> <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property> <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> - </bean> - <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/> - <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/> - <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/> - <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/> - <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl"> + </bean> + <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/> + <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> - </bean> + </bean> + + <!-- Deployment aspect installers --> + <!-- Phase 1 --> + <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + </set> + </property> + </bean> - <!-- Deployment aspect installers --> - <!-- Phase 1 --> - <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <!-- Phase 2 --> + <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSContainerMetaDataDeploymentAspect"/> - <inject bean="WSContextRootDeploymentAspect"/> - <inject bean="WSEndpointAddressDeploymentAspect"/> - <inject bean="WSEndpointHandlerDeploymentAspect"/> - <inject bean="WSEndpointMetricsDeploymentAspect"/> - <inject bean="WSEndpointNameDeploymentAspect"/> - <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSModifyWebMetaDataDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> - <inject bean="WSEndpointLifecycleDeploymentAspect"/> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> - <inject bean="WSFakeWebMetaDataDeploymentAspect"/> - </set> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + </set> </property> - </bean> + <depends>WSDeploymentAspectInstallerPreJSE</depends> + </bean> - <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSContainerMetaDataDeploymentAspect"/> - <inject bean="WSContextRootDeploymentAspect"/> - <inject bean="WSEndpointAddressDeploymentAspect"/> - <inject bean="WSEndpointHandlerDeploymentAspect"/> - <inject bean="WSEndpointLifecycleDeploymentAspect"/> - <inject bean="WSEndpointMetricsDeploymentAspect"/> - <inject bean="WSEndpointNameDeploymentAspect"/> - <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> - <inject bean="WSWebAppDeploymentAspect"/> - <inject bean="WSWebAppGeneratorDeploymentAspect"/> - </set> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> </property> - </bean> + </bean> - <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSEndpointAPIDeploymentAspect"/> - <inject bean="WSEndpointAddressDeploymentAspect"/> - <inject bean="WSEndpointHandlerDeploymentAspect"/> - <inject bean="WSEndpointLifecycleDeploymentAspect"/> - <inject bean="WSEndpointMetricsDeploymentAspect"/> - <inject bean="WSEndpointNameDeploymentAspect"/> - <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSWebAppDeploymentAspect"/> - <inject bean="WSWebAppGeneratorDeploymentAspect"/> - </set> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> </property> - </bean> + </bean>