directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [19/45] - in /directory/trunks/apacheds: ./ core-plugin/ core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ core-shared/ core-shared/src/...
Date Mon, 20 Feb 2006 03:58:21 GMT
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java Sun Feb 19 19:57:02 2006
@@ -65,7 +65,6 @@
 import org.apache.directory.shared.ldap.name.DnParser;
 import org.apache.directory.shared.ldap.name.LdapName;
 
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -96,7 +95,7 @@
     private DnParser parser;
     private Hashtable env;
 
-    static 
+    static
     {
         /*
          * These are the services that we will bypass while searching for referrals in
@@ -114,8 +113,8 @@
         c.add( "eventService" );
         SEARCH_BYPASS = Collections.unmodifiableCollection( c );
     }
-    
-    
+
+
     static boolean hasValue( Attribute attr, String value ) throws NamingException
     {
         if ( attr == null )
@@ -124,7 +123,7 @@
         }
         for ( int ii = 0; ii < attr.size(); ii++ )
         {
-            if ( ! ( attr.get( ii ) instanceof String ) )
+            if ( !( attr.get( ii ) instanceof String ) )
             {
                 continue;
             }
@@ -154,15 +153,15 @@
         }
         return false;
     }
-    
-    
+
+
     public void init( DirectoryServiceConfiguration dsConfig, InterceptorConfiguration cfg ) throws NamingException
     {
         nexus = dsConfig.getPartitionNexus();
         AttributeTypeRegistry atr = dsConfig.getGlobalRegistries().getAttributeTypeRegistry();
         parser = new DnParser( new ConcreteNameComponentNormalizer( atr ) );
         env = dsConfig.getEnvironment();
-        
+
         Iterator suffixes = nexus.listSuffixes( true );
         while ( suffixes.hasNext() )
         {
@@ -179,14 +178,14 @@
         for ( int ii = 0; ii < refs.size(); ii++ )
         {
             String val = ( String ) refs.get( ii );
-            
+
             // need to add non-ldap URLs as-is
-            if ( ! val.startsWith( "ldap" ) )
+            if ( !val.startsWith( "ldap" ) )
             {
                 list.add( val );
                 continue;
             }
-            
+
             // parse the ref value and normalize the DN according to schema 
             LdapURL ldapUrl = new LdapURL();
             try
@@ -195,9 +194,9 @@
             }
             catch ( LdapURLEncodingException e )
             {
-                log.error( "Bad URL ("+ val +") for ref in " + farthest + ".  Reference will be ignored." ); 
+                log.error( "Bad URL (" + val + ") for ref in " + farthest + ".  Reference will be ignored." );
             }
-            
+
             Name urlDn = parser.parse( ldapUrl.getDn().toString() );
             if ( urlDn.equals( farthest ) )
             {
@@ -210,18 +209,18 @@
                     buf.append( ":" );
                     buf.append( ldapUrl.getPort() );
                 }
-                
+
                 list.add( buf.toString() );
                 continue;
             }
-            
+
             /*
              * If we get here then the DN of the referral was not the same as the 
              * DN of the ref LDAP URL.  We must calculate the remaining (difference)
              * name past the farthest referral DN which the target name extends.
              */
             int diff = targetUpdn.size() - farthest.size();
-            Name extra = new LdapName(); 
+            Name extra = new LdapName();
             for ( int jj = 0; jj < diff; jj++ )
             {
                 extra.add( targetUpdn.get( farthest.size() + jj ) );
@@ -243,8 +242,8 @@
         LdapReferralException lre = new LdapReferralException( list );
         throw lre;
     }
-    
-    
+
+
     public void add( NextInterceptor next, String upName, Name normName, Attributes entry ) throws NamingException
     {
         Invocation invocation = InvocationStack.getInstance().peek();
@@ -255,7 +254,7 @@
         if ( refval == null || refval.equals( IGNORE ) )
         {
             next.add( upName, normName, entry );
-            if ( isReferral( entry ) ) 
+            if ( isReferral( entry ) )
             {
                 lut.referralAdded( normName );
             }
@@ -265,16 +264,16 @@
         if ( refval.equals( THROW ) )
         {
             Name farthest = lut.getFarthestReferralAncestor( normName );
-            if ( farthest == null ) 
+            if ( farthest == null )
             {
                 next.add( upName, normName, entry );
-                if ( isReferral( entry ) ) 
+                if ( isReferral( entry ) )
                 {
                     lut.referralAdded( normName );
                 }
                 return;
             }
-            
+
             Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
             Attribute refs = referral.get( REF_ATTR );
             doReferralException( farthest, new LdapName( upName ), refs );
@@ -285,18 +284,18 @@
         }
         else
         {
-            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL  + " key: " 
-                + refval, ResultCodeEnum.OTHER );
+            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL + " key: " + refval,
+                ResultCodeEnum.OTHER );
         }
     }
 
-    
+
     public boolean compare( NextInterceptor next, Name normName, String oid, Object value ) throws NamingException
     {
         Invocation invocation = InvocationStack.getInstance().peek();
         ServerLdapContext caller = ( ServerLdapContext ) invocation.getCaller();
         String refval = ( String ) caller.getEnvironment().get( Context.REFERRAL );
-        
+
         // handle a normal add without following referrals
         if ( refval == null || refval.equals( IGNORE ) )
         {
@@ -306,15 +305,15 @@
         if ( refval.equals( THROW ) )
         {
             Name farthest = lut.getFarthestReferralAncestor( normName );
-            if ( farthest == null ) 
+            if ( farthest == null )
             {
                 return next.compare( normName, oid, value );
             }
-            
+
             Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
             Attribute refs = referral.get( REF_ATTR );
             doReferralException( farthest, normName, refs );
-            
+
             // we really can't get here since doReferralException will throw an exception
             return false;
         }
@@ -324,13 +323,13 @@
         }
         else
         {
-            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL  + " key: " 
-                + refval, ResultCodeEnum.OTHER );
+            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL + " key: " + refval,
+                ResultCodeEnum.OTHER );
         }
     }
-    
-    
-    public void delete( NextInterceptor next, Name normName ) throws NamingException 
+
+
+    public void delete( NextInterceptor next, Name normName ) throws NamingException
     {
         Invocation invocation = InvocationStack.getInstance().peek();
         ServerLdapContext caller = ( ServerLdapContext ) invocation.getCaller();
@@ -340,26 +339,26 @@
         if ( refval == null || refval.equals( IGNORE ) )
         {
             next.delete( normName );
-            if ( lut.isReferral( normName ) ) 
+            if ( lut.isReferral( normName ) )
             {
                 lut.referralDeleted( normName );
             }
             return;
         }
-        
+
         if ( refval.equals( THROW ) )
         {
             Name farthest = lut.getFarthestReferralAncestor( normName );
-            if ( farthest == null ) 
+            if ( farthest == null )
             {
                 next.delete( normName );
-                if ( lut.isReferral( normName ) ) 
+                if ( lut.isReferral( normName ) )
                 {
                     lut.referralDeleted( normName );
                 }
                 return;
             }
-            
+
             Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
             Attribute refs = referral.get( REF_ATTR );
             doReferralException( farthest, normName, refs );
@@ -370,12 +369,12 @@
         }
         else
         {
-            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL  + " key: " 
-                + refval, ResultCodeEnum.OTHER );
+            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL + " key: " + refval,
+                ResultCodeEnum.OTHER );
         }
     }
