Author: richard.opalka(a)jboss.com Date: 2008-10-29 16:32:20 -0400 (Wed, 29 Oct 2008) New Revision: 8586 Modified: container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml Log: [JBWS-2338] refactoring Modified: container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml =================================================================== --- container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-10-29 20:19:52 UTC (rev 8585) +++ container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-10-29 20:32:20 UTC (rev 8586) @@ -13,7 +13,7 @@ </bean> <!-- The HTTPServer used by the JAXWS Endpoint API --> - <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.DeploymentAspectHttpServer"/> + <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.transport.DeploymentAspectHttpServer"/> <!-- ********************************************************************************************************************* Web Service deployment @@ -57,7 +57,7 @@ <!-- A web service deployer that hooks in after the EJB deployers --> - <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB"> + <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB"> <depends>EJB2xDeployer</depends> <depends>Ejb3Deployer</depends> </bean> @@ -65,7 +65,7 @@ <!-- A web service deployer that hooks in before the WAR deployer --> - <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerPreJSE"> + <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"> <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> <depends>WebAppParsingDeployer</depends> </bean> @@ -73,7 +73,7 @@ <!-- A web service deployer that hooks in after the WAR deployer --> - <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerPostJSE"> + <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"> <depends>WarDeployer</depends> </bean> @@ -82,7 +82,7 @@ --> <!-- Phase 1 of JSE JAX-RPC --> - <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookPreJSE"> + <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookPreJSE"> <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> <install bean="WebServiceDeployerPreJSE" method="addDeployerHook"> <parameter> @@ -97,7 +97,7 @@ <depends>WebServiceDeployerPreJSE</depends> </bean> <!-- Phase 2 of JSE JAX-RPC --> - <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookPostJSE"> + <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookPostJSE"> <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> <install bean="WebServiceDeployerPostJSE" method="addDeployerHook"> <parameter> @@ -112,7 +112,7 @@ <depends>WebServiceDeployerPostJSE</depends> </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookEJB21"> <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -128,7 +128,7 @@ </bean> <!-- Phase 1 of JSE JAX-WS--> - <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookPreJSE"> + <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookPreJSE"> <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> <install bean="WebServiceDeployerPreJSE" method="addDeployerHook"> <parameter> @@ -143,7 +143,7 @@ <depends>WebServiceDeployerPreJSE</depends> </bean> <!-- Phase 2 of JSE JAX-WS --> - <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookPostJSE"> + <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookPostJSE"> <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> <install bean="WebServiceDeployerPostJSE" method="addDeployerHook"> <parameter> @@ -158,7 +158,7 @@ <depends>WebServiceDeployerPostJSE</depends> </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookEJB3"> <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -193,7 +193,7 @@ <!-- The container deployment aspects --> - <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.ContainerMetaDataDeploymentAspect"> + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect"> <property name="provides">ContainerMetaData, VFSRoot</property> </bean> @@ -207,7 +207,7 @@ <property name="provides">VirtualHosts</property> </bean> - <bean name="WSDynamicEndpointDeploymentAspect" class="org.jboss.wsf.container.jboss50.DynamicEndpointDeploymentAspect"> + <bean name="WSDynamicEndpointDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.DynamicEndpointDeploymentAspect"> <property name="requires">WebMetaData, ContextProperties</property> <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property> <property name="mainDeployer"><inject bean="MainDeployer"/></property> @@ -245,12 +245,12 @@ <property name="provides">RegisteredEndpoint</property> </bean> - <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeploymentAspect"> + <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.tomcat.ModifyWebMetaDataDeploymentAspect"> <property name="requires">ContextProperties, StackDescriptor</property> <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property> </bean> - <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.RuntimeLoaderDeploymentAspect"> + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.RuntimeLoaderDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">RuntimeLoader</property> </bean> @@ -260,12 +260,12 @@ <property name="provides">URLPattern</property> </bean> - <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss50.WebAppDeploymentAspect"> + <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentAspect"> <property name="requires">WebMetaData, ContextProperties</property> <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property> </bean> - <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.container.jboss50.WebAppGeneratorDeploymentAspect"> + <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppGeneratorDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">WebMetaData</property> <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> @@ -273,9 +273,9 @@ </bean> <!-- Deployment aspect helper beans --> - <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB21"/> - <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB3"/> - <bean name="WSWebMetaDataModifier" class="org.jboss.wsf.container.jboss50.WebMetaDataModifierImpl"/> + <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.invocation.SecurityHandlerEJB21"/> + <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.invocation.SecurityHandlerEJB3"/> + <bean name="WSWebMetaDataModifier" class="org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifierImpl"/> <!-- Deployment aspect installers -->