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/16 18:26:57 UTC

[sling-org-apache-sling-app-cms] branch master updated (d7358bd -> a316c7e)

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 d7358bd  Updating to put the error pages and configurations in the seed mount
     new 79e3faf  Updated the path of the error pages so they are publically available
     new e6f055a  Updating the icons so we don't run into issues with the composite repository
     new 8d7f6fe  Adding a custom login fragment
     new 2cc7a77  Updated to search for transformations out of /apps and /libs
     new 1a54f52  Separating out the composite libs and global content
     new a316c7e  Updated docker / feature configuration to setup a working pair of instances automatically

The 6 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:
 .../apache/sling/cms/core/models/ErrorHandler.java |   2 +-
 docker/cms/Dockerfile                              |  10 +-
 docker/cms/config-author.json                      |  56 ++++++++
 .../cms/config-renderer.json                       |  16 +--
 docker/cms/config-standalone.json                  |   3 +
 docker/cms/download-dependencies.sh                |   2 +-
 docker/docker-compose.yml                          |   6 +-
 docs/error-pages.md                                |   4 +-
 feature/pom.xml                                    |  10 --
 feature/src/main/assembly/author.xml               |  56 --------
 feature/src/main/assembly/renderer.xml             |  56 --------
 feature/src/main/features/app/cms.json             |   4 +
 .../features/oak/node-store/composite-runtime.json |  10 ++
 .../src/main/features/oak/node-store/segment.json  |  10 ++
 feature/src/main/features/oak/oak_base.json        |   2 +-
 feature/src/main/features/runmodes/author.json     |   8 +-
 feature/src/main/features/runmodes/renderer.json   |  36 ++----
 login/bnd.bnd                                      |   1 +
 login/pom.xml                                      |  33 +++++
 .../apache/sling/auth/form/impl}/package-info.java |   6 +-
 .../apache/sling/auth/form/impl/custom_login.html  | 142 +++++++++++++++++++++
 pom.xml                                            |   3 +
 reference-content/bnd.bnd                          |   1 +
 reference-content/pom.xml                          |  30 +++++
 .../src/main/resources/jcr_root}/content.json      |   0
 .../main/resources/jcr_root/content/apache.json    |   0
 .../resources/jcr_root/etc/taxonomy/reference.json |   0
 reference/bnd.bnd                                  |   4 +-
 .../cms/transformer/internal/TransformServlet.java |   3 +-
 ui-content/bnd.bnd                                 |   1 +
 {archetype => ui-content}/pom.xml                  |  35 +----
 .../src/main/resources/jcr_root/ROOT.json          |   0
 .../src/main/resources/jcr_root/conf/global.json   |   0
 .../src/main/resources/jcr_root}/content.json      |   0
 .../resources/jcr_root/etc/i18n/jcr%3Acontent.json |   0
 .../jcr_root/etc/taxonomy/jcr%3Acontent.json       |   0
 ui/bnd.bnd                                         |   3 +-
 .../components/cms/contentgrid/contentgrid.jsp     |   8 +-
 .../libs/sling-cms/content/publication/home.json   |   8 +-
 .../sling-cms}/errorhandling/401.json              |   0
 .../sling-cms}/errorhandling/403.json              |   0
 .../sling-cms}/errorhandling/404.json              |   0
 .../sling-cms}/errorhandling/default.json          |   0
 .../sling-cms/thumbnails/bulk-publication.png      | Bin 4080 -> 15642 bytes
 .../static/sling-cms/thumbnails/exporter.png       | Bin 3833 -> 12411 bytes
 .../jcr_root/static/sling-cms/thumbnails/file.png  | Bin 2326 -> 4291 bytes
 .../static/sling-cms/thumbnails/folder.png         | Bin 1621 -> 3186 bytes
 .../static/sling-cms/thumbnails/importer.png       | Bin 3838 -> 12497 bytes
 .../jcr_root/static/sling-cms/thumbnails/page.png  | Bin 1278 -> 2917 bytes
 .../static/sling-cms/thumbnails/publish-agent.png  | Bin 3013 -> 7686 bytes
 .../jcr_root/static/sling-cms/thumbnails/site.png  | Bin 1553 -> 3279 bytes
 51 files changed, 338 insertions(+), 231 deletions(-)
 create mode 100644 docker/cms/config-author.json
 copy feature/src/main/features/runmodes/renderer.json => docker/cms/config-renderer.json (57%)
 create mode 100644 docker/cms/config-standalone.json
 delete mode 100644 feature/src/main/assembly/author.xml
 delete mode 100644 feature/src/main/assembly/renderer.xml
 create mode 100644 login/bnd.bnd
 create mode 100644 login/pom.xml
 copy {api/src/main/java/org/apache/sling/cms/readability => login/src/main/java/org/apache/sling/auth/form/impl}/package-info.java (90%)
 create mode 100644 login/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html
 create mode 100644 reference-content/bnd.bnd
 create mode 100644 reference-content/pom.xml
 copy {ui/src/main/resources/jcr_root/libs/sling-cms => reference-content/src/main/resources/jcr_root}/content.json (100%)
 rename {reference => reference-content}/src/main/resources/jcr_root/content/apache.json (100%)
 rename {reference => reference-content}/src/main/resources/jcr_root/etc/taxonomy/reference.json (100%)
 create mode 100644 ui-content/bnd.bnd
 copy {archetype => ui-content}/pom.xml (57%)
 copy {ui => ui-content}/src/main/resources/jcr_root/ROOT.json (100%)
 rename ui/src/main/resources/jcr_root/libs/conf.json => ui-content/src/main/resources/jcr_root/conf/global.json (100%)
 copy {ui/src/main/resources/jcr_root/libs/sling-cms => ui-content/src/main/resources/jcr_root}/content.json (100%)
 copy {ui => ui-content}/src/main/resources/jcr_root/etc/i18n/jcr%3Acontent.json (100%)
 copy {ui => ui-content}/src/main/resources/jcr_root/etc/taxonomy/jcr%3Acontent.json (100%)
 rename ui/src/main/resources/jcr_root/{libs/sling-cms/content => static/sling-cms}/errorhandling/401.json (100%)
 rename ui/src/main/resources/jcr_root/{libs/sling-cms/content => static/sling-cms}/errorhandling/403.json (100%)
 rename ui/src/main/resources/jcr_root/{libs/sling-cms/content => static/sling-cms}/errorhandling/404.json (100%)
 rename ui/src/main/resources/jcr_root/{libs/sling-cms/content => static/sling-cms}/errorhandling/default.json (100%)


