moving ./config to ./marklogic-config

fixes issue #239

Author: paxtonhare

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

@@ -226,7 +226,7 @@ public void updateAppConfig(AppConfig config) {
         forestCounts.put(hubConfig.modulesDbName, 1);
         config.setForestCounts(forestCounts);
 
-        ConfigDir configDir = new ConfigDir(Paths.get(hubConfig.projectDir, "config").toFile());
+        ConfigDir configDir = new ConfigDir(Paths.get(hubConfig.projectDir, "marklogic-config").toFile());
         config.setConfigDir(configDir);
 
         Map<String, String> customTokens = config.getCustomTokens();
@@ -393,6 +393,7 @@ private List<Command> getCommands(AppConfig config) {
 
     /**
      * 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) {
         initProject();
@@ -407,6 +408,7 @@ public void install(StatusListener listener) {
 
     /**
      * 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) {
         LOGGER.debug("Uninstalling the Data Hub from MarkLogic");

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

@@ -160,6 +160,7 @@ private JobParameters buildJobParameters(Flow flow, int batchSize) {
      * Runs a given flow
      * @param flow - the flow to run
      * @param batchSize - the size to use for batching transactions
+     * @param statusListener - the callback to receive job status updates
      * @return a JobExecution instance
      */
     public JobExecution runFlow(Flow flow, int batchSize, JobStatusListener statusListener) {

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

@@ -29,7 +29,7 @@ public HubProject(HubConfig config) {
         this.hubConfig = config;
         this.projectDirStr = config.projectDir;
         this.projectDir = Paths.get(this.projectDirStr);
-        this.configDir = Paths.get(this.projectDirStr, "config");
+        this.configDir = Paths.get(this.projectDirStr, "marklogic-config");
         this.pluginsDir = Paths.get(this.projectDirStr, "plugins");
 
         customTokens.put("%%mlHost%%", hubConfig.host);

marklogic-data-hub/src/main/java/com/marklogic/spring/batch/hub/AbstractMarkLogicBatchConfig.java

@@ -45,7 +45,7 @@ public abstract class AbstractMarkLogicBatchConfig extends LoggingObject impleme
     /**
      * Convenience method for retrieving the "main" DatabaseClient instance.
      *
-     * @return
+     * @return a database client
      */
     protected DatabaseClient getDatabaseClient() {
         return databaseClientProvider.getDatabaseClient();

marklogic-data-hub/src/test/java/com/marklogic/hub/HubProjectTest.java

@@ -46,16 +46,16 @@ public void testInit() throws IOException {
         HubProject hp = new HubProject(config);
         hp.init();
 
-        assertTrue(new File(projectPath, "config/servers/staging-server.json").exists());
-        assertTrue(new File(projectPath, "config/servers/final-server.json").exists());
-        assertTrue(new File(projectPath, "config/servers/trace-server.json").exists());
-
-        assertTrue(new File(projectPath, "config/databases/staging-database.json").exists());
-        assertTrue(new File(projectPath, "config/databases/final-database.json").exists());
-        assertTrue(new File(projectPath, "config/databases/trace-database.json").exists());
-        assertTrue(new File(projectPath, "config/databases/modules-database.json").exists());
-        assertTrue(new File(projectPath, "config/databases/schemas-database.json").exists());
-        assertTrue(new File(projectPath, "config/databases/triggers-database.json").exists());
+        assertTrue(new File(projectPath, "marklogic-config/servers/staging-server.json").exists());
+        assertTrue(new File(projectPath, "marklogic-config/servers/final-server.json").exists());
+        assertTrue(new File(projectPath, "marklogic-config/servers/trace-server.json").exists());
+
+        assertTrue(new File(projectPath, "marklogic-config/databases/staging-database.json").exists());
+        assertTrue(new File(projectPath, "marklogic-config/databases/final-database.json").exists());
+        assertTrue(new File(projectPath, "marklogic-config/databases/trace-database.json").exists());
+        assertTrue(new File(projectPath, "marklogic-config/databases/modules-database.json").exists());
+        assertTrue(new File(projectPath, "marklogic-config/databases/schemas-database.json").exists());
+        assertTrue(new File(projectPath, "marklogic-config/databases/triggers-database.json").exists());
 
         File buildGradle = new File(projectPath, "build.gradle");
         assertTrue(buildGradle.exists());

quick-start/src/main/java/com/marklogic/quickstart/model/Project.java

@@ -26,7 +26,7 @@ public Project(int id, String path) {
     public boolean isInitialized() {
         File buildGradle = new File(this.path, "build.gradle");
         File gradleProperties = new File(this.path, "gradle.properties");
-        File configDir = new File(this.path, "config");
+        File configDir = new File(this.path, "marklogic-config");
         File databasesDir = new File(configDir, "databases");
         File serversDir = new File(configDir, "servers");
 

quick-start/src/main/java/com/marklogic/quickstart/service/FlowManagerService.java

@@ -60,6 +60,8 @@ public List<FlowModel> getFlows(String projectDir, String entityName, FlowType f
         Path flowPath = entityPath.resolve(flowType.toString());
         List<String> flowNames = FileUtil.listDirectFolders(flowPath.toFile());
         for (String flowName : flowNames) {
+            if (flowName.equals("REST")) continue;
+
             Flow f = AbstractFlow.loadFromFile(flowPath.resolve(flowName).resolve(flowName + ".xml").toFile());
             FlowModel flow = new FlowModel(entityName, flowName);
             if (f != null) {