Author: thomas.diesler(a)jboss.com Date: 2007-08-08 06:18:33 -0400 (Wed, 08 Aug 2007) New Revision: 4246 Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml Log: Move URLPattern to Phase1 Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-08 09:22:32 UTC (rev 4245) +++ container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-08 10:18:33 UTC (rev 4246) @@ -286,7 +286,11 @@ <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="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> </bean> @@ -297,16 +301,12 @@ <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"/> </set> </property> </bean> Modified: stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml 2007-08-08 09:22:32 UTC (rev 4245) +++ stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml 2007-08-08 10:18:33 UTC (rev 4246) @@ -54,18 +54,32 @@ </bean> <!-- Deployment aspect installers --> + + <!-- Phase 2 --> <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSCXFContextPropertiesDeploymentAspect"/> - <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> <inject bean="WSCXFDescriptorDeploymentAspect"/> </set> </property> <depends>WSDeploymentAspectInstallerPreJSE</depends> </bean> + + <!-- Phase 2 --> + <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPostJSE</depends> + </bean> + <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="sortAspectsOnCreate">true</property> Modified: stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-08-08 09:22:32 UTC (rev 4245) +++ stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-08-08 10:18:33 UTC (rev 4246) @@ -74,18 +74,32 @@ </bean> <!-- Deployment aspect installers --> + + <!-- Phase 1 --> <bean name="WSMetroDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSMetroContextPropertiesDeploymentAspect"/> - <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> <inject bean="WSMetroDescriptorDeploymentAspect"/> </set> </property> <depends>WSDeploymentAspectInstallerPreJSE</depends> </bean> + + <!-- Phase 2 --> + <bean name="WSNativeDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPostJSE</depends> + </bean> + <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="sortAspectsOnCreate">true</property>