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

Author: paxtonhare

.gitignore

@@ -9,6 +9,7 @@ marklogic-data-hub/bin/
 marklogic-data-hub/src/main/resources/ml-modules/root/trace-ui
 quick-start/bin/
 build/
+out/
 releases/
 .classpath
 .project

.travis/Dockerfile-java

@@ -1,18 +1,27 @@
 FROM centos:centos7
 
 ENV LANG C.UTF-8
-ENV JAVA_VERSION 8u131
-ENV BUILD_VERSION b11
-ENV SUM d54c1d3a095b4ff2b6607d096fa80163
+ENV JAVA_VERSION 8u141
+ENV BUILD_VERSION b15
+ENV SUM 336fa29ff2bb4ef291e347e091f7f4a7
+
+# Get any CentOS updates then clear the Docker cache
+RUN yum makecache fast && \
+    yum -y update && yum clean all
+
+# Install MarkLogic dependencies
 RUN yum -y install glibc.i686 \
     gdb.x86_64 redhat-lsb.x86_64 vim \
     bzip2 \
     unzip \
-    wget \
-    xz-utils 2>&1 > /dev/null
+    xz-utils 2>&1 > /dev/null \
+    && yum clean all
+
+# Install the initscripts package so MarkLogic starts ok
+RUN yum -y install initscripts && yum clean all
 
 # Downloading Java
-RUN wget --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/$SUM/jdk-$JAVA_VERSION-linux-x64.rpm" -O /tmp/jdk-8-linux-x64.rpm
+RUN curl -s -L -C - -b "oraclelicense=accept-securebackup-cookie" -o /tmp/jdk-8-linux-x64.rpm http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/$SUM/jdk-$JAVA_VERSION-linux-x64.rpm
 RUN yum -y install /tmp/jdk-8-linux-x64.rpm
 
 RUN alternatives --install /usr/bin/java jar /usr/java/latest/bin/java 200000
@@ -21,6 +30,9 @@ RUN alternatives --install /usr/bin/javac javac /usr/java/latest/bin/javac 20000
 
 ENV JAVA_HOME /usr/java/latest
 
+# Set the Path
+ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/MarkLogic/mlcmd/bin
+
 # Install MarkLogic
 COPY ./MarkLogic.rpm /tmp/MarkLogic.rpm
 
@@ -29,6 +41,7 @@ RUN yum -y install /tmp/MarkLogic.rpm 2>&1 > /dev/null
 # Expose MarkLogic Server ports - add additional ones for your REST, etc
 # endpoints
 EXPOSE 7997-8020
+EXPOSE 5005
 
 # init
 COPY .travis/startml.sh /tmp/startml.sh
@@ -41,7 +54,8 @@ VOLUME /marklogic-data-hub
 ADD ./ /marklogic-data-hub
 WORKDIR /marklogic-data-hub
 
-RUN ./gradlew build -x test 2>&1 > /dev/null
+RUN ./gradlew resolveAllDependencies
 
+# Start MarkLogic from init.d script.
 # Define default command (which avoids immediate shutdown)
-CMD /tmp/startml.sh && ./gradlew test
+CMD /tmp/startml.sh && ./gradlew clean && ./gradlew test

.travis/Dockerfile-ml

@@ -10,6 +10,7 @@ export MARKLOGIC_MLCMD_PID_FILE=/var/run/mlcmd.pid
 export MARKLOGIC_UMASK=022
 
 export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/MarkLogic/mlcmd/bin
+export LD_PRELOAD=/opt/MarkLogic/lib/libjemalloc.so.2
 export LD_LIBRARY_PATH=/opt/MarkLogic/lib:/data/Lib
 
 echo "STARTING MARKLOGIC"

.travis/startml.sh

@@ -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-beta.1'
+   // id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
 }
 
 // this tells gradle to apply the plugin you included above in the buildscript section
