Merge branch 'issue_96' of https://github.com/paxtonhare/ml-app-deployer into paxtonhare-issue_96

Conflicts:
	src/main/java/com/marklogic/rest/util/RestConfig.java

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,11 @@
+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

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

src/main/java/com/marklogic/appdeployer/command/appservers/UpdateRestApiServersCommand.java

@@ -13,17 +13,24 @@
  */
 public class UpdateRestApiServersCommand extends AbstractCommand {
 
+    private String restApiFilename;
+
     public UpdateRestApiServersCommand() {
         setExecuteSortOrder(SortOrderConstants.UPDATE_REST_API_SERVERS);
     }
 
+    public UpdateRestApiServersCommand(String restApiFilename) {
+        this();
+        this.restApiFilename = restApiFilename;
+    }
+
     /**
      * This uses a different file than that of creating a REST API, as the payload for /v1/rest-apis differs from that
      * of the /manage/v2/servers endpoint.
      */
     @Override
     public void execute(CommandContext context) {
-        File f = context.getAppConfig().getConfigDir().getRestApiServerFile();
+        File f = findRestApiConfigFile(context);
         if (f.exists()) {
             AppConfig appConfig = context.getAppConfig();
 
@@ -43,4 +50,11 @@ public void execute(CommandContext context) {
         }
     }
 
+    protected File findRestApiConfigFile(CommandContext context) {
+        if (restApiFilename != null) {
+            return new File(context.getAppConfig().getConfigDir().getBaseDir(), restApiFilename);
+        } else {
+            return context.getAppConfig().getConfigDir().getRestApiServerFile();
+        }
+    }
 }

src/main/java/com/marklogic/mgmt/security/AmpManager.java

@@ -79,6 +79,33 @@ protected String[] getUpdateResourceParams(String payload) {
         return params.toArray(new String[] {});
     }
 
+    /**
+     * In ML 8.0-5.1 deleting an amp fails if the database is specified on the
+     * delete url
+     */
+    @Override
+    protected String[] getDeleteResourceParams(String payload) {
+        List<String> params = new ArrayList<String>();
+        params.add("document-uri");
+        if (payloadParser.isJsonPayload(payload)) {
+            JsonNode node = payloadParser.parseJson(payload);
+            params.add(node.get("document-uri").asText());
+            if (node.has("namespace")) {
+                params.add("namespace");
+                params.add(node.get("namespace").asText());
+            }
+        } else {
+            Fragment f = new Fragment(payload);
+            params.add(f.getElementValue("/node()/*[local-name(.) = 'document-uri']"));
+
+            String val = f.getElementValue("/node()/*[local-name(.) = 'namespace']");
+            if (val != null) {
+                params.add("namespace");
+                params.add(val);
+            }
+        }
+        return params.toArray(new String[] {});    }
+
     public void setNamespace(String namespace) {
         this.namespace = namespace;
     }

src/main/java/com/marklogic/rest/util/RestConfig.java

@@ -31,16 +31,13 @@ public String toString() {
      * e.g. when a mimetype has a plus in it, that plus needs to be encoded, but doing as %2B will result in the % being
      * double encoded. Unfortunately, it seems some encoding is still needed - e.g. for a pipeline like "Flexible Replication"
      * with a space in its name, the space must be encoded properly as a "+".
-     * 
+     *
      * @param path
      * @return
      */
     public URI buildUri(String path) {
-        if (path.contains(" ")) {
-            path = path.replace(" ", "+");
-        }
         try {
-            return new URI(String.format("%s://%s:%d%s", getScheme(), getHost(), getPort(), path));
+            return new URI(String.format("%s://%s:%d%s", getScheme(), getHost(), getPort(), path.replace(" ", "+")));
         } catch (URISyntaxException ex) {
             throw new RuntimeException("Unable to build URI for path: " + path + "; cause: " + ex.getMessage(), ex);
         }

src/test/java/com/marklogic/appdeployer/command/admin/RequireAtLeastMl8Test.java

@@ -1,6 +1,7 @@
 package com.marklogic.appdeployer.command.admin;
 
 import org.junit.Test;
+import org.junit.After;
 
 import com.marklogic.appdeployer.AbstractAppDeployerTest;
 
@@ -11,4 +12,9 @@ public void testThatNoExceptionIsThrown() {
         initializeAppDeployer(new RequireAtLeastMl8Command());
         appDeployer.deploy(appConfig);
     }
+
+    @After
+    public void teardown() {
+        undeploySampleApp();
+    }
 }