Fixed demo dist to allow gradle build of java demos

18 files changed, 399 insertions, 51 deletions

diff --git a/distribution/makedist.py b/distribution/makedist.py
index 5375ae02fdc..1aac52b71f3 100755
--- a/distribution/makedist.py
+++ b/distribution/makedist.py
@@ -76,7 +76,6 @@ for l in ["/java", "/py", "/php", "/cs", "/cpp/demo"]:
 #
 demoConfigFiles = [ \
     "Make.*", \
-    "common.xml", \
     "build.js", \
     "makebundle.js", \
 ]
@@ -454,6 +453,20 @@ for root, dirnames, filesnames in os.walk(demoDir):
 
 remove(os.path.join(srcDir, 'vb')) # vb directory in Unix source distribution only needed to copy demo scripts.
 
+# Fix up the Java build files
+os.mkdir(os.path.join(demoDir, "demoj", "gradle"))
+copy(os.path.join(srcDir, "java", "gradlew"), os.path.join(demoDir, "demoj"), False)
+copy(os.path.join(srcDir, "java", "gradle", "wrapper"), os.path.join(demoDir, "demoj", "gradle", "wrapper"), False)
+copy(os.path.join(distFilesDir, "src", "common", "ice.gradle"), os.path.join(demoDir, "demoj", "gradle"), False)
+copy(os.path.join(distFilesDir, "src", "common", "build.gradle"), os.path.join(demoDir, "demoj"), False)
+copy(os.path.join(distFilesDir, "src", "common", "settings.gradle"), os.path.join(demoDir, "demoj"), False)
+
+gradleSubstituteExprs = [(re.compile(re.escape("project(\":demo/")), "project(\":")]
+for root, dirnames, filesnames in os.walk(os.path.join(demoDir, "demoj")):
+    for f in filesnames:
+        if fnmatch.fnmatch(f, "build.gradle"):
+            FixUtil.fileMatchAndReplace(os.path.join(root, f), gradleSubstituteExprs, False)
+
 copy(demoscriptDir, winDemoscriptDir)
 shutil.rmtree(os.path.join(demoscriptDir, "democs"))
 
@@ -467,7 +480,6 @@ os.mkdir(os.path.join(winDemoDir, "config"))
 
 copy(os.path.join(winSrcDir, "config", "Make.common.rules.mak"), os.path.join(winDemoDir, "config"), False)
 copy(os.path.join(winSrcDir, "cpp", "config", "Make.rules.msvc"), os.path.join(winDemoDir, "config"), False)
-copy(os.path.join(winSrcDir, "java", "config", "common.xml"), os.path.join(winDemoDir, "config"), False)
 copy(os.path.join(winSrcDir, "js", "config", "build.js"), os.path.join(winDemoDir, "config"), False)
 
 copy(os.path.join(winDistFilesDir, "src", "common", "build.properties"), os.path.join(winDemoDir, "config"), False)
@@ -526,6 +538,20 @@ for d in ["democs", "demovb"]:
 
 for f in rmFiles: remove(os.path.join(winDemoDir, f))
 
+# Fix up the Java build files
+os.mkdir(os.path.join(winDemoDir, "demoj", "gradle"))
+copy(os.path.join(srcDir, "java", "gradlew.bat"), os.path.join(winDemoDir, "demoj"), False)
+copy(os.path.join(srcDir, "java", "gradle", "wrapper"), os.path.join(winDemoDir, "demoj", "gradle", "wrapper"), False)
+copy(os.path.join(distFilesDir, "src", "common", "ice.gradle"), os.path.join(winDemoDir, "demoj", "gradle"), False)
+copy(os.path.join(distFilesDir, "src", "common", "build.gradle"), os.path.join(winDemoDir, "demoj"), False)
+copy(os.path.join(distFilesDir, "src", "common", "settings.gradle"), os.path.join(winDemoDir, "demoj"), False)
+
+gradleSubstituteExprs = [(re.compile(re.escape("project(\":demo/")), "project(\":")]
+for root, dirnames, filesnames in os.walk(os.path.join(winDemoDir, "demoj")):
+    for f in filesnames:
+        if fnmatch.fnmatch(f, "build.gradle"):
+            FixUtil.fileMatchAndReplace(os.path.join(root, f), gradleSubstituteExprs, False)
+
 print "ok"
 
 #
