Merging in 2.2.0 work from dev

Author: rjrudin

.gitignore

@@ -8,3 +8,4 @@
 src/test/resources/user.properties
 setenv.bat
 src/test/resources/scaffold-test/
+.DS_Store

.travis.yml

@@ -0,0 +1,16 @@
+language: java
+jdk:
+  - oraclejdk7
+sudo: true
+before_install:
+  - echo 'America/Los_Angeles' | sudo tee /etc/timezone
+  - sudo dpkg-reconfigure --frontend noninteractive tzdata
+install:
+  - ./shared/dev-tasks/install-dependencies.sh
+script:
+  - ./shared/dev-tasks/run-tests.sh
+
+#whitelist
+branches:
+  only:
+    - dev

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/rjrudin/ml-app-deployer.svg?branch=dev)](https://travis-ci.org/rjrudin/ml-app-deployer)
+
 ## What is ml-app-deployer?
 
 ml-app-deployer is a Java library that provides two capabilities:

build.gradle

@@ -15,11 +15,13 @@ repositories {
 }
 
 dependencies {
-  compile 'com.marklogic:ml-javaclient-util:2.8.0'
+  compile 'com.marklogic:ml-javaclient-util:2.9.0-RC1'
   compile 'jaxen:jaxen:1.1.6'
   compile 'org.apache.httpcomponents:httpclient:4.3.5'
   compile 'org.springframework:spring-web:4.1.5.RELEASE'
-  testCompile 'com.marklogic:ml-junit:2.6.0'
+  testCompile ('com.marklogic:ml-junit:2.6.0') {
+    exclude module: "ml-javaclient-util"
+  }
 }
 
 // This ensures that Gradle includes in the published jar any non-java files under src/main/java
@@ -42,11 +44,6 @@ publishing {
       artifact sourcesJar
     }
   }
-  repositories {
-    maven {
-      url publishUrl
-    }
-  }
 }
 
 if (project.hasProperty("myBintrayUser")) {
@@ -60,7 +57,7 @@ if (project.hasProperty("myBintrayUser")) {
       licenses = ['Apache-2.0']
       vcsUrl = 'https://github.com/rjrudin/' + project.name + '.git'
       version {
-        name = "2.1.0"
+        name = "2.2.0-RC1"
         released = new Date()
       }
     }

gradle.properties

@@ -1,4 +1,3 @@
 group=com.marklogic
-publishUrl=file:../gh-pages-marklogic-java/releases
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=2.1.0
+version=2.2.0-RC1

shared/dev-tasks/install-dependencies.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then
+  ./shared/dev-tasks/travis-install-ml.sh release
+  ./shared/dev-tasks/setup-marklogic.sh
+fi

shared/dev-tasks/run-tests.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then
+  cd ${TRAVIS_BUILD_DIR}
+  ./gradlew test -i
+fi

shared/dev-tasks/setup-marklogic.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+sudo /etc/init.d/MarkLogic start
+sleep 10
+curl -X POST -d "" http://localhost:8001/admin/v1/init
+sleep 10
+curl -X POST -H "Content-type: application/x-www-form-urlencoded" \
+     --data "admin-username=admin" \
+     --data "admin-password=admin" \
+     --data "realm=public" \
+     "http://localhost:8001/admin/v1/instance-admin"
+sleep 10

shared/dev-tasks/travis-install-ml.sh

@@ -0,0 +1,77 @@
+#!/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
+if [[ $arg1 = 'release' ]]; then
+  ver=${ML_VERSION}
+  fname=MarkLogic-RHEL6-${ver}.x86_64.rpm
+  fnamedeb="marklogic_"
+  fnamedeb=$fnamedeb$ver
+  suff="_amd64.deb"
+  fnamedeb=$fnamedeb$suff
+
+  curl -c cookies.txt --data "email=${MLBUILD_USER}&password=${MLBUILD_PASSWORD}" https://developer.marklogic.com/login
+  dl_link=$(curl -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 -k -o ./$fname $url
+
+  fname=$(pwd)/$fname
+
+  sudo apt-get update
+  sudo apt-get install wajig alien rpm lsb-base dpkg-dev debhelper build-essential
+  (cd /etc && sudo ln -s default sysconfig)
+  sudo wajig rpminstall $fname
+
+  echo "********* MarkLogic $ver installed"
+else
+  # find today
+  day=$(date +"%Y%m%d")
+
+  # if the user passed a day string as a param then use it instead
+  test $1 && day=$1
+  # make a version number out of the date
+  ver="8.0-$day"
+
+  echo "********* Downloading MarkLogic nightly $ver"
+
+  # fetch/install ML nightly
+  fname="MarkLogic-$ver.x86_64.rpm"
+  fnamedeb="marklogic_"
+  fnamedeb=$fnamedeb$ver
+  suff="_amd64.deb"
+  fnamedeb=$fnamedeb$suff
+
+  url="https://root.marklogic.com/nightly/builds/linux64/rh6-intel64-80-test-1.marklogic.com/b8_0/pkgs.$day/$fname"
+
+  status=$(curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD --head --write-out %{http_code} --silent --output /dev/null $url)
+  if [[ $status = 200 ]]; then
+    successOrExit curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD -o ./$fname $url
+
+    fname=$(pwd)/$fname
+
+    sudo apt-get update
+    sudo apt-get install alien dpkg-dev debhelper build-essential
+    sudo alien -d -k $fname
+    sudo dpkg -i $fnamedeb
+
+    echo "********* MarkLogic nightly $ver installed"
+  else
+    echo "CANNOT DOWNLOAD: status = $status for date $day (URL=\"$url\")"
+    exit 1
+  fi
+fi