geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r520533 - /geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
Date Tue, 20 Mar 2007 19:36:30 GMT
Author: sppatel
Date: Tue Mar 20 12:36:30 2007
New Revision: 520533

URL: http://svn.apache.org/viewvc?view=rev&rev=520533
Log:
allow nestedjarfiles to contain unpacked modules

Modified:
    geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java

Modified: geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java?view=diff&rev=520533&r1=520532&r2=520533
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/NestedJarFile.java
Tue Mar 20 12:36:30 2007
@@ -53,11 +53,18 @@
         }
 
         if (targetEntry.isDirectory()) {
-            baseJar = jarFile;
-            if (!path.endsWith("/")) {
-                path += "/";
-            }
-            basePath = path;
+        	if(targetEntry instanceof UnpackedJarEntry) {
+        		//unpacked nested module inside unpacked ear
+        		File targetFile = ((UnpackedJarEntry) targetEntry).getFile();
+        		baseJar = new UnpackedJarFile(targetFile);
+                basePath = "";
+        	} else {
+        		baseJar = jarFile;
+        		if (!path.endsWith("/")) {
+                    path += "/";
+                }
+                basePath = path;
+        	}
         } else {
             if (targetEntry instanceof UnpackedJarEntry) {
                 // for unpacked jars we don't need to copy the jar file



Mime
View raw message