From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 13 Jan 2020 10:24:22 +0000 (+0100)
Subject: Improve extensibility and logging.
X-Git-Tag: argeo-commons-2.1.85~34
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=bd5f25758f7030a3bc0998bb5f5fd41bbc457268

Improve extensibility and logging.
---

diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
index 8bf16a265..17c85ffb4 100644
--- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
+++ b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
@@ -21,7 +21,7 @@ public abstract class AbstractRapE4App implements ApplicationConfiguration {
 	private Map<String, String> baseProperties = new HashMap<String, String>();
 
 	private BundleContext bundleContext;
-	private final static String CONTEXT_NAME_PROPERTY = "contextName";
+	public final static String CONTEXT_NAME_PROPERTY = "contextName";
 	private String contextName;
 
 	/**
@@ -105,10 +105,14 @@ public abstract class AbstractRapE4App implements ApplicationConfiguration {
 		return bundleContext;
 	}
 
-	protected String getContextName() {
+	public String getContextName() {
 		return contextName;
 	}
 
+	public void setContextName(String contextName) {
+		this.contextName = contextName;
+	}
+
 	public void init(BundleContext bundleContext, Map<String, Object> properties) {
 		this.bundleContext = bundleContext;
 		for (String key : properties.keySet()) {
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsTheme.java b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsTheme.java
index 76b1854a4..8bb7098cf 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsTheme.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsTheme.java
@@ -92,8 +92,8 @@ public class CmsTheme {
 			if (name.startsWith("target/"))
 				continue resources; // skip maven output
 			application.addResource(name, resources.get(name));
-			if (log.isDebugEnabled())
-				log.debug("Added resource " + name);
+			if (log.isTraceEnabled())
+				log.trace("Added resource " + name);
 		}
 		for (String name : css.keySet()) {
 			application.addStyleSheet(themeId, name, css.get(name));
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 da6328163..48b6b7fc7 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
@@ -61,8 +61,14 @@ class DataModels implements BundleListener {
 	protected void processBundle(Bundle bundle) {
 		BundleWiring wiring = bundle.adapt(BundleWiring.class);
 		if (wiring == null) {
-			log.warn("Bundle " + bundle.getSymbolicName() + " #" + bundle.getBundleId() + " (" + bundle.getLocation()
-					+ ") cannot be adapted to a wiring");
+			int bundleState = bundle.getState();
+			if (bundleState != Bundle.INSTALLED && bundleState != Bundle.UNINSTALLED) {// ignore unresolved bundles
+				log.warn("Bundle " + bundle.getSymbolicName() + " #" + bundle.getBundleId() + " ("
+						+ bundle.getLocation() + ") cannot be adapted to a wiring");
+			} else {
+				if (log.isTraceEnabled())
+					log.warn("Bundle " + bundle.getSymbolicName() + " is not resolved.");
+			}
 			return;
 		}
 		List<BundleCapability> providedDataModels = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE);