Author: thomas.diesler(a)jboss.com Date: 2007-07-12 11:33:22 -0400 (Thu, 12 Jul 2007) New Revision: 3862 Modified: branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml Log: Use aspect installer Modified: branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-12 15:33:17 UTC (rev 3861) +++ branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-12 15:33:22 UTC (rev 3862) @@ -173,21 +173,11 @@ <bean name="WSClassLoaderInjectionDeploymentAspect" class="org.jboss.wsf.container.jboss50.ClassLoaderInjectionDeploymentAspect"> <property name="requires">AllowClassLoaderInjection</property> <property name="provides">ContainerClassLoader</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.spi.deployment.BackwardCompatibleContextRootDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">ContextRoot</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeploymentAspect"> @@ -199,88 +189,43 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeploymentAspect"> <property name="requires">LAST_DEPLOYMENT_ASPECT</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointMetricsDeploymentAspect"> <property name="endpointMetrics"><inject bean="WSEndpointMetrics"/></property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointNameDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointName</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeploymentAspect"> <property name="requires">EndpointName,StackEndpointHandler,InitializedMetaDataModel</property> <property name="provides">RegisteredEndpoint</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeploymentAspect"> <property name="requires">ContextProperties</property> - <install bean="WSDeploymentAspectManagerJSE" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSUnifiedDeploymentInfoDeploymentAspect" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeploymentAspect"> <property name="provides">ContainerMetaData</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.spi.deployment.BackwardCompatibleURLPatternDeploymentAspect"> <property name="requires">ContextRoot, ContainerMetaData</property> <property name="provides">URLPattern</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss50.WebAppDeploymentAspect"> <property name="requires">WebMetaData, ContextProperties</property> <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> <property name="mainDeployer"><inject bean="MainDeployer"/></property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeploymentAspect"> @@ -288,11 +233,6 @@ <property name="provides">WebMetaData</property> <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <!-- Deployment aspect helper beans --> @@ -304,4 +244,32 @@ <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> </bean> + <!-- Deployment aspect installers --> + <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + </set> + </property> + </bean> + <bean name="WSMainDeploymentAspectInstaller" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSMainDeploymentAspectManager"/></property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSClassLoaderInjectionDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSUnifiedDeploymentInfoDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> + </deployment>