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
The following commit(s) were added to refs/heads/master by this push:
new c0f25a3 Merging the content projects back in to take advantage of the
new JCR Content Loader Include / Exclude rules
c0f25a3 is described below
commit c0f25a36741bca22dab0cbe0f9fb2be9214ddba0
Author: Dan Klco <[email protected]>
AuthorDate: Wed Oct 21 22:50:10 2020 -0400
Merging the content projects back in to take advantage of the new JCR
Content Loader Include / Exclude rules
---
feature/src/main/features/base.json | 14 +++++++++-
.../features/oak/node-store/composite-runtime.json | 20 +++++++--------
.../features/oak/node-store/composite-seed.json | 8 ++++++
.../src/main/features/oak/node-store/segment.json | 10 --------
pom.xml | 2 --
reference-content/bnd.bnd | 1 -
reference-content/pom.xml | 30 ----------------------
.../src/main/resources/jcr_root/content.json | 3 ---
reference/bnd.bnd | 2 +-
.../main/resources/jcr_root/content/apache.json | 0
.../resources/jcr_root/etc/taxonomy/reference.json | 0
ui-content/bnd.bnd | 1 -
ui-content/pom.xml | 20 ---------------
ui-content/src/main/resources/jcr_root/ROOT.json | 5 ----
.../src/main/resources/jcr_root/content.json | 3 ---
.../resources/jcr_root/etc/i18n/jcr%3Acontent.json | 4 ---
.../jcr_root/etc/taxonomy/jcr%3Acontent.json | 4 ---
ui/bnd.bnd | 2 +-
.../src/main/resources/jcr_root/conf/global.json | 0
19 files changed, 33 insertions(+), 96 deletions(-)
diff --git a/feature/src/main/features/base.json
b/feature/src/main/features/base.json
index f01d2c6..d8d2969 100644
--- a/feature/src/main/features/base.json
+++ b/feature/src/main/features/base.json
@@ -273,7 +273,6 @@
"org.apache.sling.extensions.webconsolesecurityprovider",
"org.apache.sling.i18n",
"org.apache.sling.jcr.base",
- "org.apache.sling.jcr.contentloader",
"org.apache.sling.jcr.jackrabbit.usermanager",
"org.apache.sling.jcr.oak.server",
"org.apache.sling.jcr.repoinit",
@@ -292,6 +291,11 @@
"org.apache.sling.installer.factory.packages=sling-package-install"
]
},
+
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~jcr-contentloader":{
+ "user.mapping":[
+ "org.apache.sling.jcr.contentloader=sling-jcr-contentloader"
+ ]
+ },
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~jcr-install":{
"user.mapping":[
"org.apache.sling.installer.provider.jcr=sling-jcr-install"
@@ -375,6 +379,14 @@
"allow rep:write on /apps/sling/install",
"end",
"",
+ "# jcr-contentloader",
+ "create service user sling-jcr-contentloader",
+ "",
+ "set ACL for sling-jcr-contentloader",
+ "allow jcr:all on /",
+ "allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement on
:repository",
+ "end",
+ "",
"# content-package installer",
"create service user sling-package-install",
"",
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 2107456..8f605d0 100644
--- a/feature/src/main/features/oak/node-store/composite-runtime.json
+++ b/feature/src/main/features/oak/node-store/composite-runtime.json
@@ -1,14 +1,4 @@
{
- "bundles":[
- {
-
"id":"org.apache.sling:org.apache.sling.cms.reference-content:${cms.version}",
- "start-order":"10"
- },
- {
-
"id":"org.apache.sling:org.apache.sling.cms.ui-content:${cms.version}",
- "start-order":"5"
- }
- ],
"configurations": {
"org.apache.jackrabbit.oak.segment.SegmentNodeStoreService": {
"name": "Default NodeStore",
@@ -65,6 +55,16 @@
"registerDescriptors": true,
"dispatchChanges": true,
"repository.home": "sling/composite/repository-global"
+ },
+
"org.apache.sling.jcr.contentloader.internal.BundleContentLoaderListener": {
+ "includedTargets": [
+ "^\/.*$"
+ ],
+ "excludedTargets": [
+ "^\/apps\/.*$",
+ "^\/libs\/.*$",
+ "^\/oak:index\/.*$"
+ ]
}
}
}
\ No newline at end of file
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 78d9b56..ae26763 100644
--- a/feature/src/main/features/oak/node-store/composite-seed.json
+++ b/feature/src/main/features/oak/node-store/composite-seed.json
@@ -42,6 +42,14 @@
"/static",
"/jcr:system/rep:permissionStore/oak:mount-libs-default"
]
+ },
+
"org.apache.sling.jcr.contentloader.internal.BundleContentLoaderListener": {
+ "includedTargets": [
+ "^\/apps\/.*$",
+ "^\/libs\/.*$",
+ "^\/oak:index\/.*$",
+ "^\/static\/.*$"
+ ]
}
}
}
\ No newline at end of file
diff --git a/feature/src/main/features/oak/node-store/segment.json
b/feature/src/main/features/oak/node-store/segment.json
index c3a9370..a7e4eda 100644
--- a/feature/src/main/features/oak/node-store/segment.json
+++ b/feature/src/main/features/oak/node-store/segment.json
@@ -1,14 +1,4 @@
{
- "bundles": [
- {
- "id":
"org.apache.sling:org.apache.sling.cms.reference-content:${cms.version}",
- "start-order": "10"
- },
- {
- "id":
"org.apache.sling:org.apache.sling.cms.ui-content:${cms.version}",
- "start-order": "5"
- }
- ],
"configurations": {
"org.apache.jackrabbit.oak.segment.SegmentNodeStoreService": {
"name": "Default NodeStore",
diff --git a/pom.xml b/pom.xml
index d5bc21d..0969957 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,7 @@
<module>transformer</module>
<module>login</module>
<module>ui</module>
- <module>ui-content</module>
<module>reference</module>
- <module>reference-content</module>
<module>feature</module>
<module>archetype</module>
</modules>
diff --git a/reference-content/bnd.bnd b/reference-content/bnd.bnd
deleted file mode 100644
index 3704ab7..0000000
--- a/reference-content/bnd.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Sling-Initial-Content:
jcr_root;ignoreImportProviders:=xml,jcr_root/content/apache;overwrite:=false;uninstall:=false;path:=/content/apache,jcr_root/etc/taxonomy/reference;overwrite:=false;uninstall:=false;path:=/etc/taxonomy/reference,
\ No newline at end of file
diff --git a/reference-content/pom.xml b/reference-content/pom.xml
deleted file mode 100644
index 22a8f2e..0000000
--- a/reference-content/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with this work
for additional
- information regarding copyright ownership. The ASF licenses this file to
you under the Apache License, Version 2.0 (the "License"); you may not use this
file except
- in compliance with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or
agreed to
- in writing, software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. See
- the License for the specific language governing permissions and
limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.apache.sling.cms</artifactId>
- <groupId>org.apache.sling</groupId>
- <version>0.16.3-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.sling.cms.reference-content</artifactId>
- <name>Apache Sling - CMS Reference Content</name>
- <description>The content to support the Sling CMS Reference
App</description>
-
- <properties>
- <bnd.baseline.skip>true</bnd.baseline.skip>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/reference-content/src/main/resources/jcr_root/content.json
b/reference-content/src/main/resources/jcr_root/content.json
deleted file mode 100644
index e064ab5..0000000
--- a/reference-content/src/main/resources/jcr_root/content.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "jcr:primaryType": "sling:Folder"
-}
\ No newline at end of file
diff --git a/reference/bnd.bnd b/reference/bnd.bnd
index e941d56..0f9f5bf 100644
--- a/reference/bnd.bnd
+++ b/reference/bnd.bnd
@@ -1,2 +1,2 @@
-Sling-Initial-Content:
jcr_root;ignoreImportProviders:=xml,jcr_root/apps/reference;overwrite:=true;uninstall:=true;path:=/apps/reference,jcr_root/static/clientlibs/reference;overwrite=true;ignoreImportProviders:=xml;path:=/static/clientlibs/reference
+Sling-Initial-Content:
jcr_root;ignoreImportProviders:=xml,jcr_root/content/apache;overwrite:=false;uninstall:=false;path:=/content/apache,jcr_root/etc/taxonomy/reference;overwrite:=false;uninstall:=false;path:=/etc/taxonomy/reference,jcr_root;ignoreImportProviders:=xml,jcr_root/apps/reference;overwrite:=true;uninstall:=true;path:=/apps/reference,jcr_root/static/clientlibs/reference;overwrite=true;ignoreImportProviders:=xml;path:=/static/clientlibs/reference
Sling-Model-Packages:
org.apache.sling.cms.reference.models,org.apache.sling.cms.reference.forms.impl
\ No newline at end of file
diff --git a/reference-content/src/main/resources/jcr_root/content/apache.json
b/reference/src/main/resources/jcr_root/content/apache.json
similarity index 100%
rename from reference-content/src/main/resources/jcr_root/content/apache.json
rename to reference/src/main/resources/jcr_root/content/apache.json
diff --git
a/reference-content/src/main/resources/jcr_root/etc/taxonomy/reference.json
b/reference/src/main/resources/jcr_root/etc/taxonomy/reference.json
similarity index 100%
rename from
reference-content/src/main/resources/jcr_root/etc/taxonomy/reference.json
rename to reference/src/main/resources/jcr_root/etc/taxonomy/reference.json
diff --git a/ui-content/bnd.bnd b/ui-content/bnd.bnd
deleted file mode 100644
index f39368a..0000000
--- a/ui-content/bnd.bnd
+++ /dev/null
@@ -1 +0,0 @@
-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
\ No newline at end of file
diff --git a/ui-content/pom.xml b/ui-content/pom.xml
deleted file mode 100644
index f8e5bf4..0000000
--- a/ui-content/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with this work
for additional information regarding copyright ownership. The ASF licenses this
file to you under
-the Apache License, Version 2.0 (the "License"); you may not use this file
except in compliance with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or
agreed to in
-writing, software distributed under the License is distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and limitations
under the
-License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.apache.sling.cms</artifactId>
- <groupId>org.apache.sling</groupId>
- <version>0.16.3-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.sling.cms.ui-content</artifactId>
- <name>Apache Sling - CMS UI Content</name>
- <description>A bundle providing the User Interface Content for the Apache
Sling Reference CMS Application</description>
-
- <properties>
- <bnd.baseline.skip>true</bnd.baseline.skip>
- </properties>
-</project>
diff --git a/ui-content/src/main/resources/jcr_root/ROOT.json
b/ui-content/src/main/resources/jcr_root/ROOT.json
deleted file mode 100644
index ce0f9ed..0000000
--- a/ui-content/src/main/resources/jcr_root/ROOT.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "jcr:mixinTypes": [ "sling:Redirect","rep:AccessControllable" ],
- "sling:resourceType": "sling:redirect",
- "sling:target": "/cms/start.html"
-}
diff --git a/ui-content/src/main/resources/jcr_root/content.json
b/ui-content/src/main/resources/jcr_root/content.json
deleted file mode 100644
index e064ab5..0000000
--- a/ui-content/src/main/resources/jcr_root/content.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "jcr:primaryType": "sling:Folder"
-}
\ No newline at end of file
diff --git a/ui-content/src/main/resources/jcr_root/etc/i18n/jcr%3Acontent.json
b/ui-content/src/main/resources/jcr_root/etc/i18n/jcr%3Acontent.json
deleted file mode 100644
index 567db79..0000000
--- a/ui-content/src/main/resources/jcr_root/etc/i18n/jcr%3Acontent.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "jcr:primaryType": "nt:unstructured",
- "jcr:title": "i18n"
-}
\ No newline at end of file
diff --git
a/ui-content/src/main/resources/jcr_root/etc/taxonomy/jcr%3Acontent.json
b/ui-content/src/main/resources/jcr_root/etc/taxonomy/jcr%3Acontent.json
deleted file mode 100644
index 26d6e7e..0000000
--- a/ui-content/src/main/resources/jcr_root/etc/taxonomy/jcr%3Acontent.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "jcr:primaryType": "nt:unstructured",
- "jcr:title": "Taxonomy"
-}
\ No newline at end of file
diff --git a/ui/bnd.bnd b/ui/bnd.bnd
index f4a5425..b7be23c 100644
--- a/ui/bnd.bnd
+++ b/ui/bnd.bnd
@@ -1,3 +1,3 @@
Sling-Nodetypes: SLING-INF/nodetypes/nodetypes.cnd
-Sling-Initial-Content:
jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index,jcr_root/libs/sling/servlet/errorhandler;overwriteProperties:=true;overwrite:=true;uninstall:=true;path:=/libs/sling/servlet/errorhandler,jcr_root/libs/sling-cms;overwrite:=true;uninstall:=true;path:=/libs/sling-cms,jcr_root/static/clientlibs/sling-cms;overwrite:=true;uninstall:=true;path:=/static/clientlibs/sling-cms;ignoreImportProviders:=xml,jcr_root/static/clientlibs/sling-cms-editor;overwri
[...]
+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:
[...]
-includeresource: target/frontend/dist
\ No newline at end of file
diff --git a/ui-content/src/main/resources/jcr_root/conf/global.json
b/ui/src/main/resources/jcr_root/conf/global.json
similarity index 100%
rename from ui-content/src/main/resources/jcr_root/conf/global.json
rename to ui/src/main/resources/jcr_root/conf/global.json
