Merge branch 'release/2.0.0-alpha.3' into 2.0-master

Author: paxtonhare

.dockerignore

@@ -0,0 +1,13 @@
+.dockerignore
+
+.DS_Store
+
+**/node_modules
+.gradle
+**/.gradle
+!**/build.gradle
+!**/settings.gradle
+
+.idea
+
+# **/build/*

.travis.yml

@@ -1,21 +1,11 @@
-language: java
-jdk:
-  - oraclejdk8
-env:
- - NODE_VERSION=6.1
-sudo: true
+dist: trusty
+sudo: required
+services:
+  - docker
+
 before_install:
-  - echo 'America/Los_Angeles' | sudo tee /etc/timezone
-  - sudo dpkg-reconfigure --frontend noninteractive tzdata
-install:
-  - nvm install $NODE_VERSION
-  - nvm use $NODE_VERSION
-  - npm install -g typings
-  - ./shared/dev-tasks/install-dependencies.sh
+ - ./.travis/download.sh
+
 script:
-  - nvm use $NODE_VERSION
-  - if [[ $TRAVIS_SECURE_ENV_VARS == true ]]; then
-      ./gradlew check;
-    else
-      ./gradlew jshint;
-    fi
+  - docker-compose build
+  - docker-compose run marklogic

.travis/Dockerfile-java

@@ -0,0 +1,5 @@
+FROM openjdk:8
+VOLUME /code
+ADD ./ /code
+WORKDIR /code
+ENTRYPOINT [ "sh", "-c", "./gradlew check" ]

.travis/Dockerfile-ml

@@ -0,0 +1,35 @@
+FROM centos:centos7
+
+ENV LANG C.UTF-8
+
+RUN yum -y install glibc.i686 \
+    gdb.x86_64 redhat-lsb.x86_64 vim \
+    bzip2 \
+    unzip \
+    xz-utils \
+    java-1.8.0-openjdk-devel 2>&1 > /dev/null
+
+# Install MarkLogic
+COPY ./MarkLogic.rpm /tmp/MarkLogic.rpm
+
+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
+
+# init
+COPY .travis/startml.sh /tmp/startml.sh
+RUN chmod 755 /tmp/startml.sh
+COPY .travis/setup.sh /tmp/setup.sh
+RUN chmod 755 /tmp/setup.sh
+RUN /tmp/setup.sh
+
+VOLUME /marklogic-data-hub
+ADD ./ /marklogic-data-hub
+WORKDIR /marklogic-data-hub
+
+RUN ./gradlew tasks 2>&1 > /dev/null
+
+# Define default command (which avoids immediate shutdown)
+CMD /tmp/startml.sh && ./gradlew test

