Several changes for clean.

expanded all gradle build files.

2 files changed, 81 insertions, 73 deletions

diff --git a/java/demo/Manual/build.gradle b/java/demo/Manual/build.gradle
index cc2e52ad556..222216457aa 100644
--- a/java/demo/Manual/build.gradle
+++ b/java/demo/Manual/build.gradle
@@ -8,45 +8,49 @@
 // **********************************************************************
 
 ['evictor_filesystem', 'lifecycle', 'printer', 'simple_filesystem'].each {
-	// abc_def -> AbcDef
-	def name = it.split('_').collect { it.capitalize() }.join()
-	project(":demoManual${name}") {
-		slice {
-			java {
-				include = ["${projectDir}", "${sliceDir}"]
-				srcDir = '.'
-			}
-		}
-
-		sourceSets {
-			main {
-				java {
-					srcDir '.'
-				}
-			}
-		}
-
-		dependencies {
-			compile localDependency("ice")
-			if (!useLocalOnly) {
-				runtime "org.apache.tools:bzip2:1.0"
-			}
-		}
-
-		if(name == "EvictorFilesystem") {
-			dependencies {
-				compile localDependency("freeze")
-			}
-			dependencies {
-				runtime files(dbJar)
-			}
-		}
-
-
-		// Don't create the default jar.
-		jar.enabled = false
-
-		demoJar("client")
-		demoJar("server")
-	}
+    // abc_def -> AbcDef
+    def name = it.split('_').collect { it.capitalize() }.join()
+    project(":demoManual${name}") {
+        slice {
+            java {
+                include = ["${projectDir}", "${sliceDir}"]
+                srcDir = '.'
+            }
+        }
+
+        sourceSets {
+            main {
+                java {
+                    srcDir '.'
+                }
+            }
+        }
+
+        dependencies {
+            compile localDependency("ice")
+            if (!useLocalOnly) {
+                runtime "org.apache.tools:bzip2:1.0"
+            }
+        }
+
+        if(name == "EvictorFilesystem") {
+            dependencies {
+                compile localDependency("freeze")
+            }
+            dependencies {
+                runtime files(dbJar)
+            }
+        }
+
+
+        // Don't create the default jar.
+        jar.enabled = false
+
+        clean {
+            delete fileTree(dir: 'db', excludes:['.gitignore', 'DB_CONFIG'])
+        }
+
+        demoJar("client")
+        demoJar("server")
+    }
 }
diff --git a/java/demo/Manual/map_filesystem/build.gradle b/java/demo/Manual/map_filesystem/build.gradle
index e731c761a83..7d85e019dbd 100644
--- a/java/demo/Manual/map_filesystem/build.gradle
+++ b/java/demo/Manual/map_filesystem/build.gradle
@@ -8,45 +8,49 @@
 // **********************************************************************
 
 slice {
-	java {
-		include = ["${projectDir}", "${sliceDir}"]
-		srcDir = '.'
-	}
-	freezej {
-		files = [file("FilesystemDB.ice"),
-				 file("${sliceDir}/Ice/Identity.ice")]
-		include = ["${projectDir}", "${sliceDir}"]
-		args = "--ice"
-		dict {
-			IdentityFileEntryMap {
-				javaType = "FilesystemDB.IdentityFileEntryMap"
-				key = "Ice::Identity"
-				value = "FilesystemDB::FileEntry"
-			}
-			IdentityDirectoryEntryMap {
-				javaType = "FilesystemDB.IdentityDirectoryEntryMap"
-				key="Ice::Identity"
+    java {
+        include = ["${projectDir}", "${sliceDir}"]
+        srcDir = '.'
+    }
+    freezej {
+        files = [file("FilesystemDB.ice"),
+                 file("${sliceDir}/Ice/Identity.ice")]
+        include = ["${projectDir}", "${sliceDir}"]
+        args = "--ice"
+        dict {
+            IdentityFileEntryMap {
+                javaType = "FilesystemDB.IdentityFileEntryMap"
+                key = "Ice::Identity"
+                value = "FilesystemDB::FileEntry"
+            }
+            IdentityDirectoryEntryMap {
+                javaType = "FilesystemDB.IdentityDirectoryEntryMap"
+                key="Ice::Identity"
                 value="FilesystemDB::DirectoryEntry"
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 sourceSets {
-	main {
-		java {
-			srcDir '.'
-		}
-	}
+    main {
+        java {
+            srcDir '.'
+        }
+    }
 }
 
 dependencies {
-	compile localDependency("ice")
-	compile localDependency("freeze")
-	compile files(dbJar)
-	if (!useLocalOnly) {
-		runtime "org.apache.tools:bzip2:1.0"
-	}
+    compile localDependency("ice")
+    compile localDependency("freeze")
+    compile files(dbJar)
+    if (!useLocalOnly) {
+        runtime "org.apache.tools:bzip2:1.0"
+    }
+}
+
+clean {
+    delete fileTree(dir: 'db', excludes:['.gitignore', 'DB_CONFIG'])
 }
 
 // Don't create the default jar.