Develop

.gitignore

@@ -16,6 +16,7 @@ target
 .project
 .settings
 maven-eclipse.xml
+.factorypath
 *.iml
 *.ipr
 *.iws
@@ -54,4 +55,4 @@ devops___*
 
 #stats files
 .stats
-.stats/*
+.stats/*

aemdesign-aem-author/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.306</version>
+        <version>2.1.321</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-author</artifactId>
-    <version>2.1.306</version>
+    <version>2.1.321</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Author UI Updates</name>
     <description>AEM.Design extensions and libraries that enhance the default authoring UI</description>
@@ -160,15 +160,11 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.2.0</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.api</artifactId>
-            <version>2.1.0</version>
-            <scope>provided</scope>
-        </dependency>
+      </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

aemdesign-aem-common/deploy.ps1

@@ -1,22 +1,27 @@
 Param(
-  [string]$LOG_PATH = "${PWD}\logs",
+  [string]$LOG_PATH = "..\logs",
   [string]$LOG_PEFIX = "deploy",
   [string]$LOG_SUFFIX = ".log",
-  [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
+  [string]$DOCKER_LOGS_FOLDER = "..\logs\docker",
   [string]$AEM_SCHEME = "http",
   [string]$AEM_HOST = "localhost",
   [string]$AEM_PORT = "4502",
   [string]$AEM_USERNAME = "admin",
   [string]$AEM_PASSWORD = "admin",
-  [string]$MVN_COMMAND = "mvn -D""vault.useProxy=false"" -DskipTests clean install -P autoInstallPackage -D""aem.port=$AEM_PORT"" -D""aem.host=$AEM_HOST"" -D""aem.username=$AEM_USERNAME"" -D""aem.password=$AEM_PASSWORD"" -D""aem.scheme=$AEM_SCHEME"" "
-
+  [string]$MVN_COMMAND = "mvn -DskipTests -e -U -P autoInstallPackage clean install -D""aem.port=$AEM_PORT"" -D""aem.host=$AEM_HOST"" -D""aem.username=$AEM_USERNAME"" -D""aem.password=$AEM_PASSWORD"" -D""aem.scheme=$AEM_SCHEME"" ",
+  [string]$FUNCTIONS_URI = "https://github.com/aem-design/aemdesign-docker/releases/latest/download/functions.ps1"
 )
 
-. "..\scripts\functions.ps1"
+$SKIP_CONFIG = $true
+$PARENT_PROJECT_PATH = ".."
 
-printSectionBanner "Deploying:" "warn"
-printSectionLine ("$MVN_COMMAND" -replace "$AEM_PASSWORD", "***")
+. ([Scriptblock]::Create((([System.Text.Encoding]::ASCII).getString((Invoke-WebRequest -Uri "${FUNCTIONS_URI}").Content))))
 
+$script:LOG_PATH = $LOG_PATH
+$script:TEST_SELENIUM_URL = $TEST_SELENIUM_URL
+
+printSectionBanner "Deploying Monolith Package"
+printSectionLine ("$MVN_COMMAND" -replace "$AEM_PASSWORD", "***")
 
 #update host
 if ( $TEST_HOST -eq "localhost" )

aemdesign-aem-common/filevault-export.ps1

@@ -18,9 +18,10 @@
     [string]$CONTENT_DESTINATION = (Resolve-Path -Path ".\src\main\content" -Relative),
     [string]$FILTER_FILE = "${CONTENT_DESTINATION}\META-INF\vault\filter.xml",
     [string]$FILTER_FILE_LOCATION = "${CONTENT_DESTINATION}\META-INF",
-    [string[]]$ROOT_PATHS,
     [switch]$Silent = $false,
-    [string]$LOG_PATH = "..\logs"
+    [string]$LOG_PATH = "..\logs",
+    [Parameter(Position=0)]
+    [string[]]$ROOT_PATHS
 )
 
 Function Format-XMLIndent
@@ -76,6 +77,10 @@ if (-not($ROOT_PATHS)) {
     $ROOT_PATHS = GetFilterList
 }
 
+Write-Output "---------------------------------------------------"
+Write-Output "------- EXPORT CONTENT FROM AN AEM INSTANCE ----------"
+Write-Output "---------------------------------------------------"
+Write-Output ""
 Write-Output "------- CONFIG ----------"
 Write-Output "AEM_SCHEMA: $AEM_SCHEMA"
 Write-Output "AEM_HOST: $AEM_HOST"

aemdesign-aem-common/filevault-import.ps1

@@ -20,8 +20,6 @@
     [string]$CONTENT_DESTINATION = ".\src\main\content",
     [string]$FILTER_FILE = "${CONTENT_DESTINATION}\META-INF\vault\filter.xml",
     [string]$FILTER_FILE_LOCATION = "${CONTENT_DESTINATION}\META-INF",
-    #which filter paths to import
-    [string[]]$ROOT_PATHS,
     [string]$ROOT_PATH = "/",
     [string]$CONTENT_SOURCE = (Resolve-Path -Path "src\main\content\jcr_root" -Relative),
     # connection timeout
@@ -41,7 +39,10 @@
         "action"="start"
     },
     [switch]$Silent = $false,
-    [string]$LOG_PATH = "..\logs"
+    [string]$LOG_PATH = "..\logs",
+    #which filter paths to import
+    [Parameter(Position=0)]
+    [string[]]$ROOT_PATHS
 )
 
 
@@ -129,6 +130,10 @@ function doSlingPost {
 
 }
 
+Write-Output "---------------------------------------------------"
+Write-Output "------- IMPORT CONTENT TO AN AEM INSTANCE ----------"
+Write-Output "---------------------------------------------------"
+Write-Output ""
 Write-Output "------- CONFIG ----------"
 Write-Output "AEM_SCHEMA: $AEM_SCHEMA"
 Write-Output "AEM_HOST: $AEM_HOST"

aemdesign-aem-common/package.ps1

@@ -1,17 +1,24 @@
 Param(
-  [string]$LOG_PATH = "${PWD}\logs",
-  [string]$LOG_PEFIX = "deploy",
+  [string]$LOG_PATH = "..\logs",
+  [string]$LOG_PEFIX = "package",
   [string]$LOG_SUFFIX = ".log",
-  [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
+  [string]$DOCKER_LOGS_FOLDER = "..\logs\docker",
   [string]$AEM_SCHEME = "http",
   [string]$AEM_HOST = "localhost",
   [string]$AEM_PORT = "4502",
   [string]$AEM_USERNAME = "admin",
   [string]$AEM_PASSWORD = "admin",
-  [string]$MVN_COMMAND = "mvn -D""vault.useProxy=false"" -DskipTests clean package "
+  [string]$MVN_COMMAND = "mvn -D""vault.useProxy=false"" -DskipTests clean package ",
+  [string]$FUNCTIONS_URI = "https://github.com/aem-design/aemdesign-docker/releases/latest/download/functions.ps1"
 )
 
-. "..\scripts\functions.ps1"
+$SKIP_CONFIG = $true
+$PARENT_PROJECT_PATH = ".."
+
+. ([Scriptblock]::Create((([System.Text.Encoding]::ASCII).getString((Invoke-WebRequest -Uri "${FUNCTIONS_URI}").Content))))
+
+$script:LOG_PATH = $LOG_PATH
+$script:TEST_SELENIUM_URL = $TEST_SELENIUM_URL
 
 printSectionBanner "Creating Package"
 printSectionLine ("$MVN_COMMAND" -replace "$AEM_PASSWORD", "***")

aemdesign-aem-common/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.306</version>
+        <version>2.1.321</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.1.306</version>
+    <version>2.1.321</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM.Design components and base templates</description>
@@ -145,7 +145,6 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.5</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -190,7 +189,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.2.0</version>
+            <version>2.22.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-coralui-cfe/css/cf-editor.css

@@ -3,27 +3,34 @@
 /* start counter for every text area */
 .paragraphcounter {
   counter-reset: cf-rte-par-counter;
+  counter-set: cf-rte-par-counter -1;
 }
 
 /* increment counter every par block and add counter */
