Author: kayyagari
Date: Tue Jul 27 12:15:39 2010
New Revision: 979663
URL: http://svn.apache.org/viewvc?rev=979663&view=rev
Log:
o removed a duplicate value in the m-may list
o added a new error value and relevant message to log when a value to be added is already
present in the attribute
o updated the add() method
Modified:
directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=core/ou=objectclasses/m-oid=2.5.6.10.ldif
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java
Modified: directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java?rev=979663&r1=979662&r2=979663&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java (original)
+++ directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java Tue
Jul 27 12:15:39 2010
@@ -624,7 +624,8 @@ public enum I18n
ERR_04483_COLLECTIVE_NOT_MULTI_VALUED( "ERR_04483_COLLECTIVE_NOT_MULTI_VALUED" ),
ERR_04484_COLLECTIVE_NOT_ALLOWED_IN_MUST( "ERR_04484_COLLECTIVE_NOT_ALLOWED_IN_MUST"
),
ERR_04485_COLLECTIVE_NOT_ALLOWED_IN_MAY( "ERR_04485_COLLECTIVE_NOT_ALLOWED_IN_MAY" ),
-
+ ERR_04486_VALUE_ALREADY_EXISTS( "ERR_04486_VALUE_ALREADY_EXISTS" ),
+
// ldap-constants
ERR_05001( "ERR_05001" ),
Modified: directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties?rev=979663&r1=979662&r2=979663&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
(original)
+++ directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
Tue Jul 27 12:15:39 2010
@@ -608,6 +608,7 @@ ERR_04482_CANNOT_SUBTYPE_COLLECTIVE=The
ERR_04483_COLLECTIVE_NOT_MULTI_VALUED=The Collective Attribute ({0}) cannot be single valued
ERR_04484_COLLECTIVE_NOT_ALLOWED_IN_MUST=The Collective Attribute ({0}) cannot be added in
the MUST list of the {1} ObjectClass
ERR_04485_COLLECTIVE_NOT_ALLOWED_IN_MAY=The Collective Attribute ({0}) cannot be added in
the MAY list of the {1} ObjectClass
+ERR_04486_VALUE_ALREADY_EXISTS=The value ''{0}'' already exists in the attribute ({1})
# ldap-constants
ERR_05001=Unknown AuthenticationLevel {0}
Modified: directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=core/ou=objectclasses/m-oid=2.5.6.10.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dcore/ou%3Dobjectclasses/m-oid%3D2.5.6.10.ldif?rev=979663&r1=979662&r2=979663&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=core/ou=objectclasses/m-oid=2.5.6.10.ldif
(original)
+++ directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=core/ou=objectclasses/m-oid=2.5.6.10.ldif
Tue Jul 27 12:15:39 2010
@@ -15,7 +15,6 @@ m-may: teletexTerminalIdentifier
m-may: telephoneNumber
m-may: internationaliSDNNumber
m-may: facsimileTelephoneNumber
-m-may: preferredDeliveryMethod
m-may: street
m-may: postOfficeBox
m-may: postalCode
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java?rev=979663&r1=979662&r2=979663&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java
Tue Jul 27 12:15:39 2010
@@ -1131,7 +1131,7 @@ public class DefaultEntryAttribute imple
}
else
{
- LOG.error( I18n.err( I18n.ERR_04450, val ) );
+ LOG.error( I18n.err( I18n.ERR_04486_VALUE_ALREADY_EXISTS, val, upId
) );
}
}
}
@@ -1186,7 +1186,7 @@ public class DefaultEntryAttribute imple
}
else
{
- LOG.error( I18n.err( I18n.ERR_04450, val ) );
+ LOG.error( I18n.err( I18n.ERR_04486_VALUE_ALREADY_EXISTS, val, upId
) );
}
}
}
@@ -1295,7 +1295,7 @@ public class DefaultEntryAttribute imple
}
else
{
- LOG.error( I18n.err( I18n.ERR_04450, StringTools.dumpBytes( val ) ) );
+ LOG.error( I18n.err( I18n.ERR_04486_VALUE_ALREADY_EXISTS, StringTools.dumpBytes(
val ), upId ) );
}
}
}
|