X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeLogger.java;h=9b4217b8777cfd91fcb88f1cf2c476a04bab11ee;hb=35507e18257f2e9f59842ba5120fcd3f19c4cf4d;hp=3de2c7934ac43f221aca27d1cdc5ed8ddf44f281;hpb=828c592e047d6dd0b88c1835093e07b1526036b0;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 3de2c7934..9b4217b87 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
@@ -37,11 +37,12 @@ import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.log4j.spi.LoggingEvent;
-import org.argeo.ArgeoException;
+import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.node.ArgeoLogListener;
 import org.argeo.node.ArgeoLogger;
 import org.argeo.node.NodeConstants;
+import org.argeo.osgi.useradmin.UserAdminConf;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.cm.ConfigurationAdmin;
@@ -108,7 +109,7 @@ class NodeLogger implements ArgeoLogger, LogListener {
 			logDispatcherThread = new LogDispatcherThread();
 			logDispatcherThread.start();
 		} catch (Exception e) {
-			throw new ArgeoException("Cannot initialize log4j");
+			throw new CmsException("Cannot initialize log4j");
 		}
 	}
 
@@ -149,32 +150,51 @@ class NodeLogger implements ArgeoLogger, LogListener {
 	}
 
 	private String msg(LogEntry status) {
-		StringBuilder sb = new StringBuilder(status.getMessage());
+		StringBuilder sb = new StringBuilder();
+		sb.append(status.getMessage());
 		ServiceReference<?> sr = status.getServiceReference();
 		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)
-				sb.append(" " + KernelConstants.WHITEBOARD_PATTERN_PROP + ": "
-						+ arrayToString((String[]) whiteBoardPattern));
+			if (whiteBoardPattern != null) {
+				if (whiteBoardPattern instanceof String) {
+					sb.append(" " + KernelConstants.WHITEBOARD_PATTERN_PROP + ": " + whiteBoardPattern);
+				} else {
+					sb.append(" " + KernelConstants.WHITEBOARD_PATTERN_PROP + ": "
+							+ arrayToString((String[]) whiteBoardPattern));
+				}
+			}
 			// RWT
 			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();
 	}
@@ -191,6 +211,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
 	//
@@ -198,7 +227,7 @@ class NodeLogger implements ArgeoLogger, LogListener {
 	public synchronized void register(ArgeoLogListener listener, Integer numberOfPreviousEvents) {
 		String username = CurrentUser.getUsername();
 		if (username == null)
-			throw new ArgeoException("Only authenticated users can register a log listener");
+			throw new CmsException("Only authenticated users can register a log listener");
 
 		if (!userListeners.containsKey(username)) {
 			List<ArgeoLogListener> lst = Collections.synchronizedList(new ArrayList<ArgeoLogListener>());
@@ -227,9 +256,9 @@ class NodeLogger implements ArgeoLogger, LogListener {
 		if (username == null)// FIXME
 			return;
 		if (!userListeners.containsKey(username))
-			throw new ArgeoException("No user listeners " + listener + " registered for user " + username);
+			throw new CmsException("No user listeners " + listener + " registered for user " + username);
 		if (!userListeners.get(username).contains(listener))
-			throw new ArgeoException("No user listeners " + listener + " registered for user " + username);
+			throw new CmsException("No user listeners " + listener + " registered for user " + username);
 		userListeners.get(username).remove(listener);
 		if (userListeners.get(username).isEmpty())
 			userListeners.remove(username);