More gradle changes.

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

791 files changed, 3068 insertions, 2169 deletions

diff --git a/android/.gitignore b/android/.gitignore
new file mode 100644
index 00000000000..91ea7410d89
--- /dev/null
+++ b/android/.gitignore
@@ -0,0 +1,2 @@
+build
+.gradle
diff --git a/android/.idea/.gitignore b/android/.idea/.gitignore
new file mode 100644
index 00000000000..9679fd1506d
--- /dev/null
+++ b/android/.idea/.gitignore
@@ -0,0 +1,4 @@
+libraries
+workspace.xml
+tasks.xml
+misc.xml
diff --git a/android/.idea/.name b/android/.idea/.name
new file mode 100644
index 00000000000..1fd74d19811
--- /dev/null
+++ b/android/.idea/.name
@@ -0,0 +1 @@
+android
\ No newline at end of file
diff --git a/android/.idea/codeStyleSettings.xml b/android/.idea/codeStyleSettings.xml
new file mode 100644
index 00000000000..29ab470ca5f
--- /dev/null
+++ b/android/.idea/codeStyleSettings.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+          <value />
+        </option>
+        <option name="IMPORT_LAYOUT_TABLE">
+          <value>
+            <package name="android" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="junit" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="net" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="javax" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="true" />
+            <emptyLine />
+          </value>
+        </option>
+        <option name="RIGHT_MARGIN" value="100" />
+        <AndroidXmlCodeStyleSettings>
+          <option name="USE_CUSTOM_SETTINGS" value="true" />
+        </AndroidXmlCodeStyleSettings>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <codeStyleSettings language="XML">
+          <option name="FORCE_REARRANGE_MODE" value="1" />
+          <indentOptions>
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+          </indentOptions>
+          <arrangement>
+            <rules>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>xmlns:android</NAME>
+                    <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>xmlns:.*</NAME>
+                    <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*:id</NAME>
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*:name</NAME>
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>name</NAME>
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>style</NAME>
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*</NAME>
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*:layout_width</NAME>
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*:layout_height</NAME>
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*:layout_.*</NAME>
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*:width</NAME>
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*:height</NAME>
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*</NAME>
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*</NAME>
+                    <XML_NAMESPACE>.*</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+            </rules>
+          </arrangement>
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+  </component>
+</project>
+
diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml
new file mode 100644
index 00000000000..217af471a9e
--- /dev/null
+++ b/android/.idea/compiler.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
+
diff --git a/android/.idea/copyright/profiles_settings.xml b/android/.idea/copyright/profiles_settings.xml
new file mode 100644
index 00000000000..e7bedf3377d
--- /dev/null
+++ b/android/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="" />
+</component>
\ No newline at end of file
diff --git a/android/.idea/encodings.xml b/android/.idea/encodings.xml
new file mode 100644
index 00000000000..e206d70d859
--- /dev/null
+++ b/android/.idea/encodings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
new file mode 100644
index 00000000000..ed08fa67f9a
--- /dev/null
+++ b/android/.idea/gradle.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$USER_HOME$/bin/gradle-2.1" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/buildSrc" />
+            <option value="$PROJECT_DIR$/demo/chat" />
+            <option value="$PROJECT_DIR$/demo/hello" />
+            <option value="$PROJECT_DIR$/demo/library" />
+            <option value="$PROJECT_DIR$/src/Glacier2" />
+            <option value="$PROJECT_DIR$/src/Ice" />
+            <option value="$PROJECT_DIR$/src/IceBox" />
+            <option value="$PROJECT_DIR$/src/IceDiscovery" />
+            <option value="$PROJECT_DIR$/src/IceGrid" />
+            <option value="$PROJECT_DIR$/src/IcePatch2" />
+            <option value="$PROJECT_DIR$/src/IceStorm" />
+            <option value="$PROJECT_DIR$/test" />
+            <option value="$PROJECT_DIR$/test/android" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
+
diff --git a/android/.idea/modules.xml b/android/.idea/modules.xml
new file mode 100644
index 00000000000..c93f91c26d2
--- /dev/null
+++ b/android/.idea/modules.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/src/Glacier2/Glacier2.iml" filepath="$PROJECT_DIR$/src/Glacier2/Glacier2.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/Ice/Ice.iml" filepath="$PROJECT_DIR$/src/Ice/Ice.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/IceBox/IceBox.iml" filepath="$PROJECT_DIR$/src/IceBox/IceBox.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/IceDiscovery/IceDiscovery.iml" filepath="$PROJECT_DIR$/src/IceDiscovery/IceDiscovery.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/IceGrid/IceGrid.iml" filepath="$PROJECT_DIR$/src/IceGrid/IceGrid.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/IcePatch2/IcePatch2.iml" filepath="$PROJECT_DIR$/src/IcePatch2/IcePatch2.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/IceStorm/IceStorm.iml" filepath="$PROJECT_DIR$/src/IceStorm/IceStorm.iml" />
+      <module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
+      <module fileurl="file://$PROJECT_DIR$/buildSrc/buildSrc.iml" filepath="$PROJECT_DIR$/buildSrc/buildSrc.iml" />
+      <module fileurl="file://$PROJECT_DIR$/demo/chat/chat.iml" filepath="$PROJECT_DIR$/demo/chat/chat.iml" />
+      <module fileurl="file://$PROJECT_DIR$/demo/hello/hello.iml" filepath="$PROJECT_DIR$/demo/hello/hello.iml" />
+      <module fileurl="file://$PROJECT_DIR$/demo/library/library.iml" filepath="$PROJECT_DIR$/demo/library/library.iml" />
+      <module fileurl="file://$PROJECT_DIR$/test/test.iml" filepath="$PROJECT_DIR$/test/test.iml" />
+      <module fileurl="file://$PROJECT_DIR$/test/android/testApp.iml" filepath="$PROJECT_DIR$/test/android/testApp.iml" />
+    </modules>
+  </component>
+</project>
+
diff --git a/android/.idea/scopes/scope_settings.xml b/android/.idea/scopes/scope_settings.xml
new file mode 100644
index 00000000000..922003b8433
--- /dev/null
+++ b/android/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml
new file mode 100644
index 00000000000..2e0588cc37d
--- /dev/null
+++ b/android/.idea/vcs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
+
diff --git a/android/android.iml b/android/android.iml
new file mode 100644
index 00000000000..3aed3beee42
--- /dev/null
+++ b/android/android.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/android/build.gradle b/android/build.gradle
new file mode 100644
index 00000000000..5e5ae489398
--- /dev/null
+++ b/android/build.gradle
@@ -0,0 +1,39 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.12.2'
+    }
+}
+
+subprojects {
+    apply plugin: 'idea'
+
+    // The Android versions used by subprojects.
+    ext.ice_compileSdkVersion = 17
+    ext.ice_buildToolsVersion = "21.0.1"
+    ext.ice_minSdkVersion = 17
+    ext.ice_targetSdkVersion = 17
+
+    repositories {
+        maven {
+            url 'http://www.zeroc.com:8081/nexus/content/repositories/thirdparty'
+        }
+    }
+
+    //jar {
+    //    manifest {
+    //        attributes("Built-By": "ZeroC, Inc.")
+    //    }
+    //}
+}
diff --git a/android/buildSrc/build.gradle b/android/buildSrc/build.gradle
new file mode 100644
index 00000000000..3561dfca67e
--- /dev/null
+++ b/android/buildSrc/build.gradle
@@ -0,0 +1,30 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'groovy'
+
+dependencies {
+    compile gradleApi()
+    compile localGroovy()
+}
+
+// The rootProject for building buildSrc plugins is NOT the project which is causing the build.
+// It is instead the directory of the buildSrc itself so $rootProject.projectDir is android/buildSrc
+def pluginDir = "$rootProject.projectDir/../../java/buildSrc/"
+
+sourceSets {
+	main {
+		groovy {
+			srcDir "$pluginDir/src/main/groovy"
+		}
+		resources {
+			srcDir "$pluginDir/src/main/resources"
+		}
+	}
+}
\ No newline at end of file
diff --git a/android/buildSrc/buildSrc.iml b/android/buildSrc/buildSrc.iml
new file mode 100644
index 00000000000..2f43c9e723a
--- /dev/null
+++ b/android/buildSrc/buildSrc.iml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/groovy" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/groovy" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../java/buildSrc/src/main/groovy">
+      <sourceFolder url="file://$MODULE_DIR$/../../java/buildSrc/src/main/groovy" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../java/buildSrc/src/main/resources">
+      <sourceFolder url="file://$MODULE_DIR$/../../java/buildSrc/src/main/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="gradle-core-1.12" level="project" />
+    <orderEntry type="library" exported="" name="groovy-all-1.8.6" level="project" />
+    <orderEntry type="library" exported="" name="asm-all-5.0_BETA" level="project" />
+    <orderEntry type="library" exported="" name="ant-1.9.3" level="project" />
+    <orderEntry type="library" exported="" name="commons-collections-3.2.1" level="project" />
+    <orderEntry type="library" exported="" name="commons-io-1.4" level="project" />
+    <orderEntry type="library" exported="" name="commons-lang-2.6" level="project" />
+    <orderEntry type="library" exported="" name="ivy-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="logback-core-1.0.13" level="project" />
+    <orderEntry type="library" exported="" name="logback-classic-1.0.13" level="project" />
+    <orderEntry type="library" exported="" name="guava-jdk5-14.0.1" level="project" />
+    <orderEntry type="library" exported="" name="jcip-annotations-1.0" level="project" />
+    <orderEntry type="library" exported="" name="jul-to-slf4j-1.7.5" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-1.3" level="project" />
+    <orderEntry type="library" exported="" name="javax.inject-1" level="project" />
+    <orderEntry type="library" exported="" name="bintray-client-java-impl-0.1.0" level="project" />
+    <orderEntry type="library" exported="" name="httpclient-4.2.2" level="project" />
+    <orderEntry type="library" exported="" name="slf4j-api-1.7.5" level="project" />
+    <orderEntry type="library" exported="" name="log4j-over-slf4j-1.7.5" level="project" />
+    <orderEntry type="library" exported="" name="jcl-over-slf4j-1.7.5" level="project" />
+    <orderEntry type="library" exported="" name="ant-launcher-1.9.3" level="project" />
+    <orderEntry type="library" exported="" name="jsch-0.1.51" level="project" />
+    <orderEntry type="library" exported="" name="joda-time-2.3" level="project" />
+    <orderEntry type="library" exported="" name="bintray-client-java-api-0.1.0" level="project" />
+    <orderEntry type="library" exported="" name="commons-logging-1.1.1" level="project" />
+    <orderEntry type="library" exported="" name="commons-beanutils-1.8.0" level="project" />
+    <orderEntry type="library" exported="" name="ezmorph-1.0.6" level="project" />
+    <orderEntry type="library" exported="" name="json-lib-2.3-jdk15" level="project" />
+    <orderEntry type="library" exported="" name="xml-resolver-1.2" level="project" />
+    <orderEntry type="library" exported="" name="http-builder-0.6" level="project" />
+    <orderEntry type="library" exported="" name="commons-codec-1.6" level="project" />
+    <orderEntry type="library" exported="" name="httpcore-4.2.2" level="project" />
+    <orderEntry type="library" exported="" name="jcifs-1.3.17" level="project" />
+    <orderEntry type="library" exported="" name="gradle-docs-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-base-services-groovy-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-base-services-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-resources-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-cli-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-native-1.12" level="project" />
+    <orderEntry type="library" exported="" name="jna-3.2.7" level="project" />
+    <orderEntry type="library" exported="" name="native-platform-0.10" level="project" />
+    <orderEntry type="library" exported="" name="jna-posix-1.0.3" level="project" />
+    <orderEntry type="library" exported="" name="jansi-1.2.1" level="project" />
+    <orderEntry type="library" exported="" name="native-platform-osx-i386-0.10" level="project" />
+    <orderEntry type="library" exported="" name="native-platform-osx-amd64-0.10" level="project" />
+    <orderEntry type="library" exported="" name="native-platform-linux-amd64-0.10" level="project" />
+    <orderEntry type="library" exported="" name="native-platform-linux-i386-0.10" level="project" />
+    <orderEntry type="library" exported="" name="native-platform-windows-amd64-0.10" level="project" />
+    <orderEntry type="library" exported="" name="native-platform-windows-i386-0.10" level="project" />
+    <orderEntry type="library" exported="" name="native-platform-freebsd-i386-0.10" level="project" />
+    <orderEntry type="library" exported="" name="native-platform-freebsd-amd64-0.10" level="project" />
+    <orderEntry type="library" exported="" name="gradle-messaging-1.12" level="project" />
+    <orderEntry type="library" exported="" name="kryo-2.20" level="project" />
+    <orderEntry type="library" exported="" name="asm-4.0" level="project" />
+    <orderEntry type="library" exported="" name="reflectasm-1.07-shaded" level="project" />
+    <orderEntry type="library" exported="" name="minlog-1.2" level="project" />
+    <orderEntry type="library" exported="" name="objenesis-1.2" level="project" />
+    <orderEntry type="library" exported="" name="gradle-core-impl-1.12" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-maven-settings-3.0.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-maven-repository-metadata-3.0.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-plexus-container-default-1.5.5" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-maven-aether-provider-3.0.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-wagon-provider-api-2.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-plexus-cipher-1.7" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-plexus-interpolation-1.14" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-plexus-utils-2.0.6" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-plexus-classworlds-2.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-maven-plugin-api-3.0.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-maven-model-builder-3.0.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-plexus-sec-dispatcher-1.3" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-plexus-component-annotations-1.5.5" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-aether-connector-wagon-1.13.1" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-maven-compat-3.0.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-wagon-http-2.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-aether-api-1.13.1" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-maven-settings-builder-3.0.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-aether-spi-1.13.1" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-maven-core-3.0.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-wagon-http-shared4-2.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-aether-util-1.13.1" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-maven-artifact-3.0.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-maven-model-3.0.4" level="project" />
+    <orderEntry type="library" exported="" name="jarjar-aether-impl-1.13.1" level="project" />
+    <orderEntry type="library" exported="" name="maven-ant-tasks-2.1.3" level="project" />
+    <orderEntry type="library" exported="" name="nekohtml-1.9.14" level="project" />
+    <orderEntry type="library" exported="" name="xbean-reflect-3.4" level="project" />
+    <orderEntry type="library" exported="" name="xml-apis-1.3.04" level="project" />
+    <orderEntry type="library" exported="" name="xercesImpl-2.9.1" level="project" />
+    <orderEntry type="library" exported="" name="gradle-tooling-api-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-plugins-1.12" level="project" />
+    <orderEntry type="library" exported="" name="junit-4.11" level="project" />
+    <orderEntry type="library" exported="" name="testng-6.3.1" level="project" />
+    <orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
+    <orderEntry type="library" exported="" name="bsh-2.0b4" level="project" />
+    <orderEntry type="library" exported="" name="jcommander-1.12" level="project" />
+    <orderEntry type="library" exported="" name="snakeyaml-1.6" level="project" />
+    <orderEntry type="library" exported="" name="hamcrest-core-1.3" level="project" />
+    <orderEntry type="library" exported="" name="gradle-code-quality-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-jetty-1.12" level="project" />
+    <orderEntry type="library" exported="" name="jetty-6.1.25" level="project" />
+    <orderEntry type="library" exported="" name="jetty-util-6.1.25" level="project" />
+    <orderEntry type="library" exported="" name="servlet-api-2.5-20081211" level="project" />
+    <orderEntry type="library" exported="" name="jetty-plus-6.1.25" level="project" />
+    <orderEntry type="library" exported="" name="jsp-2.1-6.1.14" level="project" />
+    <orderEntry type="library" exported="" name="jetty-annotations-6.1.25" level="project" />
+    <orderEntry type="library" exported="" name="geronimo-annotation_1.0_spec-1.0" level="project" />
+    <orderEntry type="library" exported="" name="jetty-naming-6.1.25" level="project" />
+    <orderEntry type="library" exported="" name="core-3.1.1" level="project" />
+    <orderEntry type="library" exported="" name="jsp-api-2.1-6.1.14" level="project" />
+    <orderEntry type="library" exported="" name="gradle-antlr-1.12" level="project" />
+    <orderEntry type="library" exported="" name="ant-antlr-1.9.3" level="project" />
+    <orderEntry type="library" exported="" name="antlr-2.7.7" level="project" />
+    <orderEntry type="library" exported="" name="gradle-wrapper-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-osgi-1.12" level="project" />
+    <orderEntry type="library" exported="" name="bndlib-2.1.0" level="project" />
+    <orderEntry type="library" exported="" name="gradle-maven-1.12" level="project" />
+    <orderEntry type="library" exported="" name="pmaven-common-0.8-20100325" level="project" />
+    <orderEntry type="library" exported="" name="pmaven-groovy-0.8-20100325" level="project" />
+    <orderEntry type="library" exported="" name="plexus-component-annotations-1.5.2" level="project" />
+    <orderEntry type="library" exported="" name="gradle-ide-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-announce-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-scala-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-sonar-1.12" level="project" />
+    <orderEntry type="library" exported="" name="sonar-runner-2.0" level="project" />
+    <orderEntry type="library" exported="" name="sonar-batch-bootstrapper-2.9" level="project" />
+    <orderEntry type="library" exported="" name="gradle-signing-1.12" level="project" />
+    <orderEntry type="library" exported="" name="bcpg-jdk15-1.46" level="project" />
+    <orderEntry type="library" exported="" name="bcprov-jdk15-1.46" level="project" />
+    <orderEntry type="library" exported="" name="gradle-cpp-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-ear-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-javascript-1.12" level="project" />
+    <orderEntry type="library" exported="" name="rhino-1.7R3" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
+    <orderEntry type="library" exported="" name="simple-4.1.21" level="project" />
+    <orderEntry type="library" exported="" name="gradle-build-comparison-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-diagnostics-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-reporting-1.12" level="project" />
+    <orderEntry type="library" exported="" name="jatl-0.2.2" level="project" />
+    <orderEntry type="library" exported="" name="gradle-publish-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-ivy-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-jacoco-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-build-init-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-language-jvm-1.12" level="project" />
+    <orderEntry type="library" exported="" name="gradle-language-base-1.12" level="project" />
+  </component>
+</module>
+
diff --git a/java/demo/android/README b/android/demo/README
index 55957553c5c..55957553c5c 100644
--- a/java/demo/android/README
+++ b/android/demo/README
diff --git a/java/demo/android/chat/README b/android/demo/chat/README
index 50aa5ebc2ff..50aa5ebc2ff 100644
--- a/java/demo/android/chat/README
+++ b/android/demo/chat/README
diff --git a/android/demo/chat/build.gradle b/android/demo/chat/build.gradle
new file mode 100644
index 00000000000..393c18ee0f9
--- /dev/null
+++ b/android/demo/chat/build.gradle
@@ -0,0 +1,61 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'com.android.application'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+apply plugin: 'slice'
+
+slice {
+    java {
+        set1 {
+            include = ["${projectDir}/src/main/slice", "${sliceDir}"]
+            srcDir = 'src/main'
+        }
+    }
+}
+
+android {
+    compileSdkVersion ice_compileSdkVersion
+    buildToolsVersion ice_buildToolsVersion
+
+    defaultConfig {
+        applicationId "com.zeroc.chat"
+        minSdkVersion ice_minSdkVersion
+        targetSdkVersion ice_targetSdkVersion
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_6
+            targetCompatibility JavaVersion.VERSION_1_6
+        }
+    }
+
+    buildTypes {
+        release {
+            runProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+    // It would be ideal if the slice plugin did this, but it doesn't work as expected.
+    sourceSets {
+        main {
+            java {
+                srcDirs = ['src/main/java', project.slice.output ]
+            }
+        }
+    }
+}
+
+idea.module {
+    excludeDirs -= file(buildDir)
+    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
+}
+
+dependencies {
+    compile project(':Ice')
+    compile project(':Glacier2')
+}
diff --git a/android/demo/chat/chat.iml b/android/demo/chat/chat.iml
new file mode 100644
index 00000000000..20560d268c1
--- /dev/null
+++ b/android/demo/chat/chat.iml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":chat" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated-src" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="Ice" level="project" />
+    <orderEntry type="library" exported="" name="Glacier2" level="project" />
+  </component>
+</module>
+
diff --git a/java/demo/android/chat/AndroidManifest.xml b/android/demo/chat/src/main/AndroidManifest.xml
index 53fbc095066..36f168f669e 100644
--- a/java/demo/android/chat/AndroidManifest.xml
+++ b/android/demo/chat/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <!--
       http://developer.android.com/guide/topics/manifest/uses-sdk-element.html
     -->
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/>
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:allowBackup="false">
         <activity android:label="@string/app_name" android:name=".ChatActivity" android:exported="false">
             <intent-filter>
diff --git a/java/demo/android/chat/src/com/zeroc/chat/ChatActivity.java b/android/demo/chat/src/main/java/com/zeroc/chat/ChatActivity.java
index 348c95647cc..348c95647cc 100644
--- a/java/demo/android/chat/src/com/zeroc/chat/ChatActivity.java
+++ b/android/demo/chat/src/main/java/com/zeroc/chat/ChatActivity.java
diff --git a/java/demo/android/chat/src/com/zeroc/chat/ChatUtils.java b/android/demo/chat/src/main/java/com/zeroc/chat/ChatUtils.java
index 1734a886be9..1734a886be9 100644
--- a/java/demo/android/chat/src/com/zeroc/chat/ChatUtils.java
+++ b/android/demo/chat/src/main/java/com/zeroc/chat/ChatUtils.java
diff --git a/java/demo/android/chat/src/com/zeroc/chat/LoginActivity.java b/android/demo/chat/src/main/java/com/zeroc/chat/LoginActivity.java
index d52fd1fcf99..d52fd1fcf99 100644
--- a/java/demo/android/chat/src/com/zeroc/chat/LoginActivity.java
+++ b/android/demo/chat/src/main/java/com/zeroc/chat/LoginActivity.java
diff --git a/java/demo/android/chat/src/com/zeroc/chat/SessionActivity.java b/android/demo/chat/src/main/java/com/zeroc/chat/SessionActivity.java
index dd669f69b57..dd669f69b57 100644
--- a/java/demo/android/chat/src/com/zeroc/chat/SessionActivity.java
+++ b/android/demo/chat/src/main/java/com/zeroc/chat/SessionActivity.java
diff --git a/java/demo/android/chat/src/com/zeroc/chat/UserViewActivity.java b/android/demo/chat/src/main/java/com/zeroc/chat/UserViewActivity.java
index b4bea76b5a3..b4bea76b5a3 100644
--- a/java/demo/android/chat/src/com/zeroc/chat/UserViewActivity.java
+++ b/android/demo/chat/src/main/java/com/zeroc/chat/UserViewActivity.java
diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/AppSession.java b/android/demo/chat/src/main/java/com/zeroc/chat/service/AppSession.java
index 28bf2e16d04..28bf2e16d04 100644
--- a/java/demo/android/chat/src/com/zeroc/chat/service/AppSession.java
+++ b/android/demo/chat/src/main/java/com/zeroc/chat/service/AppSession.java
diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/ChatRoomListener.java b/android/demo/chat/src/main/java/com/zeroc/chat/service/ChatRoomListener.java
index c9582fcd303..c9582fcd303 100644
--- a/java/demo/android/chat/src/com/zeroc/chat/service/ChatRoomListener.java
+++ b/android/demo/chat/src/main/java/com/zeroc/chat/service/ChatRoomListener.java
diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/ChatService.java b/android/demo/chat/src/main/java/com/zeroc/chat/service/ChatService.java
index 1b3f238c12e..1b3f238c12e 100644
--- a/java/demo/android/chat/src/com/zeroc/chat/service/ChatService.java
+++ b/android/demo/chat/src/main/java/com/zeroc/chat/service/ChatService.java
diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/NoSessionException.java b/android/demo/chat/src/main/java/com/zeroc/chat/service/NoSessionException.java
index 8b46e5dab06..8b46e5dab06 100644
--- a/java/demo/android/chat/src/com/zeroc/chat/service/NoSessionException.java
+++ b/android/demo/chat/src/main/java/com/zeroc/chat/service/NoSessionException.java
diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/Service.java b/android/demo/chat/src/main/java/com/zeroc/chat/service/Service.java
index 558f3b9484a..558f3b9484a 100644
--- a/java/demo/android/chat/src/com/zeroc/chat/service/Service.java
+++ b/android/demo/chat/src/main/java/com/zeroc/chat/service/Service.java
diff --git a/java/demo/android/chat/src/com/zeroc/chat/service/SessionListener.java b/android/demo/chat/src/main/java/com/zeroc/chat/service/SessionListener.java
index 08a6a5460dc..08a6a5460dc 100644
--- a/java/demo/android/chat/src/com/zeroc/chat/service/SessionListener.java
+++ b/android/demo/chat/src/main/java/com/zeroc/chat/service/SessionListener.java
diff --git a/java/demo/android/chat/res/drawable/icon.png b/android/demo/chat/src/main/res/drawable/icon.png
index 75024841d32..75024841d32 100644
--- a/java/demo/android/chat/res/drawable/icon.png
+++ b/android/demo/chat/src/main/res/drawable/icon.png
diff --git a/java/demo/android/chat/res/drawable/stat_notify.png b/android/demo/chat/src/main/res/drawable/stat_notify.png
index 37f7c0d543b..37f7c0d543b 100644
--- a/java/demo/android/chat/res/drawable/stat_notify.png
+++ b/android/demo/chat/src/main/res/drawable/stat_notify.png
diff --git a/java/demo/android/chat/res/layout/chat.xml b/android/demo/chat/src/main/res/layout/chat.xml
index 2c10dec1308..2c10dec1308 100644
--- a/java/demo/android/chat/res/layout/chat.xml
+++ b/android/demo/chat/src/main/res/layout/chat.xml
diff --git a/java/demo/android/chat/res/layout/login.xml b/android/demo/chat/src/main/res/layout/login.xml
index 078a4da1448..078a4da1448 100644
--- a/java/demo/android/chat/res/layout/login.xml
+++ b/android/demo/chat/src/main/res/layout/login.xml
diff --git a/java/demo/android/chat/res/layout/main.xml b/android/demo/chat/src/main/res/layout/main.xml
index 1fb4479c217..1fb4479c217 100644
--- a/java/demo/android/chat/res/layout/main.xml
+++ b/android/demo/chat/src/main/res/layout/main.xml
diff --git a/java/demo/android/chat/res/layout/user.xml b/android/demo/chat/src/main/res/layout/user.xml
index 30790a86eeb..30790a86eeb 100644
--- a/java/demo/android/chat/res/layout/user.xml
+++ b/android/demo/chat/src/main/res/layout/user.xml
diff --git a/java/demo/android/chat/res/raw/client.bks b/android/demo/chat/src/main/res/raw/client.bks
index 538d360fac0..538d360fac0 100644
--- a/java/demo/android/chat/res/raw/client.bks
+++ b/android/demo/chat/src/main/res/raw/client.bks
diff --git a/java/demo/android/chat/res/values/strings.xml b/android/demo/chat/src/main/res/values/strings.xml
index 8db8daeb568..8db8daeb568 100644
--- a/java/demo/android/chat/res/values/strings.xml
+++ b/android/demo/chat/src/main/res/values/strings.xml
diff --git a/java/demo/android/chat/slice/Chat.ice b/android/demo/chat/src/main/slice/Chat.ice
index d33fabb4a34..d33fabb4a34 100644
--- a/java/demo/android/chat/slice/Chat.ice
+++ b/android/demo/chat/src/main/slice/Chat.ice
diff --git a/java/demo/android/chat/slice/ChatSession.ice b/android/demo/chat/src/main/slice/ChatSession.ice
index ac16869f2f0..ac16869f2f0 100644
--- a/java/demo/android/chat/slice/ChatSession.ice
+++ b/android/demo/chat/src/main/slice/ChatSession.ice
diff --git a/java/demo/android/hello/README b/android/demo/hello/README
index 171da763198..171da763198 100644
--- a/java/demo/android/hello/README
+++ b/android/demo/hello/README
diff --git a/android/demo/hello/build.gradle b/android/demo/hello/build.gradle
new file mode 100644
index 00000000000..4cec45a23e4
--- /dev/null
+++ b/android/demo/hello/build.gradle
@@ -0,0 +1,59 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'com.android.application'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+apply plugin: 'slice'
+
+slice {
+    java {
+        set1 {
+            srcDir = 'src/main'
+        }
+    }
+}
+
+android {
+    compileSdkVersion ice_compileSdkVersion
+    buildToolsVersion ice_buildToolsVersion
+
+    defaultConfig {
+        applicationId "com.zeroc.hello"
+        minSdkVersion ice_minSdkVersion
+        targetSdkVersion ice_targetSdkVersion
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_6
+            targetCompatibility JavaVersion.VERSION_1_6
+        }
+    }
+
+    buildTypes {
+        release {
+            runProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+    // It would be ideal if the slice plugin did this, but it doesn't work as expected.
+    sourceSets {
+        main {
+            java {
+                srcDirs = ['src/main/java', project.slice.output ]
+            }
+        }
+    }
+}
+
+idea.module {
+    excludeDirs -= file(buildDir)
+    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
+}
+
+dependencies {
+    compile project(':Ice')
+}
diff --git a/android/demo/hello/hello.iml b/android/demo/hello/hello.iml
new file mode 100644
index 00000000000..7e3188ac8f1
--- /dev/null
+++ b/android/demo/hello/hello.iml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":hello" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated-src" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="Ice" level="project" />
+  </component>
+</module>
+
diff --git a/java/demo/android/chat/project.properties b/android/demo/hello/project.properties
index b7c2081d560..a3ee5ab64f5 100644
--- a/java/demo/android/chat/project.properties
+++ b/android/demo/hello/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-10
+target=android-17
diff --git a/java/demo/android/hello/AndroidManifest.xml b/android/demo/hello/src/main/AndroidManifest.xml
index e60fa33d40b..b68738733fd 100644
--- a/java/demo/android/hello/AndroidManifest.xml
+++ b/android/demo/hello/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <!--
       http://developer.android.com/guide/topics/manifest/uses-sdk-element.html
     -->
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
+    <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="17"/>
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="HelloApp"
                  android:allowBackup="false">
         <activity android:name=".HelloWorld" android:label="@string/app_name">
diff --git a/java/demo/android/hello/src/com/zeroc/hello/.gitignore b/android/demo/hello/src/main/java/com/zeroc/hello/.gitignore
index 48c0296968b..48c0296968b 100644
--- a/java/demo/android/hello/src/com/zeroc/hello/.gitignore
+++ b/android/demo/hello/src/main/java/com/zeroc/hello/.gitignore
diff --git a/java/demo/android/hello/src/com/zeroc/hello/HelloApp.java b/android/demo/hello/src/main/java/com/zeroc/hello/HelloApp.java
index 8923e84f28b..8923e84f28b 100644
--- a/java/demo/android/hello/src/com/zeroc/hello/HelloApp.java
+++ b/android/demo/hello/src/main/java/com/zeroc/hello/HelloApp.java
diff --git a/java/demo/android/hello/src/com/zeroc/hello/HelloWorld.java b/android/demo/hello/src/main/java/com/zeroc/hello/HelloWorld.java
index 491e7692dda..491e7692dda 100644
--- a/java/demo/android/hello/src/com/zeroc/hello/HelloWorld.java
+++ b/android/demo/hello/src/main/java/com/zeroc/hello/HelloWorld.java
diff --git a/java/demo/android/hello/res/drawable/icon.png b/android/demo/hello/src/main/res/drawable/icon.png
index 75024841d32..75024841d32 100644
--- a/java/demo/android/hello/res/drawable/icon.png
+++ b/android/demo/hello/src/main/res/drawable/icon.png
diff --git a/java/demo/android/hello/res/layout-land/main.xml b/android/demo/hello/src/main/res/layout-land/main.xml
index 9fe2f5a868e..9fe2f5a868e 100644
--- a/java/demo/android/hello/res/layout-land/main.xml
+++ b/android/demo/hello/src/main/res/layout-land/main.xml
diff --git a/java/demo/android/hello/res/layout/main.xml b/android/demo/hello/src/main/res/layout/main.xml
index d6b5c741320..d6b5c741320 100644
--- a/java/demo/android/hello/res/layout/main.xml
+++ b/android/demo/hello/src/main/res/layout/main.xml
diff --git a/java/demo/android/hello/res/raw/client.bks b/android/demo/hello/src/main/res/raw/client.bks
index 538d360fac0..538d360fac0 100644
--- a/java/demo/android/hello/res/raw/client.bks
+++ b/android/demo/hello/src/main/res/raw/client.bks
diff --git a/java/demo/android/hello/res/values/strings.xml b/android/demo/hello/src/main/res/values/strings.xml
index 2274e543e9f..2274e543e9f 100644
--- a/java/demo/android/hello/res/values/strings.xml
+++ b/android/demo/hello/src/main/res/values/strings.xml
diff --git a/java/demo/android/hello/slice/Hello.ice b/android/demo/hello/src/main/slice/Hello.ice
index 3e548e149a1..3e548e149a1 100644
--- a/java/demo/android/hello/slice/Hello.ice
+++ b/android/demo/hello/src/main/slice/Hello.ice
diff --git a/java/demo/android/library/README b/android/demo/library/README
index 7046d5af689..7046d5af689 100644
--- a/java/demo/android/library/README
+++ b/android/demo/library/README
diff --git a/android/demo/library/build.gradle b/android/demo/library/build.gradle
new file mode 100644
index 00000000000..e95916bf284
--- /dev/null
+++ b/android/demo/library/build.gradle
@@ -0,0 +1,61 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'com.android.application'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+apply plugin: 'slice'
+
+slice {
+    java {
+        set1 {
+            include = ["${projectDir}/src/main/slice", "${sliceDir}"]
+            srcDir = 'src/main'
+        }
+    }
+}
+
+android {
+    compileSdkVersion ice_compileSdkVersion
+    buildToolsVersion ice_buildToolsVersion
+
+    defaultConfig {
+        applicationId "com.zeroc.library"
+        minSdkVersion ice_minSdkVersion
+        targetSdkVersion ice_targetSdkVersion
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_6
+            targetCompatibility JavaVersion.VERSION_1_6
+        }
+    }
+
+    buildTypes {
+        release {
+            runProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+    // It would be ideal if the slice plugin did this, but it doesn't work as expected.
+    sourceSets {
+        main {
+            java {
+                srcDirs = ['src/main/java', project.slice.output ]
+            }
+        }
+    }
+}
+
+idea.module {
+    excludeDirs -= file(buildDir)
+    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
+}
+
+dependencies {
+    compile project(':Ice')
+    compile project(':Glacier2')
+}
diff --git a/android/demo/library/library.iml b/android/demo/library/library.iml
new file mode 100644
index 00000000000..c908958c7b6
--- /dev/null
+++ b/android/demo/library/library.iml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":library" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated-src" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="Ice" level="project" />
+    <orderEntry type="library" exported="" name="Glacier2" level="project" />
+  </component>
+</module>
+
diff --git a/java/demo/android/library/AndroidManifest.xml b/android/demo/library/src/main/AndroidManifest.xml
index 4444596eb87..4444596eb87 100644
--- a/java/demo/android/library/AndroidManifest.xml
+++ b/android/demo/library/src/main/AndroidManifest.xml
diff --git a/java/demo/android/library/src/com/zeroc/library/EditActivity.java b/android/demo/library/src/main/java/com/zeroc/library/EditActivity.java
index 2063c4cc477..2063c4cc477 100644
--- a/java/demo/android/library/src/com/zeroc/library/EditActivity.java
+++ b/android/demo/library/src/main/java/com/zeroc/library/EditActivity.java
diff --git a/java/demo/android/library/src/com/zeroc/library/LibraryActivity.java b/android/demo/library/src/main/java/com/zeroc/library/LibraryActivity.java
index 7b97f73475e..7b97f73475e 100644
--- a/java/demo/android/library/src/com/zeroc/library/LibraryActivity.java
+++ b/android/demo/library/src/main/java/com/zeroc/library/LibraryActivity.java
diff --git a/java/demo/android/library/src/com/zeroc/library/LibraryApp.java b/android/demo/library/src/main/java/com/zeroc/library/LibraryApp.java
index d833db13d9a..d833db13d9a 100644
--- a/java/demo/android/library/src/com/zeroc/library/LibraryApp.java
+++ b/android/demo/library/src/main/java/com/zeroc/library/LibraryApp.java
diff --git a/java/demo/android/library/src/com/zeroc/library/LoginActivity.java b/android/demo/library/src/main/java/com/zeroc/library/LoginActivity.java
index fea2265b217..fea2265b217 100644
--- a/java/demo/android/library/src/com/zeroc/library/LoginActivity.java
+++ b/android/demo/library/src/main/java/com/zeroc/library/LoginActivity.java
diff --git a/java/demo/android/library/src/com/zeroc/library/SessionActivity.java b/android/demo/library/src/main/java/com/zeroc/library/SessionActivity.java
index 8a7f9dac01f..8a7f9dac01f 100644
--- a/java/demo/android/library/src/com/zeroc/library/SessionActivity.java
+++ b/android/demo/library/src/main/java/com/zeroc/library/SessionActivity.java
diff --git a/java/demo/android/library/src/com/zeroc/library/ViewActivity.java b/android/demo/library/src/main/java/com/zeroc/library/ViewActivity.java
index 62422da8023..62422da8023 100644
--- a/java/demo/android/library/src/com/zeroc/library/ViewActivity.java
+++ b/android/demo/library/src/main/java/com/zeroc/library/ViewActivity.java
diff --git a/java/demo/android/library/src/com/zeroc/library/controller/LoginController.java b/android/demo/library/src/main/java/com/zeroc/library/controller/LoginController.java
index a2bc3e304ea..a2bc3e304ea 100644
--- a/java/demo/android/library/src/com/zeroc/library/controller/LoginController.java
+++ b/android/demo/library/src/main/java/com/zeroc/library/controller/LoginController.java
diff --git a/java/demo/android/library/src/com/zeroc/library/controller/QueryController.java b/android/demo/library/src/main/java/com/zeroc/library/controller/QueryController.java
index 1467426cb52..1467426cb52 100644
--- a/java/demo/android/library/src/com/zeroc/library/controller/QueryController.java
+++ b/android/demo/library/src/main/java/com/zeroc/library/controller/QueryController.java
diff --git a/java/demo/android/library/src/com/zeroc/library/controller/QueryModel.java b/android/demo/library/src/main/java/com/zeroc/library/controller/QueryModel.java
index 6dd2e817b3c..6dd2e817b3c 100644
--- a/java/demo/android/library/src/com/zeroc/library/controller/QueryModel.java
+++ b/android/demo/library/src/main/java/com/zeroc/library/controller/QueryModel.java
diff --git a/java/demo/android/library/src/com/zeroc/library/controller/SessionAdapter.java b/android/demo/library/src/main/java/com/zeroc/library/controller/SessionAdapter.java
index c863220e9b0..c863220e9b0 100644
--- a/java/demo/android/library/src/com/zeroc/library/controller/SessionAdapter.java
+++ b/android/demo/library/src/main/java/com/zeroc/library/controller/SessionAdapter.java
diff --git a/java/demo/android/library/src/com/zeroc/library/controller/SessionController.java b/android/demo/library/src/main/java/com/zeroc/library/controller/SessionController.java
index 95c4217567b..95c4217567b 100644
--- a/java/demo/android/library/src/com/zeroc/library/controller/SessionController.java
+++ b/android/demo/library/src/main/java/com/zeroc/library/controller/SessionController.java
diff --git a/java/demo/android/library/res/drawable/icon.png b/android/demo/library/src/main/res/drawable/icon.png
index 75024841d32..75024841d32 100644
--- a/java/demo/android/library/res/drawable/icon.png
+++ b/android/demo/library/src/main/res/drawable/icon.png
diff --git a/java/demo/android/library/res/layout/author.xml b/android/demo/library/src/main/res/layout/author.xml
index fd3675d6f5a..fd3675d6f5a 100644
--- a/java/demo/android/library/res/layout/author.xml
+++ b/android/demo/library/src/main/res/layout/author.xml
diff --git a/java/demo/android/library/res/layout/authorview.xml b/android/demo/library/src/main/res/layout/authorview.xml
index d9127936571..d9127936571 100644
--- a/java/demo/android/library/res/layout/authorview.xml
+++ b/android/demo/library/src/main/res/layout/authorview.xml
diff --git a/java/demo/android/library/res/layout/edit.xml b/android/demo/library/src/main/res/layout/edit.xml
index db04b600aaa..db04b600aaa 100644
--- a/java/demo/android/library/res/layout/edit.xml
+++ b/android/demo/library/src/main/res/layout/edit.xml
diff --git a/java/demo/android/library/res/layout/library.xml b/android/demo/library/src/main/res/layout/library.xml
index de80a6a3bb1..7a8c33a1847 100644
--- a/java/demo/android/library/res/layout/library.xml
+++ b/android/demo/library/src/main/res/layout/library.xml
@@ -14,7 +14,7 @@
         android:imeOptions="actionSearch"
     />
 
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	<LinearLayout
 	    android:orientation="horizontal"
 	    android:layout_width="fill_parent"
 	    android:layout_height="wrap_content"
diff --git a/java/demo/android/library/res/layout/login.xml b/android/demo/library/src/main/res/layout/login.xml
index 3277675c2b7..3277675c2b7 100644
--- a/java/demo/android/library/res/layout/login.xml
+++ b/android/demo/library/src/main/res/layout/login.xml
diff --git a/java/demo/android/library/res/layout/rentername.xml b/android/demo/library/src/main/res/layout/rentername.xml
index b251a9dd9a3..b251a9dd9a3 100644
--- a/java/demo/android/library/res/layout/rentername.xml
+++ b/android/demo/library/src/main/res/layout/rentername.xml
diff --git a/java/demo/android/library/res/layout/view.xml b/android/demo/library/src/main/res/layout/view.xml
index cb68ab3eb97..cb68ab3eb97 100644
--- a/java/demo/android/library/res/layout/view.xml
+++ b/android/demo/library/src/main/res/layout/view.xml
diff --git a/java/demo/android/library/res/layout/viewitem.xml b/android/demo/library/src/main/res/layout/viewitem.xml
index 0a141ec8e64..0a141ec8e64 100644
--- a/java/demo/android/library/res/layout/viewitem.xml
+++ b/android/demo/library/src/main/res/layout/viewitem.xml
diff --git a/java/demo/android/library/res/raw/client.bks b/android/demo/library/src/main/res/raw/client.bks
index 538d360fac0..538d360fac0 100644
--- a/java/demo/android/library/res/raw/client.bks
+++ b/android/demo/library/src/main/res/raw/client.bks
diff --git a/java/demo/android/library/res/values/strings.xml b/android/demo/library/src/main/res/values/strings.xml
index b8d8bf514ab..b8d8bf514ab 100644
--- a/java/demo/android/library/res/values/strings.xml
+++ b/android/demo/library/src/main/res/values/strings.xml
diff --git a/java/demo/android/library/slice/Glacier2Session.ice b/android/demo/library/src/main/slice/Glacier2Session.ice
index b35b7771713..b35b7771713 100644
--- a/java/demo/android/library/slice/Glacier2Session.ice
+++ b/android/demo/library/src/main/slice/Glacier2Session.ice
diff --git a/java/demo/android/library/slice/Library.ice b/android/demo/library/src/main/slice/Library.ice
index 895dc761928..895dc761928 100644
--- a/java/demo/android/library/slice/Library.ice
+++ b/android/demo/library/src/main/slice/Library.ice
diff --git a/java/demo/android/library/slice/Session.ice b/android/demo/library/src/main/slice/Session.ice
index 93010c217ee..93010c217ee 100644
--- a/java/demo/android/library/slice/Session.ice
+++ b/android/demo/library/src/main/slice/Session.ice
diff --git a/android/gradle.properties b/android/gradle.properties
new file mode 100644
index 00000000000..2f3c1f86830
--- /dev/null
+++ b/android/gradle.properties
@@ -0,0 +1,47 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+iceVersion = 3.6b
+
+//
+// Oracle Berkeley DB version, only needed if you want to build
+// Freeze.
+//
+dbVersion = 5.3.28
+
+//
+// Select an installation base directory. The directory will be created
+// if it does not exist. If this property is not set the default will be
+// used. Default values are:
+//   - Windows: %SystemDrive%\Ice-${iceVersion}
+//   - Non Windows /opt/Ice-${iceVersion}
+//
+prefix =
+
+//
+// Define debug as true if you want to build with debug information,
+// false otherwise.
+//
+debug = true
+
+//
+// Gradle build properties
+//
+org.gradle.daemon = true
+
+#
+# This is disabled as currently slice2java crashes with parallel builds.
+#
+#org.gradle.parallel = true
+
+//
+// Package build properties
+//
+DESTDIR =
+appendVersionSuffix = no
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000000..8c0fb64a869
--- /dev/null
+++ b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..1e61d1fd3a9
--- /dev/null
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
diff --git a/android/gradlew b/android/gradlew
new file mode 100755
index 00000000000..91a7e269e19
--- /dev/null
+++ b/android/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/android/gradlew.bat b/android/gradlew.bat
new file mode 100644
index 00000000000..8a0b282aa68
--- /dev/null
+++ b/android/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/android/settings.gradle b/android/settings.gradle
new file mode 100644
index 00000000000..458743b4059
--- /dev/null
+++ b/android/settings.gradle
@@ -0,0 +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.
+//
+// **********************************************************************
+
+// Main source
+include ':hello', ':Ice', ':Glacier2', ':IceBox', ':IceDiscovery', ':IceGrid', ':IcePatch2', ':IceStorm', ':chat', ':library', ":test", ':testApp'
+project(':Ice').projectDir = new File('src/Ice')
+project(':Glacier2').projectDir = new File('src/Glacier2')
+project(':IceBox').projectDir = new File('src/IceBox')
+project(':IceDiscovery').projectDir = new File('src/IceDiscovery')
+project(':IceGrid').projectDir = new File('src/IceGrid')
+project(':IcePatch2').projectDir = new File('src/IcePatch2')
+project(':IceStorm').projectDir = new File('src/IceStorm')
+project(':hello').projectDir = new File('demo/hello')
+project(':chat').projectDir = new File('demo/chat')
+project(':library').projectDir = new File('demo/library')
+project(':test').projectDir = new File('test')
+project(':testApp').projectDir = new File('test/android')
\ No newline at end of file
diff --git a/android/src/Glacier2/Glacier2.iml b/android/src/Glacier2/Glacier2.iml
new file mode 100644
index 00000000000..c3d0e66fb20
--- /dev/null
+++ b/android/src/Glacier2/Glacier2.iml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":Glacier2" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../java/src/Glacier2/src/main/java">
+      <sourceFolder url="file://$MODULE_DIR$/../../../java/src/Glacier2/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+  </component>
+</module>
+
diff --git a/android/src/Glacier2/build.gradle b/android/src/Glacier2/build.gradle
new file mode 100644
index 00000000000..4e89aaf07d7
--- /dev/null
+++ b/android/src/Glacier2/build.gradle
@@ -0,0 +1,20 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'java'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+apply from: "$rootProject.projectDir/../java/src/Glacier2/build.gradle"
+
+sourceSets {
+    main {
+        java {
+            srcDir "$rootProject.projectDir/../java/src/Glacier2/src/main/java"
+        }
+    }
+}
diff --git a/android/src/Ice/Ice.iml b/android/src/Ice/Ice.iml
new file mode 100644
index 00000000000..457f010fe0f
--- /dev/null
+++ b/android/src/Ice/Ice.iml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":Ice" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../java/src/Ice/src/main/java">
+      <sourceFolder url="file://$MODULE_DIR$/../../../java/src/Ice/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/android/src/Ice/build.gradle b/android/src/Ice/build.gradle
new file mode 100644
index 00000000000..1326436d48f
--- /dev/null
+++ b/android/src/Ice/build.gradle
@@ -0,0 +1,20 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'java'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+apply from: "$rootProject.projectDir/../java/src/Ice/build.gradle"
+
+sourceSets {
+    main {
+        java {
+            srcDir "$rootProject.projectDir/../java/src/Ice/src/main/java"
+        }
+    }
+}
diff --git a/android/src/IceBox/IceBox.iml b/android/src/IceBox/IceBox.iml
new file mode 100644
index 00000000000..f8fe17041cf
--- /dev/null
+++ b/android/src/IceBox/IceBox.iml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":IceBox" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../java/src/IceBox/src/main/java">
+      <sourceFolder url="file://$MODULE_DIR$/../../../java/src/IceBox/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+  </component>
+</module>
+
diff --git a/android/src/IceBox/build.gradle b/android/src/IceBox/build.gradle
new file mode 100644
index 00000000000..856d6c4c4ae
--- /dev/null
+++ b/android/src/IceBox/build.gradle
@@ -0,0 +1,20 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'java'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+apply from: "$rootProject.projectDir/../java/src/IceBox/build.gradle"
+
+sourceSets {
+    main {
+        java {
+            srcDir "$rootProject.projectDir/../java/src/IceBox/src/main/java"
+        }
+    }
+}
diff --git a/android/src/IceDiscovery/IceDiscovery.iml b/android/src/IceDiscovery/IceDiscovery.iml
new file mode 100644
index 00000000000..79f6501f161
--- /dev/null
+++ b/android/src/IceDiscovery/IceDiscovery.iml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":IceDiscovery" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../java/src/IceDiscovery/src/main/java">
+      <sourceFolder url="file://$MODULE_DIR$/../../../java/src/IceDiscovery/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+  </component>
+</module>
+
diff --git a/android/src/IceDiscovery/build.gradle b/android/src/IceDiscovery/build.gradle
new file mode 100644
index 00000000000..05f5b171423
--- /dev/null
+++ b/android/src/IceDiscovery/build.gradle
@@ -0,0 +1,20 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'java'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+apply from: "$rootProject.projectDir/../java/src/IceDiscovery/build.gradle"
+
+sourceSets {
+    main {
+        java {
+            srcDir "$rootProject.projectDir/../java/src/IceDiscovery/src/main/java"
+        }
+    }
+}
diff --git a/android/src/IceGrid/IceGrid.iml b/android/src/IceGrid/IceGrid.iml
new file mode 100644
index 00000000000..8c615e2f7cb
--- /dev/null
+++ b/android/src/IceGrid/IceGrid.iml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":IceGrid" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../java/src/IceGrid/src/main/java">
+      <sourceFolder url="file://$MODULE_DIR$/../../../java/src/IceGrid/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Glacier2" exported="" />
+  </component>
+</module>
+
diff --git a/android/src/IceGrid/build.gradle b/android/src/IceGrid/build.gradle
new file mode 100644
index 00000000000..0ffd9de873f
--- /dev/null
+++ b/android/src/IceGrid/build.gradle
@@ -0,0 +1,20 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'java'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+apply from: "$rootProject.projectDir/../java/src/IceGrid/build.gradle"
+
+sourceSets {
+    main {
+        java {
+            srcDir "$rootProject.projectDir/../java/src/IceGrid/src/main/java"
+        }
+    }
+}
diff --git a/android/src/IcePatch2/IcePatch2.iml b/android/src/IcePatch2/IcePatch2.iml
new file mode 100644
index 00000000000..19b888c38e8
--- /dev/null
+++ b/android/src/IcePatch2/IcePatch2.iml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":IcePatch2" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../java/src/IcePatch2/src/main/java">
+      <sourceFolder url="file://$MODULE_DIR$/../../../java/src/IcePatch2/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+  </component>
+</module>
+
diff --git a/android/src/IcePatch2/build.gradle b/android/src/IcePatch2/build.gradle
new file mode 100644
index 00000000000..3ee8d117a1a
--- /dev/null
+++ b/android/src/IcePatch2/build.gradle
@@ -0,0 +1,20 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'java'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+apply from: "$rootProject.projectDir/../java/src/IcePatch2/build.gradle"
+
+sourceSets {
+    main {
+        java {
+            srcDir "$rootProject.projectDir/../java/src/IcePatch2/src/main/java"
+        }
+    }
+}
diff --git a/android/src/IceStorm/IceStorm.iml b/android/src/IceStorm/IceStorm.iml
new file mode 100644
index 00000000000..8dde8b531bf
--- /dev/null
+++ b/android/src/IceStorm/IceStorm.iml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":IceStorm" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../java/src/IceStorm/src/main/java">
+      <sourceFolder url="file://$MODULE_DIR$/../../../java/src/IceStorm/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+  </component>
+</module>
+
diff --git a/android/src/IceStorm/build.gradle b/android/src/IceStorm/build.gradle
new file mode 100644
index 00000000000..d96504ed3be
--- /dev/null
+++ b/android/src/IceStorm/build.gradle
@@ -0,0 +1,20 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'java'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+apply from: "$rootProject.projectDir/../java/src/IceStorm/build.gradle"
+
+sourceSets {
+    main {
+        java {
+            srcDir "$rootProject.projectDir/../java/src/IceStorm/src/main/java"
+        }
+    }
+}
diff --git a/java/test/android/.gitignore b/android/test/android/.gitignore
index 36f971e324f..36f971e324f 100644
--- a/java/test/android/.gitignore
+++ b/android/test/android/.gitignore
diff --git a/android/test/android/build.gradle b/android/test/android/build.gradle
new file mode 100644
index 00000000000..e9b8193afde
--- /dev/null
+++ b/android/test/android/build.gradle
@@ -0,0 +1,47 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'com.android.application'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+
+android {
+    compileSdkVersion ice_compileSdkVersion
+    buildToolsVersion ice_buildToolsVersion
+
+    defaultConfig {
+        applicationId "com.zeroc.test"
+        minSdkVersion ice_minSdkVersion
+        targetSdkVersion ice_targetSdkVersion
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_6
+            targetCompatibility JavaVersion.VERSION_1_6
+        }
+    }
+
+    buildTypes {
+        debug {
+            runProguard true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
+        }
+ 
+        release {
+            runProguard true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
+        }
+    }
+}
+
+idea.module {
+    excludeDirs -= file(buildDir)
+    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
+}
+
+dependencies {
+    compile project(':test')
+}
diff --git a/android/test/android/proguard.cfg b/android/test/android/proguard.cfg
new file mode 100644
index 00000000000..b1feb1a51bd
--- /dev/null
+++ b/android/test/android/proguard.cfg
@@ -0,0 +1,74 @@
+# This is a configuration file for ProGuard.
+# http://proguard.sourceforge.net/index.html#manual/usage.html
+
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+
+# Optimization is turned off by default. Dex does not like code run
+# through the ProGuard optimize and preverify steps (and performs some
+# of these optimizations on its own).
+-dontoptimize
+-dontpreverify
+# Note that if you want to enable optimization, you cannot just
+# include optimization flags in your own project configuration file;
+# instead you will need to point to the
+# "proguard-android-optimize.txt" file instead of this one from your
+# project.properties file.
+
+-keepattributes *Annotation*
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# keep setters in Views so that animations can still work.
+# see http://proguard.sourceforge.net/manual/examples.html#beans
+-keepclassmembers public class * extends android.view.View {
+   void set*(***);
+   *** get*();
+}
+
+# We want to keep methods in Activity that could be used in the XML attribute onClick
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version.  We know about them, and they are safe.
+-dontwarn android.support.**
+
+-dontwarn IceInternal.Instance$Timer*
+-dontwarn java.nio.channels.*
+-dontwarn java.net.StandardSocketOptions
+-dontwarn java.nio.charset.StandardCharsets
+
+-keepnames class ** { *; }
+
+-keep class test.Ice.** {
+    *;
+}
+-keep interface test.Ice.**
+
+# For debugging.
+-keepattributes LocalVariableTable, LocalVariableTypeTable
+-dontoptimize
+-dontobfuscate
\ No newline at end of file
diff --git a/java/demo/android/hello/project.properties b/android/test/android/project.properties
index b7c2081d560..c8d545017a3 100644
--- a/java/demo/android/hello/project.properties
+++ b/android/test/android/project.properties
@@ -9,6 +9,7 @@
 #
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+proguard.config=proguard.cfg
 
 # Project target.
-target=android-10
+target=android-17
diff --git a/java/test/android/AndroidManifest.xml b/android/test/android/src/main/AndroidManifest.xml
index ffd725f90b2..154b6e9a941 100644
--- a/java/test/android/AndroidManifest.xml
+++ b/android/test/android/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <!--
       http://developer.android.com/guide/topics/manifest/uses-sdk-element.html
     -->
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
+    <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="17"/>
     <application android:icon="@raw/icon" android:label="@string/app_name" android:name="TestApp"
         		 android:allowBackup="false">
         <activity android:name=".TestSuite"
diff --git a/java/test/android/src/com/zeroc/testsuite/TestApp.java b/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java
index 811d8060f44..811d8060f44 100644
--- a/java/test/android/src/com/zeroc/testsuite/TestApp.java
+++ b/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java
diff --git a/java/test/android/src/com/zeroc/testsuite/TestContainer.java b/android/test/android/src/main/java/com/zeroc/testsuite/TestContainer.java
index 0c9dacbaf69..0c9dacbaf69 100644
--- a/java/test/android/src/com/zeroc/testsuite/TestContainer.java
+++ b/android/test/android/src/main/java/com/zeroc/testsuite/TestContainer.java
diff --git a/java/test/android/src/com/zeroc/testsuite/TestSuite.java b/android/test/android/src/main/java/com/zeroc/testsuite/TestSuite.java
index 0b0a1178d6f..0b0a1178d6f 100644
--- a/java/test/android/src/com/zeroc/testsuite/TestSuite.java
+++ b/android/test/android/src/main/java/com/zeroc/testsuite/TestSuite.java
diff --git a/java/test/android/res/layout/container.xml b/android/test/android/src/main/res/layout/container.xml
index 91afb966be7..91afb966be7 100644
--- a/java/test/android/res/layout/container.xml
+++ b/android/test/android/src/main/res/layout/container.xml
diff --git a/java/test/android/res/layout/main.xml b/android/test/android/src/main/res/layout/main.xml
index 612802f59b4..3a8a534ecb3 100644
--- a/java/test/android/res/layout/main.xml
+++ b/android/test/android/src/main/res/layout/main.xml
@@ -6,7 +6,7 @@
     android:padding="5dip"
     >
 
-	<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+	<ListView
 	    android:id="@android:id/list"
 	    android:layout_width="fill_parent" 
 	    android:layout_height="0dip"
diff --git a/java/test/android/res/raw/client.bks b/android/test/android/src/main/res/raw/client.bks
index 538d360fac0..538d360fac0 100644
--- a/java/test/android/res/raw/client.bks
+++ b/android/test/android/src/main/res/raw/client.bks
diff --git a/java/test/android/res/raw/icon.png b/android/test/android/src/main/res/raw/icon.png
index 75024841d32..75024841d32 100644
--- a/java/test/android/res/raw/icon.png
+++ b/android/test/android/src/main/res/raw/icon.png
diff --git a/java/test/android/res/raw/server.bks b/android/test/android/src/main/res/raw/server.bks
index 1216ff6f26d..1216ff6f26d 100644
--- a/java/test/android/res/raw/server.bks
+++ b/android/test/android/src/main/res/raw/server.bks
diff --git a/java/test/android/res/values/strings.xml b/android/test/android/src/main/res/values/strings.xml
index 797e31f6429..797e31f6429 100644
--- a/java/test/android/res/values/strings.xml
+++ b/android/test/android/src/main/res/values/strings.xml
diff --git a/android/test/android/testApp.iml b/android/test/android/testApp.iml
new file mode 100644
index 00000000000..829e330b6bc
--- /dev/null
+++ b/android/test/android/testApp.iml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":testApp" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated-src" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="IceTest" level="project" />
+    <orderEntry type="library" exported="" name="Ice" level="project" />
+  </component>
+</module>
+
diff --git a/android/test/build.gradle b/android/test/build.gradle
new file mode 100644
index 00000000000..b5bde9e83fa
--- /dev/null
+++ b/android/test/build.gradle
@@ -0,0 +1,61 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+apply plugin: 'java'
+apply from: "$rootProject.projectDir/../java/gradle/ice.gradle"
+
+ext.testDir = "$rootProject.projectDir/../java/test/src/main/java/test"
+apply from: "$rootProject.projectDir/../java/test/slice.gradle"
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
+sourceSets {
+    main {
+        java {
+            srcDir "$rootProject.projectDir/../java/test/src/main/java"
+            exclude 'Ice/translator'
+            exclude 'Slice/generation'
+			exclude '**/lambda'
+            exclude 'ejb'
+            exclude '**/Freeze'
+            exclude '**/Glacier2'
+            exclude '**/IceBox'
+            exclude '**/IceDiscovery'
+            exclude '**/IceGrid'
+            exclude '**/Slice'
+            exclude '**/IceSSL'
+            exclude '**/Ice/faultTolerance'
+            exclude '**/Ice/hash'
+            exclude '**/Ice/metrics'
+            exclude '**/Ice/plugin'
+            exclude '**/Ice/properties'
+            exclude '**/Ice/threadPoolPriority'
+            exclude '**/Ice/throughput'
+        }
+    }
+}
+
+idea.module {
+    excludeDirs -= file(buildDir)
+    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
+}
+
+dependencies {
+    compile project(':Ice')
+}
+
+jar {
+    archiveName = "IceTest.jar"
+    destinationDir = new File("$rootProject.projectDir/lib/")
+}
+
+clean {
+    delete("$rootProject.projectDir/lib/IceTest.jar")
+}
diff --git a/android/test/test.iml b/android/test/test.iml
new file mode 100644
index 00000000000..ee8c862c3ce
--- /dev/null
+++ b/android/test/test.iml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":test" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../java/test/src/main/java">
+      <sourceFolder url="file://$MODULE_DIR$/../../java/test/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+  </component>
+</module>
+
diff --git a/java/.idea/modules.xml b/java/.idea/modules.xml
index 7f95f1b2e70..e325d960a82 100644
--- a/java/.idea/modules.xml
+++ b/java/.idea/modules.xml
@@ -2,6 +2,16 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/src/Freeze/Freeze.iml" filepath="$PROJECT_DIR$/src/Freeze/Freeze.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/Glacier2/Glacier2.iml" filepath="$PROJECT_DIR$/src/Glacier2/Glacier2.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/Ice/Ice.iml" filepath="$PROJECT_DIR$/src/Ice/Ice.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/IceBox/IceBox.iml" filepath="$PROJECT_DIR$/src/IceBox/IceBox.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/IceDiscovery/IceDiscovery.iml" filepath="$PROJECT_DIR$/src/IceDiscovery/IceDiscovery.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/IceGrid/IceGrid.iml" filepath="$PROJECT_DIR$/src/IceGrid/IceGrid.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/IceGridGUI/IceGridGUI.iml" filepath="$PROJECT_DIR$/src/IceGridGUI/IceGridGUI.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/IcePatch2/IcePatch2.iml" filepath="$PROJECT_DIR$/src/IcePatch2/IcePatch2.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/IceStorm/IceStorm.iml" filepath="$PROJECT_DIR$/src/IceStorm/IceStorm.iml" />
+      <module fileurl="file://$PROJECT_DIR$/src/ant/ant.iml" filepath="$PROJECT_DIR$/src/ant/ant.iml" />
       <module fileurl="file://$PROJECT_DIR$/buildSrc/buildSrc.iml" filepath="$PROJECT_DIR$/buildSrc/buildSrc.iml" />
       <module fileurl="file://$PROJECT_DIR$/demo/Database/library/demo_Database_library.iml" filepath="$PROJECT_DIR$/demo/Database/library/demo_Database_library.iml" />
       <module fileurl="file://$PROJECT_DIR$/demo/Freeze/bench/demo_Freeze_bench.iml" filepath="$PROJECT_DIR$/demo/Freeze/bench/demo_Freeze_bench.iml" />
diff --git a/java/.settings/org.eclipse.jdt.core.prefs b/java/.settings/org.eclipse.jdt.core.prefs
index 70bace9fcb0..60617a4080a 100644
--- a/java/.settings/org.eclipse.jdt.core.prefs
+++ b/java/.settings/org.eclipse.jdt.core.prefs
@@ -5,7 +5,16 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -14,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -87,6 +97,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
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__":
diff --git a/java/build.gradle b/java/build.gradle
index 642abef4c23..6f7d578fc58 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -34,7 +34,7 @@ apply from: "$rootProject.projectDir/demo/IceGrid/build.gradle"
 apply from: "$rootProject.projectDir/demo/book/build.gradle"
 
 //
-// Used to build the gradle wrapper to automatically download and install 
+// Used to build the gradle wrapper to automatically download and install
 // the version of gradle needed to build Ice.
 //
 //task wrapper(type: Wrapper) {
diff --git a/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/SlicePlugin.groovy b/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/SlicePlugin.groovy
index 2a2c0aee6c8..43a760bcb5d 100644
--- a/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/SlicePlugin.groovy
+++ b/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/SlicePlugin.groovy
@@ -12,22 +12,45 @@ package com.zeroc.gradle.plugins.slice;
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.UnknownTaskException
 
 class SlicePlugin implements Plugin<Project> {
 	void apply(Project project) {
-		project.task('generateSliceTask', type: SliceTask) {
-			group = "Slice"
-		}
+        project.task('generateSliceTask', type: SliceTask) {
+                group = "Slice"
+        }
 
         // Create and install the extension object.
         project.extensions.create("slice", SliceExtension, project.container(Java))
 
         project.extensions.slice.extensions.create("freezej", FreezejExtension,
-        	 project.container(Dict), project.container(Index))
+             project.container(Dict), project.container(Index))
 
         project.slice.output = project.file("${project.buildDir}/generated-src")
 
-        project.getTasks().getByName("compileJava").dependsOn('generateSliceTask');
-        project.sourceSets.main.java.srcDir project.slice.output
+        try {
+                project.getTasks().getByName("compileJava").dependsOn('generateSliceTask');
+                project.sourceSets.main.java.srcDir project.slice.output
+        } catch(UnknownTaskException ex)  {
+            // Using an exception to add android support isn't very nice
+            // but I couldn't find another way to find out whether a task
+            // exists.
+            //
+            // Android support.
+            //
+            // WORKAROUND
+            //
+            // This is a horrible hack, but necessary to work with the android plugin.
+            // The problem is that the compileDebugJava task isn't available at this point,
+            // and using project.getGradle().projectsEvaluated({ to add the dependency on the
+            // compileDebugJava/compileReleaseJava task doesn't work in android studio as of
+            // 0.8.9.
+            try {
+                project.getTasks().getByName("preBuild").dependsOn('generateSliceTask');
+                // This doesn't work either.
+                //project.sourceSets.main.java.srcDir project.slice.output
+            } catch(UnknownTaskException ex2)  {
+            }
+        }
 	}
 }
diff --git a/java/demo/Database/library/build.gradle b/java/demo/Database/library/build.gradle
index d132ef1de4f..6ed199b97ca 100644
--- a/java/demo/Database/library/build.gradle
+++ b/java/demo/Database/library/build.gradle
@@ -28,8 +28,8 @@ jar.enabled = false
 
 if (distJarDir == null) {
 	dependencies {
-		compile project(':src/Ice')
-		compile project(':src/Glacier2')
+		compile project(':Ice')
+		compile project(':Glacier2')
 	}
 } else {
 	dependencies {
diff --git a/java/demo/Database/library/demo_Database_library.iml b/java/demo/Database/library/demo_Database_library.iml
index 5d55e1b1264..71531cd00d4 100644
--- a/java/demo/Database/library/demo_Database_library.iml
+++ b/java/demo/Database/library/demo_Database_library.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Glacier2" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Glacier2" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Freeze/bench/build.gradle b/java/demo/Freeze/bench/build.gradle
index a42208f3de7..9c89fbcad5f 100644
--- a/java/demo/Freeze/bench/build.gradle
+++ b/java/demo/Freeze/bench/build.gradle
@@ -85,8 +85,8 @@ jar.enabled = false
 
 if (distJarDir == null) {
 	dependencies {
-		compile project(':src/Ice')
-		compile project(':src/Freeze')
+		compile project(':Ice')
+		compile project(':Freeze')
 	}
 } else {
 	dependencies {
diff --git a/java/demo/Freeze/bench/demo_Freeze_bench.iml b/java/demo/Freeze/bench/demo_Freeze_bench.iml
index a7138566392..a281b56a23b 100644
--- a/java/demo/Freeze/bench/demo_Freeze_bench.iml
+++ b/java/demo/Freeze/bench/demo_Freeze_bench.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Freeze" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Freeze" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Freeze/casino/build.gradle b/java/demo/Freeze/casino/build.gradle
index 6a317fdf965..7d5b85d6e16 100644
--- a/java/demo/Freeze/casino/build.gradle
+++ b/java/demo/Freeze/casino/build.gradle
@@ -25,8 +25,8 @@ sourceSets {
 
 if (distJarDir == null) {
 	dependencies {
-		compile project(':src/Ice')
-		compile project(':src/Freeze')
+		compile project(':Ice')
+		compile project(':Freeze')
 	}
 } else {
 	dependencies {
diff --git a/java/demo/Freeze/casino/demo_Freeze_casino.iml b/java/demo/Freeze/casino/demo_Freeze_casino.iml
index 0c35a13dfd6..2c984dfa420 100644
--- a/java/demo/Freeze/casino/demo_Freeze_casino.iml
+++ b/java/demo/Freeze/casino/demo_Freeze_casino.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Freeze" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Freeze" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Freeze/library/build.gradle b/java/demo/Freeze/library/build.gradle
index e81589dbdd8..6aef1e24bb8 100644
--- a/java/demo/Freeze/library/build.gradle
+++ b/java/demo/Freeze/library/build.gradle
@@ -37,8 +37,8 @@ sourceSets {
 
 if (distJarDir == null) {
 	dependencies {
-		compile project(':src/Ice')
-		compile project(':src/Freeze')
+		compile project(':Ice')
+		compile project(':Freeze')
 	}
 } else {
 	dependencies {
diff --git a/java/demo/Freeze/library/demo_Freeze_library.iml b/java/demo/Freeze/library/demo_Freeze_library.iml
index 0c35a13dfd6..2c984dfa420 100644
--- a/java/demo/Freeze/library/demo_Freeze_library.iml
+++ b/java/demo/Freeze/library/demo_Freeze_library.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Freeze" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Freeze" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Freeze/phonebook/build.gradle b/java/demo/Freeze/phonebook/build.gradle
index 8ce140a4e87..516eecf17af 100644
--- a/java/demo/Freeze/phonebook/build.gradle
+++ b/java/demo/Freeze/phonebook/build.gradle
@@ -38,8 +38,8 @@ sourceSets {
 
 if (distJarDir == null) {
 	dependencies {
-		compile project(':src/Ice')
-		compile project(':src/Freeze')
+		compile project(':Ice')
+		compile project(':Freeze')
 	}
 } else {
 	dependencies {
diff --git a/java/demo/Freeze/phonebook/demo_Freeze_phonebook.iml b/java/demo/Freeze/phonebook/demo_Freeze_phonebook.iml
index 97fcb33e05b..7b4ceef2a5d 100644
--- a/java/demo/Freeze/phonebook/demo_Freeze_phonebook.iml
+++ b/java/demo/Freeze/phonebook/demo_Freeze_phonebook.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Freeze" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Freeze" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Freeze/transform/build.gradle b/java/demo/Freeze/transform/build.gradle
index 6a7bf419828..23d2f45ea22 100644
--- a/java/demo/Freeze/transform/build.gradle
+++ b/java/demo/Freeze/transform/build.gradle
@@ -46,8 +46,8 @@ sourceSets {
 
 if (distJarDir == null) {
 	dependencies {
-		compile project(':src/Ice')
-		compile project(':src/Freeze')
+		compile project(':Ice')
+		compile project(':Freeze')
 	}
 } else {
 	dependencies {
diff --git a/java/demo/Freeze/transform/demo_Freeze_transform.iml b/java/demo/Freeze/transform/demo_Freeze_transform.iml
index 36977a664dd..e32f5e3b556 100644
--- a/java/demo/Freeze/transform/demo_Freeze_transform.iml
+++ b/java/demo/Freeze/transform/demo_Freeze_transform.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Freeze" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Freeze" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Glacier2/build.gradle b/java/demo/Glacier2/build.gradle
index 0e5fff5e1a3..3f99d2a3bfc 100644
--- a/java/demo/Glacier2/build.gradle
+++ b/java/demo/Glacier2/build.gradle
@@ -28,8 +28,8 @@
 
 		if (distJarDir == null) {
 			dependencies {
-				compile project(':src/Ice')
-				compile project(':src/Glacier2')
+				compile project(':Ice')
+				compile project(':Glacier2')
 			}
 		} else {
 			dependencies {
diff --git a/java/demo/Glacier2/callback/demo_Glacier2_callback.iml b/java/demo/Glacier2/callback/demo_Glacier2_callback.iml
index 5d55e1b1264..71531cd00d4 100644
--- a/java/demo/Glacier2/callback/demo_Glacier2_callback.iml
+++ b/java/demo/Glacier2/callback/demo_Glacier2_callback.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Glacier2" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Glacier2" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Glacier2/chat/demo_Glacier2_chat.iml b/java/demo/Glacier2/chat/demo_Glacier2_chat.iml
index 04a47651434..7601ab48bbe 100644
--- a/java/demo/Glacier2/chat/demo_Glacier2_chat.iml
+++ b/java/demo/Glacier2/chat/demo_Glacier2_chat.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Glacier2" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Glacier2" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Glacier2/voip/demo_Glacier2_voip.iml b/java/demo/Glacier2/voip/demo_Glacier2_voip.iml
index 89463e0c11e..a56c9b28d63 100644
--- a/java/demo/Glacier2/voip/demo_Glacier2_voip.iml
+++ b/java/demo/Glacier2/voip/demo_Glacier2_voip.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Glacier2" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Glacier2" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/applet/demo_Ice_applet.iml b/java/demo/Ice/applet/demo_Ice_applet.iml
index c796653f616..6891f1c161b 100644
--- a/java/demo/Ice/applet/demo_Ice_applet.iml
+++ b/java/demo/Ice/applet/demo_Ice_applet.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/async/demo_Ice_async.iml b/java/demo/Ice/async/demo_Ice_async.iml
index 991ecf32f02..74998b470d1 100644
--- a/java/demo/Ice/async/demo_Ice_async.iml
+++ b/java/demo/Ice/async/demo_Ice_async.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/bidir/demo_Ice_bidir.iml b/java/demo/Ice/bidir/demo_Ice_bidir.iml
index c796653f616..6891f1c161b 100644
--- a/java/demo/Ice/bidir/demo_Ice_bidir.iml
+++ b/java/demo/Ice/bidir/demo_Ice_bidir.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/build.gradle b/java/demo/Ice/build.gradle
index 866fecea69f..d36f2ebbe27 100644
--- a/java/demo/Ice/build.gradle
+++ b/java/demo/Ice/build.gradle
@@ -31,7 +31,7 @@
 
 		if (distJarDir == null) {
 			dependencies {
-				compile project(':src/Ice')
+				compile project(':Ice')
 			}
 		} else {
 			dependencies {
diff --git a/java/demo/Ice/callback/demo_Ice_callback.iml b/java/demo/Ice/callback/demo_Ice_callback.iml
index 099a2459f78..b6dce281ba2 100644
--- a/java/demo/Ice/callback/demo_Ice_callback.iml
+++ b/java/demo/Ice/callback/demo_Ice_callback.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/context/demo_Ice_context.iml b/java/demo/Ice/context/demo_Ice_context.iml
index 991ecf32f02..74998b470d1 100644
--- a/java/demo/Ice/context/demo_Ice_context.iml
+++ b/java/demo/Ice/context/demo_Ice_context.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/hello/demo_Ice_hello.iml b/java/demo/Ice/hello/demo_Ice_hello.iml
index 6699bfc35e1..0ccc1ded761 100644
--- a/java/demo/Ice/hello/demo_Ice_hello.iml
+++ b/java/demo/Ice/hello/demo_Ice_hello.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/interrupt/demo_Ice_interrupt.iml b/java/demo/Ice/interrupt/demo_Ice_interrupt.iml
index c796653f616..6891f1c161b 100644
--- a/java/demo/Ice/interrupt/demo_Ice_interrupt.iml
+++ b/java/demo/Ice/interrupt/demo_Ice_interrupt.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/invoke/demo_Ice_invoke.iml b/java/demo/Ice/invoke/demo_Ice_invoke.iml
index 6699bfc35e1..0ccc1ded761 100644
--- a/java/demo/Ice/invoke/demo_Ice_invoke.iml
+++ b/java/demo/Ice/invoke/demo_Ice_invoke.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/latency/demo_Ice_latency.iml b/java/demo/Ice/latency/demo_Ice_latency.iml
index 8a8ab37b470..62526e8b31d 100644
--- a/java/demo/Ice/latency/demo_Ice_latency.iml
+++ b/java/demo/Ice/latency/demo_Ice_latency.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/minimal/demo_Ice_minimal.iml b/java/demo/Ice/minimal/demo_Ice_minimal.iml
index 099a2459f78..b6dce281ba2 100644
--- a/java/demo/Ice/minimal/demo_Ice_minimal.iml
+++ b/java/demo/Ice/minimal/demo_Ice_minimal.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/multicast/demo_Ice_multicast.iml b/java/demo/Ice/multicast/demo_Ice_multicast.iml
index 099a2459f78..b6dce281ba2 100644
--- a/java/demo/Ice/multicast/demo_Ice_multicast.iml
+++ b/java/demo/Ice/multicast/demo_Ice_multicast.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/nested/demo_Ice_nested.iml b/java/demo/Ice/nested/demo_Ice_nested.iml
index 3106b404a90..5e03c3e6c62 100644
--- a/java/demo/Ice/nested/demo_Ice_nested.iml
+++ b/java/demo/Ice/nested/demo_Ice_nested.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/optional/demo_Ice_optional.iml b/java/demo/Ice/optional/demo_Ice_optional.iml
index 8a8ab37b470..62526e8b31d 100644
--- a/java/demo/Ice/optional/demo_Ice_optional.iml
+++ b/java/demo/Ice/optional/demo_Ice_optional.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/plugin/demo_Ice_plugin.iml b/java/demo/Ice/plugin/demo_Ice_plugin.iml
index 8a8ab37b470..62526e8b31d 100644
--- a/java/demo/Ice/plugin/demo_Ice_plugin.iml
+++ b/java/demo/Ice/plugin/demo_Ice_plugin.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/properties/demo_Ice_properties.iml b/java/demo/Ice/properties/demo_Ice_properties.iml
index 099a2459f78..b6dce281ba2 100644
--- a/java/demo/Ice/properties/demo_Ice_properties.iml
+++ b/java/demo/Ice/properties/demo_Ice_properties.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/serialize/demo_Ice_serialize.iml b/java/demo/Ice/serialize/demo_Ice_serialize.iml
index 3106b404a90..5e03c3e6c62 100644
--- a/java/demo/Ice/serialize/demo_Ice_serialize.iml
+++ b/java/demo/Ice/serialize/demo_Ice_serialize.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/session/demo_Ice_session.iml b/java/demo/Ice/session/demo_Ice_session.iml
index 991ecf32f02..74998b470d1 100644
--- a/java/demo/Ice/session/demo_Ice_session.iml
+++ b/java/demo/Ice/session/demo_Ice_session.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/swing/demo_Ice_swing.iml b/java/demo/Ice/swing/demo_Ice_swing.iml
index 8a8ab37b470..62526e8b31d 100644
--- a/java/demo/Ice/swing/demo_Ice_swing.iml
+++ b/java/demo/Ice/swing/demo_Ice_swing.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/throughput/demo_Ice_throughput.iml b/java/demo/Ice/throughput/demo_Ice_throughput.iml
index 8a8ab37b470..62526e8b31d 100644
--- a/java/demo/Ice/throughput/demo_Ice_throughput.iml
+++ b/java/demo/Ice/throughput/demo_Ice_throughput.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/Ice/value/demo_Ice_value.iml b/java/demo/Ice/value/demo_Ice_value.iml
index 3106b404a90..5e03c3e6c62 100644
--- a/java/demo/Ice/value/demo_Ice_value.iml
+++ b/java/demo/Ice/value/demo_Ice_value.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/IceBox/build.gradle b/java/demo/IceBox/build.gradle
index 165c448ad88..c19786d69ed 100644
--- a/java/demo/IceBox/build.gradle
+++ b/java/demo/IceBox/build.gradle
@@ -19,8 +19,8 @@
 
 		if (distJarDir == null) {
 			dependencies {
-				compile project(':src/Ice')
-				compile project(':src/IceBox')
+				compile project(':Ice')
+				compile project(':IceBox')
 			}
 		} else {
 			dependencies {
diff --git a/java/demo/IceBox/hello/demo_IceBox_hello.iml b/java/demo/IceBox/hello/demo_IceBox_hello.iml
index cb647765a25..f5c7d5459b7 100644
--- a/java/demo/IceBox/hello/demo_IceBox_hello.iml
+++ b/java/demo/IceBox/hello/demo_IceBox_hello.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_IceBox" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="IceBox" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/IceDiscovery/build.gradle b/java/demo/IceDiscovery/build.gradle
index c8a95d34dc4..5379de35950 100644
--- a/java/demo/IceDiscovery/build.gradle
+++ b/java/demo/IceDiscovery/build.gradle
@@ -19,8 +19,8 @@
 
 		if (distJarDir == null) {
 			dependencies {
-				compile project(':src/Ice')
-				compile project(':src/IceDiscovery')
+				compile project(':Ice')
+				compile project(':IceDiscovery')
 			}
 		} else {
 			dependencies {
diff --git a/java/demo/IceDiscovery/hello/demo_IceDiscovery_hello.iml b/java/demo/IceDiscovery/hello/demo_IceDiscovery_hello.iml
index 1af3b6da6a2..95a68bb04c0 100644
--- a/java/demo/IceDiscovery/hello/demo_IceDiscovery_hello.iml
+++ b/java/demo/IceDiscovery/hello/demo_IceDiscovery_hello.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_IceDiscovery" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="IceDiscovery" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/IceDiscovery/replication/demo_IceDiscovery_replication.iml b/java/demo/IceDiscovery/replication/demo_IceDiscovery_replication.iml
index d347b8cc304..2d2124000dc 100644
--- a/java/demo/IceDiscovery/replication/demo_IceDiscovery_replication.iml
+++ b/java/demo/IceDiscovery/replication/demo_IceDiscovery_replication.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_IceDiscovery" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="IceDiscovery" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/IceGrid/build.gradle b/java/demo/IceGrid/build.gradle
index a5e9e79c682..e92c5f5e5ac 100644
--- a/java/demo/IceGrid/build.gradle
+++ b/java/demo/IceGrid/build.gradle
@@ -19,9 +19,9 @@
 
 		if (distJarDir == null) {
 			dependencies {
-				compile project(':src/Ice')
-				compile project(':src/IceBox')
-				compile project(':src/IceGrid')
+				compile project(':Ice')
+				compile project(':IceBox')
+				compile project(':IceGrid')
 			}
 		} else {
 			dependencies {
diff --git a/java/demo/IceGrid/icebox/demo_IceGrid_icebox.iml b/java/demo/IceGrid/icebox/demo_IceGrid_icebox.iml
index 97eac524115..eae55654a27 100644
--- a/java/demo/IceGrid/icebox/demo_IceGrid_icebox.iml
+++ b/java/demo/IceGrid/icebox/demo_IceGrid_icebox.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,15 +12,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_IceBox" exported="" />
-    <orderEntry type="module" module-name="src_IceGrid" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="IceBox" exported="" />
+    <orderEntry type="module" module-name="IceGrid" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/IceGrid/simple/demo_IceGrid_simple.iml b/java/demo/IceGrid/simple/demo_IceGrid_simple.iml
index d1e6c7f7d86..845a54e50c5 100644
--- a/java/demo/IceGrid/simple/demo_IceGrid_simple.iml
+++ b/java/demo/IceGrid/simple/demo_IceGrid_simple.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,15 +12,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_IceBox" exported="" />
-    <orderEntry type="module" module-name="src_IceGrid" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="IceBox" exported="" />
+    <orderEntry type="module" module-name="IceGrid" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/IceStorm/build.gradle b/java/demo/IceStorm/build.gradle
index 4c3df44b529..eee551563b6 100644
--- a/java/demo/IceStorm/build.gradle
+++ b/java/demo/IceStorm/build.gradle
@@ -19,8 +19,8 @@
 
 		if (distJarDir == null) {
 			dependencies {
-				compile project(':src/Ice')
-				compile project(':src/IceStorm')
+				compile project(':Ice')
+				compile project(':IceStorm')
 			}
 		} else {
 			dependencies {
diff --git a/java/demo/IceStorm/clock/demo_IceStorm_clock.iml b/java/demo/IceStorm/clock/demo_IceStorm_clock.iml
index 30116d29b38..5dc7d385a8f 100644
--- a/java/demo/IceStorm/clock/demo_IceStorm_clock.iml
+++ b/java/demo/IceStorm/clock/demo_IceStorm_clock.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_IceStorm" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="IceStorm" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/android/chat/.gitignore b/java/demo/android/chat/.gitignore
deleted file mode 100644
index 264dd4dfe2f..00000000000
--- a/java/demo/android/chat/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-generated/*
-bin/*
diff --git a/java/demo/android/chat/.settings/com.zeroc.Slice2JavaPlugin.prefs b/java/demo/android/chat/.settings/com.zeroc.Slice2JavaPlugin.prefs
deleted file mode 100644
index 0c6a888f333..00000000000
--- a/java/demo/android/chat/.settings/com.zeroc.Slice2JavaPlugin.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Jan 31 23:00:39 CET 2012
-eclipse.preferences.version=1
-iceIncludes=true
-includes=slice
-jars=Ice.jar;Glacier2.jar
-tie=true
diff --git a/java/demo/android/chat/.settings/org.eclipse.jdt.core.prefs b/java/demo/android/chat/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 99368a6726b..00000000000
--- a/java/demo/android/chat/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,258 +0,0 @@
-#Mon Dec 08 10:55:23 NST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=21
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/java/demo/android/chat/.settings/org.eclipse.jdt.ui.prefs b/java/demo/android/chat/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 105531e5df9..00000000000
--- a/java/demo/android/chat/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Nov 07 11:00:57 NST 2008
-eclipse.preferences.version=1
-formatter_profile=_ZeroC
-formatter_settings_version=11
diff --git a/java/demo/android/chat/gen/com/zeroc/chat/BuildConfig.java b/java/demo/android/chat/gen/com/zeroc/chat/BuildConfig.java
deleted file mode 100644
index 9b48653a649..00000000000
--- a/java/demo/android/chat/gen/com/zeroc/chat/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package com.zeroc.chat;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/java/demo/android/chat/gen/com/zeroc/chat/R.java b/java/demo/android/chat/gen/com/zeroc/chat/R.java
deleted file mode 100644
index f405f5050cc..00000000000
--- a/java/demo/android/chat/gen/com/zeroc/chat/R.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.zeroc.chat;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-        public static final int stat_notify=0x7f020001;
-    }
-    public static final class id {
-        public static final int hostname=0x7f060002;
-        public static final int list=0x7f060000;
-        public static final int login=0x7f060006;
-        public static final int password=0x7f060004;
-        public static final int secure=0x7f060005;
-        public static final int text=0x7f060001;
-        public static final int username=0x7f060003;
-    }
-    public static final class layout {
-        public static final int chat=0x7f030000;
-        public static final int login=0x7f030001;
-        public static final int main=0x7f030002;
-        public static final int user=0x7f030003;
-    }
-    public static final class raw {
-        public static final int client=0x7f040000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f050001;
-        public static final int hello=0x7f050000;
-        public static final int menu_logout=0x7f050004;
-        public static final int menu_users=0x7f050003;
-        public static final int users_name=0x7f050002;
-    }
-}
diff --git a/java/demo/android/hello/.gitignore b/java/demo/android/hello/.gitignore
deleted file mode 100644
index 264dd4dfe2f..00000000000
--- a/java/demo/android/hello/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-generated/*
-bin/*
diff --git a/java/demo/android/hello/.settings/com.zeroc.Slice2JavaPlugin.prefs b/java/demo/android/hello/.settings/com.zeroc.Slice2JavaPlugin.prefs
deleted file mode 100644
index cedd679aad3..00000000000
--- a/java/demo/android/hello/.settings/com.zeroc.Slice2JavaPlugin.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Dec 18 13:31:38 NST 2008
-eclipse.preferences.version=1
-jars=
diff --git a/java/demo/android/hello/.settings/org.eclipse.jdt.core.prefs b/java/demo/android/hello/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cbdf72437c9..00000000000
--- a/java/demo/android/hello/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,261 +0,0 @@
-#Mon Dec 08 10:55:23 NST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=21
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/java/demo/android/hello/.settings/org.eclipse.jdt.ui.prefs b/java/demo/android/hello/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index a8c1409f4c5..00000000000
--- a/java/demo/android/hello/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed Oct 29 12:19:00 NDT 2008
-eclipse.preferences.version=1
-formatter_profile=_ZeroC
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">// **********************************************************************\n//\n// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\n//\n// This copy of Ice is licensed to you under the terms described in the\n// ICE_LICENSE file included in this distribution.\n//\n// **********************************************************************</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/java/demo/android/hello/gen/com/zeroc/hello/BuildConfig.java b/java/demo/android/hello/gen/com/zeroc/hello/BuildConfig.java
deleted file mode 100644
index 492b4921bba..00000000000
--- a/java/demo/android/hello/gen/com/zeroc/hello/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package com.zeroc.hello;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/java/demo/android/hello/gen/com/zeroc/hello/R.java b/java/demo/android/hello/gen/com/zeroc/hello/R.java
deleted file mode 100644
index 964369ace61..00000000000
--- a/java/demo/android/hello/gen/com/zeroc/hello/R.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.zeroc.hello;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-    }
-    public static final class id {
-        public static final int activity=0x7f060009;
-        public static final int delay=0x7f060004;
-        public static final int delayView=0x7f060005;
-        public static final int flush=0x7f060008;
-        public static final int hostname=0x7f060000;
-        public static final int mode=0x7f060001;
-        public static final int sayHello=0x7f060006;
-        public static final int shutdown=0x7f060007;
-        public static final int status=0x7f06000a;
-        public static final int timeout=0x7f060002;
-        public static final int timeoutView=0x7f060003;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class raw {
-        public static final int client=0x7f040000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f050001;
-        public static final int hello=0x7f050000;
-    }
-}
diff --git a/java/demo/android/library/.gitignore b/java/demo/android/library/.gitignore
deleted file mode 100644
index 264dd4dfe2f..00000000000
--- a/java/demo/android/library/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-generated/*
-bin/*
diff --git a/java/demo/android/library/.settings/com.zeroc.Slice2JavaPlugin.prefs b/java/demo/android/library/.settings/com.zeroc.Slice2JavaPlugin.prefs
deleted file mode 100644
index aba5e84f30d..00000000000
--- a/java/demo/android/library/.settings/com.zeroc.Slice2JavaPlugin.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Jan 31 22:56:19 CET 2012
-eclipse.preferences.version=1
-iceIncludes=true
-jars=Ice.jar;Glacier2.jar
diff --git a/java/demo/android/library/.settings/org.eclipse.jdt.core.prefs b/java/demo/android/library/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 99368a6726b..00000000000
--- a/java/demo/android/library/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,258 +0,0 @@
-#Mon Dec 08 10:55:23 NST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=21
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/java/demo/android/library/.settings/org.eclipse.jdt.ui.prefs b/java/demo/android/library/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 015d86b1892..00000000000
--- a/java/demo/android/library/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Nov 12 16:43:05 NST 2008
-eclipse.preferences.version=1
-formatter_profile=_ZeroC
-formatter_settings_version=11
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/java/demo/android/library/gen/com/zeroc/library/BuildConfig.java b/java/demo/android/library/gen/com/zeroc/library/BuildConfig.java
deleted file mode 100644
index 463af063ded..00000000000
--- a/java/demo/android/library/gen/com/zeroc/library/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package com.zeroc.library;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/java/demo/android/library/gen/com/zeroc/library/R.java b/java/demo/android/library/gen/com/zeroc/library/R.java
deleted file mode 100644
index e2c8567cfa1..00000000000
--- a/java/demo/android/library/gen/com/zeroc/library/R.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.zeroc.library;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-    }
-    public static final class id {
-        public static final int addAuthor=0x7f060005;
-        public static final int author=0x7f060000;
-        public static final int authorsList=0x7f060004;
-        public static final int content=0x7f060014;
-        public static final int delete=0x7f060001;
-        public static final int discardButton=0x7f060007;
-        public static final int glacier2=0x7f06000e;
-        public static final int hostname=0x7f06000d;
-        public static final int isbn=0x7f060002;
-        public static final int list=0x7f06000c;
-        public static final int login=0x7f060010;
-        public static final int no_match=0x7f06000b;
-        public static final int rent=0x7f060013;
-        public static final int rentedBy=0x7f060012;
-        public static final int renter=0x7f060011;
-        public static final int saveButton=0x7f060006;
-        public static final int search=0x7f06000a;
-        public static final int searchType=0x7f060009;
-        public static final int secure=0x7f06000f;
-        public static final int text=0x7f060008;
-        public static final int title=0x7f060003;
-    }
-    public static final class layout {
-        public static final int author=0x7f030000;
-        public static final int authorview=0x7f030001;
-        public static final int edit=0x7f030002;
-        public static final int library=0x7f030003;
-        public static final int login=0x7f030004;
-        public static final int rentername=0x7f030005;
-        public static final int view=0x7f030006;
-        public static final int viewitem=0x7f030007;
-    }
-    public static final class raw {
-        public static final int client=0x7f040000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f050001;
-        public static final int hello=0x7f050000;
-        public static final int menu_add=0x7f050006;
-        public static final int menu_delete=0x7f050005;
-        public static final int menu_discard=0x7f050003;
-        public static final int menu_edit=0x7f050004;
-        public static final int menu_logout=0x7f050007;
-        public static final int menu_save=0x7f050002;
-    }
-}
diff --git a/java/demo/android/library/project.properties b/java/demo/android/library/project.properties
deleted file mode 100644
index b7c2081d560..00000000000
--- a/java/demo/android/library/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-10
diff --git a/java/demo/book/build.gradle b/java/demo/book/build.gradle
index 6654d64998e..d540ad0f19a 100644
--- a/java/demo/book/build.gradle
+++ b/java/demo/book/build.gradle
@@ -28,7 +28,7 @@
 
 		if (distJarDir == null) {
 			dependencies {
-				compile project(':src/Ice')
+				compile project(':Ice')
 			}
 		} else {
 			dependencies {
@@ -39,7 +39,7 @@
 		if(name == "evictor_filesystem") {
 			if (distJarDir == null) {
 				dependencies {
-					compile project(':src/Freeze')
+					compile project(':Freeze')
 				}
 			} else {
 				dependencies {
diff --git a/java/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml b/java/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml
index 36977a664dd..e32f5e3b556 100644
--- a/java/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml
+++ b/java/demo/book/evictor_filesystem/demo_book_evictor_filesystem.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Freeze" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Freeze" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/book/lifecycle/demo_book_lifecycle.iml b/java/demo/book/lifecycle/demo_book_lifecycle.iml
index c796653f616..6891f1c161b 100644
--- a/java/demo/book/lifecycle/demo_book_lifecycle.iml
+++ b/java/demo/book/lifecycle/demo_book_lifecycle.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/book/map_filesystem/build.gradle b/java/demo/book/map_filesystem/build.gradle
index c979dac3b4f..2406cdb70f0 100644
--- a/java/demo/book/map_filesystem/build.gradle
+++ b/java/demo/book/map_filesystem/build.gradle
@@ -47,8 +47,8 @@ jar.enabled = false
 
 if (distJarDir == null) {
 	dependencies {
-		compile project(':src/Ice')
-		compile project(':src/Freeze')
+		compile project(':Ice')
+		compile project(':Freeze')
 	}
 } else {
 	dependencies {
diff --git a/java/demo/book/map_filesystem/demo_book_map_filesystem.iml b/java/demo/book/map_filesystem/demo_book_map_filesystem.iml
index bfd5aabd997..93543e73196 100644
--- a/java/demo/book/map_filesystem/demo_book_map_filesystem.iml
+++ b/java/demo/book/map_filesystem/demo_book_map_filesystem.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,14 +12,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Freeze" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Freeze" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/book/printer/demo_book_printer.iml b/java/demo/book/printer/demo_book_printer.iml
index c796653f616..6891f1c161b 100644
--- a/java/demo/book/printer/demo_book_printer.iml
+++ b/java/demo/book/printer/demo_book_printer.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/demo/book/simple_filesystem/demo_book_simple_filesystem.iml b/java/demo/book/simple_filesystem/demo_book_simple_filesystem.iml
index 6699bfc35e1..0ccc1ded761 100644
--- a/java/demo/book/simple_filesystem/demo_book_simple_filesystem.iml
+++ b/java/demo/book/simple_filesystem/demo_book_simple_filesystem.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output url="file://$MODULE_DIR$/build/classes" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
   </component>
 </module>
 
diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle
index 6538959e686..6032ba69aa1 100644
--- a/java/gradle/ice.gradle
+++ b/java/gradle/ice.gradle
@@ -11,8 +11,12 @@ apply plugin: 'slice'
 
 ext.generatedDir = "$project.buildDir/generated"
 
-compileJava {
-	options.debug = debug
+try {
+	compileJava {
+		options.debug = debug
+	}
+} catch(MissingMethodException ex) {
+	// For Android builds: thrown if compileJava isn't available.
 }
 
 // Determine the name of the Slice-to-Java translator
diff --git a/java/settings.gradle b/java/settings.gradle
index 1032c7134a9..933d2802832 100644
--- a/java/settings.gradle
+++ b/java/settings.gradle
@@ -8,16 +8,28 @@
 // **********************************************************************
 
 // Main source
-include 'src/ant'
-include 'src/Ice'
-include 'src/IceDiscovery'
-include	'src/Freeze'
-include	'src/IceBox'
-include	'src/Glacier2'
-include	'src/IcePatch2'
-include	'src/IceStorm'
-include	'src/IceGrid'
-include	'src/IceGridGUI'
+include ':Ice'
+project(':Ice').projectDir = new File('src/Ice')
+include ':IceDiscovery'
+project(':IceDiscovery').projectDir = new File('src/IceDiscovery')
+include	':Freeze'
+project(':Freeze').projectDir = new File('src/Freeze')
+include	':IceBox'
+project(':IceBox').projectDir = new File('src/IceBox')
+include	':Glacier2'
+project(':Glacier2').projectDir = new File('src/Glacier2')
+include	':IcePatch2'
+project(':IcePatch2').projectDir = new File('src/IcePatch2')
+include	':IceStorm'
+project(':IceStorm').projectDir = new File('src/IceStorm')
+include	':IceGrid'
+project(':IceGrid').projectDir = new File('src/IceGrid')
+include	':IceGridGUI'
+project(':IceGridGUI').projectDir = new File('src/IceGridGUI')
+
+
+include ':ant'
+project(':ant').projectDir = new File('src/ant')
 
 // Tests
 include 'test'
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()
 }
diff --git a/java/test/Freeze/dbmap/db/.gitignore b/java/test/Freeze/dbmap/db/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/java/test/Freeze/dbmap/db/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/java/test/Freeze/evictor/db/DB_CONFIG b/java/test/Freeze/evictor/db/DB_CONFIG
deleted file mode 100644
index b6d05535741..00000000000
--- a/java/test/Freeze/evictor/db/DB_CONFIG
+++ /dev/null
@@ -1,2 +0,0 @@
-set_flags DB_TXN_NOSYNC
-
diff --git a/java/test/Freeze/fileLock/db/.gitignore b/java/test/Freeze/fileLock/db/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/java/test/Freeze/fileLock/db/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/java/test/Ice/binding/run.py b/java/test/Ice/binding/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/binding/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/checksum/run.py b/java/test/Ice/checksum/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/checksum/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/classLoader/run.py b/java/test/Ice/classLoader/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/classLoader/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/facets/run.py b/java/test/Ice/facets/run.py
deleted file mode 100755
index 44aa7d73d00..00000000000
--- a/java/test/Ice/facets/run.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
-TestUtil.collocatedTest()
diff --git a/java/test/Ice/hold/run.py b/java/test/Ice/hold/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/hold/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/info/run.py b/java/test/Ice/info/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/info/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/inheritance/run.py b/java/test/Ice/inheritance/run.py
deleted file mode 100755
index 44aa7d73d00..00000000000
--- a/java/test/Ice/inheritance/run.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
-TestUtil.collocatedTest()
diff --git a/java/test/Ice/location/run.py b/java/test/Ice/location/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/location/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/packagemd/run.py b/java/test/Ice/packagemd/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/packagemd/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/retry/run.py b/java/test/Ice/retry/run.py
deleted file mode 100755
index a40df1a1bcb..00000000000
--- a/java/test/Ice/retry/run.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-print("tests with regular server.")
-TestUtil.clientServerTest()
-print("tests with collocated server.")
-TestUtil.collocatedTest()
diff --git a/java/test/Ice/serialize/run.py b/java/test/Ice/serialize/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/serialize/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/threadPoolPriority/run.py b/java/test/Ice/threadPoolPriority/run.py
deleted file mode 100755
index 3cbc4137c5e..00000000000
--- a/java/test/Ice/threadPoolPriority/run.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-print("tests with regular server.")
-TestUtil.clientServerTest()
diff --git a/java/test/Ice/timeout/run.py b/java/test/Ice/timeout/run.py
deleted file mode 100755
index 33fc2e8f3ac..00000000000
--- a/java/test/Ice/timeout/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# 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.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-TestUtil.clientServerTest()
diff --git a/java/test/IceGrid/simple/db/.gitignore b/java/test/IceGrid/simple/db/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/java/test/IceGrid/simple/db/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/java/test/android/.settings/com.zeroc.Slice2JavaPlugin.prefs b/java/test/android/.settings/com.zeroc.Slice2JavaPlugin.prefs
deleted file mode 100644
index e16f272214d..00000000000
--- a/java/test/android/.settings/com.zeroc.Slice2JavaPlugin.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Dec 17 22:14:32 NST 2008
-eclipse.preferences.version=1
-jars=
diff --git a/java/test/android/.settings/org.eclipse.jdt.core.prefs b/java/test/android/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 10b58d391b6..00000000000
--- a/java/test/android/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,266 +0,0 @@
-#Mon Dec 08 10:55:23 NST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=21
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/java/test/android/.settings/org.eclipse.jdt.ui.prefs b/java/test/android/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 377fe71a31b..00000000000
--- a/java/test/android/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Fri Dec 05 11:14:03 NST 2008
-eclipse.preferences.version=1
-formatter_profile=_ZeroC
-formatter_settings_version=11
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/java/test/android/gen/com/zeroc/testsuite/BuildConfig.java b/java/test/android/gen/com/zeroc/testsuite/BuildConfig.java
deleted file mode 100644
index dd14f6c3ca5..00000000000
--- a/java/test/android/gen/com/zeroc/testsuite/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package com.zeroc.testsuite;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/java/test/android/gen/com/zeroc/testsuite/R.java b/java/test/android/gen/com/zeroc/testsuite/R.java
deleted file mode 100644
index 77ab4d9e567..00000000000
--- a/java/test/android/gen/com/zeroc/testsuite/R.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.zeroc.testsuite;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class id {
-        public static final int ipv6=0x7f050002;
-        public static final int next=0x7f050000;
-        public static final int secure=0x7f050001;
-    }
-    public static final class layout {
-        public static final int container=0x7f020000;
-        public static final int main=0x7f020001;
-    }
-    public static final class raw {
-        public static final int client=0x7f030000;
-        public static final int icon=0x7f030001;
-        public static final int server=0x7f030002;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040000;
-        public static final int ipv6=0x7f040003;
-        public static final int next=0x7f040001;
-        public static final int ssl=0x7f040002;
-    }
-}
diff --git a/java/test/android/project.properties b/java/test/android/project.properties
deleted file mode 100644
index b7c2081d560..00000000000
--- a/java/test/android/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-10
diff --git a/java/test/build.gradle b/java/test/build.gradle
index f306f6c1aa7..366f51f9ed2 100644
--- a/java/test/build.gradle
+++ b/java/test/build.gradle
@@ -7,144 +7,14 @@
 //
 // **********************************************************************
 
-slice {
-    java {
-        set1 {
-            include = ["${sliceDir}"]
-            files = fileTree(dir: ".", includes:['Ice/adapterDeactivation/*.ice',
-                                                 'Ice/ami/*.ice',
-                                                 'Ice/admin/*.ice',
-                                                 'Ice/background/*.ice',
-                                                 'Ice/binding/*.ice',
-                                                 'Ice/classLoader/*.ice',
-                                                 'Ice/custom/*.ice',
-                                                 'Ice/defaultServant/*.ice',
-                                                 'Ice/defaultValue/*.ice',
-                                                 'Ice/dispatcher/*.ice',
-                                                 'Ice/echo/*.ice',
-                                                 'Ice/exceptions/*.ice',
-                                                 'Ice/facets/*.ice',
-                                                 'Ice/faultTolerance/*.ice',
-                                                 'Ice/hash/*.ice',
-                                                 'Ice/hold/*.ice',
-                                                 'Ice/info/*.ice',
-                                                 'Ice/inheritance/*.ice',
-                                                 'Ice/interceptor/*.ice',
-                                                 'Ice/interrupt/*.ice',
-                                                 'Ice/invoke/*.ice',
-                                                 'Ice/location/*.ice',
-                                                 'Ice/metrics/*.ice',
-                                                 'Ice/networkProxy/*.ice',
-                                                 'Ice/proxy/*.ice',
-                                                 'Ice/retry/*.ice',
-                                                 'Ice/seqMapping/*.ice',
-                                                 'Ice/servantLocator/*.ice',
-                                                 'Ice/serialize/*.ice',
-                                                 'Ice/slicing/exceptions/*.ice',
-                                                 'Ice/slicing/objects/*.ice',
-                                                 'Ice/timeout/*.ice',
-                                                 'Ice/acm/*.ice',
-                                                 'Ice/throughput/*.ice',
-                                                 'Ice/threadPoolPriority/*.ice',
-                                                 'Ice/udp/*.ice',
-                                                 'Freeze/complex/*.ice',
-                                                 'Glacier2/router/*.ice',
-                                                 'Glacier2/sessionHelper/*.ice',
-                                                 'IceDiscovery/simple/*.ice',
-                                                 'IceGrid/simple/*.ice',
-                                                 'IceBox/admin/*.ice',
-                                                 'IceBox/configuration/*.ice',
-                                                 'IceSSL/configuration/*.ice',
-                                                 'Slice/keyword/*.ice',
-                                                 'Slice/macros/*.ice',
-                                                 'Slice/structure/*.ice'])
-        }
-        set2 {
-            include = ["${sliceDir}"]
-            args = "--tie"
-            files = fileTree(dir: ".", includes:['Ice/operations/*.ice',
-                                                 'Freeze/evictor/*.ice'])
-        }
-        set3 {
-            include = ["${sliceDir}"]
-            args = "--stream"
-            files = fileTree(dir: ".", includes:['Ice/objects/*.ice',
-                                                 'Ice/optional/*.ice',
-                                                 'Ice/stream/*.ice',
-                                                 'Ice/enums/*.ice'])
-        }
-        set4 {
-            include = ["${sliceDir}"]
-            args = "--checksum test.Ice.checksum.Test.SliceChecksums"
-            files = fileTree(dir: ".", includes:['Ice/checksum/Test.ice',
-                                                 'Ice/checksum/Types.ice'])
-        }
-        set5 {
-            include = ["${sliceDir}", "${projectDir}/Ice/packagemd"]
-            files = fileTree(dir: ".", includes:['Ice/packagemd/*.ice'])
-        }
-        set6 {
-            include = ["${sliceDir}"]
-            args = "--checksum test.Ice.checksum.server.Test.SliceChecksums"
-            files = fileTree(dir: ".", includes:['Ice/checksum/TestServer.ice',
-                                                 'Ice/checksum/TypesServer.ice'])
-        }
-    }
-    freezej {
-        files = [file("Freeze/complex/Complex.ice"),
-                 file("${sliceDir}/Ice/Identity.ice")]
-        include = ["${sliceDir}"]
-        args = "--ice"
-        dict {
-            ComplexDict {
-                javaType = "test.Freeze.complex.Complex.ComplexDict"
-                key = "Complex::Key"
-                value = "Complex::Node"
-            }
-        }
-        dict {
-            ByteIntMap {
-                javaType = "test.Freeze.dbmap.ByteIntMap"
-                key = "byte"
-                value = "int"
-                index = [[:]]
-            }
-        }
-        dict {
-            IntIdentityMap {
-                javaType = "test.Freeze.dbmap.IntIdentityMap"
-                key = "int"
-                value = "Ice::Identity"
-            }
-        }
-        dict {
-            IntIdentityMapWithIndex {
-                javaType = "test.Freeze.dbmap.IntIdentityMapWithIndex"
-                key = "int"
-                value = "Ice::Identity"
-                index = [[ member: 'category']]
-            }
-        }
-        dict {
-            SortedMap {
-                javaType = "test.Freeze.dbmap.SortedMap"
-                key = "int"
-                value = "Ice::Identity"
-                index = [[ member: 'category']]
-            }
-        }
-    }
-}
+ext.testDir = "${projectDir}/src/main/java/test"
+apply from: "slice.gradle"
 
 def hasLambda = org.gradle.internal.jvm.Jvm.current().getJavaVersion().toString().toFloat() >= 1.8f
 
 sourceSets {
     main {
         java {
-            srcDir '.'
-            exclude 'Ice/translator'
-            exclude 'Slice/generation'
-            exclude 'android'
             if (!hasLambda) {
                 exclude '**/lambda'
             }
@@ -160,13 +30,13 @@ idea.module {
 
 if (distJarDir == null) {
     dependencies {
-        compile project(':src/Ice')
-        compile project(':src/Freeze')
-        compile project(':src/IceDiscovery')
-        compile project(':src/IceBox')
-        compile project(':src/Glacier2')
-        compile project(':src/IceStorm')
-        compile project(':src/IceGrid')
+        compile project(':Ice')
+        compile project(':Freeze')
+        compile project(':IceDiscovery')
+        compile project(':IceBox')
+        compile project(':Glacier2')
+        compile project(':IceStorm')
+        compile project(':IceGrid')
     }
 } else {
     println "Using Ice jars installed in ${distJarDir}"
diff --git a/java/test/slice.gradle b/java/test/slice.gradle
new file mode 100644
index 00000000000..d743521c36f
--- /dev/null
+++ b/java/test/slice.gradle
@@ -0,0 +1,139 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+task testSliceTask {
+    slice {
+        java {
+            set1 {
+                include = ["${sliceDir}"]
+                files = fileTree(dir: testDir, includes:['Ice/adapterDeactivation/*.ice',
+                                                     'Ice/ami/*.ice',
+                                                     'Ice/admin/*.ice',
+                                                     'Ice/background/*.ice',
+                                                     'Ice/binding/*.ice',
+                                                     'Ice/classLoader/*.ice',
+                                                     'Ice/custom/*.ice',
+                                                     'Ice/defaultServant/*.ice',
+                                                     'Ice/defaultValue/*.ice',
+                                                     'Ice/dispatcher/*.ice',
+                                                     'Ice/echo/*.ice',
+                                                     'Ice/exceptions/*.ice',
+                                                     'Ice/facets/*.ice',
+                                                     'Ice/faultTolerance/*.ice',
+                                                     'Ice/hash/*.ice',
+                                                     'Ice/hold/*.ice',
+                                                     'Ice/info/*.ice',
+                                                     'Ice/inheritance/*.ice',
+                                                     'Ice/interceptor/*.ice',
+                                                     'Ice/interrupt/*.ice',
+                                                     'Ice/invoke/*.ice',
+                                                     'Ice/location/*.ice',
+                                                     'Ice/metrics/*.ice',
+                                                     'Ice/networkProxy/*.ice',
+                                                     'Ice/proxy/*.ice',
+                                                     'Ice/retry/*.ice',
+                                                     'Ice/seqMapping/*.ice',
+                                                     'Ice/servantLocator/*.ice',
+                                                     'Ice/serialize/*.ice',
+                                                     'Ice/slicing/exceptions/*.ice',
+                                                     'Ice/slicing/objects/*.ice',
+                                                     'Ice/timeout/*.ice',
+                                                     'Ice/acm/*.ice',
+                                                     'Ice/throughput/*.ice',
+                                                     'Ice/threadPoolPriority/*.ice',
+                                                     'Ice/udp/*.ice',
+                                                     'Freeze/complex/*.ice',
+                                                     'Glacier2/router/*.ice',
+                                                     'Glacier2/sessionHelper/*.ice',
+                                                     'IceDiscovery/simple/*.ice',
+                                                     'IceGrid/simple/*.ice',
+                                                     'IceBox/admin/*.ice',
+                                                     'IceBox/configuration/*.ice',
+                                                     'IceSSL/configuration/*.ice',
+                                                     'Slice/keyword/*.ice',
+                                                     'Slice/macros/*.ice',
+                                                     'Slice/structure/*.ice'])
+            }
+            set2 {
+                include = ["${sliceDir}"]
+                args = "--tie"
+                files = fileTree(dir: testDir, includes:['Ice/operations/*.ice',
+                                                     'Freeze/evictor/*.ice'])
+            }
+            set3 {
+                include = ["${sliceDir}"]
+                args = "--stream"
+                files = fileTree(dir: testDir, includes:['Ice/objects/*.ice',
+                                                     'Ice/optional/*.ice',
+                                                     'Ice/stream/*.ice',
+                                                     'Ice/enums/*.ice'])
+            }
+            set4 {
+                include = ["${sliceDir}"]
+                args = "--checksum test.Ice.checksum.Test.SliceChecksums"
+                files = fileTree(dir: testDir, includes:['Ice/checksum/Test.ice',
+                                                     'Ice/checksum/Types.ice'])
+            }
+            set5 {
+                include = ["${sliceDir}", "${testDir}/Ice/packagemd"]
+                files = fileTree(dir: testDir, includes:['Ice/packagemd/*.ice'])
+            }
+            set6 {
+                include = ["${sliceDir}"]
+                args = "--checksum test.Ice.checksum.server.Test.SliceChecksums"
+                files = fileTree(dir: testDir, includes:['Ice/checksum/TestServer.ice',
+                                                     'Ice/checksum/TypesServer.ice'])
+            }
+        }
+        freezej {
+            files = [file("${testDir}/Freeze/complex/Complex.ice"),
+                     file("${sliceDir}/Ice/Identity.ice")]
+            include = ["${sliceDir}"]
+            args = "--ice"
+            dict {
+                ComplexDict {
+                    javaType = "test.Freeze.complex.Complex.ComplexDict"
+                    key = "Complex::Key"
+                    value = "Complex::Node"
+                }
+            }
+            dict {
+                ByteIntMap {
+                    javaType = "test.Freeze.dbmap.ByteIntMap"
+                    key = "byte"
+                    value = "int"
+                    index = [[:]]
+                }
+            }
+            dict {
+                IntIdentityMap {
+                    javaType = "test.Freeze.dbmap.IntIdentityMap"
+                    key = "int"
+                    value = "Ice::Identity"
+                }
+            }
+            dict {
+                IntIdentityMapWithIndex {
+                    javaType = "test.Freeze.dbmap.IntIdentityMapWithIndex"
+                    key = "int"
+                    value = "Ice::Identity"
+                    index = [[ member: 'category']]
+                }
+            }
+            dict {
+                SortedMap {
+                    javaType = "test.Freeze.dbmap.SortedMap"
+                    key = "int"
+                    value = "Ice::Identity"
+                    index = [[ member: 'category']]
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/test/Freeze/complex/.gitignore b/java/test/src/main/java/test/Freeze/complex/.gitignore
index ca51e824975..ca51e824975 100644
--- a/java/test/Freeze/complex/.gitignore
+++ b/java/test/src/main/java/test/Freeze/complex/.gitignore
diff --git a/java/test/Freeze/complex/Client.java b/java/test/src/main/java/test/Freeze/complex/Client.java
index e98b4ebb6fb..e98b4ebb6fb 100644
--- a/java/test/Freeze/complex/Client.java
+++ b/java/test/src/main/java/test/Freeze/complex/Client.java
diff --git a/java/test/Freeze/complex/Complex.ice b/java/test/src/main/java/test/Freeze/complex/Complex.ice
index 1953e7e3caa..1953e7e3caa 100644
--- a/java/test/Freeze/complex/Complex.ice
+++ b/java/test/src/main/java/test/Freeze/complex/Complex.ice
diff --git a/java/test/Freeze/complex/Complex/AddNodeI.java b/java/test/src/main/java/test/Freeze/complex/Complex/AddNodeI.java
index d380923382a..d380923382a 100644
--- a/java/test/Freeze/complex/Complex/AddNodeI.java
+++ b/java/test/src/main/java/test/Freeze/complex/Complex/AddNodeI.java
diff --git a/java/test/Freeze/complex/Complex/MultiplyNodeI.java b/java/test/src/main/java/test/Freeze/complex/Complex/MultiplyNodeI.java
index 67dab5d7b71..67dab5d7b71 100644
--- a/java/test/Freeze/complex/Complex/MultiplyNodeI.java
+++ b/java/test/src/main/java/test/Freeze/complex/Complex/MultiplyNodeI.java
diff --git a/java/test/Freeze/complex/Complex/NumberNodeI.java b/java/test/src/main/java/test/Freeze/complex/Complex/NumberNodeI.java
index 308f59b6170..308f59b6170 100644
--- a/java/test/Freeze/complex/Complex/NumberNodeI.java
+++ b/java/test/src/main/java/test/Freeze/complex/Complex/NumberNodeI.java
diff --git a/java/test/Freeze/complex/Complex/ObjectFactoryI.java b/java/test/src/main/java/test/Freeze/complex/Complex/ObjectFactoryI.java
index 66c92bfbf7b..66c92bfbf7b 100644
--- a/java/test/Freeze/complex/Complex/ObjectFactoryI.java
+++ b/java/test/src/main/java/test/Freeze/complex/Complex/ObjectFactoryI.java
diff --git a/java/test/Freeze/complex/ParseError.java b/java/test/src/main/java/test/Freeze/complex/ParseError.java
index 05b510c7093..05b510c7093 100644
--- a/java/test/Freeze/complex/ParseError.java
+++ b/java/test/src/main/java/test/Freeze/complex/ParseError.java
diff --git a/java/test/Freeze/complex/Parser.java b/java/test/src/main/java/test/Freeze/complex/Parser.java
index 87edceea504..87edceea504 100644
--- a/java/test/Freeze/complex/Parser.java
+++ b/java/test/src/main/java/test/Freeze/complex/Parser.java
diff --git a/java/test/src/main/java/test/Freeze/complex/db/.gitignore b/java/test/src/main/java/test/Freeze/complex/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/java/test/src/main/java/test/Freeze/complex/db/.gitignore
diff --git a/java/test/Freeze/complex/run.py b/java/test/src/main/java/test/Freeze/complex/run.py
index 1b63b3c6e0d..1fdd637162c 100755
--- a/java/test/Freeze/complex/run.py
+++ b/java/test/src/main/java/test/Freeze/complex/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+	 "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Freeze/dbmap/.gitignore b/java/test/src/main/java/test/Freeze/dbmap/.gitignore
index 9c39416c539..9c39416c539 100644
--- a/java/test/Freeze/dbmap/.gitignore
+++ b/java/test/src/main/java/test/Freeze/dbmap/.gitignore
diff --git a/java/test/Freeze/dbmap/Client.java b/java/test/src/main/java/test/Freeze/dbmap/Client.java
index fe6c9a06680..fe6c9a06680 100644
--- a/java/test/Freeze/dbmap/Client.java
+++ b/java/test/src/main/java/test/Freeze/dbmap/Client.java
diff --git a/java/test/src/main/java/test/Freeze/dbmap/db/.gitignore b/java/test/src/main/java/test/Freeze/dbmap/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/java/test/src/main/java/test/Freeze/dbmap/db/.gitignore
diff --git a/java/test/Freeze/dbmap/run.py b/java/test/src/main/java/test/Freeze/dbmap/run.py
index 3f6f310a18e..d2ed1ebbb13 100755
--- a/java/test/Freeze/dbmap/run.py
+++ b/java/test/src/main/java/test/Freeze/dbmap/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Freeze/evictor/.gitignore b/java/test/src/main/java/test/Freeze/evictor/.gitignore
index 9c39416c539..9c39416c539 100644
--- a/java/test/Freeze/evictor/.gitignore
+++ b/java/test/src/main/java/test/Freeze/evictor/.gitignore
diff --git a/java/test/Freeze/evictor/AccountI.java b/java/test/src/main/java/test/Freeze/evictor/AccountI.java
index 55e754e2553..55e754e2553 100644
--- a/java/test/Freeze/evictor/AccountI.java
+++ b/java/test/src/main/java/test/Freeze/evictor/AccountI.java
diff --git a/java/test/Freeze/evictor/Client.java b/java/test/src/main/java/test/Freeze/evictor/Client.java
index a5e649fdf48..a5e649fdf48 100644
--- a/java/test/Freeze/evictor/Client.java
+++ b/java/test/src/main/java/test/Freeze/evictor/Client.java
diff --git a/java/test/Freeze/evictor/FacetI.java b/java/test/src/main/java/test/Freeze/evictor/FacetI.java
index 46017f4d52a..46017f4d52a 100644
--- a/java/test/Freeze/evictor/FacetI.java
+++ b/java/test/src/main/java/test/Freeze/evictor/FacetI.java
diff --git a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
index dcec049d6af..dcec049d6af 100644
--- a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
+++ b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorI.java
index d3667113863..d3667113863 100644
--- a/java/test/Freeze/evictor/RemoteEvictorI.java
+++ b/java/test/src/main/java/test/Freeze/evictor/RemoteEvictorI.java
diff --git a/java/test/Freeze/evictor/ServantI.java b/java/test/src/main/java/test/Freeze/evictor/ServantI.java
index cff361d94e2..cff361d94e2 100644
--- a/java/test/Freeze/evictor/ServantI.java
+++ b/java/test/src/main/java/test/Freeze/evictor/ServantI.java
diff --git a/java/test/Freeze/evictor/Server.java b/java/test/src/main/java/test/Freeze/evictor/Server.java
index e457fdf619e..e457fdf619e 100644
--- a/java/test/Freeze/evictor/Server.java
+++ b/java/test/src/main/java/test/Freeze/evictor/Server.java
diff --git a/java/test/Freeze/evictor/Test.ice b/java/test/src/main/java/test/Freeze/evictor/Test.ice
index c31effe8451..c31effe8451 100644
--- a/java/test/Freeze/evictor/Test.ice
+++ b/java/test/src/main/java/test/Freeze/evictor/Test.ice
diff --git a/java/test/Freeze/evictor/config b/java/test/src/main/java/test/Freeze/evictor/config
index 3fb2a18d86a..3fb2a18d86a 100644
--- a/java/test/Freeze/evictor/config
+++ b/java/test/src/main/java/test/Freeze/evictor/config
diff --git a/java/test/src/main/java/test/Freeze/evictor/db/.gitignore b/java/test/src/main/java/test/Freeze/evictor/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/java/test/src/main/java/test/Freeze/evictor/db/.gitignore
diff --git a/java/test/Freeze/evictor/run.py b/java/test/src/main/java/test/Freeze/evictor/run.py
index e88a97b8412..ee33a5ae7ea 100755
--- a/java/test/Freeze/evictor/run.py
+++ b/java/test/src/main/java/test/Freeze/evictor/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Freeze/fileLock/.gitignore b/java/test/src/main/java/test/Freeze/fileLock/.gitignore
index 9c39416c539..9c39416c539 100644
--- a/java/test/Freeze/fileLock/.gitignore
+++ b/java/test/src/main/java/test/Freeze/fileLock/.gitignore
diff --git a/java/test/Freeze/fileLock/Client.java b/java/test/src/main/java/test/Freeze/fileLock/Client.java
index 8b8fd8c13a2..8b8fd8c13a2 100644
--- a/java/test/Freeze/fileLock/Client.java
+++ b/java/test/src/main/java/test/Freeze/fileLock/Client.java
diff --git a/java/test/Freeze/fileLock/ClientFail.java b/java/test/src/main/java/test/Freeze/fileLock/ClientFail.java
index 2c589a90eb1..2c589a90eb1 100644
--- a/java/test/Freeze/fileLock/ClientFail.java
+++ b/java/test/src/main/java/test/Freeze/fileLock/ClientFail.java
diff --git a/java/test/src/main/java/test/Freeze/fileLock/db/.gitignore b/java/test/src/main/java/test/Freeze/fileLock/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/java/test/src/main/java/test/Freeze/fileLock/db/.gitignore
diff --git a/java/test/Freeze/fileLock/run.py b/java/test/src/main/java/test/Freeze/fileLock/run.py
index 54fd6966dae..8f7217a04e9 100755
--- a/java/test/Freeze/fileLock/run.py
+++ b/java/test/src/main/java/test/Freeze/fileLock/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Glacier2/router/Callback.ice b/java/test/src/main/java/test/Glacier2/router/Callback.ice
index 68a40cb866c..68a40cb866c 100644
--- a/java/test/Glacier2/router/Callback.ice
+++ b/java/test/src/main/java/test/Glacier2/router/Callback.ice
diff --git a/java/test/Glacier2/router/CallbackI.java b/java/test/src/main/java/test/Glacier2/router/CallbackI.java
index e9290aa6b3e..e9290aa6b3e 100644
--- a/java/test/Glacier2/router/CallbackI.java
+++ b/java/test/src/main/java/test/Glacier2/router/CallbackI.java
diff --git a/java/test/Glacier2/router/CallbackReceiverI.java b/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java
index ecf7e1d62b2..ecf7e1d62b2 100644
--- a/java/test/Glacier2/router/CallbackReceiverI.java
+++ b/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java
diff --git a/java/test/Glacier2/router/Client.java b/java/test/src/main/java/test/Glacier2/router/Client.java
index 257e81c12cd..257e81c12cd 100644
--- a/java/test/Glacier2/router/Client.java
+++ b/java/test/src/main/java/test/Glacier2/router/Client.java
diff --git a/java/test/Glacier2/router/Server.java b/java/test/src/main/java/test/Glacier2/router/Server.java
index 78ad7b573ce..78ad7b573ce 100644
--- a/java/test/Glacier2/router/Server.java
+++ b/java/test/src/main/java/test/Glacier2/router/Server.java
diff --git a/java/test/Glacier2/router/passwords b/java/test/src/main/java/test/Glacier2/router/passwords
index a1527dec2b9..a1527dec2b9 100644
--- a/java/test/Glacier2/router/passwords
+++ b/java/test/src/main/java/test/Glacier2/router/passwords
diff --git a/java/test/Glacier2/router/run.py b/java/test/src/main/java/test/Glacier2/router/run.py
index 68f88d7ef33..0fe99c10f25 100755
--- a/java/test/Glacier2/router/run.py
+++ b/java/test/src/main/java/test/Glacier2/router/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Glacier2/sessionHelper/Callback.ice b/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice
index cd37cdb95df..cd37cdb95df 100644
--- a/java/test/Glacier2/sessionHelper/Callback.ice
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice
diff --git a/java/test/Glacier2/sessionHelper/CallbackI.java b/java/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java
index 2cfacf26f5d..2cfacf26f5d 100644
--- a/java/test/Glacier2/sessionHelper/CallbackI.java
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java
diff --git a/java/test/Glacier2/sessionHelper/Client.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java
index f61f84d0051..f61f84d0051 100644
--- a/java/test/Glacier2/sessionHelper/Client.java
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java
diff --git a/java/test/Glacier2/sessionHelper/Server.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java
index d0cfd717a14..d0cfd717a14 100644
--- a/java/test/Glacier2/sessionHelper/Server.java
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java
diff --git a/java/test/Glacier2/sessionHelper/passwords b/java/test/src/main/java/test/Glacier2/sessionHelper/passwords
index a1527dec2b9..a1527dec2b9 100644
--- a/java/test/Glacier2/sessionHelper/passwords
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/passwords
diff --git a/java/test/Glacier2/sessionHelper/run.py b/java/test/src/main/java/test/Glacier2/sessionHelper/run.py
index f6e9c94d370..ddb8006f352 100755
--- a/java/test/Glacier2/sessionHelper/run.py
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/acm/AllTests.java b/java/test/src/main/java/test/Ice/acm/AllTests.java
index a700cdb26b6..a700cdb26b6 100644
--- a/java/test/Ice/acm/AllTests.java
+++ b/java/test/src/main/java/test/Ice/acm/AllTests.java
diff --git a/java/test/Ice/acm/Client.java b/java/test/src/main/java/test/Ice/acm/Client.java
index c6045f9a6ca..c6045f9a6ca 100644
--- a/java/test/Ice/acm/Client.java
+++ b/java/test/src/main/java/test/Ice/acm/Client.java
diff --git a/java/test/Ice/acm/RemoteCommunicatorI.java b/java/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java
index 38cb0fc0384..38cb0fc0384 100644
--- a/java/test/Ice/acm/RemoteCommunicatorI.java
+++ b/java/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java
diff --git a/java/test/Ice/acm/RemoteObjectAdapterI.java b/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java
index f216f0fee69..f216f0fee69 100644
--- a/java/test/Ice/acm/RemoteObjectAdapterI.java
+++ b/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java
diff --git a/java/test/Ice/acm/Server.java b/java/test/src/main/java/test/Ice/acm/Server.java
index e267b9fa498..e267b9fa498 100644
--- a/java/test/Ice/acm/Server.java
+++ b/java/test/src/main/java/test/Ice/acm/Server.java
diff --git a/java/test/Ice/acm/Test.ice b/java/test/src/main/java/test/Ice/acm/Test.ice
index 7a2085083e4..7a2085083e4 100644
--- a/java/test/Ice/acm/Test.ice
+++ b/java/test/src/main/java/test/Ice/acm/Test.ice
diff --git a/java/test/Ice/acm/TestI.java b/java/test/src/main/java/test/Ice/acm/TestI.java
index be2e3a4a58e..be2e3a4a58e 100644
--- a/java/test/Ice/acm/TestI.java
+++ b/java/test/src/main/java/test/Ice/acm/TestI.java
diff --git a/java/test/Ice/acm/run.py b/java/test/src/main/java/test/Ice/acm/run.py
index 519f05d7278..408be7e3127 100755
--- a/java/test/Ice/acm/run.py
+++ b/java/test/src/main/java/test/Ice/acm/run.py
@@ -10,7 +10,8 @@
 
 import os, sys, getopt
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java
index 05cbc8f3d59..05cbc8f3d59 100644
--- a/java/test/Ice/adapterDeactivation/AllTests.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java
diff --git a/java/test/Ice/adapterDeactivation/Client.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java
index d5e66de93b6..d5e66de93b6 100644
--- a/java/test/Ice/adapterDeactivation/Client.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java
diff --git a/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java
index 2ddd551b6ac..2ddd551b6ac 100644
--- a/java/test/Ice/adapterDeactivation/Collocated.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java
diff --git a/java/test/Ice/adapterDeactivation/CookieI.java b/java/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java
index 2d5d990508b..2d5d990508b 100644
--- a/java/test/Ice/adapterDeactivation/CookieI.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java
diff --git a/java/test/Ice/adapterDeactivation/ServantLocatorI.java b/java/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java
index 1856f6bddcd..1856f6bddcd 100644
--- a/java/test/Ice/adapterDeactivation/ServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java
diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java
index 56d9ccd5c6b..56d9ccd5c6b 100644
--- a/java/test/Ice/adapterDeactivation/Server.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java
diff --git a/java/test/Ice/adapterDeactivation/Test.ice b/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice
index 7b1bd988078..7b1bd988078 100644
--- a/java/test/Ice/adapterDeactivation/Test.ice
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice
diff --git a/java/test/Ice/adapterDeactivation/TestI.java b/java/test/src/main/java/test/Ice/adapterDeactivation/TestI.java
index 38ce346f3de..38ce346f3de 100644
--- a/java/test/Ice/adapterDeactivation/TestI.java
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/TestI.java
diff --git a/java/test/Ice/custom/run.py b/java/test/src/main/java/test/Ice/adapterDeactivation/run.py
index 44aa7d73d00..8bb456187d9 100755
--- a/java/test/Ice/custom/run.py
+++ b/java/test/src/main/java/test/Ice/adapterDeactivation/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/admin/AllTests.java b/java/test/src/main/java/test/Ice/admin/AllTests.java
index abc85ce0b86..abc85ce0b86 100644
--- a/java/test/Ice/admin/AllTests.java
+++ b/java/test/src/main/java/test/Ice/admin/AllTests.java
diff --git a/java/test/Ice/admin/Client.java b/java/test/src/main/java/test/Ice/admin/Client.java
index bdd21e20559..bdd21e20559 100644
--- a/java/test/Ice/admin/Client.java
+++ b/java/test/src/main/java/test/Ice/admin/Client.java
diff --git a/java/test/Ice/admin/RemoteCommunicatorFactoryI.java b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java
index 3100081f816..3100081f816 100644
--- a/java/test/Ice/admin/RemoteCommunicatorFactoryI.java
+++ b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java
diff --git a/java/test/Ice/admin/RemoteCommunicatorI.java b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java
index a4137dd3d9d..a4137dd3d9d 100644
--- a/java/test/Ice/admin/RemoteCommunicatorI.java
+++ b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java
diff --git a/java/test/Ice/admin/RemoteLoggerI.java b/java/test/src/main/java/test/Ice/admin/RemoteLoggerI.java
index 8a5a2a8e06e..8a5a2a8e06e 100644
--- a/java/test/Ice/admin/RemoteLoggerI.java
+++ b/java/test/src/main/java/test/Ice/admin/RemoteLoggerI.java
diff --git a/java/test/Ice/admin/Server.java b/java/test/src/main/java/test/Ice/admin/Server.java
index a29e6a6d5a2..a29e6a6d5a2 100644
--- a/java/test/Ice/admin/Server.java
+++ b/java/test/src/main/java/test/Ice/admin/Server.java
diff --git a/java/test/Ice/admin/Test.ice b/java/test/src/main/java/test/Ice/admin/Test.ice
index 608e6068a9b..608e6068a9b 100644
--- a/java/test/Ice/admin/Test.ice
+++ b/java/test/src/main/java/test/Ice/admin/Test.ice
diff --git a/java/test/Ice/admin/TestFacetI.java b/java/test/src/main/java/test/Ice/admin/TestFacetI.java
index a1246dd8ff0..a1246dd8ff0 100644
--- a/java/test/Ice/admin/TestFacetI.java
+++ b/java/test/src/main/java/test/Ice/admin/TestFacetI.java
diff --git a/java/test/Ice/admin/run.py b/java/test/src/main/java/test/Ice/admin/run.py
index 33fc2e8f3ac..d5fe04787c9 100755
--- a/java/test/Ice/admin/run.py
+++ b/java/test/src/main/java/test/Ice/admin/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/ami/AMI.java b/java/test/src/main/java/test/Ice/ami/AMI.java
index 94c9b751401..94c9b751401 100644
--- a/java/test/Ice/ami/AMI.java
+++ b/java/test/src/main/java/test/Ice/ami/AMI.java
diff --git a/java/test/Ice/ami/AllTests.java b/java/test/src/main/java/test/Ice/ami/AllTests.java
index cfb6be791c3..cfb6be791c3 100644
--- a/java/test/Ice/ami/AllTests.java
+++ b/java/test/src/main/java/test/Ice/ami/AllTests.java
diff --git a/java/test/Ice/ami/Client.java b/java/test/src/main/java/test/Ice/ami/Client.java
index 3e547a17ec0..3e547a17ec0 100644
--- a/java/test/Ice/ami/Client.java
+++ b/java/test/src/main/java/test/Ice/ami/Client.java
diff --git a/java/test/Ice/ami/Collocated.java b/java/test/src/main/java/test/Ice/ami/Collocated.java
index 2c77bbd3833..2c77bbd3833 100644
--- a/java/test/Ice/ami/Collocated.java
+++ b/java/test/src/main/java/test/Ice/ami/Collocated.java
diff --git a/java/test/Ice/ami/Server.java b/java/test/src/main/java/test/Ice/ami/Server.java
index b22e052fa06..b22e052fa06 100644
--- a/java/test/Ice/ami/Server.java
+++ b/java/test/src/main/java/test/Ice/ami/Server.java
diff --git a/java/test/Ice/ami/Test.ice b/java/test/src/main/java/test/Ice/ami/Test.ice
index 7d1ddc7f374..7d1ddc7f374 100644
--- a/java/test/Ice/ami/Test.ice
+++ b/java/test/src/main/java/test/Ice/ami/Test.ice
diff --git a/java/test/Ice/ami/TestControllerI.java b/java/test/src/main/java/test/Ice/ami/TestControllerI.java
index 9eebceb7214..9eebceb7214 100644
--- a/java/test/Ice/ami/TestControllerI.java
+++ b/java/test/src/main/java/test/Ice/ami/TestControllerI.java
diff --git a/java/test/Ice/ami/TestI.java b/java/test/src/main/java/test/Ice/ami/TestI.java
index cc4f2a2040d..cc4f2a2040d 100644
--- a/java/test/Ice/ami/TestI.java
+++ b/java/test/src/main/java/test/Ice/ami/TestI.java
diff --git a/java/test/Ice/ami/lambda/AMI.java b/java/test/src/main/java/test/Ice/ami/lambda/AMI.java
index 65bd185a849..65bd185a849 100644
--- a/java/test/Ice/ami/lambda/AMI.java
+++ b/java/test/src/main/java/test/Ice/ami/lambda/AMI.java
diff --git a/java/test/Ice/ami/run.py b/java/test/src/main/java/test/Ice/ami/run.py
index a40df1a1bcb..6444a527f9a 100755
--- a/java/test/Ice/ami/run.py
+++ b/java/test/src/main/java/test/Ice/ami/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/background/Acceptor.java b/java/test/src/main/java/test/Ice/background/Acceptor.java
index 598ff348fb2..598ff348fb2 100644
--- a/java/test/Ice/background/Acceptor.java
+++ b/java/test/src/main/java/test/Ice/background/Acceptor.java
diff --git a/java/test/Ice/background/AllTests.java b/java/test/src/main/java/test/Ice/background/AllTests.java
index ba04e6421b7..ba04e6421b7 100644
--- a/java/test/Ice/background/AllTests.java
+++ b/java/test/src/main/java/test/Ice/background/AllTests.java
diff --git a/java/test/Ice/background/BackgroundControllerI.java b/java/test/src/main/java/test/Ice/background/BackgroundControllerI.java
index fb1a591e193..fb1a591e193 100644
--- a/java/test/Ice/background/BackgroundControllerI.java
+++ b/java/test/src/main/java/test/Ice/background/BackgroundControllerI.java
diff --git a/java/test/Ice/background/BackgroundI.java b/java/test/src/main/java/test/Ice/background/BackgroundI.java
index 57adf958ca5..57adf958ca5 100644
--- a/java/test/Ice/background/BackgroundI.java
+++ b/java/test/src/main/java/test/Ice/background/BackgroundI.java
diff --git a/java/test/Ice/background/Client.java b/java/test/src/main/java/test/Ice/background/Client.java
index 1955472ebab..1955472ebab 100644
--- a/java/test/Ice/background/Client.java
+++ b/java/test/src/main/java/test/Ice/background/Client.java
diff --git a/java/test/Ice/background/Collocated.java b/java/test/src/main/java/test/Ice/background/Collocated.java
index ac3e4622f17..ac3e4622f17 100644
--- a/java/test/Ice/background/Collocated.java
+++ b/java/test/src/main/java/test/Ice/background/Collocated.java
diff --git a/java/test/Ice/background/Configuration.java b/java/test/src/main/java/test/Ice/background/Configuration.java
index befe01738fc..befe01738fc 100644
--- a/java/test/Ice/background/Configuration.java
+++ b/java/test/src/main/java/test/Ice/background/Configuration.java
diff --git a/java/test/Ice/background/Connector.java b/java/test/src/main/java/test/Ice/background/Connector.java
index afc3db49abe..afc3db49abe 100644
--- a/java/test/Ice/background/Connector.java
+++ b/java/test/src/main/java/test/Ice/background/Connector.java
diff --git a/java/test/Ice/background/EndpointFactory.java b/java/test/src/main/java/test/Ice/background/EndpointFactory.java
index 09a8f35290b..09a8f35290b 100644
--- a/java/test/Ice/background/EndpointFactory.java
+++ b/java/test/src/main/java/test/Ice/background/EndpointFactory.java
diff --git a/java/test/Ice/background/EndpointI.java b/java/test/src/main/java/test/Ice/background/EndpointI.java
index bed906911d6..bed906911d6 100644
--- a/java/test/Ice/background/EndpointI.java
+++ b/java/test/src/main/java/test/Ice/background/EndpointI.java
diff --git a/java/test/Ice/background/PluginFactory.java b/java/test/src/main/java/test/Ice/background/PluginFactory.java
index 9edd6c8fa38..9edd6c8fa38 100644
--- a/java/test/Ice/background/PluginFactory.java
+++ b/java/test/src/main/java/test/Ice/background/PluginFactory.java
diff --git a/java/test/Ice/background/Server.java b/java/test/src/main/java/test/Ice/background/Server.java
index 52aaf1f1f49..52aaf1f1f49 100644
--- a/java/test/Ice/background/Server.java
+++ b/java/test/src/main/java/test/Ice/background/Server.java
diff --git a/java/test/Ice/background/Test.ice b/java/test/src/main/java/test/Ice/background/Test.ice
index b612eb4d280..b612eb4d280 100644
--- a/java/test/Ice/background/Test.ice
+++ b/java/test/src/main/java/test/Ice/background/Test.ice
diff --git a/java/test/Ice/background/Transceiver.java b/java/test/src/main/java/test/Ice/background/Transceiver.java
index 738c7ef1f10..738c7ef1f10 100644
--- a/java/test/Ice/background/Transceiver.java
+++ b/java/test/src/main/java/test/Ice/background/Transceiver.java
diff --git a/java/test/Ice/background/run.py b/java/test/src/main/java/test/Ice/background/run.py
index 33fc2e8f3ac..d5fe04787c9 100755
--- a/java/test/Ice/background/run.py
+++ b/java/test/src/main/java/test/Ice/background/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/binding/AllTests.java b/java/test/src/main/java/test/Ice/binding/AllTests.java
index 88aa196b157..88aa196b157 100644
--- a/java/test/Ice/binding/AllTests.java
+++ b/java/test/src/main/java/test/Ice/binding/AllTests.java
diff --git a/java/test/Ice/binding/Client.java b/java/test/src/main/java/test/Ice/binding/Client.java
index 30d087baac3..30d087baac3 100644
--- a/java/test/Ice/binding/Client.java
+++ b/java/test/src/main/java/test/Ice/binding/Client.java
diff --git a/java/test/Ice/binding/RemoteCommunicatorI.java b/java/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java
index fbebb72cd59..fbebb72cd59 100644
--- a/java/test/Ice/binding/RemoteCommunicatorI.java
+++ b/java/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java
diff --git a/java/test/Ice/binding/RemoteObjectAdapterI.java b/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java
index a8b22ec5197..a8b22ec5197 100644
--- a/java/test/Ice/binding/RemoteObjectAdapterI.java
+++ b/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java
diff --git a/java/test/Ice/binding/Server.java b/java/test/src/main/java/test/Ice/binding/Server.java
index 9c2926cdc3b..9c2926cdc3b 100644
--- a/java/test/Ice/binding/Server.java
+++ b/java/test/src/main/java/test/Ice/binding/Server.java
diff --git a/java/test/Ice/binding/Test.ice b/java/test/src/main/java/test/Ice/binding/Test.ice
index 9b951c9b6fb..9b951c9b6fb 100644
--- a/java/test/Ice/binding/Test.ice
+++ b/java/test/src/main/java/test/Ice/binding/Test.ice
diff --git a/java/test/Ice/binding/TestI.java b/java/test/src/main/java/test/Ice/binding/TestI.java
index 23a13b96ff8..23a13b96ff8 100644
--- a/java/test/Ice/binding/TestI.java
+++ b/java/test/src/main/java/test/Ice/binding/TestI.java
diff --git a/java/test/src/main/java/test/Ice/binding/run.py b/java/test/src/main/java/test/Ice/binding/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/binding/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/checksum/AllTests.java b/java/test/src/main/java/test/Ice/checksum/AllTests.java
index 3fb2c711746..3fb2c711746 100644
--- a/java/test/Ice/checksum/AllTests.java
+++ b/java/test/src/main/java/test/Ice/checksum/AllTests.java
diff --git a/java/test/Ice/checksum/ChecksumI.java b/java/test/src/main/java/test/Ice/checksum/ChecksumI.java
index a85707f400e..a85707f400e 100644
--- a/java/test/Ice/checksum/ChecksumI.java
+++ b/java/test/src/main/java/test/Ice/checksum/ChecksumI.java
diff --git a/java/test/Ice/checksum/Client.java b/java/test/src/main/java/test/Ice/checksum/Client.java
index 34d4f3ab1b8..34d4f3ab1b8 100644
--- a/java/test/Ice/checksum/Client.java
+++ b/java/test/src/main/java/test/Ice/checksum/Client.java
diff --git a/java/test/Ice/checksum/Server.java b/java/test/src/main/java/test/Ice/checksum/Server.java
index c64042283e4..c64042283e4 100644
--- a/java/test/Ice/checksum/Server.java
+++ b/java/test/src/main/java/test/Ice/checksum/Server.java
diff --git a/java/test/Ice/checksum/Test.ice b/java/test/src/main/java/test/Ice/checksum/Test.ice
index 060d9078201..060d9078201 100644
--- a/java/test/Ice/checksum/Test.ice
+++ b/java/test/src/main/java/test/Ice/checksum/Test.ice
diff --git a/java/test/Ice/checksum/TestServer.ice b/java/test/src/main/java/test/Ice/checksum/TestServer.ice
index 0fef43faabf..0fef43faabf 100644
--- a/java/test/Ice/checksum/TestServer.ice
+++ b/java/test/src/main/java/test/Ice/checksum/TestServer.ice
diff --git a/java/test/Ice/checksum/Types.ice b/java/test/src/main/java/test/Ice/checksum/Types.ice
index 8da301c229a..8da301c229a 100644
--- a/java/test/Ice/checksum/Types.ice
+++ b/java/test/src/main/java/test/Ice/checksum/Types.ice
diff --git a/java/test/Ice/checksum/TypesServer.ice b/java/test/src/main/java/test/Ice/checksum/TypesServer.ice
index 0fd16b143bc..0fd16b143bc 100644
--- a/java/test/Ice/checksum/TypesServer.ice
+++ b/java/test/src/main/java/test/Ice/checksum/TypesServer.ice
diff --git a/java/test/src/main/java/test/Ice/checksum/run.py b/java/test/src/main/java/test/Ice/checksum/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/checksum/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/classLoader/AbstractClassI.java b/java/test/src/main/java/test/Ice/classLoader/AbstractClassI.java
index df7bcf8a4c4..df7bcf8a4c4 100644
--- a/java/test/Ice/classLoader/AbstractClassI.java
+++ b/java/test/src/main/java/test/Ice/classLoader/AbstractClassI.java
diff --git a/java/test/Ice/classLoader/AllTests.java b/java/test/src/main/java/test/Ice/classLoader/AllTests.java
index d0181cff1a6..d0181cff1a6 100644
--- a/java/test/Ice/classLoader/AllTests.java
+++ b/java/test/src/main/java/test/Ice/classLoader/AllTests.java
diff --git a/java/test/Ice/classLoader/CertificateVerifierI.java b/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java
index 3e681297f84..3e681297f84 100644
--- a/java/test/Ice/classLoader/CertificateVerifierI.java
+++ b/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java
diff --git a/java/test/Ice/classLoader/Client.java b/java/test/src/main/java/test/Ice/classLoader/Client.java
index 20152d6b598..20152d6b598 100644
--- a/java/test/Ice/classLoader/Client.java
+++ b/java/test/src/main/java/test/Ice/classLoader/Client.java
diff --git a/java/test/Ice/classLoader/InitialI.java b/java/test/src/main/java/test/Ice/classLoader/InitialI.java
index a8056715aad..a8056715aad 100644
--- a/java/test/Ice/classLoader/InitialI.java
+++ b/java/test/src/main/java/test/Ice/classLoader/InitialI.java
diff --git a/java/test/Ice/classLoader/PasswordCallbackI.java b/java/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java
index e5eba1462dd..e5eba1462dd 100644
--- a/java/test/Ice/classLoader/PasswordCallbackI.java
+++ b/java/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java
diff --git a/java/test/Ice/classLoader/PluginFactoryI.java b/java/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java
index 2416e04c420..2416e04c420 100644
--- a/java/test/Ice/classLoader/PluginFactoryI.java
+++ b/java/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java
diff --git a/java/test/Ice/classLoader/Server.java b/java/test/src/main/java/test/Ice/classLoader/Server.java
index 79abca86364..79abca86364 100644
--- a/java/test/Ice/classLoader/Server.java
+++ b/java/test/src/main/java/test/Ice/classLoader/Server.java
diff --git a/java/test/Ice/classLoader/Test.ice b/java/test/src/main/java/test/Ice/classLoader/Test.ice
index 2df8659720e..2df8659720e 100644
--- a/java/test/Ice/classLoader/Test.ice
+++ b/java/test/src/main/java/test/Ice/classLoader/Test.ice
diff --git a/java/test/src/main/java/test/Ice/classLoader/run.py b/java/test/src/main/java/test/Ice/classLoader/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/classLoader/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/custom/AllTests.java b/java/test/src/main/java/test/Ice/custom/AllTests.java
index be731b43efe..be731b43efe 100644
--- a/java/test/Ice/custom/AllTests.java
+++ b/java/test/src/main/java/test/Ice/custom/AllTests.java
diff --git a/java/test/Ice/custom/Client.java b/java/test/src/main/java/test/Ice/custom/Client.java
index 17ad54b561f..17ad54b561f 100644
--- a/java/test/Ice/custom/Client.java
+++ b/java/test/src/main/java/test/Ice/custom/Client.java
diff --git a/java/test/Ice/custom/Collocated.java b/java/test/src/main/java/test/Ice/custom/Collocated.java
index 2d8fd94f500..2d8fd94f500 100644
--- a/java/test/Ice/custom/Collocated.java
+++ b/java/test/src/main/java/test/Ice/custom/Collocated.java
diff --git a/java/test/Ice/custom/Server.java b/java/test/src/main/java/test/Ice/custom/Server.java
index fe959c086ff..fe959c086ff 100644
--- a/java/test/Ice/custom/Server.java
+++ b/java/test/src/main/java/test/Ice/custom/Server.java
diff --git a/java/test/Ice/custom/Test.ice b/java/test/src/main/java/test/Ice/custom/Test.ice
index 4743eb95492..4743eb95492 100644
--- a/java/test/Ice/custom/Test.ice
+++ b/java/test/src/main/java/test/Ice/custom/Test.ice
diff --git a/java/test/Ice/custom/TestI.java b/java/test/src/main/java/test/Ice/custom/TestI.java
index e384d531ffd..e384d531ffd 100644
--- a/java/test/Ice/custom/TestI.java
+++ b/java/test/src/main/java/test/Ice/custom/TestI.java
diff --git a/java/test/Ice/adapterDeactivation/run.py b/java/test/src/main/java/test/Ice/custom/run.py
index 44aa7d73d00..8bb456187d9 100755
--- a/java/test/Ice/adapterDeactivation/run.py
+++ b/java/test/src/main/java/test/Ice/custom/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/defaultServant/AllTests.java b/java/test/src/main/java/test/Ice/defaultServant/AllTests.java
index 50589050baf..50589050baf 100644
--- a/java/test/Ice/defaultServant/AllTests.java
+++ b/java/test/src/main/java/test/Ice/defaultServant/AllTests.java
diff --git a/java/test/Ice/defaultServant/Client.java b/java/test/src/main/java/test/Ice/defaultServant/Client.java
index 4f9b3be9ec4..4f9b3be9ec4 100644
--- a/java/test/Ice/defaultServant/Client.java
+++ b/java/test/src/main/java/test/Ice/defaultServant/Client.java
diff --git a/java/test/Ice/defaultServant/MyObjectI.java b/java/test/src/main/java/test/Ice/defaultServant/MyObjectI.java
index 64d4548f920..64d4548f920 100644
--- a/java/test/Ice/defaultServant/MyObjectI.java
+++ b/java/test/src/main/java/test/Ice/defaultServant/MyObjectI.java
diff --git a/java/test/Ice/defaultServant/Test.ice b/java/test/src/main/java/test/Ice/defaultServant/Test.ice
index ce986ce32c3..ce986ce32c3 100644
--- a/java/test/Ice/defaultServant/Test.ice
+++ b/java/test/src/main/java/test/Ice/defaultServant/Test.ice
diff --git a/java/test/Ice/defaultServant/run.py b/java/test/src/main/java/test/Ice/defaultServant/run.py
index eac86a98816..d36e7a611b3 100755
--- a/java/test/Ice/defaultServant/run.py
+++ b/java/test/src/main/java/test/Ice/defaultServant/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/defaultValue/AllTests.java b/java/test/src/main/java/test/Ice/defaultValue/AllTests.java
index a53a798bde6..a53a798bde6 100644
--- a/java/test/Ice/defaultValue/AllTests.java
+++ b/java/test/src/main/java/test/Ice/defaultValue/AllTests.java
diff --git a/java/test/Ice/defaultValue/Client.java b/java/test/src/main/java/test/Ice/defaultValue/Client.java
index 78685aa1939..78685aa1939 100644
--- a/java/test/Ice/defaultValue/Client.java
+++ b/java/test/src/main/java/test/Ice/defaultValue/Client.java
diff --git a/java/test/Ice/defaultValue/Test.ice b/java/test/src/main/java/test/Ice/defaultValue/Test.ice
index 2c41e0a3293..2c41e0a3293 100644
--- a/java/test/Ice/defaultValue/Test.ice
+++ b/java/test/src/main/java/test/Ice/defaultValue/Test.ice
diff --git a/java/test/Ice/defaultValue/run.py b/java/test/src/main/java/test/Ice/defaultValue/run.py
index 2d55428a099..06025e5d073 100755
--- a/java/test/Ice/defaultValue/run.py
+++ b/java/test/src/main/java/test/Ice/defaultValue/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/dispatcher/AllTests.java b/java/test/src/main/java/test/Ice/dispatcher/AllTests.java
index e1badc24a9a..e1badc24a9a 100644
--- a/java/test/Ice/dispatcher/AllTests.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/AllTests.java
diff --git a/java/test/Ice/dispatcher/Client.java b/java/test/src/main/java/test/Ice/dispatcher/Client.java
index 9b490d763c1..9b490d763c1 100644
--- a/java/test/Ice/dispatcher/Client.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/Client.java
diff --git a/java/test/Ice/dispatcher/Collocated.java b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java
index 453311a3584..453311a3584 100644
--- a/java/test/Ice/dispatcher/Collocated.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java
diff --git a/java/test/Ice/dispatcher/Dispatcher.java b/java/test/src/main/java/test/Ice/dispatcher/Dispatcher.java
index 2ee5dbb6f4d..2ee5dbb6f4d 100644
--- a/java/test/Ice/dispatcher/Dispatcher.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/Dispatcher.java
diff --git a/java/test/Ice/dispatcher/Server.java b/java/test/src/main/java/test/Ice/dispatcher/Server.java
index c4ef87e7451..c4ef87e7451 100644
--- a/java/test/Ice/dispatcher/Server.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/Server.java
diff --git a/java/test/Ice/dispatcher/Test.ice b/java/test/src/main/java/test/Ice/dispatcher/Test.ice
index bbeabc2210a..bbeabc2210a 100644
--- a/java/test/Ice/dispatcher/Test.ice
+++ b/java/test/src/main/java/test/Ice/dispatcher/Test.ice
diff --git a/java/test/Ice/dispatcher/TestControllerI.java b/java/test/src/main/java/test/Ice/dispatcher/TestControllerI.java
index cd24a7982b3..cd24a7982b3 100644
--- a/java/test/Ice/dispatcher/TestControllerI.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/TestControllerI.java
diff --git a/java/test/Ice/dispatcher/TestI.java b/java/test/src/main/java/test/Ice/dispatcher/TestI.java
index 93dd8513ecc..93dd8513ecc 100644
--- a/java/test/Ice/dispatcher/TestI.java
+++ b/java/test/src/main/java/test/Ice/dispatcher/TestI.java
diff --git a/java/test/Ice/dispatcher/run.py b/java/test/src/main/java/test/Ice/dispatcher/run.py
index a40df1a1bcb..6444a527f9a 100755
--- a/java/test/Ice/dispatcher/run.py
+++ b/java/test/src/main/java/test/Ice/dispatcher/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/echo/BlobjectI.java b/java/test/src/main/java/test/Ice/echo/BlobjectI.java
index 946284608c1..946284608c1 100644
--- a/java/test/Ice/echo/BlobjectI.java
+++ b/java/test/src/main/java/test/Ice/echo/BlobjectI.java
diff --git a/java/test/Ice/echo/Server.java b/java/test/src/main/java/test/Ice/echo/Server.java
index 88daf466e01..88daf466e01 100644
--- a/java/test/Ice/echo/Server.java
+++ b/java/test/src/main/java/test/Ice/echo/Server.java
diff --git a/java/test/Ice/echo/Test.ice b/java/test/src/main/java/test/Ice/echo/Test.ice
index 6528f1a7501..6528f1a7501 100644
--- a/java/test/Ice/echo/Test.ice
+++ b/java/test/src/main/java/test/Ice/echo/Test.ice
diff --git a/java/test/Ice/echo/run.py b/java/test/src/main/java/test/Ice/echo/run.py
index 74984e633a4..de17f7cd696 100755
--- a/java/test/Ice/echo/run.py
+++ b/java/test/src/main/java/test/Ice/echo/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/enums/AllTests.java b/java/test/src/main/java/test/Ice/enums/AllTests.java
index 47aef9c0c83..47aef9c0c83 100644
--- a/java/test/Ice/enums/AllTests.java
+++ b/java/test/src/main/java/test/Ice/enums/AllTests.java
diff --git a/java/test/Ice/enums/Client.java b/java/test/src/main/java/test/Ice/enums/Client.java
index f27ee458960..f27ee458960 100644
--- a/java/test/Ice/enums/Client.java
+++ b/java/test/src/main/java/test/Ice/enums/Client.java
diff --git a/java/test/Ice/enums/Server.java b/java/test/src/main/java/test/Ice/enums/Server.java
index 24ef6d00730..24ef6d00730 100644
--- a/java/test/Ice/enums/Server.java
+++ b/java/test/src/main/java/test/Ice/enums/Server.java
diff --git a/java/test/Ice/enums/Test.ice b/java/test/src/main/java/test/Ice/enums/Test.ice
index 5f7f84ec899..5f7f84ec899 100644
--- a/java/test/Ice/enums/Test.ice
+++ b/java/test/src/main/java/test/Ice/enums/Test.ice
diff --git a/java/test/Ice/enums/TestIntfI.java b/java/test/src/main/java/test/Ice/enums/TestIntfI.java
index cbb511e7edd..cbb511e7edd 100644
--- a/java/test/Ice/enums/TestIntfI.java
+++ b/java/test/src/main/java/test/Ice/enums/TestIntfI.java
diff --git a/java/test/Ice/enums/run.py b/java/test/src/main/java/test/Ice/enums/run.py
index efa77639a65..946154e0d1a 100755
--- a/java/test/Ice/enums/run.py
+++ b/java/test/src/main/java/test/Ice/enums/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java
index afd5450bffc..afd5450bffc 100644
--- a/java/test/Ice/exceptions/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java
diff --git a/java/test/Ice/exceptions/AMDThrowerI.java b/java/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java
index bd1013bd589..bd1013bd589 100644
--- a/java/test/Ice/exceptions/AMDThrowerI.java
+++ b/java/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/src/main/java/test/Ice/exceptions/AllTests.java
index 7d68606047e..7d68606047e 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/src/main/java/test/Ice/exceptions/AllTests.java
diff --git a/java/test/Ice/exceptions/Client.java b/java/test/src/main/java/test/Ice/exceptions/Client.java
index ef66546fa26..ef66546fa26 100644
--- a/java/test/Ice/exceptions/Client.java
+++ b/java/test/src/main/java/test/Ice/exceptions/Client.java
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/src/main/java/test/Ice/exceptions/Collocated.java
index b85ca002b94..b85ca002b94 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/src/main/java/test/Ice/exceptions/Collocated.java
diff --git a/java/test/Ice/exceptions/DummyLogger.java b/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java
index 4230b744f94..4230b744f94 100644
--- a/java/test/Ice/exceptions/DummyLogger.java
+++ b/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java
diff --git a/java/test/Ice/exceptions/EmptyI.java b/java/test/src/main/java/test/Ice/exceptions/EmptyI.java
index f21f1bc484e..f21f1bc484e 100644
--- a/java/test/Ice/exceptions/EmptyI.java
+++ b/java/test/src/main/java/test/Ice/exceptions/EmptyI.java
diff --git a/java/test/Ice/exceptions/ObjectFactoryI.java b/java/test/src/main/java/test/Ice/exceptions/ObjectFactoryI.java
index 87dd29b637b..87dd29b637b 100644
--- a/java/test/Ice/exceptions/ObjectFactoryI.java
+++ b/java/test/src/main/java/test/Ice/exceptions/ObjectFactoryI.java
diff --git a/java/test/Ice/exceptions/ServantLocatorI.java b/java/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java
index 6619cd8f40c..6619cd8f40c 100644
--- a/java/test/Ice/exceptions/ServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/src/main/java/test/Ice/exceptions/Server.java
index 539ac3bc304..539ac3bc304 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/src/main/java/test/Ice/exceptions/Server.java
diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/src/main/java/test/Ice/exceptions/Test.ice
index c1818494ad2..c1818494ad2 100644
--- a/java/test/Ice/exceptions/Test.ice
+++ b/java/test/src/main/java/test/Ice/exceptions/Test.ice
diff --git a/java/test/Ice/exceptions/TestAMD.ice b/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice
index 4007abf0f52..4007abf0f52 100644
--- a/java/test/Ice/exceptions/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice
diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/src/main/java/test/Ice/exceptions/ThrowerI.java
index 8859147bd36..8859147bd36 100644
--- a/java/test/Ice/exceptions/ThrowerI.java
+++ b/java/test/src/main/java/test/Ice/exceptions/ThrowerI.java
diff --git a/java/test/Ice/exceptions/run.py b/java/test/src/main/java/test/Ice/exceptions/run.py
index 889f816c644..458762c1dfe 100755
--- a/java/test/Ice/exceptions/run.py
+++ b/java/test/src/main/java/test/Ice/exceptions/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/facets/AI.java b/java/test/src/main/java/test/Ice/facets/AI.java
index eb993bf3082..eb993bf3082 100644
--- a/java/test/Ice/facets/AI.java
+++ b/java/test/src/main/java/test/Ice/facets/AI.java
diff --git a/java/test/Ice/facets/AllTests.java b/java/test/src/main/java/test/Ice/facets/AllTests.java
index 79308c3b113..79308c3b113 100644
--- a/java/test/Ice/facets/AllTests.java
+++ b/java/test/src/main/java/test/Ice/facets/AllTests.java
diff --git a/java/test/Ice/facets/BI.java b/java/test/src/main/java/test/Ice/facets/BI.java
index bcc05365e0f..bcc05365e0f 100644
--- a/java/test/Ice/facets/BI.java
+++ b/java/test/src/main/java/test/Ice/facets/BI.java
diff --git a/java/test/Ice/facets/CI.java b/java/test/src/main/java/test/Ice/facets/CI.java
index fab2a5758ee..fab2a5758ee 100644
--- a/java/test/Ice/facets/CI.java
+++ b/java/test/src/main/java/test/Ice/facets/CI.java
diff --git a/java/test/Ice/facets/Client.java b/java/test/src/main/java/test/Ice/facets/Client.java
index 22867839eb7..22867839eb7 100644
--- a/java/test/Ice/facets/Client.java
+++ b/java/test/src/main/java/test/Ice/facets/Client.java
diff --git a/java/test/Ice/facets/Collocated.java b/java/test/src/main/java/test/Ice/facets/Collocated.java
index 9503a7e7748..9503a7e7748 100644
--- a/java/test/Ice/facets/Collocated.java
+++ b/java/test/src/main/java/test/Ice/facets/Collocated.java
diff --git a/java/test/Ice/facets/DI.java b/java/test/src/main/java/test/Ice/facets/DI.java
index cd4274dbaac..cd4274dbaac 100644
--- a/java/test/Ice/facets/DI.java
+++ b/java/test/src/main/java/test/Ice/facets/DI.java
diff --git a/java/test/Ice/facets/EI.java b/java/test/src/main/java/test/Ice/facets/EI.java
index 6ebeb0ee8b3..6ebeb0ee8b3 100644
--- a/java/test/Ice/facets/EI.java
+++ b/java/test/src/main/java/test/Ice/facets/EI.java
diff --git a/java/test/Ice/facets/EmptyI.java b/java/test/src/main/java/test/Ice/facets/EmptyI.java
index 89d633d6b7b..89d633d6b7b 100644
--- a/java/test/Ice/facets/EmptyI.java
+++ b/java/test/src/main/java/test/Ice/facets/EmptyI.java
diff --git a/java/test/Ice/facets/FI.java b/java/test/src/main/java/test/Ice/facets/FI.java
index 5d945d86714..5d945d86714 100644
--- a/java/test/Ice/facets/FI.java
+++ b/java/test/src/main/java/test/Ice/facets/FI.java
diff --git a/java/test/Ice/facets/GI.java b/java/test/src/main/java/test/Ice/facets/GI.java
index 397501ddeb7..397501ddeb7 100644
--- a/java/test/Ice/facets/GI.java
+++ b/java/test/src/main/java/test/Ice/facets/GI.java
diff --git a/java/test/Ice/facets/HI.java b/java/test/src/main/java/test/Ice/facets/HI.java
index 49bc8de2337..49bc8de2337 100644
--- a/java/test/Ice/facets/HI.java
+++ b/java/test/src/main/java/test/Ice/facets/HI.java
diff --git a/java/test/Ice/facets/Server.java b/java/test/src/main/java/test/Ice/facets/Server.java
index 0bba8b89cdf..0bba8b89cdf 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/src/main/java/test/Ice/facets/Server.java
diff --git a/java/test/Ice/facets/Test.ice b/java/test/src/main/java/test/Ice/facets/Test.ice
index fa6a545118e..fa6a545118e 100644
--- a/java/test/Ice/facets/Test.ice
+++ b/java/test/src/main/java/test/Ice/facets/Test.ice
diff --git a/java/test/src/main/java/test/Ice/facets/run.py b/java/test/src/main/java/test/Ice/facets/run.py
new file mode 100755
index 00000000000..8bb456187d9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/facets/run.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
+TestUtil.collocatedTest()
diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/src/main/java/test/Ice/faultTolerance/AllTests.java
index 4e334301a62..4e334301a62 100644
--- a/java/test/Ice/faultTolerance/AllTests.java
+++ b/java/test/src/main/java/test/Ice/faultTolerance/AllTests.java
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/src/main/java/test/Ice/faultTolerance/Client.java
index 7f2fb23b80e..7f2fb23b80e 100644
--- a/java/test/Ice/faultTolerance/Client.java
+++ b/java/test/src/main/java/test/Ice/faultTolerance/Client.java
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/src/main/java/test/Ice/faultTolerance/Server.java
index 18d113fdeae..18d113fdeae 100644
--- a/java/test/Ice/faultTolerance/Server.java
+++ b/java/test/src/main/java/test/Ice/faultTolerance/Server.java
diff --git a/java/test/Ice/faultTolerance/Test.ice b/java/test/src/main/java/test/Ice/faultTolerance/Test.ice
index e5f616aa8a0..e5f616aa8a0 100644
--- a/java/test/Ice/faultTolerance/Test.ice
+++ b/java/test/src/main/java/test/Ice/faultTolerance/Test.ice
diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/src/main/java/test/Ice/faultTolerance/TestI.java
index 3d3b362bd0a..3d3b362bd0a 100644
--- a/java/test/Ice/faultTolerance/TestI.java
+++ b/java/test/src/main/java/test/Ice/faultTolerance/TestI.java
diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/src/main/java/test/Ice/faultTolerance/run.py
index 7ec29613f4c..11e4dfc9efd 100755
--- a/java/test/Ice/faultTolerance/run.py
+++ b/java/test/src/main/java/test/Ice/faultTolerance/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/hash/Client.java b/java/test/src/main/java/test/Ice/hash/Client.java
index 6a01bf62285..6a01bf62285 100644
--- a/java/test/Ice/hash/Client.java
+++ b/java/test/src/main/java/test/Ice/hash/Client.java
diff --git a/java/test/Ice/hash/Test.ice b/java/test/src/main/java/test/Ice/hash/Test.ice
index e6b7243d1e7..e6b7243d1e7 100644
--- a/java/test/Ice/hash/Test.ice
+++ b/java/test/src/main/java/test/Ice/hash/Test.ice
diff --git a/java/test/Ice/hash/run.py b/java/test/src/main/java/test/Ice/hash/run.py
index 3cec68b15ce..29d7f55f0f5 100755
--- a/java/test/Ice/hash/run.py
+++ b/java/test/src/main/java/test/Ice/hash/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/hold/AllTests.java b/java/test/src/main/java/test/Ice/hold/AllTests.java
index edb5aa78e63..edb5aa78e63 100644
--- a/java/test/Ice/hold/AllTests.java
+++ b/java/test/src/main/java/test/Ice/hold/AllTests.java
diff --git a/java/test/Ice/hold/Client.java b/java/test/src/main/java/test/Ice/hold/Client.java
index 58e4e1abd32..58e4e1abd32 100644
--- a/java/test/Ice/hold/Client.java
+++ b/java/test/src/main/java/test/Ice/hold/Client.java
diff --git a/java/test/Ice/hold/HoldI.java b/java/test/src/main/java/test/Ice/hold/HoldI.java
index b127f4bebb8..b127f4bebb8 100644
--- a/java/test/Ice/hold/HoldI.java
+++ b/java/test/src/main/java/test/Ice/hold/HoldI.java
diff --git a/java/test/Ice/hold/Server.java b/java/test/src/main/java/test/Ice/hold/Server.java
index 97019f8021e..97019f8021e 100644
--- a/java/test/Ice/hold/Server.java
+++ b/java/test/src/main/java/test/Ice/hold/Server.java
diff --git a/java/test/Ice/hold/Test.ice b/java/test/src/main/java/test/Ice/hold/Test.ice
index c77f95e299f..c77f95e299f 100644
--- a/java/test/Ice/hold/Test.ice
+++ b/java/test/src/main/java/test/Ice/hold/Test.ice
diff --git a/java/test/src/main/java/test/Ice/hold/run.py b/java/test/src/main/java/test/Ice/hold/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/hold/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/info/AllTests.java b/java/test/src/main/java/test/Ice/info/AllTests.java
index 77d4e6332a6..77d4e6332a6 100644
--- a/java/test/Ice/info/AllTests.java
+++ b/java/test/src/main/java/test/Ice/info/AllTests.java
diff --git a/java/test/Ice/info/Client.java b/java/test/src/main/java/test/Ice/info/Client.java
index 2cd0d5b1f8b..2cd0d5b1f8b 100644
--- a/java/test/Ice/info/Client.java
+++ b/java/test/src/main/java/test/Ice/info/Client.java
diff --git a/java/test/Ice/info/Server.java b/java/test/src/main/java/test/Ice/info/Server.java
index ebb4046e721..ebb4046e721 100644
--- a/java/test/Ice/info/Server.java
+++ b/java/test/src/main/java/test/Ice/info/Server.java
diff --git a/java/test/Ice/info/Test.ice b/java/test/src/main/java/test/Ice/info/Test.ice
index 55bbc2ce48f..55bbc2ce48f 100644
--- a/java/test/Ice/info/Test.ice
+++ b/java/test/src/main/java/test/Ice/info/Test.ice
diff --git a/java/test/Ice/info/TestI.java b/java/test/src/main/java/test/Ice/info/TestI.java
index 316cf7e438f..316cf7e438f 100644
--- a/java/test/Ice/info/TestI.java
+++ b/java/test/src/main/java/test/Ice/info/TestI.java
diff --git a/java/test/src/main/java/test/Ice/info/run.py b/java/test/src/main/java/test/Ice/info/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/info/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/src/main/java/test/Ice/inheritance/AllTests.java
index 5a53c6916a1..5a53c6916a1 100644
--- a/java/test/Ice/inheritance/AllTests.java
+++ b/java/test/src/main/java/test/Ice/inheritance/AllTests.java
diff --git a/java/test/Ice/inheritance/CAI.java b/java/test/src/main/java/test/Ice/inheritance/CAI.java
index b867eb6f836..b867eb6f836 100644
--- a/java/test/Ice/inheritance/CAI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/CAI.java
diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/src/main/java/test/Ice/inheritance/CBI.java
index 6f07ec9b167..6f07ec9b167 100644
--- a/java/test/Ice/inheritance/CBI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/CBI.java
diff --git a/java/test/Ice/inheritance/CCI.java b/java/test/src/main/java/test/Ice/inheritance/CCI.java
index 1d88806b959..1d88806b959 100644
--- a/java/test/Ice/inheritance/CCI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/CCI.java
diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/src/main/java/test/Ice/inheritance/CDI.java
index a1ac62fdf14..a1ac62fdf14 100644
--- a/java/test/Ice/inheritance/CDI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/CDI.java
diff --git a/java/test/Ice/inheritance/Client.java b/java/test/src/main/java/test/Ice/inheritance/Client.java
index 1fc5bdb3214..1fc5bdb3214 100644
--- a/java/test/Ice/inheritance/Client.java
+++ b/java/test/src/main/java/test/Ice/inheritance/Client.java
diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/src/main/java/test/Ice/inheritance/Collocated.java
index 3c92c35545c..3c92c35545c 100644
--- a/java/test/Ice/inheritance/Collocated.java
+++ b/java/test/src/main/java/test/Ice/inheritance/Collocated.java
diff --git a/java/test/Ice/inheritance/IAI.java b/java/test/src/main/java/test/Ice/inheritance/IAI.java
index 6f783f0bc58..6f783f0bc58 100644
--- a/java/test/Ice/inheritance/IAI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/IAI.java
diff --git a/java/test/Ice/inheritance/IB1I.java b/java/test/src/main/java/test/Ice/inheritance/IB1I.java
index 0c1de6cfb99..0c1de6cfb99 100644
--- a/java/test/Ice/inheritance/IB1I.java
+++ b/java/test/src/main/java/test/Ice/inheritance/IB1I.java
diff --git a/java/test/Ice/inheritance/IB2I.java b/java/test/src/main/java/test/Ice/inheritance/IB2I.java
index 07fc2e53baa..07fc2e53baa 100644
--- a/java/test/Ice/inheritance/IB2I.java
+++ b/java/test/src/main/java/test/Ice/inheritance/IB2I.java
diff --git a/java/test/Ice/inheritance/ICI.java b/java/test/src/main/java/test/Ice/inheritance/ICI.java
index 4ff569dbf16..4ff569dbf16 100644
--- a/java/test/Ice/inheritance/ICI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/ICI.java
diff --git a/java/test/Ice/inheritance/InitialI.java b/java/test/src/main/java/test/Ice/inheritance/InitialI.java
index 083314cf62d..083314cf62d 100644
--- a/java/test/Ice/inheritance/InitialI.java
+++ b/java/test/src/main/java/test/Ice/inheritance/InitialI.java
diff --git a/java/test/Ice/inheritance/Server.java b/java/test/src/main/java/test/Ice/inheritance/Server.java
index 7ff0278c2a6..7ff0278c2a6 100644
--- a/java/test/Ice/inheritance/Server.java
+++ b/java/test/src/main/java/test/Ice/inheritance/Server.java
diff --git a/java/test/Ice/inheritance/Test.ice b/java/test/src/main/java/test/Ice/inheritance/Test.ice
index 82d63b5078f..82d63b5078f 100644
--- a/java/test/Ice/inheritance/Test.ice
+++ b/java/test/src/main/java/test/Ice/inheritance/Test.ice
diff --git a/java/test/src/main/java/test/Ice/inheritance/run.py b/java/test/src/main/java/test/Ice/inheritance/run.py
new file mode 100755
index 00000000000..8bb456187d9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/inheritance/run.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
+TestUtil.collocatedTest()
diff --git a/java/test/Ice/interceptor/AMDInterceptorI.java b/java/test/src/main/java/test/Ice/interceptor/AMDInterceptorI.java
index e9cc88a1ba5..e9cc88a1ba5 100644
--- a/java/test/Ice/interceptor/AMDInterceptorI.java
+++ b/java/test/src/main/java/test/Ice/interceptor/AMDInterceptorI.java
diff --git a/java/test/Ice/interceptor/Client.java b/java/test/src/main/java/test/Ice/interceptor/Client.java
index 12c913296b0..12c913296b0 100644
--- a/java/test/Ice/interceptor/Client.java
+++ b/java/test/src/main/java/test/Ice/interceptor/Client.java
diff --git a/java/test/Ice/interceptor/InterceptorI.java b/java/test/src/main/java/test/Ice/interceptor/InterceptorI.java
index 04458722e3a..04458722e3a 100644
--- a/java/test/Ice/interceptor/InterceptorI.java
+++ b/java/test/src/main/java/test/Ice/interceptor/InterceptorI.java
diff --git a/java/test/Ice/interceptor/MyObjectI.java b/java/test/src/main/java/test/Ice/interceptor/MyObjectI.java
index a2c10f04d38..a2c10f04d38 100644
--- a/java/test/Ice/interceptor/MyObjectI.java
+++ b/java/test/src/main/java/test/Ice/interceptor/MyObjectI.java
diff --git a/java/test/Ice/interceptor/MySystemException.java b/java/test/src/main/java/test/Ice/interceptor/MySystemException.java
index ee7bc5a626b..ee7bc5a626b 100644
--- a/java/test/Ice/interceptor/MySystemException.java
+++ b/java/test/src/main/java/test/Ice/interceptor/MySystemException.java
diff --git a/java/test/Ice/interceptor/Test.ice b/java/test/src/main/java/test/Ice/interceptor/Test.ice
index 04c460b8b5e..04c460b8b5e 100644
--- a/java/test/Ice/interceptor/Test.ice
+++ b/java/test/src/main/java/test/Ice/interceptor/Test.ice
diff --git a/java/test/Ice/interceptor/run.py b/java/test/src/main/java/test/Ice/interceptor/run.py
index 91b248967b1..04638dadfa6 100755
--- a/java/test/Ice/interceptor/run.py
+++ b/java/test/src/main/java/test/Ice/interceptor/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/interrupt/AllTests.java b/java/test/src/main/java/test/Ice/interrupt/AllTests.java
index dbc7c159ddd..dbc7c159ddd 100644
--- a/java/test/Ice/interrupt/AllTests.java
+++ b/java/test/src/main/java/test/Ice/interrupt/AllTests.java
diff --git a/java/test/Ice/interrupt/Client.java b/java/test/src/main/java/test/Ice/interrupt/Client.java
index edd6dfaa6ae..edd6dfaa6ae 100644
--- a/java/test/Ice/interrupt/Client.java
+++ b/java/test/src/main/java/test/Ice/interrupt/Client.java
diff --git a/java/test/Ice/interrupt/Collocated.java b/java/test/src/main/java/test/Ice/interrupt/Collocated.java
index 6e164020aee..6e164020aee 100644
--- a/java/test/Ice/interrupt/Collocated.java
+++ b/java/test/src/main/java/test/Ice/interrupt/Collocated.java
diff --git a/java/test/Ice/interrupt/Server.java b/java/test/src/main/java/test/Ice/interrupt/Server.java
index 9ec7a725d77..9ec7a725d77 100644
--- a/java/test/Ice/interrupt/Server.java
+++ b/java/test/src/main/java/test/Ice/interrupt/Server.java
diff --git a/java/test/Ice/interrupt/Test.ice b/java/test/src/main/java/test/Ice/interrupt/Test.ice
index 5ff03302d8e..5ff03302d8e 100644
--- a/java/test/Ice/interrupt/Test.ice
+++ b/java/test/src/main/java/test/Ice/interrupt/Test.ice
diff --git a/java/test/Ice/interrupt/TestControllerI.java b/java/test/src/main/java/test/Ice/interrupt/TestControllerI.java
index c3b9088393f..c3b9088393f 100644
--- a/java/test/Ice/interrupt/TestControllerI.java
+++ b/java/test/src/main/java/test/Ice/interrupt/TestControllerI.java
diff --git a/java/test/Ice/interrupt/TestI.java b/java/test/src/main/java/test/Ice/interrupt/TestI.java
index 35016d42489..35016d42489 100644
--- a/java/test/Ice/interrupt/TestI.java
+++ b/java/test/src/main/java/test/Ice/interrupt/TestI.java
diff --git a/java/test/src/main/java/test/Ice/interrupt/run.py b/java/test/src/main/java/test/Ice/interrupt/run.py
new file mode 100755
index 00000000000..a15d0a9c9e3
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/interrupt/run.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+print("tests with regular server.")
+TestUtil.clientServerTest()
+
+print("tests with collocated server.")
+TestUtil.collocatedTest()
diff --git a/java/test/Ice/invoke/AllTests.java b/java/test/src/main/java/test/Ice/invoke/AllTests.java
index b22f4027b32..b22f4027b32 100644
--- a/java/test/Ice/invoke/AllTests.java
+++ b/java/test/src/main/java/test/Ice/invoke/AllTests.java
diff --git a/java/test/Ice/invoke/BlobjectAsyncI.java b/java/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java
index c7e0837b946..c7e0837b946 100644
--- a/java/test/Ice/invoke/BlobjectAsyncI.java
+++ b/java/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java
diff --git a/java/test/Ice/invoke/BlobjectI.java b/java/test/src/main/java/test/Ice/invoke/BlobjectI.java
index c676c38dc63..c676c38dc63 100644
--- a/java/test/Ice/invoke/BlobjectI.java
+++ b/java/test/src/main/java/test/Ice/invoke/BlobjectI.java
diff --git a/java/test/Ice/invoke/Client.java b/java/test/src/main/java/test/Ice/invoke/Client.java
index e589d32075c..e589d32075c 100644
--- a/java/test/Ice/invoke/Client.java
+++ b/java/test/src/main/java/test/Ice/invoke/Client.java
diff --git a/java/test/Ice/invoke/ServantLocatorI.java b/java/test/src/main/java/test/Ice/invoke/ServantLocatorI.java
index 9ed2262b995..9ed2262b995 100644
--- a/java/test/Ice/invoke/ServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/invoke/ServantLocatorI.java
diff --git a/java/test/Ice/invoke/Server.java b/java/test/src/main/java/test/Ice/invoke/Server.java
index a6f315d5cf9..a6f315d5cf9 100644
--- a/java/test/Ice/invoke/Server.java
+++ b/java/test/src/main/java/test/Ice/invoke/Server.java
diff --git a/java/test/Ice/invoke/Test.ice b/java/test/src/main/java/test/Ice/invoke/Test.ice
index 6aae90da746..6aae90da746 100644
--- a/java/test/Ice/invoke/Test.ice
+++ b/java/test/src/main/java/test/Ice/invoke/Test.ice
diff --git a/java/test/Ice/invoke/lambda/AllTests.java b/java/test/src/main/java/test/Ice/invoke/lambda/AllTests.java
index 5b7764615a3..5b7764615a3 100644
--- a/java/test/Ice/invoke/lambda/AllTests.java
+++ b/java/test/src/main/java/test/Ice/invoke/lambda/AllTests.java
diff --git a/java/test/Ice/invoke/run.py b/java/test/src/main/java/test/Ice/invoke/run.py
index 7ee3382b0a2..50be82e58ca 100755
--- a/java/test/Ice/invoke/run.py
+++ b/java/test/src/main/java/test/Ice/invoke/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/location/AllTests.java b/java/test/src/main/java/test/Ice/location/AllTests.java
index 636376a0253..636376a0253 100644
--- a/java/test/Ice/location/AllTests.java
+++ b/java/test/src/main/java/test/Ice/location/AllTests.java
diff --git a/java/test/Ice/location/Client.java b/java/test/src/main/java/test/Ice/location/Client.java
index 4fc8e67893b..4fc8e67893b 100644
--- a/java/test/Ice/location/Client.java
+++ b/java/test/src/main/java/test/Ice/location/Client.java
diff --git a/java/test/Ice/location/HelloI.java b/java/test/src/main/java/test/Ice/location/HelloI.java
index 5036d4cbc18..5036d4cbc18 100644
--- a/java/test/Ice/location/HelloI.java
+++ b/java/test/src/main/java/test/Ice/location/HelloI.java
diff --git a/java/test/Ice/location/Server.java b/java/test/src/main/java/test/Ice/location/Server.java
index 4b09338d2ee..4b09338d2ee 100644
--- a/java/test/Ice/location/Server.java
+++ b/java/test/src/main/java/test/Ice/location/Server.java
diff --git a/java/test/Ice/location/ServerLocator.java b/java/test/src/main/java/test/Ice/location/ServerLocator.java
index 0e27e888eb7..0e27e888eb7 100644
--- a/java/test/Ice/location/ServerLocator.java
+++ b/java/test/src/main/java/test/Ice/location/ServerLocator.java
diff --git a/java/test/Ice/location/ServerLocatorRegistry.java b/java/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java
index 7a9fbc50ac8..7a9fbc50ac8 100644
--- a/java/test/Ice/location/ServerLocatorRegistry.java
+++ b/java/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java
diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/src/main/java/test/Ice/location/ServerManagerI.java
index 2ac89074ad7..2ac89074ad7 100644
--- a/java/test/Ice/location/ServerManagerI.java
+++ b/java/test/src/main/java/test/Ice/location/ServerManagerI.java
diff --git a/java/test/Ice/location/Test.ice b/java/test/src/main/java/test/Ice/location/Test.ice
index f6d0dfd0a94..f6d0dfd0a94 100644
--- a/java/test/Ice/location/Test.ice
+++ b/java/test/src/main/java/test/Ice/location/Test.ice
diff --git a/java/test/Ice/location/TestI.java b/java/test/src/main/java/test/Ice/location/TestI.java
index de3c6213bd7..de3c6213bd7 100644
--- a/java/test/Ice/location/TestI.java
+++ b/java/test/src/main/java/test/Ice/location/TestI.java
diff --git a/java/test/src/main/java/test/Ice/location/run.py b/java/test/src/main/java/test/Ice/location/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/location/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/metrics/AMDMetricsI.java b/java/test/src/main/java/test/Ice/metrics/AMDMetricsI.java
index e557e728a4e..e557e728a4e 100644
--- a/java/test/Ice/metrics/AMDMetricsI.java
+++ b/java/test/src/main/java/test/Ice/metrics/AMDMetricsI.java
diff --git a/java/test/Ice/metrics/AMDServer.java b/java/test/src/main/java/test/Ice/metrics/AMDServer.java
index dc559764811..dc559764811 100644
--- a/java/test/Ice/metrics/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/metrics/AMDServer.java
diff --git a/java/test/Ice/metrics/AllTests.java b/java/test/src/main/java/test/Ice/metrics/AllTests.java
index 48d1fdb8a80..48d1fdb8a80 100644
--- a/java/test/Ice/metrics/AllTests.java
+++ b/java/test/src/main/java/test/Ice/metrics/AllTests.java
diff --git a/java/test/Ice/metrics/ChildInvocationObserverI.java b/java/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java
index da56f726250..da56f726250 100644
--- a/java/test/Ice/metrics/ChildInvocationObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java
diff --git a/java/test/Ice/metrics/Client.java b/java/test/src/main/java/test/Ice/metrics/Client.java
index 48acc9244b1..48acc9244b1 100644
--- a/java/test/Ice/metrics/Client.java
+++ b/java/test/src/main/java/test/Ice/metrics/Client.java
diff --git a/java/test/Ice/metrics/Collocated.java b/java/test/src/main/java/test/Ice/metrics/Collocated.java
index e1191a4de99..e1191a4de99 100644
--- a/java/test/Ice/metrics/Collocated.java
+++ b/java/test/src/main/java/test/Ice/metrics/Collocated.java
diff --git a/java/test/Ice/metrics/CollocatedObserverI.java b/java/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java
index 607da015366..607da015366 100644
--- a/java/test/Ice/metrics/CollocatedObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java
diff --git a/java/test/Ice/metrics/CommunicatorObserverI.java b/java/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java
index 996d5a83b1a..996d5a83b1a 100644
--- a/java/test/Ice/metrics/CommunicatorObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java
diff --git a/java/test/Ice/metrics/ConnectionObserverI.java b/java/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java
index 395c31733e9..395c31733e9 100644
--- a/java/test/Ice/metrics/ConnectionObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java
diff --git a/java/test/Ice/metrics/ControllerI.java b/java/test/src/main/java/test/Ice/metrics/ControllerI.java
index 2f1434d523a..2f1434d523a 100644
--- a/java/test/Ice/metrics/ControllerI.java
+++ b/java/test/src/main/java/test/Ice/metrics/ControllerI.java
diff --git a/java/test/Ice/metrics/DispatchObserverI.java b/java/test/src/main/java/test/Ice/metrics/DispatchObserverI.java
index 43b0683696c..43b0683696c 100644
--- a/java/test/Ice/metrics/DispatchObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/DispatchObserverI.java
diff --git a/java/test/Ice/metrics/InvocationObserverI.java b/java/test/src/main/java/test/Ice/metrics/InvocationObserverI.java
index cfb7e2c6547..cfb7e2c6547 100644
--- a/java/test/Ice/metrics/InvocationObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/InvocationObserverI.java
diff --git a/java/test/Ice/metrics/MetricsI.java b/java/test/src/main/java/test/Ice/metrics/MetricsI.java
index 51f10fd2661..51f10fd2661 100644
--- a/java/test/Ice/metrics/MetricsI.java
+++ b/java/test/src/main/java/test/Ice/metrics/MetricsI.java
diff --git a/java/test/Ice/metrics/ObserverI.java b/java/test/src/main/java/test/Ice/metrics/ObserverI.java
index 1dadf4d63d8..1dadf4d63d8 100644
--- a/java/test/Ice/metrics/ObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/ObserverI.java
diff --git a/java/test/Ice/metrics/RemoveObserverI.java b/java/test/src/main/java/test/Ice/metrics/RemoveObserverI.java
index 6a5ad4817db..6a5ad4817db 100644
--- a/java/test/Ice/metrics/RemoveObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/RemoveObserverI.java
diff --git a/java/test/Ice/metrics/Server.java b/java/test/src/main/java/test/Ice/metrics/Server.java
index 70788ea876f..70788ea876f 100644
--- a/java/test/Ice/metrics/Server.java
+++ b/java/test/src/main/java/test/Ice/metrics/Server.java
diff --git a/java/test/Ice/metrics/Test.ice b/java/test/src/main/java/test/Ice/metrics/Test.ice
index 41930f8c10a..41930f8c10a 100644
--- a/java/test/Ice/metrics/Test.ice
+++ b/java/test/src/main/java/test/Ice/metrics/Test.ice
diff --git a/java/test/Ice/metrics/TestAMD.ice b/java/test/src/main/java/test/Ice/metrics/TestAMD.ice
index 0a9bf0209a9..0a9bf0209a9 100644
--- a/java/test/Ice/metrics/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/metrics/TestAMD.ice
diff --git a/java/test/Ice/metrics/ThreadObserverI.java b/java/test/src/main/java/test/Ice/metrics/ThreadObserverI.java
index af24dfd7df1..af24dfd7df1 100644
--- a/java/test/Ice/metrics/ThreadObserverI.java
+++ b/java/test/src/main/java/test/Ice/metrics/ThreadObserverI.java
diff --git a/java/test/Ice/metrics/run.py b/java/test/src/main/java/test/Ice/metrics/run.py
index 208d9fce41e..7254e6ab696 100755
--- a/java/test/Ice/metrics/run.py
+++ b/java/test/src/main/java/test/Ice/metrics/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/networkProxy/AllTests.java b/java/test/src/main/java/test/Ice/networkProxy/AllTests.java
index f0b53afd8c3..f0b53afd8c3 100644
--- a/java/test/Ice/networkProxy/AllTests.java
+++ b/java/test/src/main/java/test/Ice/networkProxy/AllTests.java
diff --git a/java/test/Ice/networkProxy/Client.java b/java/test/src/main/java/test/Ice/networkProxy/Client.java
index 411b276ac9a..411b276ac9a 100644
--- a/java/test/Ice/networkProxy/Client.java
+++ b/java/test/src/main/java/test/Ice/networkProxy/Client.java
diff --git a/java/test/Ice/networkProxy/Server.java b/java/test/src/main/java/test/Ice/networkProxy/Server.java
index fe6e7c04ea9..fe6e7c04ea9 100644
--- a/java/test/Ice/networkProxy/Server.java
+++ b/java/test/src/main/java/test/Ice/networkProxy/Server.java
diff --git a/java/test/Ice/networkProxy/Test.ice b/java/test/src/main/java/test/Ice/networkProxy/Test.ice
index 3e084d8a65e..3e084d8a65e 100644
--- a/java/test/Ice/networkProxy/Test.ice
+++ b/java/test/src/main/java/test/Ice/networkProxy/Test.ice
diff --git a/java/test/Ice/networkProxy/run.py b/java/test/src/main/java/test/Ice/networkProxy/run.py
index 0a9814c4a28..766bcb373f6 100755
--- a/java/test/Ice/networkProxy/run.py
+++ b/java/test/src/main/java/test/Ice/networkProxy/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/objects/AllTests.java b/java/test/src/main/java/test/Ice/objects/AllTests.java
index ab43e76c368..ab43e76c368 100644
--- a/java/test/Ice/objects/AllTests.java
+++ b/java/test/src/main/java/test/Ice/objects/AllTests.java
diff --git a/java/test/Ice/objects/BI.java b/java/test/src/main/java/test/Ice/objects/BI.java
index 09aebe13501..09aebe13501 100644
--- a/java/test/Ice/objects/BI.java
+++ b/java/test/src/main/java/test/Ice/objects/BI.java
diff --git a/java/test/Ice/objects/CI.java b/java/test/src/main/java/test/Ice/objects/CI.java
index f46501a241c..f46501a241c 100644
--- a/java/test/Ice/objects/CI.java
+++ b/java/test/src/main/java/test/Ice/objects/CI.java
diff --git a/java/test/Ice/objects/Client.java b/java/test/src/main/java/test/Ice/objects/Client.java
index 3d9f3803bc5..3d9f3803bc5 100644
--- a/java/test/Ice/objects/Client.java
+++ b/java/test/src/main/java/test/Ice/objects/Client.java
diff --git a/java/test/Ice/objects/Collocated.java b/java/test/src/main/java/test/Ice/objects/Collocated.java
index 06d1f4bf5fd..06d1f4bf5fd 100644
--- a/java/test/Ice/objects/Collocated.java
+++ b/java/test/src/main/java/test/Ice/objects/Collocated.java
diff --git a/java/test/Ice/objects/DI.java b/java/test/src/main/java/test/Ice/objects/DI.java
index 660efcd277c..660efcd277c 100644
--- a/java/test/Ice/objects/DI.java
+++ b/java/test/src/main/java/test/Ice/objects/DI.java
diff --git a/java/test/Ice/objects/EI.java b/java/test/src/main/java/test/Ice/objects/EI.java
index e4930e1644d..e4930e1644d 100644
--- a/java/test/Ice/objects/EI.java
+++ b/java/test/src/main/java/test/Ice/objects/EI.java
diff --git a/java/test/Ice/objects/FI.java b/java/test/src/main/java/test/Ice/objects/FI.java
index d51461c8031..d51461c8031 100644
--- a/java/test/Ice/objects/FI.java
+++ b/java/test/src/main/java/test/Ice/objects/FI.java
diff --git a/java/test/Ice/objects/HI.java b/java/test/src/main/java/test/Ice/objects/HI.java
index e41ec794c82..e41ec794c82 100644
--- a/java/test/Ice/objects/HI.java
+++ b/java/test/src/main/java/test/Ice/objects/HI.java
diff --git a/java/test/Ice/objects/II.java b/java/test/src/main/java/test/Ice/objects/II.java
index 8061d20e2cd..8061d20e2cd 100644
--- a/java/test/Ice/objects/II.java
+++ b/java/test/src/main/java/test/Ice/objects/II.java
diff --git a/java/test/Ice/objects/InitialI.java b/java/test/src/main/java/test/Ice/objects/InitialI.java
index eaa1be7785b..eaa1be7785b 100644
--- a/java/test/Ice/objects/InitialI.java
+++ b/java/test/src/main/java/test/Ice/objects/InitialI.java
diff --git a/java/test/Ice/objects/JI.java b/java/test/src/main/java/test/Ice/objects/JI.java
index ff82d0dac25..ff82d0dac25 100644
--- a/java/test/Ice/objects/JI.java
+++ b/java/test/src/main/java/test/Ice/objects/JI.java
diff --git a/java/test/Ice/objects/Server.java b/java/test/src/main/java/test/Ice/objects/Server.java
index d327e7d5b53..d327e7d5b53 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/src/main/java/test/Ice/objects/Server.java
diff --git a/java/test/Ice/objects/Test.ice b/java/test/src/main/java/test/Ice/objects/Test.ice
index d4644b11a64..d4644b11a64 100644
--- a/java/test/Ice/objects/Test.ice
+++ b/java/test/src/main/java/test/Ice/objects/Test.ice
diff --git a/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java b/java/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java
index f9b0e8deb7a..f9b0e8deb7a 100644
--- a/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java
+++ b/java/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java
diff --git a/java/test/Ice/objects/run.py b/java/test/src/main/java/test/Ice/objects/run.py
index f4d2befc202..89d67e015aa 100755
--- a/java/test/Ice/objects/run.py
+++ b/java/test/src/main/java/test/Ice/objects/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/operations/AMDMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
index f577db345c1..f577db345c1 100644
--- a/java/test/Ice/operations/AMDMyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
diff --git a/java/test/Ice/operations/AMDServer.java b/java/test/src/main/java/test/Ice/operations/AMDServer.java
index 063af513e84..063af513e84 100644
--- a/java/test/Ice/operations/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/operations/AMDServer.java
diff --git a/java/test/Ice/operations/AMDTieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java
index 8d2e26b48d1..8d2e26b48d1 100644
--- a/java/test/Ice/operations/AMDTieMyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java
diff --git a/java/test/Ice/operations/AMDTieServer.java b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java
index af88539eb00..af88539eb00 100644
--- a/java/test/Ice/operations/AMDTieServer.java
+++ b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java
diff --git a/java/test/Ice/operations/AllTests.java b/java/test/src/main/java/test/Ice/operations/AllTests.java
index b89c85f3745..b89c85f3745 100644
--- a/java/test/Ice/operations/AllTests.java
+++ b/java/test/src/main/java/test/Ice/operations/AllTests.java
diff --git a/java/test/Ice/operations/BatchOneways.java b/java/test/src/main/java/test/Ice/operations/BatchOneways.java
index fc20955e9d2..fc20955e9d2 100644
--- a/java/test/Ice/operations/BatchOneways.java
+++ b/java/test/src/main/java/test/Ice/operations/BatchOneways.java
diff --git a/java/test/Ice/operations/BatchOnewaysAMI.java b/java/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java
index f11df72b019..f11df72b019 100644
--- a/java/test/Ice/operations/BatchOnewaysAMI.java
+++ b/java/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java
diff --git a/java/test/Ice/operations/Client.java b/java/test/src/main/java/test/Ice/operations/Client.java
index 2c957a13e34..2c957a13e34 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/src/main/java/test/Ice/operations/Client.java
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/src/main/java/test/Ice/operations/Collocated.java
index ecfab090c8c..ecfab090c8c 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/src/main/java/test/Ice/operations/Collocated.java
diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
index 5fddb73a3d5..5fddb73a3d5 100644
--- a/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
diff --git a/java/test/Ice/operations/Oneways.java b/java/test/src/main/java/test/Ice/operations/Oneways.java
index ded8ee39b3d..ded8ee39b3d 100644
--- a/java/test/Ice/operations/Oneways.java
+++ b/java/test/src/main/java/test/Ice/operations/Oneways.java
diff --git a/java/test/Ice/operations/OnewaysAMI.java b/java/test/src/main/java/test/Ice/operations/OnewaysAMI.java
index dfaca37f114..dfaca37f114 100644
--- a/java/test/Ice/operations/OnewaysAMI.java
+++ b/java/test/src/main/java/test/Ice/operations/OnewaysAMI.java
diff --git a/java/test/Ice/operations/Server.java b/java/test/src/main/java/test/Ice/operations/Server.java
index 22dba1da02b..22dba1da02b 100644
--- a/java/test/Ice/operations/Server.java
+++ b/java/test/src/main/java/test/Ice/operations/Server.java
diff --git a/java/test/Ice/operations/Test.ice b/java/test/src/main/java/test/Ice/operations/Test.ice
index 38ab55f5909..38ab55f5909 100644
--- a/java/test/Ice/operations/Test.ice
+++ b/java/test/src/main/java/test/Ice/operations/Test.ice
diff --git a/java/test/Ice/operations/TestAMD.ice b/java/test/src/main/java/test/Ice/operations/TestAMD.ice
index edcb970b236..edcb970b236 100644
--- a/java/test/Ice/operations/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/operations/TestAMD.ice
diff --git a/java/test/Ice/operations/TieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java
index cbd7a833f15..cbd7a833f15 100644
--- a/java/test/Ice/operations/TieMyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java
diff --git a/java/test/Ice/operations/TieServer.java b/java/test/src/main/java/test/Ice/operations/TieServer.java
index 26bbdc7b7b5..26bbdc7b7b5 100644
--- a/java/test/Ice/operations/TieServer.java
+++ b/java/test/src/main/java/test/Ice/operations/TieServer.java
diff --git a/java/test/Ice/operations/Twoways.java b/java/test/src/main/java/test/Ice/operations/Twoways.java
index c148edddb0e..c148edddb0e 100644
--- a/java/test/Ice/operations/Twoways.java
+++ b/java/test/src/main/java/test/Ice/operations/Twoways.java
diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java
index 70e1a6566a0..70e1a6566a0 100644
--- a/java/test/Ice/operations/TwowaysAMI.java
+++ b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java
diff --git a/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java b/java/test/src/main/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java
index d5885bb2b31..d5885bb2b31 100644
--- a/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java
+++ b/java/test/src/main/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java
diff --git a/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java b/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java
index 81f4dcb321e..81f4dcb321e 100644
--- a/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java
+++ b/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java
diff --git a/java/test/Ice/operations/run.py b/java/test/src/main/java/test/Ice/operations/run.py
index 763a077b77d..4a622e6a75e 100755
--- a/java/test/Ice/operations/run.py
+++ b/java/test/src/main/java/test/Ice/operations/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/optional/AMDInitialI.java b/java/test/src/main/java/test/Ice/optional/AMDInitialI.java
index d47104d792d..d47104d792d 100644
--- a/java/test/Ice/optional/AMDInitialI.java
+++ b/java/test/src/main/java/test/Ice/optional/AMDInitialI.java
diff --git a/java/test/Ice/optional/AMDServer.java b/java/test/src/main/java/test/Ice/optional/AMDServer.java
index b05e5b28f3c..b05e5b28f3c 100644
--- a/java/test/Ice/optional/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/optional/AMDServer.java
diff --git a/java/test/Ice/optional/AllTests.java b/java/test/src/main/java/test/Ice/optional/AllTests.java
index 0665eec3252..0665eec3252 100644
--- a/java/test/Ice/optional/AllTests.java
+++ b/java/test/src/main/java/test/Ice/optional/AllTests.java
diff --git a/java/test/Ice/optional/Client.java b/java/test/src/main/java/test/Ice/optional/Client.java
index 22f05e262bc..22f05e262bc 100644
--- a/java/test/Ice/optional/Client.java
+++ b/java/test/src/main/java/test/Ice/optional/Client.java
diff --git a/java/test/Ice/optional/InitialI.java b/java/test/src/main/java/test/Ice/optional/InitialI.java
index 191575aa992..191575aa992 100644
--- a/java/test/Ice/optional/InitialI.java
+++ b/java/test/src/main/java/test/Ice/optional/InitialI.java
diff --git a/java/test/Ice/optional/SerializableClass.java b/java/test/src/main/java/test/Ice/optional/SerializableClass.java
index 1d29516c246..1d29516c246 100644
--- a/java/test/Ice/optional/SerializableClass.java
+++ b/java/test/src/main/java/test/Ice/optional/SerializableClass.java
diff --git a/java/test/Ice/optional/Server.java b/java/test/src/main/java/test/Ice/optional/Server.java
index 15446ac47b5..15446ac47b5 100644
--- a/java/test/Ice/optional/Server.java
+++ b/java/test/src/main/java/test/Ice/optional/Server.java
diff --git a/java/test/Ice/optional/Test.ice b/java/test/src/main/java/test/Ice/optional/Test.ice
index 96078ca538a..96078ca538a 100644
--- a/java/test/Ice/optional/Test.ice
+++ b/java/test/src/main/java/test/Ice/optional/Test.ice
diff --git a/java/test/Ice/optional/TestAMD.ice b/java/test/src/main/java/test/Ice/optional/TestAMD.ice
index 95a283116dd..95a283116dd 100644
--- a/java/test/Ice/optional/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/optional/TestAMD.ice
diff --git a/java/test/Ice/optional/lambda/AllTests.java b/java/test/src/main/java/test/Ice/optional/lambda/AllTests.java
index db9fce3f89d..db9fce3f89d 100644
--- a/java/test/Ice/optional/lambda/AllTests.java
+++ b/java/test/src/main/java/test/Ice/optional/lambda/AllTests.java
diff --git a/java/test/Ice/optional/run.py b/java/test/src/main/java/test/Ice/optional/run.py
index ab465630065..db4121d4784 100755
--- a/java/test/Ice/optional/run.py
+++ b/java/test/src/main/java/test/Ice/optional/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/packagemd/AllTests.java b/java/test/src/main/java/test/Ice/packagemd/AllTests.java
index 564bbebbded..564bbebbded 100644
--- a/java/test/Ice/packagemd/AllTests.java
+++ b/java/test/src/main/java/test/Ice/packagemd/AllTests.java
diff --git a/java/test/Ice/packagemd/Client.java b/java/test/src/main/java/test/Ice/packagemd/Client.java
index 8081a790e76..8081a790e76 100644
--- a/java/test/Ice/packagemd/Client.java
+++ b/java/test/src/main/java/test/Ice/packagemd/Client.java
diff --git a/java/test/Ice/packagemd/InitialI.java b/java/test/src/main/java/test/Ice/packagemd/InitialI.java
index 6d4d4fbaf96..6d4d4fbaf96 100644
--- a/java/test/Ice/packagemd/InitialI.java
+++ b/java/test/src/main/java/test/Ice/packagemd/InitialI.java
diff --git a/java/test/Ice/packagemd/NoPackage.ice b/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice
index aa870ce5814..aa870ce5814 100644
--- a/java/test/Ice/packagemd/NoPackage.ice
+++ b/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice
diff --git a/java/test/Ice/packagemd/Package.ice b/java/test/src/main/java/test/Ice/packagemd/Package.ice
index e962c55aea7..e962c55aea7 100644
--- a/java/test/Ice/packagemd/Package.ice
+++ b/java/test/src/main/java/test/Ice/packagemd/Package.ice
diff --git a/java/test/Ice/packagemd/Server.java b/java/test/src/main/java/test/Ice/packagemd/Server.java
index 61bbb0dd2c6..61bbb0dd2c6 100644
--- a/java/test/Ice/packagemd/Server.java
+++ b/java/test/src/main/java/test/Ice/packagemd/Server.java
diff --git a/java/test/Ice/packagemd/Test.ice b/java/test/src/main/java/test/Ice/packagemd/Test.ice
index c90179c6b11..c90179c6b11 100644
--- a/java/test/Ice/packagemd/Test.ice
+++ b/java/test/src/main/java/test/Ice/packagemd/Test.ice
diff --git a/java/test/src/main/java/test/Ice/packagemd/run.py b/java/test/src/main/java/test/Ice/packagemd/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/packagemd/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/plugin/Client.java b/java/test/src/main/java/test/Ice/plugin/Client.java
index 096f8d18a35..096f8d18a35 100644
--- a/java/test/Ice/plugin/Client.java
+++ b/java/test/src/main/java/test/Ice/plugin/Client.java
diff --git a/java/test/Ice/plugin/plugins/BasePlugin.java b/java/test/src/main/java/test/Ice/plugin/plugins/BasePlugin.java
index 9ca8dbf3830..9ca8dbf3830 100644
--- a/java/test/Ice/plugin/plugins/BasePlugin.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/BasePlugin.java
diff --git a/java/test/Ice/plugin/plugins/BasePluginFail.java b/java/test/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java
index 863214bf8ab..863214bf8ab 100644
--- a/java/test/Ice/plugin/plugins/BasePluginFail.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java
diff --git a/java/test/Ice/plugin/plugins/PluginFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginFactory.java
index 02e8ad76d7e..02e8ad76d7e 100644
--- a/java/test/Ice/plugin/plugins/PluginFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginInitializeFailException.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java
index d5bc41ca5d0..d5bc41ca5d0 100644
--- a/java/test/Ice/plugin/plugins/PluginInitializeFailException.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java
diff --git a/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java
index a2f419ebecb..a2f419ebecb 100644
--- a/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginOneFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java
index b4895874772..b4895874772 100644
--- a/java/test/Ice/plugin/plugins/PluginOneFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginOneFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java
index 5fd118de41e..5fd118de41e 100644
--- a/java/test/Ice/plugin/plugins/PluginOneFailFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginThreeFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java
index 6fa993b414f..6fa993b414f 100644
--- a/java/test/Ice/plugin/plugins/PluginThreeFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java
index bc5e4cc0be1..bc5e4cc0be1 100644
--- a/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginTwoFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java
index ecab2ba5222..ecab2ba5222 100644
--- a/java/test/Ice/plugin/plugins/PluginTwoFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java
diff --git a/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java
index 1b5ee8fb4af..1b5ee8fb4af 100644
--- a/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java
+++ b/java/test/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java
diff --git a/java/test/Ice/plugin/run.py b/java/test/src/main/java/test/Ice/plugin/run.py
index c886fc23c12..2b0bccd6c23 100755
--- a/java/test/Ice/plugin/run.py
+++ b/java/test/src/main/java/test/Ice/plugin/run.py
@@ -10,9 +10,8 @@
 
 import os, sys
 
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/properties/Client.java b/java/test/src/main/java/test/Ice/properties/Client.java
index 4b2571e185c..4b2571e185c 100644
--- a/java/test/Ice/properties/Client.java
+++ b/java/test/src/main/java/test/Ice/properties/Client.java
diff --git a/java/test/Ice/properties/config/.gitignore b/java/test/src/main/java/test/Ice/properties/config/.gitignore
index 143c64680f3..143c64680f3 100644
--- a/java/test/Ice/properties/config/.gitignore
+++ b/java/test/src/main/java/test/Ice/properties/config/.gitignore
diff --git a/java/test/Ice/properties/config/config.1 b/java/test/src/main/java/test/Ice/properties/config/config.1
index 2a20653e4c5..2a20653e4c5 100644
--- a/java/test/Ice/properties/config/config.1
+++ b/java/test/src/main/java/test/Ice/properties/config/config.1
diff --git a/java/test/Ice/properties/config/config.2 b/java/test/src/main/java/test/Ice/properties/config/config.2
index be276df6602..be276df6602 100644
--- a/java/test/Ice/properties/config/config.2
+++ b/java/test/src/main/java/test/Ice/properties/config/config.2
diff --git a/java/test/Ice/properties/config/config.3 b/java/test/src/main/java/test/Ice/properties/config/config.3
index 55c1e1123f6..55c1e1123f6 100644
--- a/java/test/Ice/properties/config/config.3
+++ b/java/test/src/main/java/test/Ice/properties/config/config.3
diff --git a/java/test/Ice/properties/config/escapes.cfg b/java/test/src/main/java/test/Ice/properties/config/escapes.cfg
index f438d2b59c8..f438d2b59c8 100644
--- a/java/test/Ice/properties/config/escapes.cfg
+++ b/java/test/src/main/java/test/Ice/properties/config/escapes.cfg
diff --git a/java/test/Ice/properties/run.py b/java/test/src/main/java/test/Ice/properties/run.py
index ba394336fdf..034d0abef9d 100755
--- a/java/test/Ice/properties/run.py
+++ b/java/test/src/main/java/test/Ice/properties/run.py
@@ -11,7 +11,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/proxy/AMDMyDerivedClassI.java b/java/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java
index 5cf41db2870..5cf41db2870 100644
--- a/java/test/Ice/proxy/AMDMyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java
diff --git a/java/test/Ice/proxy/AMDServer.java b/java/test/src/main/java/test/Ice/proxy/AMDServer.java
index 3629cf905b0..3629cf905b0 100644
--- a/java/test/Ice/proxy/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/proxy/AMDServer.java
diff --git a/java/test/Ice/proxy/AllTests.java b/java/test/src/main/java/test/Ice/proxy/AllTests.java
index 98e3c124fbb..98e3c124fbb 100644
--- a/java/test/Ice/proxy/AllTests.java
+++ b/java/test/src/main/java/test/Ice/proxy/AllTests.java
diff --git a/java/test/Ice/proxy/Client.java b/java/test/src/main/java/test/Ice/proxy/Client.java
index 1ad397216c9..1ad397216c9 100644
--- a/java/test/Ice/proxy/Client.java
+++ b/java/test/src/main/java/test/Ice/proxy/Client.java
diff --git a/java/test/Ice/proxy/Collocated.java b/java/test/src/main/java/test/Ice/proxy/Collocated.java
index 26e71003545..26e71003545 100644
--- a/java/test/Ice/proxy/Collocated.java
+++ b/java/test/src/main/java/test/Ice/proxy/Collocated.java
diff --git a/java/test/Ice/proxy/MyDerivedClassI.java b/java/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java
index 35cc76794c0..35cc76794c0 100644
--- a/java/test/Ice/proxy/MyDerivedClassI.java
+++ b/java/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java
diff --git a/java/test/Ice/proxy/Server.java b/java/test/src/main/java/test/Ice/proxy/Server.java
index ae09627cfe5..ae09627cfe5 100644
--- a/java/test/Ice/proxy/Server.java
+++ b/java/test/src/main/java/test/Ice/proxy/Server.java
diff --git a/java/test/Ice/proxy/Test.ice b/java/test/src/main/java/test/Ice/proxy/Test.ice
index be3393a11a6..be3393a11a6 100644
--- a/java/test/Ice/proxy/Test.ice
+++ b/java/test/src/main/java/test/Ice/proxy/Test.ice
diff --git a/java/test/Ice/proxy/TestAMD.ice b/java/test/src/main/java/test/Ice/proxy/TestAMD.ice
index c95dd99bd9a..c95dd99bd9a 100644
--- a/java/test/Ice/proxy/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/proxy/TestAMD.ice
diff --git a/java/test/Ice/proxy/run.py b/java/test/src/main/java/test/Ice/proxy/run.py
index 3fb660be2cb..c013796c45b 100755
--- a/java/test/Ice/proxy/run.py
+++ b/java/test/src/main/java/test/Ice/proxy/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/retry/AllTests.java b/java/test/src/main/java/test/Ice/retry/AllTests.java
index 2552f593dd0..2552f593dd0 100644
--- a/java/test/Ice/retry/AllTests.java
+++ b/java/test/src/main/java/test/Ice/retry/AllTests.java
diff --git a/java/test/Ice/retry/Client.java b/java/test/src/main/java/test/Ice/retry/Client.java
index f26a2b43eca..f26a2b43eca 100644
--- a/java/test/Ice/retry/Client.java
+++ b/java/test/src/main/java/test/Ice/retry/Client.java
diff --git a/java/test/Ice/retry/Collocated.java b/java/test/src/main/java/test/Ice/retry/Collocated.java
index 9a49ec6f991..9a49ec6f991 100644
--- a/java/test/Ice/retry/Collocated.java
+++ b/java/test/src/main/java/test/Ice/retry/Collocated.java
diff --git a/java/test/Ice/retry/Instrumentation.java b/java/test/src/main/java/test/Ice/retry/Instrumentation.java
index 609a8225ef2..609a8225ef2 100644
--- a/java/test/Ice/retry/Instrumentation.java
+++ b/java/test/src/main/java/test/Ice/retry/Instrumentation.java
diff --git a/java/test/Ice/retry/RetryI.java b/java/test/src/main/java/test/Ice/retry/RetryI.java
index f2afcc881dd..f2afcc881dd 100644
--- a/java/test/Ice/retry/RetryI.java
+++ b/java/test/src/main/java/test/Ice/retry/RetryI.java
diff --git a/java/test/Ice/retry/Server.java b/java/test/src/main/java/test/Ice/retry/Server.java
index 678839b36a5..678839b36a5 100644
--- a/java/test/Ice/retry/Server.java
+++ b/java/test/src/main/java/test/Ice/retry/Server.java
diff --git a/java/test/Ice/retry/SystemFailure.java b/java/test/src/main/java/test/Ice/retry/SystemFailure.java
index fc03b8e6f82..fc03b8e6f82 100644
--- a/java/test/Ice/retry/SystemFailure.java
+++ b/java/test/src/main/java/test/Ice/retry/SystemFailure.java
diff --git a/java/test/Ice/retry/Test.ice b/java/test/src/main/java/test/Ice/retry/Test.ice
index 0e1be095f41..0e1be095f41 100644
--- a/java/test/Ice/retry/Test.ice
+++ b/java/test/src/main/java/test/Ice/retry/Test.ice
diff --git a/java/test/src/main/java/test/Ice/retry/run.py b/java/test/src/main/java/test/Ice/retry/run.py
new file mode 100755
index 00000000000..6444a527f9a
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/retry/run.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+print("tests with regular server.")
+TestUtil.clientServerTest()
+print("tests with collocated server.")
+TestUtil.collocatedTest()
diff --git a/java/test/Ice/seqMapping/AMDMyClassI.java b/java/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java
index 49ee338fc1d..49ee338fc1d 100644
--- a/java/test/Ice/seqMapping/AMDMyClassI.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java
diff --git a/java/test/Ice/seqMapping/AMDServer.java b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java
index 5c3e9bc5fc0..5c3e9bc5fc0 100644
--- a/java/test/Ice/seqMapping/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java
diff --git a/java/test/Ice/seqMapping/AllTests.java b/java/test/src/main/java/test/Ice/seqMapping/AllTests.java
index 546de84ae74..546de84ae74 100644
--- a/java/test/Ice/seqMapping/AllTests.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/AllTests.java
diff --git a/java/test/Ice/seqMapping/Client.java b/java/test/src/main/java/test/Ice/seqMapping/Client.java
index 2124aefda4d..2124aefda4d 100644
--- a/java/test/Ice/seqMapping/Client.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Client.java
diff --git a/java/test/Ice/seqMapping/Collocated.java b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java
index bafcdce6b20..bafcdce6b20 100644
--- a/java/test/Ice/seqMapping/Collocated.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java
diff --git a/java/test/Ice/seqMapping/MyClassI.java b/java/test/src/main/java/test/Ice/seqMapping/MyClassI.java
index f0a2505be21..f0a2505be21 100644
--- a/java/test/Ice/seqMapping/MyClassI.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/MyClassI.java
diff --git a/java/test/Ice/seqMapping/Serialize/Large.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java
index 3b6e3edd327..3b6e3edd327 100644
--- a/java/test/Ice/seqMapping/Serialize/Large.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java
diff --git a/java/test/Ice/seqMapping/Serialize/Small.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java
index 3503c5415b5..3503c5415b5 100644
--- a/java/test/Ice/seqMapping/Serialize/Small.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java
diff --git a/java/test/Ice/seqMapping/Serialize/SmallHolder.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java
index f2f01a4805c..f2f01a4805c 100644
--- a/java/test/Ice/seqMapping/Serialize/SmallHolder.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java
diff --git a/java/test/Ice/seqMapping/Serialize/Struct.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java
index 30c80c752e6..30c80c752e6 100644
--- a/java/test/Ice/seqMapping/Serialize/Struct.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java
diff --git a/java/test/Ice/seqMapping/Serialize/StructHolder.java b/java/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java
index 9768382d0e7..9768382d0e7 100644
--- a/java/test/Ice/seqMapping/Serialize/StructHolder.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java
diff --git a/java/test/Ice/seqMapping/Server.java b/java/test/src/main/java/test/Ice/seqMapping/Server.java
index eea5e6536dd..eea5e6536dd 100644
--- a/java/test/Ice/seqMapping/Server.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Server.java
diff --git a/java/test/Ice/seqMapping/Test.ice b/java/test/src/main/java/test/Ice/seqMapping/Test.ice
index 15dfffb884b..15dfffb884b 100644
--- a/java/test/Ice/seqMapping/Test.ice
+++ b/java/test/src/main/java/test/Ice/seqMapping/Test.ice
diff --git a/java/test/Ice/seqMapping/TestAMD.ice b/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice
index 28b3aa3c434..28b3aa3c434 100644
--- a/java/test/Ice/seqMapping/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice
diff --git a/java/test/Ice/seqMapping/Twoways.java b/java/test/src/main/java/test/Ice/seqMapping/Twoways.java
index a6f50f8a327..a6f50f8a327 100644
--- a/java/test/Ice/seqMapping/Twoways.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/Twoways.java
diff --git a/java/test/Ice/seqMapping/TwowaysAMI.java b/java/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java
index 575686dac1b..575686dac1b 100644
--- a/java/test/Ice/seqMapping/TwowaysAMI.java
+++ b/java/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java
diff --git a/java/test/Ice/seqMapping/run.py b/java/test/src/main/java/test/Ice/seqMapping/run.py
index deebe811217..e3ca7f3e9c6 100755
--- a/java/test/Ice/seqMapping/run.py
+++ b/java/test/src/main/java/test/Ice/seqMapping/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/serialize/AllTests.java b/java/test/src/main/java/test/Ice/serialize/AllTests.java
index 212acc0893c..212acc0893c 100644
--- a/java/test/Ice/serialize/AllTests.java
+++ b/java/test/src/main/java/test/Ice/serialize/AllTests.java
diff --git a/java/test/Ice/serialize/Client.java b/java/test/src/main/java/test/Ice/serialize/Client.java
index ffa339ba2ca..ffa339ba2ca 100644
--- a/java/test/Ice/serialize/Client.java
+++ b/java/test/src/main/java/test/Ice/serialize/Client.java
diff --git a/java/test/Ice/serialize/InitialI.java b/java/test/src/main/java/test/Ice/serialize/InitialI.java
index 9fdd4e03c4c..9fdd4e03c4c 100644
--- a/java/test/Ice/serialize/InitialI.java
+++ b/java/test/src/main/java/test/Ice/serialize/InitialI.java
diff --git a/java/test/Ice/serialize/Server.java b/java/test/src/main/java/test/Ice/serialize/Server.java
index 19346017593..19346017593 100644
--- a/java/test/Ice/serialize/Server.java
+++ b/java/test/src/main/java/test/Ice/serialize/Server.java
diff --git a/java/test/Ice/serialize/Test.ice b/java/test/src/main/java/test/Ice/serialize/Test.ice
index 2d9a4030f63..2d9a4030f63 100644
--- a/java/test/Ice/serialize/Test.ice
+++ b/java/test/src/main/java/test/Ice/serialize/Test.ice
diff --git a/java/test/src/main/java/test/Ice/serialize/run.py b/java/test/src/main/java/test/Ice/serialize/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/serialize/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/servantLocator/AMDCookieI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java
index 5f0d227ed38..5f0d227ed38 100644
--- a/java/test/Ice/servantLocator/AMDCookieI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java
diff --git a/java/test/Ice/servantLocator/AMDServantLocatorI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java
index 24b14d3ef39..24b14d3ef39 100644
--- a/java/test/Ice/servantLocator/AMDServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java
diff --git a/java/test/Ice/servantLocator/AMDServer.java b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java
index 29f8754170a..29f8754170a 100644
--- a/java/test/Ice/servantLocator/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java
diff --git a/java/test/Ice/servantLocator/AMDTestActivationI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java
index 31ecfeab516..31ecfeab516 100644
--- a/java/test/Ice/servantLocator/AMDTestActivationI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java
diff --git a/java/test/Ice/servantLocator/AMDTestI.java b/java/test/src/main/java/test/Ice/servantLocator/AMDTestI.java
index 999b2871a89..999b2871a89 100644
--- a/java/test/Ice/servantLocator/AMDTestI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AMDTestI.java
diff --git a/java/test/Ice/servantLocator/AllTests.java b/java/test/src/main/java/test/Ice/servantLocator/AllTests.java
index 15273a5b687..15273a5b687 100644
--- a/java/test/Ice/servantLocator/AllTests.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AllTests.java
diff --git a/java/test/Ice/servantLocator/Client.java b/java/test/src/main/java/test/Ice/servantLocator/Client.java
index c781cb5ac50..c781cb5ac50 100644
--- a/java/test/Ice/servantLocator/Client.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/Client.java
diff --git a/java/test/Ice/servantLocator/Collocated.java b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java
index 612602d933d..612602d933d 100644
--- a/java/test/Ice/servantLocator/Collocated.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java
diff --git a/java/test/Ice/servantLocator/CookieI.java b/java/test/src/main/java/test/Ice/servantLocator/CookieI.java
index 52bab91e922..52bab91e922 100644
--- a/java/test/Ice/servantLocator/CookieI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/CookieI.java
diff --git a/java/test/Ice/servantLocator/ServantLocatorI.java b/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java
index f3fa5388634..f3fa5388634 100644
--- a/java/test/Ice/servantLocator/ServantLocatorI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java
diff --git a/java/test/Ice/servantLocator/Server.java b/java/test/src/main/java/test/Ice/servantLocator/Server.java
index bd3dfdc7288..bd3dfdc7288 100644
--- a/java/test/Ice/servantLocator/Server.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/Server.java
diff --git a/java/test/Ice/servantLocator/Test.ice b/java/test/src/main/java/test/Ice/servantLocator/Test.ice
index 1c12f4b8483..1c12f4b8483 100644
--- a/java/test/Ice/servantLocator/Test.ice
+++ b/java/test/src/main/java/test/Ice/servantLocator/Test.ice
diff --git a/java/test/Ice/servantLocator/TestAMD.ice b/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice
index 2a776edb658..2a776edb658 100644
--- a/java/test/Ice/servantLocator/TestAMD.ice
+++ b/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice
diff --git a/java/test/Ice/servantLocator/TestActivationI.java b/java/test/src/main/java/test/Ice/servantLocator/TestActivationI.java
index 3c1c6f209ad..3c1c6f209ad 100644
--- a/java/test/Ice/servantLocator/TestActivationI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/TestActivationI.java
diff --git a/java/test/Ice/servantLocator/TestI.java b/java/test/src/main/java/test/Ice/servantLocator/TestI.java
index b0704d4f6a6..b0704d4f6a6 100644
--- a/java/test/Ice/servantLocator/TestI.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/TestI.java
diff --git a/java/test/Ice/servantLocator/run.py b/java/test/src/main/java/test/Ice/servantLocator/run.py
index 3176df2a38e..7944176bc4a 100755
--- a/java/test/Ice/servantLocator/run.py
+++ b/java/test/src/main/java/test/Ice/servantLocator/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/slicing/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java
index acca7cf53e8..acca7cf53e8 100644
--- a/java/test/Ice/slicing/exceptions/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java
diff --git a/java/test/Ice/slicing/exceptions/AMDTestI.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java
index 07ca77f5dad..07ca77f5dad 100644
--- a/java/test/Ice/slicing/exceptions/AMDTestI.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java
diff --git a/java/test/Ice/slicing/exceptions/AllTests.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java
index cd159a9006b..cd159a9006b 100644
--- a/java/test/Ice/slicing/exceptions/AllTests.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java
diff --git a/java/test/Ice/slicing/exceptions/Client.java b/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java
index bee392fe3b3..bee392fe3b3 100644
--- a/java/test/Ice/slicing/exceptions/Client.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java
diff --git a/java/test/Ice/slicing/exceptions/ClientPrivate.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice
index 703399d8502..703399d8502 100644
--- a/java/test/Ice/slicing/exceptions/ClientPrivate.ice
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice
diff --git a/java/test/Ice/slicing/exceptions/Server.java b/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java
index 0844dd92275..0844dd92275 100644
--- a/java/test/Ice/slicing/exceptions/Server.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java
diff --git a/java/test/Ice/slicing/exceptions/ServerPrivate.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice
index d12869fb451..d12869fb451 100644
--- a/java/test/Ice/slicing/exceptions/ServerPrivate.ice
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice
diff --git a/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
index ff2ee33b93e..ff2ee33b93e 100644
--- a/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
diff --git a/java/test/Ice/slicing/exceptions/TestI.java b/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java
index 9cedab3b4af..9cedab3b4af 100644
--- a/java/test/Ice/slicing/exceptions/TestI.java
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java
diff --git a/java/test/Ice/slicing/exceptions/run.py b/java/test/src/main/java/test/Ice/slicing/exceptions/run.py
index 91d398b0071..e4130c0b4e6 100755
--- a/java/test/Ice/slicing/exceptions/run.py
+++ b/java/test/src/main/java/test/Ice/slicing/exceptions/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/slicing/objects/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java
index c905976b193..c905976b193 100644
--- a/java/test/Ice/slicing/objects/AMDServer.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java
diff --git a/java/test/Ice/slicing/objects/AMDTestI.java b/java/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java
index f1c9e814a9b..f1c9e814a9b 100644
--- a/java/test/Ice/slicing/objects/AMDTestI.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java
diff --git a/java/test/Ice/slicing/objects/AllTests.java b/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java
index be43330eae1..be43330eae1 100644
--- a/java/test/Ice/slicing/objects/AllTests.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java
diff --git a/java/test/Ice/slicing/objects/Client.java b/java/test/src/main/java/test/Ice/slicing/objects/Client.java
index e725c725339..e725c725339 100644
--- a/java/test/Ice/slicing/objects/Client.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/Client.java
diff --git a/java/test/Ice/slicing/objects/ClientPrivate.ice b/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice
index 716147695ae..716147695ae 100644
--- a/java/test/Ice/slicing/objects/ClientPrivate.ice
+++ b/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice
diff --git a/java/test/Ice/slicing/objects/Server.java b/java/test/src/main/java/test/Ice/slicing/objects/Server.java
index fded6895de1..fded6895de1 100644
--- a/java/test/Ice/slicing/objects/Server.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/Server.java
diff --git a/java/test/Ice/slicing/objects/ServerPrivate.ice b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice
index f880521b7b1..f880521b7b1 100644
--- a/java/test/Ice/slicing/objects/ServerPrivate.ice
+++ b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice
diff --git a/java/test/Ice/slicing/objects/ServerPrivateAMD.ice b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice
index abf0fc4ee64..abf0fc4ee64 100644
--- a/java/test/Ice/slicing/objects/ServerPrivateAMD.ice
+++ b/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice
diff --git a/java/test/Ice/slicing/objects/TestI.java b/java/test/src/main/java/test/Ice/slicing/objects/TestI.java
index aa199bfdcbe..aa199bfdcbe 100644
--- a/java/test/Ice/slicing/objects/TestI.java
+++ b/java/test/src/main/java/test/Ice/slicing/objects/TestI.java
diff --git a/java/test/Ice/slicing/objects/run.py b/java/test/src/main/java/test/Ice/slicing/objects/run.py
index ceb32b83e11..cabf77e2817 100755
--- a/java/test/Ice/slicing/objects/run.py
+++ b/java/test/src/main/java/test/Ice/slicing/objects/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/stream/Client.java b/java/test/src/main/java/test/Ice/stream/Client.java
index 5d88f303e5d..5d88f303e5d 100644
--- a/java/test/Ice/stream/Client.java
+++ b/java/test/src/main/java/test/Ice/stream/Client.java
diff --git a/java/test/Ice/stream/Serialize/Small.java b/java/test/src/main/java/test/Ice/stream/Serialize/Small.java
index 572d3ba10cf..572d3ba10cf 100644
--- a/java/test/Ice/stream/Serialize/Small.java
+++ b/java/test/src/main/java/test/Ice/stream/Serialize/Small.java
diff --git a/java/test/Ice/stream/Test.ice b/java/test/src/main/java/test/Ice/stream/Test.ice
index 5be23454461..5be23454461 100644
--- a/java/test/Ice/stream/Test.ice
+++ b/java/test/src/main/java/test/Ice/stream/Test.ice
diff --git a/java/test/Ice/stream/run.py b/java/test/src/main/java/test/Ice/stream/run.py
index 08e9e18a321..b071a5d9733 100755
--- a/java/test/Ice/stream/run.py
+++ b/java/test/src/main/java/test/Ice/stream/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Ice/threadPoolPriority/Client.java b/java/test/src/main/java/test/Ice/threadPoolPriority/Client.java
index 86dd9468d47..86dd9468d47 100644
--- a/java/test/Ice/threadPoolPriority/Client.java
+++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Client.java
diff --git a/java/test/Ice/threadPoolPriority/PriorityI.java b/java/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java
index 18579e7713a..18579e7713a 100644
--- a/java/test/Ice/threadPoolPriority/PriorityI.java
+++ b/java/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java
diff --git a/java/test/Ice/threadPoolPriority/Server.java b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java
index a1bdc6a0a31..a1bdc6a0a31 100644
--- a/java/test/Ice/threadPoolPriority/Server.java
+++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java
diff --git a/java/test/Ice/threadPoolPriority/Test.ice b/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice
index d69a2fac75a..d69a2fac75a 100644
--- a/java/test/Ice/threadPoolPriority/Test.ice
+++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice
diff --git a/java/test/Ice/interrupt/run.py b/java/test/src/main/java/test/Ice/threadPoolPriority/run.py
index 012b74ea130..46e1ee20e8d 100755
--- a/java/test/Ice/interrupt/run.py
+++ b/java/test/src/main/java/test/Ice/threadPoolPriority/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
@@ -22,6 +23,3 @@ import TestUtil
 
 print("tests with regular server.")
 TestUtil.clientServerTest()
-
-print("tests with collocated server.")
-TestUtil.collocatedTest()
\ No newline at end of file
diff --git a/java/test/Ice/throughput/Client.java b/java/test/src/main/java/test/Ice/throughput/Client.java
index b508b11bc96..b508b11bc96 100644
--- a/java/test/Ice/throughput/Client.java
+++ b/java/test/src/main/java/test/Ice/throughput/Client.java
diff --git a/java/test/Ice/throughput/Server.java b/java/test/src/main/java/test/Ice/throughput/Server.java
index 95737f3dc10..95737f3dc10 100644
--- a/java/test/Ice/throughput/Server.java
+++ b/java/test/src/main/java/test/Ice/throughput/Server.java
diff --git a/java/test/Ice/throughput/Throughput.ice b/java/test/src/main/java/test/Ice/throughput/Throughput.ice
index d1ebb567ec7..d1ebb567ec7 100644
--- a/java/test/Ice/throughput/Throughput.ice
+++ b/java/test/src/main/java/test/Ice/throughput/Throughput.ice
diff --git a/java/test/Ice/throughput/ThroughputI.java b/java/test/src/main/java/test/Ice/throughput/ThroughputI.java
index 53253549102..53253549102 100644
--- a/java/test/Ice/throughput/ThroughputI.java
+++ b/java/test/src/main/java/test/Ice/throughput/ThroughputI.java
diff --git a/java/test/Ice/timeout/AllTests.java b/java/test/src/main/java/test/Ice/timeout/AllTests.java
index 7f0239f32c5..7f0239f32c5 100644
--- a/java/test/Ice/timeout/AllTests.java
+++ b/java/test/src/main/java/test/Ice/timeout/AllTests.java
diff --git a/java/test/Ice/timeout/Client.java b/java/test/src/main/java/test/Ice/timeout/Client.java
index 7476eb5c0e8..7476eb5c0e8 100644
--- a/java/test/Ice/timeout/Client.java
+++ b/java/test/src/main/java/test/Ice/timeout/Client.java
diff --git a/java/test/Ice/timeout/Server.java b/java/test/src/main/java/test/Ice/timeout/Server.java
index b4006770863..b4006770863 100644
--- a/java/test/Ice/timeout/Server.java
+++ b/java/test/src/main/java/test/Ice/timeout/Server.java
diff --git a/java/test/Ice/timeout/Test.ice b/java/test/src/main/java/test/Ice/timeout/Test.ice
index 69ca37fb5c5..69ca37fb5c5 100644
--- a/java/test/Ice/timeout/Test.ice
+++ b/java/test/src/main/java/test/Ice/timeout/Test.ice
diff --git a/java/test/Ice/timeout/TimeoutI.java b/java/test/src/main/java/test/Ice/timeout/TimeoutI.java
index 61b8f7702c2..61b8f7702c2 100644
--- a/java/test/Ice/timeout/TimeoutI.java
+++ b/java/test/src/main/java/test/Ice/timeout/TimeoutI.java
diff --git a/java/test/src/main/java/test/Ice/timeout/run.py b/java/test/src/main/java/test/Ice/timeout/run.py
new file mode 100755
index 00000000000..d5fe04787c9
--- /dev/null
+++ b/java/test/src/main/java/test/Ice/timeout/run.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
+
+TestUtil.clientServerTest()
diff --git a/java/test/Ice/timeout/timeout.jar b/java/test/src/main/java/test/Ice/timeout/timeout.jar
index 81d74d85812..81d74d85812 100644
--- a/java/test/Ice/timeout/timeout.jar
+++ b/java/test/src/main/java/test/Ice/timeout/timeout.jar
diff --git a/java/test/Ice/udp/AllTests.java b/java/test/src/main/java/test/Ice/udp/AllTests.java
index 82dc1224d46..82dc1224d46 100644
--- a/java/test/Ice/udp/AllTests.java
+++ b/java/test/src/main/java/test/Ice/udp/AllTests.java
diff --git a/java/test/Ice/udp/Client.java b/java/test/src/main/java/test/Ice/udp/Client.java
index afd4927a470..afd4927a470 100644
--- a/java/test/Ice/udp/Client.java
+++ b/java/test/src/main/java/test/Ice/udp/Client.java
diff --git a/java/test/Ice/udp/Server.java b/java/test/src/main/java/test/Ice/udp/Server.java
index 05cfc43cbc8..05cfc43cbc8 100644
--- a/java/test/Ice/udp/Server.java
+++ b/java/test/src/main/java/test/Ice/udp/Server.java
diff --git a/java/test/Ice/udp/Test.ice b/java/test/src/main/java/test/Ice/udp/Test.ice
index be7a3269229..be7a3269229 100644
--- a/java/test/Ice/udp/Test.ice
+++ b/java/test/src/main/java/test/Ice/udp/Test.ice
diff --git a/java/test/Ice/udp/TestIntfI.java b/java/test/src/main/java/test/Ice/udp/TestIntfI.java
index d4aba78a2c3..d4aba78a2c3 100644
--- a/java/test/Ice/udp/TestIntfI.java
+++ b/java/test/src/main/java/test/Ice/udp/TestIntfI.java
diff --git a/java/test/Ice/udp/run.py b/java/test/src/main/java/test/Ice/udp/run.py
index cffeb7f24c9..efbd3b862cb 100755
--- a/java/test/Ice/udp/run.py
+++ b/java/test/src/main/java/test/Ice/udp/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceBox/admin/AllTests.java b/java/test/src/main/java/test/IceBox/admin/AllTests.java
index 4063486d1da..4063486d1da 100644
--- a/java/test/IceBox/admin/AllTests.java
+++ b/java/test/src/main/java/test/IceBox/admin/AllTests.java
diff --git a/java/test/IceBox/admin/Client.java b/java/test/src/main/java/test/IceBox/admin/Client.java
index 80664c2edd0..80664c2edd0 100644
--- a/java/test/IceBox/admin/Client.java
+++ b/java/test/src/main/java/test/IceBox/admin/Client.java
diff --git a/java/test/IceBox/admin/Test.ice b/java/test/src/main/java/test/IceBox/admin/Test.ice
index 88ab72b5322..88ab72b5322 100644
--- a/java/test/IceBox/admin/Test.ice
+++ b/java/test/src/main/java/test/IceBox/admin/Test.ice
diff --git a/java/test/IceBox/admin/TestFacetI.java b/java/test/src/main/java/test/IceBox/admin/TestFacetI.java
index 642ee400d20..642ee400d20 100644
--- a/java/test/IceBox/admin/TestFacetI.java
+++ b/java/test/src/main/java/test/IceBox/admin/TestFacetI.java
diff --git a/java/test/IceBox/admin/TestServiceI.java b/java/test/src/main/java/test/IceBox/admin/TestServiceI.java
index 7497771d248..7497771d248 100644
--- a/java/test/IceBox/admin/TestServiceI.java
+++ b/java/test/src/main/java/test/IceBox/admin/TestServiceI.java
diff --git a/java/test/IceBox/admin/config.icebox b/java/test/src/main/java/test/IceBox/admin/config.icebox
index 34d0b233419..34d0b233419 100644
--- a/java/test/IceBox/admin/config.icebox
+++ b/java/test/src/main/java/test/IceBox/admin/config.icebox
diff --git a/java/test/IceBox/admin/config.service b/java/test/src/main/java/test/IceBox/admin/config.service
index 23c6f841859..23c6f841859 100644
--- a/java/test/IceBox/admin/config.service
+++ b/java/test/src/main/java/test/IceBox/admin/config.service
diff --git a/java/test/IceBox/admin/run.py b/java/test/src/main/java/test/IceBox/admin/run.py
index 3d88326f500..f84c3203acd 100755
--- a/java/test/IceBox/admin/run.py
+++ b/java/test/src/main/java/test/IceBox/admin/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceBox/configuration/AllTests.java b/java/test/src/main/java/test/IceBox/configuration/AllTests.java
index 68f5dd65dc6..68f5dd65dc6 100644
--- a/java/test/IceBox/configuration/AllTests.java
+++ b/java/test/src/main/java/test/IceBox/configuration/AllTests.java
diff --git a/java/test/IceBox/configuration/Client.java b/java/test/src/main/java/test/IceBox/configuration/Client.java
index 39785e9de8a..39785e9de8a 100644
--- a/java/test/IceBox/configuration/Client.java
+++ b/java/test/src/main/java/test/IceBox/configuration/Client.java
diff --git a/java/test/IceBox/configuration/Test.ice b/java/test/src/main/java/test/IceBox/configuration/Test.ice
index 757de8ea164..757de8ea164 100644
--- a/java/test/IceBox/configuration/Test.ice
+++ b/java/test/src/main/java/test/IceBox/configuration/Test.ice
diff --git a/java/test/IceBox/configuration/TestI.java b/java/test/src/main/java/test/IceBox/configuration/TestI.java
index abe96b912f8..abe96b912f8 100644
--- a/java/test/IceBox/configuration/TestI.java
+++ b/java/test/src/main/java/test/IceBox/configuration/TestI.java
diff --git a/java/test/IceBox/configuration/TestServiceI.java b/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java
index 037d5465968..037d5465968 100644
--- a/java/test/IceBox/configuration/TestServiceI.java
+++ b/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java
diff --git a/java/test/IceBox/configuration/config.icebox b/java/test/src/main/java/test/IceBox/configuration/config.icebox
index 1dd4b90957c..1dd4b90957c 100644
--- a/java/test/IceBox/configuration/config.icebox
+++ b/java/test/src/main/java/test/IceBox/configuration/config.icebox
diff --git a/java/test/IceBox/configuration/config.icebox2 b/java/test/src/main/java/test/IceBox/configuration/config.icebox2
index 2866764f19f..2866764f19f 100644
--- a/java/test/IceBox/configuration/config.icebox2
+++ b/java/test/src/main/java/test/IceBox/configuration/config.icebox2
diff --git a/java/test/IceBox/configuration/config.service1 b/java/test/src/main/java/test/IceBox/configuration/config.service1
index 6028e615ff5..6028e615ff5 100644
--- a/java/test/IceBox/configuration/config.service1
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service1
diff --git a/java/test/IceBox/configuration/config.service1-2 b/java/test/src/main/java/test/IceBox/configuration/config.service1-2
index c173914db2a..c173914db2a 100644
--- a/java/test/IceBox/configuration/config.service1-2
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service1-2
diff --git a/java/test/IceBox/configuration/config.service2 b/java/test/src/main/java/test/IceBox/configuration/config.service2
index 78e08aadba6..78e08aadba6 100644
--- a/java/test/IceBox/configuration/config.service2
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service2
diff --git a/java/test/IceBox/configuration/config.service2-2 b/java/test/src/main/java/test/IceBox/configuration/config.service2-2
index 36c8d0812cb..36c8d0812cb 100644
--- a/java/test/IceBox/configuration/config.service2-2
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service2-2
diff --git a/java/test/IceBox/configuration/config.service3 b/java/test/src/main/java/test/IceBox/configuration/config.service3
index c93ed144701..c93ed144701 100644
--- a/java/test/IceBox/configuration/config.service3
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service3
diff --git a/java/test/IceBox/configuration/config.service4 b/java/test/src/main/java/test/IceBox/configuration/config.service4
index 182fb3a7289..182fb3a7289 100644
--- a/java/test/IceBox/configuration/config.service4
+++ b/java/test/src/main/java/test/IceBox/configuration/config.service4
diff --git a/java/test/IceBox/configuration/run.py b/java/test/src/main/java/test/IceBox/configuration/run.py
index 45c300b3b16..32ce304919c 100755
--- a/java/test/IceBox/configuration/run.py
+++ b/java/test/src/main/java/test/IceBox/configuration/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceDiscovery/simple/AllTests.java b/java/test/src/main/java/test/IceDiscovery/simple/AllTests.java
index 97546028b59..97546028b59 100644
--- a/java/test/IceDiscovery/simple/AllTests.java
+++ b/java/test/src/main/java/test/IceDiscovery/simple/AllTests.java
diff --git a/java/test/IceDiscovery/simple/Client.java b/java/test/src/main/java/test/IceDiscovery/simple/Client.java
index 7b93371328e..7b93371328e 100644
--- a/java/test/IceDiscovery/simple/Client.java
+++ b/java/test/src/main/java/test/IceDiscovery/simple/Client.java
diff --git a/java/test/IceDiscovery/simple/ControllerI.java b/java/test/src/main/java/test/IceDiscovery/simple/ControllerI.java
index 188b1c7182d..188b1c7182d 100644
--- a/java/test/IceDiscovery/simple/ControllerI.java
+++ b/java/test/src/main/java/test/IceDiscovery/simple/ControllerI.java
diff --git a/java/test/IceDiscovery/simple/Server.java b/java/test/src/main/java/test/IceDiscovery/simple/Server.java
index 7bc444355f4..7bc444355f4 100644
--- a/java/test/IceDiscovery/simple/Server.java
+++ b/java/test/src/main/java/test/IceDiscovery/simple/Server.java
diff --git a/java/test/IceDiscovery/simple/Test.ice b/java/test/src/main/java/test/IceDiscovery/simple/Test.ice
index 03d59e513a7..03d59e513a7 100644
--- a/java/test/IceDiscovery/simple/Test.ice
+++ b/java/test/src/main/java/test/IceDiscovery/simple/Test.ice
diff --git a/java/test/IceDiscovery/simple/TestIntfI.java b/java/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java
index 339bc281081..339bc281081 100644
--- a/java/test/IceDiscovery/simple/TestIntfI.java
+++ b/java/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java
diff --git a/java/test/IceDiscovery/simple/run.py b/java/test/src/main/java/test/IceDiscovery/simple/run.py
index d1581a0663c..2f14ff0442f 100755
--- a/java/test/IceDiscovery/simple/run.py
+++ b/java/test/src/main/java/test/IceDiscovery/simple/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceGrid/simple/.gitignore b/java/test/src/main/java/test/IceGrid/simple/.gitignore
index 1a5104f3c93..1a5104f3c93 100644
--- a/java/test/IceGrid/simple/.gitignore
+++ b/java/test/src/main/java/test/IceGrid/simple/.gitignore
diff --git a/java/test/IceGrid/simple/AllTests.java b/java/test/src/main/java/test/IceGrid/simple/AllTests.java
index b6aba8b8594..b6aba8b8594 100644
--- a/java/test/IceGrid/simple/AllTests.java
+++ b/java/test/src/main/java/test/IceGrid/simple/AllTests.java
diff --git a/java/test/IceGrid/simple/Client.java b/java/test/src/main/java/test/IceGrid/simple/Client.java
index 0da92bbeffe..0da92bbeffe 100644
--- a/java/test/IceGrid/simple/Client.java
+++ b/java/test/src/main/java/test/IceGrid/simple/Client.java
diff --git a/java/test/IceGrid/simple/Server.java b/java/test/src/main/java/test/IceGrid/simple/Server.java
index 1b349a70773..1b349a70773 100644
--- a/java/test/IceGrid/simple/Server.java
+++ b/java/test/src/main/java/test/IceGrid/simple/Server.java
diff --git a/java/test/IceGrid/simple/Test.ice b/java/test/src/main/java/test/IceGrid/simple/Test.ice
index 645988ffff1..645988ffff1 100644
--- a/java/test/IceGrid/simple/Test.ice
+++ b/java/test/src/main/java/test/IceGrid/simple/Test.ice
diff --git a/java/test/IceGrid/simple/TestI.java b/java/test/src/main/java/test/IceGrid/simple/TestI.java
index 82ba95b7aad..82ba95b7aad 100644
--- a/java/test/IceGrid/simple/TestI.java
+++ b/java/test/src/main/java/test/IceGrid/simple/TestI.java
diff --git a/java/test/Freeze/complex/db/.gitignore b/java/test/src/main/java/test/IceGrid/simple/db/.gitignore
index 39af5887579..39af5887579 100644
--- a/java/test/Freeze/complex/db/.gitignore
+++ b/java/test/src/main/java/test/IceGrid/simple/db/.gitignore
diff --git a/java/test/IceGrid/simple/run.py b/java/test/src/main/java/test/IceGrid/simple/run.py
index d31cdaaea77..1dea25f18d6 100755
--- a/java/test/IceGrid/simple/run.py
+++ b/java/test/src/main/java/test/IceGrid/simple/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceGrid/simple/simple_server.xml b/java/test/src/main/java/test/IceGrid/simple/simple_server.xml
index 1548b0e482d..1548b0e482d 100644
--- a/java/test/IceGrid/simple/simple_server.xml
+++ b/java/test/src/main/java/test/IceGrid/simple/simple_server.xml
diff --git a/java/test/IceSSL/certs/c_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/c_dsa_ca1.jks
index fd0b5d6e56d..fd0b5d6e56d 100644
--- a/java/test/IceSSL/certs/c_dsa_ca1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/c_dsa_ca1.jks
diff --git a/java/test/IceSSL/certs/c_rsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1.jks
index ee0b1afc7b2..ee0b1afc7b2 100644
--- a/java/test/IceSSL/certs/c_rsa_ca1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1.jks
diff --git a/java/test/IceSSL/certs/c_rsa_ca1_exp.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1_exp.jks
index fdac5c1508a..fdac5c1508a 100644
--- a/java/test/IceSSL/certs/c_rsa_ca1_exp.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1_exp.jks
diff --git a/java/test/IceSSL/certs/c_rsa_ca2.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca2.jks
index 56f0b25815c..56f0b25815c 100644
--- a/java/test/IceSSL/certs/c_rsa_ca2.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca2.jks
diff --git a/java/test/IceSSL/certs/cacert1.jks b/java/test/src/main/java/test/IceSSL/certs/cacert1.jks
index d17718e981f..d17718e981f 100644
--- a/java/test/IceSSL/certs/cacert1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/cacert1.jks
diff --git a/java/test/IceSSL/certs/cacert2.jks b/java/test/src/main/java/test/IceSSL/certs/cacert2.jks
index 0a22dfe4696..0a22dfe4696 100644
--- a/java/test/IceSSL/certs/cacert2.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/cacert2.jks
diff --git a/java/test/IceSSL/certs/cacerts.jks b/java/test/src/main/java/test/IceSSL/certs/cacerts.jks
index b45456de292..b45456de292 100644
--- a/java/test/IceSSL/certs/cacerts.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/cacerts.jks
diff --git a/java/test/IceSSL/certs/makecerts.py b/java/test/src/main/java/test/IceSSL/certs/makecerts.py
index 3aea85737c8..3aea85737c8 100755..100644
--- a/java/test/IceSSL/certs/makecerts.py
+++ b/java/test/src/main/java/test/IceSSL/certs/makecerts.py
diff --git a/java/test/IceSSL/certs/s_cacert2.jks b/java/test/src/main/java/test/IceSSL/certs/s_cacert2.jks
index 7d55050b1a5..7d55050b1a5 100644
--- a/java/test/IceSSL/certs/s_cacert2.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_cacert2.jks
diff --git a/java/test/IceSSL/certs/s_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_dsa_ca1.jks
index c2e9fb20e71..c2e9fb20e71 100644
--- a/java/test/IceSSL/certs/s_dsa_ca1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_dsa_ca1.jks
diff --git a/java/test/IceSSL/certs/s_rsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1.jks
index f7c85ae50d5..f7c85ae50d5 100644
--- a/java/test/IceSSL/certs/s_rsa_ca1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1.jks
diff --git a/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks
index 0bc38875428..0bc38875428 100644
--- a/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks
diff --git a/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks
index 1f734a49687..1f734a49687 100644
--- a/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks
diff --git a/java/test/IceSSL/certs/s_rsa_ca1_exp.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_exp.jks
index ca6a874a0b5..ca6a874a0b5 100644
--- a/java/test/IceSSL/certs/s_rsa_ca1_exp.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_exp.jks
diff --git a/java/test/IceSSL/certs/s_rsa_ca2.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca2.jks
index e2403e84e53..e2403e84e53 100644
--- a/java/test/IceSSL/certs/s_rsa_ca2.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca2.jks
diff --git a/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks
index 4b7f7ff0a5e..4b7f7ff0a5e 100644
--- a/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks
+++ b/java/test/src/main/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks
diff --git a/java/test/IceSSL/certs/seed.dat b/java/test/src/main/java/test/IceSSL/certs/seed.dat
index ba313c59460..ba313c59460 100644
--- a/java/test/IceSSL/certs/seed.dat
+++ b/java/test/src/main/java/test/IceSSL/certs/seed.dat
diff --git a/java/test/IceSSL/configuration/AllTests.java b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
index 1e955c8c1f5..1e955c8c1f5 100644
--- a/java/test/IceSSL/configuration/AllTests.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
diff --git a/java/test/IceSSL/configuration/CertificateVerifierI.java b/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java
index 03ae75ad659..03ae75ad659 100644
--- a/java/test/IceSSL/configuration/CertificateVerifierI.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java
diff --git a/java/test/IceSSL/configuration/Client.java b/java/test/src/main/java/test/IceSSL/configuration/Client.java
index 36ecfde860d..36ecfde860d 100644
--- a/java/test/IceSSL/configuration/Client.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/Client.java
diff --git a/java/test/IceSSL/configuration/PasswordCallbackI.java b/java/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java
index b7493caaffc..b7493caaffc 100644
--- a/java/test/IceSSL/configuration/PasswordCallbackI.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java
diff --git a/java/test/IceSSL/configuration/Server.java b/java/test/src/main/java/test/IceSSL/configuration/Server.java
index 9438f73d419..9438f73d419 100644
--- a/java/test/IceSSL/configuration/Server.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/Server.java
diff --git a/java/test/IceSSL/configuration/ServerFactoryI.java b/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java
index 34271e03f89..34271e03f89 100644
--- a/java/test/IceSSL/configuration/ServerFactoryI.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java
diff --git a/java/test/IceSSL/configuration/ServerI.java b/java/test/src/main/java/test/IceSSL/configuration/ServerI.java
index ca3e2835e23..ca3e2835e23 100644
--- a/java/test/IceSSL/configuration/ServerI.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/ServerI.java
diff --git a/java/test/IceSSL/configuration/Test.ice b/java/test/src/main/java/test/IceSSL/configuration/Test.ice
index b884e914104..b884e914104 100644
--- a/java/test/IceSSL/configuration/Test.ice
+++ b/java/test/src/main/java/test/IceSSL/configuration/Test.ice
diff --git a/java/test/IceSSL/configuration/run.py b/java/test/src/main/java/test/IceSSL/configuration/run.py
index d812806ea22..791f566f4b2 100755
--- a/java/test/IceSSL/configuration/run.py
+++ b/java/test/src/main/java/test/IceSSL/configuration/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceUtil/fileLock/.gitignore b/java/test/src/main/java/test/IceUtil/fileLock/.gitignore
index 3c97cdc2906..3c97cdc2906 100644
--- a/java/test/IceUtil/fileLock/.gitignore
+++ b/java/test/src/main/java/test/IceUtil/fileLock/.gitignore
diff --git a/java/test/IceUtil/fileLock/Client.java b/java/test/src/main/java/test/IceUtil/fileLock/Client.java
index ce67ad3fe50..ce67ad3fe50 100644
--- a/java/test/IceUtil/fileLock/Client.java
+++ b/java/test/src/main/java/test/IceUtil/fileLock/Client.java
diff --git a/java/test/IceUtil/fileLock/ClientFail.java b/java/test/src/main/java/test/IceUtil/fileLock/ClientFail.java
index c96dc7c9b57..c96dc7c9b57 100644
--- a/java/test/IceUtil/fileLock/ClientFail.java
+++ b/java/test/src/main/java/test/IceUtil/fileLock/ClientFail.java
diff --git a/java/test/IceUtil/fileLock/run.py b/java/test/src/main/java/test/IceUtil/fileLock/run.py
index 3f5b6dbea86..26ab933f034 100755
--- a/java/test/IceUtil/fileLock/run.py
+++ b/java/test/src/main/java/test/IceUtil/fileLock/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/IceUtil/inputUtil/Client.java b/java/test/src/main/java/test/IceUtil/inputUtil/Client.java
index 5d29a45452c..5d29a45452c 100644
--- a/java/test/IceUtil/inputUtil/Client.java
+++ b/java/test/src/main/java/test/IceUtil/inputUtil/Client.java
diff --git a/java/test/IceUtil/inputUtil/run.py b/java/test/src/main/java/test/IceUtil/inputUtil/run.py
index ff92c5757a1..cb15b614259 100755
--- a/java/test/IceUtil/inputUtil/run.py
+++ b/java/test/src/main/java/test/IceUtil/inputUtil/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Slice/generation/.gitignore b/java/test/src/main/java/test/Slice/generation/.gitignore
index 90b07e9d451..90b07e9d451 100644
--- a/java/test/Slice/generation/.gitignore
+++ b/java/test/src/main/java/test/Slice/generation/.gitignore
diff --git a/java/test/Slice/generation/File1.ice b/java/test/src/main/java/test/Slice/generation/File1.ice
index c92e0a00b2d..c92e0a00b2d 100644
--- a/java/test/Slice/generation/File1.ice
+++ b/java/test/src/main/java/test/Slice/generation/File1.ice
diff --git a/java/test/Slice/generation/File2.ice b/java/test/src/main/java/test/Slice/generation/File2.ice
index 2d6f7a498f7..2d6f7a498f7 100644
--- a/java/test/Slice/generation/File2.ice
+++ b/java/test/src/main/java/test/Slice/generation/File2.ice
diff --git a/java/test/Slice/generation/list-generated.out b/java/test/src/main/java/test/Slice/generation/list-generated.out
index cbacf36a41c..cbacf36a41c 100644
--- a/java/test/Slice/generation/list-generated.out
+++ b/java/test/src/main/java/test/Slice/generation/list-generated.out
diff --git a/java/test/Slice/generation/run.py b/java/test/src/main/java/test/Slice/generation/run.py
index 248350f9438..72f21335e28 100755
--- a/java/test/Slice/generation/run.py
+++ b/java/test/src/main/java/test/Slice/generation/run.py
@@ -10,7 +10,8 @@
 
 import os, sys, re
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Slice/keyword/Client.java b/java/test/src/main/java/test/Slice/keyword/Client.java
index df96ebc985f..df96ebc985f 100644
--- a/java/test/Slice/keyword/Client.java
+++ b/java/test/src/main/java/test/Slice/keyword/Client.java
diff --git a/java/test/Slice/keyword/Key.ice b/java/test/src/main/java/test/Slice/keyword/Key.ice
index f2002f43ccc..f2002f43ccc 100644
--- a/java/test/Slice/keyword/Key.ice
+++ b/java/test/src/main/java/test/Slice/keyword/Key.ice
diff --git a/java/test/Slice/keyword/run.py b/java/test/src/main/java/test/Slice/keyword/run.py
index 4f211e2bdd8..1b7865a118d 100755
--- a/java/test/Slice/keyword/run.py
+++ b/java/test/src/main/java/test/Slice/keyword/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Slice/macros/Client.java b/java/test/src/main/java/test/Slice/macros/Client.java
index 4c4fa0e7b0a..4c4fa0e7b0a 100644
--- a/java/test/Slice/macros/Client.java
+++ b/java/test/src/main/java/test/Slice/macros/Client.java
diff --git a/java/test/Slice/macros/Test.ice b/java/test/src/main/java/test/Slice/macros/Test.ice
index 2a791540afa..2a791540afa 100644
--- a/java/test/Slice/macros/Test.ice
+++ b/java/test/src/main/java/test/Slice/macros/Test.ice
diff --git a/java/test/Slice/macros/run.py b/java/test/src/main/java/test/Slice/macros/run.py
index 11e187b79d2..4b62a2b9c3a 100755
--- a/java/test/Slice/macros/run.py
+++ b/java/test/src/main/java/test/Slice/macros/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Slice/structure/Client.java b/java/test/src/main/java/test/Slice/structure/Client.java
index 74f2239ae2e..74f2239ae2e 100644
--- a/java/test/Slice/structure/Client.java
+++ b/java/test/src/main/java/test/Slice/structure/Client.java
diff --git a/java/test/Slice/structure/Test.ice b/java/test/src/main/java/test/Slice/structure/Test.ice
index 5cda671b732..5cda671b732 100644
--- a/java/test/Slice/structure/Test.ice
+++ b/java/test/src/main/java/test/Slice/structure/Test.ice
diff --git a/java/test/Slice/structure/run.py b/java/test/src/main/java/test/Slice/structure/run.py
index a3d93af454d..c48b8cf432c 100755
--- a/java/test/Slice/structure/run.py
+++ b/java/test/src/main/java/test/Slice/structure/run.py
@@ -10,7 +10,8 @@
 
 import os, sys
 
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
diff --git a/java/test/Util/Application.java b/java/test/src/main/java/test/Util/Application.java
index 07c7d28b54e..07c7d28b54e 100644
--- a/java/test/Util/Application.java
+++ b/java/test/src/main/java/test/Util/Application.java
diff --git a/java/test/test.iml b/java/test/test.iml
index 857ab40bfe4..975e1a9afea 100644
--- a/java/test/test.iml
+++ b/java/test/test.iml
@@ -5,7 +5,6 @@
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
@@ -15,16 +14,20 @@
       <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/ami/lambda" />
+      <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/invoke/lambda" />
+      <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/operations/lambda" />
+      <excludeFolder url="file://$MODULE_DIR$/src/main/java/test/Ice/optional/lambda" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="src_Ice" exported="" />
-    <orderEntry type="module" module-name="src_Freeze" exported="" />
-    <orderEntry type="module" module-name="src_IceDiscovery" exported="" />
-    <orderEntry type="module" module-name="src_IceBox" exported="" />
-    <orderEntry type="module" module-name="src_Glacier2" exported="" />
-    <orderEntry type="module" module-name="src_IceStorm" exported="" />
-    <orderEntry type="module" module-name="src_IceGrid" exported="" />
+    <orderEntry type="module" module-name="Ice" exported="" />
+    <orderEntry type="module" module-name="Freeze" exported="" />
+    <orderEntry type="module" module-name="IceDiscovery" exported="" />
+    <orderEntry type="module" module-name="IceBox" exported="" />
+    <orderEntry type="module" module-name="Glacier2" exported="" />
+    <orderEntry type="module" module-name="IceStorm" exported="" />
+    <orderEntry type="module" module-name="IceGrid" exported="" />
   </component>
 </module>
 
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 277891f3802..6ec47126644 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -175,7 +175,8 @@ testErrors = []
 
 toplevel = None
 
-path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ]
+path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../..", "../../../../../..",
+         "../../../../../../..", "../../../../../../../..", "../../../../../../../../.." ]
 head = os.path.dirname(sys.argv[0])
 if len(head) > 0:
     path = [os.path.join(head, p) for p in path]