Author: bdecoste Date: 2007-11-14 15:01:43 -0500 (Wed, 14 Nov 2007) New Revision: 5048 Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpoint.java legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/WSDLRequestHandler.java Log: [JBPAPP-415] merged changes from jbossws-1.2.0.SP1-JBWS-1643 Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpoint.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpoint.java 2007-11-14 17:30:00 UTC (rev 5047) +++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpoint.java 2007-11-14 20:01:43 UTC (rev 5048) @@ -135,18 +135,13 @@ ServiceEndpointInfo sepInfo = getServiceEndpointInfo(); EndpointMetaData epMetaData = sepInfo.getServerEndpointMetaData(); - //String wsdlHost = reqURL.getHost(); - String wsdlHost = reqURL.getProtocol() + "://" + reqURL.getHost() + ":" + reqURL.getPort(); - ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance(); ServiceEndpointManager epManager = factory.getServiceEndpointManager(); - if (epManager.getWebServiceHost().equals(ServiceEndpointManager.UNDEFINED_HOSTNAME) == false) - { - wsdlHost = epManager.getWebServiceHost(); - } - if (log.isDebugEnabled()) - log.debug("WSDL request, using host: " + wsdlHost); + String wsdlHost = epManager.getDisplayHost(sepInfo, reqURL); + + if(log.isDebugEnabled()) log.debug("WSDL request, using host: " + wsdlHost); + WSDLRequestHandler wsdlRequestHandler = new WSDLRequestHandler(epMetaData); Document document = wsdlRequestHandler.getDocumentForPath(reqURL, wsdlHost, resPath); Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-11-14 17:30:00 UTC (rev 5047) +++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-11-14 20:01:43 UTC (rev 5048) @@ -343,15 +343,68 @@ { String endpointAddress = seInfo.getServerEndpointMetaData().getEndpointAddress(); URL displayURL = new URL(endpointAddress); - String endPointPath = displayURL.getPath(); - if (this.getWebServiceHost().equals(ServiceEndpointManager.UNDEFINED_HOSTNAME) == true) + String displayHost = getDisplayHost(seInfo, requestURL); + + String displayAddress = displayHost + displayURL.getPath(); + if (log.isDebugEnabled()) { - displayURL = requestURL; + log.trace("Mapping WSDL soap:address from '" + endpointAddress + "' to '" + displayAddress + "'"); } - String displayAddress = displayURL.getProtocol() + "://" + displayURL.getHost() + ":" + displayURL.getPort() + endPointPath; return displayAddress; } + /* + * Formats the Service endpoint host according to the beans.xml definition and + * the requested url and returns the URL as string + * + */ + public String getDisplayHost(ServiceEndpointInfo seInfo, URL requestURL) throws MalformedURLException + { + String endpointAddress = seInfo.getServerEndpointMetaData().getEndpointAddress(); + URL displayURL = new URL(endpointAddress); + String protocol = displayURL.getProtocol(); + String host = displayURL.getHost(); + int port = displayURL.getPort(); + String uriScheme = requestURL.getProtocol(); + if ("CONFIDENTIAL".equals(seInfo.getServerEndpointMetaData().getTransportGuarantee())) + { + //If service is defined to be confidential then always it is https + uriScheme = "https"; + } + if (alwaysModifySOAPAddress || host.equals(ServiceEndpointManager.UNDEFINED_HOSTNAME) == true) + { + //Modify the address + if (this.getWebServiceHost().equals(ServiceEndpointManager.UNDEFINED_HOSTNAME) == true) + { + //Use the incoming request's address + protocol = uriScheme; + host = requestURL.getHost(); + port = requestURL.getPort(); + } + else + { + //Use the address given in jboss-beans.xml + protocol = uriScheme; + host = this.getWebServiceHost(); + if (protocol.equals("https")) + { + port = this.getWebServiceSecurePort(); + } + else + { + port = this.getWebServicePort(); + } + } + } + String displayHost = protocol + "://" + host + (port > 0 ? ":" + port : ""); + + if (log.isDebugEnabled()) + { + log.trace("Mapping WSDL host from '" + protocol + "://" + host + ":" + port + "' to '" + displayHost + "'"); + } + return displayHost; + } + /** Get the endpoint metrics */ public ServiceEndpointMetrics getServiceEndpointMetrics(ObjectName sepID) Modified: legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-11-14 17:30:00 UTC (rev 5047) +++ legacy/branches/jbossws-1.2.1.GA_CP01_JBPAPP-415/jbossws-core/src/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-11-14 20:01:43 UTC (rev 5048) @@ -134,10 +134,10 @@ if (! (wsdlHost.startsWith("http://") || wsdlHost.startsWith("https://")) ) { - String reqProtocol = reqURL.getProtocol(); - int reqPort = reqURL.getPort(); - String hostAndPort = wsdlHost + (reqPort > 0 ? ":" + reqPort : ""); - completeHost = reqProtocol + "://" + hostAndPort; + String reqProtocol = reqURL.getProtocol(); + int reqPort = reqURL.getPort(); + String hostAndPort = wsdlHost + (reqPort > 0 ? ":" + reqPort : ""); + completeHost = reqProtocol + "://" + hostAndPort; } String newLocation = completeHost + reqPath + "?wsdl&resource=" + newResourcePath; @@ -157,25 +157,12 @@ String orgLocation = locationAttr.getNodeValue(); URL locURL = new URL(orgLocation); - String locProtocol = locURL.getProtocol(); String locPath = locURL.getPath(); - if (reqURL.getProtocol().equals(locProtocol) && reqURL.getPath().equals(locPath)) - { - String completeHost = wsdlHost; - if (! (completeHost.startsWith("http://") || completeHost.startsWith("https://")) ) - { - int locPort = locURL.getPort(); - String hostAndPort = wsdlHost + (locPort > 0 ? ":" + locPort : ""); + String newLocation = wsdlHost + locPath; + locationAttr.setNodeValue(newLocation); - completeHost = locProtocol + "://" + hostAndPort; - } - - String newLocation = completeHost + locPath; - locationAttr.setNodeValue(newLocation); - - log.trace("Mapping address from '" + orgLocation + "' to '" + newLocation + "'"); - } + log.trace("Mapping address from '" + orgLocation + "' to '" + newLocation + "'"); } } else @@ -185,5 +172,4 @@ } } } - }