diff --git a/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/_remote.repositories b/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/_remote.repositories deleted file mode 100644 index 01bcd62..0000000 --- a/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/_remote.repositories +++ /dev/null @@ -1,3 +0,0 @@ -#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice. -#Thu Nov 07 15:05:54 CST 2013 -logback-ext-parent-0.1.2-SNAPSHOT.pom>= diff --git a/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/logback-ext-parent-0.1.2-SNAPSHOT.pom b/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/logback-ext-parent-0.1.2-SNAPSHOT.pom deleted file mode 100644 index 4544713..0000000 --- a/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/logback-ext-parent-0.1.2-SNAPSHOT.pom +++ /dev/null @@ -1,414 +0,0 @@ - - - - 4.0.0 - - - org.sonatype.oss - oss-parent - 7 - - - org.logback-extensions - logback-ext-parent - pom - 0.1.2-SNAPSHOT - - Logback Extensions - https://github.com/qos-ch/logback-extensions/wiki - - Logback Extensions provides community-driven and supported extensions to the Logback logging framework. - - 2012 - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - scm:git:git://github.com/qos-ch/logback-extensions.git - scm:git:git@github.com:qos-ch/logback-extensions.git - https://github.com/qos-ch/logback-extensions - - - GitHub - https://github.com/qos-ch/logback-extensions/issues - - - - - lhazlewood - Les Hazlewood - les@hazlewood.com - http://www.leshazlewood.com - -8 - - - belaso - Christian Trutz - christian.trutz@belaso.de - http://www.belaso.de - +2 - - - tony19 - Tony Trinh - tony19@gmail.com - http://tony19.github.com - -5 - - - - - - spring - - - - UTF-8 - - - 1.0.9 - 1.9.5 - 3.1.1.RELEASE - 2.7.3 - - - 3.1 - 1.8.6 - 0.999.15 - 4.8.2 - - - - - - - org.codehaus.groovy - groovy-all - ${groovy.version} - test - - - org.easymock - easymock - ${easymock.version} - test - - - com.googlecode.jmockit - jmockit - ${jmockit.version} - test - - - junit - junit - ${junit.version} - test - - - - - - - - - - - - - - ch.qos.logback - logback-access - ${logback.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - - ch.qos.logback - logback-core - ${logback.version} - - - - - ch.qos.logback.extensions - logback-ext-jackson - - ${project.version} - - - - ch.qos.logback.extensions - logback-ext-json-classic - - ${project.version} - - - ch.qos.logback.extensions - logback-ext-json-core - - ${project.version} - - - - - javax.servlet - servlet-api - 2.5 - provided - true - - - org.codehaus.jackson - jackson-mapper-asl - ${jackson.version} - provided - - - - org.springframework - spring-context - ${spring.version} - provided - true - - - commons-logging - commons-logging - - - - - org.springframework - spring-web - ${spring.version} - provided - true - - - commons-logging - commons-logging - - - - - - org.mongodb - mongo-java-driver - ${mongo-java-driver.version} - provided - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - UTF-8 - - - - - org.codehaus.gmaven - gmaven-plugin - 1.4 - - 1.7 - src/main/groovy - - - - org.codehaus.gmaven.runtime - gmaven-runtime-1.7 - 1.3 - - - org.codehaus.groovy - groovy-all - - - - - org.codehaus.groovy - groovy-all - ${groovy.version} - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.gmaven - gmaven-plugin - [1.0.0,) - - testCompile - - - - - - - - - - - - - - - - - org.codehaus.gmaven - gmaven-plugin - - - - - testCompile - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.2.2 - - clean install - true - false - - deploy - -Prelease - forked-path - - - - - - - - release - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - - attach-api-docs - - - jar - - - - true - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - - jar - - - - true - - - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - - - - - - - - diff --git a/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/maven-metadata-basedir.xml b/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/maven-metadata-basedir.xml deleted file mode 100644 index 57f2852..0000000 --- a/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/maven-metadata-basedir.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - org.logback-extensions - logback-ext-parent - 0.1.2-SNAPSHOT - diff --git a/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/maven-metadata-local.xml b/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index 01794d9..0000000 --- a/lib/org/logback-extensions/logback-ext-parent/0.1.2-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - org.logback-extensions - logback-ext-parent - 0.1.2-SNAPSHOT - - - true - - 20131107070554 - - - pom - 0.1.2-SNAPSHOT - 20131107070554 - - - - diff --git a/lib/org/logback-extensions/logback-ext-parent/maven-metadata-local.xml b/lib/org/logback-extensions/logback-ext-parent/maven-metadata-local.xml deleted file mode 100644 index 6203676..0000000 --- a/lib/org/logback-extensions/logback-ext-parent/maven-metadata-local.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - org.logback-extensions - logback-ext-parent - - - 0.1.2-SNAPSHOT - - 20131107070554 - - diff --git a/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/_remote.repositories b/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/_remote.repositories deleted file mode 100644 index 029cd3d..0000000 --- a/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/_remote.repositories +++ /dev/null @@ -1,4 +0,0 @@ -#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice. -#Thu Nov 07 12:01:52 CST 2013 -logback-ext-spring-0.1.2-SNAPSHOT.jar>= -logback-ext-spring-0.1.2-SNAPSHOT.pom>= diff --git a/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/logback-ext-spring-0.1.2-SNAPSHOT.jar b/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/logback-ext-spring-0.1.2-SNAPSHOT.jar deleted file mode 100644 index 1cc1ba1..0000000 Binary files a/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/logback-ext-spring-0.1.2-SNAPSHOT.jar and /dev/null differ diff --git a/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/logback-ext-spring-0.1.2-SNAPSHOT.pom b/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/logback-ext-spring-0.1.2-SNAPSHOT.pom deleted file mode 100644 index 8fd692c..0000000 --- a/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/logback-ext-spring-0.1.2-SNAPSHOT.pom +++ /dev/null @@ -1,51 +0,0 @@ - - - - - org.logback-extensions - logback-ext-parent - 0.1.2-SNAPSHOT - - - 4.0.0 - logback-ext-spring - Logback Extensions :: Spring - jar - - - - ch.qos.logback - logback-classic - - - - org.springframework - spring-context - - - - org.springframework - spring-web - - - javax.servlet - servlet-api - - - - - diff --git a/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/maven-metadata-local.xml b/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index b720bcc..0000000 --- a/lib/org/logback-extensions/logback-ext-spring/0.1.2-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - org.logback-extensions - logback-ext-spring - 0.1.2-SNAPSHOT - - - true - - 20131107040152 - - - jar - 0.1.2-SNAPSHOT - 20131107040152 - - - pom - 0.1.2-SNAPSHOT - 20131107040152 - - - - diff --git a/lib/org/logback-extensions/logback-ext-spring/maven-metadata-local.xml b/lib/org/logback-extensions/logback-ext-spring/maven-metadata-local.xml deleted file mode 100644 index 89e1ddf..0000000 --- a/lib/org/logback-extensions/logback-ext-spring/maven-metadata-local.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - org.logback-extensions - logback-ext-spring - - - 0.1.2-SNAPSHOT - - 20131107040152 - - diff --git a/pom.xml b/pom.xml index f2f319a..2e9eaee 100644 --- a/pom.xml +++ b/pom.xml @@ -302,22 +302,21 @@ compile + - ch.qos.logback - logback-classic - 1.0.13 - - - org.logback-extensions - logback-ext-spring - 0.1.2-SNAPSHOT + log4j + log4j + 1.2.14 + compile org.slf4j - jul-to-slf4j + slf4j-log4j12 1.7.5 + compile + org.mybatis @@ -356,11 +355,5 @@ - - - basedir - file://${project.basedir}/lib/ - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/log4j.xml b/src/main/webapp/WEB-INF/log4j.xml new file mode 100644 index 0000000..d788ca6 --- /dev/null +++ b/src/main/webapp/WEB-INF/log4j.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/logback.xml b/src/main/webapp/WEB-INF/logback.xml deleted file mode 100644 index 3027c4d..0000000 --- a/src/main/webapp/WEB-INF/logback.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - %d{yyyy-MM-dd HH:mm:ss} %level %class:%line - %msg%n - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index a089ccb..7b4c539 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -63,11 +63,11 @@ classpath:spring/*.xml - logbackConfigLocation - /WEB-INF/logback.xml + log4jConfigLocation + /WEB-INF/log4j.xml - ch.qos.logback.ext.spring.web.LogbackConfigListener + org.springframework.web.util.Log4jConfigListener diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties new file mode 100644 index 0000000..0e6392a --- /dev/null +++ b/src/test/resources/log4j.properties @@ -0,0 +1,8 @@ +log4j.rootLogger=INFO, stdout + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +#log4j.appender.stdout.Threshold=INFO +#log4j.appender.stdout.ImmediateFlush=true +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n