Author: richard.opalka(a)jboss.com Date: 2008-10-08 09:58:13 -0400 (Wed, 08 Oct 2008) New Revision: 8394 Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/metro/trunk/modules/testsuite/pom.xml Log: [JBWS-2246][JBWS-2264][JBAS-5732] switch to new AS5 deployment model Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java =================================================================== --- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-10-08 13:57:00 UTC (rev 8393) +++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-10-08 13:58:13 UTC (rev 8394) @@ -120,8 +120,10 @@ { MessageStreamAdapter msgStreamAdapter = MessageStreamAdapter.FACTORY.createAdapter(adapter.getName(), null, adapter.getEndpoint()); // TODO JBWS-1869: Support stream based RequestHandler API - ep.addAttachment(MessageStreamAdapter.class, msgStreamAdapter); - ep.addAttachment(ServletAdapter.class, adapter); + if (ep.getAttachment(MessageStreamAdapter.class) == null) // TODO: review to don't insert the same attachments multiple times + ep.addAttachment(MessageStreamAdapter.class, msgStreamAdapter); // do it only once + if (ep.getAttachment(ServletAdapter.class) == null) + ep.addAttachment(ServletAdapter.class, adapter); // TODO: review to don't insert the same attachments multiple times break; } } Modified: stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml =================================================================== --- stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml 2008-10-08 13:57:00 UTC (rev 8393) +++ stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml 2008-10-08 13:58:13 UTC (rev 8394) @@ -84,10 +84,6 @@ <property name="provides">RuntimeModel</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="WSMetroDeployersProvidedDeploymentAspect" class="org.jboss.wsf.framework.deployment.IdentityDeploymentAspect"> <property name="provides">RuntimeLoader,URLPattern,WebMetaData,StackDescriptor</property> @@ -140,7 +136,6 @@ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSMetroDeployersProvidedDeploymentAspect"/><!-- hacky DA --> <inject bean="WSRuntimeModelDeploymentAspect"/> - <inject bean="WSEndpointServletLifecycleDeploymentAspect"/> </set> </property> </bean> Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-10-08 13:57:00 UTC (rev 8393) +++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-10-08 13:58:13 UTC (rev 8394) @@ -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-metro-config.xml"/> + <fileset file="${project.resources.directory}/as5-jbossws-metro-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-metro-config.xml"/> + <fileset file="${project.resources.directory}/as5-jbossws-metro-config.xml"/> <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-10-08 13:57:00 UTC (rev 8393) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-10-08 13:58:13 UTC (rev 8394) @@ -431,7 +431,7 @@ <properties> <jboss.version>5.0.0.CR2</jboss.version> <jbossws.integration.target>jboss500</jbossws.integration.target> - <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet> + <endpoint.servlet>org.jboss.wsf.stack.metro.AspectizedEndpointServlet</endpoint.servlet> </properties> <dependencies> <!-- JBWS-2263 --> @@ -495,7 +495,7 @@ <properties> <jboss.version>5.0.0-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss501</jbossws.integration.target> - <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet> + <endpoint.servlet>org.jboss.wsf.stack.metro.AspectizedEndpointServlet</endpoint.servlet> </properties> <dependencies> <!-- JBWS-2263 -->