Author: thomas.diesler(a)jboss.com Date: 2007-07-12 11:33:17 -0400 (Thu, 12 Jul 2007) New Revision: 3861 Modified: branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml Log: Use aspect installer Modified: branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-07-12 15:33:12 UTC (rev 3860) +++ branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-07-12 15:33:17 UTC (rev 3861) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<deployment xmlns="urn:jboss:bean-deployer:2.0"> +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> <!-- An abstraction of server configuration aspects. --> <bean name="WSServerConfig" class="org.jboss.wsf.spi.management.BasicServerConfig"> @@ -46,26 +46,11 @@ <entry><key>SERVICE_ENDPOINT_SERVLET</key><value>org.jboss.wsf.stack.jbws.ServiceEndpointServlet</value></entry> </map> </property> - <install bean="WSDeploymentAspectManagerJSE" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> <property name="requires">ContainerClassLoader,UnifiedMetaDataModel</property> <property name="provides">InitializedMetaDataModel</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeploymentAspect"> @@ -78,49 +63,48 @@ <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> </map> </property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> <property name="requires">UnifiedMetaDataModel</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> <property name="requires">UnifiedMetaDataModel</property> <property name="provides">PublishedContract</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> <property name="requires">UnifiedMetaDataModel</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> <property name="requires">ContainerMetaData, URLPattern</property> <property name="provides">UnifiedMetaDataModel, AllowClassLoaderInjection</property> - <install bean="WSMainDeploymentAspectManager" method="addDeploymentAspect"> - <parameter> - <this/> - </parameter> - </install> </bean> + <!-- Deployment aspect installers --> + <bean name="WSNativeMainDeploymentAspectInstaller" 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="WSNativeContextPropertiesDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> + <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + </set> + </property> + </bean> + <bean name="WSNativeJSEDeploymentAspectInstaller" 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="WSNativeContextPropertiesDeploymentAspect"/> + </set> + </property> + </bean> + </deployment>