directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1078980 - in /directory/shared/branches/milestones/ldap/model/src: main/java/org/apache/directory/shared/ldap/model/entry/ main/java/org/apache/directory/shared/ldap/model/schema/ main/java/org/apache/directory/shared/ldap/model/schema/com...
Date Mon, 07 Mar 2011 22:16:22 GMT
Author: akarasulu
Date: Mon Mar  7 22:16:21 2011
New Revision: 1078980

URL: http://svn.apache.org/viewvc?rev=1078980&view=rev
Log:
Some serializable objects have had their versiono ids inadvertantly removed.

Modified:
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java
    directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java
    directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
    directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
    directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
Mon Mar  7 22:16:21 2011
@@ -62,6 +62,8 @@ public class EntryUtils
      */
     static class MR extends MatchingRule
     {
+        private static final long serialVersionUID = 1L;
+
         protected MR( String oid )
         {
             super( oid );
@@ -83,6 +85,8 @@ public class EntryUtils
     }
     static class S extends LdapSyntax
     {
+        private static final long serialVersionUID = 1L;
+
         public S( String oid, boolean humanReadible )
         {
             super( oid, "", humanReadible );
@@ -96,6 +100,8 @@ public class EntryUtils
 
         syntax.setSyntaxChecker( new SyntaxChecker( "1.1.2.1" )
         {
+            private static final long serialVersionUID = 1L;
+
             public boolean isValidSyntax( Object value )
             {
                 if ( !( value instanceof String ) )
@@ -122,6 +128,8 @@ public class EntryUtils
 
         matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid()
)
         {
+            private static final long serialVersionUID = 1L;
+
             public int compare( String o1, String o2 )
             {
                 return ( o1 == null ? 
@@ -132,6 +140,9 @@ public class EntryUtils
         
         Normalizer normalizer = new Normalizer( "1.1.1" )
         {
+            private static final long serialVersionUID = 1L;
+
+
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
                 if ( !value.isBinary() )
@@ -166,6 +177,8 @@ public class EntryUtils
 
         syntax.setSyntaxChecker( new SyntaxChecker( "1.1.2" )
         {
+            private static final long serialVersionUID = 1L;
+
             public boolean isValidSyntax( Object value )
             {
                 return ((String)value == null) || (((String)value).length() < 7) ;
@@ -178,6 +191,8 @@ public class EntryUtils
 
         matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid()
)
         {
+            private static final long serialVersionUID = 1L;
+
             public int compare( String o1, String o2 )
             {
                 return ( ( o1 == null ) ? 
@@ -202,6 +217,8 @@ public class EntryUtils
 
         syntax.setSyntaxChecker( new SyntaxChecker( "1.2.1" )
         {
+            private static final long serialVersionUID = 1L;
+
             public boolean isValidSyntax( Object value )
             {
                 return ( value == null ) || ( ((byte[])value).length < 5 );
@@ -215,6 +232,8 @@ public class EntryUtils
         
         matchingRule.setNormalizer( new Normalizer( "1.1.1" )
         {
+            private static final long serialVersionUID = 1L;
+
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
                 if ( value.isBinary() )

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
Mon Mar  7 22:16:21 2011
@@ -141,6 +141,8 @@ import org.slf4j.LoggerFactory;
  */
 public class AttributeType extends AbstractSchemaObject implements Cloneable
 {
+    private static final long serialVersionUID = 1L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( AttributeType.class );
 

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java
Mon Mar  7 22:16:21 2011
@@ -119,6 +119,8 @@ import org.apache.directory.shared.ldap.
 @SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class DITContentRule extends AbstractSchemaObject
 {
+    private static final long serialVersionUID = 1L;
+
     /** The list of Auxiliary ObjectClass OIDs entries may belong to */
     private List<String> auxObjectClassOids;
 

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java
Mon Mar  7 22:16:21 2011
@@ -84,6 +84,8 @@ import org.apache.directory.shared.util.
 @SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class DITStructureRule extends AbstractSchemaObject
 {
+    private static final long serialVersionUID = 1L;
+
     /** The rule ID. A DSR does not have an OID */
     private int ruleId;
 

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java
Mon Mar  7 22:16:21 2011
@@ -74,6 +74,8 @@ import org.apache.directory.shared.ldap.
 @SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class LdapSyntax extends AbstractSchemaObject
 {
+    private static final long serialVersionUID = 1L;
+
     /** the human readable flag */
     protected boolean isHumanReadable = false;
 

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java
Mon Mar  7 22:16:21 2011
@@ -89,6 +89,8 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class MatchingRule extends AbstractSchemaObject
 {
+    private static final long serialVersionUID = 1L;
+
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( MatchingRule.class );
 

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java
Mon Mar  7 22:16:21 2011
@@ -88,6 +88,8 @@ import org.apache.directory.shared.ldap.
 @SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class MatchingRuleUse extends AbstractSchemaObject
 {
+    private static final long serialVersionUID = 1L;
+
     /** The list of attributes types OID the matching rule applies to */
     private List<String> applicableAttributeOids;
 

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java
Mon Mar  7 22:16:21 2011
@@ -98,6 +98,8 @@ import org.apache.directory.shared.ldap.
 @SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class NameForm extends AbstractSchemaObject
 {
+    private static final long serialVersionUID = 1L;
+
     /** The structural object class OID this rule applies to */
     private String structuralObjectClassOid;
 

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java
Mon Mar  7 22:16:21 2011
@@ -79,6 +79,8 @@ import org.apache.directory.shared.ldap.
 @SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class ObjectClass extends AbstractSchemaObject
 {
+    private static final long serialVersionUID = 1L;
+
     /** The ObjectClass type : ABSTRACT, AUXILIARY or STRUCTURAL */
     private ObjectClassTypeEnum objectClassType = ObjectClassTypeEnum.STRUCTURAL;
 

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
Mon Mar  7 22:16:21 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@SuppressWarnings("serial")
 public class DnComparator extends LdapComparator<Object>
 {
     /** The serial version UID */

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java
Mon Mar  7 22:16:21 2011
@@ -32,6 +32,8 @@ import org.apache.directory.shared.ldap.
  */
 public class LdapComparatorDescription extends LoadableSchemaObject
 {
+    private static final long serialVersionUID = 1L;
+
     /**
      * A constructor for a LdapComparatorDescription.
      * @param oid The associated OID

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java
Mon Mar  7 22:16:21 2011
@@ -32,6 +32,8 @@ import org.apache.directory.shared.ldap.
  */
 public class NormalizerDescription extends LoadableSchemaObject
 {
+    private static final long serialVersionUID = 1L;
+
     /**
      * Default constructor for a NormalizerDecription
      * @param oid The SyntaxChecker OID

Modified: directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java
Mon Mar  7 22:16:21 2011
@@ -17,7 +17,6 @@
  *  under the License. 
  *  
  */
-
 package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
@@ -32,6 +31,8 @@ import org.apache.directory.shared.ldap.
  */
 public class SyntaxCheckerDescription extends LoadableSchemaObject
 {
+    private static final long serialVersionUID = 1L;
+
     /**
      * Default constructor for a SyntaxCheckerDecription
      * @param oid The SyntaxChecker OID

Modified: directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
Mon Mar  7 22:16:21 2011
@@ -88,6 +88,8 @@ public class BinaryValueAttributeTypeTes
         mr.setLdapComparator( new ByteArrayComparator( "1.1.1" ) );
         mr.setNormalizer( new Normalizer( "1.1.1" )
         {
+            private static final long serialVersionUID = 1L;
+
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
                 if ( value.isBinary() )

Modified: directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
Mon Mar  7 22:16:21 2011
@@ -62,6 +62,8 @@ public class BinaryValueTest
     
     private static final Normalizer BINARY_NORMALIZER = new Normalizer( "1.1.1" )
     {
+        private static final long serialVersionUID = 1L;
+
         public Value<?> normalize( Value<?> value ) throws LdapException
         {
             if ( value.isBinary() )
@@ -94,6 +96,8 @@ public class BinaryValueTest
      */
     private static final Normalizer BINARY_NORMALIZER_EMPTY = new Normalizer( "1.1.1" )
     {
+        private static final long serialVersionUID = 1L;
+
         public Value<?> normalize( Value<?> value ) throws LdapException
         {
             if ( value.isBinary() )
@@ -113,6 +117,8 @@ public class BinaryValueTest
     
     private static final SyntaxChecker BINARY_CHECKER = new SyntaxChecker( "1.1.1" )
     {
+        private static final long serialVersionUID = 1L;
+
         public boolean isValidSyntax( Object value )
         {
             if ( value == null )

Modified: directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java?rev=1078980&r1=1078979&r2=1078980&view=diff
==============================================================================
--- directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
(original)
+++ directory/shared/branches/milestones/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
Mon Mar  7 22:16:21 2011
@@ -445,6 +445,8 @@ public class StringValueAttributeTypeTes
     @Test public void testConstrainedString()
     {
         s.setSyntaxChecker( new SyntaxChecker( "1.1.1.1" ) {
+            private static final long serialVersionUID = 1L;
+
             public boolean isValidSyntax( Object value )
             {
                 if ( value instanceof String )
@@ -459,6 +461,8 @@ public class StringValueAttributeTypeTes
         mr.setSyntax( s );
         mr.setLdapComparator( new LdapComparator<String>( mr.getOid() )
         {
+            private static final long serialVersionUID = 1L;
+
             public int compare( String o1, String o2 )
             {
                 if ( o1 == null )



Mime
View raw message