-    
-    
+
+
     /* -----------------------------------------------------------------------
      * Special handling instructions for ModifyDn operations:
      * ======================================================
@@ -391,7 +390,6 @@
      * -----------------------------------------------------------------------
      */
 
-    
     public void move( NextInterceptor next, Name oldName, Name newParent ) throws NamingException
     {
         Invocation invocation = InvocationStack.getInstance().peek();
@@ -415,7 +413,7 @@
         {
             Name farthestSrc = lut.getFarthestReferralAncestor( oldName );
             Name farthestDst = lut.getFarthestReferralAncestor( newName ); // note will not return newName so safe
-            if ( farthestSrc == null && farthestDst == null && ! lut.isReferral(  newName ) ) 
+            if ( farthestSrc == null && farthestDst == null && !lut.isReferral( newName ) )
             {
                 next.move( oldName, newParent );
                 if ( lut.isReferral( oldName ) )
@@ -426,24 +424,25 @@
             }
             else if ( farthestSrc != null )
             {
-                Attributes referral = invocation.getProxy().lookup( farthestSrc, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+                Attributes referral = invocation.getProxy().lookup( farthestSrc,
+                    DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
                 Attribute refs = referral.get( REF_ATTR );
                 doReferralException( farthestSrc, oldName, refs );
             }
             else if ( farthestDst != null )
             {
-                throw new LdapNamingException( farthestDst + " ancestor is a referral for modifyDn on " + newName 
+                throw new LdapNamingException( farthestDst + " ancestor is a referral for modifyDn on " + newName
                     + " so it affects multiple DSAs", ResultCodeEnum.AFFECTSMULTIPLEDSAS );
             }
             else if ( lut.isReferral( newName ) )
             {
-                throw new LdapNamingException( newName 
-                    + " exists and is a referral for modifyDn destination so it affects multiple DSAs", 
+                throw new LdapNamingException( newName
+                    + " exists and is a referral for modifyDn destination so it affects multiple DSAs",
                     ResultCodeEnum.AFFECTSMULTIPLEDSAS );
             }
-            
-            throw new IllegalStateException( "If you get this exception the server's logic was flawed in handling a " +
-                    "modifyDn operation while processing referrals.  Report this as a bug!" );
+
+            throw new IllegalStateException( "If you get this exception the server's logic was flawed in handling a "
+                + "modifyDn operation while processing referrals.  Report this as a bug!" );
         }
         else if ( refval.equals( FOLLOW ) )
         {
@@ -451,13 +450,13 @@
         }
         else
         {
-            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL  + " key: " 
-                + refval, ResultCodeEnum.OTHER );
+            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL + " key: " + refval,
+                ResultCodeEnum.OTHER );
         }
     }
-    
-    
-    public void move( NextInterceptor next, Name oldName, Name newParent, String newRdn, boolean deleteOldRdn ) 
+
+
+    public void move( NextInterceptor next, Name oldName, Name newParent, String newRdn, boolean deleteOldRdn )
         throws NamingException
     {
         Invocation invocation = InvocationStack.getInstance().peek();
@@ -481,7 +480,7 @@
         {
             Name farthestSrc = lut.getFarthestReferralAncestor( oldName );
             Name farthestDst = lut.getFarthestReferralAncestor( newName ); // safe to use - does not return newName
-            if ( farthestSrc == null && farthestDst == null && ! lut.isReferral( newName ) ) 
+            if ( farthestSrc == null && farthestDst == null && !lut.isReferral( newName ) )
             {
                 next.move( oldName, newParent, newRdn, deleteOldRdn );
                 if ( lut.isReferral( oldName ) )
@@ -492,24 +491,25 @@
             }
             else if ( farthestSrc != null )
             {
-                Attributes referral = invocation.getProxy().lookup( farthestSrc, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+                Attributes referral = invocation.getProxy().lookup( farthestSrc,
+                    DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
                 Attribute refs = referral.get( REF_ATTR );
                 doReferralException( farthestSrc, oldName, refs );
             }
             else if ( farthestDst != null )
             {
-                throw new LdapNamingException( farthestDst + " ancestor is a referral for modifyDn on " + newName 
+                throw new LdapNamingException( farthestDst + " ancestor is a referral for modifyDn on " + newName
                     + " so it affects multiple DSAs", ResultCodeEnum.AFFECTSMULTIPLEDSAS );
             }
             else if ( lut.isReferral( newName ) )
             {
-                throw new LdapNamingException( newName 
-                    + " exists and is a referral for modifyDn destination so it affects multiple DSAs", 
+                throw new LdapNamingException( newName
+                    + " exists and is a referral for modifyDn destination so it affects multiple DSAs",
                     ResultCodeEnum.AFFECTSMULTIPLEDSAS );
             }
-            
-            throw new IllegalStateException( "If you get this exception the server's logic was flawed in handling a " +
-                    "modifyDn operation while processing referrals.  Report this as a bug!" );
+
+            throw new IllegalStateException( "If you get this exception the server's logic was flawed in handling a "
+                + "modifyDn operation while processing referrals.  Report this as a bug!" );
         }
         else if ( refval.equals( FOLLOW ) )
         {
@@ -517,13 +517,13 @@
         }
         else
         {
-            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL  + " key: " 
-                + refval, ResultCodeEnum.OTHER );
+            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL + " key: " + refval,
+                ResultCodeEnum.OTHER );
         }
     }
 
 
-    public void modifyRn( NextInterceptor next, Name oldName, String newRdn, boolean deleteOldRdn ) 
+    public void modifyRn( NextInterceptor next, Name oldName, String newRdn, boolean deleteOldRdn )
         throws NamingException
     {
         Invocation invocation = InvocationStack.getInstance().peek();
@@ -548,7 +548,7 @@
         {
             Name farthestSrc = lut.getFarthestReferralAncestor( oldName );
             Name farthestDst = lut.getFarthestReferralAncestor( newName );
-            if ( farthestSrc == null && farthestDst == null && ! lut.isReferral( newName ) ) 
+            if ( farthestSrc == null && farthestDst == null && !lut.isReferral( newName ) )
             {
                 next.modifyRn( oldName, newRdn, deleteOldRdn );
                 if ( lut.isReferral( oldName ) )
@@ -559,24 +559,25 @@
             }
             if ( farthestSrc != null )
             {
-                Attributes referral = invocation.getProxy().lookup( farthestSrc, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
+                Attributes referral = invocation.getProxy().lookup( farthestSrc,
+                    DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
                 Attribute refs = referral.get( REF_ATTR );
                 doReferralException( farthestSrc, oldName, refs );
             }
             else if ( farthestDst != null )
             {
-                throw new LdapNamingException( farthestDst + " ancestor is a referral for modifyDn on " + newName 
+                throw new LdapNamingException( farthestDst + " ancestor is a referral for modifyDn on " + newName
                     + " so it affects multiple DSAs", ResultCodeEnum.AFFECTSMULTIPLEDSAS );
             }
             else if ( lut.isReferral( newName ) )
             {
-                throw new LdapNamingException( newName 
-                    + " exists and is a referral for modifyDn destination so it affects multiple DSAs", 
+                throw new LdapNamingException( newName
+                    + " exists and is a referral for modifyDn destination so it affects multiple DSAs",
                     ResultCodeEnum.AFFECTSMULTIPLEDSAS );
             }
-            
-            throw new IllegalStateException( "If you get this exception the server's logic was flawed in handling a " +
-                    "modifyDn operation while processing referrals.  Report this as a bug!" );
+
+            throw new IllegalStateException( "If you get this exception the server's logic was flawed in handling a "
+                + "modifyDn operation while processing referrals.  Report this as a bug!" );
         }
         else if ( refval.equals( FOLLOW ) )
         {
@@ -584,11 +585,11 @@
         }
         else
         {
-            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL  + " key: " 
-                + refval, ResultCodeEnum.OTHER );
+            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL + " key: " + refval,
+                ResultCodeEnum.OTHER );
         }
     }
-    
+
 
     private void checkModify( Name name, int modOp, Attributes mods ) throws NamingException
     {
@@ -607,7 +608,7 @@
                  * if ADD op where refferal is added to objectClass of a
                  * non-referral entry then we add a new referral to lut
                  */
-                case( DirContext.ADD_ATTRIBUTE ):
+                case ( DirContext.ADD_ATTRIBUTE  ):
                     if ( modsOcHasReferral && !isTargetReferral )
                     {
                         lut.referralAdded( name );
@@ -617,7 +618,7 @@
                  * if REMOVE op where refferal is removed from objectClass of a
                  * referral entry then we remove the referral from lut
                  */
-                case( DirContext.REMOVE_ATTRIBUTE ):
+                case ( DirContext.REMOVE_ATTRIBUTE  ):
                     if ( modsOcHasReferral && isTargetReferral )
                     {
                         lut.referralDeleted( name );
@@ -631,12 +632,12 @@
                  * if REPLACE op on non-referral has new set of OC values with 
                  * referral value then we add the new referral to the lut
                  */
-                case( DirContext.REPLACE_ATTRIBUTE ):
-                    if ( isTargetReferral && ! modsOcHasReferral )
+                case ( DirContext.REPLACE_ATTRIBUTE  ):
+                    if ( isTargetReferral && !modsOcHasReferral )
                     {
                         lut.referralDeleted( name );
                     }
-                    else if ( ! isTargetReferral && modsOcHasReferral )
+                    else if ( !isTargetReferral && modsOcHasReferral )
                     {
                         lut.referralAdded( name );
                     }
@@ -646,8 +647,8 @@
             }
         }
     }
-    
-    
+
+
     public void modify( NextInterceptor next, Name name, int modOp, Attributes mods ) throws NamingException
     {
         Invocation invocation = InvocationStack.getInstance().peek();
@@ -665,13 +666,13 @@
         if ( refval.equals( THROW ) )
         {
             Name farthest = lut.getFarthestReferralAncestor( name );
-            if ( farthest == null ) 
+            if ( farthest == null )
             {
                 next.modify( name, modOp, mods );
                 checkModify( name, modOp, mods );
                 return;
             }
-            
+
             Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
             Attribute refs = referral.get( REF_ATTR );
             doReferralException( farthest, name, refs );
@@ -682,12 +683,12 @@
         }
         else
         {
-            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL  + " key: " 
-                + refval, ResultCodeEnum.OTHER );
+            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL + " key: " + refval,
+                ResultCodeEnum.OTHER );
         }
     }
-    
-    
+
+
     private void checkModify( Name name, ModificationItem[] mods ) throws NamingException
     {
         boolean isTargetReferral = lut.isReferral( name );
@@ -708,7 +709,7 @@
                      * if ADD op where refferal is added to objectClass of a
                      * non-referral entry then we add a new referral to lut
                      */
-                    case( DirContext.ADD_ATTRIBUTE ):
+                    case ( DirContext.ADD_ATTRIBUTE  ):
                         if ( modsOcHasReferral && !isTargetReferral )
                         {
                             lut.referralAdded( name );
@@ -718,7 +719,7 @@
                      * if REMOVE op where refferal is removed from objectClass of a
                      * referral entry then we remove the referral from lut
                      */
-                    case( DirContext.REMOVE_ATTRIBUTE ):
+                    case ( DirContext.REMOVE_ATTRIBUTE  ):
                         if ( modsOcHasReferral && isTargetReferral )
                         {
                             lut.referralDeleted( name );
@@ -732,12 +733,12 @@
                      * if REPLACE op on non-referral has new set of OC values with 
                      * referral value then we add the new referral to the lut
                      */
-                    case( DirContext.REPLACE_ATTRIBUTE ):
-                        if ( isTargetReferral && ! modsOcHasReferral )
+                    case ( DirContext.REPLACE_ATTRIBUTE  ):
+                        if ( isTargetReferral && !modsOcHasReferral )
                         {
                             lut.referralDeleted( name );
                         }
-                        else if ( ! isTargetReferral && modsOcHasReferral )
+                        else if ( !isTargetReferral && modsOcHasReferral )
                         {
                             lut.referralAdded( name );
                         }
@@ -750,8 +751,8 @@
             }
         }
     }
-    
-    
+
+
     public void modify( NextInterceptor next, Name name, ModificationItem[] mods ) throws NamingException
     {
         Invocation invocation = InvocationStack.getInstance().peek();
@@ -769,13 +770,13 @@
         if ( refval.equals( THROW ) )
         {
             Name farthest = lut.getFarthestReferralAncestor( name );
-            if ( farthest == null ) 
+            if ( farthest == null )
             {
                 next.modify( name, mods );
                 checkModify( name, mods );
                 return;
             }
-            
+
             Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
             Attribute refs = referral.get( REF_ATTR );
             doReferralException( farthest, name, refs );
@@ -786,18 +787,18 @@
         }
         else
         {
-            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL  + " key: " 
-                + refval, ResultCodeEnum.OTHER );
+            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL + " key: " + refval,
+                ResultCodeEnum.OTHER );
         }
     }
-    
-    
-    static ExprNode getReferralFilter() 
+
+
+    static ExprNode getReferralFilter()
     {
         return new SimpleNode( OBJCLASS_ATTR, REFERRAL_OC, LeafNode.EQUALITY );
     }
-    
-    
+
+
     static SearchControls getControls()
     {
         SearchControls controls = new SearchControls();
@@ -805,32 +806,34 @@
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         return controls;
     }
-    
-    
+
+
     public void addContextPartition( NextInterceptor next, DirectoryPartitionConfiguration cfg ) throws NamingException
     {
         next.addContextPartition( cfg );
-        
+
         // add referrals immediately after adding the new partition
         DirectoryPartition partition = cfg.getContextPartition();
         Name suffix = partition.getSuffix( true );
         Invocation invocation = InvocationStack.getInstance().peek();
-        NamingEnumeration list = invocation.getProxy().search( suffix, env, getReferralFilter(), getControls(), SEARCH_BYPASS );
+        NamingEnumeration list = invocation.getProxy().search( suffix, env, getReferralFilter(), getControls(),
+            SEARCH_BYPASS );
         addReferrals( list, suffix );
     }
-    
-    
+
+
     public void removeContextPartition( NextInterceptor next, Name suffix ) throws NamingException
     {
         // remove referrals immediately before removing the partition
         Invocation invocation = InvocationStack.getInstance().peek();
-        NamingEnumeration list = invocation.getProxy().search( suffix, env, getReferralFilter(), getControls(), SEARCH_BYPASS );
+        NamingEnumeration list = invocation.getProxy().search( suffix, env, getReferralFilter(), getControls(),
+            SEARCH_BYPASS );
         deleteReferrals( list, suffix );
-        
+
         next.removeContextPartition( suffix );
     }
-    
-    
+
+
     private void addReferrals( NamingEnumeration referrals, Name base ) throws NamingException
     {
         while ( referrals.hasMore() )
@@ -848,8 +851,8 @@
             }
         }
     }