@@ -111,13 +111,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/marklogic-data-hub/fork) and clone
+Fork the project [on GitHub](https://github.com/marklogic-community/marklogic-data-hub/fork) and clone
 your copy.
 
 ```sh
 $ git clone git@github.com:username/marklogic-data-hub.git
 $ cd marklogic-data-hub
-$ git remote add upstream git://github.com/marklogic/marklogic-data-hub.git
+$ git remote add upstream git://github.com/marklogic-community/marklogic-data-hub.git
 ```
 
 We ask that you open an issue in the [issue tracker][] and get agreement from
@@ -248,5 +248,5 @@ from the main (upstream) repository:
     git pull --ff upstream 2.0-develop
     ```
 
-[issue tracker]: https://github.com/marklogic/marklogic-data-hub/issues
+[issue tracker]: https://github.com/marklogic-community/marklogic-data-hub/issues
 [.editorconfig]: http://editorconfig.org/

CHANGELOG.md

@@ -1,15 +1,18 @@
 _The MarkLogic Data Hub Framework is a data integration framework and tool-set to quickly and efficiently integrate data from many sources into a single MarkLogic database, and expose that data._
 
-_The Data Hub Framework is free and open source under the [Apache 2 License](https://github.com/marklogic/marklogic-data-hub/blob/1.0-master/LICENSE) and is supported by the community of developers who build and contribute to it. Please note that this open source project and its code and functionality is not representative of MarkLogic Server and is not supported by MarkLogic._
+_The Data Hub Framework is free and open source under the [Apache 2 License](https://github.com/marklogic-community/marklogic-data-hub/blob/1.0-master/LICENSE) and is supported by the community of developers who build and contribute to it. Please note that this open source project and its code and functionality is not representative of MarkLogic Server and is not supported by MarkLogic._
 
 | OS | Status |
 | --- | --- |
-| Linux/Mac | [![Build Status](https://travis-ci.org/marklogic/marklogic-data-hub.svg?branch=2.0-develop)](https://travis-ci.org/marklogic/marklogic-data-hub) |
-| Windows | [![Windows Build status](https://ci.appveyor.com/api/projects/status/kgj0k5na59uhkvbv?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=2.0-develop)](https://travis-ci.org/marklogic-community/marklogic-data-hub) |
+| Windows | [![Windows Build status](https://ci.appveyor.com/api/projects/status/kgj0k5na59uhkvbv/branch/2.0-develop?svg=true)](https://ci.appveyor.com/project/paxtonhare/marklogic-data-hub) |
 
-# 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._
+
+_If you are looking for the 1.0 branch ( MarkLogic 8 compatible ) go [here](https://github.com/marklogic-community/marklogic-data-hub/tree/1.0-develop)._
 
-## 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 which is currently in Early Access and not generally available.
+# MarkLogic Data Hub
 
 Go from nothing to Operational Data Hub in a matter of minutes.  
 
@@ -33,7 +36,7 @@ Or watch the [MarkLogic University - Data Hub Framework On Demand Video Courses]
 
 ### The Easiest Way
 
-To use the Data Hub Framework you should download the quickstart.war file from the [releases page](https://github.com/marklogic/marklogic-data-hub/releases).
+To use the Data Hub Framework you should download the quickstart.war file from the [releases page](https://github.com/marklogic-community/marklogic-data-hub/releases).
 
 Then Run the war like so:
 
@@ -48,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-beta.1')
+compile('com.marklogic:marklogic-data-hub:2.0.0-rc.1')
 ```
 
 **Maven**
@@ -57,15 +60,15 @@ compile('com.marklogic:marklogic-data-hub:2.0.0-beta.1')
 <dependency>
   <groupId>com.marklogic</groupId>
   <artifactId>marklogic-data-hub</artifactId>
-  <version>2.0.0-beta.1</version>
+  <version>2.0.0-rc.1</version>
   <type>pom</type>
 </dependency>
 ```
 
 **Ivy**
 
 ```xml
-<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-beta.1'>
+<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-rc.1'>
   <artifact name='$AID' ext='pom'></artifact>
 </dependency>
 ```
@@ -76,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-beta.1'
+    id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
 }
 ```
 
@@ -90,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/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/2.0-master/CONTRIBUTING.md#building-the-framework-from-source) file for details on building from source.

CONTRIBUTING.md

@@ -1,3 +1,11 @@
+allprojects {
+    task resolveAllDependencies {
+        doLast {
+            configurations.all { it.resolve() }
+        }
+    }
+}
+
 subprojects {
     apply plugin: 'java'
 

README.md

@@ -2,7 +2,11 @@ version: '2'
 services:
   marklogic:
     image: marklogiccommunity/marklogic-datahub-2x
+    build:
+      context: .
+      dockerfile: ./.travis/Dockerfile-ml
     ports:
-      - "8000-8020"
+      - "5005:5005"
+      - "8000-8020:8000-8020"
     volumes:
       - .:/marklogic-data-hub

build.gradle

@@ -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 jar from the [releases page](https://github.com/marklogic/marklogic-data-hub/releases) into this folder.
+1. Download the latest quick-start jar from the [releases page](https://github.com/marklogic-community/marklogic-data-hub/releases) into this folder.
 
 1. Run the quick-start jar `java -jar quick-start.jar`