[sling-org-apache-sling-app-cms] 01/06: Updated the path of the error pages so they are publically available

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 79e3faf7163caa626c7af89f8ce560840f505dad
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Oct 16 14:15:03 2020 -0400

    Updated the path of the error pages so they are publically available
---
 core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java | 2 +-
 docs/error-pages.md                                                   | 4 ++--
 .../sling-cms/content => static/sling-cms}/errorhandling/401.json     | 0
 .../sling-cms/content => static/sling-cms}/errorhandling/403.json     | 0
 .../sling-cms/content => static/sling-cms}/errorhandling/404.json     | 0
 .../sling-cms/content => static/sling-cms}/errorhandling/default.json | 0
 6 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java b/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java
index 388838c..2799bcd 100644
--- a/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java
+++ b/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java
@@ -135,7 +135,7 @@ public class ErrorHandler {
     /**
      * Path under which the error pages for Sling CMS can be found.
      */
-    public static final String SLING_CMS_ERROR_PATH = "/libs/sling-cms/content/errorhandling/";
+    public static final String SLING_CMS_ERROR_PATH = "/static/sling-cms/errorhandling/";
 
     @RequestAttribute
     @Named(SlingConstants.ERROR_STATUS)
diff --git a/docs/error-pages.md b/docs/error-pages.md
index 274f376..0dd6630 100644
--- a/docs/error-pages.md
+++ b/docs/error-pages.md
@@ -16,8 +16,8 @@ When a user encounters an error on a Sling CMS site, Sling CMS will attempt to p
 
  - Check for a `sling:Page` at */content/[SITE_GROUP]/[SITE_NAME]/errors/[STATUS_CODE]*
  - Check for a `sling:Page` at */content/[SITE_GROUP]/[SITE_NAME]/errors/default*
- - Check for a `sling:Page` at */libs/sling-cms/content/errorhandling/[STATUS_CODE]*
- - Check for a `sling:Page` at */libs/sling-cms/content/errorhandling/default*
+ - Check for a `sling:Page` at */static/sling-cms/errorhandling/[STATUS_CODE]*
+ - Check for a `sling:Page` at */static/sling-cms/errorhandling/default*
  
 This allows you to customize the response to an error while not providing too much information to your users. For example, if you provide the following structure:
 
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/401.json b/ui/src/main/resources/jcr_root/static/sling-cms/errorhandling/401.json
similarity index 100%
rename from ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/401.json
rename to ui/src/main/resources/jcr_root/static/sling-cms/errorhandling/401.json
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/403.json b/ui/src/main/resources/jcr_root/static/sling-cms/errorhandling/403.json
similarity index 100%
rename from ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/403.json
rename to ui/src/main/resources/jcr_root/static/sling-cms/errorhandling/403.json
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/404.json b/ui/src/main/resources/jcr_root/static/sling-cms/errorhandling/404.json
similarity index 100%
rename from ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/404.json
rename to ui/src/main/resources/jcr_root/static/sling-cms/errorhandling/404.json
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/default.json b/ui/src/main/resources/jcr_root/static/sling-cms/errorhandling/default.json
similarity index 100%
rename from ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/default.json
rename to ui/src/main/resources/jcr_root/static/sling-cms/errorhandling/default.json


[sling-org-apache-sling-app-cms] 02/06: Updating the icons so we don't run into issues with the composite repository

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 e6f055a4e2a32e0d9a8aa0cda48327f3753f21d0
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Oct 16 14:19:18 2020 -0400

    Updating the icons so we don't run into issues with the composite repository
---
 .../components/cms/contentgrid/contentgrid.jsp       |   8 ++++----
 .../libs/sling-cms/content/publication/home.json     |   8 ++++----
 .../static/sling-cms/thumbnails/bulk-publication.png | Bin 4080 -> 15642 bytes
 .../static/sling-cms/thumbnails/exporter.png         | Bin 3833 -> 12411 bytes
 .../jcr_root/static/sling-cms/thumbnails/file.png    | Bin 2326 -> 4291 bytes
 .../jcr_root/static/sling-cms/thumbnails/folder.png  | Bin 1621 -> 3186 bytes
 .../static/sling-cms/thumbnails/importer.png         | Bin 3838 -> 12497 bytes
 .../jcr_root/static/sling-cms/thumbnails/page.png    | Bin 1278 -> 2917 bytes
 .../static/sling-cms/thumbnails/publish-agent.png    | Bin 3013 -> 7686 bytes
 .../jcr_root/static/sling-cms/thumbnails/site.png    | Bin 1553 -> 3279 bytes
 10 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
index e680f54..d05b81c 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
@@ -49,10 +49,10 @@
                                             <img src="${child.path}.transform/sling-cms-thumbnail.png" loading="lazy" alt="${child.name}">
                                         </c:when>
                                         <c:when test="${child.resourceType == 'sling:Site'}">
-                                            <img src="/static/sling-cms/thumbnails/site.png.transform/sling-cms-thumbnail.png" loading="lazy" alt="${sling:encode(child.name, 'HTML_ATTR')}">
+                                            <img src="/static/sling-cms/thumbnails/site.png" loading="lazy" alt="${sling:encode(child.name, 'HTML_ATTR')}">
                                         </c:when>
                                         <c:when test="${child.resourceType == 'sling:OrderedFolder' || child.resourceType == 'sling:Folder' || child.resourceType == 'nt:folder'}">
-                                            <img src="/static/sling-cms/thumbnails/folder.png.transform/sling-cms-thumbnail.png" loading="lazy" alt="${sling:encode(child.name, 'HTML_ATTR')}">
+                                            <img src="/static/sling-cms/thumbnails/folder.png" loading="lazy" alt="${sling:encode(child.name, 'HTML_ATTR')}">
                                         </c:when>
                                         <c:when test="${child.resourceType == 'sling:Page'}">
                                             <c:set var="templateThumbnail" value="${child.valueMap['jcr:content/sling:template']}/thumbnail"/>
@@ -61,12 +61,12 @@
                                                     <img src="${templateThumbnail}.transform/sling-cms-thumbnail.png" loading="lazy" alt="${sling:encode(child.name, 'HTML_ATTR')}">
                                                 </c:when>
                                                 <c:otherwise>
-                                                    <img src="/static/sling-cms/thumbnails/page.png.transform/sling-cms-thumbnail.png" loading="lazy" alt="${child.name}">
+                                                    <img src="/static/sling-cms/thumbnails/page.png" loading="lazy" alt="${child.name}">
                                                 </c:otherwise>
                                             </c:choose>
                                         </c:when>
                                         <c:otherwise>
-                                            <img src="/static/sling-cms/thumbnails/file.png.transform/sling-cms-thumbnail.png" loading="lazy" alt="${child.name}">
+                                            <img src="/static/sling-cms/thumbnails/file.png" loading="lazy" alt="${child.name}">
                                         </c:otherwise>
                                     </c:choose>
                                 </figure>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/home.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/home.json
index 65e922e..8d93902 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/home.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/home.json
@@ -22,28 +22,28 @@
                 "agents": {
                     "jcr:primaryType": "nt:unstructured",
                     "sling:resourceType": "sling-cms/components/cms/tilecard",
-                    "image": "/static/sling-cms/thumbnails/publish-agent.png.transform/sling-cms-thumbnail.png",
+                    "image": "/static/sling-cms/thumbnails/publish-agent.png",
                     "link": "/cms/publication/agents.html/libs/sling/distribution/settings/agents",
                     "title": "Agents"
                 },
                 "bulk-publication": {
                     "jcr:primaryType": "nt:unstructured",
                     "sling:resourceType": "sling-cms/components/cms/tilecard",
-                    "image": "/static/sling-cms/thumbnails/bulk-publication.png.transform/sling-cms-thumbnail.png",
+                    "image": "/static/sling-cms/thumbnails/bulk-publication.png",
                     "link": "/cms/jobs/list.html",
                     "title": "Bulk Publication"
                 },
                 "exporters": {
                     "jcr:primaryType": "nt:unstructured",
                     "sling:resourceType": "sling-cms/components/cms/tilecard",
-                    "image": "/static/sling-cms/thumbnails/exporter.png.transform/sling-cms-thumbnail.png",
+                    "image": "/static/sling-cms/thumbnails/exporter.png",
                     "link": "/cms/publication/exporters.html/libs/sling/distribution/settings/exporters",
                     "title": "Exporters"
                 },
                 "importers": {
                     "jcr:primaryType": "nt:unstructured",
                     "sling:resourceType": "sling-cms/components/cms/tilecard",
-                    "image": "/static/sling-cms/thumbnails/importer.png.transform/sling-cms-thumbnail.png",
+                    "image": "/static/sling-cms/thumbnails/importer.png",
                     "link": "/cms/publication/importers.html/libs/sling/distribution/settings/importers",
                     "title": "Importers"
                 }
diff --git a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/bulk-publication.png b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/bulk-publication.png
index b4e5c5c..cd96af1 100644
Binary files a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/bulk-publication.png and b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/bulk-publication.png differ
diff --git a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/exporter.png b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/exporter.png
index 8c63b29..f694aeb 100644
Binary files a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/exporter.png and b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/exporter.png differ
diff --git a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/file.png b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/file.png
index 690cdb3..53ee1ee 100644
Binary files a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/file.png and b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/file.png differ
diff --git a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/folder.png b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/folder.png
index cb19af5..ff6874e 100644
Binary files a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/folder.png and b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/folder.png differ
diff --git a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/importer.png b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/importer.png
index 4723a15..8b08d51 100644
Binary files a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/importer.png and b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/importer.png differ
diff --git a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/page.png b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/page.png
index 96de0c0..29c88b6 100644
Binary files a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/page.png and b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/page.png differ
diff --git a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/publish-agent.png b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/publish-agent.png
index 705007e..9768b38 100644
Binary files a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/publish-agent.png and b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/publish-agent.png differ
diff --git a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/site.png b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/site.png
index 5a29f8e..5847eb5 100644
Binary files a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/site.png and b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/site.png differ


[sling-org-apache-sling-app-cms] 03/06: Adding a custom login fragment

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 8d7f6fea5de14b7f4b551daf4564cd8325dfccb2
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Oct 16 14:22:02 2020 -0400

    Adding a custom login fragment
---
 feature/src/main/features/app/cms.json             |   4 +
 login/bnd.bnd                                      |   1 +
 login/pom.xml                                      |  33 +++++
 .../apache/sling/auth/form/impl/package-info.java  |  26 ++++
 .../apache/sling/auth/form/impl/custom_login.html  | 142 +++++++++++++++++++++
 pom.xml                                            |   1 +
 6 files changed, 207 insertions(+)

diff --git a/feature/src/main/features/app/cms.json b/feature/src/main/features/app/cms.json
index 75269de..407e5b2 100644
--- a/feature/src/main/features/app/cms.json
+++ b/feature/src/main/features/app/cms.json
@@ -99,6 +99,10 @@
             "start-order":"20"
         },
         {
+            "id":"org.apache.sling:org.apache.sling.cms.login:${cms.version}",
+            "start-order":"20"
+        },
+        {
             "id":"org.apache.sling:org.apache.sling.commons.crypto:1.0.0",
             "start-order":"15"
         },
