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 40adf69ad75f72410157bc2879565c4b7a2a4311..1b6873a79a78652bcc1d15e631e8a34d31d7d1fb 100644 (file)
--- a/org.argeo.slc.server/.classpath
+++ b/org.argeo.slc.server/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
        <classpathentry kind="src" path="src/main/java"/>\r
+       <classpathentry kind="src" path="src/test/resources"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
        <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>\r

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 66f90d6f7a6c1435cbabf8cddc436d0fddab8fd5..9a96e64fc1449aa15ae5ae44a007fa50b11bf564 100644 (file)
--- 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 @@
 <project-modules id="moduleCoreId" project-version="1.5.0">\r
 <wb-module deploy-name="org.argeo.slc.server">\r
 <wb-resource deploy-path="/" source-path="/src/main/java"/>\r
+<wb-resource deploy-path="/" source-path="/src/test/resources"/>\r
 </wb-module>\r
 </project-modules>\r

diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml
index 87965f92824e1bc3977cc4a7728405463d5d5e2b..d4dcaf9ed63c3d10998e88bfeb75992159dfe787 100644 (file)
--- a/org.argeo.slc.server/pom.xml
+++ b/org.argeo.slc.server/pom.xml
@@ -27,6 +27,29 @@
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-javadoc-plugin</artifactId>\r
                        </plugin>\r
+                       <plugin>\r
+                               <groupId>org.mortbay.jetty</groupId>\r
+                               <artifactId>maven-jetty-plugin</artifactId>\r
+                               <configuration>\r
+                                       <scanIntervalSeconds>5</scanIntervalSeconds>\r
+                                       <contextPath>org.argeo.slc.webapp</contextPath>\r
+                                       <useTestClasspath>true</useTestClasspath>\r
+                                       <webAppSourceDirectory>\r
+                                               ../org.argeo.slc.webapp/src/main/webapp\r
+                                       </webAppSourceDirectory>\r
+                                       <scanTargetPatterns>\r
+                                               <scanTargetPattern>\r
+                                                       <directory>\r
+                                                               ../org.argeo.slc.webapp/src/main/webapp\r
+                                                       </directory>\r
+                                                       <includes>\r
+                                                               <include>**/*.xml</include>\r
+                                                       </includes>\r
+                                               </scanTargetPattern>\r
+                                       </scanTargetPatterns>\r
+                               </configuration>\r
+                       </plugin>\r
+\r
                </plugins>\r
        </build>\r
        <dependencies>\r

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 (file)
index 0000000..8eb8b0c
--- /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.\r
+log4j.rootLogger=INFO, console\r
+\r
+## Levels\r
+# Slc\r
+log4j.logger.org.argeo.slc=DEBUG\r
+# Spring\r
+log4j.logger.org.springframework=INFO\r
+# Hibernate\r
+log4j.logger.org.hibernate=WARN\r
+#log4j.logger.org.hibernate.SQL=TRACE\r
+#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE\r
+#log4j.logger.org.hibernate.type=TRACE\r
+\r
+\r
+## Appenders\r
+# A1 is set to be a ConsoleAppender.\r
+log4j.appender.console=org.apache.log4j.ConsoleAppender\r
+\r
+# A1 uses PatternLayout.\r
+log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n\r
+\r