More gradle changes.

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

15 files changed, 176 insertions, 88 deletions

diff --git a/java/src/Freeze/build.gradle b/java/src/Freeze/build.gradle
index b4a55532468..eb271d9c1f4 100644
--- a/java/src/Freeze/build.gradle
+++ b/java/src/Freeze/build.gradle
@@ -1,3 +1,15 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 slice {
     java {
         include = ["${sliceDir}"]
@@ -27,7 +39,7 @@ slice {
 }
 
 dependencies {
-    compile project(':src/Ice')
+    compile project(':Ice')
     compile "com.sleepycat:db:${dbVersion}"
 }
 
diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle
index 2b41717dd7e..98a1c7352d3 100644
--- a/java/src/Glacier2/build.gradle
+++ b/java/src/Glacier2/build.gradle
@@ -1,8 +1,23 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 slice {
     java {
-    	include = ["${sliceDir}"]
-        args = "--ice --tie --checksum Glacier2.SliceChecksums"
-        files = fileTree(dir: "$sliceDir/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
+        set1 {
+    	    include = ["${sliceDir}"]
+            args = "--ice --tie --checksum Glacier2.SliceChecksums"
+            files = fileTree(dir: "${sliceDir}/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
+        }
     }
 }
 
@@ -12,7 +27,7 @@ idea.module {
 }
 
 dependencies {
-    compile project(':src/Ice')
+    compile project(':Ice')
 }
 
 def jarName = "Glacier2${versionSuffix}.jar"
diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle
index 222a933ecc2..a4c096d393e 100644
--- a/java/src/Ice/build.gradle
+++ b/java/src/Ice/build.gradle
@@ -1,3 +1,15 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 slice {
     java {
         stream {
diff --git a/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java b/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
index 4e187728281..55acdf29696 100644
--- a/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
+++ b/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
@@ -402,6 +402,7 @@ public final class IncomingConnectionFactory extends EventHandler implements Ice
                     new Ice.ConnectionI(_adapter.getCommunicator(), _instance, null, _transceiver, null, _endpoint,
                                         _adapter);
                 connection.startAndWait();
+
                 _connections.add(connection);
             }
             else
diff --git a/java/src/Ice/src/main/java/IceInternal/Instance.java b/java/src/Ice/src/main/java/IceInternal/Instance.java
index 94a74a959ee..46af349027c 100644
--- a/java/src/Ice/src/main/java/IceInternal/Instance.java
+++ b/java/src/Ice/src/main/java/IceInternal/Instance.java
@@ -70,7 +70,11 @@ public final class Instance
         Timer(Ice.Properties props, String threadName)
         {
             super(1, Util.createThreadFactory(props, threadName)); // Single thread executor
-            setRemoveOnCancelPolicy(true);
+            if(!Util.isAndroid())
+            {
+                // This API doesn't exist on Android up to API level 20.
+                setRemoveOnCancelPolicy(true);
+            }
             setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
             _observerHelper = new ThreadObserverHelper(threadName);
         }
@@ -942,7 +946,11 @@ public final class Instance
 
             _retryQueue = new RetryQueue(this);
 
-            if(_initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0)
+            //
+            // If Ice.ThreadInterruptSafe is set or we're running on Android all
+            // IO is done on the background thread.
+            //
+            if(_initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0 || Util.isAndroid())
             {
                 _queueExecutor = new QueueExecutor(_initData.properties,
                                                    Util.createThreadName(_initData.properties, "Ice.BackgroundIO"));
diff --git a/java/src/Ice/src/main/java/IceInternal/StreamSocket.java b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java
index 63b26361668..93892f951a6 100644
--- a/java/src/Ice/src/main/java/IceInternal/StreamSocket.java
+++ b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java
@@ -191,16 +191,6 @@ public class StreamSocket
     {
         assert(_fd != null);
 
-        //
-        // We don't want write to be called on Android's main thread as this will cause
-        // NetworkOnMainThreadException to be thrown. If this is the Android main thread
-        // we return 0 and this method will be called later from the thread pool.
-        //
-        if(buf.hasRemaining() && Util.isAndroidMainThread(Thread.currentThread()))
-        {
-            return 0;
-        }
-
         int sent = 0;
         while(buf.hasRemaining())
         {
diff --git a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
index 78e1de99371..c8de356ea6e 100644
--- a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
+++ b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
@@ -110,16 +110,6 @@ final class UdpTransceiver implements Transceiver
     @Override
     public int write(Buffer buf)
     {
-        //
-        // We don't want write or send to be called on android main thread as this will cause
-        // NetworkOnMainThreadException to be thrown. If that is the android main thread
-        // we return false and this method will be later called from the thread pool
-        //
-        if(Util.isAndroidMainThread(Thread.currentThread()))
-        {
-            return SocketOperation.Write;
-        }
-
         if(!buf.b.hasRemaining())
         {
             return SocketOperation.None;
diff --git a/java/src/Ice/src/main/java/IceInternal/Util.java b/java/src/Ice/src/main/java/IceInternal/Util.java
index 1e32d032771..fc4248f66fb 100644
--- a/java/src/Ice/src/main/java/IceInternal/Util.java
+++ b/java/src/Ice/src/main/java/IceInternal/Util.java
@@ -230,43 +230,10 @@ public final class Util
     }
 
     //
-    // Return true if the given thread is the android main thread, also know as the GUI thread.
+    // Return true if we're running on Android.
     //
-    public static boolean
-    isAndroidMainThread(Thread thread)
+    public static boolean isAndroid()
     {
-        if(!System.getProperty("java.vm.name").startsWith("Dalvik"))
-        {
-            return false;
-        }
-
-        if(_androidMainThread == null)
-        {
-            try
-            {
-                Class<?> c = Util.findClass("android.os.Looper", null);
-                java.lang.reflect.Method getMainLooper = c.getDeclaredMethod("getMainLooper", (Class<?>[])null);
-                java.lang.reflect.Method getThread = c.getDeclaredMethod("getThread", (Class<?>[])null);
-
-                Object looper = getMainLooper.invoke(null);
-                _androidMainThread = (Thread)getThread.invoke(looper);
-            }
-            catch(java.lang.reflect.InvocationTargetException ex)
-            {
-                assert false;
-            }
-            catch(java.lang.NoSuchMethodException ex)
-            {
-                assert false;
-            }
-            catch(IllegalAccessException ex)
-            {
-                assert false;
-            }
-        }
-
-        return thread != null && _androidMainThread == thread;
+        return System.getProperty("java.vm.name").startsWith("Dalvik");
     }
-
-    private static Thread _androidMainThread;
 }
diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle
index d768d99e6e3..ce3248a549d 100644
--- a/java/src/IceBox/build.gradle
+++ b/java/src/IceBox/build.gradle
@@ -1,8 +1,22 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 slice {
     java {
-    	include = ["${sliceDir}"]
-        args = "--ice --tie --checksum IceBox.SliceChecksums"
-        files = fileTree(dir: "$sliceDir/IceBox", includes:['*.ice'], excludes:["*F.ice"])
+        set1 {
+        	include = ["${sliceDir}"]
+            args = "--ice --tie --checksum IceBox.SliceChecksums"
+            files = fileTree(dir: "$sliceDir/IceBox", includes:['*.ice'], excludes:["*F.ice"])
+        }
     }
 }
 
@@ -12,7 +26,7 @@ idea.module {
 }
 
 dependencies {
-    compile project(':src/Ice')
+    compile project(':Ice')
 }
 
 def jarName = "IceBox${versionSuffix}.jar"
diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle
index 313a8033e62..cd65504d34d 100644
--- a/java/src/IceDiscovery/build.gradle
+++ b/java/src/IceDiscovery/build.gradle
@@ -1,8 +1,22 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 slice {
     java {
-    	include = ["${sliceDir}"]
-        args = "--ice"
-        files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"])
+        set1 {
+        	include = ["${sliceDir}"]
+            args = "--ice"
+            files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"])
+        }
     }
 }
 
@@ -12,7 +26,7 @@ idea.module {
 }
 
 dependencies {
-    compile project(':src/Ice')
+    compile project(':Ice')
 }
 
 def jarName = "IceDiscovery${versionSuffix}.jar"
diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle
index ac8cccbaed5..f36dec177fa 100644
--- a/java/src/IceGrid/build.gradle
+++ b/java/src/IceGrid/build.gradle
@@ -1,8 +1,22 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 slice {
     java {
-    	include = ["${sliceDir}"]
-        args = "--ice --tie --checksum IceGrid.SliceChecksums"
-        files = fileTree(dir: "$sliceDir/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
+        set1 {
+        	include = ["${sliceDir}"]
+            args = "--ice --tie --checksum IceGrid.SliceChecksums"
+            files = fileTree(dir: "$sliceDir/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
+        }
     }
 }
 
@@ -12,8 +26,8 @@ idea.module {
 }
 
 dependencies {
-    compile project(':src/Ice')
-    compile project(':src/Glacier2')
+    compile project(':Ice')
+    compile project(':Glacier2')
 }
 
 def jarName = "IceGrid${versionSuffix}.jar"
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index d29436faea7..ae77c03ddb0 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -1,10 +1,22 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 apply plugin: 'application'
 apply from: "../../gradle/javafx7.gradle"
 
 dependencies {
-  compile project(':src/Ice')
-  compile project(':src/IceBox')
-  compile project(':src/IceGrid')
+  compile project(':Ice')
+  compile project(':IceBox')
+  compile project(':IceGrid')
   compile 'com.jgoodies:jgoodies-common:1.8.0'
   compile 'com.jgoodies:jgoodies-looks:2.6.0'
   compile 'com.jgoodies:jgoodies-forms:1.8.0'
@@ -29,7 +41,6 @@ buildscript {
     dependencies {
         classpath group: 'net.sourceforge', name: 'proguard', version: '5.0'
     }
-
 }
 
 def javaHome = System.getProperty('java.home')
diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle
index 540a68b721b..67312fe2385 100644
--- a/java/src/IcePatch2/build.gradle
+++ b/java/src/IcePatch2/build.gradle
@@ -1,8 +1,22 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 slice {
     java {
-    	include = ["${sliceDir}"]
-        args = "--ice --tie --checksum IcePatch2.SliceChecksums"
-        files = fileTree(dir: "$sliceDir/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
+        set1 {
+        	include = ["${sliceDir}"]
+            args = "--ice --tie --checksum IcePatch2.SliceChecksums"
+            files = fileTree(dir: "$sliceDir/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
+        }
     }
 }
 
@@ -12,7 +26,7 @@ idea.module {
 }
 
 dependencies {
-    compile project(':src/Ice')
+    compile project(':Ice')
 }
 
 def jarName = "IcePatch2${versionSuffix}.jar"
diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle
index 6b65a87b64f..ff8de187d48 100644
--- a/java/src/IceStorm/build.gradle
+++ b/java/src/IceStorm/build.gradle
@@ -1,8 +1,22 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 slice {
     java {
-    	include = ["${sliceDir}"]
-        args = "--ice --tie --checksum IceStorm.SliceChecksums"
-        files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
+        set1 {
+        	include = ["${sliceDir}"]
+            args = "--ice --tie --checksum IceStorm.SliceChecksums"
+            files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
+        }
     }
 }
 
@@ -12,7 +26,7 @@ idea.module {
 }
 
 dependencies {
-    compile project(':src/Ice')
+    compile project(':Ice')
 }
 
 def jarName = "IceStorm${versionSuffix}.jar"
diff --git a/java/src/ant/build.gradle b/java/src/ant/build.gradle
index d3f719531bc..a75c3a74e41 100644
--- a/java/src/ant/build.gradle
+++ b/java/src/ant/build.gradle
@@ -1,3 +1,15 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 repositories {
     mavenCentral()
 }