You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/12/01 10:53:12 UTC
tomee git commit: TOMEE-1460 using right host for all ejb deployment
mode (soap)
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 27a280448 -> 2edc90fa2
TOMEE-1460 using right host for all ejb deployment mode (soap)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2edc90fa
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2edc90fa
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2edc90fa
Branch: refs/heads/tomee-1.7.x
Commit: 2edc90fa2caa4abc43c042d7832e61a5fb1a41cd
Parents: 27a2804
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Dec 1 10:45:11 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Dec 1 10:45:11 2014 +0100
----------------------------------------------------------------------
.../openejb/server/webservices/WsService.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/2edc90fa/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
index ffec7fb..8b550f5 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
@@ -270,6 +270,7 @@ public abstract class WsService implements ServerService, SelfManaging {
}
contextData.put("ejbJarId", ejbJar.moduleName);
+ final String host = host(ejbJar, appInfo);
for (final EnterpriseBeanInfo bean : ejbJar.enterpriseBeans) {
if (bean instanceof StatelessBeanInfo || bean instanceof SingletonBeanInfo) {
@@ -314,7 +315,8 @@ public abstract class WsService implements ServerService, SelfManaging {
if (context == null && !OLD_WEBSERVICE_DEPLOYMENT) {
context = ejbJar.moduleName;
}
- final List<String> addresses = wsRegistry.addWsContainer(container, classLoader, context, virtualHost, location, realm, transport, auth);
+
+ final List<String> addresses = wsRegistry.addWsContainer(container, classLoader, context, host, location, realm, transport, auth);
alreadyDeployed.add(beanContext);
// one of the registered addresses to be the canonical address
@@ -344,6 +346,18 @@ public abstract class WsService implements ServerService, SelfManaging {
} // else called because of ear case where new ejbs are deployed in webapps
}
+ private String host(final EjbJarInfo jar, final AppInfo app) {
+ for (final WebAppInfo web : app.webApps) {
+ if (jar.moduleId.equals(web.moduleId)) {
+ if (web.host != null) {
+ return web.host;
+ }
+ break;
+ }
+ }
+ return virtualHost;
+ }
+
protected void setWsdl(final HttpListener listener, final String wsdl) {
// no-op
}