You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2005/07/05 22:23:05 UTC
svn commit: r209313 -
/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/
Author: jukka
Date: Tue Jul 5 13:23:03 2005
New Revision: 209313
URL: http://svn.apache.org/viewcvs?rev=209313&view=rev
Log:
JCR-159: Fixed serialization problems in the current value classes.
(Also removed some unneeded Javadoc tags.)
Modified:
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BinaryValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BooleanValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DateValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DoubleValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/InitialValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/LongValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/NameValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/PathValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/ReferenceValue.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValueAdapter.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StringValue.java
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BinaryValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BinaryValue.java?rev=209313&r1=209312&r2=209313&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BinaryValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BinaryValue.java Tue Jul 5 13:23:03 2005
@@ -22,6 +22,7 @@
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Calendar;
@@ -42,13 +43,13 @@
* {@link #writeObject(ObjectOutputStream)} methods to (de-)serialize the
* data.
*
- * @version $Revision$, $Date$
- * @author Jukka Zitting
* @since 0.16.4.1
- *
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class BinaryValue implements StatefulValue {
+public class BinaryValue implements Serializable, StatefulValue {
+
+ /** The serial version UID */
+ private static final long serialVersionUID = -2410070522924274051L;
/** The <code>InputStream</code> providing the value */
private InputStream stream;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BooleanValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BooleanValue.java?rev=209313&r1=209312&r2=209313&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BooleanValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/BooleanValue.java Tue Jul 5 13:23:03 2005
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.value;
+import java.io.Serializable;
+
import javax.jcr.PropertyType;
/**
@@ -23,13 +25,14 @@
* Boolean values as a part of the State design pattern (Gof) used by this
* package.
*
- * @version $Revision$, $Date$
- * @author Jukka Zitting
* @since 0.16.4.1
- *
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class BooleanValue extends BaseNonStreamValue implements StatefulValue {
+public class BooleanValue extends BaseNonStreamValue
+ implements Serializable, StatefulValue {
+
+ /** The serial version UID */
+ private static final long serialVersionUID = 8212168298890947089L;
/** The boolean value */
private final boolean value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DateValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DateValue.java?rev=209313&r1=209312&r2=209313&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DateValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DateValue.java Tue Jul 5 13:23:03 2005
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.value;
+import java.io.Serializable;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -35,13 +36,14 @@
* the era specification as defined in the JCR specification (+/- prefix) as
* well as full time zone naming are not supported.
*
- * @version $Revision$, $Date$
- * @author Jukka Zitting
* @since 0.16.4.1
- *
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class DateValue extends BaseNonStreamValue implements StatefulValue {
+public class DateValue extends BaseNonStreamValue
+ implements Serializable, StatefulValue {
+
+ /** The serial version UID */
+ private static final long serialVersionUID = 7158448867450810873L;
/** The <code>Calendar</code> value */
private final Calendar value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DoubleValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DoubleValue.java?rev=209313&r1=209312&r2=209313&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DoubleValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/DoubleValue.java Tue Jul 5 13:23:03 2005
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.value;
+import java.io.Serializable;
import java.util.Calendar;
import javax.jcr.PropertyType;
@@ -26,13 +27,14 @@
* Double values as a part of the State design pattern (Gof) used by this
* package.
*
- * @version $Revision$, $Date$
- * @author Jukka Zitting
* @since 0.16.4.1
- *
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class DoubleValue extends BaseNonStreamValue implements StatefulValue {
+public class DoubleValue extends BaseNonStreamValue
+ implements Serializable, StatefulValue {
+
+ /** The serial version UID */
+ private static final long serialVersionUID = 1008752925622023274L;
/** The double value */
private final double value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/InitialValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/InitialValue.java?rev=209313&r1=209312&r2=209313&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/InitialValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/InitialValue.java Tue Jul 5 13:23:03 2005
@@ -19,6 +19,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.Serializable;
import java.util.Calendar;
import javax.jcr.PropertyType;
@@ -39,7 +40,10 @@
*
* @see SerialValue
*/
-final class InitialValue implements StatefulValue {
+final class InitialValue implements Serializable, StatefulValue {
+
+ /** The serial version UID */
+ private static final long serialVersionUID = -3277781963593015976L;
/** The containing general value instance. */
private final SerialValue general;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/LongValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/LongValue.java?rev=209313&r1=209312&r2=209313&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/LongValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/LongValue.java Tue Jul 5 13:23:03 2005
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.value;
+import java.io.Serializable;
import java.util.Calendar;
import javax.jcr.PropertyType;
@@ -26,13 +27,14 @@
* Long values as a part of the State design pattern (Gof) used by this
* package.
*
- * @version $Revision$, $Date$
- * @author Jukka Zitting
* @since 0.16.4.1
- *
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class LongValue extends BaseNonStreamValue implements StatefulValue {
+public class LongValue extends BaseNonStreamValue
+ implements Serializable, StatefulValue {
+
+ /** The serial version UID */
+ private static final long serialVersionUID = 2115837525193497922L;
/** The long value */
private final long value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/NameValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/NameValue.java?rev=209313&r1=209312&r2=209313&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/NameValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/NameValue.java Tue Jul 5 13:23:03 2005
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.value;
+import java.io.Serializable;
+
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.ValueFormatException;
@@ -24,11 +26,14 @@
* The <code>NameValue</code> class implements the committed value state for
* Name values as a part of the State design pattern (Gof) used by this package.
*
- * @version $Revision$, $Date$
* @author Felix Meschberger
* @since 0.16.4.1
*/
-public class NameValue extends BaseNonStreamValue implements StatefulValue {
+public class NameValue extends BaseNonStreamValue
+ implements Serializable, StatefulValue {
+
+ /** The serial version UID */
+ private static final long serialVersionUID = -2165655071495230179L;
/** The name value. */
private final String value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/PathValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/PathValue.java?rev=209313&r1=209312&r2=209313&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/PathValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/PathValue.java Tue Jul 5 13:23:03 2005
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.value;
+import java.io.Serializable;
+
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.ValueFormatException;
@@ -24,11 +26,14 @@
* The <code>PathValue</code> class implements the committed value state for
* Path values as a part of the State design pattern (Gof) used by this package.
*
- * @version $Revision$, $Date$
* @author Felix Meschberger
* @since 0.16.4.1
*/
-public class PathValue extends BaseNonStreamValue implements StatefulValue {
+public class PathValue extends BaseNonStreamValue
+ implements Serializable, StatefulValue {
+
+ /** The serial version UID */
+ private static final long serialVersionUID = 961536566073928748L;
/** The path value. */
private final String value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/ReferenceValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/ReferenceValue.java?rev=209313&r1=209312&r2=209313&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/ReferenceValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/ReferenceValue.java Tue Jul 5 13:23:03 2005
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.value;
+import java.io.Serializable;
+
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.ValueFormatException;
@@ -25,12 +27,14 @@
* for Reference values as a part of the State design pattern (Gof) used by
* this package.
*
- * @version $Revision$, $Date$
* @author Felix Meschberger
* @since 0.16.4.1
*/
public class ReferenceValue extends BaseNonStreamValue
- implements StatefulValue {
+ implements Serializable, StatefulValue {
+
+ /** The serial version UID */
+ private static final long serialVersionUID = -3160494922729580458L;
/** The reference value */
private final String value;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValueAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValueAdapter.java?rev=209313&r1=209312&r2=209313&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValueAdapter.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StatefulValueAdapter.java Tue Jul 5 13:23:03 2005
@@ -20,6 +20,7 @@
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.io.Serializable;
import java.util.Calendar;
import javax.jcr.PropertyType;
@@ -40,13 +41,14 @@
* {@link #readObject(ObjectInputStream)} method is here just to guarantee
* symetric implementation.
*
- * @version $Revision$, $Date$
* @author Felix Meschberger
* @since 0.16.4.1
- *
* @see SerialValue
*/
-final class StatefulValueAdapter implements StatefulValue {
+final class StatefulValueAdapter implements Serializable, StatefulValue {
+
+ /** The serial version UID */
+ private static final long serialVersionUID = -8467636003279312276L;
/** The delegatee value. */
private Value delegatee;
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StringValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StringValue.java?rev=209313&r1=209312&r2=209313&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StringValue.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/value/StringValue.java Tue Jul 5 13:23:03 2005
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.value;
+import java.io.Serializable;
import java.util.Calendar;
import javax.jcr.PropertyType;
@@ -26,13 +27,14 @@
* String values as a part of the State design pattern (Gof) used by this
* package.
*
- * @version $Revision$, $Date$
- * @author Jukka Zitting
* @since 0.16.4.1
- *
* @see org.apache.jackrabbit.value.SerialValue
*/
-public class StringValue extends BaseNonStreamValue implements StatefulValue {
+public class StringValue extends BaseNonStreamValue
+ implements Serializable, StatefulValue {
+
+ /** The serial version UID */
+ private static final long serialVersionUID = -6456025645604163205L;
/** The string value */
private final String value;