-    
-    
+
+
     private void deleteReferrals( NamingEnumeration referrals, Name base ) throws NamingException
     {
         while ( referrals.hasMore() )
@@ -867,10 +870,10 @@
             }
         }
     }
-    
-    
-    public NamingEnumeration search( NextInterceptor next, Name base, Map env, ExprNode filter, 
-        SearchControls controls ) throws NamingException
+
+
+    public NamingEnumeration search( NextInterceptor next, Name base, Map env, ExprNode filter, SearchControls controls )
+        throws NamingException
     {
         Invocation invocation = InvocationStack.getInstance().peek();
         ServerLdapContext caller = ( ServerLdapContext ) invocation.getCaller();
@@ -895,13 +898,13 @@
                 Attribute refs = referral.get( REF_ATTR );
                 doReferralExceptionOnSearchBase( base, refs, controls.getSearchScope() );
             }
-            
+
             Name farthest = lut.getFarthestReferralAncestor( base );
-            if ( farthest == null ) 
+            if ( farthest == null )
             {
                 return next.search( base, env, filter, controls );
             }
-            
+
             Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
             Attribute refs = referral.get( REF_ATTR );
             doReferralExceptionOnSearchBase( farthest, base, refs, controls.getSearchScope() );
@@ -915,15 +918,15 @@
                 Attribute refs = referral.get( REF_ATTR );
                 doReferralExceptionOnSearchBase( base, refs, controls.getSearchScope() );
             }