diff --git a/distribution/src/common/build.gradle b/distribution/src/common/build.gradle
new file mode 100644
index 00000000000..f2ccd7d89c4
--- /dev/null
+++ b/distribution/src/common/build.gradle
@@ -0,0 +1,28 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+subprojects {
+	apply plugin: 'java'
+	apply plugin: 'idea'
+	apply from: "$rootProject.projectDir/gradle/ice.gradle"
+
+	repositories {
+	    maven {
+	        url 'http://www.zeroc.com:8081/nexus/content/repositories/thirdparty'
+	    }
+    }
+}
+
+apply from: "$rootProject.projectDir/Ice/build.gradle"
+apply from: "$rootProject.projectDir/IceDiscovery/build.gradle"
+apply from: "$rootProject.projectDir/IceBox/build.gradle"
+apply from: "$rootProject.projectDir/Glacier2/build.gradle"
+apply from: "$rootProject.projectDir/IceStorm/build.gradle"
+apply from: "$rootProject.projectDir/IceGrid/build.gradle"
+apply from: "$rootProject.projectDir/book/build.gradle"
diff --git a/distribution/src/common/ice.gradle b/distribution/src/common/ice.gradle
new file mode 100644
index 00000000000..2412ca393ca
--- /dev/null
+++ b/distribution/src/common/ice.gradle
@@ -0,0 +1,137 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+def iceVersion = "3.6b"
+
+//
+// Define debug as true if you want to build with debug information,
+// false otherwise.
+//
+def debug = true
+
+//
+// Do not edit below this lne
+//
+buildscript {
+    repositories {
+        maven {
+            url 'http://www.zeroc.com:8081/nexus/content/repositories/releases'
+        }
+    }
+    dependencies {
+        classpath group: 'com.zeroc', name: 'gradle-plugin', version: '1.0'
+    }
+}
+
+if (!project.plugins.findPlugin(com.zeroc.gradle.plugins.slice.SlicePlugin)) {
+    project.apply(plugin: com.zeroc.gradle.plugins.slice.SlicePlugin)
+}
+
+ext.generatedDir = "$project.buildDir/generated"
+
+compileJava {
+	options.debug = debug
+}
+
+// Determine the name of the Slice-to-Java translator
+def isWindows = false
+def slice2java = "slice2java"
+def slice2freezej = "slice2freezej"
+if (System.properties['os.name'].toLowerCase().contains('windows'))
+{
+    isWindows = true
+    slice2java = "slice2java.exe"
+    slice2freezej = "slice2freezej.exe"
+}
+
+// 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)
+{
+	def translator = new File("$iceHome/bin/$slice2java")
+	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 = true
+
+// First check if we are building against source distribution
+def iceDir
+if (iceHome != null && iceHome.length() > 0)
+{
+	iceDir = iceHome
+}
+
+if (iceDir == null)
+{
+	def f1 = new File("/usr/bin/$slice2java")
+	if (f1.exists())
+	{
+		iceDir = "/usr"
+	}
+}
+
+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")
+	{
+		progFiles = env['ProgramFiles(x86)']
+	}
+	else
+	{
+		progFiles = env['ProgramFiles']
+	}
+	iceDir = "$progFiles\\ZeroC\\Ice-$iceVersion"
+}
+
+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("/opt/Ice-$iceVersion/bin/$slice2java")
+	if (f1.exists())
+	{
+		iceDir = "/opt/Ice-$iceVersion"
+	}
+}
+
+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"
+
+// Set the slice and java jar directory
+if (iceDir == "/usr")
+{
+	ext.sliceDir = "/usr/share/Ice-$iceVersion/slice"
+	ext.distJarDir = "/usr/share/java"
+}
+else
+{
+	ext.sliceDir = "$iceDir/slice"
+	ext.distJarDir = "$iceDir/lib"
+}
diff --git a/distribution/src/common/settings.gradle b/distribution/src/common/settings.gradle
new file mode 100644
index 00000000000..1fcd8fcd8fe
--- /dev/null
+++ b/distribution/src/common/settings.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.
+//
+// **********************************************************************
+
+['applet', 'async', 'bidir', 'callback', 'hello', 'invoke',
+ 'interrupt', 'latency', 'minimal', 'multicast', 'nested',
+ 'plugin', 'properties', 'serialize','session', 'swing',
+ 'throughput', 'value', 'optional','context'].each {
+ 	include "Ice/${it}"
+}
+
+['hello', 'replication'].each {
+ 	include "IceDiscovery/${it}"
+}
+
+['library'].each {
+ 	include "Database/${it}"
+}
+
+['bench', 'casino', 'library', 'phonebook', 'transform'].each {
+ 	include "Freeze/${it}"
+}
+
+['hello'].each {
+ 	include "IceBox/${it}"
+}
+
+['callback', 'chat', 'voip'].each {
+ 	include "Glacier2/${it}"
+}
+
+['clock'].each {
+ 	include "IceStorm/${it}"
+}
+
+['icebox', 'simple'].each {
+ 	include "IceGrid/${it}"
+}
+
+['evictor_filesystem', 'lifecycle', 'map_filesystem', 'printer', 'simple_filesystem'].each {
+ 	include "book/${it}"
+}
diff --git a/java/demo/Database/library/build.gradle b/java/demo/Database/library/build.gradle
index 02f2bf3cca6..d132ef1de4f 100644
--- a/java/demo/Database/library/build.gradle
+++ b/java/demo/Database/library/build.gradle
@@ -26,9 +26,16 @@ sourceSets {
 
 jar.enabled = false
 
-dependencies {
-	compile project(':src/Ice')
-	compile project(':src/Glacier2')
+if (distJarDir == null) {
+	dependencies {
+		compile project(':src/Ice')
+		compile project(':src/Glacier2')
+	}
+} else {
+	dependencies {
+		compile files("${distJarDir}/Ice.jar")
+		compile files("${distJarDir}/Glacier2.jar")
+	}
 }
 
 idea.module {
diff --git a/java/demo/Freeze/bench/build.gradle b/java/demo/Freeze/bench/build.gradle
index a7abdeb67ce..a42208f3de7 100644
--- a/java/demo/Freeze/bench/build.gradle
+++ b/java/demo/Freeze/bench/build.gradle
@@ -83,9 +83,17 @@ sourceSets {
 
 jar.enabled = false
 
-dependencies {
-	compile project(':src/Ice')
-	compile project(':src/Freeze')
+if (distJarDir == null) {
+	dependencies {
+		compile project(':src/Ice')
+		compile project(':src/Freeze')
+	}
+} else {
+	dependencies {
+		compile files("${distJarDir}/Ice.jar")
+		compile files("${distJarDir}/Freeze.jar")
+		compile 'com.sleepycat:db:5.3.28'
+	}
 }
 
 idea.module {
diff --git a/java/demo/Freeze/casino/build.gradle b/java/demo/Freeze/casino/build.gradle
index 50da96146f9..59ffbb786f7 100644
--- a/java/demo/Freeze/casino/build.gradle
+++ b/java/demo/Freeze/casino/build.gradle
@@ -23,12 +23,20 @@ sourceSets {
 	}
 }
 
-dependencies {
-	compile project(':src/Ice')
-	compile project(':src/Freeze')
+if (distJarDir == null) {
+	dependencies {
+		compile project(':src/Ice')
+		compile project(':src/Freeze')
+	}
+} else {
+	dependencies {
+		compile files("${distJarDir}/Ice.jar")
+		compile files("${distJarDir}/Freeze.jar")
+		compile 'com.sleepycat:db:5.3.28'
+	}
 }
 
-jar.enabled = false 
+jar.enabled = false
 
 idea.module {
 	excludeDirs -= file(buildDir)
diff --git a/java/demo/Freeze/library/build.gradle b/java/demo/Freeze/library/build.gradle
index f249d47dba6..44bc2739670 100644
--- a/java/demo/Freeze/library/build.gradle
+++ b/java/demo/Freeze/library/build.gradle
@@ -35,12 +35,20 @@ sourceSets {
 	}
 }
 
-dependencies {
-	compile project(':src/Ice')
-	compile project(':src/Freeze')
+if (distJarDir == null) {
+	dependencies {
+		compile project(':src/Ice')
+		compile project(':src/Freeze')
+	}
+} else {
+	dependencies {
+		compile files("${distJarDir}/Ice.jar")
+		compile files("${distJarDir}/Freeze.jar")
+		compile 'com.sleepycat:db:5.3.28'
+	}
 }
 
-jar.enabled = false 
+jar.enabled = false
 
 idea.module {
 	excludeDirs -= file(buildDir)
diff --git a/java/demo/Freeze/phonebook/build.gradle b/java/demo/Freeze/phonebook/build.gradle
index 0902b9275e4..1fb26e33923 100644
--- a/java/demo/Freeze/phonebook/build.gradle
+++ b/java/demo/Freeze/phonebook/build.gradle
@@ -36,12 +36,20 @@ sourceSets {
 	}
 }
 
-dependencies {
-	compile project(':src/Ice')
-	compile project(':src/Freeze')
+if (distJarDir == null) {
+	dependencies {
+		compile project(':src/Ice')
+		compile project(':src/Freeze')
+	}
+} else {
+	dependencies {
+		compile files("${distJarDir}/Ice.jar")
+		compile files("${distJarDir}/Freeze.jar")
+		compile 'com.sleepycat:db:5.3.28'
+	}
 }
 
-jar.enabled = false 
+jar.enabled = false
 
 idea.module {
 	excludeDirs -= file(buildDir)
diff --git a/java/demo/Freeze/transform/build.gradle b/java/demo/Freeze/transform/build.gradle
index 44836ea3464..92c24fb55f1 100644
--- a/java/demo/Freeze/transform/build.gradle
+++ b/java/demo/Freeze/transform/build.gradle
@@ -44,12 +44,20 @@ sourceSets {
 	}
 }
 
-dependencies {
-	compile project(':src/Ice')
-	compile project(':src/Freeze')
+if (distJarDir == null) {
+	dependencies {
+		compile project(':src/Ice')
+		compile project(':src/Freeze')
+	}
+} else {
+	dependencies {
+		compile files("${distJarDir}/Ice.jar")
+		compile files("${distJarDir}/Freeze.jar")
+		compile 'com.sleepycat:db:5.3.28'
+	}
 }
 
-jar.enabled = false 
+jar.enabled = false
 
 idea.module {
 	excludeDirs -= file(buildDir)
diff --git a/java/demo/Glacier2/build.gradle b/java/demo/Glacier2/build.gradle
index a75c241ed3f..0e5fff5e1a3 100644
--- a/java/demo/Glacier2/build.gradle
+++ b/java/demo/Glacier2/build.gradle
@@ -26,9 +26,16 @@
 			}
 		}
 
-		dependencies {
-			compile project(':src/Ice')
-			compile project(':src/Glacier2')
+		if (distJarDir == null) {
+			dependencies {
+				compile project(':src/Ice')
+				compile project(':src/Glacier2')
+			}
+		} else {
+			dependencies {
+				compile files("${distJarDir}/Ice.jar")
+				compile files("${distJarDir}/Glacier2.jar")
+			}
 		}
 
 		jar.enabled = false
diff --git a/java/demo/Ice/build.gradle b/java/demo/Ice/build.gradle
index 1266be4f56e..866fecea69f 100644
--- a/java/demo/Ice/build.gradle
+++ b/java/demo/Ice/build.gradle
@@ -29,8 +29,14 @@
 			}
 		}
 
-		dependencies {
-			compile project(':src/Ice')
+		if (distJarDir == null) {
+			dependencies {
+				compile project(':src/Ice')
+			}
+		} else {
+			dependencies {
+				compile files("${distJarDir}/Ice.jar")
+			}
 		}
 
 		jar.enabled = false
@@ -42,4 +48,4 @@
 	}
 }
 
-project(':demo/Ice/invoke').slice.java.default.args += " --stream"
+project(":demo/Ice/invoke").slice.java.default.args += " --stream"
diff --git a/java/demo/IceBox/build.gradle b/java/demo/IceBox/build.gradle
index 1cf72aed23b..165c448ad88 100644
--- a/java/demo/IceBox/build.gradle
+++ b/java/demo/IceBox/build.gradle
@@ -17,9 +17,16 @@
 			}
 		}
 
-		dependencies {
-			compile project(':src/Ice')
-			compile project(':src/IceBox')
+		if (distJarDir == null) {
+			dependencies {
+				compile project(':src/Ice')
+				compile project(':src/IceBox')
+			}
+		} else {
+			dependencies {
+				compile files("${distJarDir}/Ice.jar")
+				compile files("${distJarDir}/IceBox.jar")
+			}
 		}
 
 		jar.enabled = false
diff --git a/java/demo/IceDiscovery/build.gradle b/java/demo/IceDiscovery/build.gradle
index 20111f224c6..c8a95d34dc4 100644
--- a/java/demo/IceDiscovery/build.gradle
+++ b/java/demo/IceDiscovery/build.gradle
@@ -17,9 +17,16 @@
 			}
 		}
 
-		dependencies {
-			compile project(':src/Ice')
-			compile project(':src/IceDiscovery')
+		if (distJarDir == null) {
+			dependencies {
+				compile project(':src/Ice')
+				compile project(':src/IceDiscovery')
+			}
+		} else {
+			dependencies {
+				compile files("${distJarDir}/Ice.jar")
+				compile files("${distJarDir}/IceDiscovery.jar")
+			}
 		}
 
 		jar.enabled = false
diff --git a/java/demo/IceGrid/build.gradle b/java/demo/IceGrid/build.gradle
index 6cae4b5189d..a5e9e79c682 100644
--- a/java/demo/IceGrid/build.gradle
+++ b/java/demo/IceGrid/build.gradle
@@ -17,10 +17,18 @@
 			}
 		}
 
-		dependencies {
-			compile project(':src/Ice')
-			compile project(':src/IceBox')
-			compile project(':src/IceGrid')
+		if (distJarDir == null) {
+			dependencies {
+				compile project(':src/Ice')
+				compile project(':src/IceBox')
+				compile project(':src/IceGrid')
+			}
+		} else {
+			dependencies {
+				compile files("${distJarDir}/Ice.jar")
+				compile files("${distJarDir}/IceBox.jar")
+				compile files("${distJarDir}/IceGrid.jar")
+			}
 		}
 
 		jar.enabled = false
diff --git a/java/demo/IceStorm/build.gradle b/java/demo/IceStorm/build.gradle
index 692af0446c8..4c3df44b529 100644
--- a/java/demo/IceStorm/build.gradle
+++ b/java/demo/IceStorm/build.gradle
@@ -17,9 +17,16 @@
 			}
 		}
 
-		dependencies {
-			compile project(':src/Ice')
-			compile project(':src/IceStorm')
+		if (distJarDir == null) {
+			dependencies {
+				compile project(':src/Ice')
+				compile project(':src/IceStorm')
+			}
+		} else {
+			dependencies {
+				compile files("${distJarDir}/Ice.jar")
+				compile files("${distJarDir}/IceStorm.jar")
+			}
 		}
 
 		jar.enabled = false
diff --git a/java/demo/book/build.gradle b/java/demo/book/build.gradle
index e122b1e8d00..6654d64998e 100644
--- a/java/demo/book/build.gradle
+++ b/java/demo/book/build.gradle
@@ -26,14 +26,27 @@
 			}
 		}
 
