You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/12/15 19:49:33 UTC

[sling-org-apache-sling-karaf-features] branch master updated (a126d80 -> 9927a4a)

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

olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git.


    from a126d80  Updating to fix issue with styles not loading for the sling cms karaf feature
     new 9c357c9  SLING-8473 Provide Sling CMS features
     new 9927a4a  SLING-8473 Provide Sling CMS features

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main/feature/feature.xml | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)


[sling-org-apache-sling-karaf-features] 01/02: SLING-8473 Provide Sling CMS features

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git

commit 9c357c9ad68408dd43a374c96fef2684a262ca18
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Dec 15 20:23:48 2020 +0100

    SLING-8473 Provide Sling CMS features
    
    * Readd marker comments, uncomment CMS features
    * Remove dependency sling-cms dependency from feature sling-cms-login
---
 src/main/feature/feature.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 355192e..8062f29 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -694,7 +694,6 @@
     <bundle>mvn:org.apache.pdfbox/jempbox/1.8.16</bundle>
   </feature>
   <!-- Apache Sling Applications and Samples -->
-  <!--
   <feature name="sling-cms" version="${project.version}">
     <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_cms">classpath:cms/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_cms.config</config>
     <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms">classpath:cms/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_cms.config</config>
@@ -703,8 +702,8 @@
     <bundle>mvn:org.apache.sling/org.apache.sling.cms.core/0.16.3-SNAPSHOT</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.cms.transformer/0.16.3-SNAPSHOT</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.cms.ui/0.16.3-SNAPSHOT</bundle>
+    <!-- dependencies -->
     <feature>webconsole</feature>
-
     <feature version="${project.version}">sling</feature>
     <feature version="${project.version}">sling-caconfig</feature>
     <feature version="${project.version}">sling-cms-login</feature>
@@ -726,18 +725,18 @@
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.poi/4.1.2_2</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/3.1.0_2</bundle>
     <bundle dependency="true">mvn:org.jsoup/jsoup/1.13.1</bundle>
+    <!-- ... -->
     <bundle>mvn:org.apache.sling/org.apache.sling.fileoptim/0.9.4</bundle>
   </feature>
   <feature name="sling-cms-login" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.cms.login/0.16.3-SNAPSHOT</bundle>
-    <feature version="${project.version}">sling-cms</feature>
+    <!-- dependencies -->
     <feature version="${project.version}">sling-auth-form</feature>
   </feature>
   <feature name="sling-cms-reference" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.cms.reference/0.16.3-SNAPSHOT</bundle>
     <feature version="${project.version}">sling-cms</feature>
   </feature>
-  -->
   <!-- Composum -->
   <feature name="composum-nodes" version="${project.version}">
     <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes">classpath:org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.config</config>


[sling-org-apache-sling-karaf-features] 02/02: SLING-8473 Provide Sling CMS features

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git

commit 9927a4aa9d5a2b85216b6014f51ae9943afec958
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Dec 15 20:29:22 2020 +0100

    SLING-8473 Provide Sling CMS features
    
    add features for CMS author, renderer and standalone
---
 src/main/feature/feature.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 8062f29..66a7133 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -737,6 +737,27 @@
     <bundle>mvn:org.apache.sling/org.apache.sling.cms.reference/0.16.3-SNAPSHOT</bundle>
     <feature version="${project.version}">sling-cms</feature>
   </feature>
+  <feature name="sling-cms-author" version="${project.version}">
+    <config external="true" name="org.apache.sling.cms.core.publication.ForwardAgentEndpointSynchronization">classpath:cms/author/org.apache.sling.cms.core.publication.ForwardAgentEndpointSynchronization.json</config>
+    <config external="true" name="org.apache.sling.cms.core.publication.PublicationManagerFactoryImpl">classpath:cms/author/org.apache.sling.cms.core.publication.PublicationManagerFactoryImpl.json</config>
+    <config external="true" name="org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default">classpath:cms/author/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json</config>
+    <!-- dependencies -->
+    <feature version="${project.version}">sling-cms</feature>
+  </feature>
+  <feature name="sling-cms-renderer" version="${project.version}">
+    <config external="true" name="org.apache.sling.cms.core.publication.PublicationManagerFactoryImpl">classpath:cms/renderer/org.apache.sling.cms.core.publication.PublicationManagerFactoryImpl.json</config>
+    <config external="true" name="org.apache.sling.cms.core.publication.PublicationPropertyProvider">classpath:cms/renderer/org.apache.sling.cms.core.publication.PublicationPropertyProvider.json</config>
+    <config external="true" name="org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default">classpath:cms/renderer/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json</config>
+    <config external="true" name="org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default">classpath:cms/renderer/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json</config>
+    <!-- dependencies -->
+    <feature version="${project.version}">sling-cms</feature>
+  </feature>
+  <feature name="sling-cms-standalone" version="${project.version}">
+    <config external="true" name="org.apache.sling.cms.core.internal.filters.CMSSecurityConfigInstance">classpath:cms/standalone/org.apache.sling.cms.core.internal.filters.CMSSecurityConfigInstance.json</config>
+    <config external="true" name="org.apache.sling.cms.core.publication.PublicationManagerFactoryImpl">classpath:cms/standalone/org.apache.sling.cms.core.publication.PublicationManagerFactoryImpl.json</config>
+    <!-- dependencies -->
+    <feature version="${project.version}">sling-cms</feature>
+  </feature>
   <!-- Composum -->
   <feature name="composum-nodes" version="${project.version}">
     <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes">classpath:org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.config</config>