1 files changed, 22 insertions, 14 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 23424f42b66..cb4de97bcc7 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -148,11 +148,17 @@ def configurePaths():
 		libDir = libDir + "64"
     addLdPath(libDir)
 
-    javaDir = os.path.join(getIceDir("java"), "lib")
-    if iceHome and java2:
-        addClasspath(os.path.join(javaDir, "java2", "Ice.jar"))
+    if getDefaultMapping() == "javae":
+        javaDir = os.path.join(getIceDir("javae"), "jdk", "lib")
+	addClasspath(os.path.join(javaDir, "IceE.jar"))
+        os.environ["CLASSPATH"] = os.path.join(javaDir, "IceE.jar") + os.pathsep + os.getenv("CLASSPATH", "")
     else:
-        addClasspath(os.path.join(javaDir, "Ice.jar"))
+        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))
     
     # 
@@ -564,7 +570,7 @@ def getDefaultMapping():
     while len(here) > 0:
 	current = os.path.basename(here)
 	here = os.path.dirname(here)
-        if current in ["cpp", "cs", "java", "php", "py", "rb", "tmp"]:
+        if current in ["cpp", "cs", "java", "php", "py", "rb", "cppe", "javae", "tmp"]:
 	    return current
     else:
         raise "cannot determine mapping"
@@ -639,7 +645,9 @@ def getCommandLine(exe, config, env=None):
     # sequence, which is initialized with command line options common to
     # all test drivers.
     #
-    components = ["--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1"]
+    components = ["--Ice.NullHandleAbort=1"]
+    if getDefaultMapping() != "javae":
+        components += ["--Ice.Warn.Connections=1"]
 
     #
     # Turn on network tracing.
@@ -693,7 +701,7 @@ def getCommandLine(exe, config, env=None):
         print >>output, "mono", "--debug %s.exe" % exe,
     elif config.lang == "rb" and config.type == "client":
         print >>output, "ruby", exe,
-    elif config.lang == "java":
+    elif config.lang == "java" or config.lang == "javae":
         print >>output, "%s -ea" % javaCmd,
         if isSolaris() and config.x64:
             print >>output, "-d64",
@@ -721,11 +729,11 @@ def getCommandLine(exe, config, env=None):
 
 def getDefaultServerFile():
     lang = getDefaultMapping()
-    if lang in ["rb", "php", "cpp", "cs"]:
+    if lang in ["rb", "php", "cpp", "cs", "cppe"]:
         return "server"
     if lang == "py":
         return "Server.py"
-    if lang == "java":
+    if lang in ["java", "javae"]:
         return "Server"
 
 def getDefaultClientFile(lang = None):
@@ -735,11 +743,11 @@ def getDefaultClientFile(lang = None):
         return "Client.rb"
     if lang == "php":
         return "Client.php"
-    if lang in ["cpp", "cs"]:
+    if lang in ["cpp", "cs", "cppe"]:
         return "client"
     if lang == "py":
         return "Client.py"
-    if lang == "java":
+    if lang in ["java", "javae"]:
         return "Client"
 
 def getDefaultCollocatedFile():
@@ -748,11 +756,11 @@ def getDefaultCollocatedFile():
         return "Collocated.rb"
     if lang == "php":
         return "Collocated.php"
-    if lang in ["cpp", "cs"]:
+    if lang in ["cpp", "cs", "cppe"]:
         return "collocated"
     if lang == "py":
         return "Collocated.py"
-    if lang == "java":
+    if lang in ["java", "javae"]:
         return "Collocated"
 
 def isDebug():
@@ -886,7 +894,7 @@ def collocatedTest(additionalOptions = ""):
     testdir = os.getcwd()
 
     collocated = getDefaultCollocatedFile()
-    if lang != "java":
+    if lang != "java" and lang != "javae":
         collocated = os.path.join(testdir, collocated) 
         if lang == "cpp":
             env = copy.deepcopy(os.environ)