Author: jim.ma
Date: 2014-10-20 22:42:59 -0400 (Mon, 20 Oct 2014)
New Revision: 19019
Modified:
common/branches/JBWS-3797/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
common/branches/JBWS-3797/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
common/branches/JBWS-3797/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java
Log:
[JBWS-3797]:Let @WebContext(virtualHost...) affect endpoint address
Modified:
common/branches/JBWS-3797/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
===================================================================
---
common/branches/JBWS-3797/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-10-21
02:41:13 UTC (rev 19018)
+++
common/branches/JBWS-3797/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-10-21
02:42:59 UTC (rev 19019)
@@ -82,7 +82,10 @@
boolean confidential = isConfidentialTransportGuarantee(dep, ep);
int currentPort = port.getValue(confidential);
String hostAndPort = host + (currentPort > 0 ? ":" + currentPort
: "");
-
+ if (ep.getService().getVirtualHost() != null && !confidential) {
+ hostAndPort = ep.getService().getVirtualHost() + ":"
+ +
getServerConfig().getVirutalHostPort(ep.getService().getVirtualHost());
+ }
HttpEndpoint httpEp = (HttpEndpoint)ep;
String urlPattern = httpEp.getURLPattern();
if (urlPattern == null)
@@ -209,7 +212,7 @@
}
return this.port;
}
-
+ //TODO:Handle virtual host in webContext. This needs to be supported in
undertow(see WebServerService)
public Integer getSecurePortValue()
{
if (this.securePort == null && this.sarm != null)
Modified:
common/branches/JBWS-3797/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
===================================================================
---
common/branches/JBWS-3797/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-10-21
02:41:13 UTC (rev 19018)
+++
common/branches/JBWS-3797/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-10-21
02:42:59 UTC (rev 19019)
@@ -440,4 +440,7 @@
public interface UpdateCallbackHandler {
public void onBeforeUpdate();
}
+ public Integer getVirutalHostPort() {
+ return null;
+ }
}
Modified:
common/branches/JBWS-3797/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java
===================================================================
---
common/branches/JBWS-3797/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java 2014-10-21
02:41:13 UTC (rev 19018)
+++
common/branches/JBWS-3797/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java 2014-10-21
02:42:59 UTC (rev 19019)
@@ -57,6 +57,12 @@
{
return null;
}
+
+ @Override
+ public Integer getVirutalHostPort(String virtualHost)
+ {
+ return null;
+ }
};
//test default value
Show replies by date