You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2006/10/19 16:13:01 UTC
svn commit: r465638 -
/geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
Author: rickmcguire
Date: Thu Oct 19 07:13:01 2006
New Revision: 465638
URL: http://svn.apache.org/viewvc?view=rev&rev=465638
Log:
GERONIMO-2503 Webapp classloader prefers WEB-INF/lib over WEB-INF/classes
Modified:
geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
Modified: geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java?view=diff&rev=465638&r1=465637&r2=465638
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java Thu Oct 19 07:13:01 2006
@@ -242,6 +242,12 @@
module.setRootEarContext(earContext);
try {
+
+ // always add WEB-INF/classes to the classpath regardless of whether
+ // any classes exist. This must be searched BEFORE the WEB-INF/lib jar files,
+ // per the servlet specifications.
+ moduleContext.getConfiguration().addToClassPath("WEB-INF/classes/");
+
// add the warfile's content to the configuration
JarFile warFile = module.getModuleFile();
Enumeration entries = warFile.entries();
@@ -256,10 +262,6 @@
moduleContext.addFile(targetPath, warFile, entry);
}
}
-
- //always add WEB-INF/classes to the classpath regardless of whether
- //any classes exist
- moduleContext.getConfiguration().addToClassPath("WEB-INF/classes/");
// add the manifest classpath entries declared in the war to the class loader
// we have to explicitly add these since we are unpacking the web module