diff --git a/login/bnd.bnd b/login/bnd.bnd
new file mode 100644
index 0000000..f2d9b5c
--- /dev/null
+++ b/login/bnd.bnd
@@ -0,0 +1 @@
+Fragment-Host: org.apache.sling.auth.form
\ No newline at end of file
diff --git a/login/pom.xml b/login/pom.xml
new file mode 100644
index 0000000..c639607
--- /dev/null
+++ b/login/pom.xml
@@ -0,0 +1,33 @@
+<?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.login</artifactId>
+    <name>Apache Sling - Login Fragment</name>
+    <description>Provides a custom login window for Sling CMS</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>
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.annotation</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/login/src/main/java/org/apache/sling/auth/form/impl/package-info.java b/login/src/main/java/org/apache/sling/auth/form/impl/package-info.java
new file mode 100644
index 0000000..8ec1c70
--- /dev/null
+++ b/login/src/main/java/org/apache/sling/auth/form/impl/package-info.java
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+/**
+ * Expose the package for the login form
+ */
+@Version("1.0.0")
+package org.apache.sling.auth.form.impl;
+
+import org.osgi.annotation.versioning.Version;
diff --git a/login/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html b/login/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html
new file mode 100644
index 0000000..c34d76e
--- /dev/null
+++ b/login/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html
@@ -0,0 +1,142 @@
+<!--
+  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.
+-->
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Login :: Apache Sling CMS</title>
+    <link
+      href="/static/clientlibs/sling-cms/css/styles.min.css"
+      rel="stylesheet"
+    />
+    <link
+      rel="apple-touch-icon"
+      sizes="180x180"
+      href="/static/clientlibs/sling-cms/img/apple-touch-icon.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="32x32"
+      href="/static/clientlibs/sling-cms/img/favicon-32x32.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="16x16"
+      href="/static/clientlibs/sling-cms/img/favicon-16x16.png"
+    />
+    <link
+      rel="shortcut icon"
+      href="/static/clientlibs/sling-cms/img/favicon.ico"
+    />
+    <meta name="apple-mobile-web-app-title" content="Apache Sling CMS" />
+    <meta name="application-name" content="Apache Sling CMS" />
+    <link
+      rel="mask-icon"
+      href="/static/clientlibs/sling-cms/img/safari-pinned-tab.svg"
+      color="#662f8f"
+    />
+    <meta name="msapplication-TileColor" content="#662f8f" />
+    <meta name="theme-color" content="#662f8f" />
+    <meta
+      name="msapplication-config"
+      content="/static/clientlibs/sling-cms/img/browserconfig.xml"
+    />
+    <link
+      rel="manifest"
+      href="/static/clientlibs/sling-cms/img/site.webmanifest"
+    />
+  </head>
+
+  <body class="cms has-background-light">
+    <div class="gradient"></div>
+    <div class="container is-fluid">
+      <div class="columns is-centered is-vcentered" style="min-height: calc(100vh)">
+        <div class="column is-two-thirds-tablet is-half-desktop is-one-third-widescreen">
+          <div class="box mt-6">
+            <div class="columns">
+              <div class="column">
+                <a class="" href="http://sling.apache.org">
+                  <img src="/static/clientlibs/sling-cms/img/sling-logo.svg" width="100" alt="Apache Sling CMS">
+                </a>
+                <h1 class="pt-3 is-size-4">Welcome to Apache Sling CMS</h1>
+                <p>
+                  Sling CMS is a fully-featured Content Management System built
+                  with
+                  <a
+                    href="https://sling.apache.org"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    >Apache Sling</a
+                  >.
+                </p>
+              </div>
+              <div class="column">
+                <h3>Login</h3>
+                <p class="has-text-danger">${j_reason}</p>
+                <form method="POST" action="/j_security_check" class="py-3">
+                  <input type="hidden" name="_charset_" value="UTF-8" />
+                  <input type="hidden" name="resource" value="${resource}" />
+                  <div class="field">
+                    <label class="label is-sr-only" for="j_username"
+                      >Username</label
+                    >
+                    <div class="control">
+                      <input
+                        class="input"
+                        name="j_username"
+                        type="text"
+                        placeholder="Username"
+                        required="required"
+                      />
+                    </div>
+                  </div>
+                  <div class="field">
+                    <label class="label is-sr-only" for="j_password"
+                      >Password</label
+                    >
+                    <div class="control">
+                      <input
+                        class="input"
+                        name="j_password"
+                        type="password"
+                        placeholder="Password"
+                        required="required"
+                      />
+                    </div>
+                  </div>
+                  <div class="field">
+                    <button id="login" class="button is-primary" type="submit">
+                      Login
+                    </button>
+                  </div>
+                </form>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <script
+      src="/static/clientlibs/sling-cms/js/scripts-all.min.js"
+      async
+    ></script>
+  </body>
+</html>
diff --git a/pom.xml b/pom.xml
index 6e9fc8f..0969957 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
         <module>api</module>
         <module>core</module>
         <module>transformer</module>
