geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1127433 - /geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Date Wed, 25 May 2011 08:46:19 GMT
Author: genspring
Date: Wed May 25 08:46:19 2011
New Revision: 1127433

URL: http://svn.apache.org/viewvc?rev=1127433&view=rev
Log:
EAR/lib/sub-dir/*.jar should not be added into lib classpath.

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=1127433&r1=1127432&r2=1127433&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Wed May 25 08:46:19 2011
@@ -607,7 +607,8 @@ public class EARConfigBuilder implements
                             break;
                         }
                     }
-                    if (libDir != null && entry.getName().startsWith(libDir) &&
entry.getName().endsWith(".jar")) {
+                    //   EAR/lib/sub-dir/*.jar should not be added into lib classpath.
+                    if (libDir != null && entry.getName().startsWith(libDir) &&
entry.getName().endsWith(".jar") && entry.getName().substring(libDir.length()+1).indexOf("/")
== -1) {
                         NestedJarFile library = new NestedJarFile(earFile, entry.getName());
                         earContext.addIncludeAsPackedJar(URI.create(entry.getName()), library);
                         libClasspath.add(entry.getName());



Mime
View raw message