You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2016/06/06 10:51:38 UTC
karaf git commit: [KARAF-4547] Embed resolver to be independent of
framework resolver impl
Repository: karaf
Updated Branches:
refs/heads/master 922dd0e1b -> 3ea489f93
[KARAF-4547] Embed resolver to be independent of framework resolver impl
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3ea489f9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3ea489f9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3ea489f9
Branch: refs/heads/master
Commit: 3ea489f93806d539d2b8ffeca6157bce937f2acf
Parents: 922dd0e
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Jun 6 11:02:05 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Jun 6 11:02:05 2016 +0200
----------------------------------------------------------------------
features/core/pom.xml | 2 +-
.../org/apache/karaf/features/internal/osgi/Activator.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/3ea489f9/features/core/pom.xml
----------------------------------------------------------------------
diff --git a/features/core/pom.xml b/features/core/pom.xml
index f656354..de354c9 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -135,7 +135,6 @@
org.eclipse.equinox.region.*
</Export-Package>
<Import-Package>
- !org.apache.felix.resolver,
!org.eclipse.osgi.service.resolver,
*
</Import-Package>
@@ -149,6 +148,7 @@
org.apache.karaf.util.bundles,
org.apache.karaf.util.collections,
org.eclipse.equinox.internal.region.*;-split-package:=merge-first,
+ org.apache.felix.resolver.*,
</Private-Package>
<Embed-Dependency>
org.apache.karaf.util;inline="org/apache/karaf/util/XmlUtils*.class"
http://git-wip-us.apache.org/repos/asf/karaf/blob/3ea489f9/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java b/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
index ea5e783..ec6a85c 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
@@ -29,12 +29,13 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Map;
+import org.apache.felix.resolver.Logger;
+import org.apache.felix.resolver.ResolverImpl;
import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.features.FeaturesListener;
import org.apache.karaf.features.FeaturesService;
import org.apache.karaf.features.internal.management.FeaturesServiceMBeanImpl;
import org.apache.karaf.features.internal.region.DigraphHelper;
-import org.apache.karaf.features.internal.region.SubsystemResolveContext;
import org.apache.karaf.features.internal.repository.AggregateRepository;
import org.apache.karaf.features.internal.repository.JsonRepository;
import org.apache.karaf.features.internal.repository.XmlRepository;
@@ -66,7 +67,6 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
@Services(
requires = {
@RequireService(ConfigurationAdmin.class),
- @RequireService(Resolver.class),
@RequireService(value = URLStreamHandlerService.class, filter = "(url.handler.protocol=mvn)")
},
provides = {
@@ -114,7 +114,7 @@ public class Activator extends BaseActivator {
protected void doStart() throws Exception {
ConfigurationAdmin configurationAdmin = getTrackedService(ConfigurationAdmin.class);
- Resolver resolver = getTrackedService(Resolver.class);
+ Resolver resolver = new ResolverImpl(new Logger(Logger.LOG_INFO));
URLStreamHandlerService mvnUrlHandler = getTrackedService(URLStreamHandlerService.class);
if (configurationAdmin == null || mvnUrlHandler == null) {