+        <module>login</module>
         <module>ui</module>
         <module>reference</module>
         <module>feature</module>


[sling-org-apache-sling-app-cms] 05/06: Separating out the composite libs and global content

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 1a54f52892d2499dc944a06a4ced70077227e630
Author: Dan Klco <dk...@apache.org>
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


[sling-org-apache-sling-app-cms] 06/06: Updated docker / feature configuration to setup a working pair of instances automatically

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 a316c7e55b3e0c82e9aaa2fcf327848a265270cf
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Oct 16 14:26:46 2020 -0400

    Updated docker / feature configuration to setup a working pair of instances automatically
---
 docker/cms/Dockerfile                              | 10 ++--
 docker/cms/config-author.json                      | 56 ++++++++++++++++++++++
 .../cms/config-renderer.json                       | 16 +------
 docker/cms/config-standalone.json                  |  3 ++
 docker/cms/download-dependencies.sh                |  2 +-
 docker/docker-compose.yml                          |  6 +--
 feature/pom.xml                                    | 10 ----
 feature/src/main/assembly/author.xml               | 56 ----------------------
 feature/src/main/assembly/renderer.xml             | 56 ----------------------
 .../features/oak/node-store/composite-runtime.json | 10 ++++
 .../src/main/features/oak/node-store/segment.json  | 10 ++++
 feature/src/main/features/oak/oak_base.json        |  2 +-
 feature/src/main/features/runmodes/author.json     |  8 ++--
 feature/src/main/features/runmodes/renderer.json   | 36 ++++----------
 14 files changed, 103 insertions(+), 178 deletions(-)

