Reset Castor configs properly after bug due to Maven Eclipse plugin

git-svn-id: https://svn.argeo.org/slc/trunk@1092 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml
index 8e4e935acef1149d6b7fe7a09960d00f26239d06..2e0e87f6f1897a51caa61ce4ecf366b89074d2f3 100644 (file)
--- a/org.argeo.slc.server/pom.xml
+++ b/org.argeo.slc.server/pom.xml
@@ -25,8 +25,7 @@
                        </plugin>\r
                        <plugin>\r
                                <groupId>org.mortbay.jetty</groupId>\r
-                               <artifactId>maven-jetty-plugin</artifactId>\r
-                               <version>6.1.9</version>\r
+                               <artifactId>jetty-maven-plugin</artifactId>\r
                                <configuration>\r
                                        <scanIntervalSeconds>10</scanIntervalSeconds>\r
                                        <contextPath>org.argeo.slc.webapp</contextPath>\r

diff --git a/org.argeo.slc.server/src/test/resources/log4j.properties b/org.argeo.slc.server/src/test/resources/log4j.properties
index a38d5b0cd1d93cd92f02c2cea6e79b551aaf0e55..c49b71be87f601869ac3e4bfa4b0501360414e1f 100644 (file)
--- a/org.argeo.slc.server/src/test/resources/log4j.properties
+++ b/org.argeo.slc.server/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 # Set root logger level to DEBUG and its only appender to A1.\r
-log4j.rootLogger=TRACE, console\r
+log4j.rootLogger=INFO, console\r
 \r
 ## Levels\r
 # Slc\r