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 6b47f015a02d2a26a78b2babdbd550659af2c1c9..fc0e6be9ba267b8879ff9baef3c5ab810fa7bd41 100644 (file)
--- 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 (file)
index 5f0588a..0000000
--- 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 041b74061ef0eb9cf19cd6550ffe85f32b7b3644..d0ccdf2da0c95ec7d6063ceede7b80b622909feb 100644 (file)
--- 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 (file)
index 5f22cdd..0000000
--- 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 ba1d129b4b9ea180528c38c93c094d7c31e0e254..bb199401fd251814dd411dfd8827a39e224aacd0 100644 (file)
--- 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 7fab40e5c2b01e5b2f35a47266e8916e336ea192..66096c83435d521434c443430302092b665cf175 100644 (file)
--- 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 @@
 \r
 package org.argeo.slc.core.structure.tree;\r
 \r
+import java.io.Serializable;\r
 import java.util.List;\r
 import java.util.StringTokenizer;\r
 import java.util.Vector;\r
@@ -27,7 +28,10 @@ import org.argeo.slc.structure.StructureRegistry;
 /**\r
  * Path for tree based <code>StructureRegistry</code> implementations.\r
  */\r
-public class TreeSPath implements StructurePath, Comparable<StructurePath> {\r
+public class TreeSPath implements StructurePath, Comparable<StructurePath>,\r
+               Serializable {\r
+       private static final long serialVersionUID = -110121029180848183L;\r
+\r
        /** Default character to use a separator: /. */\r
        private static Character DEFAULT_SEPARATOR = '/';\r
 \r

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 932b4d281c6f22358d807b34c29d00acdb8f3a0a..1afb145dae3752332e37e8c0bd722f6ea0b6937f 100644 (file)
--- 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 @@
 \r
 package org.argeo.slc.core.test;\r
 \r
+import java.io.Serializable;\r
+\r
 import org.argeo.slc.test.TestResultPart;\r
 import org.argeo.slc.test.TestRun;\r
 import org.argeo.slc.test.TestRunAware;\r
@@ -30,7 +32,8 @@ import org.argeo.slc.test.TestStatus;
  * @see TestStatus\r
  */\r
 public class SimpleResultPart implements TestResultPart, TestStatus,\r
-               TestRunAware {\r
+               TestRunAware, Serializable {\r
+       private static final long serialVersionUID = 6669675957685071901L;\r
 \r
        private Long tid;\r
 \r

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 ada006fe2e1beed605ebfd38fc878c7527221e7b..1b260bd2779d0bd8eea0f41869707d3ae9ecafbc 100644 (file)
--- 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 @@
 \r
 package org.argeo.slc.core.test.tree;\r
 \r
+import java.io.Serializable;\r
 import java.util.List;\r
 import java.util.Vector;\r
 \r
@@ -30,7 +31,8 @@ import org.argeo.slc.test.TestStatus;
  * \r
  * @see TreeTestResult\r
  */\r
-public class PartSubList {\r
+public class PartSubList implements Serializable {\r
+       private static final long serialVersionUID = -5308754827565759844L;\r
 \r
        /** For ORM */\r
        private Long tid;\r

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 40eb00f8cb262c1659c87bc25f2e99372d7445e8..eadfbef58a128ecc1f374d71744634c871b0cd9e 100644 (file)
--- 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<TreeSPath>,
 \r
        // Runtime Data\r
        private TreeSPath currentPath;\r
-       private TestRun currentTestRun;\r
+       private transient TestRun currentTestRun;\r
        private Boolean warnIfAlreadyClosed = true;\r
        private Boolean strictChecks = false;\r
        // TODO is it really necessary closeDate == null ?\r
        private Boolean isClosed = false;\r
 \r
-       private List<TestResultListener<TreeTestResult>> listeners = new Vector<TestResultListener<TreeTestResult>>();\r
+       private transient List<TestResultListener<TreeTestResult>> listeners = new Vector<TestResultListener<TreeTestResult>>();\r
 \r
        /** Sets the list of listeners. */\r
        public void setListeners(List<TestResultListener<TreeTestResult>> listeners) {\r
@@ -146,8 +146,7 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
        }\r
 \r
        /**\r
-        * Used by ORM systems. \r
-        * Changed to public in order to enable jcr persistence\r
+        * Used by ORM systems. Changed to public in order to enable jcr persistence\r
         */\r
        public void setResultParts(SortedMap<TreeSPath, PartSubList> resultParts) {\r
                this.resultParts = resultParts;\r

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 2fb8b6376572d0bd430d49898379ba3a94c8be4c..9aa0d447aa1de80fcfe18ca6a6f46f0df493dc14 100644 (file)
--- 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 @@
 \r
 package org.argeo.slc.test;\r
 \r
+import java.io.Serializable;\r
+\r
 import org.argeo.slc.deploy.DeployedSystem;\r
 import org.argeo.slc.process.SlcExecutionRelated;\r
 \r
-public class TestRunDescriptor {\r
+public class TestRunDescriptor implements Serializable {\r
+       private static final long serialVersionUID = -6488010128523489018L;\r
        private String testRunUuid;\r
        private String slcExecutionUuid;\r
        private String slcExecutionStepUuid;\r