diff options
author | gjoranv <gv@verizonmedia.com> | 2020-07-16 10:11:49 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-07-16 10:12:19 +0200 |
commit | 1eb5aeac9e1ad94f4e5d290cd57264541968454b (patch) | |
tree | 0db6722d283c5f5080a8a9dc81c0d6bfa5fea6b9 /container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java | |
parent | c608c8384315cebdc8adacb012a8c49a09cc0340 (diff) |
Reapply "Load platform bundles separately"
This reverts commit 0355cb740fe498abc03861bcb64de5e418c2fa88.
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index b983cbcfe37..40470a9f096 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -101,12 +101,16 @@ public class HandlersConfigurerDi { private static class ContainerAndDiOsgi extends OsgiImpl implements OsgiWrapper { private final OsgiFramework osgiFramework; - private final BundleManager bundleManager; + private final ApplicationBundleLoader applicationBundleLoader; + private final PlatformBundleLoader platformBundleLoader; public ContainerAndDiOsgi(OsgiFramework osgiFramework) { super(osgiFramework); this.osgiFramework = osgiFramework; - bundleManager = new BundleManager(new OsgiImpl(osgiFramework)); + + OsgiImpl osgi = new OsgiImpl(osgiFramework); + applicationBundleLoader = new ApplicationBundleLoader(osgi); + platformBundleLoader = new PlatformBundleLoader(osgi); } @@ -131,9 +135,15 @@ public class HandlersConfigurerDi { } @Override - public Set<Bundle> useBundles(Collection<FileReference> bundles) { + public void installPlatformBundles(Collection<FileReference> bundles) { + log.fine("Installing platform bundles."); + platformBundleLoader.install(bundles); + } + + @Override + public Set<Bundle> useApplicationBundles(Collection<FileReference> bundles) { log.info("Installing bundles from the latest application"); - return bundleManager.use(new ArrayList<>(bundles)); + return applicationBundleLoader.useBundles(new ArrayList<>(bundles)); } } |