You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/05/04 20:34:50 UTC
svn commit: r399809 -
/geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
Author: sppatel
Date: Thu May 4 11:34:49 2006
New Revision: 399809
URL: http://svn.apache.org/viewcvs?rev=399809&view=rev
Log:
always add WEB-INF/classes to web module cp
Modified:
geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
Modified: geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java?rev=399809&r1=399808&r2=399809&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java Thu May 4 11:34:49 2006
@@ -207,7 +207,6 @@
// add the warfile's content to the configuration
JarFile warFile = module.getModuleFile();
Enumeration entries = warFile.entries();
- boolean addedClasses = false;
while (entries.hasMoreElements()) {
ZipEntry entry = (ZipEntry) entries.nextElement();
URI targetPath = new URI(null, entry.getName(), null);
@@ -217,12 +216,12 @@
moduleContext.addInclude(targetPath, warFile, entry);
} else {
moduleContext.addFile(targetPath, warFile, entry);
- if (!addedClasses && entry.getName().startsWith("WEB-INF/classes/")) {
- addedClasses = true;
- moduleContext.getConfiguration().addToClassPath("WEB-INF/classes/");
- }
}
}
+
+ //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