[jbossws-commits] JBossWS SVN: r17051 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf and 7 other directories.

Author: alessio.soldano(a)jboss.com Date: 2012-12-05 09:45:10 -0500 (Wed, 05 Dec 2012) New Revision: 17051 Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java Removed: 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 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 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/NonSpringBusHolder.java 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/deployment/aspect/BusDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java Log: [JBWS-3570] Replacing SoapTransportFactoryExt/AddressRewritingEndpointInfo integration hack with usage of Apache CXF 'publishedEndpointUrl' endpoint configuration option + fixing a couple of related bugs. This requires changes in JBWS-3571 and CXF-4674. Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2012-12-05 14:38:28 UTC (rev 17050) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -90,8 +90,8 @@ void addressRewritten(String previousAddress, String address); @LogMessage(level = DEBUG) - @Message(id = 24038, value = "Invalid url provided, using it without rewriting: %s") - void invalidAddressProvidedUseItWithoutRewriting(String address); + @Message(id = 24038, value = "Invalid url '%s' provided, using original one without rewriting: %s") + void invalidAddressProvidedUseItWithoutRewriting(String newAddress, String origAddress); @LogMessage(level = TRACE) @Message(id = 24039, value = "Spring namespace handler resolution: unable to resolve JBossWS specific handler for namespace '%s'; trying default namespace resolution...") Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2012-12-05 14:38:28 UTC (rev 17050) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -197,8 +197,10 @@ String ctxUri = req.getRequestURI(); String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); EndpointInfo endpointInfo = dest.getEndpointInfo(); - endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS, - ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost())); + if (serverConfig.isModifySOAPAddress()) { + endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL, + ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost())); + } for (QueryHandler queryHandler : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) { Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -0,0 +1,169 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.addressRewrite; + +import static org.jboss.wsf.stack.cxf.Loggers.ADDRESS_REWRITE_LOGGER; + +import java.net.URI; +import java.net.URL; + +import org.jboss.wsf.spi.management.ServerConfig; + +/** + * Helper for rewriting soap:address in published wsdl + * + * @author alessio.soldano(a)jboss.com + * @since 30-Nov-2012 + */ +public class SoapAddressRewriteHelper +{ + private static final String HTTP = "http"; + private static final String HTTPS = "https"; + + /** + * Rewrite and get address to be used for CXF published endpoint url prop (rewritten wsdl address) + * + * @param wsdlAddress The soap:address in the wsdl + * @param epAddress The address that has been computed for the endpoint + * @param serverConfig The current ServerConfig + * @return The rewritten soap:address to be used in the wsdl + */ + public static String getRewrittenPublishedEndpointUrl(String wsdlAddress, String epAddress, ServerConfig serverConfig) { + if (wsdlAddress == null) { + return null; + } + if (isRewriteRequired(serverConfig, wsdlAddress)) + { + final String origUriScheme = getUriScheme(wsdlAddress); //will be https if the user wants a https address in the wsdl + final String newUriScheme = getUriScheme(epAddress); //will be https if the user set confidential transport for the endpoint + final String uriScheme = (origUriScheme.equals(HTTPS) || newUriScheme.equals(HTTPS)) ? HTTPS : HTTP; + return rewriteSoapAddress(serverConfig, wsdlAddress, epAddress, uriScheme); + } + else + { + return wsdlAddress; + } + } + + public static boolean isAutoRewriteOn(ServerConfig serverConfig) + { + return serverConfig.isModifySOAPAddress() && ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()); + } + + private static boolean isRewriteRequired(ServerConfig serverConfig, String address) + { + //check config prop forcing address rewrite + if (serverConfig.isModifySOAPAddress()) + { + ADDRESS_REWRITE_LOGGER.addressRewriteRequiredBecauseOfServerConf(address); + return true; + } + //check if the previous address is not valid + if (isInvalidAddress(address)) + { + ADDRESS_REWRITE_LOGGER.addressRewriteRequiredBecauseOfInvalidAddress(address); + return true; + } + ADDRESS_REWRITE_LOGGER.rewriteNotRequired(address); + return false; + } + + private static boolean isInvalidAddress(String address) + { + if (address == null) + { + return true; + } + String s = address.trim(); + if (s.length() == 0 || s.contains("REPLACE_WITH_ACTUAL_URL")) + { + return true; + } + try + { + new URL(s); + } + catch (Exception e) + { + return true; + } + return false; + } + + /** + * Rewrite the provided address according to the current server + * configuration and always using the specified uriScheme. + * + * @param origAddress The source address + * @param newAddress The new (candidate) address + * @param uriScheme The uriScheme to use for rewrite + * @return The obtained address + */ + private static String rewriteSoapAddress(ServerConfig serverConfig, String origAddress, String newAddress, String uriScheme) + { + try + { + URL url = new URL(newAddress); + String path = url.getPath(); + String host = serverConfig.getWebServiceHost(); + String port = ""; + if (HTTPS.equals(uriScheme)) + { + int portNo = serverConfig.getWebServiceSecurePort(); + if (portNo != 443) + { + port = ":" + portNo; + } + } + else + { + int portNo = serverConfig.getWebServicePort(); + if (portNo != 80) + { + port = ":" + portNo; + } + } + String urlStr = uriScheme + "://" + host + port + path; + ADDRESS_REWRITE_LOGGER.addressRewritten(origAddress, urlStr); + return urlStr; + } + catch (Exception e) + { + ADDRESS_REWRITE_LOGGER.invalidAddressProvidedUseItWithoutRewriting(newAddress, origAddress); + return origAddress; + } + } + + private static String getUriScheme(String address) + { + try + { + URI addrURI = new URI(address); + String scheme = addrURI.getScheme(); + return scheme != null ? scheme : HTTP; + } + catch (Exception e) + { + return HTTP; + } + } +} 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 2012-12-05 14:38:28 UTC (rev 17050) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -26,7 +26,6 @@ import java.util.Map; import org.apache.cxf.Bus; -import org.apache.cxf.binding.soap.SoapTransportFactory; import org.apache.cxf.buslifecycle.BusLifeCycleListener; import org.apache.cxf.buslifecycle.BusLifeCycleManager; import org.apache.cxf.configuration.Configurer; @@ -37,7 +36,6 @@ import org.apache.cxf.management.interceptor.ResponseTimeMessageOutInterceptor; import org.apache.cxf.resource.ResourceManager; import org.apache.cxf.resource.ResourceResolver; -import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.cxf.workqueue.AutomaticWorkQueue; import org.apache.cxf.workqueue.AutomaticWorkQueueImpl; import org.apache.cxf.workqueue.WorkQueueManager; @@ -82,12 +80,11 @@ * Update the Bus held by the this instance using the provided parameters. * This basically prepares the bus for being used with JBossWS. * - * @param soapTransportFactory The SoapTransportFactory to configure, if any * @param resolver The ResourceResolver to configure, if any * @param configurer The JBossWSCXFConfigurer to install in the bus, if any * @param wsmd The current JBossWebservicesMetaData, if any */ - public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd) + public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd) { bus.setProperty(org.jboss.wsf.stack.cxf.client.Constants.DEPLOYMENT_BUS, true); busHolderListener = new BusHolderLifeCycleListener(); @@ -98,7 +95,6 @@ bus.setExtension(configurer, Configurer.class); } setInterceptors(bus); - setSoapTransportFactory(bus, soapTransportFactory); setResourceResolver(bus, resolver); Map<String, String> props = (wsmd == null) ? null : wsmd.getProperties(); @@ -157,17 +153,6 @@ } } - protected static void setSoapTransportFactory(Bus bus, SoapTransportFactory factory) - { - if (factory != null) - { - DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class); - factory.setBus(bus); - dfm.registerDestinationFactory(org.jboss.ws.common.Constants.NS_SOAP11, factory); - dfm.registerDestinationFactory(org.jboss.ws.common.Constants.NS_SOAP12, factory); - } - } - /** * Adds work queues parsing simple values of properties in jboss-webservices.xml: * cxf.queue.<queue-name>.<parameter> = value 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 2012-12-05 14:38:28 UTC (rev 17050) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -29,7 +29,6 @@ import javax.xml.ws.handler.Handler; import javax.xml.ws.soap.SOAPBinding; -import org.apache.cxf.binding.soap.SoapTransportFactory; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.resource.ResourceResolver; import org.apache.cxf.service.invoker.Invoker; @@ -77,19 +76,18 @@ * Update the Bus held by the this instance using the provided parameters. * This basically prepares the bus for being used with JBossWS. * - * @param soapTransportFactory The SoapTransportFactory to configure, if any * @param resolver The ResourceResolver to configure, if any * @param configurer The JBossWSCXFConfigurer to install in the bus, if any * @param wsmd The current JBossWebservicesMetaData, if any */ @Override - public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd) + public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd) { if (configured) { throw Messages.MESSAGES.busAlreadyConfigured(bus); } - super.configure(soapTransportFactory, resolver, configurer, wsmd); + super.configure(resolver, configurer, wsmd); for (DDEndpoint dde : metadata.getEndpoints()) { @@ -114,6 +112,7 @@ addressingFeature.setResponses(dde.getAddressingResponses()); endpoint.getFeatures().add(addressingFeature); } + endpoint.setPublishedEndpointUrl(dde.getPublishedEndpointUrl()); endpoint.publish(); endpoints.add(endpoint); if (dde.isMtomEnabled()) 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-12-05 14:38:28 UTC (rev 17050) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -32,7 +32,6 @@ import java.util.List; 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; @@ -115,20 +114,19 @@ * Update the Bus held by the this instance using the provided parameters. * This basically prepares the bus for being used with JBossWS. * - * @param soapTransportFactory The SoapTransportFactory to configure, if any * @param resolver The ResourceResolver to configure, if any * @param configurer The JBossWSCXFConfigurer to install in the bus, if any * @param dep The current JBossWS-SPI Deployment * @param wsmd The current JBossWebservicesMetaData, if any */ @Override - public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd) + public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd) { if (configured) { throw MESSAGES.busAlreadyConfigured(ctx); } - super.configure(soapTransportFactory, resolver, configurer, wsmd); + super.configure(resolver, configurer, wsmd); if (additionalLocations != null) { for (URL jbossCxfXml : additionalLocations) Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-12-05 14:38:28 UTC (rev 17050) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -45,7 +45,6 @@ import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; import org.jboss.wsf.stack.cxf.resolver.JBossWSResourceResolver; -import org.jboss.wsf.stack.cxf.transport.SoapTransportFactoryExt; /** * A deployment aspect that creates the CXF Bus early and attaches it to the endpoints (wrapped in a BusHolder) @@ -126,7 +125,7 @@ Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile(), epConfigName, epConfigFile); - holder.configure(new SoapTransportFactoryExt(), resolver, configurer, wsmd); + holder.configure(resolver, configurer, wsmd); dep.addAttachment(BusHolder.class, holder); } finally Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2012-12-05 14:38:28 UTC (rev 17050) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -24,6 +24,8 @@ import static org.jboss.wsf.stack.cxf.Loggers.METADATA_LOGGER; import static org.jboss.wsf.stack.cxf.Messages.MESSAGES; +import java.io.IOException; +import java.net.URL; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -39,10 +41,15 @@ import javax.xml.ws.soap.SOAPBinding; import org.jboss.ws.common.JavaUtils; +import org.jboss.ws.common.deployment.SOAPAddressWSDLParser; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.HttpEndpoint; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; @@ -50,6 +57,7 @@ import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.wsf.stack.cxf.JBossWSInvoker; +import org.jboss.wsf.stack.cxf.addressRewrite.SoapAddressRewriteHelper; import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint; @@ -62,6 +70,8 @@ */ public class MetadataBuilder { + private static ServerConfig serverConfig; + public MetadataBuilder() { @@ -69,6 +79,7 @@ public DDBeans build(Deployment dep) { + Map<String, SOAPAddressWSDLParser> soapAddressWsdlParsers = new HashMap<String, SOAPAddressWSDLParser>(); DDBeans dd = new DDBeans(); for (Endpoint ep : dep.getService().getEndpoints()) { @@ -79,8 +90,9 @@ ddep.setInvoker(JBossWSInvoker.class.getName()); } processWSDDContribution(ddep, (ArchiveDeployment)dep); + processAddressRewrite(ddep, (ArchiveDeployment)dep, soapAddressWsdlParsers); - METADATA_LOGGER.addingServiceEndpointMetadata(ddep); + METADATA_LOGGER.addingServiceEndpointMetadata(METADATA_LOGGER.isDebugEnabled() ? ddep.toStringExtended() : ddep.toString()); dd.addEndpoint(ddep); } return dd; @@ -209,22 +221,27 @@ Class<?> seiClass = null; String seiName; + boolean missingServicePortAttr = false; String name = (anWebService != null) ? anWebService.name() : ""; if (name.length() == 0) name = JavaUtils.getJustClassName(sepClass); String serviceName = (anWebService != null) ? anWebService.serviceName() : anWebServiceProvider.serviceName(); - if (serviceName.length() == 0) + if (serviceName.length() == 0) { + missingServicePortAttr = true; serviceName = JavaUtils.getJustClassName(sepClass) + "Service"; + } String serviceNS = (anWebService != null) ? anWebService.targetNamespace() : anWebServiceProvider.targetNamespace(); if (serviceNS.length() == 0) serviceNS = getTypeNamespace(JavaUtils.getPackageName(sepClass)); String portName = (anWebService != null) ? anWebService.portName() : anWebServiceProvider.portName(); - if (portName.length() == 0) + if (portName.length() == 0) { + missingServicePortAttr = true; portName = name + "Port"; + } if (anWebService != null && anWebService.endpointInterface().length() > 0) { @@ -250,6 +267,7 @@ throw MESSAGES.webserviceAnnotationSEIAttributes(seiName); } + final String annWsdlLocation = (anWebService != null) ? anWebService.wsdlLocation() : anWebServiceProvider.wsdlLocation(); DDEndpoint result = new DDEndpoint(); @@ -265,9 +283,52 @@ props.put(k, ep.getProperty(k)); } result.setProperties(props); + if (!missingServicePortAttr && annWsdlLocation.length() > 0) { + result.setAnnotationWsdlLocation(annWsdlLocation); + } return result; } + protected void processAddressRewrite(DDEndpoint ddep, ArchiveDeployment dep, Map<String, SOAPAddressWSDLParser> soapAddressWsdlParsers) + { + String wsdlLocation = ddep.getWsdlLocation(); + if (wsdlLocation == null) { + wsdlLocation = ddep.getAnnotationWsdlLocation(); + } + if (wsdlLocation != null) { + try { + URL wsdlUrl = dep.getResourceResolver().resolve(wsdlLocation); + + SOAPAddressWSDLParser parser = getCurrentSOAPAddressWSDLParser(wsdlUrl, soapAddressWsdlParsers); + //do not try rewriting addresses for not-http binding + String wsdlAddress = parser.filterSoapAddress(ddep.getServiceName(), ddep.getPortName(), SOAPAddressWSDLParser.SOAP_HTTP_NS); + + final ServerConfig sc = getServerConfig(); + String rewrittenWsdlAddress = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(wsdlAddress, ddep.getAddress(), sc); + //If "auto rewrite", leave "publishedEndpointUrl" unset so that CXF do not force host/port values for + //wsdl imports and auto-rewrite them too; otherwise set the new address into "publishedEndpointUrl", + //which causes CXF to override any address in the published wsdl. + if (!SoapAddressRewriteHelper.isAutoRewriteOn(sc)) { + ddep.setPublishedEndpointUrl(rewrittenWsdlAddress); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + private SOAPAddressWSDLParser getCurrentSOAPAddressWSDLParser(URL wsdlUrl, Map<String, SOAPAddressWSDLParser> soapAddressWsdlParsers) { + final String key = wsdlUrl.toString(); + SOAPAddressWSDLParser parser = soapAddressWsdlParsers.get(key); + if (parser != null) { + return parser; + } else { + parser = new SOAPAddressWSDLParser(wsdlUrl); + soapAddressWsdlParsers.put(key, parser); + return parser; + } + } + /** * Extracts the typeNS given the package name * Algorithm is based on the one specified in JAXWS v2.0 spec @@ -300,4 +361,14 @@ return sb.toString(); } + private static synchronized ServerConfig getServerConfig() + { + if (serverConfig == null) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); + } + return serverConfig; + } + } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2012-12-05 14:38:28 UTC (rev 17050) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -42,6 +42,8 @@ private String id; private String address; + + private String publishedEndpointUrl; private String implementor; @@ -72,6 +74,8 @@ //additional fields private Class<?> epClass; + private String annotationWsdlLocation; + private int counter = 0; public QName getPortName() @@ -114,6 +118,16 @@ this.address = address; } + public String getPublishedEndpointUrl() + { + return publishedEndpointUrl; + } + + public void setPublishedEndpointUrl(String publishedEndpointUrl) + { + this.publishedEndpointUrl = publishedEndpointUrl; + } + public String getImplementor() { return implementor; @@ -134,6 +148,16 @@ this.wsdlLocation = wsdlLocation; } + public String getAnnotationWsdlLocation() + { + return annotationWsdlLocation; + } + + public void setAnnotationWsdlLocation(String annotationWsdlLocation) + { + this.annotationWsdlLocation = annotationWsdlLocation; + } + public Class<?> getEpClass() { return epClass; @@ -231,6 +255,10 @@ { writer.write("<jaxws:endpoint id='" + this.id + "'"); writer.write(" address='" + this.address + "'"); + if (this.publishedEndpointUrl != null) + { + writer.write(" publishedEndpointUrl='" + this.publishedEndpointUrl + "'"); + } writer.write(" implementor='" + this.implementor + "'"); if (this.serviceName != null) { @@ -242,7 +270,7 @@ } if (this.wsdlLocation != null) { - writer.write(" wsdlLocationOverride='" + this.wsdlLocation + "'"); + writer.write(" wsdlLocation='" + this.wsdlLocation + "'"); } writer.write(">"); @@ -316,17 +344,17 @@ writer.write(" " + elementName + "='" + prefix + ":" + qname.getLocalPart() + "'"); writer.write(" xmlns:" + prefix + "='" + qname.getNamespaceURI() + "'"); } - - public String toString() + + private StringBuilder basicToString() { StringBuilder str = new StringBuilder(); str.append("id=" + this.id); str.append("\n address=" + this.address); str.append("\n implementor=" + this.implementor); - str.append("\n invoker=" + this.invoker); str.append("\n serviceName=" + this.serviceName); str.append("\n portName=" + this.portName); - str.append("\n wsdlLocation=" + this.wsdlLocation); + str.append("\n annotationWsdlLocation=" + this.annotationWsdlLocation); + str.append("\n wsdlLocationOverride=" + this.wsdlLocation); str.append("\n mtomEnabled=" + this.mtomEnabled); if (this.handlers != null && !this.handlers.isEmpty()) { str.append("\n handlers=["); @@ -335,6 +363,19 @@ str.append(it.hasNext() ? "," : "]"); } } + return str; + } + + public String toString() + { + return basicToString().toString(); + } + + public String toStringExtended() + { + StringBuilder str = basicToString(); + str.append("\n publishedEndpointUrl=" + this.publishedEndpointUrl); + str.append("\n invoker=" + this.invoker); if (this.properties != null && !this.properties.isEmpty()) { str.append("\n properties=["); Deleted: 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-12-05 14:38:28 UTC (rev 17050) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -1,216 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.transport; - -import static org.jboss.wsf.stack.cxf.Loggers.ADDRESS_REWRITE_LOGGER; - -import java.net.URI; -import java.net.URL; - -import org.apache.cxf.service.model.EndpointInfo; -import org.apache.cxf.service.model.ServiceInfo; -import org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress; -import org.jboss.wsf.spi.management.ServerConfig; - -/** - * A custom EndpointInfo that updates the SoapAddress extension - * coming from the wsdl definition according to the JBossWS - * soap address rewrite rules. - * - * @see org.apache.cxf.binding.soap.SoapTransportFactory.SoapEndpointInfo - * - * @author alessio.soldano(a)jboss.com - * @since 03-Aug-2009 - * - */ -public class AddressRewritingEndpointInfo extends EndpointInfo -{ - private ServerConfig serverConfig; - SoapAddress saddress; - - AddressRewritingEndpointInfo(ServiceInfo serv, String trans, ServerConfig serverConfig) - { - super(serv, trans); - this.serverConfig = serverConfig; - } - - /** - * This is the method responsible for both setting the EndpointInfo address and - * setting the soap:address in the wsdl. - * While the former action is straightforward, the latter is performed according - * to the JBossWS configuration: every time CXF updates the EndpointInfo address - * (which usually happens twice) this makes sure a proper address is updated in - * the wsdl. - * - * {@inheritDoc} - */ - public void setAddress(String s) - { - String previousAddress = super.getAddress(); - super.setAddress(s); - boolean setNewAddress = false; - if (previousAddress == null) - { - setNewAddress = true; - } - else if (isRewriteAllowed(s) && isRewriteRequired(s, previousAddress)) - { - String uriScheme = getUriScheme(s); - //we set https if the transport guarantee is CONFIDENTIAL or the previous address already used https - //(if the original wsdl soap:address uses https we can't overwrite it with http) - if ("https".equalsIgnoreCase(getUriScheme(previousAddress))) - { - uriScheme = "https"; - } - if (uriScheme == null) - { - uriScheme = "http"; - } - //rewrite the candidate new address - s = rewriteSoapAddress(s, uriScheme); - setNewAddress = true; - } - if (setNewAddress && saddress != null) - { - ADDRESS_REWRITE_LOGGER.settingNewServiceEndpointAddressInWsdl(s); - saddress.setLocationURI(s); - } - } - - public void addExtensor(Object el) - { - super.addExtensor(el); - if (el instanceof SoapAddress) - { - saddress = (SoapAddress)el; - } - } - - protected boolean isRewriteAllowed(String address) - { - //exclude non http addresses - return (address != null && address.trim().toLowerCase().startsWith("http")); - } - - - protected boolean isRewriteRequired(String address, String previousAddress) - { - //JBWS-3297:rewrite is only needed when previousAddress(from wsdl) is different with the published wsdl - if (address.equals(previousAddress)) { - return false; - } - //check config prop forcing address rewrite - if (serverConfig.isModifySOAPAddress()) - { - ADDRESS_REWRITE_LOGGER.addressRewriteRequiredBecauseOfServerConf(previousAddress); - return true; - } - //check if the previous address is not valid - if (isInvalidAddress(previousAddress)) - { - ADDRESS_REWRITE_LOGGER.addressRewriteRequiredBecauseOfInvalidAddress(previousAddress); - return true; - } - ADDRESS_REWRITE_LOGGER.rewriteNotRequired(previousAddress); - return false; - } - - protected boolean isInvalidAddress(String address) - { - if (address == null) - { - return true; - } - String s = address.trim(); - if (s.length() == 0 || s.contains("REPLACE_WITH_ACTUAL_URL")) - { - return true; - } - try - { - new URL(s); - } - catch (Exception e) - { - return true; - } - return false; - } - - /** - * Rewrite the provided address according to the current server - * configuration and always using the specified uriScheme. - * - * @param s The source address - * @param uriScheme The uriScheme to use for rewrite - * @return The obtained address - */ - protected String rewriteSoapAddress(String s, String uriScheme) - { - try - { - URL url = new URL(s); - String path = url.getPath(); - String host = serverConfig.getWebServiceHost(); - String port = ""; - if ("https".equals(uriScheme)) - { - int portNo = serverConfig.getWebServiceSecurePort(); - if (portNo != 443) - { - port = ":" + portNo; - } - } - else - { - int portNo = serverConfig.getWebServicePort(); - if (portNo != 80) - { - port = ":" + portNo; - } - } - String urlStr = uriScheme + "://" + host + port + path; - - ADDRESS_REWRITE_LOGGER.addressRewritten(s, urlStr); - return urlStr; - } - catch (Exception e) - { - ADDRESS_REWRITE_LOGGER.invalidAddressProvidedUseItWithoutRewriting(s); - return s; - } - } - - private static String getUriScheme(String address) - { - try - { - URI addrURI = new URI(address); - String scheme = addrURI.getScheme(); - return scheme; - } - catch (Exception e) - { - return null; - } - } -} Deleted: 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-12-05 14:38:28 UTC (rev 17050) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -1,106 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.transport; - -import java.util.Iterator; -import java.util.List; - -import org.apache.cxf.binding.soap.SoapTransportFactory; -import org.apache.cxf.binding.soap.jms.interceptor.SoapJMSConstants; -import org.apache.cxf.binding.soap.model.SoapBindingInfo; -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.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; -import org.jboss.wsf.spi.management.ServerConfigFactory; - -/** - * A SoapTransportFactory extending @see org.apache.cxf.binding.soap.SoapTransportFactory. - * It overrides the EndpointInfo creation method to allow for the soap:address extension - * of the wsdl to be overwritten according to the JBossWS configuration. - * - * @author alessio.soldano(a)jboss.com - * @since 31-Jul-2009 - * - */ -public class SoapTransportFactoryExt extends SoapTransportFactory -{ - private ServerConfig serverConfig; - - @Override - public EndpointInfo createEndpointInfo(ServiceInfo serviceInfo, BindingInfo b, List<?> ees) - { - String transportURI = "http://schemas.xmlsoap.org/wsdl/soap/"; - if (b instanceof SoapBindingInfo) - { - SoapBindingInfo sbi = (SoapBindingInfo) b; - transportURI = sbi.getTransportURI(); - } - ServerConfig config = getServerConfig(); - EndpointInfo info = new AddressRewritingEndpointInfo(serviceInfo, transportURI, config); - - if (ees != null) - { - for (@SuppressWarnings("rawtypes")Iterator itr = ees.iterator(); itr.hasNext();) - { - Object extensor = itr.next(); - - if (SOAPBindingUtil.isSOAPAddress(extensor)) - { - final SoapAddress sa = SOAPBindingUtil.getSoapAddress(extensor); - - info.addExtensor(sa); - info.setAddress(sa.getLocationURI()); - if (isJMSSpecAddress(sa.getLocationURI())) - { - info.setTransportId(SoapJMSConstants.SOAP_JMS_SPECIFICIATION_TRANSPORTID); - } - } - else - { - info.addExtensor(extensor); - } - } - } - - return info; - } - - private boolean isJMSSpecAddress(String address) - { - return address != null && address.startsWith("jms:") && !"jms://".equals(address); - } - - private ServerConfig getServerConfig() - { - if (serverConfig == null) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); - } - return serverConfig; - } -} Modified: stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java =================================================================== --- stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2012-12-05 14:38:28 UTC (rev 17050) +++ stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2012-12-05 14:45:10 UTC (rev 17051) @@ -64,7 +64,7 @@ } BusHolder holder = new NonSpringBusHolder(new DDBeans()); try { - holder.configure(null, null, null, wsmd); + holder.configure(null, null, wsmd); return holder.getBus().getExtension(PolicyEngine.class).getAlternativeSelector().getClass().getName(); } finally { holder.close();