geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r400252 - in /geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main: LongStartupMonitor.java ProgressBarStartupMonitor.java SilentStartupMonitor.java StartupMonitor.java
Date Sat, 06 May 2006 07:05:55 GMT
Author: jsisson
Date: Sat May  6 00:05:54 2006
New Revision: 400252

URL: http://svn.apache.org/viewcvs?rev=400252&view=rev
Log:
GERONIMO-1867 - code cleanup - remove unused methods in StartupMonitor interface.  A later
checkin will actually fix G-1867.

Modified:
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/LongStartupMonitor.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/SilentStartupMonitor.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitor.java

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/LongStartupMonitor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/LongStartupMonitor.java?rev=400252&r1=400251&r2=400252&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/LongStartupMonitor.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/LongStartupMonitor.java
Sat May  6 00:05:54 2006
@@ -115,26 +115,10 @@
         StartupMonitorUtil.wrapUp(out, kernel);
     }
 
-    // TODO Review - Currently loadFailed is not called by Daemon
-    public synchronized void loadFailed(String configuration, Exception problem) {
-        out.println("Failed to load configuration " + configuration);
-        out.println();
-        problem.printStackTrace(out);
-    }
-
     public synchronized void serverStartFailed(Exception problem) {
         out.println("Server Startup failed");
         out.println();
         problem.printStackTrace(out);
     }
 
-    // TODO Review - Currently startFailed is not called by Daemon
-    public synchronized void startFailed(String configuration, Exception problem) {
-        out.println("Failed to start configuration " + configuration);
-        // We print the stack track now (rather than defering the printing of it)
-        // since other problems that may occur during the start of a configuration
-        // (e.g. an individual GBean not being able to start) produce
-        // errors in the log (and therefore standard output) immediately.
-        problem.printStackTrace(out);
-    }
 }

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java?rev=400252&r1=400251&r2=400252&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
Sat May  6 00:05:54 2006
@@ -1,8 +1,6 @@
 package org.apache.geronimo.system.main;
 
 import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.repository.Artifact;
@@ -36,7 +34,6 @@
     private Kernel kernel;
     private int operationLimit = 50;
     private boolean finished = false;
-    private List exceptions = new ArrayList();
     private UpdateThread thread;
 
     public synchronized void systemStarting(long startTime) {
@@ -133,29 +130,11 @@
         thread.interrupt();
     }
 
-    public synchronized void loadFailed(String configuration, Exception problem) {
-        for (int i = 0; i < configurations.length; i++) {
-            if (configurations[i].equals(configuration)) {
-                configStatus[i] = STATUS_FAILED;
-            }
-        }
-        if (problem != null) exceptions.add(problem);
-    }
-
     public synchronized void serverStartFailed(Exception problem) {
         currentOperation = "Startup failed";
         repaint();
         out.println();
         problem.printStackTrace(out);
-    }
-
-    public synchronized void startFailed(String configuration, Exception problem) {
-        for (int i = 0; i < configurations.length; i++) {
-            if (configurations[i].equals(configuration)) {
-                configStatus[i] = STATUS_FAILED;
-            }
-        }
-        if (problem != null) exceptions.add(problem);
     }
 
     private synchronized void repaint() {

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/SilentStartupMonitor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/SilentStartupMonitor.java?rev=400252&r1=400251&r2=400252&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/SilentStartupMonitor.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/SilentStartupMonitor.java
Sat May  6 00:05:54 2006
@@ -62,11 +62,4 @@
         problem.printStackTrace(System.out);
     }
 
-    public void loadFailed(String configuration, Exception problem) {
-        problem.printStackTrace();
-    }
-
-    public void startFailed(String configuration, Exception problem) {
-        problem.printStackTrace();
-    }
 }

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitor.java?rev=400252&r1=400251&r2=400252&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitor.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitor.java
Sat May  6 00:05:54 2006
@@ -1,6 +1,5 @@
 package org.apache.geronimo.system.main;
 
-import java.net.URI;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.repository.Artifact;
 
@@ -23,6 +22,4 @@
 
     // Indicate failures during load
     void serverStartFailed(Exception problem);
-    void loadFailed(String configuration, Exception problem);
-    void startFailed(String configuration, Exception problem);
 }



Mime
View raw message