-            
+
             Name farthest = lut.getFarthestReferralAncestor( base );
-            if ( farthest == null ) 
+            if ( farthest == null )
             {
-                SearchResultFilteringEnumeration srfe = ( SearchResultFilteringEnumeration ) 
-                    next.search( base, env, filter, controls );
+                SearchResultFilteringEnumeration srfe = ( SearchResultFilteringEnumeration ) next.search( base, env,
+                    filter, controls );
                 return new ReferralHandlingEnumeration( srfe, lut, parser, nexus, controls.getSearchScope(), true );
             }
-            
+
             Attributes referral = invocation.getProxy().lookup( farthest, DirectoryPartitionNexusProxy.LOOKUP_BYPASS );
             Attribute refs = referral.get( REF_ATTR );
             doReferralExceptionOnSearchBase( farthest, base, refs, controls.getSearchScope() );
@@ -935,20 +938,20 @@
         }
         else
         {
-            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL  + " key: " 
-                + refval, ResultCodeEnum.OTHER );
+            throw new LdapNamingException( "Undefined value for " + Context.REFERRAL + " key: " + refval,
+                ResultCodeEnum.OTHER );
         }
     }
 
-    
     class ReferralFilter implements SearchResultFilter//, SearchResultEnumerationAppender 
     {
-        public boolean accept( Invocation invocation, SearchResult result, SearchControls controls ) throws NamingException
+        public boolean accept( Invocation invocation, SearchResult result, SearchControls controls )
+            throws NamingException
         {
             return false;
         }
     }
-    
+
 
     public void doReferralExceptionOnSearchBase( Name base, Attribute refs, int scope ) throws NamingException
     {
@@ -957,14 +960,14 @@
         for ( int ii = 0; ii < refs.size(); ii++ )
         {
             String val = ( String ) refs.get( ii );
-            
+
             // need to add non-ldap URLs as-is
-            if ( ! val.startsWith( "ldap" ) )
+            if ( !val.startsWith( "ldap" ) )
             {
                 list.add( val );
                 continue;
             }
-            
+
             // parse the ref value and normalize the DN according to schema 
             LdapURL ldapUrl = new LdapURL();
             try
@@ -973,9 +976,9 @@
             }
             catch ( LdapURLEncodingException e )
             {
-                log.error( "Bad URL ("+ val +") for ref in " + base + ".  Reference will be ignored." ); 
+                log.error( "Bad URL (" + val + ") for ref in " + base + ".  Reference will be ignored." );
             }
-            
+
             StringBuffer buf = new StringBuffer();
             buf.append( ldapUrl.getScheme() );
             buf.append( ldapUrl.getHost() );
@@ -987,22 +990,22 @@
             buf.append( "/" );
             buf.append( ldapUrl.getDn() );
             buf.append( "??" );
-            
+
             switch ( scope )
             {
-                case( SearchControls.SUBTREE_SCOPE ):
+                case ( SearchControls.SUBTREE_SCOPE  ):
                     buf.append( "sub" );
                     break;
-                case( SearchControls.ONELEVEL_SCOPE ):
+                case ( SearchControls.ONELEVEL_SCOPE  ):
                     buf.append( "one" );
                     break;
-                case( SearchControls.OBJECT_SCOPE ):
+                case ( SearchControls.OBJECT_SCOPE  ):
                     buf.append( "base" );
                     break;
                 default:
                     throw new IllegalStateException( "Unknown recognized search scope: " + scope );
             }
-            
+
             list.add( buf.toString() );
         }
         LdapReferralException lre = new LdapReferralException( list );