.travis/download.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# runs command from parameters and exits with the eoror code of the command
+# if it fails
+function successOrExit {
+    "$@"
+    local status=$?
+    if [ $status -ne 0 ]; then
+        echo "$1 exited with error: $status"
+        exit $status
+    fi
+}
+
+set | grep TRAVIS
+
+test $1 && arg1=$1
+
+ver=${ML_VERSION}
+fname=MarkLogic-RHEL7-${ver}.x86_64.rpm
+fnamedeb="marklogic_"
+fnamedeb=$fnamedeb$ver
+suff="_amd64.deb"
+fnamedeb=$fnamedeb$suff
+
+echo "Logging in for Download"
+curl -s -c cookies.txt --data "email=${MLBUILD_USER}&password=${MLBUILD_PASSWORD}" https://developer.marklogic.com/login > /dev/null 2>&1
+
+echo
+echo "Getting Download Link"
+dl_link=$(curl -s -b cookies.txt --data "download=/download/binaries/8.0/${fname}" https://developer.marklogic.com/get-download-url | perl -pe 's/.*"path":"([^"]+).*/\1/')
+url="https://developer.marklogic.com${dl_link}"
+
+echo "********* Downloading MarkLogic $ver"
+successOrExit curl -s -k -o ./MarkLogic.rpm $url

.travis/setup.sh

@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# Initializes a virgin MarkLogic installation.
+
+HOST=localhost
+ADMINUSER=admin
+ADMINPASSWORD=admin
+
+/tmp/startml.sh
+
+until curl -fsS --head --digest --user "$ADMINUSER":"$ADMINPASSWORD" http://"$HOST":8001/admin/v1/timestamp # &>/dev/null
+do
+  echo "MarkLogic hasn't started yet. Retrying in 3 seconds…"
+  sleep 3
+done
+
+# curl -X POST --data "" http://"$HOST":8001/admin/v1/init
+echo "Initializing…"
+curl --fail --show-error --silent -X POST --data "" http://"$HOST":8001/admin/v1/init 1>/dev/null
+if [[ $? != 0 ]] ; then
+    echo "error on init"
+    exit 1
+fi
+echo "Completed initialization. Waiting for restart…"
+sleep 20
+
+# curl -fsS --head --digest --user admin:"$ADMINPASSWORD" http://"$HOST":8001/admin/v1/timestamp
+# One liner: until curl -fsS --head http://192.168.56.101:8001/admin/v1/timestamp --digest --user admin:admin; do sleep 5; done
+
+
+until curl -fsS --head --digest --user "$ADMINUSER":"$ADMINPASSWORD" http://"$HOST":8001/admin/v1/timestamp &>/dev/null
+do
+  echo "Restart hasn't completed. Retrying in 3 seconds…"
+  sleep 3
+done
+
+# curl -X POST -H "Content-type: application/x-www-form-urlencoded" --data "admin-username=admin" --data "admin-password=********" http://localhost:8001/admin/v1/instance-admin
+echo "Starting instance administration…"
+curl --fail --show-error --silent \
+  -X POST -H "Content-type: application/x-www-form-urlencoded" \
+  --data "admin-username=${ADMINUSER}" --data "admin-password=${ADMINPASSWORD}" --data "realm=public" \
+  http://"$HOST":8001/admin/v1/instance-admin 1>/dev/null
+if [[ $? != 0 ]] ; then
+    echo "Error on instance-admin"
+    exit 1
+fi
+
+echo "Completed instance administration. Waiting for restart…"
+sleep 10
+until curl -fsS --head --digest --user admin:"$ADMINPASSWORD" http://"$HOST":8001/admin/v1/timestamp &>/dev/null
+do
+  echo "Restart hasn't completed. Retrying in 5 seconds…"
+  sleep 5
+done
+
+echo "Turning off log file rotation"
+curl --fail --show-error --silent \
+  -X PUT --digest -u "$ADMINUSER":"$ADMINPASSWORD" -H "Content-type: application/json" \
+  -d '{"rotate-log-files":"never"}' http://"$HOST":8002/manage/v2/groups/Default/properties &>/dev/null
+
+echo "Done!"
+exit 0

.travis/startml.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+export MARKLOGIC_INSTALL_DIR=/opt/MarkLogic
+export MARKLOGIC_DATA_DIR=/data
+
+export MARKLOGIC_FSTYPE=ext4
+export MARKLOGIC_USER=daemon
+export MARKLOGIC_PID_FILE=/var/run/MarkLogic.pid
+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_LIBRARY_PATH=/opt/MarkLogic/lib:/data/Lib
+
+echo "STARTING MARKLOGIC"
+
+/opt/MarkLogic/bin/MarkLogic

CONTRIBUTING.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 (the newer the better)
+- Gradle (3.1 or greater)
 - Node JS 6.5 or newer
 - Typings `npm -g install typings`
 - A decent IDE. IntelliJ is nice.
@@ -36,29 +36,46 @@ To build the entire DHF (marklogic-data-hub.jar, quickstart.war, and ml-data-hub
 
 ```bash
 cd /path/to/data-hub-project/
-gradle build -x test
+./gradlew build -x test
 ```
 
-#### Running your local hub instead of the cloud hosted one
+#### Making Changes to the Hub Gradle Plugin
+
+This is for when you are making changes to the ml-data-hub-plugin. This is a gradle plugin that enables Hub Capabilities. Most likely you won't find yourself doing this. You can safely ignore this section.
+
+Still here? Seems you really want to modify the Gradle Plugin. Here's how to tell Gradle to use your local copy instead of the one living up on the Cloud.
+
 ```bash
 cd /path/to/data-hub-project/
-gradle publishToMavenLocal
+./gradlew publishToMavenLocal
 cd /path/to/data-hub-project/ml-data-hub-plugin
-gradle publishToMavenLocal
+./gradlew publishToMavenLocal
 ```
 
 Then in your build.gradle file you will need to use the local version:
 ```groovy
+
+// this goes at the top above the plugins section
+
 buildscript {
   repositories {
     mavenLocal() 
     jcenter()
   } 
   dependencies {
-    classpath "com.marklogic:ml-data-hub-plugin:(the version number you chose)"
+    classpath "com.marklogic:ml-data-hub:(the version number you chose)"
   }
 }
-apply plugin: "com.marklogic.ml-data-hub-plugin"
+
+plugins {
+   ...
+
+   // comment out this line. It pulls the version from the cloud
+   // id 'com.marklogic.ml-data-hub' version '2.0.0-alpha.3'
+}
+
+// this tells gradle to apply the plugin you included above in the buildscript section
+apply plugin: "com.marklogic.ml-data-hub"
 ```
 
 #### Running the QuickStart UI from source
@@ -69,7 +86,7 @@ You will need to open two terminal windows.
 **Terminal window 1** - This runs the webapp.
 ```bash
 cd /path/to/data-hub-project
-gradle bootrun
+./gradlew bootrun
 ```
 
 **Terminal window 2** - This runs the Quickstart UI
@@ -112,10 +129,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 develop branch.
+and start hacking. **Note** that we use git flow and thus our most recent changes live on the 2.0-develop branch.
 
 ```sh
-$ git checkout -b my-feature-branch -t origin/develop
+$ git checkout -b my-feature-branch -t origin/2.0-develop
 ```
 
 #### Formatting code
@@ -165,7 +182,7 @@ Use `git rebase` (not `git merge`) to sync your work from time to time.
 
 ```sh
 $ git fetch upstream
-$ git rebase upstream/develop
+$ git rebase upstream/2.0-develop
 ```
 
 
@@ -174,7 +191,7 @@ $ git rebase upstream/develop
 Make sure the JUnit tests pass.
 
 ```sh
-$ gradle test
+$ ./gradlew test
 ```
 
 Make sure that all tests pass. Please, do not submit patches that fail.
@@ -185,6 +202,10 @@ Make sure that all tests pass. Please, do not submit patches that fail.
 $ git push origin my-feature-branch
 ```
 
+#### Agree to the contributor License
+
+Before we can merge your changes, you need to sign a [Contributor License Agreement](http://developer.marklogic.com/products/cla). You only need to do this once.
+
 #### Submit the pull request
 
 Go to https://github.com/username/marklogic-data-hub and select your feature branch. Click
@@ -209,10 +230,10 @@ from the main (upstream) repository:
     git push origin --delete my-feature-branch
     ```
 
-* Check out the develop branch:
+* Check out the 2.0-develop branch:
 
     ```shell
-    git checkout develop -f
+    git checkout 2.0-develop -f
     ```
 
 * Delete the local branch:
@@ -221,10 +242,10 @@ from the main (upstream) repository:
     git branch -D my-feature-branch
     ```
 
-* Update your develop with the latest upstream version:
+* Update your 2.0-develop with the latest upstream version:
 
     ```shell
-    git pull --ff upstream develop
+    git pull --ff upstream 2.0-develop
     ```
 
 [issue tracker]: https://github.com/marklogic/marklogic-data-hub/issues

LICENSE

@@ -1,3 +1,13 @@
+ 
+Copyright © 2017 MarkLogic Corporation.
+This project and its code and functionality is not representative of MarkLogic Server and is not supported by MarkLogic.
+ 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+ 
+http://www.apache.org/licenses/LICENSE-2.0
+ 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/