geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r240450 - /geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
Date Sat, 27 Aug 2005 19:46:35 GMT
Author: ammulder
Date: Sat Aug 27 12:46:33 2005
New Revision: 240450

URL: http://svn.apache.org/viewcvs?rev=240450&view=rev
Log:
Correct the test for EARs (GERONIMO-932)

Modified:
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java?rev=240450&r1=240449&r2=240450&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
Sat Aug 27 12:46:33 2005
@@ -359,7 +359,7 @@
         String app = on.getKeyProperty("J2EEApplication");
         String name = on.getKeyProperty("name");
         if(type != null && (app == null || app.equals("null"))) {
-            return (type.equals("WebModule") || type.equals("J2EEModule") || type.equals("EJBModule")
|| type.equals("AppClientModule") || type.equals("ResourceAdapterModule")) && !name.startsWith("org/apache/geronimo/System");
+            return (type.equals("WebModule") || type.equals("J2EEApplication") || type.equals("EJBModule")
|| type.equals("AppClientModule") || type.equals("ResourceAdapterModule")) && !name.startsWith("org/apache/geronimo/System");
         }
         return false;
     }
@@ -367,7 +367,7 @@
     private static String decodeModule(String value) {
         if(value.equals("WebModule")) {
             return "WAR";
-        } else if(value.equals("J2EEModule")) {
+        } else if(value.equals("J2EEApplication")) {
             return "EAR";
         } else if(value.equals("EJBModule")) {
             return "JAR";



Mime
View raw message