diff --git a/examples/README.md b/examples/README.md new file mode 100644 index 000000000..5ad3bffc8 --- /dev/null +++ b/examples/README.md @@ -0,0 +1,25 @@ +This directory contains example ml-gradle projects to demonstrate various features and common +deployment scenarios. + +To try a particular project, clone this repository, `cd` to the directory of the project you wish to try, +and do the following: + +1. Most of the projects default to a username and password of "admin". You can change this either by modifying the + `mlPassword` property in the `gradle.properties` file in the project, or - if the project is using the [Gradle + properties plugin](https://plugins.gradle.org/plugin/net.saliman.properties) - you can create the file + `gradle-local.properties` and set both `mlUsername` and `mlPassword` in that file. +2. If the project has any ports defined in `gradle.properties`, verify that those ports are open and available on the + machine that is running MarkLogic. +3. Most projects have the [Gradle wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html) setup, in + which case you can deploy the project to your MarkLogic instance via `./gradlew -i mlDeploy`. If the project does + not have the Gradle wrapper (you can tell by checking for a "gradlew" file in the project directory), then you'll + need to have [Gradle installed](https://gradle.org/install/). After installing Gradle, you can run `./gradle -i + mldeploy`. + +After you've deployed and examined/tested the application, you can undeploy it via: + + ./gradlew -i -Pconfirm=true mlUndeploy + +Please note that these example projects are not re-tested with every ml-gradle release. If you run into a problem with +any of them, please file an [issue with ml-gradle](https://github.com/marklogic-community/ml-gradle/wiki). + diff --git a/examples/corb2-project/build.gradle b/examples/corb2-project/build.gradle index e7115899e..9cd5051fb 100644 --- a/examples/corb2-project/build.gradle +++ b/examples/corb2-project/build.gradle @@ -21,7 +21,7 @@ buildscript { } plugins { - id "com.marklogic.ml-gradle" version "4.1.0" + id "com.marklogic.ml-gradle" version "4.4.0" } repositories { diff --git a/examples/custom-rest-rewriter-project/build.gradle b/examples/custom-rest-rewriter-project/build.gradle index 6b8d13972..b34034f9e 100644 --- a/examples/custom-rest-rewriter-project/build.gradle +++ b/examples/custom-rest-rewriter-project/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.marklogic.ml-gradle" version "3.9.0" + id "com.marklogic.ml-gradle" version "4.4.0" } task generateCustomRewriterModules { diff --git a/examples/data-services/build.gradle b/examples/data-services/build.gradle index 8b95ac950..5410a4e82 100644 --- a/examples/data-services/build.gradle +++ b/examples/data-services/build.gradle @@ -2,7 +2,7 @@ plugins { id "java" id "net.saliman.properties" version "1.5.1" id "com.marklogic.ml-gradle" version "4.4.0" - id 'com.marklogic.ml-development-tools' version '5.5.0' + id 'com.marklogic.ml-development-tools' version '6.0.0' } task generateHelloWorld(type: com.marklogic.client.tools.gradle.EndpointProxiesGenTask) { @@ -20,12 +20,12 @@ test { dependencies { implementation 'org.slf4j:slf4j-api:1.7.31' - implementation 'com.marklogic:marklogic-client-api:5.5.0' + implementation 'com.marklogic:marklogic-client-api:6.0.0' - testImplementation "org.junit.jupiter:junit-jupiter:5.7.2" + testImplementation "org.junit.jupiter:junit-jupiter:5.9.1" // Force usage of logback for logging - testImplementation "ch.qos.logback:logback-classic:1.2.4" - testImplementation "org.slf4j:jcl-over-slf4j:1.7.31" - testImplementation "org.slf4j:slf4j-api:1.7.31" + testImplementation "ch.qos.logback:logback-classic:1.3.5" + testImplementation "org.slf4j:jcl-over-slf4j:1.7.36" + testImplementation "org.slf4j:slf4j-api:1.7.36" } diff --git a/examples/dependency-project/dhf-client-project/build.gradle b/examples/dependency-project/dhf-client-project/build.gradle index d8adda2ee..49e81496a 100644 --- a/examples/dependency-project/dhf-client-project/build.gradle +++ b/examples/dependency-project/dhf-client-project/build.gradle @@ -11,7 +11,7 @@ buildscript { } plugins { - id 'net.saliman.properties' version '1.4.6' + id 'net.saliman.properties' version '1.5.1' } apply plugin: "com.marklogic.ml-data-hub" diff --git a/examples/dependency-project/ml-gradle-client-project/build.gradle b/examples/dependency-project/ml-gradle-client-project/build.gradle index 4b813d08f..aa8ef923c 100644 --- a/examples/dependency-project/ml-gradle-client-project/build.gradle +++ b/examples/dependency-project/ml-gradle-client-project/build.gradle @@ -10,7 +10,7 @@ plugins { id "net.saliman.properties" version "1.5.1" - id "com.marklogic.ml-gradle" version "4.2.0" + id "com.marklogic.ml-gradle" version "4.4.0" } //apply plugin: "com.marklogic.ml-gradle" diff --git a/examples/disconnected-project-using-plugins-and-gradlew/build.gradle b/examples/disconnected-project-using-plugins-and-gradlew/build.gradle index 301580e74..935e82322 100644 --- a/examples/disconnected-project-using-plugins-and-gradlew/build.gradle +++ b/examples/disconnected-project-using-plugins-and-gradlew/build.gradle @@ -7,7 +7,6 @@ buildscript { } else { println "Using online buildscript dependency repositories" mavenCentral() - maven { url "http://developer.marklogic.com/maven2/" } } } } @@ -26,7 +25,6 @@ repositories { } else { println "Using online dependency repositories" mavenCentral() - maven { url "http://developer.marklogic.com/maven2/" } } } @@ -35,9 +33,6 @@ configurations { } dependencies { - // sample java compile dependency. Remove if not required - compile 'com.marklogic:marklogic-xcc:10.0.7' - //sample mlcp dependency. Remove if not required mlcp "com.marklogic:mlcp:10.0.6.2" } @@ -60,9 +55,8 @@ task downloadToProjectMavenRepo(type: Copy) { /* * Include any configuration dependencies here that you want to copy the dependencies for. * These are defined in the 'dependencies' block. E.g. you need to include - * configurations.compile.files if you want your java 'compile' dependencies downloaded + * configurations.implementation.files if you want your java 'implementation' dependencies downloaded */ - configurations.compile.files //includes 'java' compile dependencies. Remove if not needed configurations.mlcp.files //includes 'mlcp' dependencies. Remove if not needed from new File(gradle.gradleUserHomeDir, 'caches/modules-2/files-2.1') // correct as of gradle 4.7 diff --git a/examples/disconnected-project-using-plugins-and-gradlew/gradle.properties b/examples/disconnected-project-using-plugins-and-gradlew/gradle.properties index 7a3613e4d..1fb0708c6 100644 --- a/examples/disconnected-project-using-plugins-and-gradlew/gradle.properties +++ b/examples/disconnected-project-using-plugins-and-gradlew/gradle.properties @@ -1,3 +1,6 @@ +mlUsername=admin +mlPassword=admin + projectMavenRepo=build/offline/maven-repo # if you change this, you need to modify gradlew and gradlew.bat also -projectGradleHome=build/gradle-home \ No newline at end of file +projectGradleHome=build/gradle-home diff --git a/examples/disconnected-project/gradle.properties b/examples/disconnected-project/gradle.properties index 9d122c8e4..259c6e30a 100644 --- a/examples/disconnected-project/gradle.properties +++ b/examples/disconnected-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleDependency=com.marklogic:ml-gradle:3.6.0 +mlGradleDependency=com.marklogic:ml-gradle:4.4.0 mlSalimanDependency=net.saliman:gradle-properties-plugin:1.4.6 mlHost=localhost diff --git a/examples/docker-projects/single-node-with-nifi/build.gradle b/examples/docker-projects/single-node-with-nifi/build.gradle index f297f1d5a..1a717b37c 100644 --- a/examples/docker-projects/single-node-with-nifi/build.gradle +++ b/examples/docker-projects/single-node-with-nifi/build.gradle @@ -1,7 +1,7 @@ plugins { // gradle -PenvironmentName=x ... - id 'net.saliman.properties' version '1.4.6' - id "com.marklogic.ml-gradle" version "3.8.2" + id 'net.saliman.properties' version '1.5.1' + id "com.marklogic.ml-gradle" version "4.4.0" id 'com.avast.gradle.docker-compose' version "0.6.11" } dockerCompose { @@ -12,7 +12,7 @@ task mlDockerSetupNode(dependsOn:composeUp) { doLast { sleep(5 * 1000) //ensure node is up exec { - commandLine 'docker', 'exec', 'node1.single', 'init-marklogic' + commandLine 'docker', 'exec', 'node1.single', 'init-marklogic' } } } @@ -30,4 +30,4 @@ task mlDockerStop(type:Exec) { task mlDockerTeardown(dependsOn:composeDown) { //remove logs directory delete 'logs' -} \ No newline at end of file +} diff --git a/examples/docker-projects/single-node-with-nifi/gradle.properties b/examples/docker-projects/single-node-with-nifi/gradle.properties index edc1e4ca7..15bfa5b43 100644 --- a/examples/docker-projects/single-node-with-nifi/gradle.properties +++ b/examples/docker-projects/single-node-with-nifi/gradle.properties @@ -1,3 +1,4 @@ mlAppName=sample-single-node-app - -mlRestPort=8003 \ No newline at end of file +mlUsername=admin +mlPassword=admin +mlRestPort=8003 diff --git a/examples/docker-projects/single-node/build.gradle b/examples/docker-projects/single-node/build.gradle index 08596ab39..203d4d299 100644 --- a/examples/docker-projects/single-node/build.gradle +++ b/examples/docker-projects/single-node/build.gradle @@ -1,7 +1,7 @@ plugins { // gradle -PenvironmentName=x ... - id 'net.saliman.properties' version '1.4.6' - id "com.marklogic.ml-gradle" version "3.8.2" + id 'net.saliman.properties' version '1.5.1' + id "com.marklogic.ml-gradle" version "4.4.0" id 'com.avast.gradle.docker-compose' version "0.6.11" } dockerCompose { @@ -12,7 +12,7 @@ task mlDockerSetupNode(dependsOn:composeUp) { doLast { sleep(5 * 1000) //ensure node is up exec { - commandLine 'docker', 'exec', 'node1.single', 'init-marklogic' + commandLine 'docker', 'exec', 'node1.single', 'init-marklogic' } } } @@ -30,4 +30,4 @@ task mlDockerStop(type:Exec) { task mlDockerTeardown(type: Delete, dependsOn:composeDown) { //remove logs directory delete 'logs' -} \ No newline at end of file +} diff --git a/examples/docker-projects/single-node/gradle.properties b/examples/docker-projects/single-node/gradle.properties index edc1e4ca7..15bfa5b43 100644 --- a/examples/docker-projects/single-node/gradle.properties +++ b/examples/docker-projects/single-node/gradle.properties @@ -1,3 +1,4 @@ mlAppName=sample-single-node-app - -mlRestPort=8003 \ No newline at end of file +mlUsername=admin +mlPassword=admin +mlRestPort=8003 diff --git a/examples/docker-projects/three-node-cluster-with-ha-proxy/build.gradle b/examples/docker-projects/three-node-cluster-with-ha-proxy/build.gradle index 3bd84ff1d..7fede31de 100644 --- a/examples/docker-projects/three-node-cluster-with-ha-proxy/build.gradle +++ b/examples/docker-projects/three-node-cluster-with-ha-proxy/build.gradle @@ -1,7 +1,6 @@ plugins { - // gradle -PenvironmentName=x ... - id 'net.saliman.properties' version '1.4.6' - id "com.marklogic.ml-gradle" version "3.8.2" + id 'net.saliman.properties' version '1.5.1' + id "com.marklogic.ml-gradle" version "4.4.0" id 'com.avast.gradle.docker-compose' version "0.6.11" } dockerCompose { @@ -37,4 +36,4 @@ task mlDockerStop(type:Exec) { task mlDockerTeardown(dependsOn:composeDown) { //remove logs directory delete 'logs' -} \ No newline at end of file +} diff --git a/examples/docker-projects/three-node-cluster-with-ha-proxy/gradle.properties b/examples/docker-projects/three-node-cluster-with-ha-proxy/gradle.properties index 42bab2a59..6bd4dd055 100644 --- a/examples/docker-projects/three-node-cluster-with-ha-proxy/gradle.properties +++ b/examples/docker-projects/three-node-cluster-with-ha-proxy/gradle.properties @@ -1,8 +1,10 @@ mlAppName=sample-cluster-app +mlUsername=admin +mlPassword=admin mlRestPort=8003 # mapped ports for node1 mlManagePort=18002 mlAdminPort=18001 -mlAppServicesPort=18000 \ No newline at end of file +mlAppServicesPort=18000 diff --git a/examples/entity-services-project/build.gradle b/examples/entity-services-project/build.gradle index 01f47da2a..203edd7d1 100644 --- a/examples/entity-services-project/build.gradle +++ b/examples/entity-services-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } diff --git a/examples/external-security/build.gradle b/examples/external-security/build.gradle index 5753e15fc..203edd7d1 100644 --- a/examples/external-security/build.gradle +++ b/examples/external-security/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" -} \ No newline at end of file + id "com.marklogic.ml-gradle" version "4.4.0" +} diff --git a/examples/failover-project/build.gradle b/examples/failover-project/build.gradle index 01f47da2a..203edd7d1 100644 --- a/examples/failover-project/build.gradle +++ b/examples/failover-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } diff --git a/examples/flexrep-project/build.gradle b/examples/flexrep-project/build.gradle index f78663434..0b019000d 100644 --- a/examples/flexrep-project/build.gradle +++ b/examples/flexrep-project/build.gradle @@ -11,7 +11,7 @@ */ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } ext { diff --git a/examples/flexrep-with-path-project/build.gradle b/examples/flexrep-with-path-project/build.gradle index 4dc5aa285..c051bf18e 100644 --- a/examples/flexrep-with-path-project/build.gradle +++ b/examples/flexrep-with-path-project/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "com.marklogic:ml-gradle:3.6.0" + classpath "com.marklogic:ml-gradle:4.4.0" } } diff --git a/examples/httpbuilder-project/build.gradle b/examples/httpbuilder-project/build.gradle index 7f1125dc4..be51054b3 100644 --- a/examples/httpbuilder-project/build.gradle +++ b/examples/httpbuilder-project/build.gradle @@ -5,7 +5,7 @@ buildscript { } plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } /* diff --git a/examples/ignore-resources-project/build.gradle b/examples/ignore-resources-project/build.gradle index 24dcf3192..01942a77d 100644 --- a/examples/ignore-resources-project/build.gradle +++ b/examples/ignore-resources-project/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } ext { diff --git a/examples/ignore-resources-project/gradle.properties b/examples/ignore-resources-project/gradle.properties index 33849a51c..a631ae79f 100644 --- a/examples/ignore-resources-project/gradle.properties +++ b/examples/ignore-resources-project/gradle.properties @@ -1,4 +1,7 @@ +mlUsername=admin +mlPassword=admin + # Specify multiple filenames by delimiting them with commas, e.g. role-2.json,user-1.xml. # Remember that these filenames are ignored by all commands, so be careful if you have different resources with the # same filename (should be rare and easily avoided). -mlResourceFilenamesToIgnore=role-2.json \ No newline at end of file +mlResourceFilenamesToIgnore=role-2.json diff --git a/examples/jdbc-project/build.gradle b/examples/jdbc-project/build.gradle index e651dede1..d832efcc9 100644 --- a/examples/jdbc-project/build.gradle +++ b/examples/jdbc-project/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" id "java" } @@ -8,14 +8,14 @@ repositories { } dependencies { - compile "org.springframework:spring-jdbc:5.0.1.RELEASE" + implementation "org.springframework:spring-jdbc:5.0.1.RELEASE" /** * 42.1.4 is the latest version that works. * Any query using 42.2.0 results in an error of "The server's DateStyle parameter was changed to ISO. The * JDBC driver requires DateStyle to begin with ISO for correct operation." */ - runtime "org.postgresql:postgresql:42.1.4" + implementation "org.postgresql:postgresql:42.1.4" } task selectFromSysTables(type: JavaExec) { diff --git a/examples/jsdoc-project/gradle.properties b/examples/jsdoc-project/gradle.properties index 498e6e344..9b0d25ea7 100644 --- a/examples/jsdoc-project/gradle.properties +++ b/examples/jsdoc-project/gradle.properties @@ -3,3 +3,6 @@ platform=win bitMode=64 extension=zip + +mlUsername=admin +mlPassword=admin diff --git a/examples/maven-project/build.gradle b/examples/maven-project/build.gradle index 01f47da2a..203edd7d1 100644 --- a/examples/maven-project/build.gradle +++ b/examples/maven-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } diff --git a/examples/mimetypes-project/build.gradle b/examples/mimetypes-project/build.gradle index 16281dfb0..da906b584 100644 --- a/examples/mimetypes-project/build.gradle +++ b/examples/mimetypes-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } diff --git a/examples/mimetypes-project/gradle.properties b/examples/mimetypes-project/gradle.properties new file mode 100644 index 000000000..d380d2159 --- /dev/null +++ b/examples/mimetypes-project/gradle.properties @@ -0,0 +1,2 @@ +mlUsername=admin +mlPassword=admin diff --git a/examples/minimal-project/build.gradle b/examples/minimal-project/build.gradle index 47af80058..04b60d723 100644 --- a/examples/minimal-project/build.gradle +++ b/examples/minimal-project/build.gradle @@ -7,5 +7,5 @@ */ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } diff --git a/examples/minimal-project/gradle.properties b/examples/minimal-project/gradle.properties new file mode 100644 index 000000000..d380d2159 --- /dev/null +++ b/examples/minimal-project/gradle.properties @@ -0,0 +1,2 @@ +mlUsername=admin +mlPassword=admin diff --git a/examples/no-appservers-project/README.md b/examples/no-appservers-project/README.md index 47039c9ad..ec1a70ff2 100644 --- a/examples/no-appservers-project/README.md +++ b/examples/no-appservers-project/README.md @@ -1 +1,5 @@ -This project shows an example of modifying mlDeploy so that no REST API server is created by default. +This project shows an example of deploying an app without ml-gradle creating a REST API server by default via the +following property: + + mlNoRestServer=true + diff --git a/examples/no-appservers-project/build.gradle b/examples/no-appservers-project/build.gradle index 6eeb396cd..da906b584 100644 --- a/examples/no-appservers-project/build.gradle +++ b/examples/no-appservers-project/build.gradle @@ -1,22 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" -} - -ext { - /** - * ml-gradle's Gradle plugin class - MarkLogicPlugin - populates the mlAppDeployer instance with a set of - * commands. You are free to manipulate the list of commands as you see it. This is an example of removing - * the command for deploying a REST API server, which will result in mlDeploy not creating a REST API server - * by default. - */ - mlAppDeployer.getCommands().remove(mlAppDeployer.getCommand("DeployRestApiServersCommand")) - - /** - * If you don't want a default REST API server, odds are you don't want the other thing that mlDeploy will create - * by default, which is a triggers database. There's not yet a Gradle property for this, so we have to manipulate the - * mlAppConfig instance directly. - */ - mlAppConfig { - createTriggersDatabase = false - } + id "com.marklogic.ml-gradle" version "4.4.0" } diff --git a/examples/no-appservers-project/gradle.properties b/examples/no-appservers-project/gradle.properties new file mode 100644 index 000000000..abec08677 --- /dev/null +++ b/examples/no-appservers-project/gradle.properties @@ -0,0 +1,3 @@ +mlUsername=admin +mlPassword=admin +mlNoRestServer=true diff --git a/examples/partition-project/gradle.properties b/examples/partition-project/gradle.properties index 83e6177a8..aaeea23df 100644 --- a/examples/partition-project/gradle.properties +++ b/examples/partition-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleVersion=3.17.0 +mlGradleVersion=4.4.0 mlHost=localhost mlAppName=partition-example diff --git a/examples/properties-project/build.gradle b/examples/properties-project/build.gradle index b1821061d..7f01a9bfb 100644 --- a/examples/properties-project/build.gradle +++ b/examples/properties-project/build.gradle @@ -3,7 +3,7 @@ plugins { // processing the gradle-(environmentName).properties files. id "net.saliman.properties" version "1.4.6" - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } task printHost { diff --git a/examples/role-project/build.gradle b/examples/role-project/build.gradle index 01f47da2a..203edd7d1 100644 --- a/examples/role-project/build.gradle +++ b/examples/role-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } diff --git a/examples/role-project/gradle.properties b/examples/role-project/gradle.properties new file mode 100644 index 000000000..d380d2159 --- /dev/null +++ b/examples/role-project/gradle.properties @@ -0,0 +1,2 @@ +mlUsername=admin +mlPassword=admin diff --git a/examples/shell-project/README.md b/examples/shell-project/README.md deleted file mode 100644 index 169c5b935..000000000 --- a/examples/shell-project/README.md +++ /dev/null @@ -1,22 +0,0 @@ -The Gradle build file in this project shows the things you need in order to run groovysh with -some MarkLogic support built in: - -1. The latest ml-gradle plugin (at the time of this writing, most likely 2.6.0+) -1. The java plugin, so that mlShell can have a classpath set on it -1. The jcenter repository, which hosts ml-groovysh -1. The latest ml-groovysh dependency -1. And then mlShell's classpath should be set to the Java runtime classpath - -You can accomplish some of the above configuration via a custom configuration in Gradle, but the -above approach should be the simplest one. - -Once the above is setup, you can run the shell (after running mlDeploy to deploy the test application) -with the following command: - - gradle --no-daemon mlShell - -To run the shell and watch for new/modified modules: - - gradle --no-daemon mlShell -PmlShellWatchModules=true - - diff --git a/examples/shell-project/build.gradle b/examples/shell-project/build.gradle deleted file mode 100644 index d627e80f9..000000000 --- a/examples/shell-project/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -plugins { - id "com.marklogic.ml-gradle" version "4.2.0" -} - -repositories { - // Needed for ml-groovysh - jcenter() - - mavenCentral() - mavenLocal() -} - -dependencies { - // Brings in a tiny Main program that ShellTask uses - implementation "com.marklogic:ml-groovysh:0.1.4" - - // Provides the "guts" needed by ShellTask; can pick any version you want, as ml-groovysh does not - // specify a dependency on ml-app-deployer - implementation "com.marklogic:ml-app-deployer:4.2.0" -} - -mlShell.classpath = sourceSets.main.runtimeClasspath - diff --git a/examples/shell-project/gradle.properties b/examples/shell-project/gradle.properties deleted file mode 100644 index c619ec619..000000000 --- a/examples/shell-project/gradle.properties +++ /dev/null @@ -1,10 +0,0 @@ -mlAppName=shell - -mlHost=localhost -mlRestPort=8078 -mlUsername=admin -mlPassword=admin -mlContentForestsPerHost=1 - -# Set this to true in order for mlShell to perform the same behavior as mlWatch -mlShellWatchModules=true diff --git a/examples/shell-project/gradle/wrapper/gradle-wrapper.jar b/examples/shell-project/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 5059212ab..000000000 Binary files a/examples/shell-project/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/examples/shell-project/gradle/wrapper/gradle-wrapper.properties b/examples/shell-project/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 1b9d0fa29..000000000 --- a/examples/shell-project/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Mon Oct 30 21:26:14 EDT 2017 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip diff --git a/examples/shell-project/gradlew b/examples/shell-project/gradlew deleted file mode 100755 index 4453ccea3..000000000 --- a/examples/shell-project/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# 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 - ;; - 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" - which java >/dev/null 2>&1 || 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 - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save ( ) { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/examples/shell-project/gradlew.bat b/examples/shell-project/gradlew.bat deleted file mode 100644 index f9553162f..000000000 --- a/examples/shell-project/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@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= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/examples/shell-project/src/main/ml-modules/ext/test.xqy b/examples/shell-project/src/main/ml-modules/ext/test.xqy deleted file mode 100644 index 1f5e6d3c0..000000000 --- a/examples/shell-project/src/main/ml-modules/ext/test.xqy +++ /dev/null @@ -1,3 +0,0 @@ -(: This is included just for testing loading modules from the shell :) -let $test := () -return $test diff --git a/examples/shell-project/src/main/resources/logback.xml b/examples/shell-project/src/main/resources/logback.xml deleted file mode 100644 index ff5dabe44..000000000 --- a/examples/shell-project/src/main/resources/logback.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/ssl-2way-project/build.gradle b/examples/ssl-2way-project/build.gradle index da4fdcb0a..a3ed051c8 100644 --- a/examples/ssl-2way-project/build.gradle +++ b/examples/ssl-2way-project/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.marklogic.ml-gradle" version "3.2.1" + id "com.marklogic.ml-gradle" version "4.4.0" } diff --git a/examples/temporal-lsqt-project/build.gradle b/examples/temporal-lsqt-project/build.gradle index 01f47da2a..203edd7d1 100644 --- a/examples/temporal-lsqt-project/build.gradle +++ b/examples/temporal-lsqt-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } diff --git a/examples/temporal-project/build.gradle b/examples/temporal-project/build.gradle index 01f47da2a..203edd7d1 100644 --- a/examples/temporal-project/build.gradle +++ b/examples/temporal-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } diff --git a/examples/uni-temporal-project/build.gradle b/examples/uni-temporal-project/build.gradle index 16281dfb0..da906b584 100644 --- a/examples/uni-temporal-project/build.gradle +++ b/examples/uni-temporal-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } diff --git a/examples/use-modulesdb-project/build.gradle b/examples/use-modulesdb-project/build.gradle index 5987f5386..caa9a8e9d 100644 --- a/examples/use-modulesdb-project/build.gradle +++ b/examples/use-modulesdb-project/build.gradle @@ -1,15 +1,9 @@ plugins { - id "com.marklogic.ml-gradle" version "3.6.0" + id "com.marklogic.ml-gradle" version "4.4.0" } ext { mlAppConfig { modulesDatabaseName = "Modules" } - - // Gotta tell ml-gradle not to delete the modules database when we undeploy this - mlAppDeployer.getCommand("DeployRestApiServersCommand").setDeleteModulesDatabase(false) - - // Here's an example of not creating a REST API server at all - just remove the command - //mlAppDeployer.getCommands().remove(mlAppDeployer.getCommand("DeployRestApiServersCommand")) }