DEVEXP-427: Generate schemas database when running mlNewProject

src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy

@@ -36,7 +36,8 @@ class NewProjectTask extends MarkLogicTask {
 			ant.input(message: "Test REST API port (intended for running automated tests; leave blank for no server):", addproperty: "mlTestRestPort")
 		}
 		ant.input(message: "Do you want support for multiple environments? ", validargs: "y,n", addproperty: "mlPropertiesPlugin", defaultvalue: "y")
-		ant.input(message: "Do you want resource files for a content database and set of users/roles created?", validargs: "y,n", addproperty: "mlScaffold", defaultvalue: "y")
+		ant.input(message: "Do you want resource files for a content database?", validargs: "y,n", addproperty: "mlScaffoldDatabases", defaultvalue: "y")
+		ant.input(message: "Do you want a set of users/roles created?", validargs: "y,n", addproperty: "mlScaffoldSecurity", defaultvalue: "y")
 
 		def now = new Date()
 
@@ -80,22 +81,15 @@ class NewProjectTask extends MarkLogicTask {
 		makeDirectory("src/main/ml-config")
 		makeDirectory("src/main/ml-modules")
 
-		if (ant.mlScaffold == "y") {
-			println "Writing project scaffolding files"
-			def appConfig = getAppConfig()
-			appConfig.setName(ant.mlAppName)
-			appConfig.setHost(ant.mlHost)
-			appConfig.setRestAdminUsername(ant.mlUsername)
-			appConfig.setRestAdminPassword(ant.mlPassword)
+		if ((ant.mlScaffoldDatabases == "y") || (ant.mlScaffoldSecurity == "y") || (ant.mlRestPort)) {
+			var scaffoldDatabases = (ant.mlScaffoldDatabases == "y")
+			var scaffoldSecurity = (ant.mlScaffoldSecurity == "y")
+			var scaffoldRestServers = false
 			if (ant.mlRestPort) {
-				appConfig.setRestPort(Integer.parseInt(ant.mlRestPort))
-				if (ant.mlTestRestPort) {
-					appConfig.setTestRestPort(Integer.parseInt(ant.mlTestRestPort))
-				}
-			} else {
-				appConfig.setNoRestServer(true)
+				scaffoldRestServers = true
 			}
-			new ScaffoldGenerator().generateScaffold(getProject().getProjectDir().getAbsolutePath(), appConfig)
+			ScaffoldGenerator.AppInputs appInputs = new ScaffoldGenerator.AppInputs(ant.mlAppName, scaffoldDatabases, scaffoldRestServers, scaffoldSecurity)
+			new ScaffoldGenerator().generateScaffold(getProject().getProjectDir().getAbsolutePath(), appInputs)
 		}
 	}