directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r808014 - in /directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers: AttributeTypeLiteral.java OpenLdapSchemaParser.java
Date Wed, 26 Aug 2009 14:02:07 GMT
Author: elecharny
Date: Wed Aug 26 14:02:07 2009
New Revision: 808014

URL: http://svn.apache.org/viewvc?rev=808014&view=rev
Log:
o Removed the AttributeTypeLiteral class
o fixed the OpenLdap schema parser tests

Removed:
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AttributeTypeLiteral.java
Modified:
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java?rev=808014&r1=808013&r2=808014&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java
Wed Aug 26 14:02:07 2009
@@ -168,11 +168,19 @@
                 resolveObjectIdentifierMacro( oid );
             }
 
-            // apply object identifier macros to object classes and attribute types
+            // apply object identifier macros to object classes
             for ( ObjectClassLiteral ocl : objectClassLiterals )
             {
                 ocl.setOid( getResolveOid( ocl.getOid() ) );
             }
+            
+            // apply object identifier macros to attribute types
+            for ( AttributeType attributeType : attributeTypes )
+            {
+                attributeType.changeOid( getResolveOid( attributeType.getOid() ) );
+                attributeType.setSyntaxOid( getResolveOid( attributeType.getSyntaxOid() )
);
+            }
+            
         }
     }
 



Mime
View raw message