Fix override of installed bundles

[lgpl/argeo-commons.git] / org.argeo.init / src / org / argeo / init / a2 / OsgiContext.java

diff --git a/org.argeo.init/src/org/argeo/init/a2/OsgiContext.java b/org.argeo.init/src/org/argeo/init/a2/OsgiContext.java
index 35fbee3568a4b3ea39d0709423ab4d33d31c1499..7f1133f676a034a8b1fde29a4a683877dbe46b1b 100644 (file)
--- a/org.argeo.init/src/org/argeo/init/a2/OsgiContext.java
+++ b/org.argeo.init/src/org/argeo/init/a2/OsgiContext.java
@@ -6,16 +6,22 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.Version;
 
-/** A running OSGi bundle context seen as a {@link AbstractProvisioningSource}. */
+/**
+ * A running OSGi bundle context seen as a {@link AbstractProvisioningSource}.
+ */
 class OsgiContext extends AbstractProvisioningSource {
        private final BundleContext bc;
 
+       private A2Contribution runtimeContribution;
+
        public OsgiContext(BundleContext bc) {
-               super();
+               super(false);
                this.bc = bc;
+               runtimeContribution = getOrAddContribution(A2Contribution.RUNTIME);
        }
 
        public OsgiContext() {
+               super(false);
                Bundle bundle = FrameworkUtil.getBundle(OsgiContext.class);
                if (bundle == null)
                        throw new IllegalArgumentException(
@@ -24,16 +30,19 @@ class OsgiContext extends AbstractProvisioningSource {
        }
 
        void load() {
-               A2Contribution runtimeContribution = getOrAddContribution( A2Contribution.RUNTIME);
                for (Bundle bundle : bc.getBundles()) {
-                       // OsgiBootUtils.debug(bundle.getDataFile("/"));
-                       String componentId = bundle.getSymbolicName();
-                       Version version = bundle.getVersion();
-                       A2Component component = runtimeContribution.getOrAddComponent(componentId);
-                       A2Module module = component.getOrAddModule(version, bundle);
-                       if (OsgiBootUtils.isDebug())
-                               OsgiBootUtils.debug("Registered " + module + " (location id: " + bundle.getLocation() + ")");
+                       registerBundle(bundle);
                }
 
        }
+
+       void registerBundle(Bundle bundle) {
+               String componentId = bundle.getSymbolicName();
+               Version version = bundle.getVersion();
+               A2Component component = runtimeContribution.getOrAddComponent(componentId);
+               A2Module module = component.getOrAddModule(version, bundle);
+               if (OsgiBootUtils.isDebug())
+                       OsgiBootUtils.debug("Registered bundle module " + module + " (location id: " + bundle.getLocation() + ")");
+
+       }
 }