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 2012/11/07 00:42:46 UTC
svn commit: r1406400 -
/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Author: jgallimore
Date: Tue Nov 6 23:42:46 2012
New Revision: 1406400
URL: http://svn.apache.org/viewvc?rev=1406400&view=rev
Log:
TOMEE-507 + fix for deploying exploded EARs referenced from server.xml
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1406400&r1=1406399&r2=1406400&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Tue Nov 6 23:42:46 2012
@@ -741,7 +741,12 @@ public class TomcatWebAppBuilder impleme
}
private static File warPath(final StandardContext standardContext) {
- final String doc = standardContext.getDocBase();
+ String doc = standardContext.getDocBase();
+ // handle ROOT case
+ if (doc == null || doc.length() == 0) {
+ doc = "ROOT";
+ }
+
File war = new File(doc);
if (war.exists()) {
return war;
@@ -882,7 +887,7 @@ public class TomcatWebAppBuilder impleme
AppContext appContext = null;
//Look for context info, maybe context is already scanned
ContextInfo contextInfo = getContextInfo(standardContext);
- final ClassLoader classLoader = standardContext.getLoader().getClassLoader();
+ ClassLoader classLoader = standardContext.getLoader().getClassLoader();
if (contextInfo == null) {
final Collection<String> tomcatResources = getResourcesNames(standardContext.getNamingResources());
AutoConfig.PROVIDED_RESOURCES.set(tomcatResources);
@@ -899,6 +904,9 @@ public class TomcatWebAppBuilder impleme
contextInfo.appInfo.autoDeploy = autoDeploy == null || autoDeploy;
DeployerEjb.AUTO_DEPLOY.remove();
+ if (!appModule.isWebapp()) {
+ classLoader = appModule.getClassLoader();
+ }
appContext = a.createApplication(contextInfo.appInfo, classLoader);
// todo add watched resources to context
} catch (Exception e) {