From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 1 May 2008 19:54:57 +0000 (+0000)
Subject: Various changes (currently broken, apparently Castor is hanging)
X-Git-Tag: argeo-slc-2.1.7~2949
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=797bda18ebe1f895782d72df6b1cdcb3af0eb34b;p=gpl%2Fargeo-slc.git

Various changes (currently broken, apparently Castor is hanging)

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

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/CreateTreeTestResultRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java
new file mode 100644
index 000000000..f8f710f10
--- /dev/null
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java
@@ -0,0 +1,35 @@
+package org.argeo.slc.ws.test.tree;
+
+import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint;
+
+import org.apache.commons.logging.Log;
+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.CreateTreeTestResultRequest;
+
+public class CreateTreeTestResultRequestEp extends AbstractMarshallingPayloadEndpoint {
+
+	private Log log = LogFactory.getLog(getClass());
+
+	private final TreeTestResultDao treeTestResultDao;
+
+	public CreateTreeTestResultRequestEp(TreeTestResultDao treeTestResultDao) {
+		this.treeTestResultDao = treeTestResultDao;
+	}
+
+	@Override
+	protected Object invokeInternal(Object requestObject) throws Exception {
+		CreateTreeTestResultRequest msg = (CreateTreeTestResultRequest) requestObject;
+		TreeTestResult treeTestResult = msg.getTreeTestResult();
+
+		treeTestResultDao.create(treeTestResult);
+		
+		if (log.isDebugEnabled())
+			log.debug("Created TreeTestResult with uuid "
+					+ treeTestResult.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/TreeTestResultRequestEp.java
deleted file mode 100644
index 345d6d828..000000000
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/TreeTestResultRequestEp.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.argeo.slc.ws.test.tree;
-
-import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint;
-
-import org.apache.commons.logging.Log;
-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;
-
-public class TreeTestResultRequestEp extends AbstractMarshallingPayloadEndpoint {
-
-	private Log log = LogFactory.getLog(getClass());
-
-	private final TreeTestResultDao treeTestResultDao;
-
-	public TreeTestResultRequestEp(TreeTestResultDao treeTestResultDao) {
-		this.treeTestResultDao = treeTestResultDao;
-	}
-
-	@Override
-	protected Object invokeInternal(Object requestObject) throws Exception {
-		TreeTestResultRequest msg = (TreeTestResultRequest) requestObject;
-		TreeTestResult treeTestResult = msg.getTreeTestResult();
-
-		if (treeTestResultDao.getTestResult(treeTestResult.getUuid()) == null) {
-			treeTestResultDao.create(treeTestResult);
-			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