From 4fefaf207cae7521880e89922c34f0d2b14f216c Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 12 Feb 2008 11:51:19 +0000
Subject: [PATCH] Fix for issue 2918 (status and uninstall direct --help output to STDERR)
---
opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java | 2 +-
opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelLauncher.java | 7 ++++---
opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java b/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
index e3fa415..fa166b0 100644
--- a/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
+++ b/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
@@ -267,7 +267,7 @@
argParser = new StatusCliArgumentParser(StatusCli.class.getName());
try
{
- argParser.initializeGlobalArguments(getErrorStream());
+ argParser.initializeGlobalArguments(getOutputStream());
}
catch (ArgumentException ae)
{
diff --git a/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelLauncher.java b/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelLauncher.java
index 0ed6aec..92c5722 100644
--- a/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelLauncher.java
+++ b/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelLauncher.java
@@ -33,6 +33,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.opends.guitools.statuspanel.StatusCli.ErrorReturnCode;
import org.opends.quicksetup.util.Utils;
import org.opends.quicksetup.Installation;
import org.opends.server.core.DirectoryServer;
@@ -106,13 +107,13 @@
{
// TODO Auto-generated catch block
}
- System.exit(1);
+ System.exit(ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode());
}
else
if (printUsage)
{
printUsage(System.out);
- System.exit(1);
+ System.exit(ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode());
} else
{
@@ -243,7 +244,7 @@
}
catch (Throwable t)
{
- System.out.println("ERROR: "+t);
+ System.err.println("ERROR: "+t);
t.printStackTrace();
}
}
diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
index c21d4c9..723cb0a 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
@@ -144,7 +144,7 @@
INFO_UNINSTALL_LAUNCHER_USAGE_DESCRIPTION.get(), false);
try
{
- argParser.initializeGlobalArguments(System.err);
+ argParser.initializeGlobalArguments(System.out);
}
catch (ArgumentException ae)
{
--
Gitblit v1.10.0