sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [sling-org-apache-sling-installer-factory-feature] 26/32: SLING-9480 : Provide all artifacts to OSGi installer
Date Tue, 01 Sep 2020 16:33:17 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit c328d1f57736b0e2908a65ee5a13e84711883ca0
Author: Carsten Ziegeler <cziegeler@apache.org>
AuthorDate: Thu May 28 14:32:14 2020 +0200

    SLING-9480 : Provide all artifacts to OSGi installer
---
 .../installer/factory/model/impl/InstallFeatureModelTask.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/sling/installer/factory/model/impl/InstallFeatureModelTask.java
b/src/main/java/org/apache/sling/installer/factory/model/impl/InstallFeatureModelTask.java
index 9d62540..a63ff6b 100644
--- a/src/main/java/org/apache/sling/installer/factory/model/impl/InstallFeatureModelTask.java
+++ b/src/main/java/org/apache/sling/installer/factory/model/impl/InstallFeatureModelTask.java
@@ -206,11 +206,12 @@ public class InstallFeatureModelTask extends AbstractFeatureModelTask
{
             }
         }
 
-        // content packages
-        final Extension ext = feature.getExtensions().getByName(Extension.EXTENSION_NAME_CONTENT_PACKAGES);
-        if (ext != null && ext.getType() == ExtensionType.ARTIFACTS) {
-            for (final Artifact artifact : ext.getArtifacts()) {
-                addArtifact(artifact, result);
+        // artifact extensions
+        for(final Extension ext : feature.getExtensions()) {
+            if ( ext.getType() == ExtensionType.ARTIFACTS ) {
+                for (final Artifact artifact : ext.getArtifacts()) {
+                    addArtifact(artifact, result);
+                }
             }
         }
 


Mime
View raw message