Merge branch 'develop' into bugfix/DHFPROD-653

Author: Charles Greer

NOTICES.txt

@@ -31,7 +31,7 @@ You can see that we are referencing the new custom tokens within the `custom-tok
   "root": "/",
   "group-name": "%%GROUP%%",
   "port": "%%TEST_SERVER_PORT%%",
-  "modules-database": "%%mlStagingModulesDbName%%",
+  "modules-database": "%%mlModulesDbName%%",
   "content-database": "%%TEST_DATABASE_NAME%%",
   "authentication": "%%TEST_TRACE_AUTH%%",
   "default-error-format": "json",

examples/custom-tokens/README.md

@@ -63,8 +63,8 @@ mlJobDbName=data-hub-JOBS
 mlJobForestsPerHost=1
 mlJobAuth=digest
 
-mlStagingModulesDbName=data-hub-MODULES
-mlStagingModulesForestsPerHost=1
+mlModulesDbName=data-hub-MODULES
+mlModulesForestsPerHost=1
 
 mlStagingTriggersDbName=data-hub-TRIGGERS
 mlStagingTriggersForestsPerHost=1

examples/custom-tokens/gradle.properties

@@ -4,7 +4,7 @@
   "root": "/",
   "group-name": "%%GROUP%%",
   "port": "%%TEST_SERVER_PORT%%",
-  "modules-database": "%%mlStagingModulesDbName%%",
+  "modules-database": "%%mlModulesDbName%%",
   "content-database": "%%TEST_DATABASE_NAME%%",
   "authentication": "%%TEST_TRACE_AUTH%%",
   "default-error-format": "json",

examples/custom-tokens/user-config/servers/test-server.json

@@ -63,8 +63,8 @@ mlJobDbName=data-hub-JOBS
 mlJobForestsPerHost=1
 mlJobAuth=digest
 
-mlStagingModulesDbName=data-hub-MODULES
-mlStagingModulesForestsPerHost=1
+mlModulesDbName=data-hub-MODULES
+mlModulesForestsPerHost=1
 
 mlStagingTriggersDbName=data-hub-TRIGGERS
 mlStagingTriggersForestsPerHost=1

examples/external-security/gradle-example.properties

@@ -63,8 +63,8 @@ mlJobDbName=data-hub-JOBS
 mlJobForestsPerHost=1
 mlJobAuth=digest
 
-mlStagingModulesDbName=data-hub-MODULES
-mlStagingModulesForestsPerHost=1
+mlModulesDbName=data-hub-MODULES
+mlModulesForestsPerHost=1
 
 mlStagingTriggersDbName=data-hub-TRIGGERS
 mlStagingTriggersForestsPerHost=1

examples/ssl/gradle.properties

@@ -220,7 +220,7 @@ ext {
         moduleTokensPropertiesSources = new ArrayList<>()
 
         // override some default values with our values
-        modulesDatabaseName = mlStagingModulesDbName
+        modulesDatabaseName = mlModulesDbName
         triggersDatabaseName = mlStagingTriggersDbName
         schemasDatabaseName = mlStagingSchemasDbName
         restPort = Integer.parseInt(mlJobPort)
@@ -238,7 +238,7 @@ ext {
         customTokens.put("%%mlJobPort%%", mlJobPort)
         customTokens.put("%%mlJobDbName%%", mlJobDbName)
 
-        customTokens.put("%%mlStagingModulesDbName%%", mlStagingModulesDbName)
+        customTokens.put("%%mlModulesDbName%%", mlModulesDbName)
         customTokens.put("%%mlStagingTriggersDbName%%", mlStagingTriggersDbName)
         customTokens.put("%%mlStagingSchemasDbName%%", mlStagingSchemasDbName)
 

marklogic-data-hub/build.gradle

@@ -40,11 +40,10 @@ mlJobPort=8013
 mlJobDbName=data-hub-JOBS
 mlJobForestsPerHost=1
 
-mlStagingModulesDbName=data-hub-MODULES
+mlModulesDbName=data-hub-MODULES
 mlStagingTriggersDbName=data-hub-staging-TRIGGERS
 mlStagingSchemasDbName=data-hub-staging-SCHEMAS
 
-mlFinalModulesDbName=data-hub-final-MODULES
 mlFinalTriggersDbName=data-hub-final-TRIGGERS
 mlFinalSchemasDbName=data-hub-final-SCHEMAS
 
@@ -60,5 +59,4 @@ mlHubAdminRole=hub-admin-role
 mlHubAdminUserName=hub-admin-user
 mlHubAdminUserPassword=fO3^)&X|j_O8m^k_2=xi
 
-mlStagingModulePermissions=rest-reader,read,rest-writer,insert,rest-writer,update,rest-extension-user,execute,data-hub-role,read,data-hub-role,execute
-mlFinalModulePermissions=rest-reader,read,rest-writer,insert,rest-writer,update,rest-extension-user,execute,data-hub-role,read,data-hub-role,execute
+mlModulePermissions=rest-reader,read,rest-writer,insert,rest-writer,update,rest-extension-user,execute,data-hub-role,read,data-hub-role,execute

marklogic-data-hub/gradle.properties

@@ -33,8 +33,9 @@ public enum DatabaseKind {
         FINAL_SCHEMAS,
         STAGING_TRIGGERS,
         FINAL_TRIGGERS,
-        STAGING_MODULES,
-        FINAL_MODULES;
+        MODULES,
+        @Deprecated STAGING_MODULES,
+        @Deprecated FINAL_MODULES;
 
        static private String[] databaseNames = {
            "staging",
@@ -45,8 +46,9 @@ public enum DatabaseKind {
            "final_schemas",
            "staging_triggers",
            "final_triggers",
-           "staging_modules",
-           "final_modules"
+           "modules",
+           "modules",
+           "modules"
         };
 
      /**

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

@@ -54,7 +54,7 @@ public interface HubConfig {
     String DEFAULT_STAGING_NAME = "data-hub-STAGING";
     String DEFAULT_FINAL_NAME = "data-hub-FINAL";
     String DEFAULT_JOB_NAME = "data-hub-JOBS";
-    String DEFAULT_STAGING_MODULES_DB_NAME = "data-hub-MODULES";
+    String DEFAULT_MODULES_DB_NAME = "data-hub-MODULES";
     String DEFAULT_FINAL_MODULES_DB_NAME = "data-hub-final-MODULES";
     String DEFAULT_STAGING_TRIGGERS_DB_NAME = "data-hub-staging-TRIGGERS";
     String DEFAULT_FINAL_TRIGGERS_DB_NAME = "data-hub-final-TRIGGERS";
@@ -383,22 +383,10 @@ static HubConfig create(String projectDir) {
     DatabaseClient newModulesDbClient();
 
     /**
-     * Gets the path for the hub staging modules
-     * @return the path for the hub staging modules
+     * Gets the path for the modules directory
+     * @return the path for the modules directory
      */
-    Path getHubStagingModulesDir();
-
-    /**
-     * Gets the path for the user staging modules
-     * @return the path for the user staging modules
-     */
-    Path getUserStagingModulesDir();
-
-    /**
-     * Gets the path for the user final modules
-     * @return the path for the user final modules
-     */
-    Path getUserFinalModulesDir();
+    Path getModulesDir();
 
     /**
      * Gets the path for the hub plugins directory