diff --git a/docker/cms/Dockerfile b/docker/cms/Dockerfile
index ee53fce..615c107 100644
--- a/docker/cms/Dockerfile
+++ b/docker/cms/Dockerfile
@@ -20,11 +20,11 @@ ARG CMS_ARTIFACT_ID=org.apache.sling.cms.feature
 ARG CMS_VERSION=0.16.3-SNAPSHOT
 ARG LAUNCHER_VERSION=1.1.6
 ARG FM_SEED_CLASSIFIER=slingcms-composite-seed
-ARG FM_RUNMODE_CLASSIFIER=runmode-standalone
+ARG RUNMODE=standalone
 ARG FM_RUNTIME_CLASSIFIER=slingcms-composite-runtime
 ENV ADDITIONAL_FEATURE_COORDINATE=${ADDITIONAL_FEATURE_COORDINATE}
 ENV CMS_ARTIFACT_ID=${CMS_ARTIFACT_ID}
-ENV FM_RUNMODE_CLASSIFIER=${FM_RUNMODE_CLASSIFIER}
+ENV RUNMODE=${RUNMODE}
 ENV FM_RUNTIME_CLASSIFIER=${FM_RUNTIME_CLASSIFIER}
 
 # Configure directories
@@ -39,11 +39,13 @@ COPY download-dependencies.sh /opt/slingcms/setup/
 RUN /bin/bash /opt/slingcms/setup/download-dependencies.sh
 COPY setup-composite.sh /opt/slingcms/setup/
 RUN /bin/bash /opt/slingcms/setup/setup-composite.sh
+COPY config-${RUNMODE}.json /opt/slingcms/features
 
 # Expose endpoints
 EXPOSE 8080
 
 # Start Sling CMS
 CMD exec java -jar org.apache.sling.feature.launcher.jar \
