Revert "Load platform bundles separately"

3 files changed, 12 insertions, 12 deletions

diff --git a/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java b/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java
index 6a700a65a03..d809c493565 100644
--- a/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java
+++ b/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java
@@ -12,11 +12,15 @@ import java.util.List;
 
 /**
  * @author Tony Vaagenes
- * @author gjoranv
  */
 public class MockOsgi extends NonWorkingOsgiFramework implements Osgi {
 
     @Override
+    public List<Bundle> getInitialBundles() {
+        return Collections.emptyList();
+    }
+
+    @Override
     public Bundle[] getBundles() {
         return new Bundle[0];
     }
diff --git a/container-core/src/main/java/com/yahoo/osgi/Osgi.java b/container-core/src/main/java/com/yahoo/osgi/Osgi.java
index 513e7883594..8f0acf41f30 100644
--- a/container-core/src/main/java/com/yahoo/osgi/Osgi.java
+++ b/container-core/src/main/java/com/yahoo/osgi/Osgi.java
@@ -9,10 +9,11 @@ import java.util.List;
 
 /**
  * @author Tony Vaagenes
- * @author gjoranv
  */
 public interface Osgi {
 
+    List<Bundle> getInitialBundles();
+
     Bundle[] getBundles();
 
     /** Returns all bundles that have not been scheduled for uninstall. */
@@ -24,7 +25,4 @@ public interface Osgi {
 
     void allowDuplicateBundles(Collection<Bundle> bundles);
 
-    default boolean hasFelixFramework() {
-       return false;
-    }
 }
diff --git a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java
index 998273acfc7..ed93d15c975 100644
--- a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java
+++ b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java
@@ -5,7 +5,6 @@ import com.yahoo.component.ComponentSpecification;
 import com.yahoo.component.Version;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.jdisc.application.OsgiFramework;
-import com.yahoo.jdisc.core.FelixFramework;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.launch.Framework;
@@ -17,7 +16,6 @@ import java.util.logging.Logger;
 /**
  * @author Tony Vaagenes
  * @author bratseth
- * @author gjoranv
  */
 public class OsgiImpl implements Osgi {
     private static final Logger log = Logger.getLogger(OsgiImpl.class.getName());
@@ -44,6 +42,11 @@ public class OsgiImpl implements Osgi {
     }
 
     @Override
+    public List<Bundle> getInitialBundles() {
+        return initialBundles;
+    }
+
+    @Override
     public Bundle[] getBundles() {
         List<Bundle> bundles = jdiscOsgi.bundles();
         return bundles.toArray(new Bundle[bundles.size()]);
@@ -152,11 +155,6 @@ public class OsgiImpl implements Osgi {
         jdiscOsgi.allowDuplicateBundles(bundles);
     }
 
-    @Override
-    public boolean hasFelixFramework() {
-        return jdiscOsgi instanceof FelixFramework;
-    }
-
     private static Bundle firstNonFrameworkBundle(List<Bundle> bundles) {
         for (Bundle b : bundles) {
             if (! (b instanceof Framework))