removing Java2 mapping

1 files changed, 5 insertions, 21 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index c474da6fe7a..acb3a85b7b6 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -20,7 +20,6 @@ keepGoing = False               # Set to True to have the tests continue on fail
 ipv6 = False                    # Default to use IPv4 only
 iceHome = None                  # Binary distribution to use (None to use binaries from source distribution)
 x64 = False                     # Binary distribution is 64-bit
-java2 = False                   # Use Java 2 jar file from binary distribution
 javaCmd = "java"                # Default java loader
 valgrind = False                # Set to True to use valgrind for C++ executables.
 tracefile = None
@@ -147,10 +146,7 @@ def configurePaths():
     #
     if iceHome == "/usr":
         javaDir = os.path.join("/", "usr", "share", "java")
-        if java2:
-            addClasspath(os.path.join(javaDir, "Ice-java2.jar"))
-        else:
-            addClasspath(os.path.join(javaDir, "Ice.jar"))
+        addClasspath(os.path.join(javaDir, "Ice.jar"))
         return # That's it, we're done!
     
     if isWin32():
@@ -175,10 +171,6 @@ def configurePaths():
         os.environ["CLASSPATH"] = os.path.join(javaDir, "IceE.jar") + os.pathsep + os.getenv("CLASSPATH", "")
     else:
         javaDir = os.path.join(getIceDir("java"), "lib")
-        if iceHome and java2:
-            addClasspath(os.path.join(javaDir, "java2", "Ice.jar"))
-        else:
-	    javaDir = os.path.join(getIceDir("java"), "lib")
 	addClasspath(os.path.join(javaDir, "Ice.jar"))
     addClasspath(os.path.join(javaDir))
     
@@ -269,7 +261,6 @@ def run(tests, root = False):
           --no-ipv6               Don't use IPv6 addresses.
           --ice-home=<path>       Use the binary distribution from the given path.
           --x64                   Binary distribution is 64-bit.
-          --java2                 Use Java 2 jar file.
           --cross=lang            Run cross language test.
           --script                Generate a script to run the tests.
           --env                   Print important environment variables
@@ -280,7 +271,7 @@ def run(tests, root = False):
         opts, args = getopt.getopt(sys.argv[1:], "lr:R:",
                                    ["start=", "start-after=", "filter=", "rfilter=", "all", "all-cross", "loop",
                                     "debug", "protocol=", "compress", "valgrind", "host=", "serialize", "continue",
-                                    "ipv6", "no-ipv6", "ice-home=", "cross=", "x64", "script", "java2", "env"])
+                                    "ipv6", "no-ipv6", "ice-home=", "cross=", "x64", "script", "env"])
     except getopt.GetoptError:
         usage()
 
@@ -332,7 +323,7 @@ def run(tests, root = False):
                 sys.exit(1)
 
         if o in ( "--cross", "--protocol", "--host", "--debug", "--compress", "--valgrind", "--serialize", "--ipv6", \
-                  "--ice-home", "--x64", "--java2", "--env"):
+                  "--ice-home", "--x64", "--env"):
             arg += " " + o
             if len(a) > 0:
                 arg += " " + a
@@ -619,7 +610,6 @@ class DriverConfig:
     overrides = None
     ipv6 = False
     x64 = False
-    java2 = False
 
     def __init__(self, type = None):
         global protocol
@@ -630,7 +620,6 @@ class DriverConfig:
         global valgrind
         global ipv6
         global x64
-        global java2
         self.lang = getDefaultMapping()
         self.protocol = protocol
         self.compress = compress
@@ -641,8 +630,7 @@ class DriverConfig:
         self.type = type
         self.ipv6 = ipv6
         self.x64 = x64
-        self.java2 = java2
-        
+
 def argsToDict(argumentString, results):
     """Converts an argument string to dictionary"""
     args = argumentString.strip()
@@ -1090,7 +1078,6 @@ def processCmdLine():
           --ipv6                  Use IPv6 addresses.
           --ice-home=<path>       Use the binary distribution from the given path.
           --x64                   Binary distribution is 64-bit.
-          --java2                 Use Java 2 jar file.
           --env                   Print important environment variables.
           --cross=lang            Run cross language test.
         """
@@ -1099,7 +1086,7 @@ def processCmdLine():
     try:
         opts, args = getopt.getopt(
             sys.argv[1:], "", ["debug", "trace=", "protocol=", "compress", "valgrind", "host=", "serialize", "ipv6", \
-                              "ice-home=", "x64", "cross=", "java2", "env"])
+                              "ice-home=", "x64", "cross=", "env"])
     except getopt.GetoptError:
         usage()
 
@@ -1131,9 +1118,6 @@ def processCmdLine():
         elif o == "--x64":
             global x64
             x64 = True
-        elif o == "--java2":
-            global java2
-            java2 = True
         elif o == "--compress":
             global compress
             compress = True