directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r477195 - in /directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema: AttributeTypes.template ObjectClasses.template
Date Mon, 20 Nov 2006 14:32:01 GMT
Author: elecharny
Date: Mon Nov 20 06:32:00 2006
New Revision: 477195

URL: http://svn.apache.org/viewvc?view=rev&rev=477195
Log:
Changed the DerefAliasTypeEnum to become an enum instead of an subclass
of ValuedEnum (Java 5 migration)
Fixed the velocity templates to fix some bug related to enum switch

Modified:
    directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template
    directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template

Modified: directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template?view=diff&rev=477195&r1=477194&r2=477195
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template
(original)
+++ directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template
Mon Nov 20 06:32:00 2006
@@ -75,7 +75,7 @@
         attributeType.setCollective( $attrType.isCollective() );
         attributeType.setObsolete( $attrType.isObsolete() );
         attributeType.setLength( $attrType.getLength() );
-        attributeType.setUsage( UsageEnum.getUsage( "$attrType.getUsage().getName()" ) );
+        attributeType.setUsage( UsageEnum.getUsage( "$attrType.getUsage()" ) );
 #if ( $attrType.getSuperior() )        attributeType.setSuperiorId( "$attrType.getSuperior()"
); #end
 #if ( $attrType.getEquality() )        attributeType.setEqualityId( "$attrType.getEquality()"
);
 #end

Modified: directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template?view=diff&rev=477195&r1=477194&r2=477195
==============================================================================
--- directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template
(original)
+++ directory/trunks/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template
Mon Nov 20 06:32:00 2006
@@ -73,11 +73,11 @@
 objectClass.setDescription( "$objectClass.getDescription()" );
         #end
 // set the objectclass type
-        #if ( $objectClass.getClassType().getName() == "ABSTRACT" )
+        #if ( $objectClass.getClassType().getValue() == 0 )
 objectClass.setType( ObjectClassTypeEnum.ABSTRACT );
-        #elseif ( $objectClass.getClassType().getName() == "AUXILIARY" )
+        #elseif ( $objectClass.getClassType().getValue() == 1 )
 objectClass.setType( ObjectClassTypeEnum.AUXILIARY );
-        #elseif ( $objectClass.getClassType().getName() == "STRUCTURAL" )
+        #elseif ( $objectClass.getClassType().getValue() == 2 )
 objectClass.setType( ObjectClassTypeEnum.STRUCTURAL );
         #end
 



Mime
View raw message