From d65cac160d9b8f8314a3f400dae6e9df2e60fb8b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 5 Mar 2012 14:38:24 +0000 Subject: [PATCH] Move secure log4j logger declaration from security.ui to security.core in order to avoid use package conflicts git-svn-id: https://svn.argeo.org/commons/trunk@5150 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org.argeo.security.ui/META-INF/spring/osgi.xml | 5 +++-- .../org/argeo/security/ui/views/AdminLogView.java | 6 +++--- .../META-INF/spring/logger.xml} | 14 ++++++++------ .../META-INF/spring/osgi.xml | 12 ++++++++++++ security/runtime/org.argeo.security.core/pom.xml | 1 + 5 files changed, 27 insertions(+), 11 deletions(-) rename security/{plugins/org.argeo.security.ui/META-INF/spring/monitor.xml => runtime/org.argeo.security.core/META-INF/spring/logger.xml} (72%) create mode 100644 security/runtime/org.argeo.security.core/META-INF/spring/osgi.xml diff --git a/security/plugins/org.argeo.security.ui/META-INF/spring/osgi.xml b/security/plugins/org.argeo.security.ui/META-INF/spring/osgi.xml index 5e1433c2f..1f93913de 100644 --- a/security/plugins/org.argeo.security.ui/META-INF/spring/osgi.xml +++ b/security/plugins/org.argeo.security.ui/META-INF/spring/osgi.xml @@ -7,6 +7,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - - + + \ No newline at end of file diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/AdminLogView.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/AdminLogView.java index 59b18e0a9..4f6fb5a35 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/AdminLogView.java +++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/AdminLogView.java @@ -2,7 +2,7 @@ package org.argeo.security.ui.views; import java.util.ArrayList; -import org.argeo.security.log4j.SecureLogger; +import org.argeo.ArgeoLogger; import org.argeo.security.ui.SecurityUiPlugin; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.LabelProvider; @@ -22,7 +22,7 @@ public class AdminLogView extends ViewPart { private TableViewer viewer; private LogContentProvider logContentProvider; - private SecureLogger argeoLogger; + private ArgeoLogger argeoLogger; @Override public void createPartControl(Composite parent) { @@ -66,7 +66,7 @@ public class AdminLogView extends ViewPart { argeoLogger.unregisterForAll(logContentProvider); } - public void setArgeoLogger(SecureLogger argeoLogger) { + public void setArgeoLogger(ArgeoLogger argeoLogger) { this.argeoLogger = argeoLogger; } diff --git a/security/plugins/org.argeo.security.ui/META-INF/spring/monitor.xml b/security/runtime/org.argeo.security.core/META-INF/spring/logger.xml similarity index 72% rename from security/plugins/org.argeo.security.ui/META-INF/spring/monitor.xml rename to security/runtime/org.argeo.security.core/META-INF/spring/logger.xml index 67f35998a..9e7a680c4 100644 --- a/security/plugins/org.argeo.security.ui/META-INF/spring/monitor.xml +++ b/security/runtime/org.argeo.security.core/META-INF/spring/logger.xml @@ -13,17 +13,19 @@ log4j.rootLogger=WARN, console ## Levels log4j.logger.org.argeo=DEBUG -log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=WARN +log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=ERROR +log4j.logger.org.springframework.web.servlet.PageNotFound=ERROR log4j.logger.org.argeo.server.webextender.TomcatDeployer=WARN -log4j.logger.org.argeo.security.core=TRACE -#log4j.logger.org.springframework.security=DEBUG - -log4j.logger.org.apache.catalina=INFO log4j.logger.org.apache.coyote=INFO +log4j.logger.org.apache.catalina.core.ContainerBase=INFO log4j.logger.org.apache.directory.server=ERROR log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR -log4j.logger.org.apache.jackrabbit.core.config=ERROR +log4j.logger.org.apache.jackrabbit.core.config.ConfigurationErrorHandler=ERROR +log4j.logger.org.apache.jackrabbit.core.util.db.DbUtility=FATAL +log4j.logger.org.apache.activemq=INFO +log4j.logger.org.apache.activemq.ActiveMQMessageConsumer=INFO +log4j.logger.org.apache.activemq.ActiveMQMessageProducer=INFO log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout diff --git a/security/runtime/org.argeo.security.core/META-INF/spring/osgi.xml b/security/runtime/org.argeo.security.core/META-INF/spring/osgi.xml new file mode 100644 index 000000000..5e1433c2f --- /dev/null +++ b/security/runtime/org.argeo.security.core/META-INF/spring/osgi.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml index d751d5ebd..b03075918 100644 --- a/security/runtime/org.argeo.security.core/pom.xml +++ b/security/runtime/org.argeo.security.core/pom.xml @@ -29,6 +29,7 @@ + lazy org.argeo.security.* -- 2.30.2