-    -f *.slingosgifeature  \
-    -f features/*.slingosgifeature 
+    -f *.slingosgifeature \
+    -f features/*.slingosgifeature \
+    -f features/*.json
diff --git a/docker/cms/config-author.json b/docker/cms/config-author.json
new file mode 100644
index 0000000..651a160
--- /dev/null
+++ b/docker/cms/config-author.json
@@ -0,0 +1,56 @@
+{
+    "id": "org.apache.sling:org.apache.sling.cms.docker:slingfeature:author:1.0.0",
+    "configurations": {
+        "org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory~default": {
+            "allowed.roots": [],
+            "async.delivery": false,
+            "details": "",
+            "enabled": true,
+            "http.conn.timeout": 10,
+            "log.level": "info",
+            "name": "default",
+            "packageBuilder.target": "(name=default)",
+            "packageImporter.endpoints": [],
+            "passiveQueues": [],
+            "priorityQueues": [],
+            "queue.processing.enabled": true,
+            "queue.provider": "jobs",
+            "requestAuthorizationStrategy.target": "(name=default)",
+            "retry.attempts": 100,
+            "retry.strategy": "none",
+            "title": "Default",
+            "transportSecretProvider.target": "(name=default)",
+            "triggers.target": "(name=)"
+        },
+        "org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider~default": {
+            "name": "default",
+            "username": "admin",
+            "password": "admin"
+        },
+        "org.apache.sling.discovery.oak.Config": {
+            "invertLeaderElectionPrefixOrder": false,
+            "enableSyncToken": true,
+            "hmacEnabled": false,
+            "soTimeout": 10,
+            "connectorPingTimeout": 120,
+            "enableEncryption": false,
+            "gzipConnectorRequestsEnabled": false,
+            "backoffStandbyFactor": "",
+            "topologyConnectorUrls": [],
+            "hmacSharedKeyTTL": 14400000,
+            "leaderElectionPrefix": 1,
+            "discoveryLiteCheckInterval": 2,
+            "connectorPingInterval": 30,
+            "clusterSyncServiceInterval": 2,
+            "socketConnectTimeout": 10,
+            "clusterSyncServiceTimeout": 120,
+            "minEventDelay": 3,
+            "autoStopLocalLoopEnabled": false,
+            "backoffStableFactor": "",
+            "topologyConnectorWhitelist": [
+                "*"
+            ],
+            "sharedKey": ""
+        }
+    }
+}
\ No newline at end of file
diff --git a/feature/src/main/features/runmodes/renderer.json b/docker/cms/config-renderer.json
similarity index 57%
copy from feature/src/main/features/runmodes/renderer.json
copy to docker/cms/config-renderer.json
index 8e78caa..60dc575 100644
--- a/feature/src/main/features/runmodes/renderer.json
+++ b/docker/cms/config-renderer.json
@@ -1,18 +1,6 @@
 {
-    "id": "org.apache.sling:org.apache.sling.cms.feature:slingfeature:runmode-renderer:${cms.version}",
+    "id": "org.apache.sling:org.apache.sling.cms.docker:slingfeature:renderer:1.0.0",
     "configurations": {
-        "org.apache.sling.cms.core.publication.PublicationManagerFactoryImpl": {
-            "instanceType": "RENDERER",
-            "publicationMode": "CONTENT_DISTRIBUTION",
-            "agents": []
-        },
-        "org.apache.sling.cms.core.publication.PublicationPropertyProvider": {
-            "endpointPath": "/libs/sling/distribution/services/importers/default"
-        },
-        "org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory~default": {
-            "packageBuilder.target": "(name=default)",
-            "name": "default"
-        },
         "org.apache.sling.discovery.oak.Config": {
             "invertLeaderElectionPrefixOrder": false,
             "enableSyncToken": true,
@@ -23,7 +11,7 @@
             "gzipConnectorRequestsEnabled": false,
             "backoffStandbyFactor": "",
             "topologyConnectorUrls": [
-                "http://localhost:8080/libs/sling/topology/connector"
+                "http://author:8080/libs/sling/topology/connector"
             ],
             "hmacSharedKeyTTL": 14400000,
             "leaderElectionPrefix": 1,
diff --git a/docker/cms/config-standalone.json b/docker/cms/config-standalone.json
new file mode 100644
index 0000000..1e31eeb
--- /dev/null
+++ b/docker/cms/config-standalone.json
@@ -0,0 +1,3 @@
+{
+    "id": "org.apache.sling:org.apache.sling.cms.docker:slingfeature:standalone:1.0.0"
+}
\ No newline at end of file
diff --git a/docker/cms/download-dependencies.sh b/docker/cms/download-dependencies.sh
index ae5ec91..21907ed 100644
--- a/docker/cms/download-dependencies.sh
+++ b/docker/cms/download-dependencies.sh
@@ -33,7 +33,7 @@ mvn -q org.apache.maven.plugins:maven-dependency-plugin:copy \
     -Dmdep.stripVersion=true \
     || { echo 'Failed to download composite runtime' ; exit 1; }
 mvn -q org.apache.maven.plugins:maven-dependency-plugin:copy \
-    -Dartifact=${CMS_GROUP_ID}:${CMS_ARTIFACT_ID}:${CMS_VERSION}:slingosgifeature:${FM_RUNMODE_CLASSIFIER} \
+    -Dartifact=${CMS_GROUP_ID}:${CMS_ARTIFACT_ID}:${CMS_VERSION}:slingosgifeature:runmode-${RUNMODE} \
     -DoutputDirectory=/opt/slingcms/features \
     -Dmdep.stripVersion=true \
     || { echo 'Failed to download author feature' ; exit 1; }
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index cc3df4f..2441c5f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     build: 
       context: cms
       args:
-        FM_RUNMODE_CLASSIFIER: runmode-author
+        RUNMODE: author
     ports:
       - "8080:8080"
     volumes:
@@ -24,7 +24,7 @@ services:
     build: 
       context: cms
       args:
-        FM_RUNMODE_CLASSIFIER: runmode-renderer
+        RUNMODE: renderer
     ports:
       - "8090:8080"
     volumes:
@@ -35,4 +35,4 @@ services:
       - "80:80"
 volumes:
   sling-author:
-  sling-renderer:
+  sling-renderer:
\ No newline at end of file
diff --git a/feature/pom.xml b/feature/pom.xml
index d85ff8f..b71bd51 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -137,14 +137,6 @@
                             <classifier>slingcms_standalone_far</classifier>
                             <includeClassifier>slingcms-standalone</includeClassifier>
                         </archive>
-                        <archive>
-                            <classifier>slingcms_author_far</classifier>
-                            <includeClassifier>slingcms-author</includeClassifier>
-                        </archive>
-                        <archive>
-                            <classifier>slingcms_renderer_far</classifier>
-                            <includeClassifier>slingcms-renderer</includeClassifier>
-                        </archive>
                     </archives>
                 </configuration>
                 <executions>
@@ -185,8 +177,6 @@
                     </archive>
                     <descriptors>
                         <descriptor>src/main/assembly/standalone.xml</descriptor>
-                        <descriptor>src/main/assembly/author.xml</descriptor>
-                        <descriptor>src/main/assembly/renderer.xml</descriptor>
                     </descriptors>
                 </configuration>
             </plugin>
diff --git a/feature/src/main/assembly/author.xml b/feature/src/main/assembly/author.xml
deleted file mode 100644
index 4dff857..0000000
--- a/feature/src/main/assembly/author.xml
+++ /dev/null
@@ -1,56 +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.
-    -->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
-
-    <id>author</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <dependencySets>
-        <dependencySet>
-            <includes>
-                <include>org.apache.sling:org.apache.sling.feature.launcher</include>
-            </includes>
-            <outputDirectory>/</outputDirectory>
-            <useProjectArtifact>true</useProjectArtifact>
-            <unpack>true</unpack>
-        </dependencySet>
-    </dependencySets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/org.apache.sling.cms.feature-${project.version}-slingcms_author_far.far</source>
-            <outputDirectory>lib</outputDirectory>
-            <destName>slingcms.far</destName>
-        </file>
-        <file>
-            <source>target/classes/org/apache/sling/cms/feature/Main.class</source>
-            <outputDirectory>org/apache/sling/cms/feature</outputDirectory>
-        </file>
-        <file>
-            <source>src/main/resources/slingcms.properties</source>
-            <filtered>true</filtered>
-        </file>
-        <file>
-            <source>target/classes/META-INF/NOTICE</source>
-            <outputDirectory>META-INF</outputDirectory>
-        </file>
-        <file>
-            <source>target/classes/META-INF/LICENSE</source>
-            <outputDirectory>META-INF</outputDirectory>
-        </file>
-    </files>
-
-</assembly>
\ No newline at end of file
diff --git a/feature/src/main/assembly/renderer.xml b/feature/src/main/assembly/renderer.xml
deleted file mode 100644
index 455ce7d..0000000
--- a/feature/src/main/assembly/renderer.xml
+++ /dev/null
@@ -1,56 +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.
-    -->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
-
-    <id>renderer</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <dependencySets>
-        <dependencySet>
-            <includes>
-                <include>org.apache.sling:org.apache.sling.feature.launcher</include>
-            </includes>
-            <outputDirectory>/</outputDirectory>
-            <useProjectArtifact>true</useProjectArtifact>
-            <unpack>true</unpack>
-        </dependencySet>
-    </dependencySets>
-
-    <files>
-        <file>
-            <source>${basedir}/target/org.apache.sling.cms.feature-${project.version}-slingcms_renderer_far.far</source>
-            <outputDirectory>lib</outputDirectory>
-            <destName>slingcms.far</destName>
-        </file>
-        <file>
-            <source>target/classes/org/apache/sling/cms/feature/Main.class</source>
-            <outputDirectory>org/apache/sling/cms/feature</outputDirectory>
-        </file>
-        <file>
-            <source>src/main/resources/slingcms.properties</source>
-            <filtered>true</filtered>
-        </file>
-        <file>
-            <source>target/classes/META-INF/NOTICE</source>
-            <outputDirectory>META-INF</outputDirectory>
-        </file>
-        <file>
-            <source>target/classes/META-INF/LICENSE</source>
-            <outputDirectory>META-INF</outputDirectory>
-        </file>
-    </files>
-
-</assembly>
\ No newline at end of file
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 0a5b220..2107456 100644
--- a/feature/src/main/features/oak/node-store/composite-runtime.json
+++ b/feature/src/main/features/oak/node-store/composite-runtime.json
@@ -1,4 +1,14 @@
 {
+    "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/feature/src/main/features/oak/node-store/segment.json b/feature/src/main/features/oak/node-store/segment.json
index a7e4eda..c3a9370 100644
--- a/feature/src/main/features/oak/node-store/segment.json
+++ b/feature/src/main/features/oak/node-store/segment.json
@@ -1,4 +1,14 @@
 {
+    "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/feature/src/main/features/oak/oak_base.json b/feature/src/main/features/oak/oak_base.json
index 0f43759..464ec6f 100644
--- a/feature/src/main/features/oak/oak_base.json
+++ b/feature/src/main/features/oak/oak_base.json
@@ -122,7 +122,7 @@
             "start-order":"15"
         },
         {
-            "id":"org.apache.sling:org.apache.sling.jcr.oak.server:1.2.4",
+            "id":"org.apache.sling:org.apache.sling.jcr.oak.server:1.2.6",
             "start-order":"20"
         },
         {
diff --git a/feature/src/main/features/runmodes/author.json b/feature/src/main/features/runmodes/author.json
index 61d9996..f312b10 100644
--- a/feature/src/main/features/runmodes/author.json
+++ b/feature/src/main/features/runmodes/author.json
@@ -7,11 +7,9 @@
         "org.apache.sling.cms.core.publication.PublicationManagerFactoryImpl": {
             "instanceType": "AUTHOR",
             "publicationMode": "CONTENT_DISTRIBUTION",
-            "agents": []
-        },
-        "org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory~default": {
-            "packageBuilder.target": "(name=default)",
-            "name": "default"
+            "agents": [
+                "default"
+            ]
         },
         "org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory~default": {
             "fileThreshold": 1,
diff --git a/feature/src/main/features/runmodes/renderer.json b/feature/src/main/features/runmodes/renderer.json
index 8e78caa..751add7 100644
--- a/feature/src/main/features/runmodes/renderer.json
+++ b/feature/src/main/features/runmodes/renderer.json
@@ -7,39 +7,19 @@
             "agents": []
         },
         "org.apache.sling.cms.core.publication.PublicationPropertyProvider": {
-            "endpointPath": "/libs/sling/distribution/services/importers/default"
+            "endpointPath": "libs/sling/distribution/services/importer/default"
         },
         "org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory~default": {
             "packageBuilder.target": "(name=default)",
             "name": "default"
         },
-        "org.apache.sling.discovery.oak.Config": {
-            "invertLeaderElectionPrefixOrder": false,
-            "enableSyncToken": true,
-            "hmacEnabled": false,
-            "soTimeout": 10,
-            "connectorPingTimeout": 120,
-            "enableEncryption": false,
-            "gzipConnectorRequestsEnabled": false,
-            "backoffStandbyFactor": "",
-            "topologyConnectorUrls": [
-                "http://localhost:8080/libs/sling/topology/connector"
-            ],
-            "hmacSharedKeyTTL": 14400000,
-            "leaderElectionPrefix": 1,
-            "discoveryLiteCheckInterval": 2,
-            "connectorPingInterval": 30,
-            "clusterSyncServiceInterval": 2,
-            "socketConnectTimeout": 10,
-            "clusterSyncServiceTimeout": 120,
-            "minEventDelay": 3,
-            "autoStopLocalLoopEnabled": false,
-            "backoffStableFactor": "",
-            "topologyConnectorWhitelist": [
-                "localhost",
-                "127.0.0.1"
-            ],
-            "sharedKey": ""
+        "org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory~default": {
+            "aclHandling": "IGNORE",
+            "cugHandling": "OVERWRITE",
+            "importMode": "REPLACE",
+            "name": "default",
+            "package.filters": ["/home/users|-.*/.tokens", "/home/users|-.*/rep:cache"],
+            "type": "jcrvlt"
         }
     }
 }
