Merge pull request #213 from marklogic/dino/197-Refactor-to-autodeploy

fixed #197
Marklogic-retired · May 3, 2016 · cd693b3 · cd693b3
2 parents be718b2 + aa7e2eb
commit cd693b3
Show file tree

Hide file tree

Showing 12 changed files with 379 additions and 368 deletions.
diff --git a/marklogic-data-hub/src/main/java/com/marklogic/hub/DataHub.java b/marklogic-data-hub/src/main/java/com/marklogic/hub/DataHub.java
@@ -69,42 +69,43 @@
 
 public class DataHub {
 
-    static final private Logger LOGGER = LoggerFactory.getLogger(DataHub.class);
-
-    private ManageConfig config;
-    private ManageClient client;
-
-    private File assetInstallTimeFile = new File("./assetInstallTime.properties");
-    private HubConfig hubConfig;
-
-    public DataHub(HubConfig hubConfig) {
-        init(hubConfig);
-    }
-
-    public DataHub(String host, String username, String password) {
-        hubConfig = new HubConfig();
-        hubConfig.host = host;
-        hubConfig.adminUsername = username;
-        hubConfig.adminPassword = password;
-        init(hubConfig);
-    }
-
-    private void init(HubConfig hubConfig) {
-        this.hubConfig = hubConfig;
-        config = new ManageConfig(hubConfig.host, 8002, hubConfig.adminUsername, hubConfig.adminPassword);
-        client = new ManageClient(config);
-    }
-
-    public void setAssetInstallTimeFile(File assetInstallTimeFile) {
-        this.assetInstallTimeFile = assetInstallTimeFile;
-    }
-
-    /**
-     * Determines if the data hub is installed in MarkLogic
-     * @return true if installed, false otherwise
-     */
-    public boolean isInstalled() {
-        ServerManager sm = new ServerManager(client);
+	static final private Logger LOGGER = LoggerFactory.getLogger(DataHub.class);
+
+	private ManageConfig config;
+	private ManageClient client;
+
+	private File assetInstallTimeFile = new File("./assetInstallTime.properties");
+	private HubConfig hubConfig;
+
+	public DataHub(HubConfig hubConfig) {
+		init(hubConfig);
+	}
+
+	public DataHub(String host, String username, String password) {
+		hubConfig = new HubConfig();
+		hubConfig.host = host;
+		hubConfig.adminUsername = username;
+		hubConfig.adminPassword = password;
+		init(hubConfig);
+	}
+
+	private void init(HubConfig hubConfig) {
+		this.hubConfig = hubConfig;
+		config = new ManageConfig(hubConfig.host, 8002, hubConfig.adminUsername, hubConfig.adminPassword);
+		client = new ManageClient(config);
+	}
+
+	public void setAssetInstallTimeFile(File assetInstallTimeFile) {
+		this.assetInstallTimeFile = assetInstallTimeFile;
+	}
+
+	/**
+	 * Determines if the data hub is installed in MarkLogic
+	 * 
+	 * @return true if installed, false otherwise
+	 */
+	public boolean isInstalled() {
+	    ServerManager sm = new ServerManager(client);
         DatabaseManager dm = new DatabaseManager(client);
 
         ResourcesFragment srf = sm.getAsXml();
@@ -152,9 +153,9 @@ public boolean isInstalled() {
         boolean forestsOk = (stagingForestsExist && finalForestsExist && tracingForestsExist);
 
         return (appserversOk && dbsOk && forestsOk);
-    }
+	}
 
-    /**
+	/**
      * Validates the MarkLogic server to ensure compatibility with the hub
      * @throws ServerValidationException if the server is not compatible
      */

diff --git a/quick-start/src/main/java/com/marklogic/hub/factory/EntityModelFactory.java b/quick-start/src/main/java/com/marklogic/hub/factory/EntityModelFactory.java
@@ -68,7 +68,6 @@ public EntityModel createEntity(String entityName, String entityFilePath, SyncSt
         EntityModel entityModel = new EntityModel();
         entityModel.setEntityName(entityName);
         //this will be updated after traversing its modules
-        entityModel.setSynched(this.entitiesInServer.containsKey(entityName));
 
         FlowModelFactory flowModelFactory = new FlowModelFactory(
                 this.entitiesInServer.get(entityName), entityName);
@@ -97,11 +96,9 @@ private void setEntityModules(EntityModel entityModel, String entityFilePath,
         for (String folderName : folderNames) {
             if (folderName.equalsIgnoreCase(RestModelFactory.REST_FOLDER_NAME)) {
                 restModel = restModelFactory.createRest(modulesParentDirectory, syncStatusService);
-                entityModel.setSynched(entityModel.isSynched() && restModel.isSynched());
             } else {
                 FlowModel flowModel = flowModelFactory.createFlow(modulesParentDirectory,
                         folderName, flowType, syncStatusService);
-                entityModel.setSynched(entityModel.isSynched() && flowModel.isSynched());
                 flows.add(flowModel);
             }
         }

diff --git a/quick-start/src/main/java/com/marklogic/hub/factory/FlowModelFactory.java b/quick-start/src/main/java/com/marklogic/hub/factory/FlowModelFactory.java
@@ -43,7 +43,6 @@ public FlowModel createNewFlow(File userPluginDirPath, String flowName,
         FlowModel flowModel = new FlowModel();
         flowModel.setEntityName(entityName);
         flowModel.setFlowName(flowName);
-        flowModel.setSynched(false);
 
         Scaffolding.createFlow(entityName, flowName, flowType, pluginFormat,
                 dataFormat, userPluginDirPath);
@@ -72,7 +71,6 @@ public FlowModel createFlow(String parentDirPath, String flowName,
                 && flowType.equals(flow.getType())) {
             synched = syncStatusService.isDirectorySynched(absolutePath);
         }
-        flowModel.setSynched(synched);
         return flowModel;
     }
 }
diff --git a/quick-start/src/main/java/com/marklogic/hub/model/EntityModel.java b/quick-start/src/main/java/com/marklogic/hub/model/EntityModel.java
@@ -9,7 +9,6 @@ public class EntityModel {
     private String entityName;
     private List<FlowModel> inputFlows;
     private List<FlowModel> harmonizeFlows;
-    private boolean isSynched;
     private RestModel inputRest;
     private RestModel harmonizeRest;
 
@@ -61,30 +60,6 @@ public void setHarmonizeFlows(List<FlowModel> harmonizeFlows) {
         this.harmonizeFlows = harmonizeFlows;
     }
 
-    public boolean isSynched() {
-        return isSynched;
-    }
-
-    public void setSynched(boolean isSynched) {
-        this.isSynched = isSynched;
-    }
-
-    public void setInputFlowsSynched(boolean synched) {
-        if (inputFlows != null) {
-            for (FlowModel model : inputFlows) {
-                model.setSynched(synched);
-            }
-        }
-    }
-
-    public void setHarmonizeFlowsSynched(boolean synched) {
-        if (harmonizeFlows != null) {
-            for (FlowModel model : harmonizeFlows) {
-                model.setSynched(synched);
-            }
-        }
-    }
-
     public RestModel getInputRest() {
         return inputRest;
     }
@@ -107,8 +82,6 @@ public String toString() {
         sb.append("{");
         sb.append("entityName=");
         sb.append(entityName);
-        sb.append("isSynched=");
-        sb.append(isSynched);
         sb.append("}");
 
         return sb.toString();

diff --git a/quick-start/src/main/java/com/marklogic/hub/model/FlowModel.java b/quick-start/src/main/java/com/marklogic/hub/model/FlowModel.java
@@ -4,7 +4,6 @@ public class FlowModel {
 
     private String entityName;
     private String flowName;
-    private boolean isSynched;
     private TreeData treeData;
 
     public String getEntityName() {
@@ -24,14 +23,6 @@ public void setFlowName(String flowName) {
         this.flowName = flowName;
     }
 
-    public boolean isSynched() {
-        return isSynched;
-    }
-
-    public void setSynched(boolean isSynched) {
-        this.isSynched = isSynched;
-    }
-
     public TreeData getTreeData() {
         return treeData;
     }
@@ -46,10 +37,8 @@ public String toString() {
         sb.append("{");
         sb.append("entityName=");
         sb.append(entityName);
-        sb.append("flowName=");
+        sb.append(" flowName=");
         sb.append(flowName);
-        sb.append("isSynched=");
-        sb.append(isSynched);
         sb.append("}");
 
         return sb.toString();

diff --git a/quick-start/src/main/java/com/marklogic/hub/service/DataHubService.java b/quick-start/src/main/java/com/marklogic/hub/service/DataHubService.java
@@ -31,8 +31,10 @@ public void install() throws DataHubException {
     }
 
     public void installUserModules() throws DataHubException {
+    	LOGGER.debug("installUserModules");
         DataHub dataHub = getDataHub();
         try {
+        	LOGGER.debug("pluginDir:" + environmentConfiguration.getUserPluginDir());
             dataHub.installUserModules(environmentConfiguration.getUserPluginDir());
         } catch(Throwable e) {
             throw new DataHubException(e.getMessage(), e);