[jbossws-commits] JBossWS SVN: r8393 - in stack/cxf/trunk/modules: server/src/main/resources and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Oct 8 09:57:00 EDT 2008
Author: richard.opalka at jboss.com
Date: 2008-10-08 09:57:00 -0400 (Wed, 08 Oct 2008)
New Revision: 8393
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
stack/cxf/trunk/modules/server/src/main/resources/as5-jbossws-cxf-config.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] switch to new AS5 deployment model
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2008-10-08 13:54:30 UTC (rev 8392)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2008-10-08 13:57:00 UTC (rev 8393)
@@ -41,6 +41,7 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
@@ -80,8 +81,25 @@
endpoint = initServiceEndpoint(contextPath);
context.setAttribute(ServletController.class.getName(), getController());
+ this.startEndpoint();
}
-
+
+ private void startEndpoint()
+ {
+ if (this.endpoint.getState() == EndpointState.CREATED)
+ {
+ this.endpoint.getLifecycleHandler().start(this.endpoint);
+ }
+ }
+
+ private void stopEndpoint()
+ {
+ if (this.endpoint.getState() == EndpointState.STARTED)
+ {
+ this.endpoint.getLifecycleHandler().stop(this.endpoint);
+ }
+ }
+
@Override
public ServletController createServletController(ServletConfig servletConfig)
{
@@ -145,6 +163,7 @@
if (childCtx != null)
childCtx.destroy();
+ this.stopEndpoint();
super.destroy();
}
Modified: stack/cxf/trunk/modules/server/src/main/resources/as5-jbossws-cxf-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/as5-jbossws-cxf-config.xml 2008-10-08 13:54:30 UTC (rev 8392)
+++ stack/cxf/trunk/modules/server/src/main/resources/as5-jbossws-cxf-config.xml 2008-10-08 13:57:00 UTC (rev 8393)
@@ -49,8 +49,7 @@
<property name="provides">ContextProperties</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.AspectizedEndpointServlet</value></entry>
- <entry><key>org.jboss.ws.webapp.ServletAspectManagerName</key><value>WSCXFServletAspectManager</value></entry>
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry>
</map>
</property>
</bean>
@@ -79,19 +78,7 @@
</property>
</bean>
- <bean name="WSEndpointServletLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointServletLifecycleDeploymentAspect">
- <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
- </bean>
-
<!--
- The endpoint servlet DA manager
- -->
-
- <bean name="WSCXFServletAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSCXFServletAspectManager</property>
- </bean>
-
- <!--
Deployment aspect installers
-->
@@ -122,13 +109,3 @@
</property>
<depends>WSDeploymentAspectInstallerEJB</depends>
</bean>
-
- <bean name="WSCXFServletAspectManagerInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSCXFServletAspectManager"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSEndpointServletLifecycleDeploymentAspect"/>
- </set>
- </property>
- </bean>
Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-10-08 13:54:30 UTC (rev 8392)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-10-08 13:57:00 UTC (rev 8393)
@@ -68,7 +68,7 @@
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/as4-jbossws-cxf-config.xml"/>
+ <fileset file="${project.resources.directory}/as5-jbossws-cxf-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
@@ -78,7 +78,7 @@
<concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/as4-jbossws-cxf-config.xml"/>
+ <fileset file="${project.resources.directory}/as5-jbossws-cxf-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-10-08 13:54:30 UTC (rev 8392)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-10-08 13:57:00 UTC (rev 8393)
@@ -253,7 +253,7 @@
<properties>
<jboss.version>4.2.2.GA</jboss.version>
<jbossws.integration.target>jboss422</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.EndpointServlet</endpoint.servlet>
+ <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -294,7 +294,7 @@
<properties>
<jboss.version>4.2.3.GA</jboss.version>
<jbossws.integration.target>jboss423</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.EndpointServlet</endpoint.servlet>
+ <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -335,7 +335,7 @@
<properties>
<jboss.version>4.2.4-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss424</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.EndpointServlet</endpoint.servlet>
+ <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -376,7 +376,7 @@
<properties>
<jboss.version>5.0.0.CR2</jboss.version>
<jbossws.integration.target>jboss500</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.EndpointServlet</endpoint.servlet>
+ <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
<dependencies>
<!-- [JBWS-2263] -->
@@ -435,7 +435,7 @@
<properties>
<jboss.version>5.0.0-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss501</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.EndpointServlet</endpoint.servlet>
+ <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
<dependencies>
<!-- [JBWS-2263] -->
More information about the jbossws-commits
mailing list