More gradle changes.

Moved android stuff to its own package.
Moved java tests to src/main/java/test subdirectory.

1 files changed, 60 insertions, 60 deletions

diff --git a/java/allTests.py b/java/allTests.py
index 84e5a748b6d..701f4554fd9 100755
--- a/java/allTests.py
+++ b/java/allTests.py
@@ -25,66 +25,66 @@ import TestUtil
 # List of all basic tests.
 #
 tests = [
-    ("Slice/generation", ["once"]),
-    ("Slice/keyword", ["once"]),
-    ("Slice/macros", ["once"]),
-    ("Slice/structure", ["once"]),
-    ("IceUtil/inputUtil", ["once"]),
-    ("IceUtil/fileLock", ["once"]),
-    ("Ice/proxy", ["core"]),
-    ("Ice/operations", ["core"]),
-    ("Ice/seqMapping", ["core"]),
-    ("Ice/exceptions", ["core"]),
-    ("Ice/ami", ["core"]),
-    ("Ice/info", ["core", "noipv6", "nocompress", "nosocks"]),
-    ("Ice/inheritance", ["core"]),
-    ("Ice/facets", ["core"]),
-    ("Ice/objects", ["core"]),
-    ("Ice/binding", ["core"]),
-    ("Ice/faultTolerance", ["core"]),
-    ("Ice/location", ["core"]),
-    ("Ice/adapterDeactivation", ["core"]),
-    ("Ice/slicing/exceptions", ["core"]),
-    ("Ice/slicing/objects", ["core"]),
-    ("Ice/custom", ["core"]),
-    ("Ice/checksum", ["core"]),
-    ("Ice/dispatcher", ["core"]),
-    ("Ice/interrupt", ["core"]),
-    ("Ice/packagemd", ["core"]),
-    ("Ice/stream", ["core"]),
-    ("Ice/hold", ["core"]),
-    ("Ice/retry", ["core"]),
-    ("Ice/timeout", ["core", "nocompress"]),
-    ("Ice/acm", ["core"]),
-    ("Ice/background", ["core", "nosocks"]),
-    ("Ice/servantLocator", ["core"]),
-    ("Ice/interceptor", ["core"]),
-    ("Ice/udp", ["core"]),
-    ("Ice/serialize", ["core"]),
-    ("Ice/defaultServant", ["core"]),
-    ("Ice/defaultValue", ["core"]),
-    ("Ice/threadPoolPriority", ["core"]),
-    ("Ice/classLoader", ["core"]),
-    ("Ice/invoke", ["core"]),
-    ("Ice/properties", ["once"]),
-    ("Ice/plugin", ["core"]),
-    ("Ice/hash", ["once"]),
-    ("Ice/optional", ["once"]),
-    ("Ice/admin", ["core"]),
-    ("Ice/metrics", ["core", "nossl", "nows", "noipv6", "nocompress", "nosocks"]),
-    ("Ice/enums", ["once"]),
-    ("Ice/networkProxy", ["core", "noipv6", "nosocks"]),
-    ("IceBox/admin", ["core", "noipv6", "nomx"]),
-    ("IceBox/configuration", ["core", "noipv6", "nomx"]),
-    ("Freeze/dbmap", ["once"]),
-    ("Freeze/complex", ["once"]),
-    ("Freeze/evictor", ["core"]),
-    ("Freeze/fileLock", ["once"]),
-    ("Glacier2/router", ["service"]),
-    ("Glacier2/sessionHelper", ["service", "nossl", "nows", "noipv6"]),
-    ("IceDiscovery/simple", ["service"]),
-    ("IceGrid/simple", ["service"]),
-    ("IceSSL/configuration", ["once"])
+    ("src/main/java/test/Slice/generation", ["once"]),
+    ("src/main/java/test/Slice/keyword", ["once"]),
+    ("src/main/java/test/Slice/macros", ["once"]),
+    ("src/main/java/test/Slice/structure", ["once"]),
+    ("src/main/java/test/IceUtil/inputUtil", ["once"]),
+    ("src/main/java/test/IceUtil/fileLock", ["once"]),
+    ("src/main/java/test/Ice/proxy", ["core"]),
+    ("src/main/java/test/Ice/operations", ["core"]),
+    ("src/main/java/test/Ice/seqMapping", ["core"]),
+    ("src/main/java/test/Ice/exceptions", ["core"]),
+    ("src/main/java/test/Ice/ami", ["core"]),
+    ("src/main/java/test/Ice/info", ["core", "noipv6", "nocompress", "nosocks"]),
+    ("src/main/java/test/Ice/inheritance", ["core"]),
+    ("src/main/java/test/Ice/facets", ["core"]),
+    ("src/main/java/test/Ice/objects", ["core"]),
+    ("src/main/java/test/Ice/binding", ["core"]),
+    ("src/main/java/test/Ice/faultTolerance", ["core"]),
+    ("src/main/java/test/Ice/location", ["core"]),
+    ("src/main/java/test/Ice/adapterDeactivation", ["core"]),
+    ("src/main/java/test/Ice/slicing/exceptions", ["core"]),
+    ("src/main/java/test/Ice/slicing/objects", ["core"]),
+    ("src/main/java/test/Ice/custom", ["core"]),
+    ("src/main/java/test/Ice/checksum", ["core"]),
+    ("src/main/java/test/Ice/dispatcher", ["core"]),
+    ("src/main/java/test/Ice/interrupt", ["core"]),
+    ("src/main/java/test/Ice/packagemd", ["core"]),
+    ("src/main/java/test/Ice/stream", ["core"]),
+    ("src/main/java/test/Ice/hold", ["core"]),
+    ("src/main/java/test/Ice/retry", ["core"]),
+    ("src/main/java/test/Ice/timeout", ["core", "nocompress"]),
+    ("src/main/java/test/Ice/acm", ["core"]),
+    ("src/main/java/test/Ice/background", ["core", "nosocks"]),
+    ("src/main/java/test/Ice/servantLocator", ["core"]),
+    ("src/main/java/test/Ice/interceptor", ["core"]),
+    ("src/main/java/test/Ice/udp", ["core"]),
+    ("src/main/java/test/Ice/serialize", ["core"]),
+    ("src/main/java/test/Ice/defaultServant", ["core"]),
+    ("src/main/java/test/Ice/defaultValue", ["core"]),
+    ("src/main/java/test/Ice/threadPoolPriority", ["core"]),
+    ("src/main/java/test/Ice/classLoader", ["core"]),
+    ("src/main/java/test/Ice/invoke", ["core"]),
+    ("src/main/java/test/Ice/properties", ["once"]),
+    ("src/main/java/test/Ice/plugin", ["core"]),
+    ("src/main/java/test/Ice/hash", ["once"]),
+    ("src/main/java/test/Ice/optional", ["once"]),
+    ("src/main/java/test/Ice/admin", ["core"]),
+    ("src/main/java/test/Ice/metrics", ["core", "nossl", "nows", "noipv6", "nocompress", "nosocks"]),
+    ("src/main/java/test/Ice/enums", ["once"]),
+    ("src/main/java/test/Ice/networkProxy", ["core", "noipv6", "nosocks"]),
+    ("src/main/java/test/IceBox/admin", ["core", "noipv6", "nomx"]),
+    ("src/main/java/test/IceBox/configuration", ["core", "noipv6", "nomx"]),
+    ("src/main/java/test/Freeze/dbmap", ["once"]),
+    ("src/main/java/test/Freeze/complex", ["once"]),
+    ("src/main/java/test/Freeze/evictor", ["core"]),
+    ("src/main/java/test/Freeze/fileLock", ["once"]),
+    ("src/main/java/test/Glacier2/router", ["service"]),
+    ("src/main/java/test/Glacier2/sessionHelper", ["service", "nossl", "nows", "noipv6"]),
+    ("src/main/java/test/IceDiscovery/simple", ["service"]),
+    ("src/main/java/test/IceGrid/simple", ["service"]),
+    ("src/main/java/test/IceSSL/configuration", ["once"])
     ]
 
 if __name__ == "__main__":