\ No newline at end of file


[sling-org-apache-sling-app-cms] 04/06: Updated to search for transformations out of /apps and /libs

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 2cc7a77d1985da0ff1626a468e8e0b67f5d378e7
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Oct 16 14:23:06 2020 -0400

    Updated to search for transformations out of /apps and /libs
---
 .../org/apache/sling/cms/transformer/internal/TransformServlet.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/transformer/src/main/java/org/apache/sling/cms/transformer/internal/TransformServlet.java b/transformer/src/main/java/org/apache/sling/cms/transformer/internal/TransformServlet.java
index 746634d..40c8e86 100644
--- a/transformer/src/main/java/org/apache/sling/cms/transformer/internal/TransformServlet.java
+++ b/transformer/src/main/java/org/apache/sling/cms/transformer/internal/TransformServlet.java
@@ -131,7 +131,6 @@ public class TransformServlet extends SlingSafeMethodsServlet {
             op.setReplaceSelectors("transform");
             RequestDispatcher disp = request.getRequestDispatcher(config.errorResourcePath(), op);
             disp.forward(request, response);
-
         }
     }
 
@@ -140,7 +139,7 @@ public class TransformServlet extends SlingSafeMethodsServlet {
         log.debug("Finding transformations with {}", name);
 
         Iterator<Resource> transformations = serviceResolver.findResources(
-                "SELECT * FROM [nt:unstructured] WHERE ISDESCENDANTNODE([/conf]) AND [sling:resourceType]='sling-cms/components/caconfig/transformation' AND [name]='"
+                "SELECT * FROM [nt:unstructured] WHERE (ISDESCENDANTNODE([/conf]) OR ISDESCENDANTNODE([/libs/conf]) OR ISDESCENDANTNODE([/apps/conf])) AND [sling:resourceType]='sling-cms/components/caconfig/transformation' AND [name]='"
                         + name + "'",
                 Query.JCR_SQL2);
         if (transformations.hasNext()) {