From 75c355f9db7002063b90a18121de2e2d1aa0eaf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Sun, 22 May 2011 17:29:34 +0200
Subject: [PATCH] Move default log4j.properties to application

Thus they can be reused by other servers. Some changes in the format
of the messages.

FEA: ItEr74S08DeployFramework
---
 .../src/main/resources}/log4j.properties                   | 4 +---
 pom.xml                                                    | 7 -------
 2 files changed, 1 insertion(+), 10 deletions(-)
 rename {src/main/jetty => navalplanner-webapp/src/main/resources}/log4j.properties (60%)

diff --git a/src/main/jetty/log4j.properties b/navalplanner-webapp/src/main/resources/log4j.properties
similarity index 60%
rename from src/main/jetty/log4j.properties
rename to navalplanner-webapp/src/main/resources/log4j.properties
index 30715319a..dca2398c2 100644
--- a/src/main/jetty/log4j.properties
+++ b/navalplanner-webapp/src/main/resources/log4j.properties
@@ -1,4 +1,3 @@
-et root logger level to DEBUG and its only appender to A1.
 log4j.rootLogger=INFO, A1
 
 # A1 is set to be a ConsoleAppender.
@@ -6,5 +5,4 @@ log4j.appender.A1=org.apache.log4j.ConsoleAppender
 
 # A1 uses PatternLayout.
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
+log4j.appender.A1.layout.ConversionPattern=%-5p [%d{dd-MMMM HH:mm:ss}] [%t] %c %x - %m%n
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4ed6971b6..6d9ff3b9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -609,7 +609,6 @@
                 <directory>../src/main/jetty</directory>
                 <includes>
                     <include>jetty-env.xml</include>
-                    <include>log4j.properties</include>
                 </includes>
                 <targetPath>../jetty</targetPath>
                 <filtering>true</filtering>
@@ -751,12 +750,6 @@
                         </connector>
                     </connectors>
                     -->
-                    <systemProperties>
-                        <systemProperty>
-                            <name>log4j.configuration</name>
-                            <value>file:./target/jetty/log4j.properties</value>
-                        </systemProperty>
-                    </systemProperties>
                 </configuration>
 
                 <dependencies>