diff --git a/.copyrightconfig b/.copyrightconfig index 304bdade..ccc3da50 100644 --- a/.copyrightconfig +++ b/.copyrightconfig @@ -11,4 +11,4 @@ startyear: 2015 # - Dotfiles already skipped automatically # Enable by removing the leading '# ' from the next line and editing values. # filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js -filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml, test-complete-app/* +filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml, test-complete-app/*, test-complete-app-mlDeploy/* diff --git a/test-complete-app-mlDeploy/build.gradle b/test-complete-app-mlDeploy/build.gradle new file mode 100644 index 00000000..d18b836d --- /dev/null +++ b/test-complete-app-mlDeploy/build.gradle @@ -0,0 +1,49 @@ +/** + * This Gradle file is used to add a certificate template to the app that is created via the bespoke + * deployer in test-setup-qa.js and test-setup-dmsdk-qa.js. + */ +plugins { + id "net.saliman.properties" version "1.5.1" + id "com.marklogic.ml-gradle" version "6.1.0" +} + +/* + * Since our REST API server uses a certificate template, we need to execute an extra command to generate a temporary + * certificate for this template - without that, the REST API server won't be able to receive HTTP or HTTPS requests. + */ +ext { + def command = new com.marklogic.appdeployer.command.security.GenerateTemporaryCertificateCommand() + command.setTemplateIdOrName("ssl-project-template") + command.setCommonName("localhost") + command.setValidFor(365) + mlAppDeployer.commands.add(command) +} + +tasks.register("curlPeople", Exec) { + commandLine = [ + 'curl', + '--fail', + '--anyauth', '--user', 'admin:admin', + '-i', + '-X', 'POST', + '--data-binary', '@./src/main/turtle/people/people.ttl', + '-H', 'Content-type: text/turtle', + 'http://localhost:8079/v1/graphs?graph=/people' + ] +} + +tasks.register("curlCompanies", Exec) { + commandLine = [ + 'curl', + '--fail', + '--anyauth', '--user', 'admin:admin', + '-i', + '-X', 'POST', + '--data-binary', '@./src/main/turtle/companies/companies_100.ttl', + '-H', 'Content-type: text/turtle', + 'http://localhost:8079/v1/graphs?graph=/optic/sparql/test/companies.ttl' + ] +} + +mlDeploy.finalizedBy curlPeople +mlDeploy.finalizedBy curlCompanies \ No newline at end of file diff --git a/test-complete-app-mlDeploy/gradle.properties b/test-complete-app-mlDeploy/gradle.properties new file mode 100644 index 00000000..d7a78f54 --- /dev/null +++ b/test-complete-app-mlDeploy/gradle.properties @@ -0,0 +1,8 @@ +mlHost=localhost +mlUsername=admin +mlPassword=admin + +mlNoRestServer=true +mlModulesDatabaseName=nodeOpticFunctionalTestModules +mlSchemasDatabaseName=Schemas +mlRestPort=8079 \ No newline at end of file diff --git a/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.jar b/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..7f93135c Binary files /dev/null and b/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.jar differ diff --git a/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties b/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..d4081da4 --- /dev/null +++ b/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/test-complete-app-mlDeploy/gradlew b/test-complete-app-mlDeploy/gradlew new file mode 100755 index 00000000..1aa94a42 --- /dev/null +++ b/test-complete-app-mlDeploy/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# 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 +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/test-complete-app-mlDeploy/gradlew.bat b/test-complete-app-mlDeploy/gradlew.bat new file mode 100644 index 00000000..6689b85b --- /dev/null +++ b/test-complete-app-mlDeploy/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json diff --git a/test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server.json diff --git a/test-complete-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server-modules.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server-modules.json diff --git a/test-complete-app/src/main/ml-config/databases/node-client-api-rest-server.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/node-client-api-rest-server.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json diff --git a/test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json diff --git a/test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json b/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json similarity index 100% rename from test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json rename to test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml b/test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml new file mode 100644 index 00000000..d745328d --- /dev/null +++ b/test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml @@ -0,0 +1,17 @@ + + ssl-project-template + This template is used to demonstrate how ml-gradle can enable SSL for an app server + rsa + + + 0 + + US + VA + McLean + MarkLogic + Sales + nobody@marklogic.com + + + \ No newline at end of file diff --git a/test-complete-app/src/main/ml-config/security/roles/eval.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/eval.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/roles/eval.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/roles/eval.json diff --git a/test-complete-app/src/main/ml-config/security/roles/qbvuser-role.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/qbvuser-role.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/roles/qbvuser-role.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/roles/qbvuser-role.json diff --git a/test-complete-app/src/main/ml-config/security/roles/rest-evaluator.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-evaluator.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/roles/rest-evaluator.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-evaluator.json diff --git a/test-complete-app/src/main/ml-config/security/roles/tde-User.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/tde-User.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/roles/tde-User.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/roles/tde-User.json diff --git a/test-complete-app/src/main/ml-config/security/users/qbvuser.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/qbvuser.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/qbvuser.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/qbvuser.json diff --git a/test-complete-app/src/main/ml-config/security/users/rest-admin.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-admin.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/rest-admin.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-admin.json diff --git a/test-complete-app/src/main/ml-config/security/users/rest-evaluator.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-evaluator.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/rest-evaluator.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-evaluator.json diff --git a/test-complete-app/src/main/ml-config/security/users/rest-reader-optic.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader-optic.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/rest-reader-optic.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader-optic.json diff --git a/test-complete-app/src/main/ml-config/security/users/rest-reader.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/rest-reader.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader.json diff --git a/test-complete-app/src/main/ml-config/security/users/rest-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-writer.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/rest-writer.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-writer.json diff --git a/test-complete-app/src/main/ml-config/security/users/tde-user.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/tde-user.json similarity index 100% rename from test-complete-app/src/main/ml-config/security/users/tde-user.json rename to test-complete-app-mlDeploy/src/main/ml-config/security/users/tde-user.json diff --git a/test-complete-app/src/main/ml-config/servers/dmsdk-api-rest-server.json b/test-complete-app-mlDeploy/src/main/ml-config/servers/dmsdk-api-rest-server.json similarity index 100% rename from test-complete-app/src/main/ml-config/servers/dmsdk-api-rest-server.json rename to test-complete-app-mlDeploy/src/main/ml-config/servers/dmsdk-api-rest-server.json diff --git a/test-complete-app/src/main/ml-config/servers/node-client-api-rest-server.json b/test-complete-app-mlDeploy/src/main/ml-config/servers/node-client-api-rest-server.json similarity index 100% rename from test-complete-app/src/main/ml-config/servers/node-client-api-rest-server.json rename to test-complete-app-mlDeploy/src/main/ml-config/servers/node-client-api-rest-server.json diff --git a/test-complete-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json b/test-complete-app-mlDeploy/src/main/ml-config/servers/nodeOpticFunctionalTest.json similarity index 100% rename from test-complete-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json rename to test-complete-app-mlDeploy/src/main/ml-config/servers/nodeOpticFunctionalTest.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json b/test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json new file mode 100644 index 00000000..47819895 --- /dev/null +++ b/test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json @@ -0,0 +1,14 @@ +{ + "server-name": "node-client-api-ssl-server", + "port": 8016, + "server-type": "http", + "root": "/", + "content-database": "node-client-api-rest-server", + "modules-database": "node-client-api-rest-server-modules", + "default-error-format": "json", + "error-handler": "/MarkLogic/rest-api/error-handler.xqy", + "url-rewriter": "/MarkLogic/rest-api/rewriter.xml", + "rewrite-resolves-globally": true, + "authentication": "digestbasic", + "ssl-certificate-template": "ssl-project-template" +} \ No newline at end of file diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city1.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city1.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/city1.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city1.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city2.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city2.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/city2.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city2.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city3.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city3.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/city3.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city3.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city4.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city4.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/city4.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city4.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/city5.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city5.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/city5.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city5.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/collections.properties b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/collections.properties similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/collections.properties rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/collections.properties diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc1.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc1.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/doc1.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc1.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc2.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc2.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/doc2.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc2.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc3.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc3.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/doc3.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc3.json diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc4.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc4.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/doc4.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc4.xml diff --git a/test-complete-app/src/main/ml-data/optic/lexicon/test/doc5.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc5.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/lexicon/test/doc5.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc5.xml diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/collections.properties b/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/collections.properties similarity index 100% rename from test-complete-app/src/main/ml-data/optic/plan/test/collections.properties rename to test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/collections.properties diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/planLexicons.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planLexicons.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/plan/test/planLexicons.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planLexicons.json diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/planTriples.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planTriples.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/plan/test/planTriples.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planTriples.json diff --git a/test-complete-app/src/main/ml-data/optic/plan/test/planViews.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planViews.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/plan/test/planViews.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planViews.json diff --git a/test-complete-app/src/main/ml-data/optic/sparql/test/collections.properties b/test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/collections.properties similarity index 100% rename from test-complete-app/src/main/ml-data/optic/sparql/test/collections.properties rename to test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/collections.properties diff --git a/test-complete-app/src/main/ml-data/optic/sparql/test/dedupdoc1.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/dedupdoc1.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/sparql/test/dedupdoc1.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/dedupdoc1.xml diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/collections.properties b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/collections.properties similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/collections.properties rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/collections.properties diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/playerTripleSet.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/playerTripleSet.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/playerTripleSet.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/playerTripleSet.xml diff --git a/test-complete-app/src/main/ml-data/optic/triple/test/teamTripleSet.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/teamTripleSet.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/triple/test/teamTripleSet.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/teamTripleSet.xml diff --git a/test-complete-app/src/main/ml-data/optic/view/test/collections.properties b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/collections.properties similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/collections.properties rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/collections.properties diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail.xml b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail.xml similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/masterDetail.xml rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail.xml diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail2.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail2.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/masterDetail2.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail2.json diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail3.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail3.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/masterDetail3.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail3.json diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail4.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail4.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/masterDetail4.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail4.json diff --git a/test-complete-app/src/main/ml-data/optic/view/test/masterDetail5.json b/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail5.json similarity index 100% rename from test-complete-app/src/main/ml-data/optic/view/test/masterDetail5.json rename to test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail5.json diff --git a/test-complete-app/src/main/ml-modules/root/optic/test/mapperReducer.sjs b/test-complete-app-mlDeploy/src/main/ml-modules/root/optic/test/mapperReducer.sjs similarity index 100% rename from test-complete-app/src/main/ml-modules/root/optic/test/mapperReducer.sjs rename to test-complete-app-mlDeploy/src/main/ml-modules/root/optic/test/mapperReducer.sjs diff --git a/test-complete-app/src/main/ml-schemas/permissions.properties b/test-complete-app-mlDeploy/src/main/ml-schemas/permissions.properties similarity index 100% rename from test-complete-app/src/main/ml-schemas/permissions.properties rename to test-complete-app-mlDeploy/src/main/ml-schemas/permissions.properties diff --git a/test-complete-app/src/main/ml-schemas/tde/exportingRows.tdex b/test-complete-app-mlDeploy/src/main/ml-schemas/tde/exportingRows.tdex similarity index 100% rename from test-complete-app/src/main/ml-schemas/tde/exportingRows.tdex rename to test-complete-app-mlDeploy/src/main/ml-schemas/tde/exportingRows.tdex diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail.tdex b/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail.tdex similarity index 100% rename from test-complete-app/src/main/ml-schemas/tde/masterDetail.tdex rename to test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail.tdex diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail2.tdej b/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail2.tdej similarity index 100% rename from test-complete-app/src/main/ml-schemas/tde/masterDetail2.tdej rename to test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail2.tdej diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail3.tdej b/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail3.tdej similarity index 100% rename from test-complete-app/src/main/ml-schemas/tde/masterDetail3.tdej rename to test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail3.tdej diff --git a/test-complete-app/src/main/ml-schemas/tde/masterDetail4.tdej b/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail4.tdej similarity index 100% rename from test-complete-app/src/main/ml-schemas/tde/masterDetail4.tdej rename to test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail4.tdej diff --git a/test-complete-app/src/main/turtle/companies/companies_100.ttl b/test-complete-app-mlDeploy/src/main/turtle/companies/companies_100.ttl similarity index 100% rename from test-complete-app/src/main/turtle/companies/companies_100.ttl rename to test-complete-app-mlDeploy/src/main/turtle/companies/companies_100.ttl diff --git a/test-complete-app/src/main/turtle/people/people.ttl b/test-complete-app-mlDeploy/src/main/turtle/people/people.ttl similarity index 100% rename from test-complete-app/src/main/turtle/people/people.ttl rename to test-complete-app-mlDeploy/src/main/turtle/people/people.ttl diff --git a/test-complete-app/build.gradle b/test-complete-app/build.gradle index 02823118..9b3e099a 100644 --- a/test-complete-app/build.gradle +++ b/test-complete-app/build.gradle @@ -18,32 +18,3 @@ ext { command.setValidFor(365) mlAppDeployer.commands.add(command) } - -tasks.register("curlPeople", Exec) { - commandLine = [ - 'curl', - '--fail', - '--anyauth', '--user', 'admin:admin', - '-i', - '-X', 'POST', - '--data-binary', '@./src/main/turtle/people/people.ttl', - '-H', 'Content-type: text/turtle', - 'http://localhost:8079/v1/graphs?graph=/people' - ] -} - -tasks.register("curlCompanies", Exec) { - commandLine = [ - 'curl', - '--fail', - '--anyauth', '--user', 'admin:admin', - '-i', - '-X', 'POST', - '--data-binary', '@./src/main/turtle/companies/companies_100.ttl', - '-H', 'Content-type: text/turtle', - 'http://localhost:8079/v1/graphs?graph=/optic/sparql/test/companies.ttl' - ] -} - -mlDeploy.finalizedBy curlPeople -mlDeploy.finalizedBy curlCompanies \ No newline at end of file diff --git a/test-complete-app/gradle.properties b/test-complete-app/gradle.properties index d7a78f54..3d61cb0a 100644 --- a/test-complete-app/gradle.properties +++ b/test-complete-app/gradle.properties @@ -3,6 +3,3 @@ mlUsername=admin mlPassword=admin mlNoRestServer=true -mlModulesDatabaseName=nodeOpticFunctionalTestModules -mlSchemasDatabaseName=Schemas -mlRestPort=8079 \ No newline at end of file diff --git a/test-complete/nodejs-optic-generate-views.js b/test-complete/nodejs-optic-generate-views.js index b597689b..fd1a3637 100644 --- a/test-complete/nodejs-optic-generate-views.js +++ b/test-complete/nodejs-optic-generate-views.js @@ -27,8 +27,8 @@ const db = marklogic.createDatabaseClient( // Client to query schema database to verify view is stored // Make sure you have qbvuser user created. See XQuery script nodejs-optic-setup.xml of internal repo (SVN). -var dbSchemasClient = marklogic.createDatabaseClient({ - database: 'Schemas', +var dbModClient = marklogic.createDatabaseClient({ + database: dbName + 'Modules', host: connectdef.host, port: connectdef.port, user: 'qbvuser', @@ -76,14 +76,14 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'InnerJoin', 'keymatch') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbSchemasClient.documents.write({ + dbModClient.documents.write({ uri: '/qbv-InnerJoin-keymatch.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml', content: res }). result(function (response) { - setTimeout(()=> done(), 10120); + setTimeout(()=> done(), 10120); }); }).catch(error=>done(error)); }); @@ -96,9 +96,9 @@ describe('Nodejs Optic generate views test', function () { .then(function (output) { //console.log(JSON.stringify(output, null, 2)); expect(output.rows.length).to.equal(6); - var row0 = output.rows[0]; - var row3 = output.rows[3]; - var row5 = output.rows[5]; + var row0 = output.rows[0]; + var row3 = output.rows[3]; + var row5 = output.rows[5]; expect(row0['InnerJoin.keymatch.amount'].value).to.equal(60.06); expect(row0['InnerJoin.keymatch.color'].value).to.equal('green'); @@ -130,7 +130,7 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'sparql', 'groupmin') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbSchemasClient.documents.write({ + dbModClient.documents.write({ uri: '/qbv-sparql-groupmin.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml', @@ -187,7 +187,7 @@ describe('Nodejs Optic generate views test', function () { dbClient.rows.generateView(plan, 'lexicons', 'orderbyselect') .then(function (res) { //console.log(JSON.stringify(res, null, 2)); - dbSchemasClient.documents.write({ + dbModClient.documents.write({ uri: '/qbv-lexicons-orderby-select.xml', collections: 'http://marklogic.com/xdmp/qbv', contentType: 'application/xml',