Merge pull request #905 from marklogic/develop

Update 3.x from head

Author: aebadirad

CHANGELOG.md

@@ -173,15 +173,15 @@ git checkout develop
 #### Do you have the latest code?
 Better make sure...
 
-##### You clone from the github.com/marklogic-community/marklogic-data-hub repo
+##### You clone from the github.com/marklogic/marklogic-data-hub repo
 
 ```bash
 git pull origin develop
 ```
 ##### Your forked then cloned your fork
 Make sure you have the upstream set:
 ```bash
-$ git remote add upstream git://github.com/marklogic-community/marklogic-data-hub.git
+$ git remote add upstream git://github.com/marklogic/marklogic-data-hub.git
 ```
 
 Then fetch the upstream:
@@ -214,13 +214,13 @@ features, by not reporting duplicate issues. Please fill out the issue template
 
 #### Fork marklogic-data-hub
 
-Fork the project [on GitHub](https://github.com/marklogic-community/marklogic-data-hub/fork) and clone
+Fork the project [on GitHub](https://github.com/marklogic/marklogic-data-hub/fork) and clone
 your copy.
 
 ```sh
 $ git clone [email protected]:username/marklogic-data-hub.git
 $ cd marklogic-data-hub
-$ git remote add upstream git://github.com/marklogic-community/marklogic-data-hub.git
+$ git remote add upstream git://github.com/marklogic/marklogic-data-hub.git
 ```
 
 We ask that you open an issue in the [issue tracker][] and get agreement from
@@ -379,5 +379,5 @@ from the main (upstream) repository:
     git pull --ff upstream develop
     ```
 
-[issue tracker]: https://github.com/marklogic-community/marklogic-data-hub/issues
+[issue tracker]: https://github.com/marklogic/marklogic-data-hub/issues
 [.editorconfig]: http://editorconfig.org/

CONTRIBUTING.md

@@ -8,16 +8,16 @@ The MarkLogic Data Hub Framework is a data integration framework and tool-set to
 MarkLogic 9.0-5 or later is required with this version (3.0.0) of the DHF.
 
 # Getting Started
-Grab the [latest release](https://github.com/marklogic-community/marklogic-data-hub/releases) then visit our [Data Hub Framework website](https://marklogic-community.github.io/marklogic-data-hub/) to get started.
+Grab the [latest release](https://github.com/marklogic/marklogic-data-hub/releases) then visit our [Data Hub Framework website](https://marklogic.github.io/marklogic-data-hub/) to get started.
 
 
 ## Advanced Hub Usage
-Ready to go beyond QuickStart and start using DHF in your own Java or Gradle project? The [Data Hub Framework website](https://marklogic-community.github.io/marklogic-data-hub/) also provides that.
+Ready to go beyond QuickStart and start using DHF in your own Java or Gradle project? The [Data Hub Framework website](https://marklogic.github.io/marklogic-data-hub/) also provides that.
 
 ## Don't get this code
-You don't need to checkout this repo unless you plan to actively contribute changes to the Data Hub Framework. Go to [our website](https://marklogic-community.github.io/marklogic-data-hub/) to get started with DHF.
+You don't need to checkout this repo unless you plan to actively contribute changes to the Data Hub Framework. Go to [our website](https://marklogic.github.io/marklogic-data-hub/) to get started with DHF.
 
-If you really do want to contribute, see our [Contributing Guide](https://github.com/marklogic-community/marklogic-data-hub/blob/master/CONTRIBUTING.md) to get started.
+If you really do want to contribute, see our [Contributing Guide](https://github.com/marklogic/marklogic-data-hub/blob/master/CONTRIBUTING.md) to get started.
 
 # Support
 
@@ -38,7 +38,7 @@ contract can sign up for MarkLogic Technical Support on our
 
 [marklogic]: https://www.marklogic.com/
 [apache]: https://www.apache.org/licenses/LICENSE-2.0
-[issues]: https://github.com/marklogic-community/marklogic-data-hub/issues
-[releases]: https://github.com/marklogic-community/marklogic-data-hub/releases
+[issues]: https://github.com/marklogic/marklogic-data-hub/issues
+[releases]: https://github.com/marklogic/marklogic-data-hub/releases
 [handbook]: http://www.marklogic.com/files/Mark_Logic_Support_Handbook.pdf
 [support]: https://help.marklogic.com/

README.md

@@ -2,7 +2,7 @@
 
 # This script will build the javadocs for the DHF jar file
 # and push them into the docs branch to be magically published
-# via travis to the https://marklogic-community.github.io/marklogic-data-hub site
+# via travis to the https://marklogic.github.io/marklogic-data-hub site
 
 # run this after you update gradle.properties to contain the new version
 # preferable after you do a release
@@ -15,7 +15,7 @@ tmpdir=$(mktemp -d)
 hubversion=$(cat gradle.properties | awk -F"=" '{print $2}')
 echo "tmpdir: ${tmpdir}"
 echo "version: ${hubversion}"
-git clone -b docs [email protected]:marklogic-community/marklogic-data-hub.git ${tmpdir}/docs
+git clone -b docs [email protected]:marklogic/marklogic-data-hub.git ${tmpdir}/docs
 ./gradlew javadoc
 mkdir -p ${tmpdir}/docs/javadocs/${hubversion}
 cp -R marklogic-data-hub/build/docs/javadoc ${tmpdir}/docs/javadocs/${hubversion}

build-docs.sh

@@ -12,11 +12,11 @@
 - spock 1.1-groovy-2.4 -> http://spockframework.org/
 
 # DHF Runtime
-- ml-gradle 3.6.1 -> https://github.com/marklogic-community/ml-gradle
-- ml-app-deployer 3.6.1 -> https://github.com/marklogic-community/ml-app-deployer
-- ml-javaclient-util 3.3.1 -> https://github.com/marklogic-community/ml-javaclient-util
+- ml-gradle 3.6.1 -> https://github.com/marklogic/ml-gradle
+- ml-app-deployer 3.6.1 -> https://github.com/marklogic/ml-app-deployer
+- ml-javaclient-util 3.3.1 -> https://github.com/marklogic/ml-javaclient-util
 - marklogic-client-api 4.0.3.1 -> https://github.com/marklogic/java-client-api
-- mlcp-util 0.9.0 -> https://github.com/marklogic-community/mlcp-util
+- mlcp-util 0.9.0 -> https://github.com/marklogic/mlcp-util
 - apache commons io 2.4 -> https://commons.apache.org/proper/commons-io/
 - apache commons text 1.1 -> https://commons.apache.org/proper/commons-text/
 - apache commons csv 1.4 -> https://commons.apache.org/proper/commons-csv/

dependencies.md

@@ -2,10 +2,10 @@
 
 This folder contains working examples of various DHF usage scenarios.
 
-1. [barebones](https://github.com/marklogic-community/marklogic-data-hub/tree/master/examples/barebones) - an example of the minimum configuration necessary to run a Gradle based Data Hub
-1. [healthcare](https://github.com/marklogic-community/marklogic-data-hub/tree/master/examples/healthcare) - an example of a Healthcare 360 Data Hub
-1. [hr-hub](https://github.com/marklogic-community/marklogic-data-hub/tree/master/examples/hr-hub) - an example used for our 1.x tutorial. This example harmonizes data from various HR systems
-1. [load-binaries](https://github.com/marklogic-community/marklogic-data-hub/tree/master/examples/load-binaries) - an example of how to ingest binaries via an MLCP Input Flow
-1. [online-store](https://github.com/marklogic-community/marklogic-data-hub/tree/master/examples/online-store) - the example we use for our [Tutorial](https://marklogic-community.github.io/marklogic-data-hub/tutorial/)
-1. [spring-batch](https://github.com/marklogic-community/marklogic-data-hub/tree/master/examples/spring-batch) - an example of how to load relational data into a Data Hub using Spring Batch
-1. [ssl](https://github.com/marklogic-community/marklogic-data-hub/tree/master/examples/ssl) - an example of how to configure your Data Hub to use SSL for added security
+1. [barebones](https://github.com/marklogic/marklogic-data-hub/tree/master/examples/barebones) - an example of the minimum configuration necessary to run a Gradle based Data Hub
+1. [healthcare](https://github.com/marklogic/marklogic-data-hub/tree/master/examples/healthcare) - an example of a Healthcare 360 Data Hub
+1. [hr-hub](https://github.com/marklogic/marklogic-data-hub/tree/master/examples/hr-hub) - an example used for our 1.x tutorial. This example harmonizes data from various HR systems
+1. [load-binaries](https://github.com/marklogic/marklogic-data-hub/tree/master/examples/load-binaries) - an example of how to ingest binaries via an MLCP Input Flow
+1. [online-store](https://github.com/marklogic/marklogic-data-hub/tree/master/examples/online-store) - the example we use for our [Tutorial](https://marklogic.github.io/marklogic-data-hub/tutorial/)
+1. [spring-batch](https://github.com/marklogic/marklogic-data-hub/tree/master/examples/spring-batch) - an example of how to load relational data into a Data Hub using Spring Batch
+1. [ssl](https://github.com/marklogic/marklogic-data-hub/tree/master/examples/ssl) - an example of how to configure your Data Hub to use SSL for added security

examples/README.md

@@ -41,4 +41,4 @@ You can use scaffolding commands to configure flows.
 gradle hubCreateInputFlow
 gradle hubCreateHarmonizeFlow
 ```
-For a complete list of gradle tasks, check here: [https://github.com/marklogic-community/marklogic-data-hub/wiki/Gradle-Tasks](https://github.com/marklogic-community/marklogic-data-hub/wiki/Gradle-Tasks)
+For a complete list of gradle tasks, check here: [https://github.com/marklogic/marklogic-data-hub/wiki/Gradle-Tasks](https://github.com/marklogic/marklogic-data-hub/wiki/Gradle-Tasks)

examples/barebones/README.md

@@ -15,7 +15,7 @@ The sample data is located in the input/ folder.
 ```
 
 # TLDR; How do I run it?
-1. Download the [latest quick-start war](https://github.com/marklogic-community/marklogic-data-hub/releases/download/v2.0.4/quick-start-2.0.4.war) into this folder.
+1. Download the [latest quick-start war](https://github.com/marklogic/marklogic-data-hub/releases/download/v2.0.4/quick-start-2.0.4.war) into this folder.
 
 1. Run the quick-start jar `java -jar quick-start-2.0.4.war`
 

examples/healthcare/README.md

@@ -50,6 +50,6 @@ declare function plugin:main(
   let $envelope := dhf:make-envelope($content, $headers, $triples, map:get($options, "dataFormat"))
   return
   (: writers must be invoked this way.
-     see: https://github.com/marklogic-community/marklogic-data-hub/wiki/dhf-lib#run-writer :)
+     see: https://github.com/marklogic/marklogic-data-hub/wiki/dhf-lib#run-writer :)
     dhf:run-writer(xdmp:function(xs:QName("writer:write")), $id, $envelope, $options)
 };

examples/healthcare/plugins/entities/Patients/harmonize/final/main.xqy

@@ -14,7 +14,7 @@ The data are separated into 2 folders under the input/ folder.
 ```
 
 # TLDR; How do I run it?
-Check out the [HR Hub Tutorial](https://marklogic-community.github.io/marklogic-data-hub/getting-started) on the Datahub Site.
+Check out the [HR Hub Tutorial](https://marklogic.github.io/marklogic-data-hub/getting-started) on the Datahub Site.
 
 # Global Corp
 Global Corp has exported the Employee data from a relational database. They are provided to you as csv files, one for each table.
@@ -30,4 +30,4 @@ In this example we are loading the CSV table dumps from Global Corp and the JSON
 - Employee Salary
 
 # Wait. What is a data Hub?
-Get started over at the [Data Hub Site](https://marklogic-community.github.io/marklogic-data-hub/)
+Get started over at the [Data Hub Site](https://marklogic.github.io/marklogic-data-hub/)