@@ -1010,21 +1013,22 @@
     }
 
 
-    public void doReferralExceptionOnSearchBase( Name farthest, Name targetUpdn, Attribute refs, int scope ) throws NamingException
+    public void doReferralExceptionOnSearchBase( Name farthest, Name targetUpdn, Attribute refs, int scope )
+        throws NamingException
     {
         // handle referral here
         List list = new ArrayList( refs.size() );
         for ( int ii = 0; ii < refs.size(); ii++ )
         {
             String val = ( String ) refs.get( ii );
-            
+
             // need to add non-ldap URLs as-is
-            if ( ! val.startsWith( "ldap" ) )
+            if ( !val.startsWith( "ldap" ) )
             {
                 list.add( val );
                 continue;
             }
-            
+
             // parse the ref value and normalize the DN according to schema 
             LdapURL ldapUrl = new LdapURL();
             try
@@ -1033,12 +1037,12 @@
             }
             catch ( LdapURLEncodingException e )
             {
-                log.error( "Bad URL ("+ val +") for ref in " + farthest + ".  Reference will be ignored." ); 
+                log.error( "Bad URL (" + val + ") for ref in " + farthest + ".  Reference will be ignored." );
             }
-            
+
             Name urlDn = parser.parse( ldapUrl.getDn().toString() );
             int diff = targetUpdn.size() - farthest.size();
-            Name extra = new LdapName(); 
+            Name extra = new LdapName();
             for ( int jj = 0; jj < diff; jj++ )
             {
                 extra.add( targetUpdn.get( farthest.size() + jj ) );
@@ -1056,16 +1060,16 @@
             buf.append( "/" );
             buf.append( urlDn );
             buf.append( "??" );
-            
+
             switch ( scope )
             {
-                case( SearchControls.SUBTREE_SCOPE ):
+                case ( SearchControls.SUBTREE_SCOPE  ):
                     buf.append( "sub" );
                     break;
-                case( SearchControls.ONELEVEL_SCOPE ):
+                case ( SearchControls.ONELEVEL_SCOPE  ):
                     buf.append( "one" );
                     break;
-                case( SearchControls.OBJECT_SCOPE ):
+                case ( SearchControls.OBJECT_SCOPE  ):
                     buf.append( "base" );
                     break;
                 default:
@@ -1076,20 +1080,20 @@
         LdapReferralException lre = new LdapReferralException( list );
         throw lre;
     }
-    
-    
+
+
     public boolean isReferral( String name ) throws NamingException
     {
         if ( lut.isReferral( name ) )
         {
             return true;
         }
-        
+
         if ( lut.isReferral( parser.parse( name ) ) )
         {
             return true;
         }
-        
+
         return false;
     }
 }

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java Sun Feb 19 19:57:02 2006
@@ -37,7 +37,7 @@
      *
      * @param oid the unique OID for the SyntaxChecker.
      */
-    public AbstractSyntaxChecker( String oid )
+    public AbstractSyntaxChecker(String oid)
     {
         this.oid = oid;
     }

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java Sun Feb 19 19:57:02 2006
@@ -41,7 +41,8 @@
      * the registration operation is not supported
      */
     void register( String schema, AttributeType attributeType ) throws NamingException;
-    
+
+
     /**
      * Looks up an AttributeType by its unique Object Identifier or by its
      * unique name.
@@ -52,6 +53,7 @@
      */
     AttributeType lookup( String id ) throws NamingException;
 
+
     /**
      * Gets the name of the schema this schema object is associated with.
      *
@@ -61,6 +63,7 @@
      */
     String getSchemaName( String id ) throws NamingException;
 
+
     /**
      * Checks to see if an AttributeType exists.
      * 
@@ -69,6 +72,7 @@
      * otherwise
      */
     boolean hasAttributeType( String id );
+
 
     /**
      * Gets an Iterator over the AttributeTypes within this registry.

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitor.java Sun Feb 19 19:57:02 2006
@@ -35,6 +35,7 @@
      */
     void registered( AttributeType attributeType );
 
+
     /**
      * Monitors when a Comparator is successfully looked up.
      *
@@ -42,6 +43,7 @@
      */
     void lookedUp( AttributeType attributeType );
 
+
     /**
      * Monitors when a lookup attempt fails.
      *
@@ -49,6 +51,7 @@
      * @param fault the exception to be thrown for the fault
      */
     void lookupFailed( String oid, Throwable fault );
+
 
     /**
      * Monitors when a registration attempt fails.

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitor.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitorAdapter.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitorAdapter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitorAdapter.java Sun Feb 19 19:57:02 2006
@@ -29,11 +29,11 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class AttributeTypeRegistryMonitorAdapter
-    implements AttributeTypeRegistryMonitor
+public class AttributeTypeRegistryMonitorAdapter implements AttributeTypeRegistryMonitor
 {
-    private static final Logger log = LoggerFactory.getLogger(AttributeTypeRegistryMonitorAdapter.class );
-    
+    private static final Logger log = LoggerFactory.getLogger( AttributeTypeRegistryMonitorAdapter.class );
+
+
     public void registered( AttributeType attributeType )
     {
     }

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitorAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistryMonitorAdapter.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistry.java Sun Feb 19 19:57:02 2006
@@ -1,72 +1,75 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-package org.apache.directory.server.core.schema;
-
-
-import java.util.Comparator;
-
-import javax.naming.NamingException;
-
-
-/**
- * Comparator registry component's service interface.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public interface ComparatorRegistry
-{
-    /**
-     * Gets the name of the schema this schema object is associated with.
-     *
-     * @param oid the object identifier
-     * @return the schema name
-     * @throws NamingException if the schema object does not exist 
-     */
-    String getSchemaName( String oid ) throws NamingException;
-
-    /**
-     * Registers a Comparator with this registry.
-     * 
-     * @param schema the name of the schema the comparator is associated with
-     * @param oid the object identifier
-     * @param comparator the Comparator to register
-     * @throws NamingException if the Comparator is already registered or the 
-     *      registration operation is not supported
-     */
-    void register( String schema, String oid, Comparator comparator ) throws NamingException;
-    
-    /**
-     * Looks up a Comparator by its unique Object Identifier.
-     * 
-     * @param oid the object identifier
-     * @return the Comparator for the oid
-     * @throws NamingException if there is a backing store failure or the 
-     *      Comparator does not exist.
-     */
-    Comparator lookup( String oid ) throws NamingException;
-
-    /**
-     * Checks to see if a Comparator exists.  Backing store failures simply 
-     * return false.
-     * 
-     * @param oid the object identifier
-     * @return true if a Comparator definition exists for the oid, false 
-     *      otherwise
-     */
-    boolean hasComparator( String oid );
-}
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.directory.server.core.schema;
+
+
+import java.util.Comparator;
+
+import javax.naming.NamingException;
+
+
+/**
+ * Comparator registry component's service interface.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface ComparatorRegistry
+{
+    /**
+     * Gets the name of the schema this schema object is associated with.
+     *
+     * @param oid the object identifier
+     * @return the schema name
+     * @throws NamingException if the schema object does not exist 
+     */
+    String getSchemaName( String oid ) throws NamingException;
+
+
+    /**
+     * Registers a Comparator with this registry.
+     * 
+     * @param schema the name of the schema the comparator is associated with
+     * @param oid the object identifier
+     * @param comparator the Comparator to register
+     * @throws NamingException if the Comparator is already registered or the 
+     *      registration operation is not supported
+     */
+    void register( String schema, String oid, Comparator comparator ) throws NamingException;
+
+
+    /**
+     * Looks up a Comparator by its unique Object Identifier.
+     * 
+     * @param oid the object identifier
+     * @return the Comparator for the oid
+     * @throws NamingException if there is a backing store failure or the 
+     *      Comparator does not exist.
+     */
+    Comparator lookup( String oid ) throws NamingException;
+
+
+    /**
+     * Checks to see if a Comparator exists.  Backing store failures simply 
+     * return false.
+     * 
+     * @param oid the object identifier
+     * @return true if a Comparator definition exists for the oid, false 
+     *      otherwise
+     */
+    boolean hasComparator( String oid );
+}

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistry.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitor.java Sun Feb 19 19:57:02 2006
@@ -1,65 +1,68 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-package org.apache.directory.server.core.schema;
-
-
-import java.util.Comparator;
-
-import javax.naming.NamingException;
-
-
-/**
- * Monitor interface for a ComparatorRegistry.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public interface ComparatorRegistryMonitor
-{
-    /**
-     * Monitors when a Comparator is registered successfully.
-     * 
-     * @param oid OID key used for registration
-     * @param comparator the Comparator registered
-     */
-    void registered( String oid, Comparator comparator );
-
-    /**
-     * Monitors when a Comparator is successfully looked up.
-     * 
-     * @param oid OID key used for registration
-     * @param comparator the Comparator looked up
-     */
-    void lookedUp( String oid, Comparator comparator );
-
-    /**
-     * Monitors when a lookup attempt fails.
-     * 
-     * @param oid the OID for the Comparator to lookup
-     * @param fault the exception to be thrown for the fault
-     */
-    void lookupFailed( String oid, NamingException fault );
-    
-    /**
-     * Monitors when a registration attempt fails.
-     * 
-     * @param oid OID key used for registration
-     * @param comparator the Comparator which failed registration
-     * @param fault the exception to be thrown for the fault
-     */
-    void registerFailed( String oid, Comparator comparator, NamingException fault );
-}
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.directory.server.core.schema;
+
+
+import java.util.Comparator;
+
+import javax.naming.NamingException;
+
+
+/**
+ * Monitor interface for a ComparatorRegistry.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface ComparatorRegistryMonitor
+{
+    /**
+     * Monitors when a Comparator is registered successfully.
+     * 
+     * @param oid OID key used for registration
+     * @param comparator the Comparator registered
+     */
+    void registered( String oid, Comparator comparator );
+
+
+    /**
+     * Monitors when a Comparator is successfully looked up.
+     * 
+     * @param oid OID key used for registration
+     * @param comparator the Comparator looked up
+     */
+    void lookedUp( String oid, Comparator comparator );
+
+
+    /**
+     * Monitors when a lookup attempt fails.
+     * 
+     * @param oid the OID for the Comparator to lookup
+     * @param fault the exception to be thrown for the fault
+     */
+    void lookupFailed( String oid, NamingException fault );
+
+
+    /**
+     * Monitors when a registration attempt fails.
+     * 
+     * @param oid OID key used for registration
+     * @param comparator the Comparator which failed registration
+     * @param fault the exception to be thrown for the fault
+     */
+    void registerFailed( String oid, Comparator comparator, NamingException fault );
+}

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitor.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitorAdapter.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitorAdapter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitorAdapter.java Sun Feb 19 19:57:02 2006
@@ -1,81 +1,81 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-package org.apache.directory.server.core.schema;
-
-
-import java.util.Comparator;
-
-import javax.naming.NamingException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * An adapter for the ComparatorRegistry's monitor.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class ComparatorRegistryMonitorAdapter 
-    implements ComparatorRegistryMonitor
-{
-    private static final Logger log = LoggerFactory.getLogger( ComparatorRegistryMonitorAdapter.class );
-
-    /* (non-Javadoc)
-     * @see org.apache.directory.server.schema.ComparatorRegistryMonitor#registered(
-     * org.apache.eve.schema.Comparator)
-     */
-    public void registered( String oid, Comparator comparator )
-    {
-    }
-
-    
-    /* (non-Javadoc)
-     * @see org.apache.directory.server.schema.ComparatorRegistryMonitor#lookedUp(
-     * org.apache.eve.schema.Comparator)
-     */
-    public void lookedUp( String oid, Comparator comparator )
-    {
-    }
-
-    
-    /* (non-Javadoc)
-     * @see org.apache.directory.server.schema.ComparatorRegistryMonitor#lookupFailed(
-     * java.lang.String, javax.naming.NamingException)
-     */
-    public void lookupFailed( String oid, NamingException fault )
-    {
-        if ( fault != null )
-        {
-            log.warn( "Failed to look up the comparator registry: " + oid, fault );
-        }
-    }
-
-    
-    /* (non-Javadoc)
-     * @see org.apache.directory.server.schema.ComparatorRegistryMonitor#registerFailed(
-     * org.apache.eve.schema.Comparator, javax.naming.NamingException)
-     */
-    public void registerFailed( String oid, Comparator comparator, NamingException fault )
-    {
-        if ( fault != null )
-        {
-            log.warn( "Failed to register a comparator for oid '" + oid + "'.", fault );
-        }
-    }
-}
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.directory.server.core.schema;
+
+
+import java.util.Comparator;
+
+import javax.naming.NamingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * An adapter for the ComparatorRegistry's monitor.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class ComparatorRegistryMonitorAdapter implements ComparatorRegistryMonitor
+{
+    private static final Logger log = LoggerFactory.getLogger( ComparatorRegistryMonitorAdapter.class );
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.schema.ComparatorRegistryMonitor#registered(
+     * org.apache.eve.schema.Comparator)
+     */
+    public void registered( String oid, Comparator comparator )
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.schema.ComparatorRegistryMonitor#lookedUp(
+     * org.apache.eve.schema.Comparator)
+     */
+    public void lookedUp( String oid, Comparator comparator )
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.schema.ComparatorRegistryMonitor#lookupFailed(
+     * java.lang.String, javax.naming.NamingException)
+     */
+    public void lookupFailed( String oid, NamingException fault )
+    {
+        if ( fault != null )
+        {
+            log.warn( "Failed to look up the comparator registry: " + oid, fault );
+        }
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.schema.ComparatorRegistryMonitor#registerFailed(
+     * org.apache.eve.schema.Comparator, javax.naming.NamingException)
+     */
+    public void registerFailed( String oid, Comparator comparator, NamingException fault )
+    {
+        if ( fault != null )
+        {
+            log.warn( "Failed to register a comparator for oid '" + oid + "'.", fault );
+        }
+    }
+}

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitorAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistryMonitorAdapter.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ConcreteNameComponentNormalizer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ConcreteNameComponentNormalizer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ConcreteNameComponentNormalizer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ConcreteNameComponentNormalizer.java Sun Feb 19 19:57:02 2006
@@ -45,7 +45,7 @@
      *
      * @param registry the at registry used to dynamically resolve Normalizers
      */
