Author: richard.opalka(a)jboss.com Date: 2011-06-21 07:05:37 -0400 (Tue, 21 Jun 2011) New Revision: 14596 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis/jaxws/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml Log: [JBWS-3319] Unified CXF InvokerJSE & InvokerEJB3 invokers - round 2 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2011-06-21 10:38:54 UTC (rev 14595) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2011-06-21 11:05:37 UTC (rev 14596) @@ -96,6 +96,13 @@ if (!endpoint.isPublished()) //before publishing, we set the jaxws conf { Object implementor = endpoint.getImplementor(); + + // setup our invoker for http endpoints if invoker is not configured in jbossws-cxf.xml DD + boolean isHttpEndpoint = (endpoint.getAddress().substring(0, 5).toLowerCase().startsWith("http")); + if ((endpoint.getInvoker() == null) && isHttpEndpoint) + { + endpoint.setInvoker(new JBossWSInvoker()); + } EndpointConfig epConfig = implementor.getClass().getAnnotation(EndpointConfig.class); String configName = org.jboss.wsf.spi.metadata.config.EndpointConfig.STANDARD_ENDPOINT_CONFIG; Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis/jaxws/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis/jaxws/WEB-INF/jbossws-cxf.xml 2011-06-21 10:38:54 UTC (rev 14595) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/aegis/jaxws/WEB-INF/jbossws-cxf.xml 2011-06-21 11:05:37 UTC (rev 14596) @@ -19,9 +19,6 @@ <jaxws:serviceFactory> <ref bean='aegis-service-factory' /> </jaxws:serviceFactory> - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.JBossWSInvoker' /> - </jaxws:invoker> </jaxws:endpoint> </beans> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2011-06-21 10:38:54 UTC (rev 14595) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2011-06-21 11:05:37 UTC (rev 14596) @@ -6,11 +6,6 @@ <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-descriptor' implementor='org.jboss.test.ws.jaxws.cxf.descriptor.DescriptorEndpointImpl'> - - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.JBossWSInvoker'/> - </jaxws:invoker> - </jaxws:endpoint> </beans> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2011-06-21 10:38:54 UTC (rev 14595) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2011-06-21 11:05:37 UTC (rev 14596) @@ -15,9 +15,6 @@ </wsp:Policy> <jaxws:endpoint id='RMService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-doc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl'> - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.JBossWSInvoker'/> - </jaxws:invoker> <jaxws:features> <p:policies> <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2011-06-21 10:38:54 UTC (rev 14595) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2011-06-21 11:05:37 UTC (rev 14596) @@ -15,9 +15,6 @@ </wsp:Policy> <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl'> - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.JBossWSInvoker'/> - </jaxws:invoker> <jaxws:features> <p:policies> <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/jbossws-cxf.xml 2011-06-21 10:38:54 UTC (rev 14595) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/jbossws-cxf.xml 2011-06-21 11:05:37 UTC (rev 14596) @@ -9,11 +9,7 @@ <import resource="classpath:META-INF/cxf/cxf-extension-jms.xml"/> <jaxws:endpoint id='SOAPQueryService' - implementor='org.jboss.test.ws.jaxws.samples.jmstransport.OrganizationHttpEndpoint' - > - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.JBossWSInvoker'/> - </jaxws:invoker> + implementor='org.jboss.test.ws.jaxws.samples.jmstransport.OrganizationHttpEndpoint'> </jaxws:endpoint> <jaxws:endpoint id='JMSQueryService' Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2011-06-21 10:38:54 UTC (rev 14595) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2011-06-21 11:05:37 UTC (rev 14596) @@ -43,9 +43,6 @@ id='ServiceImpl' address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign-encrypt' implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'> - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.JBossWSInvoker'/> - </jaxws:invoker> <jaxws:outInterceptors> <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/> <ref bean="Sign_Response"/> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml 2011-06-21 10:38:54 UTC (rev 14595) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml 2011-06-21 11:05:37 UTC (rev 14596) @@ -26,9 +26,6 @@ id='EjbEndpointImpl' address='http://@jboss.bind.address@:8080/jaxws-samples-wsseEJB/EjbEndpointService/EjbEndpoint' implementor='org.jboss.test.ws.jaxws.samples.wsseEJB.EjbEndpointImpl'> - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.JBossWSInvoker'/> - </jaxws:invoker> <jaxws:inInterceptors> <ref bean="SecurityContextIn"/> <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>