[jbossws-commits] JBossWS SVN: r12774 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/deployment and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Aug 11 06:31:26 EDT 2010
Author: alessio.soldano at jboss.com
Date: 2010-08-11 06:31:26 -0400 (Wed, 11 Aug 2010)
New Revision: 12774
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
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/deployment/EndpointImpl.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-3001] Applying patch from Sergey + enabling test
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2010-08-11 09:50:30 UTC (rev 12773)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2010-08-11 10:31:26 UTC (rev 12774)
@@ -88,4 +88,10 @@
{
ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint);
}
+
+ @Override
+ public void destroy()
+ {
+ ServletHelper.callPreDestroy(endpoint);
+ }
}
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 2010-08-11 09:50:30 UTC (rev 12773)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-08-11 10:31:26 UTC (rev 12774)
@@ -87,5 +87,12 @@
{
ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint);
}
+
+ @Override
+ public void destroy()
+ {
+ ServletHelper.callPreDestroy(endpoint);
+ }
+
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2010-08-11 09:50:30 UTC (rev 12773)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2010-08-11 10:31:26 UTC (rev 12774)
@@ -58,6 +58,7 @@
@Override
protected void doPublish(String addr)
{
+ super.getServerFactory().setBlockPostConstruct(true);
super.doPublish(addr);
//allow for configuration so that the wsdlPublisher can be set be the JBossWSCXFConfigurer
configureObject(this);
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-08-11 09:50:30 UTC (rev 12773)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-08-11 10:31:26 UTC (rev 12774)
@@ -132,6 +132,19 @@
}
}
}
+
+ public static void callPreDestroy(Endpoint endpoint)
+ {
+ ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class);
+ if (factory != null)
+ {
+ if (DeploymentType.JAXWS_EJB3 != endpoint.getService().getDeployment().getType()
+ && factory.getServiceBean() != null)
+ {
+ InjectionHelper.callPreDestroyMethod(factory.getServiceBean());
+ }
+ }
+ }
public static void callRequestHandler(HttpServletRequest req, HttpServletResponse res, ServletContext ctx, Bus bus,
Endpoint endpoint) throws ServletException
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-08-11 09:50:30 UTC (rev 12773)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-08-11 10:31:26 UTC (rev 12774)
@@ -49,9 +49,6 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints
-org/jboss/test/ws/jaxws/jbws2268/**
-
# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available on AS 5.x
org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-08-11 09:50:30 UTC (rev 12773)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-08-11 10:31:26 UTC (rev 12774)
@@ -49,9 +49,6 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints
-org/jboss/test/ws/jaxws/jbws2268/**
-
# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available on AS 5.x
org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-08-11 09:50:30 UTC (rev 12773)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-08-11 10:31:26 UTC (rev 12774)
@@ -43,6 +43,3 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints
-org/jboss/test/ws/jaxws/jbws2268/**
-
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-08-11 09:50:30 UTC (rev 12773)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-08-11 10:31:26 UTC (rev 12774)
@@ -43,9 +43,6 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints
-org/jboss/test/ws/jaxws/jbws2268/**
-
# [JBWS-3086] TODO: merge to AS IL trunk once SPI, COMMON and FRAMEWORK are updated there
org/jboss/test/ws/jaxws/samples/jmsendpoints/**
More information about the jbossws-commits
mailing list