[jbossws-commits] JBossWS SVN: r18845 - in common/trunk/src/main/java/org/jboss/ws/common: deployment and 1 other directory.

Author: jim.ma Date: 2014-08-14 04:41:55 -0400 (Thu, 14 Aug 2014) New Revision: 18845 Modified: common/trunk/src/main/java/org/jboss/ws/common/Constants.java common/trunk/src/main/java/org/jboss/ws/common/Loggers.java common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java Log: [JBWS-3805]:Add property to force the address uri scheme Modified: common/trunk/src/main/java/org/jboss/ws/common/Constants.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/Constants.java 2014-08-13 08:23:56 UTC (rev 18844) +++ common/trunk/src/main/java/org/jboss/ws/common/Constants.java 2014-08-14 08:41:55 UTC (rev 18845) @@ -320,4 +320,6 @@ static final String HTTP_MAX_CONNECTIONS = "org.jboss.ws.http.maxConnections"; static final String NETTY_MESSAGE = "org.jboss.ws.http.netty.Message"; + + static final String FORCE_URI_SCHEME = "org.jboss.ws.address.forceUriScheme"; } Modified: common/trunk/src/main/java/org/jboss/ws/common/Loggers.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/Loggers.java 2014-08-13 08:23:56 UTC (rev 18844) +++ common/trunk/src/main/java/org/jboss/ws/common/Loggers.java 2014-08-14 08:41:55 UTC (rev 18845) @@ -222,4 +222,9 @@ @LogMessage(level = TRACE) @Message(id = 22116, value = "Could not find %s in the additional metadatafiles") void cannotFindInAdditionalMetaData(String resourcePath); + + + @LogMessage(level = WARN) + @Message(id = 22118, value = "Invalid uri schema value %s") + void invalidUriSchemeValue(String scheme); } Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-08-13 08:23:56 UTC (rev 18844) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-08-14 08:41:55 UTC (rev 18845) @@ -31,6 +31,8 @@ import java.util.Map; import org.jboss.ws.api.annotation.WebContext; +import org.jboss.ws.common.Constants; +import org.jboss.ws.common.Loggers; import org.jboss.ws.common.Messages; import org.jboss.ws.common.integration.AbstractDeploymentAspect; import org.jboss.ws.common.management.AbstractServerConfig; @@ -45,6 +47,7 @@ import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; /** * A deployer that assigns the endpoint address. @@ -70,11 +73,32 @@ Map<String, Endpoint> endpointsMap = new HashMap<String, Endpoint>(); List<Endpoint> deleteList = new LinkedList<Endpoint>(); String uriSchema = serverConfig.getWebServiceUriScheme(); + JBossWebservicesMetaData wsmd = dep.getAttachment(JBossWebservicesMetaData.class); + if (uriSchema == null && wsmd != null && wsmd.getProperty(Constants.FORCE_URI_SCHEME) != null) + { + String wsmdScheme = wsmd.getProperty(Constants.FORCE_URI_SCHEME); + if ("http".equals(wsmdScheme) || "https".equals(wsmdScheme)) + { + uriSchema = wsmdScheme; + dep.getService().setProperty(Constants.FORCE_URI_SCHEME, uriSchema); + } else { + Loggers.DEPLOYMENT_LOGGER.invalidUriSchemeValue(wsmdScheme); + } + } for (Endpoint ep : service.getEndpoints()) { if (ep instanceof HttpEndpoint) { - boolean confidential = isConfidentialTransportGuarantee(dep, ep); + boolean confidential = false; + if ("https".equals(uriSchema)) { + confidential = true; + } + if ("http".equals(uriSchema)) { + confidential = false; + } + if (uriSchema == null) { + confidential = isConfidentialTransportGuarantee(dep, ep); + } int currentPort = port.getValue(confidential); String hostAndPort = host + (currentPort > 0 ? ":" + currentPort : ""); @@ -87,10 +111,6 @@ urlPattern = urlPattern.substring(0, urlPattern.length() - 2); String protocol = confidential ? "https://" : "http://"; - //force address protocol - if (uriSchema != null) { - protocol = uriSchema + "://"; - } String address = protocol + hostAndPort + (contextRoot.equals("/") && urlPattern.startsWith("/") ? "" : contextRoot) + urlPattern; httpEp.setAddress(address); //JBWS-2957: EJB3 binds the same endpoint class to multiple beans at multiple JNDI locations;