diff options
author | gjoranv <gv@verizonmedia.com> | 2020-07-17 14:23:41 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-07-17 14:23:41 +0200 |
commit | 5627a766d1d34159ee126b4980dc817654bc7508 (patch) | |
tree | a1f5ff3d39f0343fc22e3109c5fb331b21ebdaad /jdisc_core | |
parent | f1d49e5d8be88d61c832569ca0871dc240f2ebe2 (diff) |
Reapply "Load platform bundles separately 3"
This reverts commit 1c69b4e72b3212e3ce989a8675db08ac51b7f79d.
Diffstat (limited to 'jdisc_core')
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java | 7 | ||||
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java index b1aceb81bc6..12168663205 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java @@ -113,4 +113,11 @@ public interface OsgiFramework { */ void stop() throws BundleException; + /** + * Returns true if this is a Felix based framework and not e.g. a test framework. + */ + default boolean isFelixFramework() { + return false; + } + } diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java index c14e513fb98..bd189f8b898 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java @@ -169,6 +169,11 @@ public class FelixFramework implements OsgiFramework { collisionHook.allowDuplicateBundles(bundles); } + @Override + public boolean isFelixFramework() { + return true; + } + private void installBundle(String bundleLocation, Set<String> mask, List<Bundle> out) throws BundleException { bundleLocation = BundleLocationResolver.resolve(bundleLocation); if (mask.contains(bundleLocation)) { |