Author: rmannibucau
Date: Mon Aug 12 07:47:52 2013
New Revision: 1513065
URL: http://svn.apache.org/r1513065
Log:
adding Contexts.getHostname
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Contexts.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Contexts.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Contexts.java?rev=1513065&r1=1513064&r2=1513065&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Contexts.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Contexts.java
Mon Aug 12 07:47:52 2013
@@ -20,12 +20,25 @@ import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.Host;
+import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardEngine;
import org.apache.catalina.core.StandardHost;
import java.io.File;
public class Contexts {
+ public static String getHostname(final StandardContext ctx) {
+ String hostName = null;
+ final Container parentHost = ctx.getParent();
+ if (parentHost != null) {
+ hostName = parentHost.getName();
+ }
+ if ((hostName == null) || (hostName.length() < 1)) {
+ hostName = "_";
+ }
+ return hostName;
+ }
+
public static File warPath(final Context standardContext) {
final File file = realWarPath(standardContext);
if (file == null) {
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1513065&r1=1513064&r2=1513065&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Mon Aug 12 07:47:52 2013
@@ -1980,7 +1980,7 @@ public class TomcatWebAppBuilder impleme
// create the web module
final String path = standardContext.getPath();
logger.debug("context path = " + path);
- webModule.setHost(standardContext.getHostname());
+ webModule.setHost(Contexts.getHostname(standardContext));
// Add all Tomcat env entries to context so they can be overriden by
the env.properties file
final NamingResources naming = standardContext.getNamingResources();
for (final ContextEnvironment environment : naming.findEnvironments())
{
@@ -2012,7 +2012,6 @@ public class TomcatWebAppBuilder impleme
webApp.getEnvEntryMap().remove(environment.getName());
}
}
-
}
/**
