You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2023/01/04 08:51:30 UTC

[sling-org-apache-sling-feature-launcher] branch master updated (cc75f40 -> 30921a7)

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

rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git


    from cc75f40  SLING-11718 : Migrate to Jakarta JSON API
     new 3af5be3  SLING-11747 - Unable to override the built-in content package feature model extension
     new 30921a7  SLING-11747 - Unable to override the built-in content package feature model extension

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:
 pom.xml                                                                 | 1 +
 .../java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java   | 2 ++
 2 files changed, 3 insertions(+)


[sling-org-apache-sling-feature-launcher] 01/02: SLING-11747 - Unable to override the built-in content package feature model extension

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

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git

commit 3af5be35cf8ec5520bc1e239ca6b70d75172de99
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Jan 4 00:01:28 2023 +0200

    SLING-11747 - Unable to override the built-in content package feature model extension
    
    Add debugging information for loading and executing content extensions.
---
 .../java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java b/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
index be2d1d1..fd3f16e 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
@@ -192,7 +192,9 @@ public class FeatureProcessor {
         extensions: for(final Extension ext : app.getExtensions()) {
             for (ExtensionHandler handler : ServiceLoader.load(ExtensionHandler.class,  FeatureProcessor.class.getClassLoader()))
             {
+                ctx.getLogger().debug("Loaded handler {}", handler.getClass().getName());
                 if (handler.handle(new ExtensionContextImpl(ctx, config.getInstallation(), loadedFeatures), ext)) {
+                    ctx.getLogger().debug("Handled extension {} with handler {}", ext.getName(), handler.getClass().getName());
                     continue extensions;
                 }
             }


[sling-org-apache-sling-feature-launcher] 02/02: SLING-11747 - Unable to override the built-in content package feature model extension

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

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git

commit 30921a76369f34af9258fd3fc4f916325665877c
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Jan 4 00:27:34 2023 +0200

    SLING-11747 - Unable to override the built-in content package feature model extension
    
    Configure an 'endorsed' directory for the assembly. This directory can be used to drop
    in jar files that have priority on the classpath, such as the content extension.
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 702c878..162c15b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,6 +197,7 @@
                     <useWildcardClassPath>true</useWildcardClassPath>
                     <repositoryLayout>flat</repositoryLayout>
                     <repositoryName>lib</repositoryName>
+                    <endorsedDir>endorsed</endorsedDir>
                     <extraJvmArguments>-Dproject.artifactId=${project.artifactId} -Dproject.version=${project.version} -Dbuild.timestamp=${maven.build.timestamp} -Dfile.encoding=UTF-8</extraJvmArguments>
                     <licenseHeaderFile>${basedir}/src/main/legal/license-header</licenseHeaderFile>
                     <programs>