-    public ConcreteNameComponentNormalizer( AttributeTypeRegistry registry )
+    public ConcreteNameComponentNormalizer(AttributeTypeRegistry registry)
     {
         this.registry = registry;
     }
@@ -59,6 +59,7 @@
         return lookup( name ).normalize( value ).toString();
     }
 
+
     /**
      * @see NameComponentNormalizer#normalizeByName(String, String)
      */
@@ -75,6 +76,7 @@
     {
         return lookup( oid ).normalize( value ).toString();
     }
+
 
     /**
      * @see NameComponentNormalizer#normalizeByOid(String, String)

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ConcreteNameComponentNormalizer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ConcreteNameComponentNormalizer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistry.java Sun Feb 19 19:57:02 2006
@@ -41,7 +41,8 @@
      * the registration operation is not supported
      */
     void register( String schema, DITContentRule dITContentRule ) throws NamingException;
-    
+
+
     /**
      * Looks up a DITContentRule by its object identifier or by its name.
      * 
@@ -51,6 +52,7 @@
      */
     DITContentRule lookup( String id ) throws NamingException;
 
+
     /**
      * Gets the name of the schema this schema object is associated with.
      *
@@ -60,6 +62,7 @@
      */
     String getSchemaName( String id ) throws NamingException;
 
