[jbossws-commits] JBossWS SVN: r10254 - stack/cxf/branches/ropalka/modules/server/src/main/resources.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-06-29 09:37:38 -0400 (Mon, 29 Jun 2009)
New Revision: 10254

Modified:
   stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)

Modified: stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml	2009-06-29 13:23:28 UTC (rev 10253)
+++ stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml	2009-06-29 13:37:38 UTC (rev 10254)
@@ -60,8 +60,8 @@
   <!-- Deployment aspect installers -->  
 
   <!-- Phase 2 -->
-  <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
-    <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+  <bean name="WSCXFPhaseOneDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+    <property name="manager"><inject bean="WSPhaseOneDeploymentAspectManager"/></property>
     <property name="sortAspectsOnCreate">true</property>
     <property name="aspects">
       <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
@@ -69,12 +69,12 @@
         <inject bean="WSCXFDescriptorDeploymentAspect"/>
       </set>
     </property>
-    <depends>WSDeploymentAspectInstallerPreJSE</depends>
+    <depends>WSPhaseOneDeploymentAspectInstaller</depends>
   </bean>
 
   <!-- Phase 2 -->
-  <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
-    <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
+  <bean name="WSCXFPhaseTwoDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+    <property name="manager"><inject bean="WSPhaseTwoDeploymentAspectManager"/></property>
     <property name="sortAspectsOnCreate">true</property>
     <property name="aspects">
       <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">        
@@ -82,20 +82,5 @@
         <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
       </set>
     </property>
-    <depends>WSDeploymentAspectInstallerPostJSE</depends>
+    <depends>WSPhaseTwoDeploymentAspectInstaller</depends>
   </bean>
-
-  <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
-    <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></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="WSCXFEndpointRecordProcessorDeploymentAspect"/>
-        <inject bean="WSCXFDescriptorDeploymentAspect"/>
-      </set>
-    </property>
-    <depends>WSDeploymentAspectInstallerEJB</depends>
-  </bean>
-