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 2011/01/21 15:26:30 UTC
svn commit: r1061818 -
/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
Author: rickmcguire
Date: Fri Jan 21 14:26:29 2011
New Revision: 1061818
URL: http://svn.apache.org/viewvc?rev=1061818&view=rev
Log:
GERONIMO-5768 Invalid Bundle-Classpath entry ends with '/'
Modified:
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=1061818&r1=1061817&r2=1061818&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java Fri Jan 21 14:26:29 2011
@@ -381,7 +381,7 @@ public abstract class AbstractWebModuleB
// 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.addToClassPath(module.resolve("WEB-INF/classes/").getPath());
+ moduleContext.addToClassPath(module.resolve("WEB-INF/classes").getPath());
manifestcp.add("WEB-INF/classes"); // NOTE: Spec requires there be no trailing "/" on this.
// install the libs
for (ZipEntry entry : libs) {