- Add as documented src/main/slice to the gradle slice plugin.

- Simplifications and cleanup to the gradle build files.

22 files changed, 147 insertions, 702 deletions

diff --git a/java/build.gradle b/java/build.gradle
index ac5e6d0089f..85a387ba035 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -8,12 +8,13 @@
 // **********************************************************************
 
 subprojects {
+	project.version = iceVersion
+	project.group = "com.zeroc"
+
 	apply plugin: 'java'
 	apply plugin: 'idea'
 	apply from: "$rootProject.projectDir/gradle/ice.gradle"
 
-	project.version = iceVersion
-	project.group = "com.zeroc"
 
 	repositories {
 		if (distJarDir != null) {
@@ -36,11 +37,15 @@ subprojects {
 	tasks.withType(JavaCompile) {
         options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Xlint:-options"
     }
+
+	idea.module {
+		excludeDirs -= file(buildDir)
+		buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
+	}
 }
 
 apply from: "$rootProject.projectDir/demo/Ice/build.gradle"
 apply from: "$rootProject.projectDir/demo/IceDiscovery/build.gradle"
-apply from: "$rootProject.projectDir/demo/IceBox/build.gradle"
 apply from: "$rootProject.projectDir/demo/Glacier2/build.gradle"
 apply from: "$rootProject.projectDir/demo/IceGrid/build.gradle"
 apply from: "$rootProject.projectDir/demo/Manual/build.gradle"
diff --git a/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/Java.groovy b/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/Java.groovy
index a27e7ef0847..e0c6a213fe1 100644
--- a/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/Java.groovy
+++ b/java/buildSrc/src/main/groovy/com/zeroc/gradle/plugins/slice/Java.groovy
@@ -13,7 +13,7 @@ class Java {
     def name
     def args = ""
     def files
-    def srcDir
+    def srcDir = "src/main/slice"
     def include
 
     Java(String n) {
diff --git a/java/demo/Database/library/build.gradle b/java/demo/Database/library/build.gradle
index 12ad8116e1c..9ff5a463d2d 100644
--- a/java/demo/Database/library/build.gradle
+++ b/java/demo/Database/library/build.gradle
@@ -29,42 +29,8 @@ dependencies {
 	compile localDependency("glacier2")
 }
 
-// Create a jar for the client & server which includes everything in the demo.
-task clientJar(type: Jar) {
-	version = ""
-   	baseName = "client"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-task serverJar(type: Jar) {
-	version = ""
-    baseName = "server"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-clientJar {
-    manifest {
-        attributes("Main-Class": "Client")
-        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-    }
-}
+// Don't create the default jar.
+jar.enabled = false
 
-serverJar {
-    manifest {
-    	attributes("Main-Class": "Server")
-        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-    }
-}
-
-artifacts {
-	archives clientJar, serverJar;
-}
-
-idea.module {
-	excludeDirs -= file(buildDir)
-	buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
+demoJar("client")
+demoJar("server")
\ No newline at end of file
diff --git a/java/demo/Freeze/bench/build.gradle b/java/demo/Freeze/bench/build.gradle
index b9f4d0fc36d..5712d638122 100644
--- a/java/demo/Freeze/bench/build.gradle
+++ b/java/demo/Freeze/bench/build.gradle
@@ -75,27 +75,7 @@ dependencies {
 	compile files(dbJar)
 }
 
-// Create a jar for the client & server which includes everything in the demo.
-task clientJar(type: Jar) {
-	version = ""
-   	baseName = "client"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-clientJar {
-    manifest {
-        attributes("Main-Class": "Client")
-        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-    }
-}
+// Don't create the default jar.
+jar.enabled = false
 
-artifacts {
-	archives clientJar;
-}
-
-idea.module {
-	excludeDirs -= file(buildDir)
-	buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
+demoJar("client")
diff --git a/java/demo/Freeze/casino/build.gradle b/java/demo/Freeze/casino/build.gradle
index 372f234a1be..8f967227481 100644
--- a/java/demo/Freeze/casino/build.gradle
+++ b/java/demo/Freeze/casino/build.gradle
@@ -32,45 +32,8 @@ dependencies {
 	compile files(dbJar)
 }
 
-// Create a jar for the client & server which includes everything in the demo.
-task clientJar(type: Jar) {
-	version = ""
-   	baseName = "client"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-task serverJar(type: Jar) {
-	version = ""
-    baseName = "server"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-clientJar {
-    manifest {
-        attributes("Main-Class": "Client")
-        attributes("Class-Path": configurations.runtime.resolve().collect { it.toURI() }.join(' '))
-    }
-}
-
-serverJar {
-    manifest {
-    	attributes("Main-Class": "Server")
-        attributes("Class-Path": configurations.runtime.resolve().collect { it.toURI() }.join(' '))
-    }
-}
-
-artifacts {
-	archives clientJar, serverJar;
-}
-
 // Don't create the default jar.
 jar.enabled = false
 
-idea.module {
-	excludeDirs -= file(buildDir)
-	buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
+demoJar("client")
+demoJar("server")
diff --git a/java/demo/Freeze/library/build.gradle b/java/demo/Freeze/library/build.gradle
index ce1bd5668b2..8a152f47ec9 100644
--- a/java/demo/Freeze/library/build.gradle
+++ b/java/demo/Freeze/library/build.gradle
@@ -41,60 +41,9 @@ dependencies {
 	compile files(dbJar)
 }
 
-// Create a jar for the client & server which includes everything in the demo.
-task clientJar(type: Jar) {
-	version = ""
-   	baseName = "client"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-task serverJar(type: Jar) {
-	version = ""
-    baseName = "server"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-task collocatedJar(type: Jar) {
-	version = ""
-    baseName = "collocated"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-clientJar {
-    manifest {
-        attributes("Main-Class": "Client")
-        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-    }
-}
-
-serverJar {
-    manifest {
-    	attributes("Main-Class": "Server")
-        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-    }
-}
-
-collocatedJar {
-    manifest {
-    	attributes("Main-Class": "Collocated")
-        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-    }
-}
-
-artifacts {
-	archives clientJar, serverJar, collocatedJar;
-}
-
 // Don't create the default jar.
 jar.enabled = false
 
-idea.module {
-	excludeDirs -= file(buildDir)
-	buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
+demoJar("client")
+demoJar("server")
+demoJar("collocated")
diff --git a/java/demo/Freeze/phonebook/build.gradle b/java/demo/Freeze/phonebook/build.gradle
index e9b0be7a28f..295dbe0c06e 100644
--- a/java/demo/Freeze/phonebook/build.gradle
+++ b/java/demo/Freeze/phonebook/build.gradle
@@ -42,60 +42,9 @@ dependencies {
 	compile files(dbJar)
 }
 
-// Create a jar for the client & server which includes everything in the demo.
-task clientJar(type: Jar) {
-	version = ""
-   	baseName = "client"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-task serverJar(type: Jar) {
-	version = ""
-    baseName = "server"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-task collocatedJar(type: Jar) {
-	version = ""
-    baseName = "collocated"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-clientJar {
-    manifest {
-        attributes("Main-Class": "Client")
-        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-    }
-}
-
-serverJar {
-    manifest {
-    	attributes("Main-Class": "Server")
-        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-    }
-}
-
-collocatedJar {
-    manifest {
-    	attributes("Main-Class": "Collocated")
-        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-    }
-}
-
-artifacts {
-	archives clientJar, serverJar, collocatedJar;
-}
-
 // Don't create the default jar.
 jar.enabled = false
 
-idea.module {
-	excludeDirs -= file(buildDir)
-	buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
+demoJar("client")
+demoJar("server")
+demoJar("collocated")
diff --git a/java/demo/Freeze/transform/build.gradle b/java/demo/Freeze/transform/build.gradle
index 74da6e40f83..f2b5a9f2df8 100644
--- a/java/demo/Freeze/transform/build.gradle
+++ b/java/demo/Freeze/transform/build.gradle
@@ -112,8 +112,3 @@ readnewJar {
 artifacts {
 	archives createJar, recreateJar, readJar, readnewJar;
 }
-
-idea.module {
-	excludeDirs -= file(buildDir)
-	buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
diff --git a/java/demo/Glacier2/build.gradle b/java/demo/Glacier2/build.gradle
index 392525d5372..c3464318177 100644
--- a/java/demo/Glacier2/build.gradle
+++ b/java/demo/Glacier2/build.gradle
@@ -31,57 +31,17 @@
 			compile localDependency("glacier2")
 		}
 
-		// Create a jar for the client & server which includes everything in the demo.
-		task clientJar(type: Jar) {
-			version = ""
- 		    baseName = "client"
-    		from(sourceSets.main.output) {
-        		include "**"
-    		}
-		}
-
-		task serverJar(type: Jar) {
-			version = ""
- 		    baseName = "server"
-    		from(sourceSets.main.output) {
-        		include "**"
-    		}
-		}
-
-		clientJar {
-		    manifest {
-		    	attributes("Main-Class": "Client")
-		        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-		    }
-		}
-
-		serverJar {
-		    manifest {
-		    	attributes("Main-Class": "Server")
-		    	attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-		    }
-		}
+		// Don't create the default jar.
+		jar.enabled = false
 
 		// The voip demo has no clientJar.
 		if(name != "voip") {
-			artifacts {
-				archives clientJar;
-			}
+			demoJar("client")
 		}
 
 		// The chat demo has no serverJar.
 		if(name != "chat") {
-			artifacts {
-				archives serverJar;
-			}
-		}
-
-		// Don't create the default jar.
-		jar.enabled = false
-
-		idea.module {
-		    excludeDirs -= file(buildDir)
-		    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
+			demoJar("server")
 		}
 	}
 }
diff --git a/java/demo/Ice/build.gradle b/java/demo/Ice/build.gradle
index 36b327b82a6..90b0cbad8cc 100644
--- a/java/demo/Ice/build.gradle
+++ b/java/demo/Ice/build.gradle
@@ -33,48 +33,11 @@
 			compile localDependency("ice")
 		}
 
-		// Create a jar for the client & server which includes everything in the demo.
-		task clientJar(type: Jar) {
-			version = ""
-			baseName = "client"
-    		from(sourceSets.main.output) {
-        		include "**"
-    		}
-		}
-
-		task serverJar(type: Jar) {
-			version = ""
-			baseName = "server"
-			from(sourceSets.main.output) {
-				include "**"
-			}
-		}
-
-		clientJar {
-		    manifest {
-		    	attributes("Main-Class": "Client")
-		        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-		    }
-		}
-
-		serverJar {
-		    manifest {
-		    	attributes("Main-Class": "Server")
-		    	attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-		    }
-		}
-
-		artifacts {
-			archives clientJar, serverJar;
-		}
-
 		// Don't create the default jar.
 		jar.enabled = false
 
-		idea.module {
-		    excludeDirs -= file(buildDir)
-		    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-		}
+		demoJar("client")
+		demoJar("server")
 	}
 }
 
diff --git a/java/demo/IceBox/build.gradle b/java/demo/IceBox/build.gradle
deleted file mode 100644
index 038a923ef7d..00000000000
--- a/java/demo/IceBox/build.gradle
+++ /dev/null
@@ -1,67 +0,0 @@
-['hello'].each {
- 	def name = it
-	project(":demoIceBox${it.capitalize()}") {
-		slice {
-			java {
-				include = ["${projectDir}", "${sliceDir}"]
-				srcDir = '.'
-			}
-		}
-
-		sourceSets {
-			main {
-				java {
-					srcDir '.'
-					output.classesDir "${buildDir}/classes"
-				}
-			}
-		}
-
-		dependencies {
-			compile localDependency("ice")
-			compile localDependency("icebox")
-		}
-
-        // Create a jar for the client & server which includes everything in the demo.
-        task clientJar(type: Jar) {
-        	version = ""
-           	baseName = "client"
-	        from(sourceSets.main.output) {
-	        	include "**"
-	        }
-        }
-
-        task serverJar(type: Jar) {
-        	version = ""
-	        baseName = "server"
-	        from(sourceSets.main.output) {
-	        	include "**"
-	        }
-        }
-
-        clientJar {
-            manifest {
-                attributes("Main-Class": "Client")
-                attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-            }
-        }
-
-        serverJar {
-            manifest {
-                attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-            }
-        }
-
-        artifacts {
-        	archives clientJar, serverJar;
-        }
-
-        // Don't create the default jar.
-        jar.enabled = false
-
-		idea.module {
-		    excludeDirs -= file(buildDir)
-		    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-		}
-	}
-}
diff --git a/java/demo/IceDiscovery/build.gradle b/java/demo/IceDiscovery/build.gradle
index 9aa36dd9ce6..0083183eb28 100644
--- a/java/demo/IceDiscovery/build.gradle
+++ b/java/demo/IceDiscovery/build.gradle
@@ -31,48 +31,10 @@
 			compile localDependency("icediscovery")
 		}
 
-		// Create a jar for the client & server which includes everything in the demo.
-		task clientJar(type: Jar) {
-			version = ""
- 		    baseName = "client"
-    		from(sourceSets.main.output) {
-        		include "**"
-    		}
-		}
-
-		task serverJar(type: Jar) {
-			version = ""
- 		    baseName = "server"
-    		from(sourceSets.main.output) {
-        		include "**"
-    		}
-		}
-
-		clientJar {
-		    manifest {
-		    	attributes("Main-Class": "Client")
-		        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-		    }
-		}
-
-		serverJar {
-		    manifest {
-		    	attributes("Main-Class": "Server")
-		    	attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-		    }
-		}
-
-
-		artifacts {
-			archives clientJar, serverJar;
-		}
-
 		// Don't create the default jar.
 		jar.enabled = false
 
-		idea.module {
-		    excludeDirs -= file(buildDir)
-		    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-		}
+		demoJar("client")
+		demoJar("server")
 	}
 }
diff --git a/java/demo/IceGrid/build.gradle b/java/demo/IceGrid/build.gradle
index b31748f207f..f2cbbd9803d 100644
--- a/java/demo/IceGrid/build.gradle
+++ b/java/demo/IceGrid/build.gradle
@@ -23,47 +23,10 @@
 			compile localDependency("icegrid")
 		}
 
-        // Create a jar for the client & server which includes everything in the demo.
-        task clientJar(type: Jar) {
-        	version = ""
-           	baseName = "client"
-	        from(sourceSets.main.output) {
-	        	include "**"
-	        }
-        }
+		// Don't create the default jar.
+		jar.enabled = false
 
-        task serverJar(type: Jar) {
-        	version = ""
-	        baseName = "server"
-	        from(sourceSets.main.output) {
-	        	include "**"
-	        }
-        }
-
-        clientJar {
-            manifest {
-                attributes("Main-Class": "Client")
-                attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-            }
-        }
-
-        serverJar {
-            manifest {
-            	attributes("Main-Class": "Server")
-                attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-            }
-        }
-
-        artifacts {
-        	archives clientJar, serverJar;
-        }
-
-        // Don't create the default jar.
-        jar.enabled = false
-
-		idea.module {
-		    excludeDirs -= file(buildDir)
-		    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-		}
+		demoJar("client")
+		demoJar("server")
 	}
 }
diff --git a/java/demo/IceStorm/clock/build.gradle b/java/demo/IceStorm/clock/build.gradle
index 64894205c0a..748fa0c2541 100644
--- a/java/demo/IceStorm/clock/build.gradle
+++ b/java/demo/IceStorm/clock/build.gradle
@@ -64,9 +64,3 @@ artifacts {
 }
 
 jar.enabled = false
-
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
diff --git a/java/demo/Manual/build.gradle b/java/demo/Manual/build.gradle
index c7c75450230..f7bf1253ec4 100644
--- a/java/demo/Manual/build.gradle
+++ b/java/demo/Manual/build.gradle
@@ -40,47 +40,11 @@
 			}
 		}
 
-		// Create a jar for the client & server which includes everything in the demo.
-		task clientJar(type: Jar) {
-			version = ""
- 		   	baseName = "client"
-    		from(sourceSets.main.output) {
-        		include "**"
-    		}
-		}
-
-		task serverJar(type: Jar) {
-			version = ""
- 		    baseName = "server"
-    		from(sourceSets.main.output) {
-        		include "**"
-    		}
-		}
-
-		clientJar {
-		    manifest {
-		    	attributes("Main-Class": "Client")
-		        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-		    }
-		}
-
-		serverJar {
-		    manifest {
-		    	attributes("Main-Class": "Server")
-		    	attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-		    }
-		}
-
-		artifacts {
-			archives clientJar, serverJar;
-		}
 
 		// Don't create the default jar.
 		jar.enabled = false
 
-		idea.module {
-		    excludeDirs -= file(buildDir)
-		    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-		}
+		demoJar("client")
+		demoJar("server")
 	}
 }
diff --git a/java/demo/Manual/map_filesystem/build.gradle b/java/demo/Manual/map_filesystem/build.gradle
index bacbc78a5f3..d6e50f6ec59 100644
--- a/java/demo/Manual/map_filesystem/build.gradle
+++ b/java/demo/Manual/map_filesystem/build.gradle
@@ -47,45 +47,8 @@ dependencies {
 	compile files(dbJar)
 }
 
-// Create a jar for the client & server which includes everything in the demo.
-task clientJar(type: Jar) {
-	version = ""
-   	baseName = "client"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-task serverJar(type: Jar) {
-	version = ""
-    baseName = "server"
-    from(sourceSets.main.output) {
-    	include "**"
-    }
-}
-
-clientJar {
-    manifest {
-        attributes("Main-Class": "Client")
-        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-    }
-}
-
-serverJar {
-    manifest {
-    	attributes("Main-Class": "Server")
-        attributes("Class-Path": configurations.compile.resolve().collect { it.toURI() }.join(' '))
-    }
-}
-
-artifacts {
-	archives clientJar, serverJar;
-}
-
 // Don't create the default jar.
 jar.enabled = false
 
-idea.module {
-	excludeDirs -= file(buildDir)
-	buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
+demoJar("client")
+demoJar("server")
diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle
index 504fb489897..72db011eddf 100644
--- a/java/gradle/ice.gradle
+++ b/java/gradle/ice.gradle
@@ -23,42 +23,34 @@ try {
 def isWindows = false
 def slice2java = "slice2java"
 def slice2freezej = "slice2freezej"
-if (System.properties['os.name'].toLowerCase().contains('windows'))
-{
+if (System.properties['os.name'].toLowerCase().contains('windows')) {
     isWindows = true
     slice2java = "slice2java.exe"
     slice2freezej = "slice2freezej.exe"
 }
 
 // Set the install prefix to defaults if not already set
-if (prefix == null || prefix.length() == 0)
-{
-	if (isWindows)
-	{
-		prefix = "C:\\Ice-${iceVersion}"
-	}
-	else
-	{
-		prefix = "/opt/Ice-${iceVersion}"
+if (prefix == null || prefix.length() == 0) {
+	if (isWindows) {
+		prefix = "C:\\Ice-${project.version}"
+	} else {
+		prefix = "/opt/Ice-${project.version}"
 	}
 }
 
 // First check if ICE_HOME is set and it points at a valid installation
 def env = System.getenv()
 def iceHome = env['ICE_HOME']
-if (iceHome != null && iceHome.length() > 0)
-{
+if (iceHome != null && iceHome.length() > 0) {
 	def translator = new File("$iceHome/bin/$slice2java")
-	if (!translator.exists())
-	{
+	if (!translator.exists()) {
 		throw new GradleException("Unable to find $slice2java in $iceHome, please verify ICE_HOME is " +
 								  "properly configured and Ice is correctly installed.")
 	}
 }
 
 def iceBinDist = false
-if(env['USE_BIN_DIST'] == "yes")
-{
+if(env['USE_BIN_DIST'] == "yes") {
 	iceBinDist = true
 }
 
@@ -66,26 +58,20 @@ if(env['USE_BIN_DIST'] == "yes")
 def iceDir
 def iceCppDir
 def iceSrcDist = false
-if (!iceBinDist)
-{
+if (!iceBinDist) {
 	def f1 = new File("$rootProject.projectDir/../java/src/Ice/src/main/java/Ice/Util.java")
-	if (f1.exists())
-	{
+	if (f1.exists()) {
 		iceDir = "$rootProject.projectDir/.."
 		iceSrcDist = true
 
-		if (iceHome != null && iceHome.length() > 0)
-		{
+		if (iceHome != null && iceHome.length() > 0) {
 			iceCppDir = iceHome
 
 			def f2 = new File("$iceDir/cpp/bin/$slice2java")
-			if (f2.exists())
-			{
+			if (f2.exists()) {
 				println "Found $slice2java in both $iceCppDir/bin and $iceDir/cpp/bin, $iceCppDir/bin/$slice2java will be used!"
 			}
-		}
-		else
-		{
+		} else {
 			iceCppDir = iceDir + "/cpp"
 		}
 
@@ -97,87 +83,71 @@ if (!iceBinDist)
 }
 
 // Then, check if we're building against a binary distribution.
-if (!iceDir)
-{
-	if (iceHome != null && iceHome.length() > 0)
-	{
+if (!iceDir) {
+	if (iceHome != null && iceHome.length() > 0) {
 		iceDir = iceHome
 	}
 
-	if (iceDir == null)
-	{
+	if (iceDir == null) {
 		def f1 = new File("/usr/bin/$slice2java")
-		if (f1.exists())
-		{
+		if (f1.exists()) {
 			iceDir = "/usr"
 		}
 	}
 
-	if (iceDir == null && isWindows)
-	{
+	if (iceDir == null && isWindows) {
 		def progFiles
 		def arch1 = env['PROCESSOR_ARCHITECTURE']
 		def arch2 = env['PROCESSOR_ARCHITEW6432']
-		if (arch1 == "AMD64" || arch1 == "IA64" || arch2 == "AMD64" || arch2 == "IA64")
-		{
+		if (arch1 == "AMD64" || arch1 == "IA64" || arch2 == "AMD64" || arch2 == "IA64") {
 			progFiles = env['ProgramFiles(x86)']
-		}
-		else
-		{
+		} else {
 			progFiles = env['ProgramFiles']
 		}
-		iceDir = "$progFiles\\ZeroC\\Ice-$iceVersion"
+		iceDir = "$progFiles\\ZeroC\\Ice-${project.version}"
 	}
 
-	if (iceDir == null)
-	{
-		def f1 = new File("/Library/Developer/Ice-$iceVersion/bin/$slice2java")
-		if (f1.exists())
-		{
-			iceDir = "/Library/Developer/Ice-$iceVersion"
+	if (iceDir == null) {
+		def f1 = new File("/Library/Developer/Ice-${project.version}/bin/${slice2java}")
+		if (f1.exists()) {
+			iceDir = "/Library/Developer/Ice-${project.version}"
 		}
 	}
 
-	if (iceDir == null)
-	{
-		def f1 = new File("/opt/Ice-$iceVersion/bin/$slice2java")
+	if (iceDir == null) {
+		def f1 = new File("/opt/Ice-${project.version}/bin/${slice2java}")
 		if (f1.exists())
 		{
-			iceDir = "/opt/Ice-$iceVersion"
+			iceDir = "/opt/Ice-${project.version}"
 		}
 	}
 
-	if (iceDir == null)
-	{
+	if (iceDir == null) {
 		throw new GradleException("Unable to find a valid Ice distribution, please verify ICE_HOME is properly " +
 								  "configured and Ice is correctly installed.")
 	}
 
-	slice.slice2java = "$iceDir/bin/$slice2java"
-	slice.slice2freezej = "$iceDir/bin/$slice2freezej"
+	slice.slice2java = "${iceDir}/bin/${slice2java}"
+	slice.slice2freezej = "${iceDir}/bin/${slice2freezej}"
 	slice.iceHome = iceDir
 	slice.srcDist = false
 }
 
 // Set the slice and java jar directory
-if (iceDir == "/usr")
-{
-	ext.sliceDir = "/usr/share/Ice-$iceVersion/slice"
+if (iceDir == "/usr") {
+	ext.sliceDir = "/usr/share/Ice-${project.version}/slice"
 	ext.distJarDir = "/usr/share/java"
-}
-else
-{
-	ext.sliceDir = "$iceDir/slice"
-	ext.distJarDir = iceSrcDist ? null : "$iceDir/lib"
+} else {
+	ext.sliceDir = "${iceDir}/slice"
+	ext.distJarDir = iceSrcDist ? null : "${iceDir}/lib"
 }
 
 // Check is DESTDIR is set (non-Windows)
-if (isWindows)
-{
+if (isWindows) {
 	ext.DESTDIR = ""
 }
 
-ext.versionSuffix = "-${iceVersion}"
+ext.versionSuffix = "-${project.version}"
 ext.libDir = "$rootProject.projectDir/lib"
 
 ext.iceSourceCompatibility = 1.7
@@ -209,9 +179,34 @@ ext.searchFile = { Map<String, Closure> places, List<String> searchPaths ->
     }
 }
 
+def demoJar(name) {
+    def taskName = name + "Jar"
+	// Create a jar for the client & server which includes everything in the demo.
+	def jarTask = tasks.create(name: taskName, type: Jar) {
+		version = ""
+	   	baseName = name
+	    from(sourceSets.main.output) {
+	    	include "**"
+	    }
+	}
+
+	jarTask.manifest {
+        attributes("Main-Class": name.capitalize())
+        attributes("Class-Path": configurations.runtime.resolve().collect { it.toURI() }.join(' '))
+    }
+
+
+	artifacts {
+		archives jarTask
+	}
+}
+ext {
+	demoJar = this.&demoJar
+}
+
 def localDependency(artifactId) {
 	if (distJarDir != null) {
-		return "com.zeroc:${artifactId}:${iceVersion}"
+		return "com.zeroc:${artifactId}:${project.version}"
 	} else {
 		return project(":${artifactId}")
 	}
@@ -223,86 +218,47 @@ ext {
 //
 // Find BerkeleyDB JAR
 //
-ext.dbJar = ""
-if(dbHome != "")
-{
+if(dbHome) {
 	ext.dbJar = "${dbHome}/db.jar"
-}
-else
-{
-	["db-5.3.28.jar", "db-5.3.21.jar", "db.jar"].each {
-		if (ext.dbJar.length() != 0)
-		{
-			// Already found DB JAR, just ignore.
-		}
-		else if (isWindows)
-		{
-			def thirdpartyhome = env['THIRDPARTY_HOME']
-			if (thirdpartyhome == null || thirpartyhome.length() == 0)
-			{
-				def progFiles
-				def arch1 = env['PROCESSOR_ARCHITECTURE']
-				def arch2 = env['PROCESSOR_ARCHITEW6432']
-				if (arch1 == "AMD64" || arch1 == "IA64" || arch2 == "AMD64" || arch2 == "IA64")
-				{
-					progFiles = env['ProgramFiles(x86)']
-				}
-				else
-				{
-					progFiles = env['ProgramFiles']
-				}
-				thirdpartyhome = "$progFiles\\ZeroC\\Ice-$iceVersion-ThirdParty"
-			}
-
-			def f = new File("$thirdpartyhome\\lib\\${it}")
-			if (f.exists())
-			{
-				ext.dbJar = "$thirdpartyhome\\lib\\${it}"
+} else {	
+	def subdirs
+	if (isWindows) {
+		def thirdpartyhome = env['THIRDPARTY_HOME']
+		if (thirdpartyhome == null || thirpartyhome.length() == 0) {
+			def progFiles
+			def arch1 = env['PROCESSOR_ARCHITECTURE']
+			def arch2 = env['PROCESSOR_ARCHITEW6432']
+			if (arch1 == "AMD64" || arch1 == "IA64" || arch2 == "AMD64" || arch2 == "IA64") {
+				progFiles = env['ProgramFiles(x86)']
+			} else {
+				progFiles = env['ProgramFiles']
 			}
+			thirdpartyhome = "${progFiles}/ZeroC/Ice-${project.version}-ThirdParty"
 		}
-		else
-		{
-			def f = new File("/Library/Developer/Ice-$iceVersion-ThirdParty/lib/${it}")
-			if (f.exists())
-			{
-				ext.dbJar = "/Library/Developer/Ice-$iceVersion-ThirdParty/lib/${it}"
-			}
 
-			if (ext.dbJar.length() == 0)
-			{
-				f = new File("/usr/share/java/${it}")
-				if (f.exists())
-				{
-					ext.dbJar = "/usr/share/java/${it}"
-				}
-			}
-
-			if (ext.dbJar.length() == 0)
-			{
-				f = new File("/opt/Ice-${iceVersion}/lib/${it}")
-				if (f.exists())
-				{
-					ext.dbJar = "/opt/Ice-${iceVersion}/lib/${it}"
-				}
-			}
-
-			if (ext.dbJar.length() == 0)
-			{
-				f = new File("/opt/db/lib/${it}")
-				if (f.exists())
-				{
-					ext.dbJar = "/opt/db/lib/${it}"
-				}
-			}
+		subdirs = [ "${thirdpartyhome}/lib/" ]
+	} else {
+		subdirs = [
+			"/Library/Developer/Ice-${project.version}-ThirdParty/lib/",
+			"/usr/share/java/",
+			"/opt/Ice-${project.version}/lib/",
+			"/opt/db/lib/",
+			"/usr/lib/"
+		]
+	}
 
-			if (ext.dbJar.length() == 0)
-			{
-				f = new File("/usr/lib/${it}")
-				if (f.exists())
-				{
-					ext.dbJar = "/usr/lib/${it}"
-				}
-			}
+	def candidates = ["db-5.3.28.jar", "db-5.3.21.jar", "db.jar"].collect {
+		def dbJarName = it
+		subdirs.collect {
+			it.concat(dbJarName)
 		}
+	}.flatten()
+
+	ext.dbJar = candidates.find {
+		new File(it).exists()
 	}
 }
+
+if(!ext.dbJar || !new File(ext.dbJar).exists()) {
+	throw new GradleException("Unable to locate the required third party BerkeleyDB jar file `b.jar'.")
+}
\ No newline at end of file
diff --git a/java/gradle/library.gradle b/java/gradle/library.gradle
index bb824b48561..b010e745a2a 100644
--- a/java/gradle/library.gradle
+++ b/java/gradle/library.gradle
@@ -9,7 +9,7 @@
 
 apply plugin: 'maven'
 
-def pomName = "${libDir}/${project.name}-${iceVersion}.pom"
+def pomName = "${libDir}/${project.name}-${project.version}.pom"
 task writeNewPom {
 	outputs.file file(pomName)
 } << {
@@ -38,7 +38,4 @@ task install(type: Copy, dependsOn: jar, overwrite: true) {
     into "${DESTDIR}${prefix}/lib"
 }
 
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
+install.dependsOn copyJars
\ No newline at end of file
diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle
index dde3bef5021..241f6cc45d3 100644
--- a/java/src/IceDiscovery/build.gradle
+++ b/java/src/IceDiscovery/build.gradle
@@ -12,19 +12,12 @@ targetCompatibility = iceTargetCompatibility
 
 slice {
     java {
-        set1 {
-        	include = ["${sliceDir}"]
-            args = "--ice"
-            files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"])
-        }
+    	include = ["${sliceDir}"]
+        args = "--ice"
+        files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
 dependencies {
     compile project(':ice')
 }
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index a6db81532e1..fa3b9d988de 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -103,7 +103,7 @@ if(macosx)
                       displayname: appName,
                       identifier: "com.zeroc.IceGridGUI",
                       icon: "${projectDir}/src/main/resources/icons/icegrid.icns",
-                      shortversion: "${iceVersion}",
+                      shortversion: "${project.version}",
                       applicationCategory: "public.app-category.utilities",
                       mainclassname: "IceGridGUI/MainProxy",
                       copyright: "Copyright © 2005-2014 ZeroC, Inc. All rights reserved.") {
diff --git a/java/test/build.gradle b/java/test/build.gradle
index c080d274c10..4a3b11804c0 100644
--- a/java/test/build.gradle
+++ b/java/test/build.gradle
@@ -24,11 +24,6 @@ sourceSets {
     }
 }
 
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
 dependencies {
     compile localDependency('ice')
     compile localDependency('freeze')
diff --git a/java/test/plugins/build.gradle b/java/test/plugins/build.gradle
index 202223d8887..8aebbeba2c3 100644
--- a/java/test/plugins/build.gradle
+++ b/java/test/plugins/build.gradle
@@ -15,11 +15,6 @@ sourceSets {
     }
 }
 
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
 dependencies {
     compile localDependency('ice')
 }