Merge branch 'release/1.0.0'

Author: paxtonhare

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,29 @@
+### Welcome Hub enthusiast!
+
+Let's get the most out of this ticket.
+
+#### The issue
+
+Short description of the problem:
+
+What behavior are you expecting?
+
+#### Tech details
+
+Which Operating System are you using?
+
+Which version of MarkLogic are you using?
+
+Which version of the Data Hub Framework are you using?
+
+Is this a QuickStart UI bug? If so, which browser are you using?
+
+#### The devil is in the details...
+
+If possible, rerun the command with -d for debugging output and attach the output:
+
+  **for quickstart:**  
+  `java -jar quickstart.war -d > myoutput.txt`
+
+  **for gradle:**  
+  `gradle mlYourCommand -d > myoutput.txt`

CHANGELOG.md

@@ -1,7 +1,24 @@
 # Change Log
 
-## [v1.0.0-rc.6](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-rc.6)
+## [v1.0.0](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0)
 
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.0-rc.6...v1.0.0)
+
+**Fixed bugs:**
+
+- DeployViewSchemasCommand is failing installs [\#312](https://github.com/marklogic/marklogic-data-hub/issues/312)
+- File change watcher fires multiple times on Windows [\#308](https://github.com/marklogic/marklogic-data-hub/issues/308)
+- Clean Target database directory ? is confusing not working [\#305](https://github.com/marklogic/marklogic-data-hub/issues/305)
+
+**Closed issues:**
+
+- Gradle Daemon causing working directory issues [\#314](https://github.com/marklogic/marklogic-data-hub/issues/314)
+- marklogic spring batch requires additional date sort operator [\#311](https://github.com/marklogic/marklogic-data-hub/issues/311)
+- Handling tab-delimited files  [\#310](https://github.com/marklogic/marklogic-data-hub/issues/310)
+- Add issue template to the repo [\#309](https://github.com/marklogic/marklogic-data-hub/issues/309)
+- Last deployed time sometimes says 47 years ago [\#303](https://github.com/marklogic/marklogic-data-hub/issues/303)
+
+## [v1.0.0-rc.6](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-rc.6) (2016-10-17)
 [Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.0-rc.5...v1.0.0-rc.6)
 
 **Fixed bugs:**

examples/spring-batch/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'idea'
     id 'application'
     id 'net.saliman.properties' version '1.4.6'
-    id 'com.marklogic.ml-data-hub' version '1.0.0-rc.6'
+    id 'com.marklogic.ml-data-hub' version '1.0.0'
 }
 
 repositories {
@@ -13,10 +13,10 @@ repositories {
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-data-hub:1.0.0-rc.6'
-    compile "com.marklogic:marklogic-spring-batch-core:0.6.0"
-    compile "com.marklogic:ml-javaclient-util:2.9.1"
-    testCompile "com.marklogic:marklogic-spring-batch-test:0.6.0"
+    compile 'com.marklogic:marklogic-data-hub:1.0.0'
+    compile 'com.marklogic:marklogic-spring-batch-core:0.6.0'
+    compile 'com.marklogic:ml-javaclient-util:2.9.1'
+    testCompile 'com.marklogic:marklogic-spring-batch-test:0.6.0'
 }
 
 distributions {

examples/spring-batch/gradle.properties

@@ -10,8 +10,8 @@
 mlHost=localhost
 mlAppName=data-hub
 
-mlAdminUsername=admin
-mlAdminPassword=admin
+mlUsername=admin
+mlPassword=admin
 
 mlStagingAppserverName=data-hub-STAGING
 mlStagingPort=8010

marklogic-data-hub/build.gradle

@@ -22,7 +22,7 @@ dependencies {
     compile 'org.springframework.batch:spring-batch-core:3.0.6.RELEASE'
     compile 'org.springframework:spring-jdbc:4.2.6.RELEASE'
     compile 'com.marklogic:java-client-api:3.0.5'
-    compile 'com.marklogic:ml-javaclient-util:2.9.1'
+    compile 'com.marklogic:ml-javaclient-util:2.10.0'
     compile 'com.marklogic:ml-app-deployer:2.3.0'
     compile 'com.marklogic:marklogic-spring-batch-core:0.7.0'
     compile 'commons-io:commons-io:2.4'

marklogic-data-hub/gradle.properties

@@ -31,11 +31,11 @@ mlModulesDbName=data-hub-MODULES
 mlTriggersDbName=data-hub-TRIGGERS
 mlSchemasDbName=data-hub-SCHEMAS
 
-hubModulesPath=examples/hr-hub/plugins
+hubProjectDir=examples/hr-hub
 
 mlReplaceTokensInModules=true
 mlUseRoxyTokenPrefix=false
 
-version=1.0.0-rc.6
+version=1.0.0
 
 

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

@@ -51,9 +51,12 @@
 import com.marklogic.client.helper.LoggingObject;
 import com.marklogic.client.io.JacksonHandle;
 import com.marklogic.client.util.RequestParameters;
-import com.marklogic.hub.commands.DeployHubDatabasesCommand;
-import com.marklogic.hub.commands.LoadHubModulesCommand;
-import com.marklogic.hub.commands.LoadUserModulesCommand;
+import com.marklogic.hub.deploy.commands.DeployHubDatabasesCommand;
+import com.marklogic.hub.deploy.commands.LoadHubModulesCommand;
+import com.marklogic.hub.deploy.commands.LoadUserModulesCommand;
+import com.marklogic.hub.deploy.HubAppDeployer;
+import com.marklogic.hub.deploy.util.HubDeployStatusListener;
+import com.marklogic.hub.error.ServerValidationException;
 import com.marklogic.mgmt.ManageClient;
 import com.marklogic.mgmt.ManageConfig;
 import com.marklogic.mgmt.admin.AdminConfig;
@@ -84,29 +87,26 @@ public DataHub(HubConfig hubConfig) {
         init(hubConfig);
     }
 
-    public DataHub(String host, String username, String password) {
-        hubConfig = new HubConfig();
-        hubConfig.host = host;
-        hubConfig.username = username;
-        hubConfig.password = password;
-        init(hubConfig);
-    }
-
     private void init(HubConfig hubConfig) {
         this.hubConfig = hubConfig;
-        config = new ManageConfig(hubConfig.host, 8002, hubConfig.username, hubConfig.password);
-        client = new ManageClient(config);
-        databaseManager = new DatabaseManager(client);
-        serverManager = new ServerManager(client);
-
-        AdminConfig adminConfig = new AdminConfig();
-        adminConfig.setHost(hubConfig.host);
-        adminConfig.setUsername(hubConfig.username);
-        adminConfig.setPassword(hubConfig.password);
-        adminManager = new AdminManager(adminConfig);
+        if (hubConfig.username != null && hubConfig.password != null) {
+            config = new ManageConfig(hubConfig.host, 8002, hubConfig.username, hubConfig.password);
+            client = new ManageClient(config);
+            databaseManager = new DatabaseManager(client);
+            serverManager = new ServerManager(client);
+
+            AdminConfig adminConfig = new AdminConfig();
+            adminConfig.setHost(hubConfig.host);
+            adminConfig.setUsername(hubConfig.adminUsername);
+            adminConfig.setPassword(hubConfig.adminPassword);
+            adminManager = new AdminManager(adminConfig);
+        }
+        else {
+            logger.info("Missing username and/or password.");
+        }
     }
 
-    public void setAdminManager(AdminManager manager) {
+    void setAdminManager(AdminManager manager) {
         this.adminManager = manager;
     }
 
@@ -203,6 +203,10 @@ private AppConfig getAppConfig() {
         return config;
     }
 
+    /**
+     * Updates the given AppConfig with values from this DataHub
+     * @param config - the AppConfig instance to update
+     */
     public void updateAppConfig(AppConfig config) {
         config.setHost(hubConfig.host);
         config.setRestPort(hubConfig.stagingPort);
@@ -253,6 +257,10 @@ public void updateAppConfig(AppConfig config) {
         customTokens.put("%%mlModulesDbName%%", hubConfig.modulesDbName);
         customTokens.put("%%mlTriggersDbName%%", hubConfig.triggersDbName);
         customTokens.put("%%mlSchemasDbName%%", hubConfig.schemasDbName);
+
+        customTokens.put("%%mlHubUserName%%", hubConfig.hubUserName);
+        customTokens.put("%%mlHubUserPassword%%", hubConfig.hubUserPassword);
+        customTokens.put("%%mlHubUserRole%%", hubConfig.hubUserRole);
     }
 
     public void initProject() {
@@ -426,17 +434,26 @@ private List<Command> getCommands(AppConfig config) {
 
         // SQL Views
         List<Command> viewCommands = new ArrayList<>();
-        viewCommands.add(new DeployViewSchemasCommand());
+        DeployViewSchemasCommand deployViewSchemasCommand = new DeployViewSchemasCommand();
+        deployViewSchemasCommand.setDatabaseIdOrName(hubConfig.finalDbName);
+        viewCommands.add(deployViewSchemasCommand);
         commands.addAll(viewCommands);
 
         return commands;
     }
 
+    /**
+     * Installs the data hub configuration and server-side modules into MarkLogic
+     */
+    public void install() {
+        install(null);
+    }
+
     /**
      * Installs the data hub configuration and server-side modules into MarkLogic
      * @param listener - the callback method to receive status updates
      */
-    public void install(StatusListener listener) {
+    public void install(HubDeployStatusListener listener) {
         initProject();
 
         logger.info("Installing the Data Hub into MarkLogic");
@@ -447,11 +464,18 @@ public void install(StatusListener listener) {
         deployer.deploy(config);
     }
 
+    /**
+     * Uninstalls the data hub configuration and server-side modules from MarkLogic
+     */
+    public void uninstall() {
+        uninstall(null);
+    }
+
     /**
      * Uninstalls the data hub configuration and server-side modules from MarkLogic
      * @param listener - the callback method to receive status updates
      */
-    public void uninstall(StatusListener listener) {
+    public void uninstall(HubDeployStatusListener listener) {
         logger.debug("Uninstalling the Data Hub from MarkLogic");
 
         AppConfig config = getAppConfig();

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

@@ -16,7 +16,7 @@ public Debugging(DatabaseClient client) {
     }
 
     /**
-     * Enables tracing
+     * Enables debugging
      */
     public void enable() {
         RequestParameters params = new RequestParameters();
@@ -25,7 +25,7 @@ public void enable() {
     }
 
     /**
-     * Disables tracing
+     * Disables debugging
      */
     public void disable() {
         RequestParameters params = new RequestParameters();
@@ -34,7 +34,7 @@ public void disable() {
     }
 
     /**
-     * Determines if the hub has tracing enabled or not
+     * Determines if the hub has debugging enabled or not
      *
      * @return - true if enabled, false otherwise
      */

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

@@ -23,6 +23,7 @@
 import com.marklogic.client.io.DOMHandle;
 import com.marklogic.client.util.RequestParameters;
 import com.marklogic.hub.flow.Flow;
+import com.marklogic.hub.flow.FlowComplexity;
 import com.marklogic.hub.flow.FlowType;
 import com.marklogic.hub.flow.SimpleFlow;
 import com.marklogic.spring.batch.hub.FlowConfig;
@@ -51,21 +52,10 @@ public class FlowManager extends ResourceManager {
     private DatabaseClient client;
     private HubConfig hubConfig;
 
-    private DatabaseClient getClient() {
-        DatabaseClientFactory.Authentication authMethod = DatabaseClientFactory.Authentication
-            .valueOf(hubConfig.authMethod.toUpperCase());
-
-        return DatabaseClientFactory.newClient(
-            hubConfig.host,
-            hubConfig.stagingPort,
-            hubConfig.username,
-            hubConfig.password, authMethod);
-    }
-
     public FlowManager(HubConfig hubConfig) {
         super();
         this.hubConfig = hubConfig;
-        this.client = getClient();
+        this.client = hubConfig.newStagingClient();
         this.client.init(NAME, this);
     }