fixed #314

Author: paxtonhare

marklogic-data-hub/gradle.properties

@@ -31,7 +31,7 @@ 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

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

@@ -87,14 +87,6 @@ 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;
         if (hubConfig.username != null && hubConfig.password != null) {

ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/DataHubPlugin.groovy

@@ -67,7 +67,7 @@ class DataHubPlugin implements Plugin<Project> {
     }
 
     void initializeProjectExtensions(Project project) {
-        HubConfig hubConfig = new DefaultHubConfigFactory(new ProjectPropertySource(project)).newHubConfig()
+        HubConfig hubConfig = new DefaultHubConfigFactory(project, new ProjectPropertySource(project)).newHubConfig()
         project.extensions.add("hubConfig", hubConfig)
 
         DataHub hub = new DataHub(hubConfig)

ml-data-hub-plugin/src/main/java/com.marklogic.hub/DefaultHubConfigFactory.java

@@ -17,15 +17,19 @@
 
 import com.marklogic.mgmt.util.PropertySource;
 import com.marklogic.mgmt.util.PropertySourceFactory;
+import org.gradle.api.Project;
 
 public class DefaultHubConfigFactory extends PropertySourceFactory {
 
     public DefaultHubConfigFactory() {
         super();
     };
 
-    public DefaultHubConfigFactory(PropertySource propertySource) {
+    private Project project;
+
+    public DefaultHubConfigFactory(Project project, PropertySource propertySource) {
         super(propertySource);
+        this.project = project;
     }
 
     public HubConfig newHubConfig() {
@@ -181,6 +185,9 @@ public HubConfig newHubConfig() {
         if (prop != null) {
             logger.info("REST admin username: " + prop);
             c.adminUsername = prop;
+            if (mlUsername == null) {
+                c.username = prop;
+            }
         } else if (mlUsername != null) {
             logger.info("REST admin username: " + mlUsername);
             c.adminUsername = mlUsername;
@@ -189,17 +196,20 @@ public HubConfig newHubConfig() {
         prop = getProperty("mlAdminPassword");
         if (prop != null) {
             c.adminPassword = prop;
+            if (mlPassword == null) {
+                c.username = prop;
+            }
         }
         else if (mlPassword != null) {
             c.adminPassword = mlPassword;
         }
 
-        prop = getProperty("hubModulesPath");
+        prop = getProperty("hubProjectDir");
         if (prop != null) {
             c.projectDir = prop;
         }
         else {
-            c.projectDir = ".";
+            c.projectDir = project.getProjectDir().getAbsolutePath();
         }
         logger.info("Hub Project Dir: " + c.projectDir);
 

ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/BaseTest.groovy

@@ -85,8 +85,6 @@ class BaseTest extends Specification {
             mlModulesDbName=data-hub-MODULES
             mlTriggersDbName=data-hub-TRIGGERS
             mlSchemasDbName=data-hub-SCHEMAS
-
-            hubModulesPath = ${testProjectDir.root}
         """
     }