You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2020/09/01 16:33:17 UTC
[sling-org-apache-sling-installer-factory-feature] 26/32:
SLING-9480 : Provide all artifacts to OSGi installer
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 <cz...@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);
+ }
}
}