[jbossws-commits] JBossWS SVN: r18841 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite.

[jbossws-commits at lists.jboss.org]

Author: jim.ma
Date: 2014-08-11 06:08:14 -0400 (Mon, 11 Aug 2014)
New Revision: 18841

Modified:
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java
Log:
[JBWS-3785]:Add option for forcing https protocol when rewriting soap:addres in WSDL

Modified: 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	2014-08-11 10:07:33 UTC (rev 18840)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/addressRewrite/SoapAddressRewriteHelper.java	2014-08-11 10:08:14 UTC (rev 18841)
@@ -56,7 +56,10 @@
       {
          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; 
+         String uriScheme = (origUriScheme.equals(HTTPS) || newUriScheme.equals(HTTPS)) ? HTTPS : HTTP; 
+         if (serverConfig.getWebServiceUriScheme() != null) {
+            uriScheme = serverConfig.getWebServiceUriScheme();
+         }
          return rewriteSoapAddress(serverConfig, wsdlAddress, epAddress, uriScheme);
       }
       else