[jbossws-commits] JBossWS SVN: r16311 - in stack/cxf/trunk: modules/client and 5 other directories.

Author: ropalka Date: 2012-05-24 08:15:01 -0400 (Thu, 24 May 2012) New Revision: 16311 Modified: stack/cxf/trunk/ stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl stack/cxf/trunk/pom.xml Log: [JBWS-3495] upgrade from Apache CXF 2.5.4-SNAPSHOT > 2.6.1-SNAPSHOT Property changes on: stack/cxf/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/branches/ropalka:16301-16305 Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2012-05-24 10:49:28 UTC (rev 16310) +++ stack/cxf/trunk/modules/client/pom.xml 2012-05-24 12:15:01 UTC (rev 16311) @@ -50,17 +50,12 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-http</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-object</artifactId> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-coloc</artifactId> </dependency> - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-05-24 10:49:28 UTC (rev 16310) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-05-24 12:15:01 UTC (rev 16311) @@ -108,14 +108,12 @@ } /** JBossWSNonSpringBusFactory methods **/ - @SuppressWarnings("rawtypes") - public Bus createBus(Map<Class, Object> extensions) + public Bus createBus(Map<Class<?>, Object> extensions) { return getNonSpringBusFactory().createBus(extensions); } - @SuppressWarnings("rawtypes") - public Bus createBus(Map<Class, Object> extensions, Map<String, Object> properties) + public Bus createBus(Map<Class<?>, Object> extensions, Map<String, Object> properties) { return getNonSpringBusFactory().createBus(extensions, properties); } Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-05-24 10:49:28 UTC (rev 16310) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-05-24 12:15:01 UTC (rev 16311) @@ -38,12 +38,11 @@ */ public class JBossWSNonSpringBusFactory extends CXFBusFactory { - @SuppressWarnings("rawtypes") @Override - public Bus createBus(Map<Class, Object> extensions, Map<String, Object> properties) { + public Bus createBus(Map<Class<?>, Object> extensions, Map<String, Object> properties) { if (extensions == null) { - extensions = new HashMap<Class, Object>(); + extensions = new HashMap<Class<?>, Object>(); } if (!extensions.containsKey(Configurer.class)) { Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-05-24 10:49:28 UTC (rev 16310) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-05-24 12:15:01 UTC (rev 16311) @@ -118,7 +118,7 @@ return bus; } - private BusApplicationContext createApplicationContext(String cfgFiles[], boolean includeDefaults) + protected BusApplicationContext createApplicationContext(String cfgFiles[], boolean includeDefaults) { try { Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2012-05-24 10:49:28 UTC (rev 16310) +++ stack/cxf/trunk/modules/server/pom.xml 2012-05-24 12:15:01 UTC (rev 16311) @@ -51,10 +51,6 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-http</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-object</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-24 10:49:28 UTC (rev 16310) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-24 12:15:01 UTC (rev 16311) @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.ResourceBundle; @@ -31,6 +32,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.binding.soap.SoapTransportFactory; import org.apache.cxf.bus.spring.BusApplicationContext; +import org.apache.cxf.configuration.ConfiguredBeanLocator; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.resource.ResourceResolver; import org.apache.cxf.transport.http.HttpDestinationFactory; @@ -67,6 +69,7 @@ protected BusApplicationContext ctx; protected List<GenericApplicationContext> additionalCtx = new LinkedList<GenericApplicationContext>(); + private ConfiguredBeanLocator delegatingBeanLocator; protected URL[] additionalLocations; @@ -90,13 +93,16 @@ //the cxf/jbossws-cxf check on actual need for spring bus (we know //it's required here as we have the jbossws-cxf.xml descriptor) bus = new JBossWSSpringBusFactory().createBus((URL[])null); + ConfiguredBeanLocator delegate = bus.getExtension(ConfiguredBeanLocator.class); + delegatingBeanLocator = new DelegatingBeanLocator(additionalCtx, delegate); + bus.setExtension(delegatingBeanLocator, ConfiguredBeanLocator.class); ctx = bus.getExtension(BusApplicationContext.class); //Load additional configurations from cxf-servlet.xml if (location != null) { try { - additionalCtx.add(loadAdditionalConfig(ctx, location)); + loadAdditionalConfig(ctx, location); } catch (IOException e) { @@ -130,7 +136,7 @@ { try { - additionalCtx.add(loadAdditionalConfig(ctx, jbossCxfXml)); + loadAdditionalConfig(ctx, jbossCxfXml); } catch (IOException e) { @@ -172,13 +178,14 @@ return serverConfigurer; } - protected static GenericApplicationContext loadAdditionalConfig(ApplicationContext ctx, URL locationUrl) + protected GenericApplicationContext loadAdditionalConfig(ApplicationContext ctx, URL locationUrl) throws IOException { if (locationUrl == null) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_LOAD_ADDITIONAL_CONFIG")); InputStream is = locationUrl.openStream(); GenericApplicationContext childCtx = new GenericApplicationContext(ctx); + additionalCtx.add(childCtx); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD); reader.setNamespaceHandlerResolver(new NamespaceHandlerResolver(SecurityActions.getContextClassLoader())); @@ -207,4 +214,51 @@ super.setBus(bus); ctx = (bus.getExtension(BusApplicationContext.class)); } + + private static class DelegatingBeanLocator implements ConfiguredBeanLocator { + + private final ConfiguredBeanLocator delegate; + private final List<GenericApplicationContext> contexts; + + private DelegatingBeanLocator(final List<GenericApplicationContext> contexts, final ConfiguredBeanLocator delegate) { + this.delegate = delegate; + this.contexts = contexts; + } + + @Override + public List<String> getBeanNamesOfType(Class<?> arg0) { + return delegate.getBeanNamesOfType(arg0); + } + + // TODO: hack for WSPolicyFeature local reference resolver :( + @Override + public <T> T getBeanOfType(String arg0, Class<T> arg1) { + for (final GenericApplicationContext ctx : contexts) { + if (ctx.containsBean(arg0)) { + return ctx.getBean(arg0, arg1); + } + } + return delegate.getBeanOfType(arg0, arg1); + } + + @Override + public <T> Collection<? extends T> getBeansOfType(Class<T> arg0) { + return delegate.getBeansOfType(arg0); + } + + @Override + public boolean hasBeanOfName(String arg0) { + return delegate.hasBeanOfName(arg0); + } + + @Override + public boolean hasConfiguredPropertyValue(String arg0, String arg1, String arg2) { + return delegate.hasConfiguredPropertyValue(arg0, arg1, arg2); + } + + @Override + public <T> boolean loadBeansOfType(Class<T> arg0, BeanLoaderListener<T> arg1) { + return delegate.loadBeansOfType(arg0, arg1); + } + } } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2012-05-24 10:49:28 UTC (rev 16310) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2012-05-24 12:15:01 UTC (rev 16311) @@ -26,7 +26,7 @@ import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.service.model.ServiceInfo; -import org.apache.cxf.tools.common.extensions.soap.SoapAddress; +import org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress; import org.jboss.logging.Logger; import org.jboss.wsf.spi.management.ServerConfig; Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2012-05-24 10:49:28 UTC (rev 16310) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2012-05-24 12:15:01 UTC (rev 16311) @@ -30,8 +30,8 @@ import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.service.model.ServiceInfo; -import org.apache.cxf.tools.common.extensions.soap.SoapAddress; -import org.apache.cxf.tools.util.SOAPBindingUtil; +import org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress; +import org.apache.cxf.binding.soap.SOAPBindingUtil; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.management.ServerConfig; Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl 2012-05-24 10:49:28 UTC (rev 16310) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl 2012-05-24 12:15:01 UTC (rev 16311) @@ -45,7 +45,7 @@ </wsdl:binding> <wsdl:service name="HelloWorldService"> <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> - <soap:address location="INVALID"/> + <soap:address location="http://unreachable-testHttpProxyUsingHTTPClientPolicy/jaxws-cxf-httpproxy/HelloWorldService/HelloWorldImpl"/> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-05-24 10:49:28 UTC (rev 16310) +++ stack/cxf/trunk/pom.xml 2012-05-24 12:15:01 UTC (rev 16311) @@ -73,7 +73,7 @@ <jboss712.version>7.1.2.Final</jboss712.version> <jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version> <ejb.api.version>1.0.1.Final</ejb.api.version> - <cxf.version>2.5.4-SNAPSHOT</cxf.version> + <cxf.version>2.6.1-SNAPSHOT</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> <cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version> <fastinfoset.api.version>1.2.7</fastinfoset.api.version> @@ -109,7 +109,7 @@ <xmlsec.version>1.5.1</xmlsec.version> <wss4j.version>1.6.5</wss4j.version> <wstx.version>3.2.9</wstx.version> - <spring.version>3.0.6.RELEASE</spring.version> + <spring.version>3.0.7.RELEASE</spring.version> </properties> @@ -240,21 +240,6 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-http</artifactId> - <version>${cxf.version}</version> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jra</groupId> - <artifactId>jra</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-object</artifactId> <version>${cxf.version}</version> </dependency>