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/10/21 20:32:29 UTC
git commit: without docBase our file search was totally broken -
todo: check if we have it on 1.7.x and if so create a jira and backport
Repository: tomee
Updated Branches:
refs/heads/develop dc93d6ce3 -> 7e820eef5
without docBase our file search was totally broken - todo: check if we have it on 1.7.x and if so create a jira and backport
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7e820eef
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7e820eef
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7e820eef
Branch: refs/heads/develop
Commit: 7e820eef571c320b104ef64ea2fc0342baac1382
Parents: dc93d6c
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Oct 21 20:32:17 2014 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Oct 21 20:32:17 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/tomee/catalina/Contexts.java | 12 ++++++++++--
.../org/apache/tomee/catalina/TomcatWebAppBuilder.java | 4 ++++
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e820eef/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Contexts.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Contexts.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Contexts.java
index cd80659..bd5c13a 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Contexts.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Contexts.java
@@ -70,6 +70,7 @@ public class Contexts {
container = container.getParent();
}
+ String baseName = null;
if (standardContext.getDocBase() != null) {
File file = new File(standardContext.getDocBase());
if (!file.isAbsolute()) {
@@ -91,11 +92,18 @@ public class Contexts {
if (path == null) {
throw new IllegalStateException("Can't find docBase");
} else {
- docBase = new File(new ContextName(path, standardContext.getWebappVersion()).getBaseName());
+ baseName = new ContextName(path, standardContext.getWebappVersion()).getBaseName();
+ docBase = new File(baseName);
}
}
- if (!docBase.exists()) { // for old compatibility, will be removed soon
+ if (!docBase.exists() && baseName != null) { // for old compatibility, will be removed soon
+ if (Host.class.isInstance(container)) {
+ final File file = new File(Host.class.cast(container).getAppBaseFile(), baseName);
+ if (file.exists()) {
+ return file;
+ }
+ }
return oldRealWarPath(standardContext);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e820eef/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index baa284c..d22868b 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -780,6 +780,10 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
initJ2EEInfo(standardContext);
File warFile = Contexts.warPath(standardContext);
+ if (!warFile.exists()) {
+ return;
+ }
+
if (!warFile.isDirectory()) {
try {
warFile = DeploymentLoader.unpack(warFile);