-		dependencies {
-			compile project(':src/Ice')
+		if (distJarDir == null) {
+			dependencies {
+				compile project(':src/Ice')
+			}
+		} else {
+			dependencies {
+				compile files("${distJarDir}/Ice.jar")
+			}
 		}
 
 		if(name == "evictor_filesystem") {
-			dependencies {
-				compile project(':src/Freeze')
-			}		
+			if (distJarDir == null) {
+				dependencies {
+					compile project(':src/Freeze')
+				}
+			} else {
+				dependencies {
+					compile files("${distJarDir}/Freeze.jar")
+					compile 'com.sleepycat:db:5.3.28'
+				}
+			}
 		}
 
 		jar.enabled = false
diff --git a/java/demo/book/map_filesystem/build.gradle b/java/demo/book/map_filesystem/build.gradle
index 4580f7ff6df..c979dac3b4f 100644
--- a/java/demo/book/map_filesystem/build.gradle
+++ b/java/demo/book/map_filesystem/build.gradle
@@ -45,9 +45,17 @@ sourceSets {
 
 jar.enabled = false
 
-dependencies {
-	compile project(':src/Ice')
-	compile project(':src/Freeze')
+if (distJarDir == null) {
+	dependencies {
+		compile project(':src/Ice')
+		compile project(':src/Freeze')
+	}
+} else {
+	dependencies {
+		compile files("${distJarDir}/Ice.jar")
+		compile files("${distJarDir}/Freeze.jar")
+		compile 'com.sleepycat:db:5.3.28'
+	}
 }
 
 idea.module {