Skip to content

Commit

Permalink
Update urls for the repository move
Browse files Browse the repository at this point in the history
  • Loading branch information
aebadirad committed Apr 20, 2018
1 parent e6aacf6 commit dcae4e7
Show file tree
Hide file tree
Showing 59 changed files with 777 additions and 1,684 deletions.
1,290 changes: 645 additions & 645 deletions CHANGELOG.md

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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/
4 changes: 2 additions & 2 deletions build-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down
8 changes: 4 additions & 4 deletions dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
14 changes: 7 additions & 7 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/barebones/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion examples/healthcare/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
};
4 changes: 2 additions & 2 deletions examples/hr-hub/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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/)
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function main(id, options) {
var envelope = dhf.makeEnvelope(content, headers, triples, options.dataFormat);

// 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.runWriter(writerPlugin, id, envelope, options);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function main(id, options) {
var envelope = dhf.makeEnvelope(content, headers, triples, options.dataFormat);

// 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.runWriter(writerPlugin, id, envelope, options);
}

Expand Down
2 changes: 1 addition & 1 deletion examples/load-binaries/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This example shows how to load binary documents with the Hub Framework.

# 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 war `java -jar quick-start-2.0.4.war`

Expand Down
8 changes: 4 additions & 4 deletions examples/online-store/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Example Online Store
This example accompanies the [Getting Started Tutorial](https://marklogic-community.github.io/marklogic-data-hub). It demonstrates how to ingest, model, and harmonize multiple data sources for an online board game retailer.
This example accompanies the [Getting Started Tutorial](https://marklogic.github.io/marklogic-data-hub). It demonstrates how to ingest, model, and harmonize multiple data sources for an online board game retailer.

The data are separated into 2 folders under the input/ folder.
```
Expand All @@ -14,12 +14,12 @@ The data are separated into 2 folders under the input/ folder.
```

# TLDR; How do I run it?
Check out the [Getting Started Tutorial](https://marklogic-community.github.io/marklogic-data-hub/) on the Datahub Site.
Check out the [Getting Started Tutorial](https://marklogic.github.io/marklogic-data-hub/) on the Datahub Site.

You will want to download the latest 2.x release of the [QuickStart Application](https://github.com/marklogic-community/marklogic-data-hub/releases/download/v2.0.4/quick-start-2.0.4.war) and save it in this directory.
You will want to download the latest 2.x release of the [QuickStart Application](https://github.com/marklogic/marklogic-data-hub/releases/download/v2.0.4/quick-start-2.0.4.war) and save it in this directory.

# Wait. What is a data Hub?
Get started over at the [Data Hub Site](https://marklogic-community.github.io/marklogic-data-hub/what/)
Get started over at the [Data Hub Site](https://marklogic.github.io/marklogic-data-hub/what/)

## Loading the Sample Data
1. Click on the **Flows** Tab at the top.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function main(id, options) {
var envelope = dhf.makeEnvelope(content, headers, triples, options.dataFormat);

// 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.runWriter(writerPlugin, id, envelope, options);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function main(id, options) {
var envelope = dhf.makeEnvelope(content, headers, triples, options.dataFormat);

// 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.runWriter(writerPlugin, id, envelope, options);
}

Expand Down
2 changes: 1 addition & 1 deletion examples/single-step-ingest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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.3/quick-start-2.0.3.war) into this folder.
1. Download the [latest quick-start war](https://github.com/marklogic/marklogic-data-hub/releases/download/v2.0.3/quick-start-2.0.3.war) into this folder.

1. Run the quick-start jar `java -jar quick-start-2.0.3.war`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
https://marklogic-community.github.io/marklogic-data-hub/docs/server-side/#run-writer :)
https://marklogic.github.io/marklogic-data-hub/docs/server-side/#run-writer :)
dhf:run-writer(xdmp:function(xs:QName("writer:write")), $id, $envelope, $options)
};
2 changes: 1 addition & 1 deletion examples/spring-batch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This example loads relational data from an [Invoice Database](./invoices-sql-dia

## How do I run this example?

1. [Deploy the MarkLogic Job Repository](https://github.com/marklogic-community/marklogic-spring-batch/wiki/MarkLogicJobRepository). When the application starts it needs to persist the job metadata into MarkLogic. Note that this metadata is different than datahub job metadata.
1. [Deploy the MarkLogic Job Repository](https://github.com/marklogic/marklogic-spring-batch/wiki/MarkLogicJobRepository). When the application starts it needs to persist the job metadata into MarkLogic. Note that this metadata is different than datahub job metadata.
1. Start up the Data Hub Quick Start, deploy the project from the examples/spring-batch directory. Verify that the Customer entity and customer-flow exist.
1. Verify the property values in src/test/resources/job.properties for your environment.
1. Verify the hosts for the STAGING database and mlJobRepo
Expand Down
2 changes: 1 addition & 1 deletion examples/ssl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,4 @@ gradle hubCreateInputFlow -PentityName=myNewEntity -PflowName=myInputFlow
gradle hubCreateHarmonizeFlow -PentityName=myNewEntity -PflowName=myHarmonizationFlow
```

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)
8 changes: 4 additions & 4 deletions marklogic-data-hub/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ Node pomCustomizations = new NodeBuilder(). project {
name 'marklogic-data-hub'
packaging 'jar'
textdescription 'Library for Creating an Operational Data Hub on MarkLogic'
url 'https://github.com/marklogic-community/marklogic-data-hub'
url 'https://github.com/marklogic/marklogic-data-hub'

scm {
url '[email protected]:marklogic/marklogic-data-hub.git'
Expand All @@ -172,7 +172,7 @@ Node pomCustomizations = new NodeBuilder(). project {
name 'MarkLogic Github Contributors'
email '[email protected]'
organization 'Github Contributors'
organizationUrl 'https://github.com/marklogic-community/marklogic-data-hub/graphs/contributors'
organizationUrl 'https://github.com/marklogic/marklogic-data-hub/graphs/contributors'
}
}
}
Expand Down Expand Up @@ -204,12 +204,12 @@ bintray {
pkg {
repo = 'Maven'
name = project.name
userOrg = 'marklogic-community'
userOrg = 'marklogic'
desc = pomCustomizations.textdescription.text()
licenses = ['Apache-2.0']
websiteUrl = pomCustomizations.url
vcsUrl = pomCustomizations.scm.url
issueTrackerUrl = 'https://github.com/marklogic-community/marklogic-data-hub/issues'
issueTrackerUrl = 'https://github.com/marklogic/marklogic-data-hub/issues'
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ public DiskQueue<String> run(String jobId, String entity, String flow, int threa

// Important design info:
// The collector is invoked with a regular http client due to streaming limitations in OkHttp.
// https://github.com/marklogic-community/marklogic-data-hub/issues/632
// https://github.com/marklogic-community/marklogic-data-hub/issues/633
// https://github.com/marklogic/marklogic-data-hub/issues/632
// https://github.com/marklogic/marklogic-data-hub/issues/633
//
AppConfig appConfig = hubConfig.getAppConfig();

Expand Down
2 changes: 1 addition & 1 deletion marklogic-data-hub/src/main/resources/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h2>MarkLogic Data Hub Framework</h2>
<h3>Before Starting</h3>
<p>
Read through our <a target="_blank" href="https://marklogic-community.github.io/marklogic-data-hub/">Main Documentation page</a>.
Read through our <a target="_blank" href="https://marklogic.github.io/marklogic-data-hub/">Main Documentation page</a>.
</p>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function main(id, options) {
var envelope = dhf.makeLegacyEnvelope(content, headers, triples, options.dataFormat);

// 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.runWriter(writerPlugin, id, envelope, options);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function main(id, options) {
var envelope = dhf.makeEnvelope(content, headers, triples, options.dataFormat);

// 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.runWriter(writerPlugin, id, envelope, options);
}

Expand Down
Loading

0 comments on commit dcae4e7

Please sign in to comment.