JBossWS SVN: r8391 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-08 09:50:40 -0400 (Wed, 08 Oct 2008)
New Revision: 8391
Removed:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointServletLifecycleDeploymentAspect.java
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] endpoint lifecycle START and STOP events must be handled in servlet lifecycle methods
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java 2008-10-08 13:45:40 UTC (rev 8390)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java 2008-10-08 13:50:40 UTC (rev 8391)
@@ -35,6 +35,7 @@
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
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;
@@ -71,6 +72,7 @@
this.initRegistry();
this.initServiceEndpoint(servletConfig.getServletContext().getContextPath());
this.postInit(servletConfig);
+ this.startEndpoint();
}
/**
@@ -80,6 +82,7 @@
{
try
{
+ this.stopEndpoint();
this.stopAspectManager();
}
finally
@@ -202,4 +205,20 @@
}
}
+ 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);
+ }
+ }
+
}
Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointServletLifecycleDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointServletLifecycleDeploymentAspect.java 2008-10-08 13:45:40 UTC (rev 8390)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointServletLifecycleDeploymentAspect.java 2008-10-08 13:50:40 UTC (rev 8391)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.framework.deployment;
-
-import org.jboss.wsf.spi.WSFRuntime;
-import org.jboss.wsf.spi.deployment.Deployment;
-
-/**
- * Lifecycle deployer handler dealing with START and STOP only
- * @author richard.opalka(a)jboss.com
- */
-public class EndpointServletLifecycleDeploymentAspect extends EndpointLifecycleDeploymentAspect
-{
- @Override
- public void create(Deployment dep, WSFRuntime runtime)
- {
- // do nothing in servlet
- }
-
- @Override
- public void destroy(Deployment dep, WSFRuntime runtime)
- {
- // do nothing in servlet
- }
-}
17 years, 2 months
JBossWS SVN: r8390 - in container/jboss50: trunk/src/main/resources/jbossws-jboss50-container.jar/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-08 09:45:40 -0400 (Wed, 08 Oct 2008)
New Revision: 8390
Modified:
container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml
container/jboss50/trunk/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] switch to new AS5 deployment model
Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml 2008-10-08 13:24:32 UTC (rev 8389)
+++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml 2008-10-08 13:45:40 UTC (rev 8390)
@@ -156,7 +156,7 @@
<property name="provides">ContainerEndpointHandler</property>
</bean>
- <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
+ <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointDeployerLifecycleDeploymentAspect">
<property name="requires">LAST_DEPLOYMENT_ASPECT</property>
</bean>
Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml
===================================================================
--- container/jboss50/trunk/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml 2008-10-08 13:24:32 UTC (rev 8389)
+++ container/jboss50/trunk/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml 2008-10-08 13:45:40 UTC (rev 8390)
@@ -156,7 +156,7 @@
<property name="provides">ContainerEndpointHandler</property>
</bean>
- <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
+ <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointDeployerLifecycleDeploymentAspect">
<property name="requires">LAST_DEPLOYMENT_ASPECT</property>
</bean>
17 years, 2 months
JBossWS SVN: r8389 - stack/metro/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-08 09:24:32 -0400 (Wed, 08 Oct 2008)
New Revision: 8389
Added:
stack/metro/branches/asoldano/
Log:
Creating user branch
Copied: stack/metro/branches/asoldano (from rev 8388, stack/metro/trunk)
17 years, 2 months
JBossWS SVN: r8388 - in stack/native: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-08 06:08:56 -0400 (Wed, 08 Oct 2008)
New Revision: 8388
Added:
stack/native/tags/jbossws-native-2.0.1.SP2_CP04/
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP04/
Log:
[JBPAPP-927] Tag JBossWS Native 2.0.1.SP2_CP04
Copied: stack/native/tags/jbossws-native-2.0.1.SP2_CP04 (from rev 8387, stack/native/branches/jbossws-native-2.0.1.SP2_CP04)
17 years, 2 months
JBossWS SVN: r8387 - stack/native/branches/jbossws-native-2.0.1.SP2_CP04.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-08 06:08:03 -0400 (Wed, 08 Oct 2008)
New Revision: 8387
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP04/version.properties
Log:
[JBPAPP-927] Set the version.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP04/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP04/version.properties 2008-10-08 10:05:20 UTC (rev 8386)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP04/version.properties 2008-10-08 10:08:03 UTC (rev 8387)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.SP2_CP-SNAPSHOT
-repository.id=2.0.1.SP2_CP-SNAPSHOT
+version.id=2.0.1.SP2_CP04
+repository.id=2.0.1.SP2_CP04
implementation.title=JBoss Web Services - Native
implementation.url=http://www.jboss.org/products/jbossws
17 years, 2 months
JBossWS SVN: r8386 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-08 06:05:20 -0400 (Wed, 08 Oct 2008)
New Revision: 8386
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP04/
Log:
[JBPAPP-927] Branch before tagging release.
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP04 (from rev 8385, stack/native/branches/jbossws-native-2.0.1.SP2_CP)
17 years, 2 months
JBossWS SVN: r8385 - in stack/native/trunk/modules/testsuite: native-tests/src/test/resources/jaxrpc/jbws124/WEB-INF and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-08 05:04:22 -0400 (Wed, 08 Oct 2008)
New Revision: 8385
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] customize EndpointServlet for each AS
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2008-10-08 09:04:01 UTC (rev 8384)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2008-10-08 09:04:22 UTC (rev 8385)
@@ -8,7 +8,7 @@
<!-- Test that we can deploy an already modified web.xml -->
<servlet>
<servlet-name>Hello</servlet-name>
- <servlet-class>org.jboss.wsf.stack.jbws.EndpointServlet</servlet-class>
+ <servlet-class>@endpoint.servlet@</servlet-class>
<init-param>
<param-name>jboss.ws.endpoint</param-name>
<param-value>org.jboss.test.ws.jaxrpc.jbws124.HelloJavaBean</param-value>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml 2008-10-08 09:04:01 UTC (rev 8384)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml 2008-10-08 09:04:22 UTC (rev 8385)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
<servlet>
<servlet-name>POJOBean</servlet-name>
- <servlet-class>org.jboss.wsf.stack.jbws.EndpointServlet</servlet-class>
+ <servlet-class>@endpoint.servlet@</servlet-class>
<init-param>
<param-name>jboss.ws.endpoint</param-name>
<param-value>org.jboss.test.ws.jaxrpc.jbws1762.services.POJOBean</param-value>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-10-08 09:04:01 UTC (rev 8384)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-10-08 09:04:22 UTC (rev 8385)
@@ -24,7 +24,6 @@
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
- <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<!-- Modules -->
@@ -288,6 +287,7 @@
<properties>
<jboss.version>4.2.2.GA</jboss.version>
<jbossws.integration.target>jboss422</jbossws.integration.target>
+ <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -328,6 +328,7 @@
<properties>
<jboss.version>4.2.3.GA</jboss.version>
<jbossws.integration.target>jboss423</jbossws.integration.target>
+ <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -368,6 +369,7 @@
<properties>
<jboss.version>4.2.4-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss424</jbossws.integration.target>
+ <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -408,6 +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>
</properties>
<dependencies>
<!-- [JBWS-2263] -->
@@ -476,6 +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>
</properties>
<dependencies>
<!-- [JBWS-2263] -->
17 years, 2 months
JBossWS SVN: r8384 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-08 05:04:01 -0400 (Wed, 08 Oct 2008)
New Revision: 8384
Modified:
stack/metro/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] customize EndpointServlet for each AS
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2008-10-08 09:02:48 UTC (rev 8383)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-10-08 09:04:01 UTC (rev 8384)
@@ -24,7 +24,6 @@
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
- <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
</properties>
<!-- Modules -->
@@ -294,6 +293,7 @@
<properties>
<jboss.version>4.2.2.GA</jboss.version>
<jbossws.integration.target>jboss422</jbossws.integration.target>
+ <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -339,6 +339,7 @@
<properties>
<jboss.version>4.2.3.GA</jboss.version>
<jbossws.integration.target>jboss423</jbossws.integration.target>
+ <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -384,6 +385,7 @@
<properties>
<jboss.version>4.2.4-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss424</jbossws.integration.target>
+ <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -429,6 +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>
</properties>
<dependencies>
<!-- JBWS-2263 -->
@@ -492,6 +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>
</properties>
<dependencies>
<!-- JBWS-2263 -->
17 years, 2 months
JBossWS SVN: r8383 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-08 05:02:48 -0400 (Wed, 08 Oct 2008)
New Revision: 8383
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] customize EndpointServlet for each AS
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-10-07 17:51:26 UTC (rev 8382)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-10-08 09:02:48 UTC (rev 8383)
@@ -24,7 +24,6 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<asm.version>2.2.3</asm.version>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.EndpointServlet</endpoint.servlet>
</properties>
<!-- Modules -->
@@ -254,6 +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>
</properties>
<dependencies>
<dependency>
@@ -294,6 +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>
</properties>
<dependencies>
<dependency>
@@ -334,6 +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>
</properties>
<dependencies>
<dependency>
@@ -374,6 +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>
</properties>
<dependencies>
<!-- [JBWS-2263] -->
@@ -432,6 +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>
</properties>
<dependencies>
<!-- [JBWS-2263] -->
17 years, 2 months
JBossWS SVN: r8382 - stack/native/trunk/modules/core/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-07 13:51:26 -0400 (Tue, 07 Oct 2008)
New Revision: 8382
Modified:
stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] rollback
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-07 17:50:39 UTC (rev 8381)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2008-10-07 17:51:26 UTC (rev 8382)
@@ -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}/as5-jbossws-native-config.xml"/>
+ <fileset file="${project.resources.directory}/as4-jbossws-native-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}/as5-jbossws-native-config.xml"/>
+ <fileset file="${project.resources.directory}/as4-jbossws-native-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
17 years, 2 months