Merge branch 'release/2.0.0-rc.2' into 2.0-master

Author: paxtonhare

.gitignore

@@ -23,3 +23,7 @@ node_modules/
 .tmp/
 *.sublime-*
 .vscode/
+*.iml
+*.ipr
+*.iws
+*.db

.travis/Dockerfile-ml renamed to .travis/Dockerfile

@@ -1,8 +1,119 @@
 # Change Log
 
-## [Unreleased](https://github.com/marklogic-community/marklogic-data-hub/tree/v2.0.0-beta.2)
+## [v2.0.0-rc.2](https://github.com/marklogic-community/marklogic-data-hub/tree/v2.0.0-rc.2)
 
-[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v1.1.3...v2.0.0-beta.2)
+[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v1.1.5...v2.0.0-rc.2)
+
+**Implemented enhancements:**
+
+- Add Fastload support for MLCP [\#490](https://github.com/marklogic-community/marklogic-data-hub/issues/490)
+- Refactor to use main.xqy [\#484](https://github.com/marklogic-community/marklogic-data-hub/issues/484)
+- Refactor classes that break openjdk [\#482](https://github.com/marklogic-community/marklogic-data-hub/issues/482)
+
+**Fixed bugs:**
+
+- Next button not working when browsing to new hub project directory [\#502](https://github.com/marklogic-community/marklogic-data-hub/issues/502)
+- Quickstart gets stuck in Loading... with js error [\#501](https://github.com/marklogic-community/marklogic-data-hub/issues/501)
+- scaffolded flow from empty ES model has errors [\#495](https://github.com/marklogic-community/marklogic-data-hub/issues/495)
+- Need to properly escape the path for RegEx [\#494](https://github.com/marklogic-community/marklogic-data-hub/issues/494)
+- Files are being locked on Windows [\#450](https://github.com/marklogic-community/marklogic-data-hub/issues/450)
+
+**Closed issues:**
+
+- Increase gradleVersion to 3.4 for the wrapper task [\#499](https://github.com/marklogic-community/marklogic-data-hub/issues/499)
+- MLCP 9.0.2 isn't backwards compatible [\#498](https://github.com/marklogic-community/marklogic-data-hub/issues/498)
+- Example: Make a barebones example for cmd line ninjas [\#497](https://github.com/marklogic-community/marklogic-data-hub/issues/497)
+- ML behind Firewall + different ports [\#489](https://github.com/marklogic-community/marklogic-data-hub/issues/489)
+- Ports 8010 and 8011 conflicting with Ops-Director [\#447](https://github.com/marklogic-community/marklogic-data-hub/issues/447)
+
+**Merged pull requests:**
+
+- Support MLCP fastload [\#500](https://github.com/marklogic-community/marklogic-data-hub/pull/500) ([RobertSzkutak](https://github.com/RobertSzkutak))
+
+## [v1.1.5](https://github.com/marklogic-community/marklogic-data-hub/tree/v1.1.5) (2017-08-14)
+[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v1.1.4...v1.1.5)
+
+**Implemented enhancements:**
+
+- Update Quickstart Ready message [\#478](https://github.com/marklogic-community/marklogic-data-hub/issues/478)
+- Example: Migrating a RDBMS to Data Hub using Spring Batch [\#473](https://github.com/marklogic-community/marklogic-data-hub/issues/473)
+
+**Fixed bugs:**
+
+- Providing different source/dest DB for the hubRunFlow does not work [\#488](https://github.com/marklogic-community/marklogic-data-hub/issues/488)
+- Path to code has wrong slash on Windows [\#467](https://github.com/marklogic-community/marklogic-data-hub/issues/467)
+- Job status stuck on STARTED for Input Flows [\#466](https://github.com/marklogic-community/marklogic-data-hub/issues/466)
+- File not saving properly from quickstart to fix a bug [\#430](https://github.com/marklogic-community/marklogic-data-hub/issues/430)
+- Error on initial run of QuickStart GUI [\#394](https://github.com/marklogic-community/marklogic-data-hub/issues/394)
+- Error saving entity - collation not legal [\#337](https://github.com/marklogic-community/marklogic-data-hub/issues/337)
+
+**Closed issues:**
+
+- collection name is hard coded in online store example [\#474](https://github.com/marklogic-community/marklogic-data-hub/issues/474)
+- add \(rest-extension-user,read\) to XML documents in modules-db [\#470](https://github.com/marklogic-community/marklogic-data-hub/issues/470)
+- column-width, or tooltip with full "Identifier" in traces table [\#469](https://github.com/marklogic-community/marklogic-data-hub/issues/469)
+- Initializing DHF Project against existing DB is dropping indexes [\#468](https://github.com/marklogic-community/marklogic-data-hub/issues/468)
+- Saving the changes in a flow code never finishes \*sometimes\* [\#462](https://github.com/marklogic-community/marklogic-data-hub/issues/462)
+- Sometimes a trace for a failed Harmonize job is not available/not existing [\#461](https://github.com/marklogic-community/marklogic-data-hub/issues/461)
+- Unable to ingest image \(.png\) documents using DHF Quick-Start application [\#420](https://github.com/marklogic-community/marklogic-data-hub/issues/420)
+- Load files into the data hub schemas database [\#288](https://github.com/marklogic-community/marklogic-data-hub/issues/288)
+- Ability to override uri for input flows [\#182](https://github.com/marklogic-community/marklogic-data-hub/issues/182)
+- Create concept of a domain [\#82](https://github.com/marklogic-community/marklogic-data-hub/issues/82)
+
+**Merged pull requests:**
+
+- Feature/473 msb example [\#480](https://github.com/marklogic-community/marklogic-data-hub/pull/480) ([sastafford](https://github.com/sastafford))
+- Some typos and suggestions [\#475](https://github.com/marklogic-community/marklogic-data-hub/pull/475) ([patrickmcelwee](https://github.com/patrickmcelwee))
+
+## [v1.1.4](https://github.com/marklogic-community/marklogic-data-hub/tree/v1.1.4) (2017-07-25)
+[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v2.0.0-rc.1...v1.1.4)
+
+## [v2.0.0-rc.1](https://github.com/marklogic-community/marklogic-data-hub/tree/v2.0.0-rc.1) (2017-07-24)
+[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v2.0.0-beta.1...v2.0.0-rc.1)
+
+**Implemented enhancements:**
+
+- Cannot specify default permissions for data-hub-modules db [\#434](https://github.com/marklogic-community/marklogic-data-hub/issues/434)
+
+**Fixed bugs:**
+
+- MlcpRunner is being started improperly [\#452](https://github.com/marklogic-community/marklogic-data-hub/issues/452)
+- Code deploy fails when An entity is deleted [\#451](https://github.com/marklogic-community/marklogic-data-hub/issues/451)
+- error during data hub workshop [\#437](https://github.com/marklogic-community/marklogic-data-hub/issues/437)
+- when scaffolding code for an array, have it be empty list \[\] rather than null [\#432](https://github.com/marklogic-community/marklogic-data-hub/issues/432)
+- gradlew is generated without execute permission [\#428](https://github.com/marklogic-community/marklogic-data-hub/issues/428)
+- RunFlowTask using dyslexic string for hub key [\#419](https://github.com/marklogic-community/marklogic-data-hub/issues/419)
+
+**Closed issues:**
+
+- Upgrade quick-start to mlcp 9.0.2 [\#465](https://github.com/marklogic-community/marklogic-data-hub/issues/465)
+- QuickStart app doesn't work on Internet Explorer 11 [\#463](https://github.com/marklogic-community/marklogic-data-hub/issues/463)
+- Redeploy modules removes trace and debugging settings [\#460](https://github.com/marklogic-community/marklogic-data-hub/issues/460)
+- Quickstart Application not working on Internet Explorer [\#456](https://github.com/marklogic-community/marklogic-data-hub/issues/456)
+- Envelope instance created does not include "info" [\#455](https://github.com/marklogic-community/marklogic-data-hub/issues/455)
+- Error when creating a harmonize flow based on entity definition [\#454](https://github.com/marklogic-community/marklogic-data-hub/issues/454)
+- tutorial link is 404: https://marklogic.github.io/marklogic-data-hub/ [\#449](https://github.com/marklogic-community/marklogic-data-hub/issues/449)
+- Changes to $options not persisting if set in headers or triples in Harmonization flow [\#448](https://github.com/marklogic-community/marklogic-data-hub/issues/448)
+- Input flow job \(load-acme-tech\) failing on 2.0.0-beta.1 [\#446](https://github.com/marklogic-community/marklogic-data-hub/issues/446)
+- Fix AppVeyor CI [\#445](https://github.com/marklogic-community/marklogic-data-hub/issues/445)
+- consider using windows compatible line breaks [\#444](https://github.com/marklogic-community/marklogic-data-hub/issues/444)
+- RFE: support setting log level [\#442](https://github.com/marklogic-community/marklogic-data-hub/issues/442)
+- Setting replica forest data path [\#441](https://github.com/marklogic-community/marklogic-data-hub/issues/441)
+- Replica forests not created from quick-start [\#439](https://github.com/marklogic-community/marklogic-data-hub/issues/439)
+- Error in documentation for the REST transform [\#433](https://github.com/marklogic-community/marklogic-data-hub/issues/433)
+- Harmonization hits maximum document size in collector output [\#427](https://github.com/marklogic-community/marklogic-data-hub/issues/427)
+- Create a checklist for making DHF releases [\#424](https://github.com/marklogic-community/marklogic-data-hub/issues/424)
+- Expose the ability to set the writer plugin's target database in gradle [\#423](https://github.com/marklogic-community/marklogic-data-hub/issues/423)
+- Document all gradle hub tasks [\#402](https://github.com/marklogic-community/marklogic-data-hub/issues/402)
+- Document query-only mode for plugins [\#368](https://github.com/marklogic-community/marklogic-data-hub/issues/368)
+- Generated code template from Entity for nested item hides vars \(v2/Entities\) [\#353](https://github.com/marklogic-community/marklogic-data-hub/issues/353)
+- Control what runs in update mode to minimize locking [\#300](https://github.com/marklogic-community/marklogic-data-hub/issues/300)
+- Library Modules not being autodeployed [\#299](https://github.com/marklogic-community/marklogic-data-hub/issues/299)
+- Uninstall doesn't always finish on the UI [\#266](https://github.com/marklogic-community/marklogic-data-hub/issues/266)
+- Consider name and description for data hub framework and tooling [\#175](https://github.com/marklogic-community/marklogic-data-hub/issues/175)
+
+## [v2.0.0-beta.1](https://github.com/marklogic-community/marklogic-data-hub/tree/v2.0.0-beta.1) (2017-05-31)
+[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v1.1.3...v2.0.0-beta.1)
 
 **Implemented enhancements:**
 

CHANGELOG.md

@@ -24,7 +24,7 @@ Looking to build the code from source? Look no further.
 You need these to get started
 
 - Java 8 JDK
-- Gradle (3.1 or greater)
+- Gradle (3.4 or greater)
 - Node JS 6.5 or newer
 - Typings `npm -g install typings`
 - A decent IDE. IntelliJ is nice.
@@ -71,7 +71,7 @@ plugins {
    ...
 
    // comment out this line. It pulls the version from the cloud
-   // id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
+   // id 'com.marklogic.ml-data-hub' version '2.0.0-rc.2'
 }
 
 // this tells gradle to apply the plugin you included above in the buildscript section
@@ -91,9 +91,8 @@ cd /path/to/data-hub-project
 
 **Terminal window 2** - This runs the Quickstart UI
 ```
-cd /path/to/data-hub-project/quick-start
-npm install
-npm start
+cd /path/to/data-hub-project
+./gradlew runui
 ```
 
 Now open your browser to [http://localhost:4200](http://localhost:4200) to use the debug version of the Quickstart UI.
@@ -129,10 +128,10 @@ your vision does not align with that of a project maintainer.
 #### Create a branch for your changes
 
 Okay, so you have decided to fix something. Create a feature branch
-and start hacking. **Note** that we use git flow and thus our most recent changes live on the 2.0-develop branch.
+and start hacking. **Note** that we use git flow and thus our most recent changes live on the develop branch.
 
 ```sh
-$ git checkout -b my-feature-branch -t origin/2.0-develop
+$ git checkout -b my-feature-branch -t origin/develop
 ```
 
 #### Formatting code
@@ -182,7 +181,7 @@ Use `git rebase` (not `git merge`) to sync your work from time to time.
 
 ```sh
 $ git fetch upstream
-$ git rebase upstream/2.0-develop
+$ git rebase upstream/develop
 ```
 
 
@@ -230,10 +229,10 @@ from the main (upstream) repository:
     git push origin --delete my-feature-branch
     ```
 
-* Check out the 2.0-develop branch:
+* Check out the develop branch:
 
     ```shell
-    git checkout 2.0-develop -f
+    git checkout develop -f
     ```
 
 * Delete the local branch:
@@ -242,10 +241,10 @@ from the main (upstream) repository:
     git branch -D my-feature-branch
     ```
 
-* Update your 2.0-develop with the latest upstream version:
+* Update your develop with the latest upstream version:
 
     ```shell
-    git pull --ff upstream 2.0-develop
+    git pull --ff upstream develop
     ```
 
 [issue tracker]: https://github.com/marklogic-community/marklogic-data-hub/issues

CONTRIBUTING.md

@@ -4,8 +4,8 @@ _The Data Hub Framework is free and open source under the [Apache 2 License](htt
 
 | OS | Status |
 | --- | --- |
-| Linux/Mac | [![Build Status](https://travis-ci.org/marklogic-community/marklogic-data-hub.svg?branch=2.0-master)](https://travis-ci.org/marklogic-community/marklogic-data-hub) |
-| Windows | [![Windows Build status](https://ci.appveyor.com/api/projects/status/kgj0k5na59uhkvbv/branch/2.0-master?svg=true)](https://ci.appveyor.com/project/paxtonhare/marklogic-data-hub) |
+| Linux/Mac | [![Build Status](https://travis-ci.org/marklogic-community/marklogic-data-hub.svg?branch=master)](https://travis-ci.org/marklogic-community/marklogic-data-hub) |
+| Windows | [![Windows Build status](https://ci.appveyor.com/api/projects/status/kgj0k5na59uhkvbv/branch/master?svg=true)](https://ci.appveyor.com/project/paxtonhare/marklogic-data-hub) |
 
 ### Warning
 _This is the the 2.0 branch of The MarkLogic Data Hub Framework. The 2.0 version is only compatible with MarkLogic 9.0._
@@ -26,7 +26,7 @@ You need these to get started
 
 - Java 8 JDK
 - MarkLogic 9.0 or greater
-- Gradle 3.1 or greater **(Optional)**
+- Gradle 3.4 or greater **(Optional)**
 
 ### TL;DR
 
@@ -51,7 +51,7 @@ Alternatively you can include the jar file as a build dependency in your Java pr
 **Gradle**
 
 ```groovy
-compile('com.marklogic:marklogic-data-hub:2.0.0-rc.1')
+compile('com.marklogic:marklogic-data-hub:2.0.0-rc.2')
 ```
 
 **Maven**
@@ -60,15 +60,15 @@ compile('com.marklogic:marklogic-data-hub:2.0.0-rc.1')
 <dependency>
   <groupId>com.marklogic</groupId>
   <artifactId>marklogic-data-hub</artifactId>
-  <version>2.0.0-rc.1</version>
+  <version>2.0.0-rc.2</version>
   <type>pom</type>
 </dependency>
 ```
 
 **Ivy**
 
 ```xml
-<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-rc.1'>
+<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-rc.2'>
   <artifact name='$AID' ext='pom'></artifact>
 </dependency>
 ```
@@ -79,7 +79,7 @@ If you prefer to use gradle for all of your hub interactions then you can includ
 
 ```groovy
 plugins {
-    id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
+    id 'com.marklogic.ml-data-hub' version '2.0.0-rc.2'
 }
 ```
 
@@ -93,4 +93,4 @@ Now you have full access to the Data Hub tasks. To see all available tasks run:
 
 Feeling intrepid? Want to contrubute to the Data Hub Framework? Perhaps you just want to poke the code?
 
-Look at our [CONTRIBUTING.md](https://github.com/marklogic-community/marklogic-data-hub/blob/2.0-master/CONTRIBUTING.md#building-the-framework-from-source) file for details on building from source.
+Look at our [CONTRIBUTING.md](https://github.com/marklogic-community/marklogic-data-hub/blob/master/CONTRIBUTING.md#building-the-framework-from-source) file for details on building from source.

README.md

@@ -33,5 +33,5 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.1'
+    gradleVersion = '3.4'
 }

build.gradle

@@ -4,7 +4,7 @@ services:
     image: marklogiccommunity/marklogic-datahub-2x
     build:
       context: .
-      dockerfile: ./.travis/Dockerfile-ml
+      dockerfile: ./.travis/Dockerfile
     ports:
       - "5005:5005"
       - "8000-8020:8000-8020"

docker-compose.yml

@@ -0,0 +1,2 @@
+[*]
+end_of_line = crlf

examples/.editorconfig

@@ -1,6 +1,6 @@
-config
-build.gradle
-gradle.properties
-gradle-local.properties
-hub-internal-config/
-user-config/
+config
+build.gradle
+gradle.properties
+gradle-local.properties
+hub-internal-config/
+user-config/

examples/.gitignore

@@ -0,0 +1,44 @@
+# Barebones Example
+
+This example shows you the zen of Data Hub Framework. Simply drop a `build.gradle` into a directory with these contents:
+
+build.gradle:
+```groovy
+plugins {
+    // this plugin lets you create properties files
+    // for multiple environments... like dev, qa, prod
+    id 'net.saliman.properties' version '1.4.6'
+
+    // this is the data hub framework gradle plugin
+    // it includes ml-gradle. This plugin is what lets you
+    // run DHF (Data Hub Framework) tasks from the
+    // command line
+    id 'com.marklogic.ml-data-hub' version '2.0.0-rc.2'
+}
+```
+
+Next, Initialize your DHF app:
+
+```bash
+gradle hubInit
+```
+
+Then Bootstrap your DHF app:
+
+```bash
+gradle mlDeploy
+```
+
+Then Deploy your custom modules:
+
+```bash
+gradle mlLoadModules
+```
+
+You can use scaffolding commands to configure flows.
+
+```bash
+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)