Major changes in Java:

- Moved existing Java mapping sources to java-compat subdirectory
- Added new "Java 8" mapping in java subdirectory
- Significant features of Java 8 mapping:
  - All classes in com.zeroc package (e.g., com.zeroc.Ice.Communicator)
  - New AMI mapping that uses java.util.concurrent.CompletableFuture
  - New AMD mapping that uses java.util.concurrent.CompletionStage
  - New mapping for out parameters - "holder" types have been eliminated
  - New mapping for optional types that uses JDK classes from java.util
    (e.g., java.util.Optional)
  - "TIE" classes are no longer supported or necessary; servant classes
    now only need to implement a generated interface
- Moved IceGrid GUI to new mapping
- The "Java Compat" mapping is provided only for backward compatibility
  to ease migration to Ice 3.7. The Slice compiler supports a new --compat
  option to generate code for this mapping. However, users are encouraged
  to migrate to the new mapping as soon as possible.

1 files changed, 2 insertions, 2 deletions

diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py
index 854dc3b25e0..f020d088865 100644
--- a/scripts/IceGridAdmin.py
+++ b/scripts/IceGridAdmin.py
@@ -229,7 +229,7 @@ def iceGridTest(application, additionalOptions = "", applicationOptions = ""):
         return
 
     client = TestUtil.getDefaultClientFile()
-    if TestUtil.getDefaultMapping() != "java":
+    if TestUtil.getDefaultMapping() != "java" and TestUtil.getDefaultMapping() != "java-compat":
         client = os.path.join(testdir, client)
 
     clientOptions = ' ' + getDefaultLocatorProperty() + ' ' + additionalOptions
@@ -283,7 +283,7 @@ def iceGridClientServerTest(additionalClientOptions, additionalServerOptions):
     testdir = os.getcwd()
     server = TestUtil.getDefaultServerFile()
     client = TestUtil.getDefaultClientFile()
-    if TestUtil.getDefaultMapping() != "java":
+    if TestUtil.getDefaultMapping() != "java" and TestUtil.getDefaultMapping() != "java-compat":
         server = os.path.join(testdir, server)
         client = os.path.join(testdir, client)