fixing upgrade code

Author: paxtonhare

marklogic-data-hub/src/main/java/com/marklogic/hub/DataHub.java

@@ -482,6 +482,8 @@ public boolean updateHubFrom110() {
             text = Pattern.compile("^(\\s*)compile.+marklogic-data-hub.+$", Pattern.MULTILINE).matcher(text).replaceAll("$1compile 'com.marklogic:marklogic-data-hub:" + version + "'");
             FileUtils.writeStringToFile(buildGradle, text);
 
+            hubConfig.getHubSecurityDir().resolve("roles").resolve("data-hub-user.json").toFile().delete();
+
             // step 3: install hub modules into MarkLogic
             install();
 

marklogic-data-hub/src/main/java/com/marklogic/hub/HubConfig.java

@@ -60,7 +60,7 @@ public class HubConfig {
     public static final String DEFAULT_TRIGGERS_DB_NAME = "data-hub-TRIGGERS";
     public static final String DEFAULT_SCHEMAS_DB_NAME = "data-hub-SCHEMAS";
 
-    public static final String DEFAULT_ROLE_NAME = "data-hub-ROLE";
+    public static final String DEFAULT_ROLE_NAME = "data-hub-role";
     public static final String DEFAULT_USER_NAME = "data-hub-user";
 
     public static final Integer DEFAULT_STAGING_PORT = 8010;
@@ -542,21 +542,25 @@ public Map<String, String> getCustomTokens(Map<String, String> customTokens) {
         customTokens.put("\"%%mlStagingPort%%\"", stagingPort.toString());
         customTokens.put("%%mlStagingDbName%%", stagingDbName);
         customTokens.put("%%mlStagingForestsPerHost%%", stagingForestsPerHost.toString());
+        customTokens.put("%%mlStagingAuth%%", stagingAuthMethod);
 
         customTokens.put("%%mlFinalAppserverName%%", finalHttpName);
         customTokens.put("\"%%mlFinalPort%%\"", finalPort.toString());
         customTokens.put("%%mlFinalDbName%%", finalDbName);
         customTokens.put("%%mlFinalForestsPerHost%%", finalForestsPerHost.toString());
+        customTokens.put("%%mlFinalAuth%%", finalAuthMethod);
 
         customTokens.put("%%mlTraceAppserverName%%", traceHttpName);
         customTokens.put("\"%%mlTracePort%%\"", tracePort.toString());
         customTokens.put("%%mlTraceDbName%%", traceDbName);
         customTokens.put("%%mlTraceForestsPerHost%%", traceForestsPerHost.toString());
+        customTokens.put("%%mlTraceAuth%%", traceAuthMethod);
 
         customTokens.put("%%mlJobAppserverName%%", jobHttpName);
         customTokens.put("\"%%mlJobPort%%\"", jobPort.toString());
         customTokens.put("%%mlJobDbName%%", jobDbName);
         customTokens.put("%%mlJobForestsPerHost%%", jobForestsPerHost.toString());
+        customTokens.put("%%mlJobAuth%%", jobAuthMethod);
 
         customTokens.put("%%mlModulesDbName%%", modulesDbName);
         customTokens.put("%%mlModulesForestsPerHost%%", modulesForestsPerHost.toString());

marklogic-data-hub/src/main/java/com/marklogic/hub/HubProject.java

@@ -69,8 +69,8 @@ public void init() {
             rolesDir.toFile().mkdirs();
             usersDir.toFile().mkdirs();
 
-            writeResourceFileWithReplace("ml-config/security/roles/data-hub-user.json", rolesDir.resolve("data-hub-user.json"), true);
-            writeResourceFileWithReplace("ml-config/security/users/data-hub-user.json", usersDir.resolve("data-hub-user.json"), true);
+            writeResourceFile("ml-config/security/roles/data-hub-role.json", rolesDir.resolve("data-hub-role.json"), true);
+            writeResourceFile("ml-config/security/users/data-hub-user.json", usersDir.resolve("data-hub-user.json"), true);
 
             Path mimetypesDir = hubConfig.getHubMimetypesDir();
             mimetypesDir.toFile().mkdirs();