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

- Simplifications and cleanup to the gradle build files.

2 files changed, 4 insertions, 77 deletions

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")