directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r806824 - in /directory: apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/ apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/changelog/ shared/branches/s...
Date Sat, 22 Aug 2009 09:30:20 GMT
Author: elecharny
Date: Sat Aug 22 09:30:19 2009
New Revision: 806824

URL: http://svn.apache.org/viewvc?rev=806824&view=rev
Log:
o Reflected the changes done in Normalizers.
o The NoOpNormalizer constructor is now public

Modified:
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NoOpNormalizer.java

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?rev=806824&r1=806823&r2=806824&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
Sat Aug 22 09:30:19 2009
@@ -129,7 +129,7 @@
 
                         public Normalizer getNormalizer() throws NamingException
                         {
-                            return new Normalizer()
+                            return new Normalizer( "1.1.1" )
                             {
                                 private static final long serialVersionUID = 1L;
 
@@ -410,7 +410,7 @@
 
                         public Normalizer getNormalizer() throws NamingException
                         {
-                            return new Normalizer()
+                            return new Normalizer( "1.1.1" )
                             {
                                 private static final long serialVersionUID = 1L;
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java?rev=806824&r1=806823&r2=806824&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
Sat Aug 22 09:30:19 2009
@@ -67,13 +67,21 @@
     {
         store = new MemoryChangeLogStore();
 
-        oidsMap.put( SchemaConstants.UID_AT, new OidNormalizer( SchemaConstants.UID_AT_OID,
new NoOpNormalizer() ) );
-        oidsMap.put( SchemaConstants.USER_ID_AT, new OidNormalizer( SchemaConstants.UID_AT_OID,
new NoOpNormalizer() ) );
-        oidsMap.put( SchemaConstants.UID_AT_OID, new OidNormalizer( SchemaConstants.UID_AT_OID,
new NoOpNormalizer() ) );
-        
-        oidsMap.put( SchemaConstants.OU_AT, new OidNormalizer( SchemaConstants.OU_AT_OID,
new NoOpNormalizer()  ) );
-        oidsMap.put( SchemaConstants.ORGANIZATIONAL_UNIT_NAME_AT, new OidNormalizer( SchemaConstants.OU_AT_OID,
new NoOpNormalizer()  ) );
-        oidsMap.put( SchemaConstants.OU_AT_OID, new OidNormalizer( SchemaConstants.OU_AT_OID,
new NoOpNormalizer()  ) );
+        // The uid/UserId/0.9.2342.19200300.100.1.1 normalizer
+        OidNormalizer uidOidNormalizer = new OidNormalizer( SchemaConstants.UID_AT_OID, 
+            new NoOpNormalizer( SchemaConstants.UID_AT_OID ) );
+        
+        oidsMap.put( SchemaConstants.UID_AT, uidOidNormalizer );
+        oidsMap.put( SchemaConstants.USER_ID_AT, uidOidNormalizer );
+        oidsMap.put( SchemaConstants.UID_AT_OID, uidOidNormalizer );
+        
+        // The ou/organizationalUnit/2.5.4.11 normalizer
+        OidNormalizer ouOidNormalizer = new OidNormalizer( SchemaConstants.OU_AT_OID, 
+            new NoOpNormalizer( SchemaConstants.OU_AT_OID ) );
+        
+        oidsMap.put( SchemaConstants.OU_AT, ouOidNormalizer );
+        oidsMap.put( SchemaConstants.ORGANIZATIONAL_UNIT_NAME_AT, ouOidNormalizer );
+        oidsMap.put( SchemaConstants.OU_AT_OID, ouOidNormalizer );
     }
 
 

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NoOpNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NoOpNormalizer.java?rev=806824&r1=806823&r2=806824&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NoOpNormalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NoOpNormalizer.java
Sat Aug 22 09:30:19 2009
@@ -40,7 +40,7 @@
      * 
      * @param oid The MR OID to use with this Normalizer
      */
-    protected NoOpNormalizer( String oid )
+    public NoOpNormalizer( String oid )
     {
         super( oid );
     }



Mime
View raw message