directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r239213 - /directory/apacheds/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template
Date Mon, 22 Aug 2005 18:27:42 GMT
Author: akarasulu
Date: Mon Aug 22 11:27:40 2005
New Revision: 239213

URL: http://svn.apache.org/viewcvs?rev=239213&view=rev
Log:
The Velocity script was not generating the code to set the objectClass type of
the ObjectClass instances in the generated ObjectClassProducer.  This was the
case for all ObjectClasses.  As a result the were defaulting to an improper 
objectClass type.  This commit fixes the other half of Stefan's JIRA issue here:

http://issues.apache.org/jira/browse/DIREVE-227

Modified:
    directory/apacheds/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template

Modified: directory/apacheds/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template?rev=239213&r1=239212&r2=239213&view=diff
==============================================================================
--- directory/apacheds/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template
(original)
+++ directory/apacheds/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template
Mon Aug 22 11:27:40 2005
@@ -64,15 +64,17 @@
 
         objectClass = newObjectClass( "$objectClass.getOid()", registries );
         objectClass.setObsolete( $objectClass.isObsolete() );
+
         #if ( $objectClass.getDescription() )
-        objectClass.setDescription( "$objectClass.getDescription()" );
+objectClass.setDescription( "$objectClass.getDescription()" );
         #end
-        #if ( $objectClass.getObjectClassType().getName() == "ABSTRACT" )
-        objectClass.setType( ObjectClassTypeEnum.ABSTRACT );
-        #elseif ( $objectClass.getObjectClassType().getName() == "AUXILIARY" )
-        objectClass.setType( ObjectClassTypeEnum.AUXILIARY );
-        #elseif ( $objectClass.getObjectClassType().getName() == "STRUCTURAL" )
-        objectClass.setType( ObjectClassTypeEnum.STRUCTURAL );
+// set the objectclass type
+        #if ( $objectClass.getClassType().getName() == "ABSTRACT" )
+objectClass.setType( ObjectClassTypeEnum.ABSTRACT );
+        #elseif ( $objectClass.getClassType().getName() == "AUXILIARY" )
+objectClass.setType( ObjectClassTypeEnum.AUXILIARY );
+        #elseif ( $objectClass.getClassType().getName() == "STRUCTURAL" )
+objectClass.setType( ObjectClassTypeEnum.STRUCTURAL );
         #end
 
         // set superior objectClasses



Mime
View raw message