Merge branch 'release/1.0.0-rc.5'

Author: paxtonhare

CHANGELOG.md

@@ -1,7 +1,37 @@
 # Change Log
 
-## [v1.0.0-rc.4](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-rc.4)
+## [v1.0.0-rc.5](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-rc.5)
 
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.0-rc.4...v1.0.0-rc.5)
+
+**Implemented enhancements:**
+
+- Allow plugins to know then name of the entity [\#271](https://github.com/marklogic/marklogic-data-hub/issues/271)
+- Mark mlcp jobs with errors as failed? [\#268](https://github.com/marklogic/marklogic-data-hub/issues/268)
+
+**Fixed bugs:**
+
+- Tooltip comment for mlcp option wrong [\#270](https://github.com/marklogic/marklogic-data-hub/issues/270)
+- TimeAgo [\#267](https://github.com/marklogic/marklogic-data-hub/issues/267)
+
+**Closed issues:**
+
+- chore: update java dependencies [\#287](https://github.com/marklogic/marklogic-data-hub/issues/287)
+- Github pages link error [\#285](https://github.com/marklogic/marklogic-data-hub/issues/285)
+- Module watch fails when you switch projects [\#284](https://github.com/marklogic/marklogic-data-hub/issues/284)
+- chore: fix appveyor build [\#282](https://github.com/marklogic/marklogic-data-hub/issues/282)
+- Lots of cache warnings [\#281](https://github.com/marklogic/marklogic-data-hub/issues/281)
+- Trace settings gets wiped out when content database is cleared [\#280](https://github.com/marklogic/marklogic-data-hub/issues/280)
+- Better distinguish between Entities and Flows [\#275](https://github.com/marklogic/marklogic-data-hub/issues/275)
+- Exception in Quick Start [\#274](https://github.com/marklogic/marklogic-data-hub/issues/274)
+- Setting up on Mac causes an issue with .war file [\#273](https://github.com/marklogic/marklogic-data-hub/issues/273)
+- rc4 - input flow UI jacked up on chrome/windows [\#272](https://github.com/marklogic/marklogic-data-hub/issues/272)
+- MLCP command is using deprecated command line flags [\#265](https://github.com/marklogic/marklogic-data-hub/issues/265)
+- QuickStart App: Status indicator on installation screen is out of view when text is enlarged [\#262](https://github.com/marklogic/marklogic-data-hub/issues/262)
+- Run Flow buttons inconsistent b/c Harmonize runs immediately [\#257](https://github.com/marklogic/marklogic-data-hub/issues/257)
+- QuickStart App data not loaded to correct collection [\#250](https://github.com/marklogic/marklogic-data-hub/issues/250)
+
+## [v1.0.0-rc.4](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-rc.4) (2016-09-02)
 [Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.0-rc.3...v1.0.0-rc.4)
 
 **Implemented enhancements:**
@@ -12,6 +42,7 @@
 
 - MLCP Command for CSV files is generated incorrectly  [\#261](https://github.com/marklogic/marklogic-data-hub/issues/261)
 - update examples now that rc.2 is out [\#247](https://github.com/marklogic/marklogic-data-hub/issues/247)
+- UI rework based on new screen designs [\#70](https://github.com/marklogic/marklogic-data-hub/issues/70)
 
 ## [v1.0.0-rc.3](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-rc.3) (2016-08-25)
 [Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.0-rc.2...v1.0.0-rc.3)
@@ -63,7 +94,6 @@
 - Performance tracing [\#193](https://github.com/marklogic/marklogic-data-hub/issues/193)
 - Refactor the Spring Boot API [\#145](https://github.com/marklogic/marklogic-data-hub/issues/145)
 - Support index configuration as a part of pushbutton deploy.  [\#10](https://github.com/marklogic/marklogic-data-hub/issues/10)
-- UI rework based on new screen designs [\#70](https://github.com/marklogic/marklogic-data-hub/issues/70)
 
 ## [v1.0.0-beta.6](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.0-beta.6) (2016-06-20)
 [Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.0-beta.5...v1.0.0-beta.6)

appveyor.yml

@@ -1,78 +1,78 @@
-version: 1.0.{build}
-branches:
-  only:
-  - master
-image: WMF 5
-environment:
-  ML_USER:
-    secure: nioOZ/YaPcyFoqN9bVZHMllinShpPT+lG1uyi78H23c=
-  ML_PASSWORD:
-    secure: LaFtKimqM2zAtGUkciP5RA==
-  ML_VERSION: 8.0-5.1
-install:
-- ps: >-
-    function HttpPost($cookieContainer, $url, $postData) {
-        $uri = New-Object "System.Uri" "$url"
-        $webrequest = [System.Net.HTTPWebRequest]::Create($uri)
-        $webrequest.CookieContainer = $cookieContainer
-        $webrequest.ContentType = "application/x-www-form-urlencoded"
-        $webrequest.Method = "POST"
-
-        $encoding = New-Object System.Text.ASCIIEncoding
-        $bytes = $encoding.GetBytes($postData)
-        $webrequest.ContentLength = $bytes.Length
-
-        $newStream = $webrequest.GetRequestStream()
-        $newStream.Write($bytes, 0, $bytes.Length)
-        $response = $webrequest.GetResponse().GetResponseStream()
-        $sr = New-Object System.IO.StreamReader($response)
-        $respTxt = $sr.ReadToEnd()
-        $sr.Close()
-        $response.Dispose()
-        return $respTxt
-    }
-
-    function downloadFile($cookieContainer, $url, $targetFile) {
-        $cookie = $cookieContainer.GetCookies("https://developer.marklogic.com")[0]
-        $cookieTxt = $cookie.NAME + "=" + $cookie.Value
-        $wc = New-Object System.Net.WebClient
-        $wc.Headers.Add([System.Net.HttpRequestHeader]::Cookie, $cookieTxt)
-        $wc.DownloadFile($url, $targetFile)
-    }
-
-    $cookieContainer = New-Object System.Net.CookieContainer
-    $email = $env:ML_USER
-    $password = $env:ML_PASSWORD
-    $loginData = "email=$email&password=$password"
-
-    # Login
-    $url = "https://developer.marklogic.com/login"
-    $response = HttpPost $cookieContainer $url $loginData
-
-    # Get Download url
-    $ver = $env:ML_VERSION
-    $fname = "MarkLogic-$ver-amd64.msi"
-    $url = "https://developer.marklogic.com/get-download-url"
-    $postData = "download=/download/binaries/8.0/$fname"
-    $response = HttpPost $cookieContainer $url $postData
-    $json = $response | ConvertFrom-Json
-    $downloadLink = $json.path
-    $downloadLink = "https://developer.marklogic.com$downloadLink"
-
-    # Download File
-    downloadFile $cookieContainer $downloadLink "$PSScriptRoot\$fname"
-    msiexec /i "$PSScriptRoot\$fname" /quiet /qn /norestart /log install.log
-    Start-Sleep -s 90
-    cat .\install.log
-    Start-Service -displayname "MarkLogic"
-    HttpPost $cookieContainer "http://localhost:8001/admin/v1/init" ""
-    Start-Sleep -s 10
-    $postData = "admin-username=admin&admin-password=admin&realm=public"
-    HttpPost $cookieContainer "http://localhost:8001/admin/v1/instance-admin" $postData
-    Start-Sleep -s 10
-build: off
-test_script:
-- ps: >-
-    c:
-    cd \projects\marklogic-data-hub
-    .\gradlew.bat test
+version: 1.0.{build}
+branches:
+  only:
+  - master
+image: WMF 5
+environment:
+  ML_USER:
+    secure: nioOZ/YaPcyFoqN9bVZHMllinShpPT+lG1uyi78H23c=
+  ML_PASSWORD:
+    secure: LaFtKimqM2zAtGUkciP5RA==
+  ML_VERSION: 8.0-5.8
+install:
+- ps: >-
+    function HttpPost($cookieContainer, $url, $postData) {
+        $uri = New-Object "System.Uri" "$url"
+        $webrequest = [System.Net.HTTPWebRequest]::Create($uri)
+        $webrequest.CookieContainer = $cookieContainer
+        $webrequest.ContentType = "application/x-www-form-urlencoded"
+        $webrequest.Method = "POST"
+
+        $encoding = New-Object System.Text.ASCIIEncoding
+        $bytes = $encoding.GetBytes($postData)
+        $webrequest.ContentLength = $bytes.Length
+
+        $newStream = $webrequest.GetRequestStream()
+        $newStream.Write($bytes, 0, $bytes.Length)
+        $response = $webrequest.GetResponse().GetResponseStream()
+        $sr = New-Object System.IO.StreamReader($response)
+        $respTxt = $sr.ReadToEnd()
+        $sr.Close()
+        $response.Dispose()
+        return $respTxt
+    }
+
+    function downloadFile($cookieContainer, $url, $targetFile) {
+        $cookie = $cookieContainer.GetCookies("https://developer.marklogic.com")[0]
+        $cookieTxt = $cookie.NAME + "=" + $cookie.Value
+        $wc = New-Object System.Net.WebClient
+        $wc.Headers.Add([System.Net.HttpRequestHeader]::Cookie, $cookieTxt)
+        $wc.DownloadFile($url, $targetFile)
+    }
+
+    $cookieContainer = New-Object System.Net.CookieContainer
+    $email = $env:ML_USER
+    $password = $env:ML_PASSWORD
+    $loginData = "email=$email&password=$password"
+
+    # Login
+    $url = "https://developer.marklogic.com/login"
+    $response = HttpPost $cookieContainer $url $loginData
+
+    # Get Download url
+    $ver = $env:ML_VERSION
+    $fname = "MarkLogic-$ver-amd64.msi"
+    $url = "https://developer.marklogic.com/get-download-url"
+    $postData = "download=/download/binaries/8.0/$fname"
+    $response = HttpPost $cookieContainer $url $postData
+    $json = $response | ConvertFrom-Json
+    $downloadLink = $json.path
+    $downloadLink = "https://developer.marklogic.com$downloadLink"
+
+    # Download File
+    downloadFile $cookieContainer $downloadLink "$PSScriptRoot\$fname"
+    msiexec /i "$PSScriptRoot\$fname" /quiet /qn /norestart /log install.log
+    Start-Sleep -s 90
+    cat .\install.log
+    Start-Service -displayname "MarkLogic"
+    HttpPost $cookieContainer "http://localhost:8001/admin/v1/init" ""
+    Start-Sleep -s 10
+    $postData = "admin-username=admin&admin-password=admin&realm=public"
+    HttpPost $cookieContainer "http://localhost:8001/admin/v1/instance-admin" $postData
+    Start-Sleep -s 10
+build: off
+test_script:
+- ps: >-
+    c:
+    cd \projects\marklogic-data-hub
+    .\gradlew.bat test

examples/.gitignore

@@ -2,3 +2,4 @@ config
 build.gradle
 gradle.properties
 gradle-local.properties
+marklogic-config/

examples/hr-hub/input/AcmeTech/32920.json

@@ -3,14 +3,14 @@
   "firstName": "Rosanne",
   "lastName": "Henckle",
   "dateOfBirth": "05/19/1979",
-  "hireDate": "11/12/2015",
+  "hireDate": "12/19/2005",
   "salaryHistory": [
     {
-      "effectiveDate": "11/12/2015",
+      "effectiveDate": "12/23/2005",
       "salary": 63439
     },
     {
-      "effectiveDate": "01/14/2016",
+      "effectiveDate": "01/14/2010",
       "salary": 66300
     }
   ]

examples/hr-hub/input/AcmeTech/34324.json

@@ -3,14 +3,14 @@
   "firstName": "Robert",
   "lastName": "Smith",
   "dateOfBirth": "01/01/1981",
-  "hireDate": "09/01/2014",
+  "hireDate": "12/19/2005",
   "salaryHistory": [
     {
-      "effectiveDate": "09/01/2014",
+      "effectiveDate": "12/21/2005",
       "salary": 59832
     },
     {
-      "effectiveDate": "09/14/2015",
+      "effectiveDate": "05/14/2009",
       "salary": 60832
     }
   ]

examples/hr-hub/plugins/entities/Employee/harmonize/harmonize-acme-tech/headers/headers.sjs

@@ -22,7 +22,7 @@ function createHeaders(id, content, options) {
 
   return {
     employeeId: content.id,
-    hireDate: xs.date(xdmp.parseDateTime('[M01]/[D01]/[Y0001]', content.hireDate)),
+    dateOfHire: xs.date(xdmp.parseDateTime('[M01]/[D01]/[Y0001]', content.hireDate)),
     salary: xs.int(salary)
   };
 }

examples/hr-hub/plugins/entities/Employee/harmonize/harmonize-global-corp/headers/headers.sjs

@@ -10,7 +10,7 @@
 function createHeaders(id, content, options) {
   return {
     employeeId: content.emp_id,
-    hireDate: xs.date(xdmp.parseDateTime('[M01]/[D01]/[Y0001]', content.hire_date)),
+    dateOfHire: fn.substring(xs.string(xdmp.parseDateTime('[M01]/[D01]/[Y0001]', content.hire_date)), 1, 10),
     salary: xs.int(content.base_salary) + xs.int(content.bonus)
   };
 }

examples/spring-batch/build.gradle

@@ -0,0 +1,30 @@
+plugins {
+    id 'java'
+    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'
+}
+
+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-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"
+}
+
+distributions {
+    main {
+        baseName = 'baseJob'
+    }
+}
+
+mainClassName = "com.marklogic.spring.batch.hub.HubJobRunner"

examples/spring-batch/gradle.properties

@@ -0,0 +1,38 @@
+# These settings are used by the Data Hub Framework when
+# communicating with MarkLogic.
+# The values in this file are meant as project-wide settings.
+# You can override these properties for a specific environment
+# by creating a gradle-{environment}.properties file.
+# For example, to create a properties file for your prod environment create a file
+# named gradle-prod.properties.
+#
+# ....
+mlHost=localhost
+mlAppName=data-hub
+
+mlAdminUsername=admin
+mlAdminPassword=admin
+
+mlStagingAppserverName=data-hub-STAGING
+mlStagingPort=8010
+mlStagingDbName=data-hub-STAGING
+mlStagingForestsPerHost=4
+
+mlFinalAppserverName=data-hub-FINAL
+mlFinalPort=8011
+mlFinalDbName=data-hub-FINAL
+mlFinalForestsPerHost=4
+
+mlTraceAppserverName=data-hub-TRACING
+mlTracePort=8012
+mlTraceDbName=data-hub-TRACING
+mlTraceForestsPerHost=1
+
+mlJobAppserverName=data-hub-JOBS
+mlJobPort=8013
+mlJobDbName=data-hub-JOBS
+mlJobForestsPerHost=1
+
+mlModulesDbName=data-hub-MODULES
+mlTriggersDbName=data-hub-TRIGGERS
+mlSchemasDbName=data-hub-SCHEMAS

marklogic-data-hub/build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'com.jfrog.bintray' version '1.6'
-    id 'com.marklogic.ml-gradle' version '2.3.1'
+    id 'com.marklogic.ml-gradle' version '2.3.4'
 }
 
 repositories {
@@ -22,10 +22,10 @@ targetCompatibility = 1.8
 dependencies {
     compile 'org.springframework.batch:spring-batch-core:3.0.6.RELEASE'
     compile 'org.springframework:spring-jdbc:4.2.6.RELEASE'
-    compile 'com.marklogic:java-client-api:3.0.4'
-    compile 'com.marklogic:ml-javaclient-util:2.9.0'
-    compile 'com.marklogic:ml-app-deployer:2.2.0'
-    compile 'com.marklogic:marklogic-spring-batch-core:0.5.2'
+    compile 'com.marklogic:java-client-api:3.0.5'
+    compile 'com.marklogic:ml-javaclient-util:2.9.1'
+    compile 'com.marklogic:ml-app-deployer:2.3.0'
+    compile 'com.marklogic:marklogic-spring-batch-core:0.7.0'
     compile 'commons-io:commons-io:2.4'
     testCompile 'org.springframework.batch:spring-batch-test:3.0.6.RELEASE'
     testCompile 'junit:junit:4.12'