Author: jim.ma Date: 2010-10-18 03:39:48 -0400 (Mon, 18 Oct 2010) New Revision: 13143 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 Log: [JBWS-3149]:Set MaximalAlternativeSelector to server side policy engine 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-15 14:14:14 UTC (rev 13142) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2010-10-18 07:39:48 UTC (rev 13143) @@ -32,6 +32,8 @@ 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; @@ -65,6 +67,12 @@ //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-15 14:14:14 UTC (rev 13142) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-10-18 07:39:48 UTC (rev 13143) @@ -32,6 +32,8 @@ 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; @@ -64,6 +66,12 @@ //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)