X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FDataModels.java;h=acf0dbf7cbf9dbd97e4aa95d26df1c068d7586a1;hb=3c7803ca05e2b0276d635e64046d924d3f1884c9;hp=48b6b7fc75f3476caab9b7a9be218feca546e8cf;hpb=bd5f25758f7030a3bc0998bb5f5fd41bbc457268;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java
index 48b6b7fc7..acf0dbf7c 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java
@@ -1,6 +1,6 @@
 package org.argeo.cms.internal.kernel;
 
-import static org.argeo.node.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE;
+import static org.argeo.api.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -10,8 +10,8 @@ import java.util.TreeMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.api.DataModelNamespace;
 import org.argeo.cms.CmsException;
-import org.argeo.node.DataModelNamespace;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
@@ -27,7 +27,7 @@ class DataModels implements BundleListener {
 
 	public DataModels(BundleContext bc) {
 		for (Bundle bundle : bc.getBundles())
-			processBundle(bundle);
+			processBundle(bundle, null);
 		bc.addBundleListener(this);
 	}
 
@@ -45,7 +45,7 @@ class DataModels implements BundleListener {
 	@Override
 	public void bundleChanged(BundleEvent event) {
 		if (event.getType() == Bundle.RESOLVED) {
-			processBundle(event.getBundle());
+			processBundle(event.getBundle(), null);
 		} else if (event.getType() == Bundle.UNINSTALLED) {
 			BundleWiring wiring = event.getBundle().adapt(BundleWiring.class);
 			List<BundleCapability> providedDataModels = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE);
@@ -58,7 +58,9 @@ class DataModels implements BundleListener {
 
 	}
 
-	protected void processBundle(Bundle bundle) {
+	protected void processBundle(Bundle bundle, List<Bundle> scannedBundles) {
+		if (scannedBundles != null && scannedBundles.contains(bundle))
+			throw new IllegalStateException("Cycle in CMS data model requirements for " + bundle);
 		BundleWiring wiring = bundle.adapt(BundleWiring.class);
 		if (wiring == null) {
 			int bundleState = bundle.getState();
@@ -77,7 +79,12 @@ class DataModels implements BundleListener {
 		List<BundleWire> requiredDataModels = wiring.getRequiredWires(CMS_DATA_MODEL_NAMESPACE);
 		// process requirements first
 		for (BundleWire bundleWire : requiredDataModels) {
-			processBundle(bundleWire.getProvider().getBundle());
+			List<Bundle> nextScannedBundles = new ArrayList<>();
+			if (scannedBundles != null)
+				nextScannedBundles.addAll(scannedBundles);
+			nextScannedBundles.add(bundle);
+			Bundle providerBundle = bundleWire.getProvider().getBundle();
+			processBundle(providerBundle, nextScannedBundles);
 		}
 		for (BundleCapability bundleCapability : providedDataModels) {
 			String name = (String) bundleCapability.getAttributes().get(DataModelNamespace.NAME);