You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/10/11 16:33:00 UTC
[1/3] karaf git commit: [KARAF-5396] Fix instance starting on java 9
Repository: karaf
Updated Branches:
refs/heads/master 183763959 -> c77fe2cae
[KARAF-5396] Fix instance starting on java 9
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c77fe2ca
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c77fe2ca
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c77fe2ca
Branch: refs/heads/master
Commit: c77fe2caeec94e151922f196d2e21febe0c1e5b8
Parents: e03196e
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Oct 11 17:30:57 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Wed Oct 11 17:34:19 2017 +0200
----------------------------------------------------------------------
.../core/internal/InstanceServiceImpl.java | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c77fe2ca/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
----------------------------------------------------------------------
diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
index ba299d5..e386595 100644
--- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
+++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
@@ -488,13 +488,29 @@ public class InstanceServiceImpl implements InstanceService {
classpath.append(childClasspath);
}
+ String jdkOpts;
+ if (!System.getProperty("java.version").startsWith("1.")) {
+ jdkOpts = " --add-opens java.base/java.security=ALL-UNNAMED" +
+ " --add-opens java.base/java.net=ALL-UNNAMED" +
+ " --add-opens java.base/java.lang=ALL-UNNAMED" +
+ " --add-opens java.base/java.util=ALL-UNNAMED" +
+ " --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED" +
+ " --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED" +
+ " --add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED" +
+ " --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED" +
+ " --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED" +
+ " --add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED" +
+ " --add-modules java.xml.ws.annotation,java.corba,java.transaction,java.xml.bind,java.xml.ws";
+ } else {
+ jdkOpts = " -Djava.endorsed.dirs=\"" + new File(new File(new File(System.getProperty("java.home"), "jre"), "lib"), "endorsed") + System.getProperty("path.separator") + new File(new File(System.getProperty("java.home"), "lib"), "endorsed") + System.getProperty("path.separator") + new File(libDir, "endorsed").getCanonicalPath() + "\""
+ + " -Djava.ext.dirs=\"" + new File(new File(new File(System.getProperty("java.home"), "jre"), "lib"), "ext") + System.getProperty("path.separator") + new File(new File(System.getProperty("java.home"), "lib"), "ext") + System.getProperty("path.separator") + new File(libDir, "ext").getCanonicalPath() + "\"";
+ }
String command = "\""
+ new File(System.getProperty("java.home"), ScriptUtils.isWindows() ? "bin\\java.exe" : "bin/java").getCanonicalPath()
+ "\" " + opts
+ " " + karafOpts
+ + " " + jdkOpts
+ " -Djava.util.logging.config.file=\"" + new File(location, "etc/java.util.logging.properties").getCanonicalPath() + "\""
- + " -Djava.endorsed.dirs=\"" + new File(new File(new File(System.getProperty("java.home"), "jre"), "lib"), "endorsed") + System.getProperty("path.separator") + new File(new File(System.getProperty("java.home"), "lib"), "endorsed") + System.getProperty("path.separator") + new File(libDir, "endorsed").getCanonicalPath() + "\""
- + " -Djava.ext.dirs=\"" + new File(new File(new File(System.getProperty("java.home"), "jre"), "lib"), "ext") + System.getProperty("path.separator") + new File(new File(System.getProperty("java.home"), "lib"), "ext") + System.getProperty("path.separator") + new File(libDir, "ext").getCanonicalPath() + "\""
+ " -Dkaraf.home=\"" + System.getProperty("karaf.home") + "\""
+ " -Dkaraf.base=\"" + new File(location).getCanonicalPath() + "\""
+ " -Dkaraf.data=\"" + new File(new File(location).getCanonicalPath(), "data") + "\""
[2/3] karaf git commit: Remove start="true" attribute on bundle
dependencies as it's the default value
Posted by gn...@apache.org.
Remove start="true" attribute on bundle dependencies as it's the default value
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e03196e7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e03196e7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e03196e7
Branch: refs/heads/master
Commit: e03196e7574bfabb4c0f7f1c67d1ba4c5ead63d3
Parents: cd0ecbb
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Oct 11 16:12:59 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Wed Oct 11 17:34:19 2017 +0200
----------------------------------------------------------------------
.../framework/src/main/feature/feature.xml | 28 ++++++------
.../standard/src/main/feature/feature.xml | 46 ++++++++++----------
2 files changed, 37 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/e03196e7/assemblies/features/framework/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml
index 6dbe1a1..5184536 100644
--- a/assemblies/features/framework/src/main/feature/feature.xml
+++ b/assemblies/features/framework/src/main/feature/feature.xml
@@ -23,34 +23,34 @@
<feature version="${project.version}" description="Karaf core feature" name="framework" hidden="true">
<!-- persistent wiring extension -->
- <bundle start="true" start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/${project.version}</bundle>
+ <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/${project.version}</bundle>
<!-- mvn: and wrap: url handlers -->
- <bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
+ <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
<!-- logging -->
- <bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
- <bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${pax.logging.version}</bundle>
+ <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
+ <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${pax.logging.version}</bundle>
<!-- config admin -->
- <bundle start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
+ <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
<!-- file install -->
- <bundle start="true" start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
+ <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
<!-- features service -->
- <bundle start="true" start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle>
+ <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle>
</feature>
<feature version="${project.version}" description="Karaf core feature" name="framework-logback" hidden="true">
<!-- persistent wiring extension -->
- <bundle start="true" start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/${project.version}</bundle>
+ <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/${project.version}</bundle>
<!-- mvn: and wrap: url handlers -->
- <bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
+ <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
<!-- logging -->
- <bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
- <bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-logback/${pax.logging.version}</bundle>
+ <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
+ <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-logback/${pax.logging.version}</bundle>
<!-- config admin -->
- <bundle start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
+ <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
<!-- file install -->
- <bundle start="true" start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
+ <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
<!-- features service -->
- <bundle start="true" start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle>
+ <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle>
</feature>
</features>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e03196e7/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 487d4ea..f2d7683 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -27,7 +27,7 @@
<feature version="${project.version}" description="Services Security for Karaf" name="service-security">
<feature>jaas-boot</feature>
<feature>aries-proxy</feature>
- <bundle start="true" start-level="10">mvn:org.apache.karaf.service/org.apache.karaf.service.guard/${project.version}</bundle>
+ <bundle start-level="10">mvn:org.apache.karaf.service/org.apache.karaf.service.guard/${project.version}</bundle>
</feature>
<feature name="aries-proxy" description="Aries Proxy" version="${project.version}">
@@ -267,18 +267,18 @@
</feature>
<feature name="deployer" description="Karaf Deployer" version="${project.version}">
- <bundle start="true" start-level="26">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.features/${project.version}</bundle>
+ <bundle start-level="26">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.features/${project.version}</bundle>
<conditional>
<condition>wrap</condition>
- <bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.wrap/${project.version}</bundle>
+ <bundle start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.wrap/${project.version}</bundle>
</conditional>
<conditional>
<condition>req:osgi.extender;filter:="(&(osgi.extender=osgi.blueprint)(version>=1.0))"</condition>
- <bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/${project.version}</bundle>
+ <bundle start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/${project.version}</bundle>
</conditional>
<conditional>
<condition>kar</condition>
- <bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${project.version}</bundle>
+ <bundle start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${project.version}</bundle>
</conditional>
</feature>
@@ -298,7 +298,7 @@
<feature name="bundle" description="Provide Bundle support" version="${project.version}">
<feature>jaas-boot</feature>
- <bundle start-level="30" start="true">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.core/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.core/${project.version}</bundle>
<conditional>
<condition>management</condition>
<config name="jmx.acl.org.apache.karaf.bundle">
@@ -356,7 +356,7 @@
</feature>
<feature name="config" description="Provide OSGi ConfigAdmin support" version="${project.version}">
- <bundle start-level="30" start="true">mvn:org.apache.karaf.config/org.apache.karaf.config.core/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.config/org.apache.karaf.config.core/${project.version}</bundle>
<conditional>
<condition>management</condition>
<config name="jmx.acl.org.apache.karaf.config">
@@ -428,14 +428,14 @@
</feature>
<feature name="diagnostic" description="Provide Diagnostic support" version="${project.version}">
- <bundle start-level="30" start="true">mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.core/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.core/${project.version}</bundle>
<library export="true" type="boot">
mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.boot/${project.version}
</library>
</feature>
<feature name="instance" description="Provide Instance support" version="${project.version}">
- <bundle start-level="30" start="true">mvn:org.apache.karaf.instance/org.apache.karaf.instance.core/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.instance/org.apache.karaf.instance.core/${project.version}</bundle>
</feature>
<feature name="jaas" description="Provide JAAS support" version="${project.version}">
@@ -484,11 +484,11 @@
encryption.encoding = hexadecimal
</config>
<feature>jaas-boot</feature>
- <bundle start-level="30" start="true">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/${project.version}</bundle>
- <bundle start-level="30" start="true">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/${project.version}</bundle>
<conditional>
<condition>aries-blueprint</condition>
- <bundle start-level="30" start="true">mvn:org.apache.karaf.jaas.blueprint/org.apache.karaf.jaas.blueprint.config/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.jaas.blueprint/org.apache.karaf.jaas.blueprint.config/${project.version}</bundle>
</conditional>
<conditional>
<condition>shell</condition>
@@ -498,7 +498,7 @@
# Jaas commands commands have no effect until update is called.
update = admin
</config>
- <bundle start-level="30" start="true">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.command/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.command/${project.version}</bundle>
</conditional>
</feature>
@@ -522,7 +522,7 @@
#
pattern = "%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n"
</config>
- <bundle start-level="30" start="true">mvn:org.apache.karaf.log/org.apache.karaf.log.core/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.log/org.apache.karaf.log.core/${project.version}</bundle>
</feature>
<feature name="package" version="${project.version}" description="Package commands and mbeans">
@@ -530,11 +530,11 @@
</feature>
<feature name="service" description="Provide Service support" version="${project.version}">
- <bundle start-level="30" start="true">mvn:org.apache.karaf.service/org.apache.karaf.service.core/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.service/org.apache.karaf.service.core/${project.version}</bundle>
</feature>
<feature name="system" description="Provide System support" version="${project.version}">
- <bundle start-level="30" start="true">mvn:org.apache.karaf.system/org.apache.karaf.system.core/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.system/org.apache.karaf.system.core/${project.version}</bundle>
<conditional>
<condition>shell</condition>
<config name="org.apache.karaf.command.acl.system">
@@ -672,9 +672,9 @@
<feature name="ssh" description="Provide a SSHd server on Karaf" version="${project.version}">
<feature>shell</feature>
<feature>jaas</feature>
- <bundle start="true" start-level="30">mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
- <bundle start="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.not-yet-commons-ssl/0.3.11_1</bundle>
- <bundle start="true" start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.not-yet-commons-ssl/0.3.11_1</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
</feature>
<feature name="management" description="Provide a JMX MBeanServer and a set of MBeans in Karaf" version="${project.version}">
@@ -935,11 +935,11 @@
<bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/${project.version}</bundle>
<conditional>
<condition>aries-blueprint</condition>
- <bundle start-level="30" start="true">mvn:org.apache.karaf.jaas.blueprint/org.apache.karaf.jaas.blueprint.jasypt/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.jaas.blueprint/org.apache.karaf.jaas.blueprint.jasypt/${project.version}</bundle>
</conditional>
<conditional>
<condition>spring</condition>
- <bundle start-level="30" start="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt-spring31/${jasypt.bundle.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt-spring31/${jasypt.bundle.version}</bundle>
</conditional>
</feature>
@@ -973,7 +973,7 @@
</feature>
<feature name="wrap" description="Wrap URL handler">
- <bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}/jar/uber</bundle>
+ <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}/jar/uber</bundle>
</feature>
<feature name="profile" description="Profiles support" version="${project.version}">
@@ -997,7 +997,7 @@
<feature name="maven" description="Commands for Maven configuration of services from pax-url-aether" version="${project.version}">
<feature>shell</feature>
- <bundle start-level="30" start="true">mvn:org.apache.karaf.maven/org.apache.karaf.maven.core/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.maven/org.apache.karaf.maven.core/${project.version}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
<config name="org.apache.karaf.command.acl.maven">
#
[3/3] karaf git commit: [KARAF-5371] Make sure the region hooks are
invoked first by the framework
Posted by gn...@apache.org.
[KARAF-5371] Make sure the region hooks are invoked first by the framework
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cd0ecbbb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cd0ecbbb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cd0ecbbb
Branch: refs/heads/master
Commit: cd0ecbbb0fb8a09a928bd87cc027572df2adfb7f
Parents: 1837639
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Oct 11 16:11:33 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Wed Oct 11 17:34:19 2017 +0200
----------------------------------------------------------------------
.../apache/karaf/features/internal/osgi/Activator.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/cd0ecbbb/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 2bfbb62..dfc16dd 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
@@ -59,6 +59,7 @@ import org.eclipse.equinox.internal.region.management.StandardManageableRegionDi
import org.eclipse.equinox.region.RegionDigraph;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.hooks.bundle.CollisionHook;
import org.osgi.framework.hooks.resolver.ResolverHookFactory;
@@ -249,12 +250,14 @@ public class Activator extends BaseActivator {
@SuppressWarnings("deprecation")
private void registerRegionDiGraph(StandardRegionDigraph dg) throws BundleException {
+ Dictionary<String, Object> ranking = new Hashtable<>();
+ ranking.put(Constants.SERVICE_RANKING, 1000);
register(ResolverHookFactory.class, dg.getResolverHookFactory());
register(CollisionHook.class, CollisionHookHelper.getCollisionHook(dg));
- register(org.osgi.framework.hooks.bundle.FindHook.class, dg.getBundleFindHook());
- register(org.osgi.framework.hooks.bundle.EventHook.class, dg.getBundleEventHook());
- register(org.osgi.framework.hooks.service.FindHook.class, dg.getServiceFindHook());
- register(org.osgi.framework.hooks.service.EventHook.class, dg.getServiceEventHook());
+ register(org.osgi.framework.hooks.bundle.FindHook.class, dg.getBundleFindHook(), ranking);
+ register(org.osgi.framework.hooks.bundle.EventHook.class, dg.getBundleEventHook(), ranking);
+ register(org.osgi.framework.hooks.service.FindHook.class, dg.getServiceFindHook(), ranking);
+ register(org.osgi.framework.hooks.service.EventHook.class, dg.getServiceEventHook(), ranking);
register(RegionDigraph.class, dg);
if (getBoolean("digraphMBean", FeaturesService.DEFAULT_DIGRAPH_MBEAN)) {