[jboss-cvs] JBossAS SVN: r97456 - trunk/webservices/src/resources/jbossws-jboss.deployer/META-INF.

[jboss-cvs-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-12-04 08:05:30 -0500 (Fri, 04 Dec 2009)
New Revision: 97456

Modified:
   trunk/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Log:
[JBWS-2835] removing workaround for AS 6.x series

Modified: trunk/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- trunk/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml	2009-12-04 12:31:24 UTC (rev 97455)
+++ trunk/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml	2009-12-04 13:05:30 UTC (rev 97456)
@@ -58,13 +58,9 @@
 
   <bean name="WSEJBAdapterDeployer" class="org.jboss.webservices.integration.deployers.WSEJBAdapterDeployer"/>
 
-  <bean name="WSTypeDeployer" class="org.jboss.webservices.integration.deployers.WSTypeDeployer">
-    <property name="relativeOrder">1</property> <!-- [JBDEPLOY-201] workaround -->
-  </bean>
+  <bean name="WSTypeDeployer" class="org.jboss.webservices.integration.deployers.WSTypeDeployer"/>
 
-  <bean name="WSDeploymentDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentDeployer">
-    <property name="relativeOrder">2</property> <!-- [JBDEPLOY-201] workaround -->
-  </bean>
+  <bean name="WSDeploymentDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentDeployer"/>
 
   <!-- WSDeploymentAspectDeployers factory -->
   <bean name="WSAspectizedDeployersFactory" class="org.jboss.webservices.integration.deployers.WSAspectizedDeployersFactory">
@@ -80,80 +76,67 @@
   <!-- The AS specific deployment aspects -->
   <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.webservices.integration.metadata.ContainerMetaDataDeploymentAspect">
     <property name="provides">ContainerMetaData, VFSRoot</property>
-    <property name="relativeOrder">12</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
   <bean name="WSInjectionMetaDataDeploymentAspect" class="org.jboss.webservices.integration.injection.InjectionMetaDataDeploymentAspect">
     <property name="requires">WebMetaData</property>
     <property name="provides">InjectionMetaData</property>
     <property name="ejbReferenceResolver"><inject bean="org.jboss.ejb3.EjbReferenceResolver"/></property>
-    <property name="relativeOrder">34</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
-  <!-- TODO: remove this hacky aspect in AS trunk -->
+  <!-- TODO: remove this hacky aspect -->
   <bean name="WSJACCPermissionsDeploymentAspect" class="org.jboss.webservices.integration.security.JACCPermissionsDeploymentAspect">
     <property name="requires">WebMetaData</property>
     <property name="provides">JACCPermisions</property>
-    <property name="relativeOrder">34</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
   <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
     <property name="requires">ContainerMetaData</property>
     <property name="provides">ContextRoot</property>
-    <property name="relativeOrder">14</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
   <bean name="WSVirtualHostDeploymentAspect" class="org.jboss.wsf.framework.deployment.VirtualHostDeploymentAspect">
     <property name="requires">ContainerMetaData</property>
     <property name="provides">VirtualHosts</property>
-    <property name="relativeOrder">18</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
   <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
     <property name="requires">URLPattern</property>
     <property name="provides">EndpointAddress</property>
-    <property name="relativeOrder">16</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
   <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
     <property name="provides">LifecycleHandler</property>
     <property name="last">true</property>
-    <property name="relativeOrder">37</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
   <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
     <property name="provides">EndpointMetrics</property>
-    <property name="relativeOrder">11</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
   <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
     <property name="requires">URLPattern</property>
     <property name="provides">EndpointName</property>
-    <property name="relativeOrder">17</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
   <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
     <property name="requires">EndpointName</property>
     <property name="provides">RegisteredEndpoint</property>
-    <property name="relativeOrder">35</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
   <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.URLPatternDeploymentAspect">
     <property name="requires">ContextRoot, ContainerMetaData</property>
     <property name="provides">URLPattern</property>
-    <property name="relativeOrder">15</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
   <bean name="WSWebMetaDataModifyingDeploymentAspect" class="org.jboss.webservices.integration.tomcat.WebMetaDataModifyingDeploymentAspect">
     <property name="requires">WebMetaData, ContextProperties, StackDescriptor</property>
     <property name="provides">WebMetaData</property>
-    <property name="relativeOrder">33</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
   <bean name="WSWebMetaDataCreatingDeploymentAspect" class="org.jboss.webservices.integration.tomcat.WebMetaDataCreatingDeploymentAspect">
     <property name="requires">VirtualHosts,URLPattern</property>
     <property name="provides">WebMetaData</property>
-    <property name="relativeOrder">32</property> <!-- [JBDEPLOY-201] workaround -->
   </bean>
 
 </deployment>