[sling-org-apache-sling-app-cms] 04/04: Removing duplicate sling directory, updating to the latest feature launcher and fixing the seed log format

[dk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 50091e7608c3153b3564875013379d293623f4bc
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Oct 22 12:27:01 2020 -0400

    Removing duplicate sling directory, updating to the latest feature launcher and fixing the seed log format
---
 docker/cms/setup-composite.sh                                  | 10 +++++-----
 docker/docker-compose.yml                                      |  4 ++--
 feature/pom.xml                                                |  2 +-
 .../src/main/features/oak/node-store/composite-runtime.json    |  7 ++++---
 feature/src/main/features/oak/node-store/composite-seed.json   |  6 +++---
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/docker/cms/setup-composite.sh b/docker/cms/setup-composite.sh
index 4a82313..776156b 100644
--- a/docker/cms/setup-composite.sh
+++ b/docker/cms/setup-composite.sh
@@ -45,10 +45,10 @@ if [ $STARTED -eq 1 ]; then
     exit 2
 else
     echo "Cleaning up seeding..."
-    rm -rf /opt/slingcms/launcher
-    cd sling/composite/repository-libs
-    ln -s segmentstore segmentstore-composite-mount-libs
-    cd ../../..
-    rm -rf /opt/slingcms/setup
+    rm -rf /opt/slingcms/launcher/framework /opt/slingcms/launcher/logs \
+        /opt/slingcms/launcher/repository /opt/slingcms/launcher/resources \
+        /opt/slingcms/setup
+    ln -s /opt/slingcms/launcher/composite/repository-libs/segmentstore \
+        /opt/slingcms/launcher/composite/repository-libs/segmentstore-composite-mount-libs
 fi
 echo "Repository seeded successfully!"
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 2441c5f..a50a1c1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -19,7 +19,7 @@ services:
     ports:
       - "8080:8080"
     volumes:
-      - sling-author:/opt/slingcms/sling/composite/repository-global
+      - sling-author:/opt/slingcms/launcher/composite/repository-global
   renderer:
     build: 
       context: cms
@@ -28,7 +28,7 @@ services:
     ports:
       - "8090:8080"
     volumes:
-      - sling-renderer:/opt/slingcms/sling/composite/repository-global
+      - sling-renderer:/opt/slingcms/launcher/composite/repository-global
   webcache:
     build: webcache
     ports:
diff --git a/feature/pom.xml b/feature/pom.xml
index d6896e2..24e7b18 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -223,7 +223,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.feature.launcher</artifactId>
-            <version>1.1.6</version>
+            <version>1.1.8</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/feature/src/main/features/oak/node-store/composite-runtime.json b/feature/src/main/features/oak/node-store/composite-runtime.json
index 8f605d0..ac59553 100644
--- a/feature/src/main/features/oak/node-store/composite-runtime.json
+++ b/feature/src/main/features/oak/node-store/composite-runtime.json
@@ -47,14 +47,14 @@
             "role": "composite-mount-libs",
             "customBlobStore": false,
             "nodeDeduplicationCache.size": 0,
-            "repository.home": "sling/composite/repository-libs"
+            "repository.home": "${sling.home}/composite/repository-libs"
         },
         "org.apache.jackrabbit.oak.segment.SegmentNodeStoreFactory~global": {
             "service.ranking": 100,
             "role": "composite-global",
             "registerDescriptors": true,
             "dispatchChanges": true,
-            "repository.home": "sling/composite/repository-global"
+            "repository.home": "${sling.home}/composite/repository-global"
         },
         "org.apache.sling.jcr.contentloader.internal.BundleContentLoaderListener": {
             "includedTargets": [
@@ -63,7 +63,8 @@
             "excludedTargets": [
                 "^\/apps\/.*$",
                 "^\/libs\/.*$",
-                "^\/oak:index\/.*$"
+                "^\/oak:index\/.*$",
+                "^\/static\/.*$"
             ]
         }
     }
diff --git a/feature/src/main/features/oak/node-store/composite-seed.json b/feature/src/main/features/oak/node-store/composite-seed.json
index ae26763..07d2eb6 100644
--- a/feature/src/main/features/oak/node-store/composite-seed.json
+++ b/feature/src/main/features/oak/node-store/composite-seed.json
@@ -7,7 +7,7 @@
             "name": "Default NodeStore"
         },
         "org.apache.sling.commons.log.LogManager.factory.config~oak.log": {
-            "org.apache.sling.commons.log.pattern": "%-4r [%t] %-5p %c %x - %m%n",
+            "org.apache.sling.commons.log.pattern": "%d{dd.MM.yyyy HH:mm:ss.SSS} *%level* [%thread] %logger %msg%n",
             "org.apache.sling.commons.log.names": [
                 "org.apache.jackrabbit.oak"
             ],
@@ -15,7 +15,7 @@
             "org.apache.sling.commons.log.file": "logs/oak.log"
         },
         "org.apache.sling.commons.log.LogManager.factory.config~composum.log": {
-            "org.apache.sling.commons.log.pattern": "%-4r [%t] %-5p %c %x - %m%n",
+            "org.apache.sling.commons.log.pattern": "%d{dd.MM.yyyy HH:mm:ss.SSS} *%level* [%thread] %logger %msg%n",
             "org.apache.sling.commons.log.names": [
                 "com.composum"
             ],
@@ -24,7 +24,7 @@
         },
         "org.apache.jackrabbit.oak.segment.SegmentNodeStoreService~global": {
             "name": "Default NodeStore",
-            "repository.home": "sling/composite/repository-libs"
+            "repository.home": "${sling.home}/composite/repository-libs"
         },
         "org.apache.jackrabbit.oak.composite.CrossMountReferenceValidatorProvider": {
             "failOnDetection": true