Merge branch 'release/1.1.1' into 1.0-master

Author: paxtonhare

.dockerignore

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

.gitignore

@@ -21,3 +21,4 @@ flow.properties
 node_modules/
 .tmp/
 *.sublime-*
+.vscode/

.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-8002
+
+# 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,18 @@
+#!/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_PRELOAD=/opt/MarkLogic/lib/libjemalloc.so.1
+export LD_LIBRARY_PATH=/opt/MarkLogic/lib:/data/Lib
+
+echo "STARTING MARKLOGIC"
+
+/opt/MarkLogic/bin/MarkLogic

CHANGELOG.md

@@ -1,7 +1,33 @@
 # Change Log
 
-## [v1.1.0](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.0)
+## [v1.1.1](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.1)
 
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.1.0...v1.1.1)
+
+**Implemented enhancements:**
+
+- customize session name to avoid conflicts [\#369](https://github.com/marklogic/marklogic-data-hub/issues/369)
+- Change Java Client API dependency to stable build [\#358](https://github.com/marklogic/marklogic-data-hub/issues/358)
+- Update Hub to use latest ml-gradle [\#355](https://github.com/marklogic/marklogic-data-hub/issues/355)
+
+**Closed issues:**
+
+- Entities and custom modules fail to deploy - v1.1.0 [\#377](https://github.com/marklogic/marklogic-data-hub/issues/377)
+- See if we can bail if the gradle version is too low [\#376](https://github.com/marklogic/marklogic-data-hub/issues/376)
+- Unable to login marklogic using hub frame work received  "500 Internal Server Error"  [\#374](https://github.com/marklogic/marklogic-data-hub/issues/374)
+- gradle plugin gets confused about users [\#371](https://github.com/marklogic/marklogic-data-hub/issues/371)
+- can't put binary inside envelope [\#366](https://github.com/marklogic/marklogic-data-hub/issues/366)
+- MLCP can't find /etc/hadooop [\#365](https://github.com/marklogic/marklogic-data-hub/issues/365)
+- Add CLA requirement to CONTRIBUTING [\#361](https://github.com/marklogic/marklogic-data-hub/issues/361)
+- Bug: QuickStart Login screen: Long paths aren't completely visible in Chrome [\#354](https://github.com/marklogic/marklogic-data-hub/issues/354)
+
+**Merged pull requests:**
+
+- Adds CLA requirement \(\#361\) [\#363](https://github.com/marklogic/marklogic-data-hub/pull/363) ([jmakeig](https://github.com/jmakeig))
+- Adds CLA requirement \(\#361\) [\#362](https://github.com/marklogic/marklogic-data-hub/pull/362) ([jmakeig](https://github.com/jmakeig))
+- Updates Java Client API dependency to stable build [\#359](https://github.com/marklogic/marklogic-data-hub/pull/359) ([jmakeig](https://github.com/jmakeig))
+
+## [v1.1.0](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.0) (2016-12-16)
 [Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.2...v1.1.0)
 
 **Implemented enhancements:**

CONTRIBUTING.md

@@ -36,7 +36,29 @@ 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
+```bash
+cd /path/to/data-hub-project/
+./gradlew publishToMavenLocal
+cd /path/to/data-hub-project/ml-data-hub-plugin
+./gradlew publishToMavenLocal
+```
+
+Then in your build.gradle file you will need to use the local version:
+```groovy
+buildscript {
+  repositories {
+    mavenLocal() 
+    jcenter()
+  } 
+  dependencies {
+    classpath "com.marklogic:ml-data-hub:(the version number you chose)"
+  }
+}
+apply plugin: "com.marklogic.ml-data-hub"
 ```
 
 #### Running the QuickStart UI from source
@@ -47,7 +69,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
@@ -152,7 +174,7 @@ $ git rebase upstream/1.0-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.
@@ -163,6 +185,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