From b5c4e0c9c2fcf788a56d6ce72989fe15182e057d Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 1 Dec 2007 15:23:26 +0000
Subject: [PATCH] Manage with Maven

git-svn-id: https://svn.argeo.org/slc/trunk@801 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc/.classpath                      |  25 +--
 org.argeo.slc/.project                        |   6 +
 .../.settings/org.eclipse.jdt.core.prefs      |   2 +-
 org.argeo.slc/pom.xml                         | 176 ++++++++++++++++++
 .../java/org/argeo/slc/ant/SlcAntConfig.java  |   4 +
 .../org/argeo/slc/ant/SlcProjectHelper.java   |  16 +-
 .../org/argeo/slc/ant/deploy/package.html     |   6 +
 .../org/argeo/slc/ant/structure/package.html  |   2 +-
 .../org/argeo/slc/core/structure/package.html |   2 +-
 .../org/argeo/slc/ant/taskdefs.properties     |   0
 .../slc/core/test/tree/htmlreport/index.html  |   0
 .../slc/core/test/tree/htmlreport/style.css   |   0
 .../structure/SimpleSElement.hbm.xml          |   0
 .../structure/tree/TreeSPath.hbm.xml          |   0
 .../structure/tree/TreeSRegistry.hbm.xml      |   0
 .../slc/hibernate/test/NumericTRId.hbm.xml    |   0
 .../hibernate/test/SimpleResultPart.hbm.xml   |   0
 .../slc/hibernate/test/TestResultId.hbm.xml   |   0
 .../hibernate/test/tree/PartSubList.hbm.xml   |   0
 .../test/tree/TreeTestResult.hbm.xml          |   0
 org.argeo.slc/src/site/apt/index.apt          |   1 +
 .../argeo/slc/example/junit/TestAntBuild.java |  15 +-
 .../test/{java => resources}/log4j.properties |   4 +-
 .../slc/hibernate/applicationContext.xml      |   0
 .../src/test/slc/conf/log4j.properties        |   2 +-
 25 files changed, 228 insertions(+), 33 deletions(-)
 create mode 100644 org.argeo.slc/pom.xml
 create mode 100644 org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/package.html
 rename org.argeo.slc/src/main/{java => resources}/org/argeo/slc/ant/taskdefs.properties (100%)
 rename org.argeo.slc/src/main/{java => resources}/org/argeo/slc/core/test/tree/htmlreport/index.html (100%)
 rename org.argeo.slc/src/main/{java => resources}/org/argeo/slc/core/test/tree/htmlreport/style.css (100%)
 rename org.argeo.slc/src/main/{java => resources}/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml (100%)
 rename org.argeo.slc/src/main/{java => resources}/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml (100%)
 rename org.argeo.slc/src/main/{java => resources}/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml (100%)
 rename org.argeo.slc/src/main/{java => resources}/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml (100%)
 rename org.argeo.slc/src/main/{java => resources}/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml (100%)
 rename org.argeo.slc/src/main/{java => resources}/org/argeo/slc/hibernate/test/TestResultId.hbm.xml (100%)
 rename org.argeo.slc/src/main/{java => resources}/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml (100%)
 rename org.argeo.slc/src/main/{java => resources}/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml (100%)
 create mode 100644 org.argeo.slc/src/site/apt/index.apt
 rename org.argeo.slc/src/test/{java => resources}/log4j.properties (88%)
 rename org.argeo.slc/src/test/{java => resources}/org/argeo/slc/hibernate/applicationContext.xml (100%)

