JBossWS SVN: r18324 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: transport and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2014-02-07 18:17:11 -0500 (Fri, 07 Feb 2014)
New Revision: 18324
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
Log:
[JBWS-3670]:Add the endpoint a flag to demonstrate spring integraiton; Remove the duplicate code to preDestroy code, the preDestory is called in ee's interceptors
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-02-07 23:14:25 UTC (rev 18323)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-02-07 23:17:11 UTC (rev 18324)
@@ -27,6 +27,7 @@
import javax.xml.ws.spi.Provider;
+import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.configuration.Configurer;
import org.jboss.ws.api.binding.BindingCustomization;
@@ -35,6 +36,7 @@
import org.jboss.ws.common.utils.DelegateClassLoader;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ResourceResolver;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
@@ -134,6 +136,13 @@
new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile(), epConfigName, epConfigFile);
holder.configure(resolver, configurer, wsmd, dep);
dep.addAttachment(BusHolder.class, holder);
+ if (holder instanceof SpringBusHolder)
+ {
+ for (Endpoint endpoint : dep.getService().getEndpoints())
+ {
+ endpoint.setProperty("SpringBus", true);
+ }
+ }
}
finally
{
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 2014-02-07 23:14:25 UTC (rev 18323)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2014-02-07 23:17:11 UTC (rev 18324)
@@ -115,16 +115,6 @@
public static void callPreDestroy(Endpoint endpoint)
{
- ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class);
- if (factory != null)
- {
- if (isJaxwsJseEndpoint(endpoint) && factory.getServiceBean() != null)
- {
- final Reference epReference = endpoint.getInstanceProvider().getInstance(factory.getServiceBean().getClass().getName());
- final Object epInstance = epReference.getValue();
- InjectionHelper.callPreDestroyMethod(epInstance);
- }
- }
}
public static void callRequestHandler(HttpServletRequest req, HttpServletResponse res, ServletContext ctx, Bus bus,