replace crx. with aem.

aem-design · Dec 26, 2020 · 9ccfded · 9ccfded
1 parent edfd2c8
commit 9ccfded
Show file tree

Hide file tree

Showing 52 changed files with 139 additions and 139 deletions.
diff --git 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
@@ -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
@@ -248,7 +248,7 @@
                                 <configuration>
                                     <targetURL>${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/crx/packmgr/service.jsp</targetURL>
                                     <userId>${symbol_dollar}{aem.username}</userId>
-                                    <password>${symbol_dollar}{crx.password}</password>
+                                    <password>${symbol_dollar}{aem.password}</password>
                                 </configuration>
                             </execution>
                         </executions>

diff --git a/...sources/__artifactId__-aem-author/src/main/content/META-INF/vault/definition/.content.xml b/...sources/__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 @@
     <screenshots jcr:primaryType="nt:unstructured">
         <screenshot1 jcr:primaryType="nt:unstructured"/>
     </screenshots>
-</jcr:root>
+</jcr:root>
diff --git a/...em-author/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/...em-author/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml
@@ -4,5 +4,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
   jcr:primaryType="nt:unstructured"
-  fileReference="${symbol_dollar}{crx.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png">
+  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">
 </jcr:root>
diff --git 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
@@ -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
@@ -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
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./deploy -Dcrx.host=localhost -Dcrx.port=4503
+./deploy -Daem.host=localhost -Daem.port=4503
diff --git a/...sources/__artifactId__-aem-common/src/main/content/META-INF/vault/definition/.content.xml b/...sources/__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 @@
     <screenshots jcr:primaryType="nt:unstructured">
         <screenshot1 jcr:primaryType="nt:unstructured"/>
     </screenshots>
-</jcr:root>
+</jcr:root>
diff --git a/...em-common/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/...em-common/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml
@@ -4,5 +4,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
   jcr:primaryType="nt:unstructured"
-  fileReference="${symbol_dollar}{crx.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png">
+  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">
 </jcr:root>
diff --git a/...esources/__artifactId__-aem-compose/.maven/content/META-INF/vault/definition/.content.xml b/...esources/__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/...aem-compose/.maven/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/...aem-compose/.maven/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml
@@ -4,5 +4,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
   jcr:primaryType="nt:unstructured"
-  fileReference="${symbol_dollar}{crx.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png">
+  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">
 </jcr:root>
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -329,9 +329,9 @@
                                     <goal>install</goal>
                                 </goals>
                                 <configuration>
-                                    <targetURL>${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{crx.host}:${symbol_dollar}{crx.port}/crx/packmgr/service.jsp</targetURL>
-                                    <userId>${symbol_dollar}{crx.username}</userId>
-                                    <password>${symbol_dollar}{crx.password}</password>
+                                    <targetURL>${symbol_dollar}{package.uploadProtocol}://${symbol_dollar}{aem.host}:${symbol_dollar}{aem.port}/crx/packmgr/service.jsp</targetURL>
+                                    <userId>${symbol_dollar}{aem.username}</userId>
+                                    <password>${symbol_dollar}{aem.password}</password>
                                 </configuration>
                             </execution>
                         </executions>

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
@@ -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
@@ -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 <goals>
+mvn -Daem.host=otherhost -Daem.port=5502 <goals>
 
 
diff --git 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/...sources/__artifactId__-aem-config/src/main/content/META-INF/vault/definition/.content.xml b/...sources/__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 @@
     <screenshots jcr:primaryType="nt:unstructured">
         <screenshot1 jcr:primaryType="nt:unstructured"/>
     </screenshots>
-</jcr:root>
+</jcr:root>
diff --git a/...em-config/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml b/...em-config/src/main/content/META-INF/vault/definition/screenshots/screenshot1/.content.xml
@@ -4,5 +4,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
   jcr:primaryType="nt:unstructured"
-  fileReference="${symbol_dollar}{crx.package.path}/${symbol_dollar}{package.group}/${symbol_dollar}{artifactId}-${symbol_dollar}{version}.zip/jcr:content/vlt:definition/screenshots/screenshot1/file.png">
+  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">
 </jcr:root>
diff --git 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
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-./deploy -Dcrx.host=localhost
+./deploy -Daem.host=localhost