+.paragraphcounter > h1:before,
+.paragraphcounter > h2:before,
+.paragraphcounter > h3:before,
 .paragraphcounter > p:before {
 
-  	counter-increment: cf-rte-par-counter;
-	content: "#" counter(cf-rte-par-counter) "";
-	float: right;
-    color: black;
-    background-color: lightgray;
-    width: 40px;
-    text-align: center;
-    border-radius: 100%;
-    vertical-align: middle;
-    opacity: .5;
+  counter-increment: cf-rte-par-counter;
+  content: "#" counter(cf-rte-par-counter) "";
+  float: right;
+  color: black;
+  background-color: lightgray;
+  width: 40px;
+  text-align: center;
+  border-radius: 100%;
+  vertical-align: middle;
+  opacity: .5;
 
 }
 
 /* highlight every par block */
+.paragraphcounter > h1:before,
+.paragraphcounter > h2:before,
+.paragraphcounter > h3:before,
 .paragraphcounter > p {
 
-	border: 1px dashed rgba(0, 0, 0, .5);
+  border: 1px dashed rgba(0, 0, 0, .5);
 
 }

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/datalayer/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/redirectnotification/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/staticinclude/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/timing/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contenttemplate/v1/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/download/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/embedsource/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/external/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/link/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pageauthor/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedate/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedescription/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetags/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetitle/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/reference/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/table/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/text/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>

aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/common/.content.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder">
+</jcr:root>