From 797bda18ebe1f895782d72df6b1cdcb3af0eb34b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 1 May 2008 19:54:57 +0000 Subject: [PATCH] Various changes (currently broken, apparently Castor is hanging) git-svn-id: https://svn.argeo.org/slc/trunk@1091 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../slc/ws/process/SlcExecutionRequestEp.java | 12 ++++++++---- ...java => CreateTreeTestResultRequestEp.java} | 18 +++++++----------- .../src/test/resources/log4j.properties | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) rename org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/{TreeTestResultRequestEp.java => CreateTreeTestResultRequestEp.java} (56%) diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java index 65b520a26..5978fc457 100644 --- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java @@ -24,12 +24,16 @@ public class SlcExecutionRequestEp extends AbstractMarshallingPayloadEndpoint { if (slcExecutionDao.getSlcExecution(slcExecution.getUuid()) == null) { slcExecutionDao.create(slcExecution); - log.debug("Created SlcExecution with uuid " - + slcExecution.getUuid()); + + if (log.isDebugEnabled()) + log.debug("Created SlcExecution with uuid " + + slcExecution.getUuid()); } else { slcExecutionDao.update(slcExecution); - log.debug("Updated SlcExecution with uuid " - + slcExecution.getUuid()); + + if (log.isDebugEnabled()) + log.debug("Updated SlcExecution with uuid " + + slcExecution.getUuid()); } return null; } diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/TreeTestResultRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java similarity index 56% rename from org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/TreeTestResultRequestEp.java rename to org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java index 345d6d828..f8f710f10 100644 --- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/TreeTestResultRequestEp.java +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java @@ -7,32 +7,28 @@ import org.apache.commons.logging.LogFactory; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.dao.test.tree.TreeTestResultDao; -import org.argeo.slc.msg.test.tree.TreeTestResultRequest; +import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest; -public class TreeTestResultRequestEp extends AbstractMarshallingPayloadEndpoint { +public class CreateTreeTestResultRequestEp extends AbstractMarshallingPayloadEndpoint { private Log log = LogFactory.getLog(getClass()); private final TreeTestResultDao treeTestResultDao; - public TreeTestResultRequestEp(TreeTestResultDao treeTestResultDao) { + public CreateTreeTestResultRequestEp(TreeTestResultDao treeTestResultDao) { this.treeTestResultDao = treeTestResultDao; } @Override protected Object invokeInternal(Object requestObject) throws Exception { - TreeTestResultRequest msg = (TreeTestResultRequest) requestObject; + CreateTreeTestResultRequest msg = (CreateTreeTestResultRequest) requestObject; TreeTestResult treeTestResult = msg.getTreeTestResult(); - if (treeTestResultDao.getTestResult(treeTestResult.getUuid()) == null) { - treeTestResultDao.create(treeTestResult); + treeTestResultDao.create(treeTestResult); + + if (log.isDebugEnabled()) log.debug("Created TreeTestResult with uuid " + treeTestResult.getUuid()); - } else { - treeTestResultDao.update(treeTestResult); - log.debug("Updated TreeTestResult with uuid " - + treeTestResult.getUuid()); - } return null; } diff --git a/org.argeo.slc.server/src/test/resources/log4j.properties b/org.argeo.slc.server/src/test/resources/log4j.properties index c49b71be8..a38d5b0cd 100644 --- a/org.argeo.slc.server/src/test/resources/log4j.properties +++ b/org.argeo.slc.server/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=TRACE, console ## Levels # Slc -- 2.39.2