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 1a54f52892d2499dc944a06a4ced70077227e630 Author: Dan Klco <[email protected]> AuthorDate: Fri Oct 16 14:24:16 2020 -0400 Separating out the composite libs and global content --- pom.xml | 2 ++ reference-content/bnd.bnd | 1 + reference-content/pom.xml | 30 ++++++++++++++++++++++ .../src/main/resources/jcr_root/content.json | 3 +++ .../main/resources/jcr_root/content/apache.json | 0 .../resources/jcr_root/etc/taxonomy/reference.json | 0 reference/bnd.bnd | 4 +-- 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/conf/global.json | 0 .../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 | 3 +-- 15 files changed, 76 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0969957..d5bc21d 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,9 @@ <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 new file mode 100644 index 0000000..3704ab7 --- /dev/null +++ b/reference-content/bnd.bnd @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..22a8f2e --- /dev/null +++ b/reference-content/pom.xml @@ -0,0 +1,30 @@ +<?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 new file mode 100644 index 0000000..e064ab5 --- /dev/null +++ b/reference-content/src/main/resources/jcr_root/content.json @@ -0,0 +1,3 @@ +{ + "jcr:primaryType": "sling:Folder" +} \ No newline at end of file diff --git a/reference/src/main/resources/jcr_root/content/apache.json b/reference-content/src/main/resources/jcr_root/content/apache.json similarity index 100% rename from reference/src/main/resources/jcr_root/content/apache.json rename to reference-content/src/main/resources/jcr_root/content/apache.json diff --git a/reference/src/main/resources/jcr_root/etc/taxonomy/reference.json b/reference-content/src/main/resources/jcr_root/etc/taxonomy/reference.json similarity index 100% rename from reference/src/main/resources/jcr_root/etc/taxonomy/reference.json rename to reference-content/src/main/resources/jcr_root/etc/taxonomy/reference.json diff --git a/reference/bnd.bnd b/reference/bnd.bnd index bf4c100..e941d56 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/content/apache;overwrite:=false;uninstall:=false;path:=/content/apache,jcr_root/etc/taxonomy/reference;overwrite:=false;uninstall:=false;path:=/etc/taxonomy/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, +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-Model-Packages: org.apache.sling.cms.reference.models,org.apache.sling.cms.reference.forms.impl \ No newline at end of file diff --git a/ui-content/bnd.bnd b/ui-content/bnd.bnd new file mode 100644 index 0000000..f39368a --- /dev/null +++ b/ui-content/bnd.bnd @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..f8e5bf4 --- /dev/null +++ b/ui-content/pom.xml @@ -0,0 +1,20 @@ +<?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 new file mode 100644 index 0000000..ce0f9ed --- /dev/null +++ b/ui-content/src/main/resources/jcr_root/ROOT.json @@ -0,0 +1,5 @@ +{ + "jcr:mixinTypes": [ "sling:Redirect","rep:AccessControllable" ], + "sling:resourceType": "sling:redirect", + "sling:target": "/cms/start.html" +} diff --git a/ui/src/main/resources/jcr_root/libs/conf.json b/ui-content/src/main/resources/jcr_root/conf/global.json similarity index 100% rename from ui/src/main/resources/jcr_root/libs/conf.json rename to ui-content/src/main/resources/jcr_root/conf/global.json diff --git a/ui-content/src/main/resources/jcr_root/content.json b/ui-content/src/main/resources/jcr_root/content.json new file mode 100644 index 0000000..e064ab5 --- /dev/null +++ b/ui-content/src/main/resources/jcr_root/content.json @@ -0,0 +1,3 @@ +{ + "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 new file mode 100644 index 0000000..567db79 --- /dev/null +++ b/ui-content/src/main/resources/jcr_root/etc/i18n/jcr%3Acontent.json @@ -0,0 +1,4 @@ +{ + "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 new file mode 100644 index 0000000..26d6e7e --- /dev/null +++ b/ui-content/src/main/resources/jcr_root/etc/taxonomy/jcr%3Acontent.json @@ -0,0 +1,4 @@ +{ + "jcr:primaryType": "nt:unstructured", + "jcr:title": "Taxonomy" +} \ No newline at end of file diff --git a/ui/bnd.bnd b/ui/bnd.bnd index 0f52367..f4a5425 100644 --- a/ui/bnd.bnd +++ b/ui/bnd.bnd @@ -1,4 +1,3 @@ Sling-Nodetypes: SLING-INF/nodetypes/nodetypes.cnd -Sling-Initial-Content: jcr_root;overwriteProperties=true;overwrite=false;ignoreImportProviders:=xml,jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index,jcr_root/conf/global;overwrite:=false;uninstall:=true;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/libs/sling/servlet/errorhandler;overwriteProperties:=true;overwrite:=true;un [...] - +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 [...] -includeresource: target/frontend/dist \ No newline at end of file
