svn commit: r1232338 - /geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java

[dj...@apache.org]

Author: djencks
Date: Tue Jan 17 08:45:34 2012
New Revision: 1232338

URL: http://svn.apache.org/viewvc?rev=1232338&view=rev
Log:
adapt installer mojo to new lib jars

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

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java?rev=1232338&r1=1232337&r2=1232338&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java Tue Jan 17 08:45:34 2012
@@ -124,7 +124,7 @@ public abstract class InstallerMojoSuppo
             while (n.hasMoreElements()) {
                 ZipEntry entry = (ZipEntry)n.nextElement();
                 // look for lib/geronimo-main.jar under a single directory                     
-                if (entry.getName().endsWith("lib/geronimo-main.jar") && entry.getName().split("/").length == 3) {
+                if (entry.getName().endsWith("lib/karaf.jar") && entry.getName().split("/").length == 3) {
                     File file = new File(installDirectory, entry.getName());
                     dir = file.getParentFile().getParentFile();
                     break;
@@ -134,7 +134,7 @@ public abstract class InstallerMojoSuppo
             zipFile.close();
         }
         catch (IOException e) {
-            throw new MojoExecutionException("Failed to determine geronimoHome while scanning archive for 'lib/geronimo-main.jar'", e);
+            throw new MojoExecutionException("Failed to determine geronimoHome while scanning archive for 'lib/karaf.jar'", e);
         }
 
         if (dir == null) {
@@ -153,9 +153,9 @@ public abstract class InstallerMojoSuppo
                 geronimoHome = geronimoHome.getCanonicalFile();
                 
                 // Quick sanity check
-                File file = new File(geronimoHome, "lib/geronimo-main.jar");
+                File file = new File(geronimoHome, "lib/karaf.jar");
                 if (!file.exists()) {
-                    throw new MojoExecutionException("When geronimoHome is set, it must point to a directory that contains 'lib/geronimo-main.jar'");
+                    throw new MojoExecutionException("When geronimoHome is set, it must point to a directory that contains 'lib/karaf.jar'");
                 }
                 log.info("Using pre-installed assembly: " + geronimoHome);