From 62fa7073046d9581413d87aa6025de74bd4b669c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 26 Jul 2010 11:09:52 +0000 Subject: [PATCH] Fix issue related to serialization, old spring template files and logging git-svn-id: https://svn.argeo.org/slc/trunk@3720 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../META-INF/spring/mysql.xml | 3 +-- .../slc/core/execution/RefSpecAttribute.java | 2 +- .../slc/core/structure/SimpleSElement.java | 4 +++- .../slc/jms/JmsTreeTestResultListener.java | 19 +++++++++++-------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/modules/server/org.argeo.slc.server.mysql/META-INF/spring/mysql.xml b/modules/server/org.argeo.slc.server.mysql/META-INF/spring/mysql.xml index 51003f5cd..4f85f569e 100644 --- a/modules/server/org.argeo.slc.server.mysql/META-INF/spring/mysql.xml +++ b/modules/server/org.argeo.slc.server.mysql/META-INF/spring/mysql.xml @@ -8,8 +8,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd" default-lazy-init="false"> - + diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/RefSpecAttribute.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/RefSpecAttribute.java index b83add850..495f32322 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/RefSpecAttribute.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/RefSpecAttribute.java @@ -21,7 +21,7 @@ import java.util.List; public class RefSpecAttribute extends AbstractSpecAttribute implements Cloneable { private static final long serialVersionUID = -3427797452955753574L; - private Class targetClass; + private transient Class targetClass; /** Read only. */ private String targetClassName; private transient Object value = null; diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java index 67bdf8711..817dc6160 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java @@ -16,6 +16,7 @@ package org.argeo.slc.core.structure; +import java.io.Serializable; import java.util.Map; import java.util.TreeMap; @@ -27,7 +28,8 @@ import org.argeo.slc.structure.StructureElement; * * @see TreeSPath */ -public class SimpleSElement implements StructureElement { +public class SimpleSElement implements StructureElement, Serializable { + private static final long serialVersionUID = -7012193125005818900L; /** For ORM */ private Long tid; private String label; diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTreeTestResultListener.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTreeTestResultListener.java index dc545c5eb..2902b94d4 100644 --- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTreeTestResultListener.java +++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTreeTestResultListener.java @@ -54,16 +54,16 @@ public class JmsTreeTestResultListener implements TreeTestResultListener { CreateTreeTestResultRequest req = new CreateTreeTestResultRequest( testResult); - if (log.isDebugEnabled()) - log.debug("Send create result request for result " + if (log.isTraceEnabled()) + log.trace("Send create result request for result " + testResult.getUuid()); jmsTemplate.convertAndSend(executionEventDestination, req); } else { ResultPartRequest req = new ResultPartRequest(testResult); - if (log.isDebugEnabled()) - log.debug("Send result parts for result " + if (log.isTraceEnabled()) + log.trace("Send result parts for result " + testResult.getUuid()); jmsTemplate.convertAndSend(executionEventDestination, req); @@ -84,8 +84,8 @@ public class JmsTreeTestResultListener implements TreeTestResultListener { CreateTreeTestResultRequest req = new CreateTreeTestResultRequest( testResult); - if (log.isDebugEnabled()) - log.debug("Send create result request for result " + if (log.isTraceEnabled()) + log.trace("Send onClose create result request for result " + testResult.getUuid()); jmsTemplate.convertAndSend(executionEventDestination, req); @@ -93,8 +93,8 @@ public class JmsTreeTestResultListener implements TreeTestResultListener { CloseTreeTestResultRequest req = new CloseTreeTestResultRequest( testResult); - if (log.isDebugEnabled()) - log.debug("Send close result request for result " + if (log.isTraceEnabled()) + log.trace("Send close result request for result " + testResult.getUuid()); jmsTemplate.convertAndSend(executionEventDestination, req); @@ -111,6 +111,9 @@ public class JmsTreeTestResultListener implements TreeTestResultListener { } public void addAttachment(TreeTestResult testResult, Attachment attachment) { + if (onlyOnClose) + return; + try { AddTreeTestResultAttachmentRequest req = new AddTreeTestResultAttachmentRequest(); req.setResultUuid(testResult.getUuid()); -- 2.39.2