From 9ccfded5da7498d1fa73c75cd1e0642e83639ccf Mon Sep 17 00:00:00 2001 From: wildone Date: Sat, 26 Dec 2020 16:13:17 +1100 Subject: [PATCH] replace crx. with aem. --- .../resources/archetype-resources/README.md | 2 +- .../__artifactId__-aem-author/deploy-local | 2 +- .../__artifactId__-aem-author/pom.xml | 2 +- .../META-INF/vault/definition/.content.xml | 4 +-- .../screenshots/screenshot1/.content.xml | 2 +- .../__artifactId__-aem-common/README.md | 2 +- .../__artifactId__-aem-common/deploy-local | 2 +- .../__artifactId__-aem-common/deploy-publish | 2 +- .../deploy-publish-local | 2 +- .../META-INF/vault/definition/.content.xml | 4 +-- .../screenshots/screenshot1/.content.xml | 2 +- .../META-INF/vault/definition/.content.xml | 2 +- .../screenshots/screenshot1/.content.xml | 2 +- .../cypress/cypress.js | 4 +-- .../__artifactId__-aem-compose/deploy-local | 2 +- .../deploy-local-dev | 2 +- .../deploy-local.cmd | 2 +- .../__artifactId__-aem-compose/pom.xml | 6 ++-- .../webpack.config.js | 2 +- .../__artifactId__-aem-config/README.md | 2 +- .../__artifactId__-aem-config/deploy-local | 2 +- .../META-INF/vault/definition/.content.xml | 4 +-- .../screenshots/screenshot1/.content.xml | 2 +- .../__artifactId__-aem-content/README.md | 6 ++-- .../__artifactId__-aem-content/deploy-local | 2 +- .../__artifactId__-aem-content/pom.xml | 32 +++++++++---------- .../screenshots/screenshot1/.content.xml | 2 +- .../__artifactId__-aem-deploy/deploy-local | 2 +- .../__artifactId__-aem-deploy/pom.xml | 6 ++-- .../META-INF/vault/definition/.content.xml | 2 +- .../screenshots/screenshot1/.content.xml | 2 +- .../__artifactId__-aem-services/deploy-local | 2 +- .../__artifactId__-aem-services/pom.xml | 2 +- .../__artifactId__-aem-showcase/deploy-local | 2 +- .../__artifactId__-aem-showcase/pom.xml | 32 +++++++++---------- .../META-INF/vault/definition/.content.xml | 4 +-- .../screenshots/screenshot1/.content.xml | 2 +- .../__artifactId__-aem-showcase/vlt-sync | 2 +- .../__artifactId__-aem-showcase/vlt-update | 2 +- .../__artifactId__-aem-training/deploy-local | 2 +- .../__artifactId__-aem-training/pom.xml | 32 +++++++++---------- .../META-INF/vault/definition/.content.xml | 4 +-- .../screenshots/screenshot1/.content.xml | 2 +- .../__artifactId__-testing/README.md | 4 +-- .../test/groovy/support/FunctionalSpec.groovy | 8 ++--- .../src/test/resources/GebConfig.groovy | 20 ++++++------ .../templateReportCreator/summary-template.ad | 4 +-- .../__artifactId__-testing/test-spec | 2 +- .../archetype-resources/deploy-local | 2 +- .../archetype-resources/deploy-publish | 2 +- .../resources/archetype-resources/pom.xml | 26 +++++++-------- .../scripts/functions-maven.sh | 10 +++--- 52 files changed, 139 insertions(+), 139 deletions(-) diff --git a/src/main/resources/archetype-resources/README.md b/src/main/resources/archetype-resources/README.md index 94dad122..14d63ff7 100644 --- a/src/main/resources/archetype-resources/README.md +++ b/src/main/resources/archetype-resources/README.md @@ -101,7 +101,7 @@ KEYNAME=${artifactId}; ssh-keygen -t rsa -b 4096 -C "${KEYNAME}" -N '' -f "${KEY Use the deploy scripts or use the following command ```bash -mvn -Dvault.useProxy=false -DskipTests clean install -P autoInstallBundle,autoInstallPackage -pl ${artifactId}-aem-common,${artifactId}-aem-content,${artifactId}-aem-showcase -Dcrx.host=localhost +mvn -Dvault.useProxy=false -DskipTests clean install -P autoInstallBundle,autoInstallPackage -pl ${artifactId}-aem-common,${artifactId}-aem-content,${artifactId}-aem-showcase -Daem.host=localhost ``` ###Deploy - Deployment Package diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-author/deploy-local b/src/main/resources/archetype-resources/__artifactId__-aem-author/deploy-local index 2a6faa7b..d1f6e843 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-author/deploy-local +++ b/src/main/resources/archetype-resources/__artifactId__-aem-author/deploy-local @@ -1,3 +1,3 @@ #!/bin/bash -./deploy -Dcrx.host=localhost +./deploy -Daem.host=localhost diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-author/pom.xml b/src/main/resources/archetype-resources/__artifactId__-aem-author/pom.xml index 48c21e17..bcdd42e8 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-author/pom.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-author/pom.xml @@ -248,7 +248,7 @@ ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/crx/packmgr/service.jsp ${symbol_dollar}{aem.username} - ${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.password} diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-author/src/main/content/META-INF/vault/definition/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-author/src/main/content/META-INF/vault/definition/.content.xml index cf3866db..65ff9aad 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-author/src/main/content/META-INF/vault/definition/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-author/src/main/content/META-INF/vault/definition/.content.xml @@ -12,7 +12,7 @@ groupTitle="${symbol_dollar}{package.groupTitle}" builtWith="${symbol_dollar}{package.builtWith}" name="${symbol_dollar}{name}" - path="${symbol_dollar}{crx.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" + path="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" version="${symbol_dollar}{version}" providerName="${symbol_dollar}{package.providerName}" providerUrl="${symbol_dollar}{package.providerUrl}" @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-author/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-author/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml index 7220db22..50c4048a 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-author/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-author/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml @@ -4,5 +4,5 @@ + fileReference="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png"> diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-common/README.md b/src/main/resources/archetype-resources/__artifactId__-aem-common/README.md index 4e8b19b2..baa512ff 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-common/README.md +++ b/src/main/resources/archetype-resources/__artifactId__-aem-common/README.md @@ -14,7 +14,7 @@ Deploying Deploy project to local AEM instance use the deploy scripts or the following command ```bash -mvn -Dvault.useProxy=false -DskipTests clean install -P autoInstallPackage,autoInstallBundle -Dcrx.host=localhost +mvn -Dvault.useProxy=false -DskipTests clean install -P autoInstallPackage,autoInstallBundle -Daem.host=localhost ``` diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-local b/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-local index 2a6faa7b..d1f6e843 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-local +++ b/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-local @@ -1,3 +1,3 @@ #!/bin/bash -./deploy -Dcrx.host=localhost +./deploy -Daem.host=localhost diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-publish b/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-publish index 73ba1db5..06229124 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-publish +++ b/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-publish @@ -1,3 +1,3 @@ #!/bin/bash -./deploy -Dcrx.port=4503 +./deploy -Daem.port=4503 diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-publish-local b/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-publish-local index 2e70766e..442824f2 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-publish-local +++ b/src/main/resources/archetype-resources/__artifactId__-aem-common/deploy-publish-local @@ -1,3 +1,3 @@ #!/bin/bash -./deploy -Dcrx.host=localhost -Dcrx.port=4503 +./deploy -Daem.host=localhost -Daem.port=4503 diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-common/src/main/content/META-INF/vault/definition/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-common/src/main/content/META-INF/vault/definition/.content.xml index db4661e6..f5f7ada7 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-common/src/main/content/META-INF/vault/definition/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-common/src/main/content/META-INF/vault/definition/.content.xml @@ -12,7 +12,7 @@ groupTitle="${symbol_dollar}{package.groupTitle}" builtWith="${symbol_dollar}{package.builtWith}" name="${symbol_dollar}{name}" - path="${symbol_dollar}{crx.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" + path="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" version="${symbol_dollar}{version}" providerName="${symbol_dollar}{package.providerName}" providerUrl="${symbol_dollar}{package.providerUrl}" @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-common/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-common/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml index 7220db22..50c4048a 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-common/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-common/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml @@ -4,5 +4,5 @@ + fileReference="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png"> diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-compose/.maven/content/META-INF/vault/definition/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-compose/.maven/content/META-INF/vault/definition/.content.xml index 9842a02c..c0a13853 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-compose/.maven/content/META-INF/vault/definition/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-compose/.maven/content/META-INF/vault/definition/.content.xml @@ -12,7 +12,7 @@ groupTitle="${symbol_dollar}{package.groupTitle}" builtWith="${symbol_dollar}{package.builtWith}" name="${symbol_dollar}{name}" - path="${symbol_dollar}{crx.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" + path="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" version="${symbol_dollar}{version}" providerName="${symbol_dollar}{package.providerName}" providerUrl="${symbol_dollar}{package.providerUrl}" diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-compose/.maven/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-compose/.maven/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml index 7220db22..50c4048a 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-compose/.maven/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-compose/.maven/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml @@ -4,5 +4,5 @@ + fileReference="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png"> diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-compose/cypress/cypress.js b/src/main/resources/archetype-resources/__artifactId__-aem-compose/cypress/cypress.js index e5472a94..ccbfa1fd 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-compose/cypress/cypress.js +++ b/src/main/resources/archetype-resources/__artifactId__-aem-compose/cypress/cypress.js @@ -16,8 +16,8 @@ function getConfigFromMaven(variable) { // return spawn.execSync(`mvn help:evaluate -q -DforceStdout -D"expression=${variable}"`).toString(); } -const CRX_USERNAME = getConfigFromMaven('crx.username') -const CRX_PASSWORD = getConfigFromMaven('crx.username') +const CRX_USERNAME = getConfigFromMaven('aem.username') +const CRX_PASSWORD = getConfigFromMaven('aem.username') const PACKAGE_CONTENTFOLDER = getConfigFromMaven('package.contentFolder') const TEST_ENV = { diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local b/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local index 2a6faa7b..d1f6e843 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local +++ b/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local @@ -1,3 +1,3 @@ #!/bin/bash -./deploy -Dcrx.host=localhost +./deploy -Daem.host=localhost diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local-dev b/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local-dev index a0ade20e..eb42c734 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local-dev +++ b/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local-dev @@ -1,3 +1,3 @@ #!/bin/bash -./deploy -Dcrx.host=localhost -Dpackage.npmCommand=aem:build:dev "$@" +./deploy -Daem.host=localhost -Dpackage.npmCommand=aem:build:dev "$@" diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local.cmd b/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local.cmd index 97462041..a52b3e8e 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local.cmd +++ b/src/main/resources/archetype-resources/__artifactId__-aem-compose/deploy-local.cmd @@ -1,2 +1,2 @@ -mvn -D"skipTests=true" clean install -P autoInstallPackage,deploymentpackage -D"crx.host=localhost" +mvn -D"skipTests=true" clean install -P autoInstallPackage,deploymentpackage -D"aem.host=localhost" diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-compose/pom.xml b/src/main/resources/archetype-resources/__artifactId__-aem-compose/pom.xml index ce89757f..6c1eb2a9 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-compose/pom.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-compose/pom.xml @@ -329,9 +329,9 @@ install - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/crx/packmgr/service.jsp - ${symbol_dollar}{crx.username} - ${symbol_dollar}{crx.password} + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/crx/packmgr/service.jsp + ${symbol_dollar}{aem.username} + ${symbol_dollar}{aem.password} diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-compose/webpack.config.js b/src/main/resources/archetype-resources/__artifactId__-aem-compose/webpack.config.js index 33b1939a..7ae4a352 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-compose/webpack.config.js +++ b/src/main/resources/archetype-resources/__artifactId__-aem-compose/webpack.config.js @@ -45,7 +45,7 @@ xmlParser.parseString(pomConfig, (_, { project }) => { xmlParser.parseString(parentPomConfig, (_, { project }) => { const properties = project.properties[0] - authorPort = properties['crx.port'][0] + authorPort = properties['aem.port'][0] }) console.log(`authorPort: ${authorPort}`) diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-config/README.md b/src/main/resources/archetype-resources/__artifactId__-aem-config/README.md index e53c7697..84bc05ea 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-config/README.md +++ b/src/main/resources/archetype-resources/__artifactId__-aem-config/README.md @@ -28,6 +28,6 @@ Specifying CRX Host/Port ------------------------ The CRX host and port can be specified on the command line with: -mvn -Dcrx.host=otherhost -Dcrx.port=5502 +mvn -Daem.host=otherhost -Daem.port=5502 diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-config/deploy-local b/src/main/resources/archetype-resources/__artifactId__-aem-config/deploy-local index 7c528ef5..7b0995ed 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-config/deploy-local +++ b/src/main/resources/archetype-resources/__artifactId__-aem-config/deploy-local @@ -9,7 +9,7 @@ set_term_title "Deploying Project" #mvn -Dvault.useProxy=false -DskipTests clean install -P autoInstallBundle,autoInstallPackage,autoInstallPackagePublish #mvn -Dvault.useProxy=false -DskipTests clean install -P autoInstallBundle,autoInstallPackage -mvn -Dvault.useProxy=false -DskipTests clean install -P autoInstallPackage -Dcrx.host=localhost +mvn -Dvault.useProxy=false -DskipTests clean install -P autoInstallPackage -Daem.host=localhost set_term_title "Deployed" diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-config/src/main/content/META-INF/vault/definition/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-config/src/main/content/META-INF/vault/definition/.content.xml index cf3866db..65ff9aad 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-config/src/main/content/META-INF/vault/definition/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-config/src/main/content/META-INF/vault/definition/.content.xml @@ -12,7 +12,7 @@ groupTitle="${symbol_dollar}{package.groupTitle}" builtWith="${symbol_dollar}{package.builtWith}" name="${symbol_dollar}{name}" - path="${symbol_dollar}{crx.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" + path="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" version="${symbol_dollar}{version}" providerName="${symbol_dollar}{package.providerName}" providerUrl="${symbol_dollar}{package.providerUrl}" @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-config/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-config/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml index 7220db22..50c4048a 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-config/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-config/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml @@ -4,5 +4,5 @@ + fileReference="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png"> diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-content/README.md b/src/main/resources/archetype-resources/__artifactId__-aem-content/README.md index 06a74a3a..fba06af3 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-content/README.md +++ b/src/main/resources/archetype-resources/__artifactId__-aem-content/README.md @@ -13,9 +13,9 @@ Deploying Use the deploy scripts or use the following command ```bash -mvn -Dvault.useProxy=false -DskipTests verify -P turnoffdamworkflow -Dcrx.host=localhost -mvn -Dvault.useProxy=false -DskipTests clean install -P autoInstallPackage -Dcrx.host=localhost -mvn -Dvault.useProxy=false -DskipTests verify -P turnondamworkflow -Dcrx.host=localhost +mvn -Dvault.useProxy=false -DskipTests verify -P turnoffdamworkflow -Daem.host=localhost +mvn -Dvault.useProxy=false -DskipTests clean install -P autoInstallPackage -Daem.host=localhost +mvn -Dvault.useProxy=false -DskipTests verify -P turnondamworkflow -Daem.host=localhost ``` Content Cleaning diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-content/deploy-local b/src/main/resources/archetype-resources/__artifactId__-aem-content/deploy-local index 30e3cf6a..2504a2e9 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-content/deploy-local +++ b/src/main/resources/archetype-resources/__artifactId__-aem-content/deploy-local @@ -1,4 +1,4 @@ #!/bin/bash -./deploy -Dcrx.host=localhost +./deploy -Daem.host=localhost diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-content/pom.xml b/src/main/resources/archetype-resources/__artifactId__-aem-content/pom.xml index 569734ed..747b2e7a 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-content/pom.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-content/pom.xml @@ -100,7 +100,7 @@ ${symbol_dollar}{package.group} src/main/content/META-INF/vault/filter.xml - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/crx/packmgr/service.jsp + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/crx/packmgr/service.jsp ${symbol_dollar}{project.description} ${symbol_dollar}{buildNumber} @@ -153,9 +153,9 @@ install - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/crx/packmgr/service.jsp - ${symbol_dollar}{crx.username} - ${symbol_dollar}{crx.password} + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/crx/packmgr/service.jsp + ${symbol_dollar}{aem.username} + ${symbol_dollar}{aem.password} @@ -187,16 +187,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=false - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_create + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_create @@ -210,16 +210,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=false - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_mod + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_mod @@ -251,16 +251,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=true - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_create + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_create @@ -274,16 +274,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=true - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_mod + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_mod diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml index 7220db22..50c4048a 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-content/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml @@ -4,5 +4,5 @@ + fileReference="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png"> diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-deploy/deploy-local b/src/main/resources/archetype-resources/__artifactId__-aem-deploy/deploy-local index 2a6faa7b..d1f6e843 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-deploy/deploy-local +++ b/src/main/resources/archetype-resources/__artifactId__-aem-deploy/deploy-local @@ -1,3 +1,3 @@ #!/bin/bash -./deploy -Dcrx.host=localhost +./deploy -Daem.host=localhost diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-deploy/pom.xml b/src/main/resources/archetype-resources/__artifactId__-aem-deploy/pom.xml index def67772..b6afaf9d 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-deploy/pom.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-deploy/pom.xml @@ -228,9 +228,9 @@ install - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/crx/packmgr/service.jsp - ${symbol_dollar}{crx.username} - ${symbol_dollar}{crx.password} + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/crx/packmgr/service.jsp + ${symbol_dollar}{aem.username} + ${symbol_dollar}{aem.password} diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-deploy/src/content/META-INF/vault/definition/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-deploy/src/content/META-INF/vault/definition/.content.xml index 9842a02c..c0a13853 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-deploy/src/content/META-INF/vault/definition/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-deploy/src/content/META-INF/vault/definition/.content.xml @@ -12,7 +12,7 @@ groupTitle="${symbol_dollar}{package.groupTitle}" builtWith="${symbol_dollar}{package.builtWith}" name="${symbol_dollar}{name}" - path="${symbol_dollar}{crx.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" + path="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" version="${symbol_dollar}{version}" providerName="${symbol_dollar}{package.providerName}" providerUrl="${symbol_dollar}{package.providerUrl}" diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-deploy/src/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-deploy/src/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml index 7220db22..50c4048a 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-deploy/src/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-deploy/src/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml @@ -4,5 +4,5 @@ + fileReference="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png"> diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-services/deploy-local b/src/main/resources/archetype-resources/__artifactId__-aem-services/deploy-local index 30e3cf6a..2504a2e9 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-services/deploy-local +++ b/src/main/resources/archetype-resources/__artifactId__-aem-services/deploy-local @@ -1,4 +1,4 @@ #!/bin/bash -./deploy -Dcrx.host=localhost +./deploy -Daem.host=localhost diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-services/pom.xml b/src/main/resources/archetype-resources/__artifactId__-aem-services/pom.xml index 24905ad2..1cfea775 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-services/pom.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-services/pom.xml @@ -281,7 +281,7 @@ Export-Package: ${classNamespace}.* org.apache.sling maven-sling-plugin - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/apps/${symbol_dollar}{package.appFolder}/install + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/apps/${symbol_dollar}{package.appFolder}/install true diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/deploy-local b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/deploy-local index 30e3cf6a..2504a2e9 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/deploy-local +++ b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/deploy-local @@ -1,4 +1,4 @@ #!/bin/bash -./deploy -Dcrx.host=localhost +./deploy -Daem.host=localhost diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/pom.xml b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/pom.xml index b185289f..17491e0e 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/pom.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/pom.xml @@ -99,7 +99,7 @@ ${symbol_dollar}{package.group} src/main/content/META-INF/vault/filter.xml - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/crx/packmgr/service.jsp + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/crx/packmgr/service.jsp ${symbol_dollar}{project.description} @@ -152,9 +152,9 @@ install - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/crx/packmgr/service.jsp - ${symbol_dollar}{crx.username} - ${symbol_dollar}{crx.password} + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/crx/packmgr/service.jsp + ${symbol_dollar}{aem.username} + ${symbol_dollar}{aem.password} @@ -185,16 +185,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=false - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_create + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_create @@ -208,16 +208,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=false - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_mod + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_mod @@ -250,16 +250,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=true - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_create + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_create @@ -273,16 +273,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=true - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_mod + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_mod diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/src/main/content/META-INF/vault/definition/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/src/main/content/META-INF/vault/definition/.content.xml index 57a5f184..c0a13853 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/src/main/content/META-INF/vault/definition/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/src/main/content/META-INF/vault/definition/.content.xml @@ -12,7 +12,7 @@ groupTitle="${symbol_dollar}{package.groupTitle}" builtWith="${symbol_dollar}{package.builtWith}" name="${symbol_dollar}{name}" - path="${symbol_dollar}{crx.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" + path="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" version="${symbol_dollar}{version}" providerName="${symbol_dollar}{package.providerName}" providerUrl="${symbol_dollar}{package.providerUrl}" @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml index 7220db22..50c4048a 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml @@ -4,5 +4,5 @@ + fileReference="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png"> diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/vlt-sync b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/vlt-sync index b9981262..3a0ab148 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/vlt-sync +++ b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/vlt-sync @@ -7,7 +7,7 @@ SCRIPT_PARAMS="$@" set_term_title "Sync Showcase" -HOST="http://localhost:4502/crx/server/crx.default/jcr:root/" +HOST="http://localhost:4502/crx/server/aem.default/jcr:root/" JCR_ROOT="$(realpath ./src/main/content/jcr_root/)" CREDENTIALS="$AEM_USER:$AEM_PASS" FILTER="./src/main/content/META-INF/vault/filter.xml" diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/vlt-update b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/vlt-update index 3fa2184a..44510fe9 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-showcase/vlt-update +++ b/src/main/resources/archetype-resources/__artifactId__-aem-showcase/vlt-update @@ -7,7 +7,7 @@ SCRIPT_PARAMS="$@" set_term_title "Sync Showcase" -HOST="http://localhost:4502/crx/server/crx.default/jcr:root/" +HOST="http://localhost:4502/crx/server/aem.default/jcr:root/" JCR_ROOT="$(realpath ./src/main/content/jcr_root/)" CREDENTIALS="$AEM_USER:$AEM_PASS" FILTER="./src/main/content/META-INF/vault/filter.xml" diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-training/deploy-local b/src/main/resources/archetype-resources/__artifactId__-aem-training/deploy-local index 30e3cf6a..2504a2e9 100755 --- a/src/main/resources/archetype-resources/__artifactId__-aem-training/deploy-local +++ b/src/main/resources/archetype-resources/__artifactId__-aem-training/deploy-local @@ -1,4 +1,4 @@ #!/bin/bash -./deploy -Dcrx.host=localhost +./deploy -Daem.host=localhost diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-training/pom.xml b/src/main/resources/archetype-resources/__artifactId__-aem-training/pom.xml index fd37c9d1..17428168 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-training/pom.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-training/pom.xml @@ -100,7 +100,7 @@ ${symbol_dollar}{package.group} src/main/content/META-INF/vault/filter.xml - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/crx/packmgr/service.jsp + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/crx/packmgr/service.jsp ${symbol_dollar}{project.description} @@ -157,9 +157,9 @@ install - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/crx/packmgr/service.jsp - ${symbol_dollar}{crx.username} - ${symbol_dollar}{crx.password} + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/crx/packmgr/service.jsp + ${symbol_dollar}{aem.username} + ${symbol_dollar}{aem.password} @@ -192,16 +192,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=false - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_create + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_create @@ -215,16 +215,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=false - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_mod + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_mod @@ -257,16 +257,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=true - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_create + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_create @@ -280,16 +280,16 @@ curl -u - ${symbol_dollar}{crx.username}:${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username}:${symbol_dollar}{aem.password} -H User-Agent:curl -H - Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port} + Referer:${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port} -X POST -F enabled=true - ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/libs/settings/workflow/launcher/config/update_asset_mod + ${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/libs/settings/workflow/launcher/config/update_asset_mod diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-training/src/main/content/META-INF/vault/definition/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-training/src/main/content/META-INF/vault/definition/.content.xml index 57a5f184..c0a13853 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-training/src/main/content/META-INF/vault/definition/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-training/src/main/content/META-INF/vault/definition/.content.xml @@ -12,7 +12,7 @@ groupTitle="${symbol_dollar}{package.groupTitle}" builtWith="${symbol_dollar}{package.builtWith}" name="${symbol_dollar}{name}" - path="${symbol_dollar}{crx.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" + path="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}" version="${symbol_dollar}{version}" providerName="${symbol_dollar}{package.providerName}" providerUrl="${symbol_dollar}{package.providerUrl}" @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/archetype-resources/__artifactId__-aem-training/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/src/main/resources/archetype-resources/__artifactId__-aem-training/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml index 7220db22..50c4048a 100644 --- a/src/main/resources/archetype-resources/__artifactId__-aem-training/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml +++ b/src/main/resources/archetype-resources/__artifactId__-aem-training/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml @@ -4,5 +4,5 @@ + fileReference="${symbol_dollar}{aem.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png"> diff --git a/src/main/resources/archetype-resources/__artifactId__-testing/README.md b/src/main/resources/archetype-resources/__artifactId__-testing/README.md index 336397e2..f25621d6 100644 --- a/src/main/resources/archetype-resources/__artifactId__-testing/README.md +++ b/src/main/resources/archetype-resources/__artifactId__-testing/README.md @@ -37,13 +37,13 @@ mvn -pl ${artifactId}-testing clean test -Dgeb.env=dev -Dtest=EventDetailsPublis From Root: ```bash -mvn -pl ${artifactId}-testing clean test -Dgeb.env=dev -Dcrx.host=192.168.27.2 -Dcrx.port=4502 -Dcrx.user=admin -Dcrx.password=admin -Dtest=Text* +mvn -pl ${artifactId}-testing clean test -Dgeb.env=dev -Daem.host=192.168.27.2 -Daem.port=4502 -Daem.user=admin -Daem.password=admin -Dtest=Text* ``` In Project Folder ```bash -mvn clean test -Dgeb.env=dev -Dcrx.host=192.168.27.2 -Dcrx.port=4502 -Dcrx.user=admin -Dcrx.password=admin -Dtest=Text* +mvn clean test -Dgeb.env=dev -Daem.host=192.168.27.2 -Daem.port=4502 -Daem.user=admin -Daem.password=admin -Dtest=Text* ``` - Quick test on clean instance diff --git a/src/main/resources/archetype-resources/__artifactId__-testing/src/test/groovy/support/FunctionalSpec.groovy b/src/main/resources/archetype-resources/__artifactId__-testing/src/test/groovy/support/FunctionalSpec.groovy index 888c4fb2..ee929689 100755 --- a/src/main/resources/archetype-resources/__artifactId__-testing/src/test/groovy/support/FunctionalSpec.groovy +++ b/src/main/resources/archetype-resources/__artifactId__-testing/src/test/groovy/support/FunctionalSpec.groovy @@ -166,12 +166,12 @@ abstract class FunctionalSpec extends GebReportingSpec { } static String getHostName() { - return System.properties.getProperty("crx.host", "localhost") + return System.properties.getProperty("aem.host", "localhost") } static String getUIMode() { - return System.properties.getProperty("crx.authoruimode", "CLASSIC") + return System.properties.getProperty("aem.authoruimode", "CLASSIC") } @@ -216,11 +216,11 @@ abstract class FunctionalSpec extends GebReportingSpec { } def getAdminUsername() { - return System.properties.getProperty("crx.user", "admin") + return System.properties.getProperty("aem.user", "admin") } def getAdminPassword() { - return System.properties.getProperty("crx.password", "admin") + return System.properties.getProperty("aem.password", "admin") } // def designReference(String filePath) { diff --git a/src/main/resources/archetype-resources/__artifactId__-testing/src/test/resources/GebConfig.groovy b/src/main/resources/archetype-resources/__artifactId__-testing/src/test/resources/GebConfig.groovy index ff5a92c4..d0219921 100644 --- a/src/main/resources/archetype-resources/__artifactId__-testing/src/test/resources/GebConfig.groovy +++ b/src/main/resources/archetype-resources/__artifactId__-testing/src/test/resources/GebConfig.groovy @@ -50,21 +50,21 @@ boolean is64bit = System.getProperty("sun.arch.data.model").contains("64") reportingListener = new ReportListener() String GLOBAL_ENV = System.getProperty("geb.env","local-chrome") -String GLOBAL_SCHEME = System.properties.getProperty("crx.scheme","http") -String GLOBAL_HOST = System.properties.getProperty("crx.host","localhost") -String GLOBAL_PORT = System.properties.getProperty("crx.port","4502") -String GLOBAL_USER = System.properties.getProperty("crx.user","admin") -String GLOBAL_PASS = System.properties.getProperty("crx.password","admin") +String GLOBAL_SCHEME = System.properties.getProperty("aem.scheme","http") +String GLOBAL_HOST = System.properties.getProperty("aem.host","localhost") +String GLOBAL_PORT = System.properties.getProperty("aem.port","4502") +String GLOBAL_USER = System.properties.getProperty("aem.user","admin") +String GLOBAL_PASS = System.properties.getProperty("aem.password","admin") String GLOBAL_URL = "${symbol_dollar}{GLOBAL_SCHEME}://${symbol_dollar}{GLOBAL_HOST}:${symbol_dollar}{GLOBAL_PORT}" String GLOBAL_SELENIUMHUB_URL = System.properties.getProperty("selenumhuburl","http://${symbol_dollar}GLOBAL_HOST:32768/wd/hub") String GLOBAL_BUILD_DIR = System.properties.getProperty("project.buildDirectory", GLOBAL_ENV) //save params if have not been defined -System.properties.setProperty("crx.scheme", GLOBAL_SCHEME) -System.properties.setProperty("crx.host", GLOBAL_HOST) -System.properties.setProperty("crx.port", GLOBAL_PORT) -System.properties.setProperty("crx.password", GLOBAL_PASS) -System.properties.setProperty("crx.user", GLOBAL_USER) //used in report +System.properties.setProperty("aem.scheme", GLOBAL_SCHEME) +System.properties.setProperty("aem.host", GLOBAL_HOST) +System.properties.setProperty("aem.port", GLOBAL_PORT) +System.properties.setProperty("aem.password", GLOBAL_PASS) +System.properties.setProperty("aem.user", GLOBAL_USER) //used in report System.properties.setProperty("geb.build.baseUrl", GLOBAL_URL) //used in report System.properties.setProperty("selenumhuburl", GLOBAL_SELENIUMHUB_URL) //used in report System.properties.setProperty("geb.env", GLOBAL_ENV) //used in report diff --git a/src/main/resources/archetype-resources/__artifactId__-testing/src/test/resources/templateReportCreator/summary-template.ad b/src/main/resources/archetype-resources/__artifactId__-testing/src/test/resources/templateReportCreator/summary-template.ad index 37c81eb4..04cab700 100644 --- a/src/main/resources/archetype-resources/__artifactId__-testing/src/test/resources/templateReportCreator/summary-template.ad +++ b/src/main/resources/archetype-resources/__artifactId__-testing/src/test/resources/templateReportCreator/summary-template.ad @@ -18,7 +18,7 @@ | Config | Value | Exec Config | ${System.properties['geb.env']} | Target Host | ${System.properties['geb.build.baseUrl']} -| Testing User | ${System.properties['crx.user']} +| Testing User | ${System.properties['aem.user']} | Testing Host | ${System.properties['selenumhuburl']} | Driver | ${System.properties['testingdriver']} | Test Filter | ${System.properties['test']} @@ -57,4 +57,4 @@ <% //println "REPORT: exiting spec-template" -%> \ No newline at end of file +%> diff --git a/src/main/resources/archetype-resources/__artifactId__-testing/test-spec b/src/main/resources/archetype-resources/__artifactId__-testing/test-spec index f0e9460e..2e9002c3 100755 --- a/src/main/resources/archetype-resources/__artifactId__-testing/test-spec +++ b/src/main/resources/archetype-resources/__artifactId__-testing/test-spec @@ -49,7 +49,7 @@ getMavenCommand() { MAVEN_EXTRAS="-P compile-reports-ruby" fi - COMMAND="mvn clean test ${MAVEN_EXTRAS} -Dgeb.env="${DRIVER}" -Dproject.buildDirectory="${DRIVER}" -Dcrx.scheme="${SCHEME}" -Dcrx.host="${HOST}" -Dcrx.port="${PORT}" -Dcrx.username="${USERNAME}" -Dcrx.password="${PASSWORD}" -Dtest="${SPECS}" -Dselenium.huburl="${SELENIUM_URL}" -Dlogin.req="${LOGIN}" -Dtest.dispatcher="${DISPATCHER}" ${MAVEN_CONFIG}" + COMMAND="mvn clean test ${MAVEN_EXTRAS} -Dgeb.env="${DRIVER}" -Dproject.buildDirectory="${DRIVER}" -Daem.scheme="${SCHEME}" -Daem.host="${HOST}" -Daem.port="${PORT}" -Daem.username="${USERNAME}" -Daem.password="${PASSWORD}" -Dtest="${SPECS}" -Dselenium.huburl="${SELENIUM_URL}" -Dlogin.req="${LOGIN}" -Dtest.dispatcher="${DISPATCHER}" ${MAVEN_CONFIG}" echo ${COMMAND} } diff --git a/src/main/resources/archetype-resources/deploy-local b/src/main/resources/archetype-resources/deploy-local index 98fb78c0..d18e7d1d 100755 --- a/src/main/resources/archetype-resources/deploy-local +++ b/src/main/resources/archetype-resources/deploy-local @@ -1,3 +1,3 @@ #!/bin/bash -./deploy -Dcrx.host=localhost -P installdeploymentpackage +./deploy -Daem.host=localhost -P installdeploymentpackage diff --git a/src/main/resources/archetype-resources/deploy-publish b/src/main/resources/archetype-resources/deploy-publish index 64ae33dd..a5f1c9ce 100755 --- a/src/main/resources/archetype-resources/deploy-publish +++ b/src/main/resources/archetype-resources/deploy-publish @@ -1,3 +1,3 @@ #!/bin/bash -./deploy -Dcrx.port=4503 -P installdeploymentpackage +./deploy -Daem.port=4503 -P installdeploymentpackage diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index ff668377..c2e81068 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -45,17 +45,17 @@ - 192.168.27.2 - 4502 - admin - admin - /etc/packages + 192.168.27.2 + 4502 + admin + admin + /etc/packages 192.168.27.2 8081 - 192.168.27.2 - 4503 - admin - admin + 192.168.27.2 + 4503 + admin + admin UTF-8 UTF-8 ${packageGroup} @@ -753,8 +753,8 @@ maven-sling-plugin 2.1.0 - ${symbol_dollar}{crx.username} - ${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username} + ${symbol_dollar}{aem.password} @@ -765,8 +765,8 @@ true true - ${symbol_dollar}{crx.username} - ${symbol_dollar}{crx.password} + ${symbol_dollar}{aem.username} + ${symbol_dollar}{aem.password}