Author: alessio.soldano(a)jboss.com Date: 2010-08-04 07:50:20 -0400 (Wed, 04 Aug 2010) New Revision: 12728 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java Log: [JBWS-3087] Removing RMManager at undeploy Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-04 11:47:08 UTC (rev 12727) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-04 11:50:20 UTC (rev 12728) @@ -34,6 +34,7 @@ import org.apache.cxf.transport.ConduitInitiator; import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.servlet.ServletTransportFactory; +import org.apache.cxf.ws.rm.RMManager; import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringBusFactory; @@ -105,7 +106,6 @@ SOAPBinding binding = (SOAPBinding) endpoint.getBinding(); binding.setMTOMEnabled(true); } - //TODO!! We need to stop the endpoint on undeployment } configured = true; } @@ -113,6 +113,13 @@ @Override public void close() { + //Move this stuff to the bus (our own impl)? + RMManager rmManager = bus.getExtension(RMManager.class); + if (rmManager != null) + { + rmManager.shutdown(); + } + for (EndpointImpl endpoint : endpoints) { endpoint.stop();