Author: alessio.soldano(a)jboss.com Date: 2010-10-20 07:03:24 -0400 (Wed, 20 Oct 2010) New Revision: 13160 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/configuration/BusHolder.java Log: [JBWS-3149] Moving policy selector configuration to bus holder 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-10-20 10:20:36 UTC (rev 13159) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2010-10-20 11:03:24 UTC (rev 13160) @@ -32,8 +32,6 @@ import org.apache.cxf.transport.servlet.ServletContextResourceResolver; import org.apache.cxf.transport.servlet.ServletController; import org.apache.cxf.transport.servlet.ServletTransportFactory; -import org.apache.cxf.ws.policy.PolicyEngine; -import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.stack.cxf.configuration.BusHolder; import org.jboss.wsf.stack.cxf.transport.ServletHelper; @@ -68,11 +66,6 @@ //register the InstrumentManagementImpl ServletHelper.registerInstrumentManger(bus, getServletContext()); - //set MaximalAlternativeSelecltor - if (bus.getExtension(PolicyEngine.class) != null) - { - bus.getExtension(PolicyEngine.class).setAlternativeSelector(new MaximalAlternativeSelector()); - } } private void updateAvailableBusWithServletInfo(ServletConfig servletConfig) 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-10-20 10:20:36 UTC (rev 13159) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-10-20 11:03:24 UTC (rev 13160) @@ -32,8 +32,6 @@ import org.apache.cxf.transport.servlet.ServletContextResourceResolver; import org.apache.cxf.transport.servlet.ServletController; import org.apache.cxf.transport.servlet.ServletTransportFactory; -import org.apache.cxf.ws.policy.PolicyEngine; -import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.stack.cxf.configuration.BusHolder; import org.jboss.wsf.stack.cxf.transport.ServletHelper; @@ -42,6 +40,8 @@ * An extension to the CXF servlet * * @author Thomas.Diesler(a)jboss.org + * @author alessio.soldano(a)jboss.com + * * @since 21-Apr-2007 */ public class CXFServletExt extends CXFServlet @@ -66,12 +66,6 @@ //register the InstrumentManagementImpl ServletHelper.registerInstrumentManger(bus, getServletContext()); - - //set MaximalAlternativeSelecltor - if (bus.getExtension(PolicyEngine.class) != null) - { - bus.getExtension(PolicyEngine.class).setAlternativeSelector(new MaximalAlternativeSelector()); - } } private void updateAvailableBusWithServletInfo(ServletConfig servletConfig) Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-10-20 10:20:36 UTC (rev 13159) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-10-20 11:03:24 UTC (rev 13160) @@ -32,6 +32,8 @@ import org.apache.cxf.resource.ResourceResolver; import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.DestinationFactoryManager; +import org.apache.cxf.ws.policy.PolicyEngine; +import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector; import org.jboss.ws.Constants; import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.deployment.Endpoint; @@ -82,6 +84,12 @@ setInterceptors(bus); setSoapTransportFactory(bus, soapTransportFactory); setResourceResolver(bus, resolver); + + //set MaximalAlternativeSelector on server side [JBWS-3149] + if (bus.getExtension(PolicyEngine.class) != null) + { + bus.getExtension(PolicyEngine.class).setAlternativeSelector(new MaximalAlternativeSelector()); + } }