From 751669212776bf78fb9c929a3031e27003591410 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 21 Jun 2008 11:59:18 +0000 Subject: [PATCH] Restructure example Improve logging git-svn-id: https://svn.argeo.org/slc/trunk@1259 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../test/tree/CompositeTreeTestDefinition.java | 3 ++- .../argeo/slc/core/test/tree/TreeTestResult.java | 15 +++++++++------ .../slc/core/test/tree/TreeTestResultLogger.java | 12 +++++++++++- .../java/org/argeo/slc/spring/SpringUtils.java | 12 +++--------- .../slc/castor/spring/applicationContext.xml | 2 +- .../core/process/spring/applicationContext.xml | 15 +++++++++++++++ .../src/test/resources/log4j.properties | 9 ++------- 7 files changed, 43 insertions(+), 25 deletions(-) create mode 100644 org.argeo.slc.core/src/main/resources/org/argeo/slc/core/process/spring/applicationContext.xml diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java index 91534e36d..3468bcb25 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java @@ -29,7 +29,8 @@ public class CompositeTreeTestDefinition implements TestDefinition, private StructureRegistry registry; public void execute(TestRun testRun) { - log.info("Execute sequence of test definitions..."); + if (log.isTraceEnabled()) + log.trace("Execute sequence of test definitions..."); int i = 0; for (TestDefinition task : tasks) { diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java index 7e7ae68b7..f34561a9e 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java @@ -34,7 +34,7 @@ public class TreeTestResult implements TestResult, StructureAware, private TreeSPath currentPath; private TestRun currentTestRun; - + private Map rootTags = new TreeMap(); private Date closeDate; @@ -80,13 +80,15 @@ public class TreeTestResult implements TestResult, StructureAware, if (!elements.containsKey(p)) { StructureElement elem = registry.getElement(p); if (elem != null) { - - if(elements.size()==0 && (elem instanceof SimpleSElement)){ - SimpleSElement sElem = ((SimpleSElement)elem).clone(); + + if (elements.size() == 0 + && (elem instanceof SimpleSElement)) { + SimpleSElement sElem = ((SimpleSElement) elem) + .clone(); sElem.getTags().putAll(rootTags); elem = sElem; } - + elements.put(p, elem); } } else { @@ -131,7 +133,8 @@ public class TreeTestResult implements TestResult, StructureAware, } isClosed = true; - log.info("Test Result #" + getUuid() + " closed."); + if (log.isTraceEnabled()) + log.trace("Test Result " + getUuid() + " closed."); } public Date getCloseDate() { diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java index 2246e18b0..78808cbbf 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java @@ -16,6 +16,8 @@ import org.argeo.slc.core.test.TestStatus; public class TreeTestResultLogger implements TestResultListener { private static Log log = LogFactory.getLog(TreeTestResultLogger.class); + + private Boolean logExceptionMessages = false; public void resultPartAdded(TreeTestResult testResult, TestResultPart testResultPart) { @@ -26,7 +28,10 @@ public class TreeTestResultLogger implements TestResultListener } else if (testResultPart.getStatus().equals(TestStatus.FAILED)) { log.warn(msg); } else if (testResultPart.getStatus().equals(TestStatus.ERROR)) { - log.error(msg + "\n" + testResultPart.getExceptionMessage()); + if(logExceptionMessages || log.isDebugEnabled()) + msg = msg + "\n" + testResultPart.getExceptionMessage(); + + log.error(msg); } else { log.error("Unknow test status: " + msg); } @@ -36,4 +41,9 @@ public class TreeTestResultLogger implements TestResultListener log.info("Test result " + testResult.getUuid() + " closed."); } + public void setLogExceptionMessages(Boolean logExceptionMessages) { + this.logExceptionMessages = logExceptionMessages; + } + + } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java index 73f1ffde3..8ef13560c 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java @@ -27,7 +27,7 @@ public class SpringUtils { try { if (res.getURL().getPath().equals("/")) return null; - + String urlStr = res.getURL().toString(); if (urlStr.charAt(urlStr.length() - 1) == '/') urlStr = urlStr.substring(0, urlStr.length() - 2); @@ -42,14 +42,8 @@ public class SpringUtils { public static String extractRelativePath(Resource ancestor, Resource child) { try { - String childPath = child.getURL().getPath(); - String ancestorPath = ancestor.getURL().getPath(); - - if (log.isTraceEnabled()) - log.trace("extractRelativePath(): childPath=" + childPath - + ", ancestorPath=" + ancestorPath); - - return childPath.substring(ancestorPath.length()); + + return ancestor.getURI().relativize(child.getURI()).toString(); } catch (IOException e) { throw new SlcException("Cannot extract relative path of " + child + " based on " + ancestor, e); diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml index 068d773fb..28b75f8df 100644 --- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml +++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml @@ -32,7 +32,7 @@ diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/process/spring/applicationContext.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/process/spring/applicationContext.xml new file mode 100644 index 000000000..45bcac91a --- /dev/null +++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/process/spring/applicationContext.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.core/src/test/resources/log4j.properties b/org.argeo.slc.core/src/test/resources/log4j.properties index 605a28c48..0133bab88 100644 --- a/org.argeo.slc.core/src/test/resources/log4j.properties +++ b/org.argeo.slc.core/src/test/resources/log4j.properties @@ -1,5 +1,5 @@ # Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=INFO, console +log4j.rootLogger=WARN, console ## Levels # Slc @@ -9,12 +9,7 @@ log4j.logger.org.argeo=DEBUG log4j.logger.org.exolab.castor=WARN # Spring -log4j.logger.org.springframework=INFO -# Hibernate -log4j.logger.org.hibernate=WARN -#log4j.logger.org.hibernate.SQL=TRACE -#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE -#log4j.logger.org.hibernate.type=TRACE +log4j.logger.org.springframework=WARN ## Appenders -- 2.39.2