+
     /**
      * Checks to see if a DITContentRule exists.
      * 
@@ -68,6 +71,7 @@
      * otherwise
      */
     boolean hasDITContentRule( String id );
+
 
     /**
      * Lists all the DITContentRules within this registry.

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistry.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitor.java Sun Feb 19 19:57:02 2006
@@ -35,6 +35,7 @@
      */
     void registered( DITContentRule dITContentRule );
 
+
     /**
      * Monitors when a Comparator is successfully looked up.
      *
@@ -42,6 +43,7 @@
      */
     void lookedUp( DITContentRule dITContentRule );
 
+
     /**
      * Monitors when a lookup attempt fails.
      *
@@ -49,6 +51,7 @@
      * @param fault the exception to be thrown for the fault
      */
     void lookupFailed( String oid, Throwable fault );
+
 
     /**
      * Monitors when a registration attempt fails.

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitor.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitorAdapter.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitorAdapter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitorAdapter.java Sun Feb 19 19:57:02 2006
@@ -29,10 +29,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DITContentRuleRegistryMonitorAdapter
-    implements DITContentRuleRegistryMonitor
+public class DITContentRuleRegistryMonitorAdapter implements DITContentRuleRegistryMonitor
 {
     private static final Logger log = LoggerFactory.getLogger( DITContentRuleRegistryMonitorAdapter.class );
+
 
     public void registered( DITContentRule dITContentRule )
     {

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitorAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistryMonitorAdapter.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistry.java Sun Feb 19 19:57:02 2006
@@ -41,7 +41,8 @@
      * or the registration operation is not supported
      */
     void register( String schema, DITStructureRule dITStructureRule ) throws NamingException;
-    
+
+
     /**
      * Looks up an dITStructureRule by its unique Object IDentifier or by its
      * name.
@@ -52,6 +53,7 @@
      */
     DITStructureRule lookup( String id ) throws NamingException;
 
+
     /**
      * Gets the name of the schema this schema object is associated with.
      *
@@ -61,6 +63,7 @@
      */
     String getSchemaName( String id ) throws NamingException;
 
+
     /**
      * Checks to see if an dITStructureRule exists.
      * 
@@ -69,6 +72,7 @@
      * otherwise
      */
     boolean hasDITStructureRule( String id );
+
 
     /**
      * Lists all the DITStructureRules within this registry.

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistry.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitor.java Sun Feb 19 19:57:02 2006
@@ -35,6 +35,7 @@
      */
     void registered( DITStructureRule dITStructureRule );
 
+
     /**
      * Monitors when a Comparator is successfully looked up.
      *
@@ -42,6 +43,7 @@
      */
     void lookedUp( DITStructureRule dITStructureRule );
 
+
     /**
      * Monitors when a lookup attempt fails.
      *
@@ -49,6 +51,7 @@
      * @param fault the exception to be thrown for the fault
      */
     void lookupFailed( String oid, Throwable fault );
+
 
     /**
      * Monitors when a registration attempt fails.

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitor.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitorAdapter.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitorAdapter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitorAdapter.java Sun Feb 19 19:57:02 2006
@@ -29,10 +29,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DITStructureRuleRegistryMonitorAdapter
-    implements DITStructureRuleRegistryMonitor
+public class DITStructureRuleRegistryMonitorAdapter implements DITStructureRuleRegistryMonitor
 {
     private static final Logger log = LoggerFactory.getLogger( DITStructureRuleRegistryMonitorAdapter.class );
+
 
     public void registered( DITStructureRule dITStructureRule )
     {

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitorAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistryMonitorAdapter.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalAttributeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalAttributeTypeRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalAttributeTypeRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalAttributeTypeRegistry.java Sun Feb 19 19:57:02 2006
@@ -52,7 +52,6 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates a GlobalAttributeTypeRegistry which accesses data stored within
      * the system partition and within the bootstrapping registry to service
@@ -60,7 +59,7 @@
      *
      * @param bootstrap the bootstrapping registry to delegate to
      */
