From: Mathieu Baudier Date: Wed, 14 Jul 2010 13:13:16 +0000 (+0000) Subject: Progress on serialized exchanges X-Git-Tag: argeo-slc-2.1.7~1234 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=2916f0d4e65111ecf97e16517f490be25c878ed9;p=gpl%2Fargeo-slc.git Progress on serialized exchanges git-svn-id: https://svn.argeo.org/slc/trunk@3685 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties index 6b47f015a..fc0e6be9b 100644 --- a/demo/site/org.argeo.slc.demo.log4j/log4j.properties +++ b/demo/site/org.argeo.slc.demo.log4j/log4j.properties @@ -7,7 +7,7 @@ log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG log4j.logger.org.argeo.security.mvc.ArgeoRememberMeServices=WARN -#log4j.logger.org.argeo.slc.jms.JmsAgentProxy=TRACE +log4j.logger.org.argeo.slc.jms.JmsAgentProxy=TRACE #log4j.logger.org.argeo.slc.jms.JmsAgent=TRACE #log4j.logger.org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor=TRACE diff --git a/modules/agent/org.argeo.slc.ext.activemq/.settings/org.eclipse.pde.core.prefs b/modules/agent/org.argeo.slc.ext.activemq/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 5f0588ac8..000000000 --- a/modules/agent/org.argeo.slc.ext.activemq/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Wed Jul 14 11:45:13 CEST 2010 -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF index 041b74061..d0ccdf2da 100644 --- a/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF +++ b/modules/agent/org.argeo.slc.ext.activemq/META-INF/MANIFEST.MF @@ -1,8 +1,7 @@ Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 Bundle-Name: ActiveMQ Ext Bundle-SymbolicName: org.argeo.slc.ext.activemq -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 0.13.0.SNAPSHOT Fragment-Host: org.argeo.dep.osgi.activemq Import-Package: org.argeo.slc.runtime, org.argeo.slc.execution, @@ -27,5 +26,6 @@ Import-Package: org.argeo.slc.runtime, org.argeo.slc.runtime, org.argeo.slc.test, org.argeo.slc.xml.process, - org.argeo.slc.xml.test.tree + org.argeo.slc.xml.test.tree, + org.hibernate.collection Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/modules/agent/org.argeo.slc.ext.activemq/build.properties b/modules/agent/org.argeo.slc.ext.activemq/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/modules/agent/org.argeo.slc.ext.activemq/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/attachment/SimpleAttachment.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/attachment/SimpleAttachment.java index ba1d129b4..bb199401f 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/attachment/SimpleAttachment.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/attachment/SimpleAttachment.java @@ -16,9 +16,11 @@ package org.argeo.slc.core.attachment; +import java.io.Serializable; import java.util.UUID; -public class SimpleAttachment implements Attachment { +public class SimpleAttachment implements Attachment, Serializable { + private static final long serialVersionUID = 6615155908800610606L; private String uuid = UUID.randomUUID().toString(); private String name; private String contentType = ""; diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java index 7fab40e5c..66096c834 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java @@ -16,6 +16,7 @@ package org.argeo.slc.core.structure.tree; +import java.io.Serializable; import java.util.List; import java.util.StringTokenizer; import java.util.Vector; @@ -27,7 +28,10 @@ import org.argeo.slc.structure.StructureRegistry; /** * Path for tree based StructureRegistry implementations. */ -public class TreeSPath implements StructurePath, Comparable { +public class TreeSPath implements StructurePath, Comparable, + Serializable { + private static final long serialVersionUID = -110121029180848183L; + /** Default character to use a separator: /. */ private static Character DEFAULT_SEPARATOR = '/'; diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java index 932b4d281..1afb145da 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java @@ -16,6 +16,8 @@ package org.argeo.slc.core.test; +import java.io.Serializable; + import org.argeo.slc.test.TestResultPart; import org.argeo.slc.test.TestRun; import org.argeo.slc.test.TestRunAware; @@ -30,7 +32,8 @@ import org.argeo.slc.test.TestStatus; * @see TestStatus */ public class SimpleResultPart implements TestResultPart, TestStatus, - TestRunAware { + TestRunAware, Serializable { + private static final long serialVersionUID = 6669675957685071901L; private Long tid; diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java index ada006fe2..1b260bd27 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java @@ -16,6 +16,7 @@ package org.argeo.slc.core.test.tree; +import java.io.Serializable; import java.util.List; import java.util.Vector; @@ -30,7 +31,8 @@ import org.argeo.slc.test.TestStatus; * * @see TreeTestResult */ -public class PartSubList { +public class PartSubList implements Serializable { + private static final long serialVersionUID = -5308754827565759844L; /** For ORM */ private Long tid; diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java index 40eb00f8c..eadfbef58 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java @@ -65,13 +65,13 @@ public class TreeTestResult implements TestResult, StructureAware, // Runtime Data private TreeSPath currentPath; - private TestRun currentTestRun; + private transient TestRun currentTestRun; private Boolean warnIfAlreadyClosed = true; private Boolean strictChecks = false; // TODO is it really necessary closeDate == null ? private Boolean isClosed = false; - private List> listeners = new Vector>(); + private transient List> listeners = new Vector>(); /** Sets the list of listeners. */ public void setListeners(List> listeners) { @@ -146,8 +146,7 @@ public class TreeTestResult implements TestResult, StructureAware, } /** - * Used by ORM systems. - * Changed to public in order to enable jcr persistence + * Used by ORM systems. Changed to public in order to enable jcr persistence */ public void setResultParts(SortedMap resultParts) { this.resultParts = resultParts; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunDescriptor.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunDescriptor.java index 2fb8b6376..9aa0d447a 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunDescriptor.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunDescriptor.java @@ -16,10 +16,13 @@ package org.argeo.slc.test; +import java.io.Serializable; + import org.argeo.slc.deploy.DeployedSystem; import org.argeo.slc.process.SlcExecutionRelated; -public class TestRunDescriptor { +public class TestRunDescriptor implements Serializable { + private static final long serialVersionUID = -6488010128523489018L; private String testRunUuid; private String slcExecutionUuid; private String slcExecutionStepUuid;