fixed #302

prepping for rc.6 release

Author: paxtonhare

CHANGELOG.md

@@ -1,7 +1,30 @@
 # Change Log
 
-## [v1.0.0-rc.5](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-rc.5)
+## [v1.0.0-rc.6](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-rc.6)
 
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.0-rc.5...v1.0.0-rc.6)
+
+**Fixed bugs:**
+
+- Deadlock when evaling from writer [\#231](https://github.com/marklogic/marklogic-data-hub/issues/231)
+
+**Closed issues:**
+
+- Update Trace UI in Trace server [\#302](https://github.com/marklogic/marklogic-data-hub/issues/302)
+- Trace enhancement: Not logging enough for error trace [\#301](https://github.com/marklogic/marklogic-data-hub/issues/301)
+- ArrayIndexOutOfBoundsException [\#298](https://github.com/marklogic/marklogic-data-hub/issues/298)
+- Getting Started Tutorial - Sample code for Acme Tech header plugin does not update 'latest' variable [\#297](https://github.com/marklogic/marklogic-data-hub/issues/297)
+- Not all data is processed in harmonize flow when thread count is greater than 1 [\#296](https://github.com/marklogic/marklogic-data-hub/issues/296)
+- New Mlcp Error grabbing has false positives on windows [\#295](https://github.com/marklogic/marklogic-data-hub/issues/295)
+- Clarify that ML DHF is FOSS and not supported MarkLogic product [\#294](https://github.com/marklogic/marklogic-data-hub/issues/294)
+- custom thread count throws parsing error [\#292](https://github.com/marklogic/marklogic-data-hub/issues/292)
+- RC5: the ingest steps in quick start gives a exception and is not runned [\#291](https://github.com/marklogic/marklogic-data-hub/issues/291)
+- fix gradle tasks for run flow [\#290](https://github.com/marklogic/marklogic-data-hub/issues/290)
+- When exception is thrown, not all flow traces are persisted. [\#278](https://github.com/marklogic/marklogic-data-hub/issues/278)
+- Add ability to clear the Staging or Final database [\#198](https://github.com/marklogic/marklogic-data-hub/issues/198)
+- mlcp\_transform needs profiling [\#162](https://github.com/marklogic/marklogic-data-hub/issues/162)
+
+## [v1.0.0-rc.5](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-rc.5) (2016-09-27)
 [Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.0-rc.4...v1.0.0-rc.5)
 
 **Implemented enhancements:**

build.gradle

@@ -1,6 +1,5 @@
 subprojects {
     apply plugin: 'java'
-    apply plugin: 'eclipse'
 
     sourceCompatibility = "1.8"
     targetCompatibility = "1.8"

examples/spring-batch/build.gradle

@@ -3,19 +3,17 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'application'
-    id 'net.saliman.properties' version '1.4.5'
-    id 'com.marklogic.ml-gradle' version '2.3.1'
-    id 'com.marklogic.ml-data-hub' version '1.0.0-rc.5'
+    id 'net.saliman.properties' version '1.4.6'
+    id 'com.marklogic.ml-data-hub' version '1.0.0-rc.6'
 }
 
 repositories {
-    mavenLocal()
     jcenter()
     maven {url 'http://developer.marklogic.com/maven2/'}
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-data-hub:1.0.0-rc.5'
+    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"

marklogic-data-hub/build.gradle

@@ -1,11 +1,10 @@
 plugins {
-    id 'net.saliman.properties' version '1.4.4'
+    id 'net.saliman.properties' version '1.4.6'
     id 'java'
-    id 'eclipse'
-    id 'idea'
     id 'maven-publish'
-    id 'com.jfrog.bintray' version '1.6'
+    id 'com.jfrog.bintray' version '1.7.2'
     id 'com.marklogic.ml-gradle' version '2.3.4'
+    id 'com.moowork.node' version '0.13'
 }
 
 repositories {
@@ -35,6 +34,22 @@ dependencies {
     testCompile 'org.easymock:easymock:3.4'
 }
 
+node {
+  // Version of node to use.
+  version = '6.8.1'
+
+  // Version of npm to use.
+  npmVersion = '3.10.8'
+
+  download = true
+
+  // Set the work directory for unpacking node
+  workDir = file("${project.buildDir}/nodejs")
+
+  // Set the work directory where node_modules should be located
+  nodeModulesDir = file("${project.projectDir}/src/trace-ui")
+}
+
 task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'
     from javadoc.destinationDir
@@ -45,24 +60,29 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     from sourceSets.main.allSource
 }
 
-task npmInstallTraceUI(type:Exec) {
-    workingDir './src/trace-ui'
-    commandLine 'npm', 'install'
+task cleanUI(type: Delete) {
+  delete 'src/main/resources/ml-modules/root/trace-ui'
+}
+
+task npmInstallUI(type: NpmTask) {
+    args = ['install']
+    dependsOn tasks.cleanUI
 }
 
-task buildTraceUI(type:Exec) {
-    workingDir './src/trace-ui'
-    commandLine 'npm', 'run', 'build'
-    dependsOn tasks.npmInstallTraceUI
+task buildUI(type: NpmTask) {
+    args = ['run', 'build.prod']
+    dependsOn tasks.npmInstallUI
 }
 
-task watchTraceUI(type:Exec) {
-    workingDir './src/trace-ui'
-    commandLine 'npm', 'start'
-    dependsOn tasks.npmInstallTraceUI
+task copyUIAssets(type: Copy) {
+    from 'src/trace-ui/dist'
+    into 'src/main/resources/ml-modules/root/trace-ui'
+    dependsOn tasks.buildUI
 }
 
-build.dependsOn buildTraceUI
+if (!gradle.startParameter.taskNames.contains('bootrun')) {
+  processResources.dependsOn copyUIAssets
+}
 
 javadoc {
    options.overview = 'src/main/resources/overview.html'
@@ -131,7 +151,6 @@ bintray {
         repo = 'maven'
         name = project.name
         desc = pomCustomizations.textdescription.text()
-        // userOrg = user
         licenses = ['Apache-2.0']
         websiteUrl = pomCustomizations.url
         vcsUrl = pomCustomizations.scm.url

marklogic-data-hub/gradle.properties

@@ -36,6 +36,6 @@ hubModulesPath=examples/hr-hub/plugins
 mlReplaceTokensInModules=true
 mlUseRoxyTokenPrefix=false
 
-version=1.0.0-rc.5
+version=1.0.0-rc.6
 
 

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

@@ -161,6 +161,7 @@ private JobParameters buildJobParameters(Flow flow, int batchSize, int threadCou
      * Runs a given flow
      * @param flow - the flow to run
      * @param batchSize - the size to use for batching transactions
+     * @param threadCount - the number of threads to use
      * @param statusListener - the callback to receive job status updates
      * @return a JobExecution instance
      */

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.hub/tracing-rewriter.xml

@@ -11,12 +11,12 @@
     <dispatch>/trace-ui/index.html</dispatch>
   </match-path>
 
-  <match-path matches="^/(app|vendor).*\.(js|css)(\.map)?$">
+  <match-path matches="^/.*\.(js|css|ttf|eot|woff|woff2|svg)$">
     <add-query-param name="uri">$0</add-query-param>
     <dispatch>/com.marklogic.hub/endpoints/trace-ui.xqy</dispatch>
   </match-path>
 
-  <match-path matches="^/resources/.+$">
+  <match-path matches="^/assets/.+$">
     <add-query-param name="uri">$0</add-query-param>
     <dispatch>/com.marklogic.hub/endpoints/trace-ui.xqy</dispatch>
   </match-path>

marklogic-data-hub/src/main/resources/scaffolding/build_gradle

@@ -2,13 +2,11 @@ plugins {
     id 'java'
     id 'eclipse'
     id 'idea'
-    id 'net.saliman.properties' version '1.4.5'
-    id 'com.marklogic.ml-gradle' version '2.3.1'
-    id 'com.marklogic.ml-data-hub' version '1.0.0-rc.5'
+    id 'net.saliman.properties' version '1.4.6'
+    id 'com.marklogic.ml-data-hub' version '1.0.0-rc.6'
 }
 
 repositories {
-    mavenLocal()
     jcenter()
     maven {url 'http://developer.marklogic.com/maven2/'}
 }