#453 mlInstallAdmin now supports a realm property

Author: rjrudin

examples/sample-project/gradle.properties

@@ -13,7 +13,7 @@ mlTestRestPort=8101
 
 # You can define just mlUsername and mlPassword, and that user will be used for all deployment operations, but that's
 # generally not a good practice, as this user will need the admin role in order to create security resources. Generally,
-# you want to use an admin user just for mlAdminUsername, as that username will only be used for creating security
+# you want to use an admin user just for mlSecurityUsername, as that username will only be used for creating security
 # resources such as users and roles. You can then use app-specific users for mlRestAdminUsername, mlManageUsername, etc.
 #
 # Otherwise, this is typically an application user. In sample-project, this user is used for running JUnit tests.

src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy

@@ -111,7 +111,8 @@ class MarkLogicPlugin implements Plugin<Project> {
 
 		String adminGroup = "ml-gradle Admin"
 		project.task("mlInit", type: InitTask, group: adminGroup, description: "Perform a one-time initialization of a MarkLogic server; uses the properties 'mlLicenseKey' and 'mlLicensee'")
-		project.task("mlInstallAdmin", type: InstallAdminTask, group: adminGroup, description: "Perform a one-time installation of an admin user; uses the properties 'mlAdminUsername'/'mlUsername' and 'mlAdminPassword'/'mlPassword'")
+		project.task("mlInstallAdmin", type: InstallAdminTask, group: adminGroup, description: "Perform a one-time installation of an admin user; uses the properties 'mlAdminUsername'/'mlUsername' and 'mlAdminPassword'/'mlPassword'; " +
+			"the realm, which defaults to 'public', can optionally be specified on the command line via '-Prealm='")
 
 		String alertGroup = "ml-gradle Alert"
 		project.task("mlDeleteAllAlertConfigs", type: DeleteAllAlertConfigsTask, group: alertGroup, description: "Delete all alert configs, which also deletes all of the actions rules associated with them")

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

@@ -36,10 +36,14 @@ class MarkLogicTask extends DefaultTask {
         getProject().property("mlAdminManager")
     }
 
+	// TODO Should remove this as "mlSecurityUsername" is preferred, and this is now specific to InstallAdminTask
+	@Deprecated
     String getAdminUsername() {
         project.hasProperty("mlAdminUsername") ? project.property("mlAdminUsername") : project.property("mlUsername")
     }
 
+	// TODO Should remove this as "mlSecurityUsername" is preferred, and this is now specific to InstallAdminTask
+	@Deprecated
 	String getAdminPassword() {
 		project.hasProperty("mlAdminPassword") ? project.property("mlAdminPassword") : project.property("mlPassword")
 	}

src/main/groovy/com/marklogic/gradle/task/admin/InstallAdminTask.groovy

@@ -6,8 +6,17 @@ import com.marklogic.gradle.task.MarkLogicTask
 
 class InstallAdminTask extends MarkLogicTask {
 
+	String realm
+
     @TaskAction
     void installAdmin() {
-        getAdminManager().installAdmin(getAdminUsername(), getAdminPassword())
+	    if (getProject().hasProperty("realm")) {
+		    realm = project.property("realm")
+	    }
+	    if (realm != null) {
+		    getAdminManager().installAdmin(getAdminUsername(), getAdminPassword(), realm)
+	    } else {
+		    getAdminManager().installAdmin(getAdminUsername(), getAdminPassword())
+	    }
     }
 }