directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1074175 - in /directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema: ./ comparators/
Date Thu, 24 Feb 2011 14:47:42 GMT
Author: elecharny
Date: Thu Feb 24 14:47:40 2011
New Revision: 1074175

URL: http://svn.apache.org/viewvc?rev=1074175&view=rev
Log:
o Updated the serialVersionUid from many classes

Modified:
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NormalizingComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java
Thu Feb 24 14:47:40 2011
@@ -20,6 +20,7 @@
 package org.apache.directory.shared.ldap.model.schema;
 
 
+import java.io.Serializable;
 import java.util.Comparator;
 
 
@@ -29,11 +30,10 @@ import java.util.Comparator;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class LdapComparator<T> extends LoadableSchemaObject implements Comparator<T>
+public abstract class LdapComparator<T> extends LoadableSchemaObject implements Comparator<T>,
Serializable
 {
-    /** The serialversionUID */
-    private static final long serialVersionUID = 1L;
-
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
 
     /**
      * Create a new instance of a Comparator

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java
Thu Feb 24 14:47:40 2011
@@ -36,8 +36,8 @@ import org.apache.directory.shared.util.
 @SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public abstract class LoadableSchemaObject extends AbstractSchemaObject
 {
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
 
     /** The Full Qualified Class Name */
     private String fqcn;

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
Thu Feb 24 14:47:40 2011
@@ -32,13 +32,12 @@ import org.slf4j.LoggerFactory;
  */
 public class BitStringComparator extends LdapComparator<String>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( BitStringComparator.class
);
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-
     /**
      * The BitStringComparator constructor. Its OID is the IntegerOrderingMatch matching
      * rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java
Thu Feb 24 14:47:40 2011
@@ -32,13 +32,12 @@ import org.slf4j.LoggerFactory;
  */
 public class BooleanComparator extends LdapComparator<String>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( BooleanComparator.class );
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-
     /**
      * The BooleanComparator constructor. Its OID is the BooleanMatch matching
      * rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java
Thu Feb 24 14:47:40 2011
@@ -33,12 +33,12 @@ import org.slf4j.LoggerFactory;
  */
 public class ByteArrayComparator extends LdapComparator<byte[]>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( ByteArrayComparator.class
);
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
     /**
      * The ByteArrayComparator constructor. Its OID is the OctetStringMatch matching
      * rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java
Thu Feb 24 14:47:40 2011
@@ -34,13 +34,12 @@ import org.slf4j.LoggerFactory;
  */
 public class ComparableComparator<T> extends LdapComparator<Comparable<T>>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( ComparableComparator.class
);
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-
     /**
      * The ComparableComparator constructor.
      *

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
Thu Feb 24 14:47:40 2011
@@ -39,12 +39,12 @@ import org.slf4j.LoggerFactory;
  */
 public class CsnComparator extends LdapComparator<Object>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( CsnComparator.class );
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
     /**
      * The CsnComparator constructor. Its OID is the CsnMatch matching
      * rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java
Thu Feb 24 14:47:40 2011
@@ -34,12 +34,12 @@ import org.slf4j.LoggerFactory;
  */
 public class CsnSidComparator extends LdapComparator<String>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( CsnSidComparator.class );
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
     /**
      * The CsnSidComparator constructor. Its OID is the CsnSidMatch matching
      * rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
Thu Feb 24 14:47:40 2011
@@ -31,9 +31,9 @@ import org.apache.directory.shared.ldap.
  */
 public class DeepTrimCachingNormalizingComparator extends NormalizingComparator
 {
-    private static final long serialVersionUID = -3462901701103045845L;
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
 
-    
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public DeepTrimCachingNormalizingComparator( String oid )
     {

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
Thu Feb 24 14:47:40 2011
@@ -31,9 +31,9 @@ import org.apache.directory.shared.ldap.
  */
 public class DeepTrimToLowerCachingNormalizingComparator extends NormalizingComparator
 {
-    private static final long serialVersionUID = -3462901701103045845L;
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
 
-    
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public DeepTrimToLowerCachingNormalizingComparator( String oid )
     {

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
Thu Feb 24 14:47:40 2011
@@ -36,8 +36,11 @@ import org.apache.directory.shared.ldap.
 @SuppressWarnings("serial")
 public class DnComparator extends LdapComparator<Object>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A reference to the schema manager */ 
-    private transient SchemaManager schemaManager;
+    private SchemaManager schemaManager;
     
     public DnComparator( String oid )
     {

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
Thu Feb 24 14:47:40 2011
@@ -38,13 +38,12 @@ import org.slf4j.LoggerFactory;
  */
 public class GeneralizedTimeComparator extends LdapComparator<String>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( GeneralizedTimeComparator.class
);
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-
     /**
      * The GeneralizedTimeComparator constructor. Its OID is the 
      * generalizedTimeOrderingMatch matching rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
Thu Feb 24 14:47:40 2011
@@ -21,6 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.math.BigInteger;
 
 import org.apache.directory.shared.i18n.I18n;
@@ -35,15 +36,14 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class IntegerComparator extends LdapComparator<Object>
+public class IntegerComparator extends LdapComparator<Object> implements Serializable
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( IntegerComparator.class );
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-
     /**
      * The IntegerComparator constructor. Its OID is the IntegerOrderingMatch matching
      * rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
Thu Feb 24 14:47:40 2011
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.model.schema.comparators;
 
 
+import java.io.Serializable;
+
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 
@@ -29,13 +31,10 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LongComparator extends LdapComparator<Long>
+public class LongComparator extends LdapComparator<Long> implements Serializable
 {
-    /**
-     * Version id for serialization.
-     */
-    static final long serialVersionUID = 1L;
-
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
 
     /**
      * The LongComparator constructor. Its OID is the IntegerOrderingMatch matching

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NormalizingComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NormalizingComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NormalizingComparator.java
Thu Feb 24 14:47:40 2011
@@ -35,12 +35,12 @@ import org.slf4j.LoggerFactory;
  */
 /* no qualifier*/class NormalizingComparator extends LdapComparator<String>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( NormalizingComparator.class
);
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
     /** the Normalizer to normalize values with before comparing */
     private Normalizer normalizer;
 

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
Thu Feb 24 14:47:40 2011
@@ -36,13 +36,12 @@ import org.slf4j.LoggerFactory;
  */
 public class NumericStringComparator extends LdapComparator<String>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( NumericStringComparator.class
);
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-
     /**
      * The IntegerComparator constructor. Its OID is the numericStringOrderingMatch matching
      * rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java
Thu Feb 24 14:47:40 2011
@@ -32,9 +32,9 @@ import org.apache.directory.shared.util.
  */
 public class ObjectClassTypeComparator<T> extends LdapComparator<T> 
 {
-    private static final long serialVersionUID = 1L;
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
 
-    
     public ObjectClassTypeComparator( String oid )
     {
         super( oid );

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java
Thu Feb 24 14:47:40 2011
@@ -32,13 +32,12 @@ import org.slf4j.LoggerFactory;
  */
 public class ObjectIdentifierComparator extends LdapComparator<Object>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( ObjectIdentifierComparator.class
);
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-
     /**
      * The ObjectIdentifierComparator constructor. Its OID is the ObjectIdentifierMatch matching
      * rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java
Thu Feb 24 14:47:40 2011
@@ -35,12 +35,12 @@ import org.slf4j.LoggerFactory;
  */
 public class ObjectIdentifierFirstComponentComparator extends LdapComparator<String>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( ObjectIdentifierFirstComponentComparator.class
);
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
     /**
      * The ObjectIdentifierFirstComponentComparator constructor. Its OID is the 
      * ObjectIdentifierFirstComponentMatch matching rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java
Thu Feb 24 14:47:40 2011
@@ -20,6 +20,7 @@
 package org.apache.directory.shared.ldap.model.schema.comparators;
 
 
+import java.io.Serializable;
 import java.util.Comparator;
 
 import org.apache.directory.shared.i18n.I18n;
@@ -35,9 +36,10 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SerializableComparator<E> extends LdapComparator<E>
+public class SerializableComparator<E> extends LdapComparator<E> implements Serializable
 {
-    private static final long serialVersionUID = 3257566226288162870L;
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
 
     /** the OID of the matchingRule for this comparator */
     private String matchingRuleOid;

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
Thu Feb 24 14:47:40 2011
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.model.schema.comparators;
 
 
+import java.io.Serializable;
+
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,14 +32,15 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class StringComparator extends LdapComparator<String>
+public class StringComparator extends LdapComparator<String> implements Serializable
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( StringComparator.class );
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
 
     /**
      * The StringComparator constructor. Its OID is the StringMatch matching

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java
Thu Feb 24 14:47:40 2011
@@ -35,12 +35,12 @@ import org.slf4j.LoggerFactory;
  */
 public class TelephoneNumberComparator extends LdapComparator<String>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( TelephoneNumberComparator.class
);
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
     /**
      * The TelephoneNumberComparator constructor. Its OID is the TelephoneNumberMatch matching
      * rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java
Thu Feb 24 14:47:40 2011
@@ -32,12 +32,12 @@ import org.slf4j.LoggerFactory;
  */
 public class UUIDComparator extends LdapComparator<String>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( UUIDComparator.class );
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
     /**
      * The UUIDComparator constructor. Its OID is the UUIDMatch matching
      * rule OID.

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java
Thu Feb 24 14:47:40 2011
@@ -37,12 +37,11 @@ import org.apache.directory.shared.ldap.
  */
 public class UniqueMemberComparator extends LdapComparator<String>
 {
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
 
     /** A reference to the schema manager */
-    private transient SchemaManager schemaManager;
-
+    private SchemaManager schemaManager;
 
     /**
      * The IntegerComparator constructor. Its OID is the IntegerOrderingMatch matching

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java?rev=1074175&r1=1074174&r2=1074175&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java
Thu Feb 24 14:47:40 2011
@@ -46,13 +46,12 @@ import org.slf4j.LoggerFactory;
  */
 public class WordComparator extends LdapComparator<String>
 {
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( WordComparator.class );
 
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-
     /**
      * The StringComparator constructor. Its OID is the StringMatch matching
      * rule OID.



Mime
View raw message