From 535fec006c3ebee217eaa35295c5c9d8dfa18c6a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 22 Oct 2012 15:52:50 +0000
Subject: [PATCH] Fix maven issue with included properties files

git-svn-id: https://svn.argeo.org/commons/trunk@5633 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 security/plugins/pom.xml                      |  1 +
 .../log4j.properties                          | 25 -------------------
 server/plugins/pom.xml                        |  6 ++++-
 3 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 server/plugins/org.argeo.jcr.ui.explorer/log4j.properties

diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml
index c426ba9da..73b930023 100644
--- a/security/plugins/pom.xml
+++ b/security/plugins/pom.xml
@@ -27,6 +27,7 @@
 				<includes>
 					<include>plugin.xml</include>
 					<include>security*.properties</include>
+					<include>plugin.properties</include>
 					<include>META-INF/**</include>
 					<include>branding/**</include>
 					<include>icons/**</include>
diff --git a/server/plugins/org.argeo.jcr.ui.explorer/log4j.properties b/server/plugins/org.argeo.jcr.ui.explorer/log4j.properties
deleted file mode 100644
index 46b724cea..000000000
--- a/server/plugins/org.argeo.jcr.ui.explorer/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=DEBUG
-log4j.logger.org.springframework.security=WARN
-
-log4j.logger.org.apache.catalina=INFO
-log4j.logger.org.apache.coyote=INFO
-log4j.logger.org.apache.tomcat=INFO
-log4j.logger.org.springframework.osgi.web.deployer.tomcat=WARN
-
-log4j.logger.org.apache.directory.server=INFO
-log4j.logger.org.apache.directory.server.core.partition=ERROR
-log4j.logger.org.apache.directory.server.core.schema.bootstrap.BootstrapAttributeTypeRegistry=ERROR
-
-log4j.logger.org.apache.jackrabbit=WARN
-log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR
-
-## Appenders
-# console is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# console uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c - [%t]%n
diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
index c12b3f086..0d4cab19d 100644
--- a/server/plugins/pom.xml
+++ b/server/plugins/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
@@ -24,6 +25,9 @@
 					<include>plugin.xml</include>
 					<include>META-INF/**</include>
 					<include>icons/**</include>
+					<include>plugin.properties</include>
+					<!-- Specific -->
+					<include>jcrexplorer.properties</include>
 				</includes>
 			</resource>
 		</resources>
-- 
2.30.2