From: Mathieu Baudier Date: Sun, 28 Oct 2007 16:28:52 +0000 (+0000) Subject: Introduce results persistence X-Git-Tag: argeo-slc-2.1.7~3194 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=62ef12a06742ee09256c18e8db90fe83a108c116;p=gpl%2Fargeo-slc.git Introduce results persistence git-svn-id: https://svn.argeo.org/slc/trunk@668 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc/.classpath b/org.argeo.slc/.classpath index 6e1743509..fc54474e7 100644 --- a/org.argeo.slc/.classpath +++ b/org.argeo.slc/.classpath @@ -8,6 +8,18 @@ + + + + + + + + + + + + diff --git a/org.argeo.slc/lib/antlr-2.7.6.jar b/org.argeo.slc/lib/antlr-2.7.6.jar new file mode 100644 index 000000000..3702b645f Binary files /dev/null and b/org.argeo.slc/lib/antlr-2.7.6.jar differ diff --git a/org.argeo.slc/lib/asm-attrs.jar b/org.argeo.slc/lib/asm-attrs.jar new file mode 100644 index 000000000..f07bcb2b4 Binary files /dev/null and b/org.argeo.slc/lib/asm-attrs.jar differ diff --git a/org.argeo.slc/lib/asm.jar b/org.argeo.slc/lib/asm.jar new file mode 100644 index 000000000..ee0c7ccd2 Binary files /dev/null and b/org.argeo.slc/lib/asm.jar differ diff --git a/org.argeo.slc/lib/cglib-2.1.3.jar b/org.argeo.slc/lib/cglib-2.1.3.jar new file mode 100644 index 000000000..ddfbdb05a Binary files /dev/null and b/org.argeo.slc/lib/cglib-2.1.3.jar differ diff --git a/org.argeo.slc/lib/commons-collections-2.1.1.jar b/org.argeo.slc/lib/commons-collections-2.1.1.jar new file mode 100644 index 000000000..3272f2be6 Binary files /dev/null and b/org.argeo.slc/lib/commons-collections-2.1.1.jar differ diff --git a/org.argeo.slc/lib/commons-dbcp.jar b/org.argeo.slc/lib/commons-dbcp.jar new file mode 100644 index 000000000..faea05626 Binary files /dev/null and b/org.argeo.slc/lib/commons-dbcp.jar differ diff --git a/org.argeo.slc/lib/commons-lang.jar b/org.argeo.slc/lib/commons-lang.jar new file mode 100644 index 000000000..87b80ab5d Binary files /dev/null and b/org.argeo.slc/lib/commons-lang.jar differ diff --git a/org.argeo.slc/lib/commons-pool.jar b/org.argeo.slc/lib/commons-pool.jar new file mode 100644 index 000000000..e8de3275c Binary files /dev/null and b/org.argeo.slc/lib/commons-pool.jar differ diff --git a/org.argeo.slc/lib/dom4j-1.6.1.jar b/org.argeo.slc/lib/dom4j-1.6.1.jar new file mode 100644 index 000000000..c8c4dbb92 Binary files /dev/null and b/org.argeo.slc/lib/dom4j-1.6.1.jar differ diff --git a/org.argeo.slc/lib/hibernate3.jar b/org.argeo.slc/lib/hibernate3.jar new file mode 100644 index 000000000..b6009726d Binary files /dev/null and b/org.argeo.slc/lib/hibernate3.jar differ diff --git a/org.argeo.slc/lib/hsqldb.jar b/org.argeo.slc/lib/hsqldb.jar new file mode 100644 index 000000000..dc3055e44 Binary files /dev/null and b/org.argeo.slc/lib/hsqldb.jar differ diff --git a/org.argeo.slc/lib/jta.jar b/org.argeo.slc/lib/jta.jar new file mode 100644 index 000000000..ffa3c5ba2 Binary files /dev/null and b/org.argeo.slc/lib/jta.jar differ diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java index 5d54f9ac6..daa160626 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java @@ -24,6 +24,12 @@ public class TreeSPath implements StructurePath, Comparable { String parentStr = parent != null ? parent.getAsUniqueString() : ""; return parentStr + separator + name; } + + public void setAsUniqueString(String str){ + TreeSPath twin = parseToCreatePath(str, getSeparator()); + name = twin.name; + parent = twin.parent; + } /** The separator actually used by this path. */ public Character getSeparator() { diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/NumericTRId.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/NumericTRId.java new file mode 100644 index 000000000..b3654dc05 --- /dev/null +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/NumericTRId.java @@ -0,0 +1,55 @@ +package org.argeo.slc.core.test; + +import org.argeo.slc.core.deploy.DeployedSystemId; + +public class NumericTRId implements TestResultId { + /** For ORM */ + private Long tid; + + private Long value; + private DeployedSystemId deployedSystemId; + + public void init() { + if (getValue() == null) { + setValue(System.currentTimeMillis()); + } + } + + + public Long getValue() { + return value; + } + + public void setValue(Long value) { + this.value = value; + } + + public DeployedSystemId getDeployedSystemId() { + return deployedSystemId; + } + + public void setDeployedSystemId(DeployedSystemId deployedSystemId) { + this.deployedSystemId = deployedSystemId; + } + + @Override + public boolean equals(Object obj) { + return value.toString().equals(obj.toString()); + } + + @Override + public String toString() { + return value.toString(); + } + + Long getTid() { + return tid; + } + + void setTid(Long tid) { + this.tid = tid; + } + + + +} diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java index 2eaa9e59e..1c7c7e267 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java @@ -6,6 +6,9 @@ public class SimpleResultPart implements TestResultPart { public final static Integer FAILED = 2; public final static Integer ERROR = 3; + /** For ORM */ + private Long tid; + private Integer status; private String message; private Throwable exception; @@ -51,4 +54,12 @@ public class SimpleResultPart implements TestResultPart { return buf.toString(); } + Long getTid() { + return tid; + } + + void setTid(Long tid) { + this.tid = tid; + } + } diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResult.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResult.java index 72ba643c6..f01c8fb42 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResult.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResult.java @@ -1,10 +1,7 @@ package org.argeo.slc.core.test; -import java.util.List; - /** The result of a test */ public interface TestResult { public TestResultId getTestResultId(); - public List listResultParts(); public void addResultPart(TestResultPart part); } diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultId.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultId.java index 5dfa0730d..8c9425399 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultId.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TestResultId.java @@ -5,4 +5,5 @@ import org.argeo.slc.core.deploy.DeployedSystemId; /** The unique id referencing a test result.*/ public interface TestResultId { public DeployedSystemId getDeployedSystemId(); + } diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TimeTestResultId.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TimeTestResultId.java index 017f36478..0dffd4712 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TimeTestResultId.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/TimeTestResultId.java @@ -2,12 +2,13 @@ package org.argeo.slc.core.test; import org.argeo.slc.core.deploy.DeployedSystemId; -public class TimeTestResultId implements TestResultId{ +public class TimeTestResultId extends NumericTRId { private DeployedSystemId deployedSystemId; - private Long time; public void init() { - time = System.currentTimeMillis(); + if (getValue() == null) { + setValue(System.currentTimeMillis()); + } } public void setDeployedSystemId(DeployedSystemId deployedSystemId) { @@ -17,17 +18,4 @@ public class TimeTestResultId implements TestResultId{ public DeployedSystemId getDeployedSystemId() { return deployedSystemId; } - - @Override - public boolean equals(Object obj) { - return obj.toString().equals(toString()); - } - - @Override - public String toString() { - return time.toString(); - } - - - } diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java index d6f0c935d..13b3b25df 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java @@ -3,8 +3,8 @@ package org.argeo.slc.core.test.tree; import java.util.Vector; 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.TestResultListener; import org.argeo.slc.core.test.TestResultPart; @@ -29,19 +29,20 @@ public abstract class AsynchronousTreeTestResultListener implements TestResultPart testResultPart) { TreeTestResult result = (TreeTestResult) testResult; synchronized (partStructs) { - partStructs.add(new PartStruct(result.getCurrentPath(), result - .getTestResultId(), testResultPart, result)); + partStructs.add(new PartStruct(result.getCurrentPath(), + (NumericTRId) result.getTestResultId(), testResultPart, + result)); partStructs.notifyAll(); } } public void run() { while (thread != null) { - for (PartStruct partStruct : partStructs) { - resultPartAdded(partStruct); - } - synchronized (partStructs) { + for (PartStruct partStruct : partStructs) { + resultPartAdded(partStruct); + } + partStructs.clear(); while (partStructs.size() == 0) { try { @@ -58,11 +59,11 @@ public abstract class AsynchronousTreeTestResultListener implements protected static class PartStruct { public final TreeSPath path; - public final TestResultId resultId; + public final NumericTRId resultId; public final TestResultPart part; public final TreeTestResult result; - public PartStruct(TreeSPath path, TestResultId resultId, + public PartStruct(TreeSPath path, NumericTRId resultId, TestResultPart part, TreeTestResult result) { super(); this.path = path; diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java new file mode 100644 index 000000000..34ef96a4e --- /dev/null +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java @@ -0,0 +1,32 @@ +package org.argeo.slc.core.test.tree; + +import java.util.List; +import java.util.Vector; + +import org.argeo.slc.core.test.TestResultPart; + +public class PartSubList { + + /** For ORM */ + private Long tid; + + private List parts = new Vector(); + + public List getParts() { + return parts; + } + + public void setParts(List parts) { + this.parts = parts; + } + + Long getTid() { + return tid; + } + + void setTid(Long tid) { + this.tid = tid; + } + + +} diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java index 3134e1aaa..c333bf79f 100644 --- a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java @@ -3,63 +3,64 @@ package org.argeo.slc.core.test.tree; import java.util.List; import java.util.SortedMap; import java.util.TreeMap; -import java.util.Vector; import org.argeo.slc.core.SlcException; import org.argeo.slc.core.structure.StructureAware; import org.argeo.slc.core.structure.StructurePath; import org.argeo.slc.core.structure.StructureRegistry; 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.TestResultListener; import org.argeo.slc.core.test.TestResultPart; public class TreeTestResult implements TestResult, StructureAware { - private TestResultId testResultId; + /** For ORM */ + private Long tid; + + private NumericTRId testResultId; private List listeners; private TreeSPath currentPath; - private SortedMap> resultParts = new TreeMap>(); + private SortedMap resultParts = new TreeMap(); + + public TestResultId getTestResultId() { return testResultId; } - public void setTestResultId(TestResultId testResultId) { + public NumericTRId getNumericResultId() { + return testResultId; + } + + public void setNumericResultId(NumericTRId testResultId) { this.testResultId = testResultId; } public void setListeners(List listeners) { this.listeners = listeners; } - + public void addResultPart(TestResultPart part) { - if(currentPath==null){ + if (currentPath == null) { throw new SlcException("No current path set."); } - List list = resultParts.get(currentPath); - if(list == null){ - list = new Vector(); - resultParts.put(currentPath, list); + PartSubList subList = resultParts.get(currentPath); + if (subList == null) { + subList = new PartSubList(); + resultParts.put(currentPath, subList); } - list.add(part); - + subList.getParts().add(part); + // notify listeners - for(TestResultListener listener: listeners){ + for (TestResultListener listener : listeners) { listener.resultPartAdded(this, part); } } - public List listResultParts() { - List all = new Vector(); - for(TreeSPath path:resultParts.keySet()){ - all.addAll(resultParts.get(path)); - } - return all; - } - public void notifyCurrentPath(StructureRegistry registry, StructurePath path) { currentPath = (TreeSPath) path; } @@ -68,9 +69,20 @@ public class TreeTestResult implements TestResult, StructureAware { return currentPath; } - public SortedMap> getResultParts() { + public SortedMap getResultParts() { return resultParts; } - + void setResultParts(SortedMap resultParts) { + this.resultParts = resultParts; + } + + Long getTid() { + return tid; + } + + void setTid(Long tid) { + this.tid = tid; + } + } diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultPersister.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultPersister.java new file mode 100644 index 000000000..16ec6facd --- /dev/null +++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultPersister.java @@ -0,0 +1,37 @@ +package org.argeo.slc.core.test.tree; + +import org.argeo.slc.dao.test.TestResultDao; + +public class TreeTestResultPersister extends AsynchronousTreeTestResultListener { + private TestResultDao testResultDao; + + @Override + protected void resultPartAdded(PartStruct partStruct) { + TreeTestResult persistedResult = (TreeTestResult) testResultDao + .getTestResult(partStruct.resultId); + if (persistedResult == null) { + persistedResult = new TreeTestResult(); + persistedResult.setNumericResultId(partStruct.resultId); + PartSubList subList = new PartSubList(); + subList.getParts().add(partStruct.part); + persistedResult.getResultParts().put(partStruct.path, subList); + + testResultDao.create(persistedResult); + } else { + PartSubList subList = persistedResult.getResultParts().get( + partStruct.path); + if (subList == null) { + subList = new PartSubList(); + persistedResult.getResultParts().put(partStruct.path, subList); + } + subList.getParts().add(partStruct.part); + + testResultDao.update(persistedResult); + } + } + + public void setTestResultDao(TestResultDao testResultDao) { + this.testResultDao = testResultDao; + } + +} diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/dao/test/TestResultDao.java b/org.argeo.slc/src/main/java/org/argeo/slc/dao/test/TestResultDao.java new file mode 100644 index 000000000..b282cd485 --- /dev/null +++ b/org.argeo.slc/src/main/java/org/argeo/slc/dao/test/TestResultDao.java @@ -0,0 +1,13 @@ +package org.argeo.slc.dao.test; + +import java.util.List; + +import org.argeo.slc.core.test.TestResult; +import org.argeo.slc.core.test.TestResultId; + +public interface TestResultDao { + public TestResult getTestResult(TestResultId id); + public void create(TestResult testResult); + public void update(TestResult testResult); + public List listTestResults(); +} diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml new file mode 100644 index 000000000..ca9c5d972 --- /dev/null +++ b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/NumericTRId.hbm.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml new file mode 100644 index 000000000..f1fc40794 --- /dev/null +++ b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/TestResultId.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/TestResultId.hbm.xml new file mode 100644 index 000000000..dee13a618 --- /dev/null +++ b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/TestResultId.hbm.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml new file mode 100644 index 000000000..158fe6d2d --- /dev/null +++ b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java new file mode 100644 index 000000000..7b91769aa --- /dev/null +++ b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java @@ -0,0 +1,41 @@ +package org.argeo.slc.hibernate.test.tree; + +import java.util.List; + +import org.springframework.orm.hibernate3.support.HibernateDaoSupport; + +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.dao.test.TestResultDao; + +public class TestResultDaoHibernate extends HibernateDaoSupport implements + TestResultDao { + + public void create(TestResult testResult) { + getHibernateTemplate().save(testResult); + } + + public void update(TestResult testResult) { + getHibernateTemplate().saveOrUpdate(testResult); + } + + public TestResult getTestResult(TestResultId id) { + NumericTRId ntrid = (NumericTRId) id; + List list = getHibernateTemplate().find( + "from TreeTestResult where numericResultId.value=?", + ntrid.getValue()); + if (list.size() == 0) { + return null; + } else { + return (TestResult) list.get(0); + } + + } + + public List listTestResults() { + return (List) getHibernateTemplate().find( + "from TreeTestResult"); + } + +} diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml new file mode 100644 index 000000000..4060e0090 --- /dev/null +++ b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + \ 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 48fd27aea..916d9809d 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 @@ -15,5 +15,11 @@ public class TestAntBuild extends TestCase { File antFile = new File(slcBaseDir.getPath() + "/root/Category1/SubCategory2/build.xml"); AntRegistryUtil.runAll(antFile); + + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } } } diff --git a/org.argeo.slc/src/test/slc/conf/applicationContext.xml b/org.argeo.slc/src/test/slc/conf/applicationContext.xml index 25657efb8..f8a240998 100644 --- a/org.argeo.slc/src/test/slc/conf/applicationContext.xml +++ b/org.argeo.slc/src/test/slc/conf/applicationContext.xml @@ -3,6 +3,7 @@ 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.0.xsd"> + diff --git a/org.argeo.slc/src/test/slc/conf/data.xml b/org.argeo.slc/src/test/slc/conf/data.xml new file mode 100644 index 000000000..2ea17cd20 --- /dev/null +++ b/org.argeo.slc/src/test/slc/conf/data.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + org/argeo/slc/hibernate/test/NumericTRId.hbm.xml + + + org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml + + + org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml + + + org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml + + + + + + hibernate.dialect=org.hibernate.dialect.HSQLDialect + c3p0.min_size=1 c3p0.timeout=1800 + cache.provider_class=org.hibernate.cache.NoCacheProvider + cache.use_query_cache=false cache.use_minimal_puts=false + max_fetch_depth=3 show_sql=true format_sql=true + current_session_context_class=thread + hibernate.hbm2ddl.auto=update + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc/src/test/slc/conf/log4j.properties b/org.argeo.slc/src/test/slc/conf/log4j.properties index 8a70a33f4..21da2fc41 100644 --- a/org.argeo.slc/src/test/slc/conf/log4j.properties +++ b/org.argeo.slc/src/test/slc/conf/log4j.properties @@ -1,9 +1,11 @@ # Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=TRACE, console +log4j.rootLogger=DEBUG, console ## Levels # Spring log4j.logger.org.springframework=INFO +# Hibernate +log4j.logger.org.hibernate=INFO ## Appenders diff --git a/org.argeo.slc/src/test/slc/conf/slc.xml b/org.argeo.slc/src/test/slc/conf/slc.xml index cef799e20..4b13480f4 100644 --- a/org.argeo.slc/src/test/slc/conf/slc.xml +++ b/org.argeo.slc/src/test/slc/conf/slc.xml @@ -9,20 +9,21 @@ + + + - + + - - - @@ -31,6 +32,11 @@ init-method="init" destroy-method="destroy"> + + + + @@ -45,4 +51,5 @@ + \ No newline at end of file