[jbossws-commits] JBossWS SVN: r19065 - in common/trunk/src: main/java/org/jboss/ws/common/deployment and 2 other directories.

Author: jim.ma Date: 2014-11-03 04:17:20 -0500 (Mon, 03 Nov 2014) New Revision: 19065 Modified: common/trunk/src/main/java/org/jboss/ws/common/Loggers.java common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java common/trunk/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java Log: [JBWS-3797]:Compute host and port with virtualHost value from @WebContext in EndpointAddressDeploymentAspect Modified: common/trunk/src/main/java/org/jboss/ws/common/Loggers.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/Loggers.java 2014-11-03 09:15:42 UTC (rev 19064) +++ common/trunk/src/main/java/org/jboss/ws/common/Loggers.java 2014-11-03 09:17:20 UTC (rev 19065) @@ -222,4 +222,12 @@ @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 = "Cannot obtain host for vituralHost %s, use default host") + void cannotObtainHost(String host); + + @LogMessage(level = WARN) + @Message(id = 22119, value = "Cannot obtain port for vituralHost %s, use default port") + void cannotObtainPort(String host); } 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-11-03 09:15:42 UTC (rev 19064) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-11-03 09:17:20 UTC (rev 19065) @@ -31,6 +31,7 @@ import java.util.Map; import org.jboss.ws.api.annotation.WebContext; +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; @@ -82,7 +83,20 @@ boolean confidential = isConfidentialTransportGuarantee(dep, ep); int currentPort = port.getValue(confidential); String hostAndPort = host + (currentPort > 0 ? ":" + currentPort : ""); - + if (ep.getService().getVirtualHost() != null) + { + String hostName = getServerConfig().getHostAlias(ep.getService().getVirtualHost()); + if (hostName == null) { + Loggers.DEPLOYMENT_LOGGER.cannotObtainHost(ep.getService().getVirtualHost()); + hostName = host; + } + Integer hostPort = getServerConfig().getVirtualHostPort(ep.getService().getVirtualHost(), confidential); + if (hostPort == null) { + Loggers.DEPLOYMENT_LOGGER.cannotObtainPort(ep.getService().getVirtualHost()); + hostPort = currentPort; + } + hostAndPort = hostName + ":" + hostPort; + } HttpEndpoint httpEp = (HttpEndpoint)ep; String urlPattern = httpEp.getURLPattern(); if (urlPattern == null) Modified: common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-11-03 09:15:42 UTC (rev 19064) +++ common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-11-03 09:17:20 UTC (rev 19065) @@ -428,6 +428,15 @@ return endpointConfigStore.getConfig(name); } + public Integer getVirtualHostPort(String hostname, boolean secure) + { + return null; + } + + public String getHostAlias(String virtualHost) + { + return virtualHost; + } private static void checkPermission(final Permission permission) { SecurityManager securityManager = System.getSecurityManager(); Modified: common/trunk/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java =================================================================== --- common/trunk/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java 2014-11-03 09:15:42 UTC (rev 19064) +++ common/trunk/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java 2014-11-03 09:17:20 UTC (rev 19065) @@ -57,6 +57,15 @@ { return null; } + public Integer getVirtualHostPort(String virtualHost, boolean secure) + { + return null; + } + + public String getHostAlias(String host) + { + return host; + } }; //test default value