From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 31 May 2008 17:41:39 +0000 (+0000)
Subject: Create separate Hibernate project
X-Git-Tag: argeo-slc-2.1.7~2878
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=5978e7e4f44af177846149d60cf5ff6e2d7462bf;p=gpl%2Fargeo-slc.git

Create separate Hibernate project

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

diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index 6eecd543c..54184e74d 100644
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -61,31 +61,15 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>spring-ws-core</artifactId>
@@ -138,10 +122,6 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>xalan</groupId>
 			<artifactId>xalan</artifactId>
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java
deleted file mode 100644
index 9518d93fc..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.argeo.slc.hibernate.process;
-
-import java.util.List;
-
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-
-import org.argeo.slc.core.process.SlcExecution;
-import org.argeo.slc.dao.process.SlcExecutionDao;
-
-public class SlcExecutionDaoHibernate extends HibernateDaoSupport implements
-		SlcExecutionDao {
-
-	public void create(SlcExecution slcExecution) {
-		getHibernateTemplate().save(slcExecution);
-	}
-
-	public void update(SlcExecution slcExecution) {
-		getHibernateTemplate().update(slcExecution);
-	}
-
-	public SlcExecution getSlcExecution(String uuid) {
-		return (SlcExecution) getHibernateTemplate().get(SlcExecution.class,
-				uuid);
-	}
-
-	public List<SlcExecution> listSlcExecutions() {
-		return (List<SlcExecution>) getHibernateTemplate().loadAll(
-				SlcExecution.class);
-	}
-
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernate.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernate.java
deleted file mode 100644
index 1e120632c..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernate.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.argeo.slc.hibernate.structure.tree;
-
-import java.util.List;
-
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.dao.structure.tree.TreeSPathDao;
-
-/**
- * The Hibernate implementation for tree-based result of the test result dao.
- * 
- * @see TreeTestResult
- */
-public class TreeSPathDaoHibernate extends HibernateDaoSupport implements
-		TreeSPathDao {
-
-	private static Log log = LogFactory.getLog(TreeSPathDaoHibernate.class);
-
-	public void create(TreeSPath path) {
-		createImpl(path);
-	}
-
-	private void createImpl(TreeSPath path) {
-		if (path.getParent() != null) {
-			TreeSPath parent = getTreeSPath(path.getParent()
-					.getAsUniqueString());
-			if (parent == null) {
-				createImpl(path.getParent());
-			}
-		}
-		getHibernateTemplate().save(path);
-		if (log.isTraceEnabled())
-			log.trace("Saved TreeSPath " + path.getAsUniqueString());
-	}
-
-	public TreeSPath getTreeSPath(String pathString) {
-		List<?> list = getHibernateTemplate().find(
-				"from TreeSPath where asUniqueString=?", pathString);
-		if (list.size() == 0) {
-			return null;
-		} else {
-			return (TreeSPath) list.get(0);
-		}
-	}
-
-	public TreeSPath getOrCreate(TreeSPath pathTransient) {
-		TreeSPath path = getTreeSPath(pathTransient.getAsUniqueString());
-		if (path != null) {
-			return path;
-		} else {
-			create(pathTransient);
-			// TODO: optimize
-			return getTreeSPath(pathTransient.getAsUniqueString());
-		}
-
-	}
-
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernate.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernate.java
deleted file mode 100644
index fab18a19d..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernate.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.argeo.slc.hibernate.structure.tree;
-
-import java.util.List;
-
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.argeo.slc.core.structure.SimpleSElement;
-import org.argeo.slc.core.structure.StructureElement;
-import org.argeo.slc.core.structure.StructureRegistry;
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.structure.tree.TreeSRegistry;
-import org.argeo.slc.dao.structure.tree.TreeSPathDao;
-import org.argeo.slc.dao.structure.tree.TreeSRegistryDao;
-import org.hibernate.Session;
-
-/**
- * The Hibernate implementation for tree-based structure registry.
- * 
- * @see TreeSRegistry
- */
-public class TreeSRegistryDaoHibernate extends HibernateDaoSupport implements
-		TreeSRegistryDao {
-
-	private TreeSPathDao treeSPathDao;
-
-	private static Log log = LogFactory.getLog(TreeSRegistryDaoHibernate.class);
-
-	public void create(TreeSRegistry registry) {
-		getHibernateTemplate().save(registry);
-	}
-
-	public void update(TreeSRegistry registryArg) {
-		Session session = getSession();
-		session.beginTransaction();
-		TreeSRegistry registry = (TreeSRegistry)session.merge(registryArg);
-		session.update(registry);
-		session.getTransaction().commit();
-	}
-
-	public TreeSRegistry getActiveTreeSRegistry() {
-		List<?> list = getHibernateTemplate().find(
-				"from TreeSRegistry where status=?",
-				TreeSRegistry.STATUS_ACTIVE);
-		if (list.size() == 0) {
-			return null;
-		} else {
-			return (TreeSRegistry) list.get(0);
-		}
-	}
-
-	public void syncPath(TreeSRegistry registryArg,
-			StructureRegistry<TreeSPath> localRegistry, TreeSPath pathArg) {
-		Session session = getSession();
-		session.beginTransaction();
-		TreeSRegistry registry = (TreeSRegistry)session.merge(registryArg);
-		TreeSPath path = (TreeSPath)session.merge(pathArg);
-		if (log.isTraceEnabled())
-			log.trace("Session#" + session.hashCode() + " " + session);
-		syncPathImpl(registry, localRegistry, path, session);
-		session.update(registry);
-		session.getTransaction().commit();
-	}
-
-	private void syncPathImpl(TreeSRegistry registry,
-			StructureRegistry<TreeSPath> localRegistry, TreeSPath path,
-			Session session) {
-		if (path.getParent() != null) {
-			TreeSPath parent = treeSPathDao.getOrCreate(path.getParent());
-			syncPathImpl(registry, localRegistry, parent, session);
-		}
-
-		if (log.isTraceEnabled())
-			log.trace("Synchronize path " + path);
-
-		if (registry.getElement(path) == null) {
-			final StructureElement element = getElement(registry,
-					localRegistry, path, session);
-			StructureElement elementPersisted = (StructureElement) session
-					.merge(element);
-			registry.register(path, elementPersisted);
-			// update(registry);
-
-			if (log.isTraceEnabled())
-				log.trace("No element in persisted structure for " + path
-						+ ", merged to " + elementPersisted);
-		} else {
-			if (localRegistry != null) {
-				StructureElement element = getElement(registry, localRegistry,
-						path, session);
-
-				if (element != null) {
-					StructureElement elementPersisted = (StructureElement) session
-							.merge(element);
-					registry.register(path, elementPersisted);
-					// update(registry);
-					if (log.isTraceEnabled())
-						log
-								.trace("Update existing element in persisted structure for "
-										+ path
-										+ ", merged to "
-										+ elementPersisted);
-				}
-			}
-		}
-
-	}
-
-	public void setTreeSPathDao(TreeSPathDao treeSPathDao) {
-		this.treeSPathDao = treeSPathDao;
-	}
-
-	protected StructureElement getElement(TreeSRegistry registry,
-			StructureRegistry<TreeSPath> localRegistry, TreeSPath path,
-			Session session) {
-		StructureElement element;
-		if (localRegistry != null) {
-			element = localRegistry.getElement(path);
-			if (session.getSessionFactory()
-					.getClassMetadata(element.getClass()) == null) {
-				if (log.isTraceEnabled())
-					log.trace("Replace non-hibernate element " + element
-							+ " by a simple element.");
-				element = new SimpleSElement(element.getLabel());
-			}
-		} else {
-			element = new SimpleSElement(path.getName());
-		}
-		return element;
-	}
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/package.html b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/package.html
deleted file mode 100644
index 9b5cfa237..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head></head>
-<body>
-Hibernate based DAO implementations for tree-based structure objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/TestRunDescriptorDaoHibernate.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/TestRunDescriptorDaoHibernate.java
deleted file mode 100644
index 49162d529..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/TestRunDescriptorDaoHibernate.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.argeo.slc.hibernate.test;
-
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-
-import org.argeo.slc.core.test.TestRunDescriptor;
-import org.argeo.slc.dao.test.TestRunDescriptorDao;
-
-public class TestRunDescriptorDaoHibernate extends HibernateDaoSupport
-		implements TestRunDescriptorDao {
-
-	public TestRunDescriptor getTestRunDescriptor(String id) {
-		return (TestRunDescriptor) getHibernateTemplate().get(
-				TestRunDescriptor.class, id);
-	}
-
-	public void saveOrUpdate(TestRunDescriptor testRunDescriptor) {
-		getHibernateTemplate().saveOrUpdate(testRunDescriptor);
-	}
-
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java
deleted file mode 100644
index 681a707f1..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.argeo.slc.hibernate.test.tree;
-
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-
-import org.argeo.slc.core.SlcException;
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.test.NumericTRId;
-import org.argeo.slc.core.test.TestResult;
-import org.argeo.slc.core.test.TestResultId;
-import org.argeo.slc.core.test.tree.TreeTestResult;
-import org.argeo.slc.dao.test.tree.TreeTestResultDao;
-
-/**
- * The Hibernate implementation for tree-based result of the test result dao.
- * 
- * @see TreeTestResult
- */
-public class TestResultDaoHibernate extends HibernateDaoSupport implements
-		TreeTestResultDao {
-
-	public void create(TestResult testResult) {
-		getHibernateTemplate().save(testResult);
-	}
-
-	public void update(TestResult testResult) {
-		getHibernateTemplate().saveOrUpdate(testResult);
-	}
-
-	public TreeTestResult getTestResult(String uuid) {
-		List<?> list = getHibernateTemplate().find(
-				"from TreeTestResult where uuid=?", uuid);
-		if (list.size() == 0) {
-			return null;
-		} else {
-			return (TreeTestResult) list.get(0);
-		}
-
-	}
-
-	public List<TreeTestResult> listTestResults() {
-		return (List<TreeTestResult>) getHibernateTemplate().find(
-				"from TreeTestResult");
-	}
-
-	public List<TreeTestResult> listResults(TreeSPath path) {
-		List<TreeTestResult> list = getHibernateTemplate().find(
-				"from TreeTestResult res where ? in indices(res.resultParts)",
-				path.getAsUniqueString());
-		return list;
-	}
-
-	public void close(String id, Date closeDate) {
-//		TreeTestResult ttr = (TreeTestResult) getHibernateTemplate().load(
-//				TreeTestResult.class, id);
-		TreeTestResult ttr = getTestResult(id);
-		if (ttr != null) {
-			ttr.setCloseDate(closeDate);
-			getHibernateTemplate().update(ttr);
-		} else {
-			throw new SlcException("Result with id " + id
-					+ " could not be closed because it was not found.");
-		}
-	}
-
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResultCollectionDaoHibernate.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResultCollectionDaoHibernate.java
deleted file mode 100644
index b08072058..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResultCollectionDaoHibernate.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.argeo.slc.hibernate.test.tree;
-
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-
-import org.argeo.slc.core.test.tree.TreeTestResultCollection;
-import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;
-
-public class TreeTestResultCollectionDaoHibernate extends HibernateDaoSupport
-		implements TreeTestResultCollectionDao {
-
-	public void create(TreeTestResultCollection ttrCollection) {
-		getHibernateTemplate().save(ttrCollection);
-	}
-
-	public TreeTestResultCollection getTestResultCollection(String id) {
-		return (TreeTestResultCollection) getHibernateTemplate().get(
-				TreeTestResultCollection.class, id);
-	}
-
-	public void update(TreeTestResultCollection ttrCollection) {
-		getHibernateTemplate().update(ttrCollection);
-	}
-
-	public SortedSet<TreeTestResultCollection> listCollections() {
-		return new TreeSet<TreeTestResultCollection>(getHibernateTemplate()
-				.find("from TreeTestResultCollection"));
-	}
-
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/package.html b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/package.html
deleted file mode 100644
index 6042b0789..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head></head>
-<body>
-Hibernate based DAO implementations for tree-based SLC Test.
-</body>
-</html>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/DbModel.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/DbModel.java
deleted file mode 100644
index 504dffedd..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/DbModel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.argeo.slc.unit;
-
-import java.sql.Connection;
-import java.util.List;
-import java.util.Properties;
-
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.tool.hbm2ddl.SchemaExport;
-
-/**
- * Creates a relational data model from Hibernate mapping files. The benefit of
- * this class is to be able to use Hibernate to have test data which are
- * independent from the type of database used.
- */
-public class DbModel {
-	private String dialect;
-	private List<String> mappings;
-
-	/** Sets the Hibernate dialect to use. */
-	public void setDialect(String dialect) {
-		this.dialect = dialect;
-	}
-
-	/** Sets the list of mappings to consider. */
-	public void setMappings(List<String> mappings) {
-		this.mappings = mappings;
-	}
-
-	/**
-	 * Creates an Hibernate schema export tool, in order to create the
-	 * underlying datamodel.
-	 */
-	public SchemaExport createSchemaExport(Connection connection) {
-		Configuration configuration = new Configuration();
-		Properties properties = new Properties();
-		properties.setProperty(Environment.DIALECT, dialect);
-		properties.setProperty(Environment.HBM2DDL_AUTO, "create");
-		configuration.setProperties(properties);
-
-		for (String mapping : mappings) {
-			configuration.addResource(mapping.trim());
-		}
-
-		return new SchemaExport(configuration, connection);
-	}
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/IndependentDbTestCase.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/IndependentDbTestCase.java
deleted file mode 100644
index bd6b2f993..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/IndependentDbTestCase.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.argeo.slc.unit;
-
-import java.io.InputStream;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import org.dbunit.DataSourceDatabaseTester;
-import org.dbunit.DatabaseUnitException;
-import org.dbunit.IDatabaseTester;
-import org.dbunit.database.IDatabaseConnection;
-import org.dbunit.dataset.IDataSet;
-import org.dbunit.dataset.ReplacementDataSet;
-import org.dbunit.dataset.xml.FlatXmlDataSet;
-import org.dbunit.operation.DatabaseOperation;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-
-import org.apache.commons.io.IOUtils;
-
-import org.hibernate.tool.hbm2ddl.SchemaExport;
-
-import org.argeo.slc.core.SlcException;
-
-/**
- * Helper to make db vendor independent tests using DbUnit data sets. Based on
- * {@link DbModel}.
- */
-public abstract class IndependentDbTestCase extends AbstractSpringTestCase {
-	private IDatabaseTester databaseTester;
-
-	/** Creates the DDL of the data model and loads the data. */
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		databaseTester = new DataSourceDatabaseTester(getDataSource());
-		databaseTester.setSetUpOperation(new DatabaseOperation() {
-
-			@Override
-			public void execute(IDatabaseConnection connection, IDataSet dataSet)
-					throws DatabaseUnitException, SQLException {
-				DbModel dbModel = getDbModel();
-				SchemaExport schemaExport = dbModel
-						.createSchemaExport(connection.getConnection());
-				schemaExport.create(true, true);
-
-				DatabaseOperation.INSERT.execute(connection, dataSet);
-			}
-
-		});
-		databaseTester.setDataSet(createDataSet());
-		databaseTester.onSetup();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		if (databaseTester != null) {
-			databaseTester.onTearDown();
-		}
-		super.tearDown();
-	}
-
-	/**
-	 * The data source to use. The default implementation returns a bean named
-	 * {@link #getDataSourceBeanName}
-	 */
-	protected DataSource getDataSource() {
-		return (DataSource) getContext().getBean(getDataSourceBeanName());
-	}
-
-	/**
-	 * The name of the data source bean to use. The default implementation
-	 * returns <i>dataSource</i>.
-	 */
-	protected String getDataSourceBeanName() {
-		return "slcDefault.dataSource.inMemoryTestHSQL";
-	}
-
-	/**
-	 * Creates the data set to use. The default implementation creates a
-	 * <code>FlatXmlDataSet</code> load from the resource defined in
-	 * {@link #getDataSetResource()}
-	 */
-	protected IDataSet createDataSet() {
-		InputStream in = null;
-		try {
-			in = getDataSetResource().getInputStream();
-			String[] replaceStrings = getReplacementStrings();
-			IDataSet dataSet;
-			if (replaceStrings.length == 0) {
-				dataSet = new FlatXmlDataSet(in);
-			} else {
-				dataSet = new ReplacementDataSet(new FlatXmlDataSet(in));
-				for (String str : replaceStrings) {
-					replace((ReplacementDataSet) dataSet, str);
-				}
-			}
-			return dataSet;
-		} catch (Exception e) {
-			throw new SlcException("Cannot create data set", e);
-		} finally {
-			IOUtils.closeQuietly(in);
-		}
-	}
-
-	/**
-	 * To be overridden. Return an empty array by default.
-	 * 
-	 * @return the array of strings to replace in the dataset
-	 */
-	protected String[] getReplacementStrings() {
-		return new String[0];
-	}
-
-	/**
-	 * Set the object replacing the given string. To be overridden. Does nothing
-	 * by default.
-	 */
-	protected void replace(ReplacementDataSet dataSet, String str)
-			throws Exception {
-
-	}
-
-	/**
-	 * Replace the given string by the content of the resource with the same
-	 * name in the same package, as a byte array.
-	 */
-	protected void replaceByRessource(ReplacementDataSet dataSet, String str)
-			throws Exception {
-		Resource zipResource = new ClassPathResource(inPackage(str));
-
-		dataSet.addReplacementObject(str, IOUtils.toByteArray(zipResource
-				.getInputStream()));
-	}
-
-	/**
-	 * The resource of the data set to load. The default implementation loads a
-	 * <code>ClassPathResource</code> located at
-	 * {@link #getDataSetResourceLocation()}.
-	 */
-	protected Resource getDataSetResource() {
-		return new ClassPathResource(getDataSetResourceLocation());
-	}
-
-	/**
-	 * The location of the data set to load. The default implementation loads
-	 * <i>dataSet.xml</i> found in the same package as the test.
-	 */
-	protected String getDataSetResourceLocation() {
-		return inPackage("dataSet.xml");
-	}
-
-	/**
-	 * The DB model to us to create the DDL of the testes database. The default
-	 * implementation loads a bean named after {@link #getDbModelBeanName()}.
-	 */
-	protected DbModel getDbModel() {
-		return (DbModel) getContext().getBean(getDbModelBeanName());
-	}
-
-	/**
-	 * The name of the bean to load. The default implementation returns
-	 * <i>dbModel</i>.
-	 */
-	protected String getDbModelBeanName() {
-		return "dbModel";
-	}
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java
new file mode 100644
index 000000000..70400da54
--- /dev/null
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java
@@ -0,0 +1,54 @@
+package org.argeo.slc.unit.process;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static org.argeo.slc.unit.UnitUtils.assertDateSec;
+
+import java.util.UUID;
+
+import org.argeo.slc.core.process.SlcExecution;
+import org.argeo.slc.core.process.SlcExecutionStep;
+
+public abstract class SlcExecutionTestUtils {
+
+	public static SlcExecution createSimpleSlcExecution() {
+		SlcExecution slcExec = new SlcExecution();
+		slcExec.setUuid(UUID.randomUUID().toString());
+		slcExec.setHost("localhost");
+		slcExec.setUser("user");
+		slcExec.setType("slcAnt");
+		slcExec.setStatus("STARTED");
+		slcExec.getAttributes().put("ant.file", "/test");
+		return slcExec;
+	}
+
+	public static void assertSlcExecution(SlcExecution expected,
+			SlcExecution reached) {
+		assertNotNull(reached);
+		assertEquals(expected.getHost(), reached.getHost());
+		assertEquals(expected.getUser(), reached.getUser());
+		assertEquals(expected.getType(), reached.getType());
+		assertEquals(expected.getStatus(), reached.getStatus());
+		assertEquals(expected.getAttributes().size(), reached.getAttributes()
+				.size());
+		for (String key : expected.getAttributes().keySet()) {
+			String expectedValue = expected.getAttributes().get(key);
+			String reachedValue = reached.getAttributes().get(key);
+			assertNotNull(reachedValue);
+			assertEquals(expectedValue, reachedValue);
+		}
+	}
+
+	public static void assertSlcExecutionStep(SlcExecutionStep expected,
+			SlcExecutionStep reached) {
+		assertNotNull(reached);
+		assertEquals(expected.getUuid(), reached.getUuid());
+		assertEquals(expected.getType(), reached.getType());
+		assertEquals(expected.logAsString(), reached.logAsString());
+		assertDateSec(expected.getBegin(), reached.getBegin());
+	}
+
+	private SlcExecutionTestUtils() {
+
+	}
+}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java
new file mode 100644
index 000000000..944fe2e64
--- /dev/null
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java
@@ -0,0 +1,107 @@
+package org.argeo.slc.unit.test.tree;
+
+import java.util.UUID;
+
+import org.argeo.slc.core.build.Distribution;
+import org.argeo.slc.core.deploy.DeployedSystem;
+import org.argeo.slc.core.process.SlcExecution;
+import org.argeo.slc.core.process.SlcExecutionStep;
+import org.argeo.slc.core.structure.SimpleSElement;
+import org.argeo.slc.core.structure.tree.TreeSPath;
+import org.argeo.slc.core.structure.tree.TreeSRegistry;
+import org.argeo.slc.core.test.SimpleResultPart;
+import org.argeo.slc.core.test.SimpleTestRun;
+import org.argeo.slc.core.test.TestStatus;
+import org.argeo.slc.core.test.tree.PartSubList;
+import org.argeo.slc.core.test.tree.TreeTestResult;
+import org.argeo.slc.msg.test.tree.ResultPartRequest;
+import org.argeo.slc.unit.process.SlcExecutionTestUtils;
+
+public abstract class TreeTestResultTestUtils {
+
+	public static TreeTestResult createSimpleTreeTestResult() {
+		TreeTestResult treeTestResult = new TreeTestResult();
+		treeTestResult.setUuid(UUID.randomUUID().toString());
+		return treeTestResult;
+	}
+
+	public static TreeTestResult createCompleteTreeTestResult() {
+		SlcExecution slcExecution = SlcExecutionTestUtils
+				.createSimpleSlcExecution();
+		SlcExecutionStep step = new SlcExecutionStep("LOG", "JUnit step");
+		slcExecution.getSteps().add(step);
+
+		SimpleTestRun testRun = new SimpleTestRun();
+		testRun.setUuid(UUID.randomUUID().toString());
+
+		String pathStr = "/test";
+		TreeSPath path = new TreeSPath(pathStr);
+
+		TreeSRegistry registry = new TreeSRegistry();
+		SimpleSElement elem = new SimpleSElement("Unit Test");
+		elem.getTags().put("myTag", "myTagValue");
+		registry.register(path, elem);
+
+		TreeTestResult ttr = createSimpleTreeTestResult();
+		ttr.notifyCurrentPath(registry, path);
+		ttr.notifyTestRun(testRun);
+		testRun.setTestResult(ttr);
+		testRun.setDeployedSystem(new DeployedSystem() {
+			private String uuid = UUID.randomUUID().toString();
+
+			public String getDeployedSystemId() {
+				return uuid;
+			}
+
+			public Distribution getDistribution() {
+				return null;
+			}
+		});
+		testRun.notifySlcExecution(slcExecution);
+
+		ttr.addResultPart(createSimpleResultPartPassed());
+		ttr.addResultPart(createSimpleResultPartFailed());
+		ttr.addResultPart(createSimpleResultPartError());
+		return ttr;
+	}
+
+	public static SimpleResultPart createSimpleResultPartPassed() {
+		SimpleResultPart partPassed = new SimpleResultPart();
+		String msgPassed = "message\nnew line";
+		partPassed.setStatus(TestStatus.PASSED);
+		partPassed.setMessage(msgPassed);
+		return partPassed;
+	}
+
+	public static SimpleResultPart createSimpleResultPartFailed() {
+		SimpleResultPart partFailed = new SimpleResultPart();
+		String msgFailed = "too bad";
+		partFailed.setStatus(TestStatus.FAILED);
+		partFailed.setMessage(msgFailed);
+		return partFailed;
+	}
+
+	public static SimpleResultPart createSimpleResultPartError() {
+		SimpleResultPart partFailed = new SimpleResultPart();
+		String msgFailed = "crashed\nanother line";
+		partFailed.setStatus(TestStatus.ERROR);
+		partFailed.setMessage(msgFailed);
+		partFailed.setException(new Exception("Test Exception"));
+		return partFailed;
+	}
+
+	public static ResultPartRequest createSimpleResultPartRequest(TreeTestResult ttr) {
+		TreeSPath path = ttr.getCurrentPath();
+		PartSubList lst = ttr.getResultParts().get(path);
+		SimpleResultPart part = (SimpleResultPart) lst.getParts().get(2);
+
+		ResultPartRequest req = new ResultPartRequest(ttr, path, part);
+		req.setPath(ttr.getCurrentPath());
+
+		return req;
+	}
+
+	private TreeTestResultTestUtils() {
+
+	}
+}
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml
deleted file mode 100644
index bde8cc54d..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.process">
-	<class name="SlcExecution" table="SLC_EXECUTION">
-		<id name="uuid" column="UUID" />
-		<property name="host" column="HOST" />
-		<property name="user" column="USER" />
-		<property name="type" column="TYPE" />
-		<property name="status" column="STATUS" />
-
-		<list name="steps" cascade="all" lazy="false"
-			table="SLC_EXECUTIONS_STEPS">
-			<key column="SLC_EXECUTION_ID" />
-			<list-index column="INDX" />
-			<one-to-many
-				class="org.argeo.slc.core.process.SlcExecutionStep" />
-		</list>
-
-		<map name="attributes" table="SLC_EXEC_ATTRS_MAP" cascade="all"
-			lazy="false" sort="natural">
-			<key column="PARENT_ID" />
-			<map-key type="string" column="ATTR_NAME" />
-			<element column="NAME" type="string" />
-		</map>
-
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml
deleted file mode 100644
index ce22c71a4..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.process">
-	<class name="SlcExecutionStep" table="SLC_EXECUTION_STEP">
-		<id name="uuid" column="UUID" />
-		<property name="type" column="TYPE" />
-		<property name="begin" column="BEGIN" />
-
-		<list name="logLines" cascade="all" lazy="false"
-			table="SLC_EXECUTION_STEP_LOG_LINE">
-			<key column="SLC_EXECUTION_STEP_ID" />
-			<list-index column="INDX" />
-			<element column="LOG_LINE" type="string" />
-		</list>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml
deleted file mode 100644
index 19f1d73c8..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
-	default-lazy-init="true">
-
-	<bean id="slcDefault.dataSource.inMemoryTestHSQL"
-		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
-		destroy-method="destroy">
-		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
-		<property name="url" value="jdbc:hsqldb:mem:test" />
-		<property name="username" value="sa" />
-		<property name="password" value="" />
-		<property name="suppressClose" value="true" />
-	</bean>
-
-	<bean id="slcTemplates.sessionFactory.hibernateBasic"
-		abstract="true"
-		class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="mappingResources">
-			<list>
-				<value>
-					org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/NumericTRId.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/process/SlcExecution.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml
-				</value>
-			</list>
-		</property>
-	</bean>
-
-	<bean id="slcDefault.sessionFactory.hibernateTestHSQL"
-		parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource"
-			ref="slcDefault.dataSource.inMemoryTestHSQL" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.HSQLDialect
-				hibernate.hbm2ddl.auto=create
-				hibernate.current_session_context_class=thread
-			]]></value>
-		</property>
-	</bean>
-
-	<bean id="slcTemplates.dao.treeSPathDao"
-		class="org.argeo.slc.hibernate.structure.tree.TreeSPathDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.treeSRegistryDao"
-		class="org.argeo.slc.hibernate.structure.tree.TreeSRegistryDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.testResultDao"
-		class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.testResultCollectionDao"
-		class="org.argeo.slc.hibernate.test.tree.TreeTestResultCollectionDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.testRunDescriptorDao"
-		class="org.argeo.slc.hibernate.test.TestRunDescriptorDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.slcExecutionDao"
-		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate"
-		abstract="true">
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
deleted file mode 100644
index 0bc9e6aea..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.structure">
-	<class name="SimpleSElement" table="SIMPLE_SELEMENT">
-		<id name="tid" column="T_ID">
-			<generator class="native" />
-		</id>
-		<property name="label" column="LABEL" not-null="true" />
-		<map name="tags" table="SIMPLE_SELEMENT_TAGS" cascade="all"
-			lazy="false" sort="natural">
-			<key column="PARENT_ID" />
-			<map-key type="string" column="NAME" />
-			<element type="string" column="VALUE" />
-		</map>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml
deleted file mode 100644
index 0e282505f..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.structure.tree">
-	<class name="TreeSPath" table="TREE_SPATH">
-		<id name="tid" column="T_ID">
-			<generator class="native" />
-		</id>
-		<property name="asUniqueString" column="PATH" not-null="true"
-			unique="true" />
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml
deleted file mode 100644
index 2182a2304..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.structure.tree">
-	<class name="TreeSRegistry" table="TREE_SREGISTRY">
-		<id name="tid" column="T_ID">
-			<generator class="native" />
-		</id>
-
-		<property name="status" column="STATUS" not-null="true"
-			unique="true" />
-
-		<map name="elements" table="REGISTRY_ELEMENTS" cascade="all"
-			lazy="false" sort="natural">
-			<key column="PARENT_ID" />
-			<map-key-many-to-many class="TreeSPath" column="PATH" />
-
-			<many-to-many
-				class="org.argeo.slc.core.structure.SimpleSElement"
-				column="ELEMENT_ID" unique="true" lazy="false" />
-		</map>
-
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml
deleted file mode 100644
index ca9c5d972..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.test">
-	<class name="NumericTRId" table="NUMERIC_TR_ID">
-
-		<id name="tid" column="T_ID">
-			<generator class="native" />
-		</id>
-		<property name="value" column="VALUE" not-null="true"
-			unique="true" />
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
deleted file mode 100644
index 42f32dfb8..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.test">
-	<class name="SimpleResultPart" table="SIMPLE_RESULT_PART">
-		<id name="tid" column="T_ID">
-			<generator class="native" />
-		</id>
-		<property name="status" column="STATUS" not-null="true" />
-		<property name="message" column="MESSAGE" not-null="true" />
-		<property name="exceptionMessage" column="EXCEPTION_MESSAGE"
-			not-null="false" />
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/TestResultId.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/TestResultId.hbm.xml
deleted file mode 100644
index dee13a618..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/TestResultId.hbm.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.test">
-	<class name="TestResultId" table="TEST_RESULT_ID">
-		<id name="tid" column="T_ID">
-			<generator class="native" />
-		</id>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml
deleted file mode 100644
index a00332cc2..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.test">
-	<class name="TestRunDescriptor" table="TEST_RUN_DESCRIPTOR">
-		<id name="testRunUuid" column="TEST_RUN_UUID" />
-		<property name="slcExecutionUuid" column="SLC_EXEC_UUID"
-			not-null="false" />
-		<property name="slcExecutionStepUuid"
-			column="SLC_EXEC_STEP_UUID" not-null="false" />
-		<property name="testResultUuid" column="TEST_RESULT_UUID"
-			not-null="false" />
-		<property name="deployedSytemId" column="DEPLOYED_SYSTEM_ID"
-			not-null="false" />
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
deleted file mode 100644
index f86de7312..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.test.tree">
-	<class name="PartSubList" table="PART_SUB_LIST">
-		<id name="tid" column="T_ID">
-			<generator class="native" />
-		</id>
-		<list name="parts" cascade="all" lazy="false">
-			<key column="PART_SUBLIST_ID" />
-			<list-index column="INDX" />
-			<composite-element
-				class="org.argeo.slc.core.test.SimpleResultPart">
-				<property name="status" column="STATUS" not-null="true" />
-				<property name="message" column="MESSAGE"
-					not-null="true" />
-				<property name="exceptionMessage"
-					column="EXCEPTION_MESSAGE" not-null="false" />
-				<property name="testRunUuid" column="TEST_RUN_UUID"
-					not-null="false" />
-			</composite-element>
-		</list>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
deleted file mode 100644
index 37db79a6d..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.test.tree">
-	<class name="TreeTestResult" table="TREE_TEST_RESULT">
-		<id name="uuid" column="UUID"/>
-
-		<property name="closeDate" column="CLOSE_DATE" type="timestamp"
-			not-null="false" />
-
-		<map name="resultParts" table="RESULT_PARTS_MAP" cascade="all"
-			lazy="false" sort="natural">
-			<key column="PARENT_ID" />
-			<composite-map-key
-				class="org.argeo.slc.core.structure.tree.TreeSPath">
-				<key-property name="asUniqueString" column="PATH" />
-			</composite-map-key>
-			<many-to-many class="PartSubList" column="PART_SUB_LIST_ID"
-				unique="true" lazy="false" />
-		</map>
-
-		<map name="elements" table="RESULT_ELEMENTS_MAP"
-			cascade="all" lazy="false" sort="natural">
-			<key column="PARENT_ID" />
-			<composite-map-key
-				class="org.argeo.slc.core.structure.tree.TreeSPath">
-				<key-property name="asUniqueString" column="PATH" />
-			</composite-map-key>
-			<many-to-many class="org.argeo.slc.core.structure.SimpleSElement" column="ELEMENT_ID"
-				unique="true" lazy="false" />
-		</map>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
deleted file mode 100644
index 19fce6656..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.argeo.slc.core.test.tree">
-	<class name="TreeTestResultCollection"
-		table="TREE_TEST_RESULT_COLLECTION">
-		<id name="id" column="ID" />
-
-		<set name="results" table="TTR_COLLECTION_RESULTS"
-			sort="natural" lazy="false">
-			<key column="PARENT_ID" />
-			<many-to-many class="TreeTestResult" />
-		</set>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java
index 55fba622f..8ede3a234 100644
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java
@@ -17,6 +17,7 @@ import org.argeo.slc.msg.process.SlcExecutionRequest;
 import org.argeo.slc.msg.process.SlcExecutionStepsRequest;
 import org.argeo.slc.unit.AbstractSpringTestCase;
 import org.argeo.slc.unit.UnitXmlUtils;
+import org.argeo.slc.unit.process.SlcExecutionTestUtils;
 
 import org.springframework.oxm.Marshaller;
 import org.springframework.oxm.Unmarshaller;
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java
deleted file mode 100644
index c3c880366..000000000
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.argeo.slc.core.process;
-
-import java.util.UUID;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static org.argeo.slc.unit.UnitUtils.assertDateSec;
-
-public abstract class SlcExecutionTestUtils {
-
-	public static SlcExecution createSimpleSlcExecution() {
-		SlcExecution slcExec = new SlcExecution();
-		slcExec.setUuid(UUID.randomUUID().toString());
-		slcExec.setHost("localhost");
-		slcExec.setUser("user");
-		slcExec.setType("slcAnt");
-		slcExec.setStatus("STARTED");
-		slcExec.getAttributes().put("ant.file", "/test");
-		return slcExec;
-	}
-
-	public static void assertSlcExecution(SlcExecution expected,
-			SlcExecution reached) {
-		assertNotNull(reached);
-		assertEquals(expected.getHost(), reached.getHost());
-		assertEquals(expected.getUser(), reached.getUser());
-		assertEquals(expected.getType(), reached.getType());
-		assertEquals(expected.getStatus(), reached.getStatus());
-		assertEquals(expected.getAttributes().size(), reached.getAttributes()
-				.size());
-		for (String key : expected.getAttributes().keySet()) {
-			String expectedValue = expected.getAttributes().get(key);
-			String reachedValue = reached.getAttributes().get(key);
-			assertNotNull(reachedValue);
-			assertEquals(expectedValue, reachedValue);
-		}
-	}
-
-	public static void assertSlcExecutionStep(SlcExecutionStep expected,
-			SlcExecutionStep reached) {
-		assertNotNull(reached);
-		assertEquals(expected.getUuid(), reached.getUuid());
-		assertEquals(expected.getType(), reached.getType());
-		assertEquals(expected.logAsString(), reached.logAsString());
-		assertDateSec(expected.getBegin(), reached.getBegin());
-	}
-
-	private SlcExecutionTestUtils() {
-
-	}
-}
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java
index b35ea1774..aec7a68b4 100644
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java
@@ -9,9 +9,9 @@ import org.springframework.xml.validation.XmlValidator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
-import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createSimpleResultPartRequest;
 import static org.argeo.slc.unit.UnitUtils.assertDateSec;
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createSimpleResultPartRequest;
 
 import org.argeo.slc.core.structure.tree.TreeSPath;
 import org.argeo.slc.core.test.SimpleResultPart;
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java
deleted file mode 100644
index bc7dcbdd2..000000000
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.argeo.slc.core.test.tree;
-
-import java.util.Date;
-import java.util.UUID;
-
-import org.argeo.slc.core.build.Distribution;
-import org.argeo.slc.core.deploy.DeployedSystem;
-import org.argeo.slc.core.process.SlcExecution;
-import org.argeo.slc.core.process.SlcExecutionStep;
-import org.argeo.slc.core.process.SlcExecutionTestUtils;
-import org.argeo.slc.core.structure.SimpleSElement;
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.structure.tree.TreeSRegistry;
-import org.argeo.slc.core.test.SimpleResultPart;
-import org.argeo.slc.core.test.SimpleTestRun;
-import org.argeo.slc.core.test.TestStatus;
-import org.argeo.slc.msg.test.tree.ResultPartRequest;
-
-public abstract class TreeTestResultTestUtils {
-
-	public static TreeTestResult createSimpleTreeTestResult() {
-		TreeTestResult treeTestResult = new TreeTestResult();
-		treeTestResult.setUuid(UUID.randomUUID().toString());
-		return treeTestResult;
-	}
-
-	public static TreeTestResult createCompleteTreeTestResult() {
-		SlcExecution slcExecution = SlcExecutionTestUtils
-				.createSimpleSlcExecution();
-		SlcExecutionStep step = new SlcExecutionStep("LOG", "JUnit step");
-		slcExecution.getSteps().add(step);
-
-		SimpleTestRun testRun = new SimpleTestRun();
-		testRun.setUuid(UUID.randomUUID().toString());
-
-		String pathStr = "/test";
-		TreeSPath path = new TreeSPath(pathStr);
-
-		TreeSRegistry registry = new TreeSRegistry();
-		SimpleSElement elem = new SimpleSElement("Unit Test");
-		elem.getTags().put("myTag", "myTagValue");
-		registry.register(path, elem);
-
-		TreeTestResult ttr = createSimpleTreeTestResult();
-		ttr.notifyCurrentPath(registry, path);
-		ttr.notifyTestRun(testRun);
-		testRun.setTestResult(ttr);
-		testRun.setDeployedSystem(new DeployedSystem() {
-			private String uuid = UUID.randomUUID().toString();
-
-			public String getDeployedSystemId() {
-				return uuid;
-			}
-
-			public Distribution getDistribution() {
-				return null;
-			}
-		});
-		testRun.notifySlcExecution(slcExecution);
-
-		ttr.addResultPart(createSimpleResultPartPassed());
-		ttr.addResultPart(createSimpleResultPartFailed());
-		ttr.addResultPart(createSimpleResultPartError());
-		return ttr;
-	}
-
-	public static SimpleResultPart createSimpleResultPartPassed() {
-		SimpleResultPart partPassed = new SimpleResultPart();
-		String msgPassed = "message\nnew line";
-		partPassed.setStatus(TestStatus.PASSED);
-		partPassed.setMessage(msgPassed);
-		return partPassed;
-	}
-
-	public static SimpleResultPart createSimpleResultPartFailed() {
-		SimpleResultPart partFailed = new SimpleResultPart();
-		String msgFailed = "too bad";
-		partFailed.setStatus(TestStatus.FAILED);
-		partFailed.setMessage(msgFailed);
-		return partFailed;
-	}
-
-	public static SimpleResultPart createSimpleResultPartError() {
-		SimpleResultPart partFailed = new SimpleResultPart();
-		String msgFailed = "crashed\nanother line";
-		partFailed.setStatus(TestStatus.ERROR);
-		partFailed.setMessage(msgFailed);
-		partFailed.setException(new Exception("Test Exception"));
-		return partFailed;
-	}
-
-	public static ResultPartRequest createSimpleResultPartRequest(TreeTestResult ttr) {
-		TreeSPath path = ttr.getCurrentPath();
-		PartSubList lst = ttr.getResultParts().get(path);
-		SimpleResultPart part = (SimpleResultPart) lst.getParts().get(2);
-
-		ResultPartRequest req = new ResultPartRequest(ttr, path, part);
-		req.setPath(ttr.getCurrentPath());
-
-		return req;
-	}
-
-	private TreeTestResultTestUtils() {
-
-	}
-}
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/process/SlcExecutionHibernateTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/process/SlcExecutionHibernateTest.java
deleted file mode 100644
index f821dbd9b..000000000
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/process/SlcExecutionHibernateTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.argeo.slc.hibernate.process;
-
-import java.util.List;
-
-import org.argeo.slc.core.process.SlcExecution;
-import org.argeo.slc.core.process.SlcExecutionStep;
-import org.argeo.slc.core.process.SlcExecutionTestUtils;
-import org.argeo.slc.dao.process.SlcExecutionDao;
-import org.argeo.slc.unit.AbstractSpringTestCase;
-
-public class SlcExecutionHibernateTest extends AbstractSpringTestCase {
-
-	public void testSave() {
-		SlcExecutionDao dao = getBean(SlcExecutionDao.class);
-
-		SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution();
-		slcExec.getSteps().add(new SlcExecutionStep("LOG", "A log line"));
-		slcExec.getSteps().add(new SlcExecutionStep("LOG", "Two log\nlines"));
-
-		dao.create(slcExec);
-
-		SlcExecution slcExecPersisted = dao.getSlcExecution(slcExec.getUuid());
-		SlcExecutionTestUtils.assertSlcExecution(slcExec, slcExecPersisted);
-		assertEquals(2, slcExecPersisted.getSteps().size());
-		SlcExecutionTestUtils.assertSlcExecutionStep(slcExec.getSteps().get(0),
-				slcExecPersisted.getSteps().get(0));
-		SlcExecutionTestUtils.assertSlcExecutionStep(slcExec.getSteps().get(1),
-				slcExecPersisted.getSteps().get(1));
-	}
-
-	public void testModify() {
-		SlcExecutionDao dao = getBean(SlcExecutionDao.class);
-
-		// slcExecution Creation
-		SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution();
-		slcExec.getSteps().add(new SlcExecutionStep("LOG", "A log line"));
-		slcExec.getSteps().add(new SlcExecutionStep("LOG", "Two log\nlines"));
-
-		dao.create(slcExec);
-
-		// slcExecution retrieval and update
-		SlcExecution slcExecRetrieved = dao.getSlcExecution(slcExec.getUuid());
-
-		List<String> logLineListStep0 = slcExecRetrieved.getSteps().get(0)
-				.getLogLines();
-		for (String logLine : logLineListStep0)
-			logLine = logLine + "appended Log text";
-
-		slcExecRetrieved.getSteps().get(0).setLogLines(logLineListStep0);
-		slcExecRetrieved.getSteps().add(
-				new SlcExecutionStep("LOG", "Three \n log \n lines"));
-
-		dao.update(slcExecRetrieved);
-
-		// updated slcExecution retrieval and comparison
-		SlcExecution slcExecUpdated = dao.getSlcExecution(slcExec.getUuid());
-
-		SlcExecutionTestUtils.assertSlcExecution(slcExecRetrieved,
-				slcExecUpdated);
-		assertEquals(3, slcExecUpdated.getSteps().size());
-		SlcExecutionTestUtils.assertSlcExecutionStep(slcExecUpdated.getSteps()
-				.get(0), slcExecRetrieved.getSteps().get(0));
-		SlcExecutionTestUtils.assertSlcExecutionStep(slcExecUpdated.getSteps()
-				.get(1), slcExecRetrieved.getSteps().get(1));
-		SlcExecutionTestUtils.assertSlcExecutionStep(slcExecUpdated.getSteps()
-				.get(2), slcExecRetrieved.getSteps().get(2));
-	}
-
-	@Override
-	protected String getApplicationContextLocation() {
-		return "org/argeo/slc/hibernate/applicationContext.xml";
-	}
-
-}
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernateTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernateTest.java
deleted file mode 100644
index 3cb906b24..000000000
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernateTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.argeo.slc.hibernate.structure.tree;
-
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.dao.structure.tree.TreeSPathDao;
-import org.argeo.slc.unit.AbstractSpringTestCase;
-
-public class TreeSPathDaoHibernateTest extends AbstractSpringTestCase {
-
-	public void testCreate() {
-		TreeSPathDao treeSPathDao = getBean(TreeSPathDao.class);
-
-		String pathParentStr = "/root/testParent";
-		String pathStr = pathParentStr + "/test";
-		TreeSPath path = TreeSPath.parseToCreatePath(pathStr);
-		treeSPathDao.create(path);
-
-		TreeSPath pathChild = treeSPathDao.getTreeSPath(pathStr);
-		assertEquals(path, pathChild);
-
-		TreeSPath pathParent = treeSPathDao.getTreeSPath(pathParentStr);
-		assertEquals(path.getParent(), pathParent);
-	}
-
-	@Override
-	protected String getApplicationContextLocation() {
-		return "org/argeo/slc/hibernate/applicationContext.xml";
-	}
-
-}
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java
deleted file mode 100644
index c9d0a99cd..000000000
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.argeo.slc.hibernate.structure.tree;
-
-import org.argeo.slc.core.structure.SimpleSElement;
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.structure.tree.TreeSRegistry;
-import org.argeo.slc.dao.structure.tree.TreeSPathDao;
-import org.argeo.slc.dao.structure.tree.TreeSRegistryDao;
-import org.argeo.slc.unit.AbstractSpringTestCase;
-
-public class TreeSRegistryDaoHibernateTest extends AbstractSpringTestCase {
-
-	public void testCreate() {
-		TreeSRegistryDao treeSRegistryDao = getBean(TreeSRegistryDao.class);
-
-		TreeSPathDao treeSPathDao = (TreeSPathDao) getContext().getBean(
-				"treeSPathDao");
-
-		TreeSPath root = TreeSPath.parseToCreatePath("/root");
-		TreeSPath path = root.createChild("test");
-
-		treeSPathDao.create(root);
-		treeSPathDao.create(path);
-
-		TreeSRegistry registry = new TreeSRegistry();
-		registry.setStatus(TreeSRegistry.STATUS_ACTIVE);
-		String desc = "desc";
-		registry.register(path, new SimpleSElement(desc));
-
-		treeSRegistryDao.create(registry);
-
-		TreeSRegistry registry2 = treeSRegistryDao.getActiveTreeSRegistry();
-		SimpleSElement element = registry2.getElements().get(path);
-		assertEquals(desc, element.getLabel());
-	}
-
-	@Override
-	protected String getApplicationContextLocation() {
-		return "org/argeo/slc/hibernate/applicationContext.xml";
-	}
-
-}
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/CastorTestResultDaoHibernateTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/CastorTestResultDaoHibernateTest.java
deleted file mode 100644
index 4b5d6bd1f..000000000
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/CastorTestResultDaoHibernateTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.argeo.slc.hibernate.test.tree;
-
-import org.springframework.oxm.Marshaller;
-import org.springframework.oxm.Unmarshaller;
-import org.springframework.xml.transform.StringResult;
-import org.springframework.xml.transform.StringSource;
-
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.test.tree.TreeTestResult;
-import org.argeo.slc.core.test.tree.TreeTestResultTestUtils;
-import org.argeo.slc.dao.test.tree.TreeTestResultDao;
-import org.argeo.slc.unit.AbstractSpringTestCase;
-import org.argeo.slc.unit.test.tree.UnitTestTreeUtil;
-
-public class CastorTestResultDaoHibernateTest extends AbstractSpringTestCase {
-
-	public void testUnmarshallAndCreate() throws Exception {
-		TreeTestResult ttr = TreeTestResultTestUtils
-				.createCompleteTreeTestResult();
-
-		StringResult result = new StringResult();
-		getBean(Marshaller.class).marshal(ttr, result);
-
-		StringSource source = new StringSource(result.toString());
-		TreeTestResult ttrUnm = (TreeTestResult) getBean(Unmarshaller.class)
-				.unmarshal(source);
-
-		for (TreeSPath path : ttrUnm.getResultParts().keySet()) {
-			log.debug("Path: " + path.getClass() + ": " + path);
-		}
-
-		TreeTestResultDao ttrDao = getBean(TreeTestResultDao.class);
-		ttrDao.create(ttrUnm);
-		TreeTestResult ttrPersist = ttrDao.getTestResult(ttr.getUuid());
-
-		UnitTestTreeUtil.assertTreeTestResult(ttr, ttrPersist);
-	}
-
-	@Override
-	protected String getApplicationContextLocation() {
-		return "org/argeo/slc/hibernate/withCastor.xml";
-	}
-
-}
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultCollectionDaoHibernateTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultCollectionDaoHibernateTest.java
deleted file mode 100644
index 786ff527b..000000000
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultCollectionDaoHibernateTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.argeo.slc.hibernate.test.tree;
-
-import org.argeo.slc.core.test.tree.TreeTestResult;
-import org.argeo.slc.core.test.tree.TreeTestResultCollection;
-import org.argeo.slc.core.test.tree.TreeTestResultTestUtils;
-import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;
-import org.argeo.slc.dao.test.tree.TreeTestResultDao;
-import org.argeo.slc.unit.AbstractSpringTestCase;
-import org.argeo.slc.unit.test.tree.UnitTestTreeUtil;
-
-public class TreeTestResultCollectionDaoHibernateTest extends
-		AbstractSpringTestCase {
-
-	public void testScenario() {
-		TreeTestResultDao ttrDao = getBean(TreeTestResultDao.class);
-		TreeTestResultCollectionDao ttrcDao = getBean(TreeTestResultCollectionDao.class);
-
-		String ttrcName = "testCollection";
-
-		TreeTestResult ttr1 = TreeTestResultTestUtils
-				.createCompleteTreeTestResult();
-		ttrDao.create(ttr1);
-
-		TreeTestResultCollection ttrc = new TreeTestResultCollection(ttrcName);
-		ttrcDao.create(ttrc);
-
-		ttrc.getResults().add(ttr1);
-		ttrcDao.update(ttrc);
-
-		TreeTestResult ttr2 = TreeTestResultTestUtils
-				.createCompleteTreeTestResult();
-		ttrDao.create(ttr2);
-
-		ttrc.getResults().add(ttr2);
-		ttrcDao.update(ttrc);
-
-		ttrc.getResults().remove(ttr1);
-		ttrcDao.update(ttrc);
-
-		TreeTestResultCollection ttrcPersist = ttrcDao
-				.getTestResultCollection(ttrcName);
-		assertEquals(1, ttrcPersist.getResults().size());
-		UnitTestTreeUtil.assertTreeTestResult(ttr2, ttrcPersist.getResults()
-				.iterator().next());
-	}
-
-	@Override
-	protected String getApplicationContextLocation() {
-		return "org/argeo/slc/hibernate/applicationContext.xml";
-	}
-
-}
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java
deleted file mode 100644
index c1808da13..000000000
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.argeo.slc.hibernate.test.tree;
-
-import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
-import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createSimpleTreeTestResult;
-
-import java.util.Date;
-
-import org.argeo.slc.core.structure.SimpleSElement;
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.structure.tree.TreeSRegistry;
-import org.argeo.slc.core.test.SimpleResultPart;
-import org.argeo.slc.core.test.TestStatus;
-import org.argeo.slc.core.test.tree.TreeTestResult;
-import org.argeo.slc.core.test.tree.TreeTestResultTestUtils;
-import org.argeo.slc.dao.test.tree.TreeTestResultDao;
-import org.argeo.slc.unit.AbstractSpringTestCase;
-import org.argeo.slc.unit.test.tree.UnitTestTreeUtil;
-
-public class TreeTestResultDaoHibernateTest extends AbstractSpringTestCase {
-	private TreeTestResultDao testResultDao = null;
-
-	@Override
-	public void setUp() {
-		testResultDao = (TreeTestResultDao) getContext().getBean(
-				"testResultDao");
-	}
-
-	public void testCreate() {
-
-		TreeTestResult ttr = createCompleteTreeTestResult();
-		testResultDao.create(ttr);
-
-		TreeTestResult ttrPersisted = (TreeTestResult) testResultDao
-				.getTestResult(ttr.getUuid());
-
-		UnitTestTreeUtil.assertTreeTestResult(ttr, ttrPersisted);
-	}
-
-	public void testUpdate() {
-		TreeTestResult ttr = createCompleteTreeTestResult();
-		testResultDao.create(ttr);
-
-		TreeTestResult ttrUpdated = (TreeTestResult) testResultDao
-				.getTestResult(ttr.getUuid());
-
-		// Modifying ttrUpdated
-
-		/**
-		 * this closeDate update commented because the assertTreeTestResult will
-		 * find a unexpected discrepancy in the date.
-		 * ttrUpdated.setCloseDate(new Date());
-		 */
-
-		String pathStr = "/test";
-		TreeSPath path = TreeSPath.parseToCreatePath(pathStr);
-
-		TreeSRegistry registry = new TreeSRegistry();
-		SimpleSElement elem = new SimpleSElement("Unit Test");
-		elem.getTags().put("myTag", "myTagValue");
-		registry.register(path, elem);
-
-		ttrUpdated.notifyCurrentPath(registry, path);
-
-		ttrUpdated.addResultPart(TreeTestResultTestUtils
-				.createSimpleResultPartPassed());
-		ttrUpdated.addResultPart(TreeTestResultTestUtils
-				.createSimpleResultPartFailed());
-		ttrUpdated.addResultPart(TreeTestResultTestUtils
-				.createSimpleResultPartError());
-
-		testResultDao.update(ttrUpdated);
-
-		// comparison of ttrUpdated and ttrRetrieved
-		TreeTestResult ttrRetrieved = (TreeTestResult) testResultDao
-				.getTestResult(ttr.getUuid());
-
-		UnitTestTreeUtil.assertTreeTestResult(ttrRetrieved, ttrUpdated);
-	}
-
-	public void testMultipleUpdateScenario() throws Exception{
-		TreeSRegistry registry = new TreeSRegistry();
-
-		TreeSPath path = new TreeSPath("/root/test");
-		SimpleSElement elem = new SimpleSElement("Unit Test");
-		elem.getTags().put("myTag", "myTagValue");
-		registry.register(path, elem);
-		
-		TreeTestResult ttr = createSimpleTreeTestResult();
-		ttr.notifyCurrentPath(registry, path);
-		ttr.addResultPart(new SimpleResultPart(TestStatus.PASSED,"First test"));
-		
-		testResultDao.create(ttr);
-		
-		path = new TreeSPath("/root/test2/subtest");
-		elem = new SimpleSElement("Sub Test");
-		elem.getTags().put("myTag", "myTagValue");
-		registry.register(path, elem);
-		
-		ttr.notifyCurrentPath(registry, path);
-		ttr.addResultPart(new SimpleResultPart(TestStatus.PASSED,"Second test"));
-		
-		testResultDao.update(ttr);
-		
-		ttr.notifyCurrentPath(registry, path);
-		ttr.addResultPart(new SimpleResultPart(TestStatus.PASSED,"Third test with same path"));
-		
-		testResultDao.update(ttr);
-		
-		ttr.close();
-		
-		testResultDao.close(ttr.getUuid(), ttr.getCloseDate());
-	}
-
-	@Override
-	protected String getApplicationContextLocation() {
-		return "org/argeo/slc/hibernate/applicationContext.xml";
-	}
-
-}
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java
index 2aa29e2ab..47d584f23 100644
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java
@@ -6,9 +6,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.argeo.slc.core.process.SlcExecution;
-import org.argeo.slc.core.process.SlcExecutionTestUtils;
 import org.argeo.slc.msg.process.SlcExecutionRequest;
 import org.argeo.slc.unit.AbstractSpringTestCase;
+import org.argeo.slc.unit.process.SlcExecutionTestUtils;
 
 public class SlcExecutionWsIntegrationTest extends AbstractSpringTestCase {
 	private Log log = LogFactory.getLog(getClass());
diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
index 6e6ffa176..7796c26d7 100644
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
@@ -5,8 +5,8 @@ import org.springframework.ws.client.core.WebServiceTemplate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
-import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createSimpleResultPartRequest;
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createSimpleResultPartRequest;
 
 import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest;
diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml
deleted file mode 100644
index 31158cf49..000000000
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<import
-		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
-
-	<bean id="sessionFactory"
-		parent="slcDefault.sessionFactory.hibernateTestHSQL">
-	</bean>
-
-	<bean id="testResultDao"
-		parent="slcTemplates.dao.testResultDao">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-	<bean id="testResultCollectionDao"
-		parent="slcTemplates.dao.testResultCollectionDao">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<bean id="slcExecutionDao"
-		parent="slcTemplates.dao.slcExecutionDao">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-	
-	<bean id="treeSPathDao"
-		parent="slcTemplates.dao.treeSPathDao">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<bean id="treeSRegistryDao"
-		parent="slcTemplates.dao.treeSRegistryDao">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/hibernate/withCastor.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/hibernate/withCastor.xml
deleted file mode 100644
index ae7f97114..000000000
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/hibernate/withCastor.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<import resource="applicationContext.xml" />
-	<import
-		resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
-</beans>
\ No newline at end of file