You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2009/01/07 00:11:53 UTC
svn commit: r732167 -
/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
Author: jgallimore
Date: Tue Jan 6 15:11:53 2009
New Revision: 732167
URL: http://svn.apache.org/viewvc?rev=732167&view=rev
Log:
OPENEJB-975 patch to allow webapps to be deployed to the root context by
specifying an empty path in a <Context> node in conf/server.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java?rev=732167&r1=732166&r2=732167&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java Tue Jan 6 15:11:53 2009
@@ -252,7 +252,7 @@
// appInfo is null when deployment fails
if (contextInfo.appInfo != null) {
for (WebAppInfo w : contextInfo.appInfo.webApps) {
- if (("/" + w.contextRoot).equals(standardContext.getPath())) {
+ if (("/" + w.contextRoot).equals(standardContext.getPath()) || isRootApplication(standardContext)) {
webAppInfo = w;
break;
}
@@ -336,7 +336,7 @@
// add context to WebDeploymentInfo
for (WebAppInfo webAppInfo : contextInfo.appInfo.webApps) {
- if (("/" + webAppInfo.contextRoot).equals(standardContext.getPath())) {
+ if (("/" + webAppInfo.contextRoot).equals(standardContext.getPath()) || isRootApplication(standardContext)) {
CoreWebDeploymentInfo webDeploymentInfo = (CoreWebDeploymentInfo) getContainerSystem().getWebDeploymentInfo(webAppInfo.moduleId);
if (webDeploymentInfo != null) {
webDeploymentInfo.setJndiEnc(comp);
@@ -511,6 +511,10 @@
return file.isFile() && standardHost.findChild(name) != null;
}
+
+ private boolean isRootApplication(StandardContext standardContext) {
+ return "".equals(standardContext.getPath());
+ }
protected File appBase(StandardHost standardHost) {
File file = new File(standardHost.getAppBase());