[jbossws-commits] JBossWS SVN: r8395 - in stack/native/trunk/modules: core/src/main/scripts and 1 other directories.

Author: richard.opalka(a)jboss.com Date: 2008-10-08 10:01:36 -0400 (Wed, 08 Oct 2008) New Revision: 8395 Modified: stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-2246][JBWS-2264][JBAS-5732] switch to new AS5 deployment model Modified: stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml 2008-10-08 13:58:13 UTC (rev 8394) +++ stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml 2008-10-08 14:01:36 UTC (rev 8395) @@ -101,10 +101,6 @@ <property name="provides">JAXBIntros</property> </bean> - <bean name="WSEndpointServletLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointServletLifecycleDeploymentAspect"> - <property name="requires">LAST_DEPLOYMENT_ASPECT</property> - </bean> - <!-- This is hacky DA because endpoint servlet DAs depend on deployers DAs. But servlet DAs and deployers DAs are not in the same DA chain --> <bean name="WSNativeDeployersProvidedDeploymentAspect" class="org.jboss.wsf.framework.deployment.IdentityDeploymentAspect"> <property name="provides">RuntimeLoader,ContainerMetaData,URLPattern,VFSRoot,JAXBIntros,StackEndpointHandler</property> @@ -176,7 +172,6 @@ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> <inject bean="WSNativeRMDeploymentAspect"/> <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> - <inject bean="WSEndpointServletLifecycleDeploymentAspect"/> </set> </property> </bean> Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2008-10-08 13:58:13 UTC (rev 8394) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2008-10-08 14:01:36 UTC (rev 8395) @@ -68,7 +68,7 @@ <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${project.resources.directory}/as4-jbossws-native-config.xml"/> + <fileset file="${project.resources.directory}/as5-jbossws-native-config.xml"/> <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> @@ -78,7 +78,7 @@ <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${project.resources.directory}/as4-jbossws-native-config.xml"/> + <fileset file="${project.resources.directory}/as5-jbossws-native-config.xml"/> <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-10-08 13:58:13 UTC (rev 8394) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-10-08 14:01:36 UTC (rev 8395) @@ -410,7 +410,7 @@ <properties> <jboss.version>5.0.0.CR2</jboss.version> <jbossws.integration.target>jboss500</jbossws.integration.target> - <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet> + <endpoint.servlet>org.jboss.wsf.stack.jbws.AspectizedEndpointServlet</endpoint.servlet> </properties> <dependencies> <!-- [JBWS-2263] --> @@ -479,7 +479,7 @@ <properties> <jboss.version>5.0.0-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss501</jbossws.integration.target> - <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet> + <endpoint.servlet>org.jboss.wsf.stack.jbws.AspectizedEndpointServlet</endpoint.servlet> </properties> <dependencies> <!-- [JBWS-2263] -->