directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r519093 - /directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
Date Fri, 16 Mar 2007 18:44:41 GMT
Author: elecharny
Date: Fri Mar 16 11:44:40 2007
New Revision: 519093

URL: http://svn.apache.org/viewvc?view=rev&rev=519093
Log:
Moved the "objectClass" definition to shared-ldap-constants.
Modified the classes which were using the SystemSchemaConstants for "objctClass"

Modified:
    directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java

Modified: directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java?view=diff&rev=519093&r1=519092&r2=519093
==============================================================================
--- directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
(original)
+++ directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
Fri Mar 16 11:44:40 2007
@@ -29,6 +29,7 @@
 import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.constants.SystemSchemaConstants;
 import org.apache.directory.server.schema.bootstrap.Schema;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -95,8 +96,8 @@
     
     public Attributes getAttributes( Schema schema )
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_SCHEMA_OC
);
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_SCHEMA_OC
);
         entry.put( SystemSchemaConstants.CN_AT, schema.getSchemaName() );
         entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
         entry.put( SystemSchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
@@ -123,8 +124,8 @@
     
     public Attributes getAttributes( SyntaxChecker syntaxChecker, Schema schema )
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_SYNTAX_CHECKER_OC
);
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_SYNTAX_CHECKER_OC
);
         entry.put( MetaSchemaConstants.M_OID_AT, syntaxChecker.getSyntaxOid() );
         entry.put( MetaSchemaConstants.M_FQCN_AT, syntaxChecker.getClass().getName() );
         entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
@@ -135,8 +136,8 @@
     
     public Attributes getAttributes( Syntax syntax, Schema schema )
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_SYNTAX_OC
);
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_SYNTAX_OC
);
         entry.put( MetaSchemaConstants.X_HUMAN_READIBLE_AT, getBoolean( syntax.isHumanReadible()
) );
         entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
         entry.put( SystemSchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
@@ -147,8 +148,8 @@
     
     public Attributes getAttributes( String oid, Normalizer normalizer, Schema schema )
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_NORMALIZER_OC
);
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_NORMALIZER_OC
);
         entry.put( MetaSchemaConstants.M_OID_AT, oid );
         entry.put( MetaSchemaConstants.M_FQCN_AT, normalizer.getClass().getName() );
         entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
@@ -159,8 +160,8 @@
     
     public Attributes getAttributes( String oid, Comparator comparator, Schema schema )
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_COMPARATOR_OC
);
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_COMPARATOR_OC
);
         entry.put( MetaSchemaConstants.M_OID_AT, oid );
         entry.put( MetaSchemaConstants.M_FQCN_AT, comparator.getClass().getName() );
         entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
@@ -177,8 +178,8 @@
      */
     public Attributes getAttributes( MatchingRule matchingRule, Schema schema ) throws NamingException
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_MATCHING_RULE_OC
);
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_MATCHING_RULE_OC
);
         entry.put( MetaSchemaConstants.M_SYNTAX_AT, matchingRule.getSyntax().getOid() );
         entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
         entry.put( SystemSchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
@@ -189,8 +190,8 @@
     
     public Attributes getAttributes( MatchingRuleUse matchingRuleUse, Schema schema )
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "" );
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( "" );
         entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
         entry.put( SystemSchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
         return entry;
@@ -199,8 +200,8 @@
     
     public Attributes getAttributes( DITStructureRule dITStructureRule, Schema schema )
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "" );
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( "" );
         entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
         entry.put( SystemSchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
         return entry;
@@ -209,8 +210,8 @@
     
     public Attributes getAttributes( DITContentRule dITContentRule, Schema schema )
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "" );
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( "" );
         entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
         entry.put( SystemSchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
         return entry;
@@ -219,8 +220,8 @@
     
     public Attributes getAttributes( NameForm nameForm, Schema schema )
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "" );
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( "" );
         entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
         entry.put( SystemSchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
         return entry;
@@ -247,8 +248,8 @@
      */
     public Attributes getAttributes( AttributeType attributeType, Schema schema ) throws
NamingException
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC
);
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC
);
         entry.put( MetaSchemaConstants.M_SYNTAX_AT, attributeType.getSyntax().getOid() );
         entry.put( MetaSchemaConstants.M_COLLECTIVE_AT, getBoolean( attributeType.isCollective()
) );
         entry.put( MetaSchemaConstants.M_NO_USER_MODIFICATION_AT, getBoolean( ! attributeType.isCanUserModify()
) );
@@ -332,8 +333,8 @@
      */
     public Attributes getAttributes( ObjectClass objectClass, Schema schema ) throws NamingException
     {
-        Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_OBJECT_CLASS_OC
);
+        Attributes entry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true
);
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_OBJECT_CLASS_OC
);
         entry.put( MetaSchemaConstants.M_TYPE_OBJECT_CLASS_AT, objectClass.getType().toString()
);
         entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
         entry.put( SystemSchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);



Mime
View raw message