geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r703199 - /geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
Date Thu, 09 Oct 2008 16:14:10 GMT
Author: gawor
Date: Thu Oct  9 09:14:09 2008
New Revision: 703199

URL: http://svn.apache.org/viewvc?rev=703199&view=rev
Log:
fix InstallerMojoSupport to properly detect Geronimo installation directory after boilerplate.jar
-> boilerplate.car change (related to GERONIMO-4328)

Modified:
    geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java

Modified: geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java?rev=703199&r1=703198&r2=703199&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
(original)
+++ geronimo/server/trunk/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
Thu Oct  9 09:14:09 2008
@@ -123,7 +123,8 @@
             Enumeration n = zipFile.entries();
             while (n.hasMoreElements()) {
                 ZipEntry entry = (ZipEntry)n.nextElement();
-                if (entry.getName().endsWith("bin/server.jar")) {
+                // look for bin/server.jar under a single directory                     
+                if (entry.getName().endsWith("bin/server.jar") && entry.getName().split("/").length
== 3) {
                     File file = new File(installDirectory, entry.getName());
                     dir = file.getParentFile().getParentFile();
                     break;



Mime
View raw message