From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 5 Mar 2012 14:38:24 +0000 (+0000)
Subject: Move secure log4j logger declaration from security.ui to security.core in order to... 
X-Git-Tag: argeo-commons-2.1.30~992
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=d65cac160d9b8f8314a3f400dae6e9df2e60fb8b;p=lgpl%2Fargeo-commons.git

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
---

diff --git a/security/plugins/org.argeo.security.ui/META-INF/spring/monitor.xml b/security/plugins/org.argeo.security.ui/META-INF/spring/monitor.xml
deleted file mode 100644
index 67f35998a..000000000
--- a/security/plugins/org.argeo.security.ui/META-INF/spring/monitor.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<!-- Log4j appender singleton -->
-	<bean id="secureLogger" class="org.argeo.security.log4j.SecureLogger"
-		init-method="init" destroy-method="destroy">
-		<property name="configuration">
-			<value><![CDATA[
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=DEBUG
-log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=WARN
-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.directory.server=ERROR
-log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR
-log4j.logger.org.apache.jackrabbit.core.config=ERROR
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yyMMdd HH:mm:ss} %-5p %m [%t] %c%n
-			]]></value>
-		</property>
-	</bean>
-</beans>
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">
 
-	<!-- SERVICES -->
-	<service ref="secureLogger" interface="org.argeo.ArgeoLogger" />
+	<!-- REFERENCES -->
+	<reference id="secureLogger" interface="org.argeo.ArgeoLogger"
+		cardinality="0..1" />
 </beans:beans>
\ 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/runtime/org.argeo.security.core/META-INF/spring/logger.xml b/security/runtime/org.argeo.security.core/META-INF/spring/logger.xml
new file mode 100644
index 000000000..9e7a680c4
--- /dev/null
+++ b/security/runtime/org.argeo.security.core/META-INF/spring/logger.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<!-- Log4j appender singleton -->
+	<bean id="secureLogger" class="org.argeo.security.log4j.SecureLogger"
+		init-method="init" destroy-method="destroy">
+		<property name="configuration">
+			<value><![CDATA[
+log4j.rootLogger=WARN, console
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+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.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.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
+log4j.appender.console.layout.ConversionPattern=%d{yyMMdd HH:mm:ss} %-5p %m [%t] %c%n
+			]]></value>
+		</property>
+	</bean>
+</beans>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:osgi="http://www.springframework.org/schema/osgi"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<!-- SERVICES -->
+	<service ref="secureLogger" interface="org.argeo.ArgeoLogger" />
+</beans:beans>
\ 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 @@
 
 				<configuration>
 					<instructions>
+						<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
 						<Export-Package>
 							org.argeo.security.*
 						</Export-Package>