geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r528221 - in /geronimo/server/trunk/modules: geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ geronimo-system/src/main/java/org/apache/geronimo/system/main/
Date Thu, 12 Apr 2007 20:22:29 GMT
Author: dwoods
Date: Thu Apr 12 13:22:29 2007
New Revision: 528221

URL: http://svn.apache.org/viewvc?view=rev&rev=528221
Log:
GERONIMO-2609 - On linux and maybe other platform, the geronimo.out log file contains invalid
characters
None of these messages are getting displayed in the latest 2.0 code, but cleaning up for completeness.
Changed println() to not use "/r", which is the invalid char in the 1.1.1 output.
Switched shutdown word "begun" to "started" to match the "Server shutdown completed" phrasing.

Modified:
    geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java

Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java?view=diff&rev=528221&r1=528220&r2=528221
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java
Thu Apr 12 13:22:29 2007
@@ -105,7 +105,7 @@
             }
             if (kernel != null) {
                 System.out.println("Server found.");
-                System.out.println("Server shutdown begun");
+                System.out.println("Server shutdown started");
                 kernel.shutdown();
                 System.out.println("Server shutdown completed");
             }
@@ -119,7 +119,7 @@
 	private boolean argumentHasValue(int i) {
 		return i + 1 < args.length && !args[i + 1].startsWith("--");
 	}
-             
+
 	private boolean setParam(int i) {
 		if (argumentHasValue(i)) {
 			if (args[i].equals("--user")) {
@@ -167,17 +167,17 @@
 	}
 
     public static final GBeanInfo GBEAN_INFO;
-    
+
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(StopServer.class, "StopServer");
 
         infoBuilder.addInterface(Main.class);
-        
+
         infoBuilder.setConstructor(new String[0]);
-        
+
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }
-    
+
     public static GBeanInfo getGBeanInfo() {
         return GBEAN_INFO;
     }

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java?view=diff&rev=528221&r1=528220&r2=528221
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java
Thu Apr 12 13:22:29 2007
@@ -94,7 +94,7 @@
         kernel = getBootedKernel();
 
         initializeKernel();
-        
+
         loadConfigurations(configurations);
 
         log.info("Server startup completed");
@@ -121,10 +121,10 @@
 
     protected void initializeKernel() throws Exception {
         loadBootstrapConfiguration();
-        
+
         Runtime.getRuntime().addShutdownHook(new Thread("Geronimo shutdown thread") {
             public void run() {
-                log.info("Server shutdown begun");
+                log.info("Server shutdown started");
                 try {
                     stopKernel();
                 } catch (GBeanNotFoundException e) {

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java?view=diff&rev=528221&r1=528220&r2=528221
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java
Thu Apr 12 13:22:29 2007
@@ -32,7 +32,7 @@
     private Daemon() {
         super(null);
     }
-    
+
     @Override
     protected int initializeKernel() throws Exception {
         ClassLoader classLoader = EmbeddedDaemon.class.getClassLoader();
@@ -51,7 +51,8 @@
         // add our shutdown hook
         Runtime.getRuntime().addShutdownHook(new Thread("Geronimo shutdown thread") {
             public void run() {
-                System.out.println("\rServer shutdown begun              ");
+                System.out.println("");
+                System.out.println("Server shutdown started");
                 kernel.shutdown();
                 System.out.println("Server shutdown completed");
             }
@@ -72,7 +73,7 @@
         }
         return 0;
     }
-    
+
     /**
      * Static entry point allowing a Kernel to be run from the command line.
      *



Mime
View raw message