diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df634233..82d9dfcf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,6 +32,7 @@ While still in the test-app directory run the following gradle command. cd test-app ./gradlew -i mlDeploy + ./gradlew -i -Penv=e2e mlLoadData mlLoadModules Once the deploy has completed successfully, use "cd .." to return to the root directory of the project. diff --git a/Jenkinsfile b/Jenkinsfile index 98f75156..45939b37 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ def runTests() { ./gradlew -i mlWaitTillReady ./gradlew -i mlTestConnections ./gradlew -i mlDeploy + ./gradlew -i -Penv=e2e mlLoadData mlLoadModules cd .. rm -rf $WORKSPACE/*.xml || true @@ -70,19 +71,12 @@ def runLint() { def runE2ETests() { sh label: 'run-e2e-tests', script: ''' - export JAVA_HOME=$JAVA_HOME_DIR - export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR - export PATH=$JAVA_HOME/bin:${NODE_HOME_DIR}/bin:$PATH + export PATH=${NODE_HOME_DIR}/bin:$PATH cd node-client-api node --version npm --version npm ci - cd test-complete-app-mlDeploy - echo "Deploying from test-complete-app-mlDeploy" - ./gradlew -i mlDeploy - cd .. - echo "Running test-complete tests" ./node_modules/.bin/mocha --no-parallel -R xunit --timeout 60000 test-complete/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-complete-results.xml || true echo "Done with test-complete tests" diff --git a/test-app/build.gradle b/test-app/build.gradle index 33fe6fbb..8c9e2afd 100644 --- a/test-app/build.gradle +++ b/test-app/build.gradle @@ -12,7 +12,7 @@ buildscript { } plugins { - id "net.saliman.properties" version "1.5.2" + id "net.saliman.properties" version "1.6.0" } apply plugin: "com.marklogic.ml-gradle" @@ -46,3 +46,32 @@ 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 diff --git a/test-app/gradle-e2e.properties b/test-app/gradle-e2e.properties new file mode 100644 index 00000000..fd2ac4ff --- /dev/null +++ b/test-app/gradle-e2e.properties @@ -0,0 +1,8 @@ +# Defines properties for loading data and modules for the so-called "e2e" tests in "test-complete". +mlDataPaths=src/main/ml-e2e-data +mlModulePaths=src/main/ml-e2e-modules + +mlDataDatabaseName=nodeOpticFunctionalTest +mlModulesDatabaseName=nodeOpticFunctionalTestModules + +mlNoRestServer=true diff --git a/test-app/gradle.properties b/test-app/gradle.properties index 3a31f809..c2ae282d 100644 --- a/test-app/gradle.properties +++ b/test-app/gradle.properties @@ -1,7 +1,10 @@ +# See https://github.com/stevesaliman/gradle-properties-plugin +propertiesPluginEnvironmentNameProperty=env + mlAppName=unittest-nodeapi mlContentDatabaseName=unittest-nodeapi mlHost=localhost mlUsername=admin mlPassword=admin mlRestPort=8015 -mlContentForestsPerHost=3 \ No newline at end of file +mlContentForestsPerHost=3 diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/permissions.properties b/test-app/src/main/ml-config/databases/Schemas/schemas/permissions.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/permissions.properties rename to test-app/src/main/ml-config/databases/Schemas/schemas/permissions.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/tde/exportingRows.tdex b/test-app/src/main/ml-config/databases/Schemas/schemas/tde/exportingRows.tdex similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/tde/exportingRows.tdex rename to test-app/src/main/ml-config/databases/Schemas/schemas/tde/exportingRows.tdex diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail.tdex b/test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail.tdex similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail.tdex rename to test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail.tdex diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail2.tdej b/test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail2.tdej similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail2.tdej rename to test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail2.tdej diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail3.tdej b/test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail3.tdej similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail3.tdej rename to test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail3.tdej diff --git a/test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail4.tdej b/test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail4.tdej similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-schemas/tde/masterDetail4.tdej rename to test-app/src/main/ml-config/databases/Schemas/schemas/tde/masterDetail4.tdej diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json b/test-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json rename to test-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server.json b/test-app/src/main/ml-config/databases/dmsdk-api-rest-server.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/dmsdk-api-rest-server.json rename to test-app/src/main/ml-config/databases/dmsdk-api-rest-server.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server-modules.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server-modules.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-system-axis.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/axes/temporal-valid-axis.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporal-collection.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json b/test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json rename to test-app/src/main/ml-config/databases/node-client-api-rest-server/temporal/collections/temporalCollectionLsqt.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json b/test-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTest.json rename to test-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json b/test-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json rename to test-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/servers/dmsdk-api-rest-server.json b/test-app/src/main/ml-config/servers/dmsdk-api-rest-server.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/servers/dmsdk-api-rest-server.json rename to test-app/src/main/ml-config/servers/dmsdk-api-rest-server.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/servers/node-client-api-rest-server.json b/test-app/src/main/ml-config/servers/node-client-api-rest-server.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/servers/node-client-api-rest-server.json rename to test-app/src/main/ml-config/servers/node-client-api-rest-server.json diff --git a/test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json b/test-app/src/main/ml-config/servers/node-client-api-ssl-server.json similarity index 88% rename from test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json rename to test-app/src/main/ml-config/servers/node-client-api-ssl-server.json index 47819895..69f230b3 100644 --- a/test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json +++ b/test-app/src/main/ml-config/servers/node-client-api-ssl-server.json @@ -10,5 +10,5 @@ "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 + "ssl-certificate-template": "node-client-ssl-template" +} diff --git a/test-complete-app-mlDeploy/src/main/ml-config/servers/nodeOpticFunctionalTest.json b/test-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-config/servers/nodeOpticFunctionalTest.json rename to test-app/src/main/ml-config/servers/nodeOpticFunctionalTest.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city1.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/city1.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city1.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/city1.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city2.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/city2.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city2.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/city2.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city3.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/city3.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city3.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/city3.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city4.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/city4.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city4.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/city4.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city5.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/city5.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/city5.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/city5.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/collections.properties b/test-app/src/main/ml-e2e-data/optic/lexicon/test/collections.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/collections.properties rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/collections.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc1.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/doc1.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc1.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/doc1.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc2.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/doc2.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc2.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/doc2.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc3.json b/test-app/src/main/ml-e2e-data/optic/lexicon/test/doc3.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc3.json rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/doc3.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc4.xml b/test-app/src/main/ml-e2e-data/optic/lexicon/test/doc4.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc4.xml rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/doc4.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc5.xml b/test-app/src/main/ml-e2e-data/optic/lexicon/test/doc5.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/lexicon/test/doc5.xml rename to test-app/src/main/ml-e2e-data/optic/lexicon/test/doc5.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/collections.properties b/test-app/src/main/ml-e2e-data/optic/plan/test/collections.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/collections.properties rename to test-app/src/main/ml-e2e-data/optic/plan/test/collections.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planLexicons.json b/test-app/src/main/ml-e2e-data/optic/plan/test/planLexicons.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planLexicons.json rename to test-app/src/main/ml-e2e-data/optic/plan/test/planLexicons.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planTriples.json b/test-app/src/main/ml-e2e-data/optic/plan/test/planTriples.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planTriples.json rename to test-app/src/main/ml-e2e-data/optic/plan/test/planTriples.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planViews.json b/test-app/src/main/ml-e2e-data/optic/plan/test/planViews.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/plan/test/planViews.json rename to test-app/src/main/ml-e2e-data/optic/plan/test/planViews.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/collections.properties b/test-app/src/main/ml-e2e-data/optic/sparql/test/collections.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/collections.properties rename to test-app/src/main/ml-e2e-data/optic/sparql/test/collections.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/dedupdoc1.xml b/test-app/src/main/ml-e2e-data/optic/sparql/test/dedupdoc1.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/sparql/test/dedupdoc1.xml rename to test-app/src/main/ml-e2e-data/optic/sparql/test/dedupdoc1.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/collections.properties b/test-app/src/main/ml-e2e-data/optic/triple/test/collections.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/collections.properties rename to test-app/src/main/ml-e2e-data/optic/triple/test/collections.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml b/test-app/src/main/ml-e2e-data/optic/triple/test/duplicatePlayerTripleSet.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicatePlayerTripleSet.xml rename to test-app/src/main/ml-e2e-data/optic/triple/test/duplicatePlayerTripleSet.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml b/test-app/src/main/ml-e2e-data/optic/triple/test/duplicateTeamTripleSet.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/duplicateTeamTripleSet.xml rename to test-app/src/main/ml-e2e-data/optic/triple/test/duplicateTeamTripleSet.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml b/test-app/src/main/ml-e2e-data/optic/triple/test/otherPlayerTripleSet.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/otherPlayerTripleSet.xml rename to test-app/src/main/ml-e2e-data/optic/triple/test/otherPlayerTripleSet.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/playerTripleSet.xml b/test-app/src/main/ml-e2e-data/optic/triple/test/playerTripleSet.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/playerTripleSet.xml rename to test-app/src/main/ml-e2e-data/optic/triple/test/playerTripleSet.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/teamTripleSet.xml b/test-app/src/main/ml-e2e-data/optic/triple/test/teamTripleSet.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/triple/test/teamTripleSet.xml rename to test-app/src/main/ml-e2e-data/optic/triple/test/teamTripleSet.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/collections.properties b/test-app/src/main/ml-e2e-data/optic/view/test/collections.properties similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/collections.properties rename to test-app/src/main/ml-e2e-data/optic/view/test/collections.properties diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail.xml b/test-app/src/main/ml-e2e-data/optic/view/test/masterDetail.xml similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail.xml rename to test-app/src/main/ml-e2e-data/optic/view/test/masterDetail.xml diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail2.json b/test-app/src/main/ml-e2e-data/optic/view/test/masterDetail2.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail2.json rename to test-app/src/main/ml-e2e-data/optic/view/test/masterDetail2.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail3.json b/test-app/src/main/ml-e2e-data/optic/view/test/masterDetail3.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail3.json rename to test-app/src/main/ml-e2e-data/optic/view/test/masterDetail3.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail4.json b/test-app/src/main/ml-e2e-data/optic/view/test/masterDetail4.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail4.json rename to test-app/src/main/ml-e2e-data/optic/view/test/masterDetail4.json diff --git a/test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail5.json b/test-app/src/main/ml-e2e-data/optic/view/test/masterDetail5.json similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-data/optic/view/test/masterDetail5.json rename to test-app/src/main/ml-e2e-data/optic/view/test/masterDetail5.json diff --git a/test-complete-app-mlDeploy/src/main/ml-modules/root/optic/test/mapperReducer.sjs b/test-app/src/main/ml-e2e-modules/root/optic/test/mapperReducer.sjs similarity index 100% rename from test-complete-app-mlDeploy/src/main/ml-modules/root/optic/test/mapperReducer.sjs rename to test-app/src/main/ml-e2e-modules/root/optic/test/mapperReducer.sjs diff --git a/test-complete-app-mlDeploy/src/main/turtle/companies/companies_100.ttl b/test-app/src/main/turtle/companies/companies_100.ttl similarity index 100% rename from test-complete-app-mlDeploy/src/main/turtle/companies/companies_100.ttl rename to test-app/src/main/turtle/companies/companies_100.ttl diff --git a/test-complete-app-mlDeploy/src/main/turtle/people/people.ttl b/test-app/src/main/turtle/people/people.ttl similarity index 100% rename from test-complete-app-mlDeploy/src/main/turtle/people/people.ttl rename to test-app/src/main/turtle/people/people.ttl diff --git a/test-complete-app-mlDeploy/build.gradle b/test-complete-app-mlDeploy/build.gradle deleted file mode 100644 index 3fcc0516..00000000 --- a/test-complete-app-mlDeploy/build.gradle +++ /dev/null @@ -1,45 +0,0 @@ -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 diff --git a/test-complete-app-mlDeploy/gradle.properties b/test-complete-app-mlDeploy/gradle.properties deleted file mode 100644 index d7a78f54..00000000 --- a/test-complete-app-mlDeploy/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 7f93135c..00000000 Binary files a/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties b/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index d4081da4..00000000 --- a/test-complete-app-mlDeploy/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100755 index 1aa94a42..00000000 --- a/test-complete-app-mlDeploy/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/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 deleted file mode 100644 index 6689b85b..00000000 --- a/test-complete-app-mlDeploy/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@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-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 deleted file mode 100644 index d745328d..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/certificate-templates/template-1.xml +++ /dev/null @@ -1,17 +0,0 @@ - - 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-mlDeploy/src/main/ml-config/security/roles/eval.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/eval.json deleted file mode 100644 index 681dbd5b..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/eval.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "role-name": "eval", - "description": "eval role", - "role": [], - "privilege": [ - { - "privilege-name": "xdbc-eval", - "action": "http://marklogic.com/xdmp/privileges/xdbc-eval", - "kind": "execute" - }, - { - "privilege-name": "xdmp-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", - "kind": "execute" - }, - { - "privilege-name": "xdmp-invoke", - "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke", - "kind": "execute" - }, - { - "privilege-name": "xdmp-invoke-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke-in", - "kind": "execute" - }, - { - "privilege-name": "xdmp-spawn", - "action": "http://marklogic.com/xdmp/privileges/xdmp-spawn", - "kind": "execute" - }, - { - "privilege-name": "xdmp-spawn-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-spawn-in", - "kind": "execute" - } - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/qbvuser-role.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/qbvuser-role.json deleted file mode 100644 index 5cab4f0f..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/qbvuser-role.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "role-name": "qbvuser-role", - "description": "qbvuser role for test-complete tests", - "role": [ - "tde-view", - "query-view-admin", - "app-user", - "eval", - "harmonized-reader", - "rest-extension-user", - "rest-reader", - "rest-writer", - "rest-admin", - "tde-admin", - "manage-user", - "sparql-update-user" - ], - "privilege": [ - { - "privilege-name": "any-uri", - "action": "http://marklogic.com/xdmp/privileges/any-uri", - "kind": "execute" - }, - { - "privilege-name": "xdmp-eval", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval", - "kind": "execute" - }, - { - "privilege-name": "xdmp-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", - "kind": "execute" - }, - { - "privilege-name": "sem-sparql", - "action": "http://marklogic.com/xdmp/privileges/sem-sparql", - "kind": "execute" - }, - { - "privilege-name": "xdbc-eval", - "action": "http://marklogic.com/xdmp/privileges/xdbc-eval", - "kind": "execute" - }, - { - "privilege-name": "xdbc-invoke", - "action": "http://marklogic.com/xdmp/privileges/xdbc-invoke", - "kind": "execute" - }, - { - "privilege-name": "xdmp-sql", - "action": "http://marklogic.com/xdmp/privileges/xdmp-sql", - "kind": "execute" - }, - { - "privilege-name": "xdmp-http-get", - "action": "http://marklogic.com/xdmp/privileges/xdmp-http-get", - "kind": "execute" - }, - { - "privilege-name": "xdmp-http-post", - "action": "http://marklogic.com/xdmp/privileges/xdmp-http-post", - "kind": "execute" - }, - { - "privilege-name": "xdbc-invoke-in", - "action": "http://marklogic.com/xdmp/privileges/xdbc-invoke-in", - "kind": "execute" - }, - { - "privilege-name": "xdbc-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdbc-eval-in", - "kind": "execute" - } - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-evaluator.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-evaluator.json deleted file mode 100644 index 476c59cb..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-evaluator.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "role-name": "rest-evaluator", - "description": "REST writer who can eval, invoke, or set a dynamic databases", - "role": [ - "rest-writer" - ], - "privilege": [ - { - "privilege-name": "xdmp-eval", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval", - "kind": "execute" - }, - { - "privilege-name": "xdmp-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", - "kind": "execute" - }, - { - "privilege-name": "xdmp-invoke", - "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke", - "kind": "execute" - }, - { - "privilege-name": "xdbc-eval", - "action": "http://marklogic.com/xdmp/privileges/xdbc-eval", - "kind": "execute" - }, - { - "privilege-name": "xdbc-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdbc-eval-in", - "kind": "execute" - }, - { - "privilege-name": "xdbc-invoke", - "action": "http://marklogic.com/xdmp/privileges/xdbc-invoke", - "kind": "execute" - }, - { - "privilege-name": "any-uri", - "action": "http://marklogic.com/xdmp/privileges/any-uri", - "kind": "execute" - }, - { - "privilege-name": "xdmp-set-session-field", - "action": "http://marklogic.com/xdmp/privileges/xdmp-set-session-field", - "kind": "execute" - }, - { - "privilege-name": "xdmp-get-session-field", - "action": "http://marklogic.com/xdmp/privileges/xdmp-get-session-field", - "kind": "execute" - } - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json deleted file mode 100644 index a78e7c6d..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/rest-temporal-writer.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "role-name": "rest-temporal-writer", - "description": "REST writer with temporal privileges", - "role": [ - "rest-writer" - ], - "privilege": [ - { - "privilege-name": "temporal-statement-set-system-time", - "action": "http://marklogic.com/xdmp/privileges/temporal-statement-set-system-time", - "kind": "execute" - }, - { - "privilege-name": "temporal-document-protect", - "action": "http://marklogic.com/xdmp/privileges/temporal-document-protect", - "kind": "execute" - }, - { - "privilege-name": "temporal-document-wipe", - "action": "http://marklogic.com/xdmp/privileges/temporal-document-wipe", - "kind": "execute" - } - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/tde-User.json b/test-complete-app-mlDeploy/src/main/ml-config/security/roles/tde-User.json deleted file mode 100644 index c9d8fd11..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/roles/tde-User.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "role-name": "tde-User", - "description": "test user to write tde to modules database", - "role": [ - "tde-view", - "tde-admin", - "rest-writer" - ], - "privilege": [ - { - "privilege-name": "xdmp-eval-in", - "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", - "kind": "execute" - } - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/qbvuser.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/qbvuser.json deleted file mode 100644 index e90b1b21..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/qbvuser.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "qbvuser", - "description": "qbvuser for test complete tests.", - "password": "qbvuser", - "role": [ - "qbvuser-role" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-admin.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-admin.json deleted file mode 100644 index 1d61dd6f..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-admin.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "rest-admin", - "description": "rest-admin user", - "password": "x", - "role": [ - "rest-admin" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-evaluator.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-evaluator.json deleted file mode 100644 index fe89e731..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-evaluator.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "rest-evaluator", - "description": "rest-writer user with evaluate privileges", - "password": "x", - "role": [ - "rest-evaluator" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/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 deleted file mode 100644 index 6db7588e..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader-optic.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "rest-reader-optic", - "password": "x", - "description": "rest-reader user", - "role": [ - "rest-reader" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader.json deleted file mode 100644 index 7cdeed28..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-reader.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "rest-reader", - "description": "rest-reader user", - "password": "x", - "role": [ - "rest-reader" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-temporal-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-temporal-writer.json deleted file mode 100644 index aa163780..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-temporal-writer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "rest-temporal-writer", - "description": "rest-writer user with temporal privileges", - "password": "x", - "role": [ - "rest-temporal-writer" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-writer.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-writer.json deleted file mode 100644 index 340ec3ba..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/rest-writer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "user-name": "rest-writer", - "description": "rest-writer user", - "password": "x", - "role": [ - "rest-writer", - "rest-evaluator" - ] -} \ No newline at end of file diff --git a/test-complete-app-mlDeploy/src/main/ml-config/security/users/tde-user.json b/test-complete-app-mlDeploy/src/main/ml-config/security/users/tde-user.json deleted file mode 100644 index deb28d45..00000000 --- a/test-complete-app-mlDeploy/src/main/ml-config/security/users/tde-user.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user-name": "tde-user", - "description": "test user to write tde to modules database", - "password": "x", - "role": [ - "tde-User" - ] -} \ No newline at end of file