Author: pamarcelot
Date: Thu Feb  3 17:41:46 2011
New Revision: 1066888

URL: http://svn.apache.org/viewvc?rev=1066888&view=rev
Log:
Added more information about the error in the LdapSchemaException.

Modified:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java?rev=1066888&r1=1066887&r2=1066888&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java Thu Feb  3 17:41:46 2011
@@ -227,6 +227,7 @@ public class AttributeType extends Abstr
                 LdapSchemaException ldapSchemaException = new LdapSchemaException(
                     LdapSchemaExceptionCodes.AT_NONEXISTENT_SUPERIOR, msg );
                 ldapSchemaException.setSourceObject( this );
+                ldapSchemaException.setRelatedId( superiorOid );
                 errors.add( ldapSchemaException );
                 LOG.info( msg );
 
@@ -313,6 +314,7 @@ public class AttributeType extends Abstr
                 LdapSchemaException ldapSchemaException = new LdapSchemaException(
                     LdapSchemaExceptionCodes.AT_NONEXISTENT_SUPERIOR, msg );
                 ldapSchemaException.setSourceObject( this );
+                ldapSchemaException.setRelatedId( superiorOid );
                 errors.add( ldapSchemaException );
                 LOG.info( msg );
 
@@ -349,6 +351,7 @@ public class AttributeType extends Abstr
                 LdapSchemaException ldapSchemaException = new LdapSchemaException(
                     LdapSchemaExceptionCodes.AT_NONEXISTENT_SYNTAX, msg );
                 ldapSchemaException.setSourceObject( this );
+                ldapSchemaException.setRelatedId( syntaxOid );
                 errors.add( ldapSchemaException );
                 LOG.info( msg );
                 return;
@@ -367,6 +370,7 @@ public class AttributeType extends Abstr
                 LdapSchemaException ldapSchemaException = new LdapSchemaException(
                     LdapSchemaExceptionCodes.AT_NONEXISTENT_SYNTAX, msg );
                 ldapSchemaException.setSourceObject( this );
+                ldapSchemaException.setRelatedId( syntaxOid );
                 errors.add( ldapSchemaException );
                 LOG.info( msg );
                 return;
@@ -417,6 +421,8 @@ public class AttributeType extends Abstr
 
                 LdapSchemaException ldapSchemaException = new LdapSchemaException(
                     LdapSchemaExceptionCodes.AT_NONEXISTENT_EQUALITY_MATCHING_RULE, msg );
+                ldapSchemaException.setSourceObject( this );
+                ldapSchemaException.setRelatedId( equalityOid );
                 errors.add( ldapSchemaException );
                 LOG.info( msg );
                 return;
@@ -434,6 +440,7 @@ public class AttributeType extends Abstr
                 LdapSchemaException ldapSchemaException = new LdapSchemaException(
                     LdapSchemaExceptionCodes.AT_NONEXISTENT_EQUALITY_MATCHING_RULE, msg );
                 ldapSchemaException.setSourceObject( this );
+                ldapSchemaException.setRelatedId( equalityOid );
                 errors.add( ldapSchemaException );
                 LOG.info( msg );
             }
@@ -471,6 +478,7 @@ public class AttributeType extends Abstr
                 LdapSchemaException ldapSchemaException = new LdapSchemaException(
                     LdapSchemaExceptionCodes.AT_NONEXISTENT_ORDERING_MATCHING_RULE, msg );
                 ldapSchemaException.setSourceObject( this );
+                ldapSchemaException.setRelatedId( orderingOid );
                 errors.add( ldapSchemaException );
                 LOG.info( msg );
                 return;
@@ -488,6 +496,7 @@ public class AttributeType extends Abstr
                 LdapSchemaException ldapSchemaException = new LdapSchemaException(
                     LdapSchemaExceptionCodes.AT_NONEXISTENT_ORDERING_MATCHING_RULE, msg );
                 ldapSchemaException.setSourceObject( this );
+                ldapSchemaException.setRelatedId( orderingOid );
                 errors.add( ldapSchemaException );
                 LOG.info( msg );
             }
@@ -526,6 +535,7 @@ public class AttributeType extends Abstr
                 LdapSchemaException ldapSchemaException = new LdapSchemaException(
                     LdapSchemaExceptionCodes.AT_NONEXISTENT_SUBSTRING_MATCHING_RULE, msg );
                 ldapSchemaException.setSourceObject( this );
+                ldapSchemaException.setRelatedId( substringOid );
                 errors.add( ldapSchemaException );
                 LOG.info( msg );
                 return;
@@ -543,6 +553,7 @@ public class AttributeType extends Abstr
                 LdapSchemaException ldapSchemaException = new LdapSchemaException(
                     LdapSchemaExceptionCodes.AT_NONEXISTENT_SUBSTRING_MATCHING_RULE, msg );
                 ldapSchemaException.setSourceObject( this );
+                ldapSchemaException.setRelatedId( substringOid );
                 errors.add( ldapSchemaException );
                 LOG.info( msg );
                 return;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java?rev=1066888&r1=1066887&r2=1066888&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java Thu Feb  3 17:41:46 2011
@@ -165,6 +165,7 @@ public class MatchingRule extends Abstra
                 LdapSchemaException ldapSchemaException = new LdapSchemaException(
                     LdapSchemaExceptionCodes.MR_NONEXISTENT_SYNTAX, msg );
                 ldapSchemaException.setSourceObject( this );
+                ldapSchemaException.setRelatedId( ldapSyntaxOid );
                 errors.add( ldapSchemaException );
                 LOG.info( msg );
             }