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 2018/04/17 19:37:03 UTC
[sling-whiteboard] branch misc-fixes created (now ff02acb)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch misc-fixes
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git.
at ff02acb Fix system bundle fragments handling
This branch includes the following new commits:
new 24f1898 Include new artifacts in the feature-appplicationbuilder
new ff02acb Fix system bundle fragments handling
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.
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-whiteboard] 02/02: Fix system bundle fragments handling
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch misc-fixes
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit ff02acbffb77953b688b6c01e45507f0b6ae9953
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 17 22:36:01 2018 +0300
Fix system bundle fragments handling
---
.../java/org/apache/sling/feature/resolver/FrameworkResolver.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java b/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
index bd93d72..f0bf929 100644
--- a/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
+++ b/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
@@ -98,6 +98,7 @@ public class FrameworkResolver implements FeatureResolver {
BundleRevision br = framework.adapt(BundleRevision.class);
capabilities.put(PackageNamespace.PACKAGE_NAMESPACE, br.getCapabilities(PackageNamespace.PACKAGE_NAMESPACE));
capabilities.put(BundleNamespace.BUNDLE_NAMESPACE, br.getCapabilities(BundleNamespace.BUNDLE_NAMESPACE));
+ capabilities.put(HostNamespace.HOST_NAMESPACE, br.getCapabilities(HostNamespace.HOST_NAMESPACE));
capabilities.put(IdentityNamespace.IDENTITY_NAMESPACE, br.getCapabilities(IdentityNamespace.IDENTITY_NAMESPACE));
frameworkResource = new BundleResourceImpl(framework.getSymbolicName(), framework.getVersion(), null, null,
capabilities, Collections.emptyMap());
@@ -231,6 +232,10 @@ public class FrameworkResolver implements FeatureResolver {
// This is a fragment
Requirement req = reqs.iterator().next(); // TODO handle more host requirements
String bsn = req.getAttributes().get(HostNamespace.HOST_NAMESPACE).toString(); // TODO this is not valid, should obtain from filter
+ // system bundle is already started, no need to reorder here
+ if ( Constants.SYSTEM_BUNDLE_SYMBOLICNAME.equals(bsn)) {
+ continue;
+ }
int idx = getBundleIndex(orderedResources, bsn); // TODO check for filter too
if (idx < i) {
// the fragment is after the host, and should be moved to be before the host
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.
[sling-whiteboard] 01/02: Include new artifacts in the
feature-appplicationbuilder
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch misc-fixes
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 24f18985929ae2e42c681e65cd70c6ccc110d39e
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 17 22:35:38 2018 +0300
Include new artifacts in the feature-appplicationbuilder
---
featuremodel/feature-applicationbuilder/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/featuremodel/feature-applicationbuilder/pom.xml b/featuremodel/feature-applicationbuilder/pom.xml
index 9f470e2..885c31f 100644
--- a/featuremodel/feature-applicationbuilder/pom.xml
+++ b/featuremodel/feature-applicationbuilder/pom.xml
@@ -56,7 +56,7 @@
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
- <includeArtifactIds>commons-cli,org.apache.sling.feature,org.apache.sling.feature.support,org.apache.sling.commons.johnzon,slf4j-api,slf4j-simple,osgi.core,org.apache.felix.converter</includeArtifactIds>
+ <includeArtifactIds>commons-cli,org.apache.sling.feature,org.apache.sling.feature.support,org.apache.sling.commons.johnzon,slf4j-api,slf4j-simple,osgi.core,org.apache.felix.converter,org.osgi.service.resolver,org.apache.sling.feature.resolver,org.apache.sling.feature.analyser</includeArtifactIds>
</configuration>
</execution>
</executions>
--
To stop receiving notification emails like this one, please contact
rombert@apache.org.