diff --git a/org.argeo.slc/.classpath b/org.argeo.slc/.classpath
index 46fd2f448..d439082a1 100644
--- a/org.argeo.slc/.classpath
+++ b/org.argeo.slc/.classpath
@@ -1,27 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="lib" path="lib/ant.jar" sourcepath="lib-src/ant-1.7.0-src.zip"/>
-	<classpathentry kind="lib" path="lib/ant-launcher.jar" sourcepath="lib-src/ant-1.7.0-src.zip"/>
-	<classpathentry kind="lib" path="lib/spring-2.0.6.jar" sourcepath="lib-src/spring-2.0.6-src.zip"/>
-	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
-	<classpathentry kind="lib" path="lib/antlr-2.7.6.jar"/>
-	<classpathentry kind="lib" path="lib/asm.jar"/>
-	<classpathentry kind="lib" path="lib/asm-attrs.jar"/>
-	<classpathentry kind="lib" path="lib/cglib-2.1.3.jar"/>
-	<classpathentry kind="lib" path="lib/commons-collections-2.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-dbcp.jar"/>
-	<classpathentry kind="lib" path="lib/commons-lang.jar"/>
-	<classpathentry kind="lib" path="lib/commons-pool.jar"/>
-	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="lib/hibernate3.jar"/>
-	<classpathentry kind="lib" path="lib/hsqldb.jar"/>
-	<classpathentry kind="lib" path="lib/jta.jar"/>
-	<classpathentry kind="lib" path="lib/dbunit-2.2.jar" sourcepath="lib-src/dbunit-2.2-sources.jar"/>
-	<classpathentry kind="lib" path="lib/junit-3.8.2.jar" sourcepath="lib-src/junit-3.8.2-sources.jar"/>
-	<classpathentry kind="lib" path="lib/commons-io-1.3.2.jar" sourcepath="lib-src/commons-io-1.3.2-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.argeo.slc/.project b/org.argeo.slc/.project
index 7bcd1f9f3..810d37929 100644
--- a/org.argeo.slc/.project
+++ b/org.argeo.slc/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -13,5 +18,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.argeo.slc/.settings/org.eclipse.jdt.core.prefs b/org.argeo.slc/.settings/org.eclipse.jdt.core.prefs
index 3a43ca756..1485b0214 100644
--- a/org.argeo.slc/.settings/org.eclipse.jdt.core.prefs
+++ b/org.argeo.slc/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sun Nov 18 09:33:59 CET 2007
+#Sat Dec 01 11:46:50 CET 2007
 eclipse.preferences.version=1
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
new file mode 100644
index 000000000..847d2a6fe
--- /dev/null
+++ b/org.argeo.slc/pom.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.argeo.slc</groupId>
+	<artifactId>argeo-slc-core</artifactId>
+	<name>Argeo SLC</name>
+	<version>0.5.1-SNAPSHOT</version>
+	<description>SLC Core</description>
+	<scm>
+		<connection>
+			scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc
+		</connection>
+		<developerConnection>
+			scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc
+		</developerConnection>
+		<url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc</url>
+	</scm>
+	<issueManagement>
+		<system>Bugzilla</system>
+		<url>https://www.argeo.org/bugzilla/</url>
+	</issueManagement>
+	<licenses>
+		<license>
+			<name>Apache 2</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+			<comments>A business-friendly OSS license</comments>
+		</license>
+	</licenses>
+	<organization>
+		<name>Argeo</name>
+		<url>http://www.argeo.org</url>
+	</organization>
+	<developers>
+		<developer>
+			<id>mbaudier</id>
+			<name>Mathieu Baudier</name>
+			<email>mbaudier@argeo.org</email>
+			<organization>Argeo</organization>
+			<roles>
+				<role>architect</role>
+				<role>developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+	</developers>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+				<executions>
+					<execution>
+						<id>surefire-it</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<skip>false</skip>
+							<systemProperties>
+								<property>
+									<name>it.slc.base</name>
+									<value>
+										${basedir}/src/test/slc
+									</value>
+								</property>
+							</systemProperties>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-changelog-plugin</artifactId>
+			</plugin>
+			<!-- 
+				<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				</plugin>
+			-->
+		</plugins>
+	</reporting>
+	<dependencies>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.14</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate</artifactId>
+			<version>3.2.5.ga</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring</artifactId>
+			<version>2.0.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant</artifactId>
+			<version>1.7.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.dbunit</groupId>
+			<artifactId>dbunit</artifactId>
+			<version>2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.2</version>
+		</dependency>
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>1.8.0.9</version>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>javax.transaction</groupId>
+				<artifactId>jta</artifactId>
+				<version>1.0.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.dbunit</groupId>
+				<artifactId>dbunit</artifactId>
+				<version>2.2</version>
+				<exclusions>
+					<exclusion>
+						<groupId>junit-addons</groupId>
+						<artifactId>junit-addons</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>poi</groupId>
+						<artifactId>poi</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+</project>
\ No newline at end of file
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
index 6085c6635..e55a39c65 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
@@ -156,6 +156,7 @@ public class SlcAntConfig {
 		Properties all = prepareAllProperties(slcRootFile);
 		for (Object o : all.keySet()) {
 			String key = o.toString();
+			//System.out.println(key+"="+all.getProperty(key));
 			if (project.getUserProperty(key) == null) {// not already set
 				project.setUserProperty(key, all.getProperty(key));
 			}
@@ -179,6 +180,9 @@ public class SlcAntConfig {
 			Properties all = new Properties();
 			all.putAll(System.getProperties());
 			all.put(ROOT_FILE_PROPERTY, slcRootFile.getCanonicalPath());
+			// Remove basedir property in order to avoid conflict with Maven
+			if (all.containsKey("basedir"))
+				all.remove("basedir");
 
 			Properties rootProps = loadFile(slcRootFile.getCanonicalPath());
 
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
index 9a13834dc..0b2698d26 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
@@ -17,6 +17,7 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.helper.ProjectHelperImpl;
 
+import org.argeo.slc.core.UnsupportedException;
 import org.argeo.slc.core.structure.DefaultSRegistry;
 import org.argeo.slc.core.structure.SimpleSElement;
 import org.argeo.slc.core.structure.StructureRegistry;
@@ -43,10 +44,17 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 
 	@Override
 	public void parse(Project project, Object source) throws BuildException {
+		if (!(source instanceof File)) {
+			throw new UnsupportedException("Ant file", source);
+		}
+		File sourceFile = (File)source;
 
 		// initialize config
 		SlcAntConfig slcAntConfig = new SlcAntConfig();
 
+		System.out.println("Base dir prop2: " + project.getProperty("basedir"));
+		// In order to avoid base dire override when running in Maven
+		project.setProperty("basedir", sourceFile.getParentFile().getAbsolutePath());
 		if (!slcAntConfig.initProject(project)) {
 			// not SLC compatible, do normal Ant
 			super.parse(project, source);
@@ -58,17 +66,24 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 			log = LogFactory.getLog(SlcProjectHelper.class);
 		}
 		log.debug("SLC properties are set, starting initialization..");
+		log.debug("Base dir1: " + project.getBaseDir().getAbsoluteFile());
+		log.debug("Base dir prop1: " + project.getProperty("basedir"));
 
 		// init Spring application context
 		initSpringContext(project);
+		log.debug("Base dir2: " + project.getBaseDir().getAbsoluteFile());
 
 		// init structure registry
 		DefaultSRegistry registry = new DefaultSRegistry();
 		project.addReference(REF_STRUCTURE_REGISTRY, registry);
 
+		log.debug("Base dir prop2: " + project.getProperty("basedir"));
+		// in order to prevent pb w/ basedir setting:
+		source = ((File) source).getAbsoluteFile();
 		// call the underlying implementation to do the actual work
 		super.parse(project, source);
 
+		log.debug("Base dir3: " + project.getBaseDir().getAbsoluteFile());
 		// create structure root
 		registerProjectAndParents(project, slcAntConfig);
 
@@ -85,7 +100,6 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 				.getUserProperty(SlcAntConfig.ROOT_DIR_PROPERTY))
 				.getAbsoluteFile();
 		File baseDir = project.getBaseDir().getAbsoluteFile();
-
 		List<File> dirs = new Vector<File>();
 		File currentDir = baseDir;
 		do {
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/package.html b/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/package.html
new file mode 100644
index 000000000..76582d159
--- /dev/null
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/package.html
@@ -0,0 +1,6 @@
+<html>
+<head></head>
+<body>
+Integration of SLC Deploy in Ant.
+</body>
+</html>
\ No newline at end of file
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/structure/package.html b/org.argeo.slc/src/main/java/org/argeo/slc/ant/structure/package.html
index 4210b9bff..99e45d335 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/structure/package.html
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/structure/package.html
@@ -1,6 +1,6 @@
 <html>
 <head></head>
 <body>
-Integration of SLC structure in Ant.
+Integration of SLC Structure in Ant.
 </body>
 </html>
\ No newline at end of file
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/package.html b/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/package.html
index 11138fda6..d9bab8a55 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/package.html
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/package.html
@@ -1,6 +1,6 @@
 <html>
 <head></head>
 <body>
-SLC structure framework allowing to uniquely reference actions.
+SLC Structure framework allowing to uniquely reference actions.
 </body>
 </html>
\ No newline at end of file
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/taskdefs.properties b/org.argeo.slc/src/main/resources/org/argeo/slc/ant/taskdefs.properties
similarity index 100%
rename from org.argeo.slc/src/main/java/org/argeo/slc/ant/taskdefs.properties
rename to org.argeo.slc/src/main/resources/org/argeo/slc/ant/taskdefs.properties
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/index.html b/org.argeo.slc/src/main/resources/org/argeo/slc/core/test/tree/htmlreport/index.html
similarity index 100%
rename from org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/index.html
rename to org.argeo.slc/src/main/resources/org/argeo/slc/core/test/tree/htmlreport/index.html
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/style.css b/org.argeo.slc/src/main/resources/org/argeo/slc/core/test/tree/htmlreport/style.css
similarity index 100%
rename from org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/htmlreport/style.css
rename to org.argeo.slc/src/main/resources/org/argeo/slc/core/test/tree/htmlreport/style.css
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
similarity index 100%
rename from org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
rename to org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml
similarity index 100%
rename from org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml
rename to org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml
similarity index 100%
rename from org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml
rename to org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml
similarity index 100%
rename from org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml
rename to org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
similarity index 100%
rename from org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
rename to org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/TestResultId.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/TestResultId.hbm.xml
similarity index 100%
rename from org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/TestResultId.hbm.xml
rename to org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/TestResultId.hbm.xml
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
similarity index 100%
rename from org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
rename to org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml b/org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
similarity index 100%
rename from org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
rename to org.argeo.slc/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
diff --git a/org.argeo.slc/src/site/apt/index.apt b/org.argeo.slc/src/site/apt/index.apt
new file mode 100644
index 000000000..f414460db
--- /dev/null
+++ b/org.argeo.slc/src/site/apt/index.apt
@@ -0,0 +1 @@
+Argeo SLC Site
\ No newline at end of file
diff --git a/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java b/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java
index 8fa1219e8..0d56f7f2f 100644
--- a/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java
+++ b/org.argeo.slc/src/test/java/org/argeo/slc/example/junit/TestAntBuild.java
@@ -4,6 +4,8 @@ import java.io.File;
 
 import org.springframework.context.ApplicationContext;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.tools.ant.Project;
 
 import junit.framework.TestCase;
@@ -20,16 +22,20 @@ import org.argeo.slc.dao.test.TestResultDao;
 
 /** High level tests for SLC Ant. */
 public class TestAntBuild extends TestCase {
+	private static Log log = LogFactory.getLog(TestAntBuild.class);
+
 	/** Tests an end-to-end Ant run. */
 	public void testAllRunSimple() {
-		File[] reportFiles = new File("src/test/slc/work/results/report/")
-				.listFiles();
+		String slcBase = System.getProperty("it.slc.base");
+		File slcBaseDir = new File(slcBase).getAbsoluteFile();
+		log.info("SLC base: " + slcBaseDir);
+
+		String reportDirPath = slcBaseDir.getPath() + "/work/results/report/";
+		File[] reportFiles = new File(reportDirPath).listFiles();
 		for (File file : reportFiles) {
 			file.delete();
 		}
 
-		File slcBaseDir = new File("./src/test/slc").getAbsoluteFile();
-
 		File antFile = new File(slcBaseDir.getPath()
 				+ "/root/Category1/SubCategory2/build.xml");
 		Project p = AntRegistryUtil.runAll(antFile);
@@ -71,7 +77,6 @@ public class TestAntBuild extends TestCase {
 				TestStatus.FAILED,
 				"Compare eu-reform-expected.txt with eu-reform-reached.txt");
 
-		String reportDirPath = "src/test/slc/work/results/report/";
 		assertTrue(new File(reportDirPath + "index.html").exists());
 		assertTrue(new File(reportDirPath + "slc-resultsList.html").exists());
 		assertTrue(new File(reportDirPath + "slc-result-1.html").exists());
diff --git a/org.argeo.slc/src/test/java/log4j.properties b/org.argeo.slc/src/test/resources/log4j.properties
similarity index 88%
rename from org.argeo.slc/src/test/java/log4j.properties
rename to org.argeo.slc/src/test/resources/log4j.properties
index 551c14c6f..6d9a400d7 100644
--- a/org.argeo.slc/src/test/java/log4j.properties
+++ b/org.argeo.slc/src/test/resources/log4j.properties
@@ -3,7 +3,7 @@ log4j.rootLogger=INFO, console
 
 ## Levels
 # Slc
-log4j.logger.org.argeo.slc=DEBUG
+log4j.logger.org.argeo.slc=TRACE
 # Spring
 log4j.logger.org.springframework=INFO
 # Hibernate
@@ -19,5 +19,5 @@ 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
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %F%L%n
 
diff --git a/org.argeo.slc/src/test/java/org/argeo/slc/hibernate/applicationContext.xml b/org.argeo.slc/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml
similarity index 100%
rename from org.argeo.slc/src/test/java/org/argeo/slc/hibernate/applicationContext.xml
rename to org.argeo.slc/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml
diff --git a/org.argeo.slc/src/test/slc/conf/log4j.properties b/org.argeo.slc/src/test/slc/conf/log4j.properties
index 551c14c6f..63db0476d 100644
--- a/org.argeo.slc/src/test/slc/conf/log4j.properties
+++ b/org.argeo.slc/src/test/slc/conf/log4j.properties
@@ -19,5 +19,5 @@ 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
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %F:%L%n
 
-- 
2.39.2