You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/10/22 16:27:13 UTC
[sling-org-apache-sling-app-cms] branch master updated (c0f25a3 ->
50091e7)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
from c0f25a3 Merging the content projects back in to take advantage of the new JCR Content Loader Include / Exclude rules
new 95f7427 Minor - bumping to the current version of the Sling JSP Taglib
new a0a083d Adding a healthcheck to ensure the content is installed
new 9d63a5d Fixing typo in the bnd file
new 50091e7 Removing duplicate sling directory, updating to the latest feature launcher and fixing the seed log format
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/resources/archetype-resources/pom.xml | 2 +-
docker/cms/setup-composite.sh | 10 +-
docker/docker-compose.yml | 4 +-
feature/pom.xml | 2 +-
feature/src/main/features/healthcheck.json | 101 +++++++++++----------
.../features/oak/node-store/composite-runtime.json | 7 +-
.../features/oak/node-store/composite-seed.json | 6 +-
pom.xml | 6 ++
reference/pom.xml | 1 -
ui/bnd.bnd | 2 +-
ui/pom.xml | 2 -
11 files changed, 77 insertions(+), 66 deletions(-)
[sling-org-apache-sling-app-cms] 04/04: Removing duplicate sling
directory,
updating to the latest feature launcher and fixing the seed log format
Posted by 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
[sling-org-apache-sling-app-cms] 01/04: Minor - bumping to the
current version of the Sling JSP Taglib
Posted by 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 95f74273ad349a66c38a5e75f214252296932794
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Oct 22 12:25:20 2020 -0400
Minor - bumping to the current version of the Sling JSP Taglib
---
archetype/src/main/resources/archetype-resources/pom.xml | 2 +-
pom.xml | 6 ++++++
reference/pom.xml | 1 -
ui/pom.xml | 2 --
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
index 3ca0dae..e82eacd 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -202,7 +202,7 @@ Sling-Model-Packages: ${package}
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.jsp.taglib</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
<scope>provided</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 0969957..897c153 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,6 +207,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.jsp.taglib</artifactId>
+ <version>2.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.post</artifactId>
<version>2.3.30</version>
diff --git a/reference/pom.xml b/reference/pom.xml
index 69a40c4..79db357 100644
--- a/reference/pom.xml
+++ b/reference/pom.xml
@@ -118,7 +118,6 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.jsp.taglib</artifactId>
- <version>2.3.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/ui/pom.xml b/ui/pom.xml
index 7528995..39168e3 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -33,8 +33,6 @@ License. -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.jsp.taglib</artifactId>
- <version>2.3.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
[sling-org-apache-sling-app-cms] 02/04: Adding a healthcheck to
ensure the content is installed
Posted by 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 a0a083d39abe0c3b1bde5c5e5db2c4a40be5f0d6
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Oct 22 12:25:49 2020 -0400
Adding a healthcheck to ensure the content is installed
---
feature/src/main/features/healthcheck.json | 101 +++++++++++++++--------------
1 file changed, 54 insertions(+), 47 deletions(-)
diff --git a/feature/src/main/features/healthcheck.json b/feature/src/main/features/healthcheck.json
index b947e58..fa30554 100644
--- a/feature/src/main/features/healthcheck.json
+++ b/feature/src/main/features/healthcheck.json
@@ -1,72 +1,71 @@
-
{
- "bundles":[
+ "bundles": [
{
- "id":"org.apache.felix:org.apache.felix.healthcheck.api:2.0.4",
- "start-order":"5"
+ "id": "org.apache.felix:org.apache.felix.healthcheck.api:2.0.4",
+ "start-order": "5"
},
{
- "id":"org.apache.felix:org.apache.felix.healthcheck.core:2.0.8",
- "start-order":"5"
+ "id": "org.apache.felix:org.apache.felix.healthcheck.core:2.0.8",
+ "start-order": "5"
},
{
- "id":"org.apache.felix:org.apache.felix.healthcheck.generalchecks:2.0.6",
- "start-order":"5"
+ "id": "org.apache.felix:org.apache.felix.healthcheck.generalchecks:2.0.6",
+ "start-order": "5"
},
{
- "id":"org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin:2.0.2",
- "start-order":"5"
+ "id": "org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin:2.0.2",
+ "start-order": "5"
},
{
- "id":"org.apache.sling:org.apache.sling.hc.api:1.0.4",
- "start-order":"20"
+ "id": "org.apache.sling:org.apache.sling.hc.api:1.0.4",
+ "start-order": "20"
},
{
- "id":"org.apache.sling:org.apache.sling.hc.support:1.0.6",
- "start-order":"20"
+ "id": "org.apache.sling:org.apache.sling.hc.support:1.0.6",
+ "start-order": "20"
}
],
- "configurations":{
- "org.apache.felix.hc.generalchecks.BundlesStartedCheck":{
- "hc.tags":[
+ "configurations": {
+ "org.apache.felix.hc.generalchecks.BundlesStartedCheck": {
+ "hc.tags": [
"bundles"
]
},
- "org.apache.felix.hc.generalchecks.CpuCheck":{
- "hc.tags":[
+ "org.apache.felix.hc.generalchecks.CpuCheck": {
+ "hc.tags": [
"cpu",
"system-resources"
],
- "cpuPercentageThresholdWarn":95
+ "cpuPercentageThresholdWarn": 95
},
- "org.apache.felix.hc.generalchecks.DiskSpaceCheck":{
- "hc.tags":[
+ "org.apache.felix.hc.generalchecks.DiskSpaceCheck": {
+ "hc.tags": [
"diskspace",
"system-resources"
],
- "diskPaths":[
+ "diskPaths": [
"."
]
},
- "org.apache.felix.hc.generalchecks.FrameworkStartCheck":{
- "hc.tags":[
+ "org.apache.felix.hc.generalchecks.FrameworkStartCheck": {
+ "hc.tags": [
"systemalive"
],
- "targetStartLevel:Integer":"30"
+ "targetStartLevel": 30
},
- "org.apache.felix.hc.generalchecks.MemoryCheck":{
- "hc.tags":[
+ "org.apache.felix.hc.generalchecks.MemoryCheck": {
+ "hc.tags": [
"memory",
"system-resources"
],
- "heapUsedPercentageThresholdCritical":100,
- "heapUsedPercentageThresholdWarn":95
+ "heapUsedPercentageThresholdCritical": 100,
+ "heapUsedPercentageThresholdWarn": 95
},
- "org.apache.felix.hc.generalchecks.ServicesCheck":{
- "hc.tags":[
+ "org.apache.felix.hc.generalchecks.ServicesCheck": {
+ "hc.tags": [
"systemalive"
],
- "services.list":[
+ "services.list": [
"org.apache.sling.jcr.api.SlingRepository",
"org.apache.sling.engine.auth.Authenticator",
"org.apache.sling.api.resource.ResourceResolverFactory",
@@ -74,29 +73,37 @@
"javax.script.ScriptEngineManager"
]
},
- "org.apache.felix.hc.generalchecks.ThreadUsageCheck":{
- "hc.tags":[
+ "org.apache.felix.hc.generalchecks.ThreadUsageCheck": {
+ "hc.tags": [
"threads",
"cpu",
"system-resources"
]
},
- "org.apache.felix.hc.core.impl.filter.ServiceUnavailableFilter~startupandshutdown":{
- "osgi.http.whiteboard.filter.regex":"(?!/system/).*",
- "avoid404DuringStartup":true,
- "service.ranking:Integer":"2147483647",
- "includeExecutionResult":false,
- "osgi.http.whiteboard.context.select":"(osgi.http.whiteboard.context.name=*)",
- "tags":[
+ "org.apache.felix.hc.core.impl.filter.ServiceUnavailableFilter~startupandshutdown": {
+ "osgi.http.whiteboard.filter.regex": "(?!/system/).*",
+ "avoid404DuringStartup": true,
+ "service.ranking:Integer": "2147483647",
+ "includeExecutionResult": false,
+ "osgi.http.whiteboard.context.select": "(osgi.http.whiteboard.context.name=*)",
+ "tags": [
"systemalive"
],
- "autoDisableFilter":true,
- "responseTextFor503":"classpath:org.apache.sling.cms.ui:/content/startup/index.html"
+ "autoDisableFilter": true,
+ "responseTextFor503": "classpath:org.apache.sling.cms.ui:/content/startup/index.html"
},
- "org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~hc-support":{
- "user.mapping":[
+ "org.apache.sling.jcr.contentloader.hc.BundleContentLoadedCheck~default": {
+ "tags": [
+ "systemalive"
+ ],
+ "includesRegex": ".*",
+ "useCriticalForNotLoaded": true,
+ "excludesRegex": ""
+ },
+ "org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~hc-support": {
+ "user.mapping": [
"org.apache.sling.hc.support=sling-readall"
]
}
}
-}
+}
\ No newline at end of file
[sling-org-apache-sling-app-cms] 03/04: Fixing typo in the bnd file
Posted by 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 9d63a5df8658457d0f3efde37864983ea77d2319
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Oct 22 12:26:04 2020 -0400
Fixing typo in the bnd file
---
ui/bnd.bnd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/bnd.bnd b/ui/bnd.bnd
index b7be23c..bd2763c 100644
--- a/ui/bnd.bnd
+++ b/ui/bnd.bnd
@@ -1,3 +1,3 @@
Sling-Nodetypes: SLING-INF/nodetypes/nodetypes.cnd
-Sling-Initial-Content: cr_root;overwriteProperties=true;overwrite=false;ignoreImportProviders:=xml,jcr_root/conf/global;overwrite=true;ignoreImportProviders:=xml;path:=/conf/global,jcr_root/etc/clientlibs;overwrite=true;ignoreImportProviders:=xml;path:=/etc/clientlibs,jcr_root/etc/taxonomy;overwrite:=false;uninstall:=true;path:=/etc/taxonomy,jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index,jcr_root/libs/sling/servlet/errorhandler;overwriteProperties:=true;overwrite: [...]
+Sling-Initial-Content: jcr_root;overwriteProperties=true;overwrite=false;ignoreImportProviders:=xml,jcr_root/conf/global;overwrite=true;ignoreImportProviders:=xml;path:=/conf/global,jcr_root/etc/clientlibs;overwrite=true;ignoreImportProviders:=xml;path:=/etc/clientlibs,jcr_root/etc/taxonomy;overwrite:=false;uninstall:=true;path:=/etc/taxonomy,jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index,jcr_root/libs/sling/servlet/errorhandler;overwriteProperties:=true;overwrite [...]
-includeresource: target/frontend/dist
\ No newline at end of file