You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/02/10 06:24:13 UTC

svn commit: r1242680 - in /camel/branches/camel-2.9.x: ./ tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/ tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/ tests/camel-itest-osgi/src/test/java...

Author: hadrian
Date: Fri Feb 10 05:24:13 2012
New Revision: 1242680

URL: http://svn.apache.org/viewvc?rev=1242680&view=rev
Log:
Merged revisions 1240833 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1240833 | bvahdat | 2012-02-05 16:49:37 -0500 (Sun, 05 Feb 2012) | 1 line
  
  Added a couple of explicit serialVersionUID = 1L declarations by the Serializable classes.
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MySerialBean.java
    camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/MySerialBean.java
    camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/SimpleObject.java
    camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/PurchaseOrder.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MySerialBean.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MySerialBean.java?rev=1242680&r1=1242679&r2=1242680&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MySerialBean.java (original)
+++ camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MySerialBean.java Fri Feb 10 05:24:13 2012
@@ -23,6 +23,7 @@ import java.io.Serializable;
  */
 public class MySerialBean implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     private int id;
     private String name;
 

Modified: camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/MySerialBean.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/MySerialBean.java?rev=1242680&r1=1242679&r2=1242680&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/MySerialBean.java (original)
+++ camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/MySerialBean.java Fri Feb 10 05:24:13 2012
@@ -23,6 +23,7 @@ import java.io.Serializable;
  */
 public class MySerialBean implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     private int id;
     private String name;
 

Modified: camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/SimpleObject.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/SimpleObject.java?rev=1242680&r1=1242679&r2=1242680&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/SimpleObject.java (original)
+++ camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/SimpleObject.java Fri Feb 10 05:24:13 2012
@@ -20,8 +20,9 @@ import java.io.Serializable;
 
 public class SimpleObject implements Serializable {
 
-    Long id;
-    Object value;
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private Object value;
 
     public SimpleObject(Long id) {
         this.id = id;

Modified: camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/PurchaseOrder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/PurchaseOrder.java?rev=1242680&r1=1242679&r2=1242680&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/PurchaseOrder.java (original)
+++ camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/PurchaseOrder.java Fri Feb 10 05:24:13 2012
@@ -30,6 +30,7 @@ import org.apache.camel.util.ObjectHelpe
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class PurchaseOrder implements Serializable {
+    private static final long serialVersionUID = 1L;
     @XmlAttribute
     private String name;
     @XmlAttribute