Refactor of the gradle build files for test plugin

3 files changed, 85 insertions, 78 deletions

diff --git a/java/settings.gradle b/java/settings.gradle
index d5eaca816e2..fd7684edd58 100644
--- a/java/settings.gradle
+++ b/java/settings.gradle
@@ -33,7 +33,7 @@ project(':ant').projectDir = new File('src/ant')
 
 // Tests
 include 'test'
-include 'testplugin'
+include 'test/plugins'
 
 // Demos
 ['applet', 'async', 'bidir', 'callback', 'hello', 'invoke',
diff --git a/java/test/build.gradle b/java/test/build.gradle
index e5954b232c7..c5e18db6ca9 100644
--- a/java/test/build.gradle
+++ b/java/test/build.gradle
@@ -10,91 +10,54 @@
 ext.testDir = "${projectDir}/src/main/java/test"
 apply from: "slice.gradle"
 
-project(':test') {
-    def hasLambda = org.gradle.internal.jvm.Jvm.current().getJavaVersion().toString().toFloat() >= 1.8f
+def hasLambda = org.gradle.internal.jvm.Jvm.current().getJavaVersion().toString().toFloat() >= 1.8f
 
-    sourceSets {
-        main {
-            java {
-                if (!hasLambda) {
-                    exclude '**/lambda'
-                }
-                exclude '**/plugin/plugins/**'
-                exclude 'ejb'
+sourceSets {
+    main {
+        java {
+            if (!hasLambda) {
+                exclude '**/lambda'
             }
+            exclude '**/plugin/plugins/**'
+            exclude 'ejb'
         }
     }
-
-    idea.module {
-        excludeDirs -= file(buildDir)
-        buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-    }
-
-    if (distJarDir == null) {
-        dependencies {
-            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}"
-        dependencies {
-            compile files("${distJarDir}/Ice.jar")
-            compile files("${distJarDir}/Freeze.jar")
-            compile files("${distJarDir}/IceDiscovery.jar")
-            compile files("${distJarDir}/IceBox.jar")
-            compile files("${distJarDir}/Glacier2.jar")
-            compile files("${distJarDir}/IceStorm.jar")
-            compile files("${distJarDir}/IceGrid.jar")
-            compile "com.sleepycat:db:${dbVersion}"
-        }
-    }
-
-    jar {
-        archiveName = "IceTest.jar"
-        destinationDir = new File("$rootProject.projectDir/lib/")
-    }
-
-    clean {
-        delete("$rootProject.projectDir/lib/IceTest.jar")
-    }
 }
 
-project(':testplugin') {
-    sourceSets {
-        main {
-            java {
-                srcDirs '../test'
-                include '**/plugin/plugins/**'
-            }
-        }
-    }
-
-    idea.module {
-        excludeDirs -= file(buildDir)
-        buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-    }
+idea.module {
+    excludeDirs -= file(buildDir)
+    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
+}
 
-    if (distJarDir == null) {
-        dependencies {
-            compile project(':Ice')
-        }
-    } else {
-        dependencies {
-            compile files("${distJarDir}/Ice.jar")
-        }
+if (distJarDir == null) {
+    dependencies {
+        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}"
+    dependencies {
+        compile files("${distJarDir}/Ice.jar")
+        compile files("${distJarDir}/Freeze.jar")
+        compile files("${distJarDir}/IceDiscovery.jar")
+        compile files("${distJarDir}/IceBox.jar")
+        compile files("${distJarDir}/Glacier2.jar")
+        compile files("${distJarDir}/IceStorm.jar")
+        compile files("${distJarDir}/IceGrid.jar")
+        compile "com.sleepycat:db:${dbVersion}"
     }
+}
 
-    jar {
-        archiveName = "IceTestPlugins.jar"
-        destinationDir = new File("$rootProject.projectDir/lib/")
-    }
+jar {
+    archiveName = "IceTest.jar"
+    destinationDir = new File("$rootProject.projectDir/lib/")
+}
 
-    clean {
-        delete("$rootProject.projectDir/lib/IceTestPlugins.jar")
-    }
+clean {
+    delete("$rootProject.projectDir/lib/IceTest.jar")
 }
diff --git a/java/test/plugins/build.gradle b/java/test/plugins/build.gradle
new file mode 100644
index 00000000000..22366750b3b
--- /dev/null
+++ b/java/test/plugins/build.gradle
@@ -0,0 +1,44 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+//ext.testDir = "${projectDir}/src/main/java/test"
+
+sourceSets {
+    main {
+        java {
+            srcDirs "$rootProject.projectDir/test"
+            include '**/plugin/plugins/**'
+        }
+    }
+}
+
+idea.module {
+    excludeDirs -= file(buildDir)
+    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
+}
+
+if (distJarDir == null) {
+    dependencies {
+        compile project(':Ice')
+    }
+} else {
+    dependencies {
+        compile files("${distJarDir}/Ice.jar")
+    }
+}
+
+jar {
+    archiveName = "IceTestPlugins.jar"
+    destinationDir = new File("$rootProject.projectDir/lib/")
+}
+
+clean {
+    delete("$rootProject.projectDir/lib/IceTestPlugins.jar")
+}
+