svn commit: r351616 - in /geronimo/trunk: modules/system/src/java/org/apache/geronimo/system/main/Daemon.java plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartRemoteServer.java

[js...@apache.org]

Author: jsisson
Date: Thu Dec  1 23:01:34 2005
New Revision: 351616

URL: http://svn.apache.org/viewcvs?rev=351616&view=rev
Log:
GERONIMO-1269 - Rename -quiet and -override startup options to follow the -short and --long option naming convention.

Modified:
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
    geronimo/trunk/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartRemoteServer.java

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java?rev=351616&r1=351615&r2=351616&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java Thu Dec  1 23:01:34 2005
@@ -52,11 +52,13 @@
  * @version $Rev$ $Date$
  */
 public class Daemon {
-    private final static String ARGUMENT_NO_PROGRESS = "-quiet";
+    private final static String ARGUMENT_NO_PROGRESS = "--quiet";
     private final static String ARGUMENT_LONG_PROGRESS = "--long";
-    private final static String ARGUMENT_VERBOSE = "-v";
-    private final static String ARGUMENT_MORE_VERBOSE = "-vv";
-    private final static String ARGUMENT_CONFIG_OVERRIDE = "-override";
+    private final static String ARGUMENT_VERBOSE_SHORTFORM = "-v";
+    private final static String ARGUMENT_VERBOSE = "--verbose";
+    private final static String ARGUMENT_MORE_VERBOSE_SHORTFORM = "-vv";
+    private final static String ARGUMENT_MORE_VERBOSE = "--veryverbose";
+    private final static String ARGUMENT_CONFIG_OVERRIDE = "--override";
     private static boolean started = false;
     private static Log log;
     private StartupMonitor monitor;
@@ -101,10 +103,10 @@
                     "             the server from an IDE or other tool (doesn't use linefeeds to\n" +
                     "             update the progress information that is used by default if you\n" +
                     "             don't specify " +ARGUMENT_NO_PROGRESS +" or "+ARGUMENT_LONG_PROGRESS+").\n");
-        out.println("  "+ARGUMENT_VERBOSE);
+        out.println("  "+ARGUMENT_VERBOSE_SHORTFORM +" " +ARGUMENT_VERBOSE);
         out.println("             Reduces the console log level to INFO, resulting in more\n" +
                     "             console output than is normally present.");
-        out.println("  "+ARGUMENT_MORE_VERBOSE);
+        out.println("  "+ARGUMENT_MORE_VERBOSE_SHORTFORM +" " +ARGUMENT_MORE_VERBOSE);
         out.println("             Reduces the console log level to DEBUG, resulting in still\n" +
                     "             more console output.");
         out.println();
@@ -143,11 +145,13 @@
                 noProgressArg = ARGUMENT_NO_PROGRESS;
             } else if (args[i].equals(ARGUMENT_LONG_PROGRESS)) {
                 longProgressArg = ARGUMENT_LONG_PROGRESS;
-            } else if (args[i].equals(ARGUMENT_VERBOSE)) {
+            } else if (args[i].equals(ARGUMENT_VERBOSE_SHORTFORM) ||
+                    args[i].equals(ARGUMENT_VERBOSE)) {
                 if (verboseArg == null) {
                     verboseArg = ARGUMENT_VERBOSE;
                 }
-            } else if (args[i].equals(ARGUMENT_MORE_VERBOSE)) {
+            } else if (args[i].equals(ARGUMENT_MORE_VERBOSE_SHORTFORM) ||
+                    args[i].equals(ARGUMENT_MORE_VERBOSE)) {
                 if (verboseArg == null) {
                     verboseArg = ARGUMENT_MORE_VERBOSE;
                 }

Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartRemoteServer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartRemoteServer.java?rev=351616&r1=351615&r2=351616&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartRemoteServer.java (original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartRemoteServer.java Thu Dec  1 23:01:34 2005
@@ -134,10 +134,10 @@
         cmd.add("-ea");
         cmd.add("-jar");
         cmd.add(systemFile.getCanonicalPath());
-        cmd.add("-quiet");
+        cmd.add("--quiet");
 
         if (getConfigs() != null  && getConfigs().trim().length() > 0) {
-            cmd.add("-override");
+            cmd.add("--override");
             for (StringTokenizer st = new StringTokenizer(getConfigs()); st.hasMoreTokens();) {
                 cmd.add(st.nextToken());
             }