Squashed commit of the following:

commit d74cec9e6c77e70b33883f517b1bb6f97b2ffa5e
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:33:06 2007 +0800

    updates.

commit 643b31f979a00ea5397206ca59f20bb58c62660e
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:32:35 2007 +0800

    added some .gitignore rules.

commit 1510d38798976753b435f32308e79acd9fcd2722
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:05:10 2007 +0800

    removed bogus use of 127.0.0.1

commit 3c91e89b01af20a0dacfdbc1fbeca1c67c796656
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 14:01:43 2007 +0800

    Verify that cygwin python is used under Windows.

commit ff160725c051eedb28a42d9dd69f0d8aa297e522
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:55:03 2007 +0800

    bump timeout for the node to terminate. killing the node leaves the servers running under cygwin

commit ec3bddb58e861f906bf39aee1fa818c3e9a50000
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:48:55 2007 +0800

    added back accidently removed files.

commit f9ea2f552d7f576ebfa878669925f4184a89257b
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 13:47:47 2007 +0800

    http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2427, http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2422

commit 8a309ca0036dba7ecbd577edb2d737fa41174a5a
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 10:06:53 2007 +0800

    added ruby support to the expect scripts.

commit 34597c1ee6d80d6754c9e925bd376125dd104a5f
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Aug 24 09:26:10 2007 +0800

    added pexpect to git repository.

commit 4bd2e1f2b52bcb9906b03ac216db686b8229b545
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 18:49:51 2007 +0800

    numerous UNIX expect script fixes.

commit 25ab4a812f45a6e908d5d2d7ab03e557d79afa9f
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 16:47:08 2007 +0800

    generate configuration files for IceGrid icebox/iceboxd

commit 6bb57bf7ed21d7256963c228aaf0b20657367a47
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Aug 23 15:16:55 2007 +0800

    added python & C# support to the expect scripts.

commit 08f1a59971ad3a52a4357069554dcc309b2d062b
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Wed Aug 22 14:23:53 2007 +0800

    java expect scripts complete.

commit 3918f4ff3beea3005001bc55c5502c0825d8b7ea
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Wed Aug 22 13:30:31 2007 +0800

    first set of expect changes.

1 files changed, 2 insertions, 71 deletions

diff --git a/java/demo/Freeze/library/RunParser.java b/java/demo/Freeze/library/RunParser.java
index 1fc0e095c7d..c524b1b1430 100644
--- a/java/demo/Freeze/library/RunParser.java
+++ b/java/demo/Freeze/library/RunParser.java
@@ -11,60 +11,10 @@ import Demo.*;
 
 class RunParser
 {
-    static void
-    usage(String appName)
-    {
-        System.err.println("Usage: " + appName + " [options] [file...]\n");
-        System.err.print(
-            "Options:\n" +
-            "-h, --help           Show this message.\n");
-        //"-v, --version        Display the Ice version.\n"
-    }
-
     static int
     runParser(String appName, String[] args, Ice.Communicator communicator)
     {
-        String file = null;
-        int idx = 0;
-
-        while(idx < args.length)
-        {
-            if(args[idx].equals("-h") | args[idx].equals("--help"))
-            {
-                usage(appName);
-                return 0;
-            }
-/*
-  else if(args[idx].equals("-v") || args[idx].equals("--version"))
-  {
-  cout + ICE_STRING_VERSION + endl;
-  return 0;
-  }
-*/
-            else if(args[idx].charAt(0) == '-')
-            {
-                System.err.println(appName + ": unknown option `" + args[idx] + "'");
-                usage(appName);
-                return 1;
-            }
-            else
-            {
-                if(file == null)
-                {
-                    file = args[idx];
-                }
-                else
-                {
-                    System.err.println(appName + ": only one file is supported.");
-                    usage(appName);
-                    return 1;
-                }
-                ++idx;
-            }
-        }
-
-        Ice.ObjectPrx base = communicator.propertyToProxy("Library.Proxy");
-        LibraryPrx library = LibraryPrxHelper.checkedCast(base);
+        LibraryPrx library = LibraryPrxHelper.checkedCast(communicator.propertyToProxy("Library.Proxy"));
         if(library == null)
         {
             System.err.println(appName + ": invalid object reference");
@@ -72,25 +22,6 @@ class RunParser
         }
 
         Parser parser = new Parser(communicator, library);
-        int status;
-
-        if(file == null)
-        {
-            status = parser.parse();
-        }
-        else
-        {
-            try
-            {
-                status = parser.parse(new java.io.BufferedReader(new java.io.FileReader(file)));
-            }
-            catch(java.io.IOException ex)
-            {
-                status = 1;
-                ex.printStackTrace();
-            }
-        }
-
-        return status;
+        return parser.parse();
     }
 }