From 0370e5550e1d9bc72d742bbbee1f6f0e2835406e Mon Sep 17 00:00:00 2001
From: Robert Greig <rgreig@apache.org>
Date: Thu, 5 Apr 2007 13:36:04 +0000
Subject: Merged revisions 525531-525536 via svnmerge from
 https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r525531 | rgreig | 2007-04-04 16:18:44 +0100 (Wed, 04 Apr 2007) | 1 line

  Added standard command line handline
........
  r525533 | rgreig | 2007-04-04 16:19:38 +0100 (Wed, 04 Apr 2007) | 1 line

  Added simeple file copy function.
........
  r525535 | rgreig | 2007-04-04 16:20:30 +0100 (Wed, 04 Apr 2007) | 1 line

  Added comments and logging to track down bug.
........
  r525536 | rgreig | 2007-04-04 16:21:43 +0100 (Wed, 04 Apr 2007) | 1 line

  Fixed dangling transaction problem by correctly binding queue.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@525825 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/qpid/util/CommandLineParser.java    | 42 +++++++++++++++++++---
 .../main/java/org/apache/qpid/util/FileUtils.java  | 36 +++++++++++++++++++
 2 files changed, 73 insertions(+), 5 deletions(-)

(limited to 'qpid/java/common/src')

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java b/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
index 6173780aa7..9051d6b470 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
@@ -143,8 +143,8 @@ public class CommandLineParser
             String[] nextOptionSpec = config[i];
 
             addOption(nextOptionSpec[0], nextOptionSpec[1], (nextOptionSpec.length > 2) ? nextOptionSpec[2] : null,
-                      (nextOptionSpec.length > 3) ? ("true".equals(nextOptionSpec[3]) ? true : false) : false,
-                      (nextOptionSpec.length > 4) ? nextOptionSpec[4] : null);
+                (nextOptionSpec.length > 3) ? ("true".equals(nextOptionSpec[3]) ? true : false) : false,
+                (nextOptionSpec.length > 4) ? nextOptionSpec[4] : null);
         }
     }
 
@@ -209,8 +209,9 @@ public class CommandLineParser
         // Print usage on each of the command line options.
         for (CommandLineOption optionInfo : optionMap.values())
         {
-            result += optionInfo.option + " " + ((optionInfo.argument != null) ? (optionInfo.argument + " ") : "")
-                      + optionInfo.comment + "\n";
+            result +=
+                optionInfo.option + " " + ((optionInfo.argument != null) ? (optionInfo.argument + " ") : "")
+                + optionInfo.comment + "\n";
         }
 
         return result;
@@ -603,6 +604,37 @@ public class CommandLineParser
         }
     }
 
+    /**
+     * Extracts all name=value pairs from the command line, sets them all as system properties and also returns
+     * a map of properties containing them.
+     *
+     * @param args The command line.
+     *
+     * @return A set of properties containing all name=value pairs from the command line.
+     */
+    public static Properties processCommandLine(String[] args, CommandLineParser commandLine)
+    {
+        // Capture the command line arguments or display errors and correct usage and then exit.
+        Properties options = null;
+
+        try
+        {
+            options = commandLine.parseCommandLine(args);
+
+            // Add all the trailing command line options (name=value pairs) to system properties. They may be picked up
+            // from there.
+            commandLine.addCommandLineToSysProperties();
+        }
+        catch (IllegalArgumentException e)
+        {
+            System.out.println(commandLine.getErrors());
+            System.out.println(commandLine.getUsage());
+            System.exit(1);
+        }
+
+        return options;
+    }
+
     /**
      * Holds information about a command line options. This includes what its name is, whether or not it is a flag,
      * whether or not it is mandatory, what its user comment is, what its argument reminder text is and what its
@@ -646,7 +678,7 @@ public class CommandLineParser
          * @param formatRegexp The regular expression that the argument to this option must meet to be valid.
          */
         public CommandLineOption(String option, boolean expectsArgs, String comment, String argument, boolean mandatory,
-                                 String formatRegexp)
+            String formatRegexp)
         {
             this.option = option;
             this.expectsArgs = expectsArgs;
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java b/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
index ba79a6e8d4..3c8d3f916b 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
@@ -158,4 +158,40 @@ public class FileUtils
 
         return is;
     }
+
+    /**
+     * Copies the specified source file to the specified destintaion file. If the destinationst file does not exist,
+     * it is created.
+     *
+     * @param src The source file name.
+     * @param dst The destination file name.
+     */
+    public static void copy(File src, File dst)
+    {
+        try
+        {
+            InputStream in = new FileInputStream(src);
+            if (!dst.exists())
+            {
+                dst.createNewFile();
+            }
+
+            OutputStream out = new FileOutputStream(dst);
+
+            // Transfer bytes from in to out
+            byte[] buf = new byte[1024];
+            int len;
+            while ((len = in.read(buf)) > 0)
+            {
+                out.write(buf, 0, len);
+            }
+
+            in.close();
+            out.close();
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
 }
-- 
cgit v1.2.1