From: Mathieu Baudier Date: Wed, 23 Apr 2008 14:03:07 +0000 (+0000) Subject: Configure for use with Jetty maven plugin X-Git-Tag: argeo-slc-2.1.7~3008 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=133b207b0fedd8e2450638ef1e1da667485bdbb1;p=gpl%2Fargeo-slc.git Configure for use with Jetty maven plugin git-svn-id: https://svn.argeo.org/slc/trunk@1032 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc.server/.classpath b/org.argeo.slc.server/.classpath index 40adf69ad..1b6873a79 100644 --- a/org.argeo.slc.server/.classpath +++ b/org.argeo.slc.server/.classpath @@ -1,6 +1,7 @@ + diff --git a/org.argeo.slc.server/.settings/org.eclipse.wst.common.component b/org.argeo.slc.server/.settings/org.eclipse.wst.common.component index 66f90d6f7..9a96e64fc 100644 --- a/org.argeo.slc.server/.settings/org.eclipse.wst.common.component +++ b/org.argeo.slc.server/.settings/org.eclipse.wst.common.component @@ -2,5 +2,6 @@ + diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml index 87965f928..d4dcaf9ed 100644 --- a/org.argeo.slc.server/pom.xml +++ b/org.argeo.slc.server/pom.xml @@ -27,6 +27,29 @@ org.apache.maven.plugins maven-javadoc-plugin + + org.mortbay.jetty + maven-jetty-plugin + + 5 + org.argeo.slc.webapp + true + + ../org.argeo.slc.webapp/src/main/webapp + + + + + ../org.argeo.slc.webapp/src/main/webapp + + + **/*.xml + + + + + + diff --git a/org.argeo.slc.server/src/test/resources/log4j.properties b/org.argeo.slc.server/src/test/resources/log4j.properties new file mode 100644 index 000000000..8eb8b0c9c --- /dev/null +++ b/org.argeo.slc.server/src/test/resources/log4j.properties @@ -0,0 +1,23 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=INFO, console + +## Levels +# Slc +log4j.logger.org.argeo.slc=DEBUG +# Spring +log4j.logger.org.springframework=INFO +# Hibernate +log4j.logger.org.hibernate=WARN +#log4j.logger.org.hibernate.SQL=TRACE +#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE +#log4j.logger.org.hibernate.type=TRACE + + +## Appenders +# A1 is set to be a ConsoleAppender. +log4j.appender.console=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n +