directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1086154 - in /directory: apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/ apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ shared/trunk/integ/src/test/java/org/apache/directory/...
Date Mon, 28 Mar 2011 08:28:55 GMT
Author: elecharny
Date: Mon Mar 28 08:28:55 2011
New Revision: 1086154

URL: http://svn.apache.org/viewvc?rev=1086154&view=rev
Log:
Renamed the applySchemaManager method

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
    directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/MultiThreadedTest.java
    directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/SchemaAwareRdnTest.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=1086154&r1=1086153&r2=1086154&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
Mon Mar 28 08:28:55 2011
@@ -167,7 +167,7 @@ public class NormalizationInterceptor ex
             renameContext.getDn().applySchemaManager( schemaManager );
         }
 
-        renameContext.getNewRdn().applySchemaManager( schemaManager );
+        renameContext.getNewRdn().apply( schemaManager );
 
         if ( !renameContext.getNewDn().isSchemaAware() )
         {
@@ -206,7 +206,7 @@ public class NormalizationInterceptor ex
 
         if ( !moveContext.getRdn().isSchemaAware() )
         {
-            moveContext.getRdn().applySchemaManager( schemaManager );
+            moveContext.getRdn().apply( schemaManager );
         }
 
         nextInterceptor.move( moveContext );
@@ -222,7 +222,7 @@ public class NormalizationInterceptor ex
 
         if ( !moveAndRenameContext.getNewRdn().isSchemaAware() )
         {
-            moveAndRenameContext.getNewRdn().applySchemaManager( schemaManager );
+            moveAndRenameContext.getNewRdn().apply( schemaManager );
         }
 
         if ( !moveAndRenameContext.getDn().isSchemaAware() )

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1086154&r1=1086153&r2=1086154&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
Mon Mar 28 08:28:55 2011
@@ -1179,7 +1179,7 @@ public abstract class AbstractStore<E, I
 
         Dn updn = entry.getDn();
 
-        newRdn.applySchemaManager( schemaManager );
+        newRdn.apply( schemaManager );
 
         /*
          * H A N D L E   N E W   R D N

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/MultiThreadedTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/MultiThreadedTest.java?rev=1086154&r1=1086153&r2=1086154&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/MultiThreadedTest.java
(original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/MultiThreadedTest.java
Mon Mar 28 08:28:55 2011
@@ -67,9 +67,9 @@ public class MultiThreadedTest
         sharedDn.applySchemaManager( schemaManager );
 
         referenceRdn = new Rdn( "ou=system" );
-        referenceRdn.applySchemaManager( schemaManager );
+        referenceRdn.apply( schemaManager );
         sharedRdn = new Rdn( "ou=system" );
-        sharedRdn.applySchemaManager( schemaManager );
+        sharedRdn.apply( schemaManager );
 
         referenceAva = new Ava( schemaManager, "ou", "System" );
         sharedAva = new Ava( schemaManager, "ou", "System" );
@@ -81,7 +81,7 @@ public class MultiThreadedTest
     {
         sharedAva.normalize();
 
-        sharedRdn.applySchemaManager( schemaManager );
+        sharedRdn.apply( schemaManager );
         assertTrue( sharedRdn.isSchemaAware() );
 
         sharedDn.applySchemaManager( schemaManager );
@@ -94,7 +94,7 @@ public class MultiThreadedTest
     {
         assertEquals( referenceAva.hashCode(), sharedAva.hashCode() );
 
-        sharedRdn.applySchemaManager( schemaManager );
+        sharedRdn.apply( schemaManager );
         assertEquals( referenceRdn.hashCode(), sharedRdn.hashCode() );
 
         sharedDn.applySchemaManager( schemaManager );
@@ -109,7 +109,7 @@ public class MultiThreadedTest
         assertTrue( referenceAva.equals( sharedAva ) );
         assertTrue( sharedAva.equals( referenceAva ) );
 
-        sharedRdn.applySchemaManager( schemaManager );
+        sharedRdn.apply( schemaManager );
         assertEquals( referenceRdn, sharedRdn );
         assertTrue( referenceRdn.equals( sharedRdn ) );
         assertTrue( sharedRdn.equals( referenceRdn ) );

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/SchemaAwareRdnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/SchemaAwareRdnTest.java?rev=1086154&r1=1086153&r2=1086154&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/SchemaAwareRdnTest.java
(original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/SchemaAwareRdnTest.java
Mon Mar 28 08:28:55 2011
@@ -1213,7 +1213,7 @@ public class SchemaAwareRdnTest
         
         assertFalse( rdn.isSchemaAware() );
 
-        rdn.applySchemaManager( schemaManager );
+        rdn.apply( schemaManager );
 
         assertTrue( rdn.isSchemaAware() );
     }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java?rev=1086154&r1=1086153&r2=1086154&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
Mon Mar 28 08:28:55 2011
@@ -1185,7 +1185,7 @@ public class Dn implements Iterable<Rdn>
 
                 for ( Rdn rdn : rdns )
                 {
-                    rdn.applySchemaManager( schemaManager );
+                    rdn.apply( schemaManager );
 
                     if ( isFirst )
                     {

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java?rev=1086154&r1=1086153&r2=1086154&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
Mon Mar 28 08:28:55 2011
@@ -240,7 +240,7 @@ public class Rdn implements Cloneable, E
             if ( schemaManager != null )
             {
                 this.schemaManager = schemaManager;
-                applySchemaManager( schemaManager );
+                apply( schemaManager );
                 normalized = true;
             }
             else
@@ -295,7 +295,7 @@ public class Rdn implements Cloneable, E
         if( schemaManager != null )
         {
             this.schemaManager = schemaManager;
-            applySchemaManager( schemaManager );
+            apply( schemaManager );
             normalized = true;
         }
         else
@@ -438,7 +438,7 @@ public class Rdn implements Cloneable, E
      * @return this Rdn, normalized
      * @throws LdapInvalidDnException if the Rdn is invalid
      */
-    public Rdn applySchemaManager( SchemaManager schemaManager ) throws LdapInvalidDnException
+    public Rdn apply( SchemaManager schemaManager ) throws LdapInvalidDnException
     {
         if ( normalized )
         {



Mime
View raw message