X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeLogger.java;h=e83d6c10ed9cd42c7af5da29b4ff05425b1229dc;hb=5b5c2b97eee9edd037e198acadf8b416a973863f;hp=14d88144d1053df6b360dfa4d791f95cd7575998;hpb=3200c28bdc2f274178a62a372dbd2f2cd12855ed;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
index 14d88144d..e83d6c10e 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
@@ -156,18 +156,25 @@ class NodeLogger implements ArgeoLogger, LogListener {
 		if (sr != null) {
 			sb.append(' ');
 			String[] objectClasses = (String[]) sr.getProperty(Constants.OBJECTCLASS);
-			sb.append(arrayToString(objectClasses));
+			if (isSpringApplicationContext(objectClasses)) {
+				sb.append("{org.springframework.context.ApplicationContext}");
+				Object symbolicName = sr.getProperty(Constants.BUNDLE_SYMBOLICNAME);
+				if (symbolicName != null)
+					sb.append(" " + Constants.BUNDLE_SYMBOLICNAME + ": " + symbolicName);
+			} else {
+				sb.append(arrayToString(objectClasses));
+			}
 			Object cn = sr.getProperty(NodeConstants.CN);
 			if (cn != null)
 				sb.append(" " + NodeConstants.CN + ": " + cn);
 			Object factoryPid = sr.getProperty(ConfigurationAdmin.SERVICE_FACTORYPID);
 			if (factoryPid != null)
 				sb.append(" " + ConfigurationAdmin.SERVICE_FACTORYPID + ": " + factoryPid);
-//			else {
-//				Object servicePid = sr.getProperty(Constants.SERVICE_PID);
-//				if (servicePid != null)
-//					sb.append(" " + Constants.SERVICE_PID + ": " + servicePid);
-//			}
+			// else {
+			// Object servicePid = sr.getProperty(Constants.SERVICE_PID);
+			// if (servicePid != null)
+			// sb.append(" " + Constants.SERVICE_PID + ": " + servicePid);
+			// }
 			// servlets
 			Object whiteBoardPattern = sr.getProperty(KernelConstants.WHITEBOARD_PATTERN_PROP);
 			if (whiteBoardPattern != null)
@@ -177,11 +184,12 @@ class NodeLogger implements ArgeoLogger, LogListener {
 			Object contextName = sr.getProperty(KernelConstants.CONTEXT_NAME_PROP);
 			if (contextName != null)
 				sb.append(" " + KernelConstants.CONTEXT_NAME_PROP + ": " + contextName);
-			
+
 			// user directories
 			Object baseDn = sr.getProperty(UserAdminConf.baseDn.name());
 			if (baseDn != null)
 				sb.append(" " + UserAdminConf.baseDn.name() + ": " + baseDn);
+
 		}
 		return sb.toString();
 	}
@@ -198,6 +206,15 @@ class NodeLogger implements ArgeoLogger, LogListener {
 		return sb.toString();
 	}
 
+	private boolean isSpringApplicationContext(String[] objectClasses) {
+		for (String clss : objectClasses) {
+			if (clss.equals("org.eclipse.gemini.blueprint.context.DelegatedExecutionOsgiBundleApplicationContext")) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	//
 	// ARGEO LOGGER
 	//