-    public GlobalAttributeTypeRegistry( BootstrapAttributeTypeRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalAttributeTypeRegistry(BootstrapAttributeTypeRegistry bootstrap, OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -69,13 +68,13 @@
         this.oidRegistry = oidRegistry;
         if ( this.oidRegistry == null )
         {
-            throw new NullPointerException( "the OID registry cannot be null" ) ;
+            throw new NullPointerException( "the OID registry cannot be null" );
         }
 
         this.bootstrap = bootstrap;
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
@@ -95,14 +94,12 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, AttributeType attributeType ) throws NamingException
     {
-        if ( byOid.containsKey( attributeType.getOid() ) ||
-             bootstrap.hasAttributeType( attributeType.getOid() ) )
+        if ( byOid.containsKey( attributeType.getOid() ) || bootstrap.hasAttributeType( attributeType.getOid() ) )
         {
-            NamingException e = new NamingException( "attributeType w/ OID " +
-                attributeType.getOid() + " has already been registered!" );
+            NamingException e = new NamingException( "attributeType w/ OID " + attributeType.getOid()
+                + " has already been registered!" );
             monitor.registerFailed( attributeType, e );
             throw e;
         }
@@ -123,10 +120,9 @@
     {
         id = oidRegistry.getOid( id );
 
-        if ( ! ( byOid.containsKey( id ) || bootstrap.hasAttributeType( id ) ) )
+        if ( !( byOid.containsKey( id ) || bootstrap.hasAttributeType( id ) ) )
         {
-            NamingException e = new NamingException( "attributeType w/ OID "
-                + id + " not registered!" );
+            NamingException e = new NamingException( "attributeType w/ OID " + id + " not registered!" );
             monitor.lookupFailed( id, e );
             throw e;
         }
@@ -149,8 +145,7 @@
         {
             if ( oidRegistry.hasOid( id ) )
             {
-                return byOid.containsKey( oidRegistry.getOid( id ) ) ||
-                       bootstrap.hasAttributeType( id );
+                return byOid.containsKey( oidRegistry.getOid( id ) ) || bootstrap.hasAttributeType( id );
             }
         }
         catch ( NamingException e )
@@ -176,14 +171,13 @@
             return bootstrap.getSchemaName( id );
         }
 
-        throw new NamingException( "OID " + id + " not found in oid to " +
-            "schema name map!" );
+        throw new NamingException( "OID " + id + " not found in oid to " + "schema name map!" );
     }
 
 
     public Iterator list()
     {
         return new JoinIterator( new Iterator[]
-            { byOid.values().iterator(),bootstrap.list() } );
+            { byOid.values().iterator(), bootstrap.list() } );
     }
 }

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalAttributeTypeRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalAttributeTypeRegistry.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalComparatorRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalComparatorRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalComparatorRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalComparatorRegistry.java Sun Feb 19 19:57:02 2006
@@ -48,12 +48,11 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates a default ComparatorRegistry by initializing the map and the
      * montior.
      */
-    public GlobalComparatorRegistry( BootstrapComparatorRegistry bootstrap )
+    public GlobalComparatorRegistry(BootstrapComparatorRegistry bootstrap)
     {
         this.oidToSchema = new HashMap();
         this.comparators = new HashMap();
@@ -65,7 +64,7 @@
         this.bootstrap = bootstrap;
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
@@ -85,14 +84,11 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
-    public void register( String schema, String oid, Comparator comparator )
-            throws NamingException
+    public void register( String schema, String oid, Comparator comparator ) throws NamingException
     {
         if ( comparators.containsKey( oid ) || bootstrap.hasComparator( oid ) )
         {
-            NamingException e = new NamingException( "Comparator with OID "
-                + oid + " already registered!" );
+            NamingException e = new NamingException( "Comparator with OID " + oid + " already registered!" );
             monitor.registerFailed( oid, comparator, e );
             throw e;
         }
@@ -136,11 +132,11 @@
 
     public String getSchemaName( String oid ) throws NamingException
     {
-        if ( ! Character.isDigit( oid.charAt( 0 ) ) )
+        if ( !Character.isDigit( oid.charAt( 0 ) ) )
         {
             throw new NamingException( "OID " + oid + " is not a numeric OID" );
         }
-        
+
         if ( oidToSchema.containsKey( oid ) )
         {
             return ( String ) oidToSchema.get( oid );
@@ -151,7 +147,6 @@
             return bootstrap.getSchemaName( oid );
         }
 
-        throw new NamingException( "OID " + oid + " not found in oid to " +
-            "schema name map!" );
+        throw new NamingException( "OID " + oid + " not found in oid to " + "schema name map!" );
     }
 }

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalComparatorRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalComparatorRegistry.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalDitContentRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalDitContentRuleRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalDitContentRuleRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalDitContentRuleRegistry.java Sun Feb 19 19:57:02 2006
@@ -52,11 +52,10 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates an empty BootstrapDitContentRuleRegistry.
      */
-    public GlobalDitContentRuleRegistry( BootstrapDitContentRuleRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalDitContentRuleRegistry(BootstrapDitContentRuleRegistry bootstrap, OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -66,7 +65,7 @@
         this.bootstrap = bootstrap;
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
@@ -86,19 +85,17 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, DITContentRule dITContentRule ) throws NamingException
     {
-        if ( byOid.containsKey( dITContentRule.getOid() ) ||
-             bootstrap.hasDITContentRule( dITContentRule.getOid() ) )
+        if ( byOid.containsKey( dITContentRule.getOid() ) || bootstrap.hasDITContentRule( dITContentRule.getOid() ) )
         {
-            NamingException e = new NamingException( "dITContentRule w/ OID " +
-                dITContentRule.getOid() + " has already been registered!" );
+            NamingException e = new NamingException( "dITContentRule w/ OID " + dITContentRule.getOid()
+                + " has already been registered!" );
             monitor.registerFailed( dITContentRule, e );
             throw e;
         }
 
-        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() ) ;
+        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() );
         byOid.put( dITContentRule.getOid(), dITContentRule );
         oidToSchema.put( dITContentRule.getOid(), schema );
         monitor.registered( dITContentRule );
@@ -123,8 +120,7 @@
             return dITContentRule;
         }
 
-        NamingException e = new NamingException( "dITContentRule w/ OID "
-            + id + " not registered!" );
+        NamingException e = new NamingException( "dITContentRule w/ OID " + id + " not registered!" );
         monitor.lookupFailed( id, e );
         throw e;
     }
@@ -136,8 +132,7 @@
         {
             try
             {
-                return byOid.containsKey( oidRegistry.getOid( id ) ) ||
-                       bootstrap.hasDITContentRule( id );
+                return byOid.containsKey( oidRegistry.getOid( id ) ) || bootstrap.hasDITContentRule( id );
             }
             catch ( NamingException e )
             {
@@ -163,14 +158,13 @@
             return bootstrap.getSchemaName( id );
         }
 
-        throw new NamingException( "OID " + id + " not found in oid to " +
-            "schema name map!" );
+        throw new NamingException( "OID " + id + " not found in oid to " + "schema name map!" );
     }
 
 
     public Iterator list()
     {
         return new JoinIterator( new Iterator[]
-            { byOid.values().iterator(),bootstrap.list() } );
+            { byOid.values().iterator(), bootstrap.list() } );
     }
 }

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalDitContentRuleRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalDitContentRuleRegistry.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id



Mime
View raw message