merging in to milestones from trunk
git-svn-id: https://svn.apache.org/repos/asf/directory/shared/branches/milestones@1079425 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
index 2a59ea5..ce3f138 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
@@ -62,6 +62,8 @@
*/
static class MR extends MatchingRule
{
+ private static final long serialVersionUID = 1L;
+
protected MR( String oid )
{
super( oid );
@@ -83,6 +85,8 @@
}
static class S extends LdapSyntax
{
+ private static final long serialVersionUID = 1L;
+
public S( String oid, boolean humanReadible )
{
super( oid, "", humanReadible );
@@ -96,6 +100,8 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
matchingRule.setNormalizer( new Normalizer( "1.1.1" )
{
+ private static final long serialVersionUID = 1L;
+
public Value<?> normalize( Value<?> value ) throws LdapException
{
if ( value.isBinary() )
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
index 0144533..ef433b2 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
@@ -141,6 +141,8 @@
*/
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 );
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java
index a7c57b0..d5ff62b 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java
@@ -119,6 +119,8 @@
@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;
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java
index 73edefe..56e96d9 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java
@@ -84,6 +84,8 @@
@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;
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java
index 230ab8a..5bdc483 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java
@@ -74,6 +74,8 @@
@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
public class LdapSyntax extends AbstractSchemaObject
{
+ private static final long serialVersionUID = 1L;
+
/** the human readable flag */
protected boolean isHumanReadable = false;
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java
index c3510ab..c9af16d 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java
@@ -89,6 +89,8 @@
@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 );
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java
index c3fe874..d55dea2 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java
@@ -88,6 +88,8 @@
@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;
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java
index b5727eb..050e0c6 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java
@@ -98,6 +98,8 @@
@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;
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java
index 564381e..a648d40 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java
@@ -79,6 +79,8 @@
@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;
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
index 37b4ab1..f356345 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
@@ -33,7 +33,6 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-@SuppressWarnings("serial")
public class DnComparator extends LdapComparator<Object>
{
/** The serial version UID */
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java
index d41a9dd..db2a549 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java
@@ -32,6 +32,8 @@
*/
public class LdapComparatorDescription extends LoadableSchemaObject
{
+ private static final long serialVersionUID = 1L;
+
/**
* A constructor for a LdapComparatorDescription.
* @param oid The associated OID
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java
index 900b86e..6e891c9 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java
@@ -32,6 +32,8 @@
*/
public class NormalizerDescription extends LoadableSchemaObject
{
+ private static final long serialVersionUID = 1L;
+
/**
* Default constructor for a NormalizerDecription
* @param oid The SyntaxChecker OID
diff --git a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java
index 13477a5..6049d78 100644
--- a/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java
+++ b/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.ldap.model.schema.parsers;
@@ -32,6 +31,8 @@
*/
public class SyntaxCheckerDescription extends LoadableSchemaObject
{
+ private static final long serialVersionUID = 1L;
+
/**
* Default constructor for a SyntaxCheckerDecription
* @param oid The SyntaxChecker OID
diff --git a/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java b/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
index 86e4945..315c187 100644
--- a/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
@@ -88,6 +88,8 @@
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() )
diff --git a/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java b/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
index 98bead7..5c21733 100644
--- a/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
@@ -62,6 +62,8 @@
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 @@
*/
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 @@
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 )
diff --git a/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java b/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
index 1ece080..fa959a3 100644
--- a/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
@@ -444,6 +444,8 @@
@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 )
@@ -458,6 +460,8 @@
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 )
