Skip to content

Commit 5e39b4b

Browse files
committed
fixed #89
- refactored mlcp to use mlcp-util from @rjrudin - removed RunInputFlow from the DataHub class and jar. It doesn't make sense to live there - removed the dependencies on ngMaterial because it was conflicting with bootstrap ui - removed unused files to reduce the size of the final quick-start jar - fixed compile errors in Groovy Tasks - added some mlcp options to the load dialog - added the ability to copy the mlcp command to the clipboard - added .. to the directory list to navigate back up - made the "hover over labels" info less "in your face" - updated the MarkLogic Data Hub Banner to fit on smaller terminal windows - broke out mlcp loading stuff in the UI into its own module - moved the download mlcp options to be client side only - updated the saving of current mlcp properties to use json (compatible with mlcp-util)
1 parent 39855a7 commit 5e39b4b

File tree

77 files changed

+671
-124476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+671
-124476
lines changed

marklogic-data-hub/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ dependencies {
2727
compile 'com.marklogic:ml-app-deployer:2.0'
2828
compile 'commons-io:commons-io:2.4'
2929
compile 'org.apache.commons:commons-csv:1.2'
30-
compile('com.marklogic:mlcp:8.0-5') {
31-
exclude module : 'servlet-api'
32-
exclude group: 'com.google.guava', module: 'guava'
33-
}
34-
compile 'com.google.guava:guava:19.0'
30+
compile 'org.glassfish.jaxb:txw2:2.2.11'
3531
testCompile 'org.springframework.batch:spring-batch-test:3.0.6.RELEASE'
3632
testCompile 'junit:junit:4.12'
3733
testCompile 'xmlunit:xmlunit:1.3'

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

Lines changed: 0 additions & 113 deletions
This file was deleted.

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import com.marklogic.client.io.Format;
5555
import com.marklogic.client.io.StringHandle;
5656
import com.marklogic.client.util.RequestParameters;
57-
import com.marklogic.hub.Mlcp.SourceOptions;
5857
import com.marklogic.hub.collector.Collector;
5958
import com.marklogic.hub.collector.ServerCollector;
6059
import com.marklogic.hub.flow.Flow;
@@ -230,26 +229,6 @@ public JobExecution runFlow(Flow flow, int batchSize, JobExecutionListener liste
230229
}
231230
}
232231

233-
public void runInputFlow(Flow flow, HubConfig config) {
234-
try {
235-
Mlcp mlcp = new Mlcp(config.host, config.stagingPort, config.adminUsername, config.adminPassword);
236-
SourceOptions sourceOptions = new SourceOptions(
237-
flow.getEntityName(), flow.getName(),
238-
FlowType.INPUT.toString(),
239-
flow.getDataFormat());
240-
sourceOptions.setInputFileType("documents");
241-
sourceOptions.setTransformModule("/com.marklogic.hub/mlcp-flow-transform.xqy");
242-
sourceOptions.setTransformNamespace("http://marklogic.com/data-hub/mlcp-flow-transform");
243-
mlcp.addSourceDirectory(config.modulesPath, sourceOptions);
244-
mlcp.loadContent();
245-
}
246-
catch (IOException | JSONException e) {
247-
LOGGER.error(
248-
"Error encountered while trying to run flow: "
249-
+ flow.getEntityName() + " > " + flow.getName(), e);
250-
}
251-
}
252-
253232
public void runFlowsInParallel(Flow ... flows) {
254233

255234
}

0 commit comments

Comments
 (0)