Updated sample-project for 4.0

Author: rjrudin

examples/sample-project/build.gradle

@@ -8,7 +8,7 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath "com.marklogic:ml-gradle:3.17.0"
+		classpath "com.marklogic:ml-gradle:4.0.0"
 	}
 }
 
@@ -80,22 +80,6 @@ ext {
 		customTokens.put("%%ODBC_PORT%%", "8102")
 		customTokens.put("%%XDBC_PORT%%", "8103")
 
-		// By default, the createTriggersDatabase attribute is set to true, which results in a triggers database being
-		// created, even if a databases/triggers-database.json file isn't present. Un-commenting the line will below
-		// will prevent one from being created (assuming the triggers-database.json file isn't present).
-		//createTriggersDatabase = false
-
-		// Example of adding a path for modules to the list of module paths, which defaults to src/main/ml-modules
-		// modulePaths.add("src/another-modules-dir")
-		// You can also override the list of module paths
-		// modulePaths = ["src/another-modules-dir"]
-
-		// You can have multiple config files for your content database. This is useful when you have a dependency on
-		// a package of MarkLogic modules that requires some content database config, and you don't want to duplicate
-		// that in your own content-database.json file. Instead, just add the file from your
-		// build/mlBundle/(name of dependency)/ml-config/databases directory.
-		configDir.contentDatabaseFiles.add(new File("src/main/ml-config/databases/more-content-database-config.json"))
-
 		// XCC URL for running corb task below and for creating triggers on pre-8.0-4 builds of MarkLogic
 		contentXccUrl = "xcc://${mlRestAdminUsername}:${mlRestAdminPassword}@${mlHost}:${mlRestPort}"
 	}

examples/sample-project/gradle.properties

@@ -68,9 +68,3 @@ mlModulePermissions=rest-admin,read,rest-admin,update,rest-extension-user,execut
 # binaries. To do, just set the below property with a comma-separated list of extensions. Of course *.gradle and
 # *.properties files aren't typically binary files, this is just for sake of example.
 mlAdditionalBinaryExtensions=.gradle,.properties
-
-
-# The configuration directory defaults to src/main/ml-config. You can override this by setting mlConfigDir, as shown
-# below. This will result in a new instance of ConfigDir with the given path being set on the instance of AppConfig
-# that's created by ml-gradle.
-# mlConfigDir=some/other/path

examples/sample-project/src/main/ml-config/databases/more-content-database-config.json

@@ -1,12 +1,13 @@
 {
-  "range-element-index": [
-    {
-      "invalid-values": "reject",
-      "collation": "",
-      "localname": "amount",
-      "namespace-uri": "",
-      "range-value-positions": false,
-      "scalar-type": "int"
-    }
-  ]
-}
+	"database-name": "%%DATABASE%%",
+	"range-element-index": [
+		{
+			"invalid-values": "reject",
+			"collation": "",
+			"localname": "amount",
+			"namespace-uri": "",
+			"range-value-positions": false,
+			"scalar-type": "int"
+		}
+	]
+}