directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r519502 - in /directory: apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/ apacheds/trunk/core/src/main/java/org/ap...
Date Sun, 18 Mar 2007 01:31:44 GMT
Author: elecharny
Date: Sat Mar 17 18:31:43 2007
New Revision: 519502

URL: http://svn.apache.org/viewvc?view=rev&rev=519502
Log:
Removed the "modifyTimestamp" from the code (except from tests and antlr files) and replaced
it by 
a reference to the constant declared in the new SchemaConstants class in shared-ldap-constants

Modified:
    directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
    directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java

Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?view=diff&rev=519502&r1=519501&r2=519502
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
(original)
+++ directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
Sat Mar 17 18:31:43 2007
@@ -660,7 +660,7 @@
         entry.put( SchemaConstants.CREATORS_NAME_AT, ADMIN_NORM_NAME );
         
         entry.put( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
-        entry.put( SystemSchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
+        entry.put( SchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
         entry.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
         
         entry.put( SystemSchemaConstants.CN_AT, "schemaModifications" );

Modified: directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java?view=diff&rev=519502&r1=519501&r2=519502
==============================================================================
--- directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
(original)
+++ directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
Sat Mar 17 18:31:43 2007
@@ -31,7 +31,6 @@
     String SCHEMA_NAME = "system";
 
     String CN_AT = "cn";
-    String MODIFY_TIMESTAMP_AT = "modifyTimestamp";
     String MODIFIERS_NAME_AT = "modifiersName";
 
     String LDAP_SYNTAXES_AT = "ldapSyntaxes";

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=519502&r1=519501&r2=519502
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
Sat Mar 17 18:31:43 2007
@@ -179,7 +179,7 @@
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new AttributeImpl( "modifyTimestamp" );
+        attribute = new AttributeImpl( SchemaConstants.MODIFY_TIMESTAMP_AT );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -202,7 +202,7 @@
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new AttributeImpl( "modifyTimestamp" );
+        attribute = new AttributeImpl( SchemaConstants.MODIFY_TIMESTAMP_AT );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -221,7 +221,7 @@
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new AttributeImpl( "modifyTimestamp" );
+        attribute = new AttributeImpl( SchemaConstants.MODIFY_TIMESTAMP_AT );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -243,7 +243,7 @@
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new AttributeImpl( "modifyTimestamp" );
+        attribute = new AttributeImpl( SchemaConstants.MODIFY_TIMESTAMP_AT );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -262,7 +262,7 @@
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new AttributeImpl( "modifyTimestamp" );
+        attribute = new AttributeImpl( SchemaConstants.MODIFY_TIMESTAMP_AT );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?view=diff&rev=519502&r1=519501&r2=519502
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
Sat Mar 17 18:31:43 2007
@@ -568,7 +568,7 @@
         mods[1] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
             new AttributeImpl( SystemSchemaConstants.MODIFIERS_NAME_AT, PartitionNexus.ADMIN_PRINCIPAL
) );
         mods[2] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
-            new AttributeImpl( SystemSchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
) );
+            new AttributeImpl( SchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
) );
         
         partition.modify( dn, mods );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=519502&r1=519501&r2=519502
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Sat Mar 17 18:31:43 2007
@@ -765,7 +765,7 @@
         
         if ( returnAllOperationalAttributes || set.contains( "modifytimestamp" ) )
         {
-            attr = new AttributeImpl( "modifyTimestamp" );
+            attr = new AttributeImpl( SchemaConstants.MODIFY_TIMESTAMP_AT );
             AttributeType schemaModifyTimestampAT = registries.
                 getAttributeTypeRegistry().lookup( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT
);
             Attribute schemaModifyTimestamp = 

Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java?view=diff&rev=519502&r1=519501&r2=519502
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
(original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
Sat Mar 17 18:31:43 2007
@@ -40,5 +40,5 @@
     public static final String CREATORS_NAME_AT = "creatorsName";
     public static final String CREATE_TIMESTAMP_AT = "createTimestamp";
     public static final String OBJECT_CLASSES_AT = "objectClasses";
-
+    public static final String MODIFY_TIMESTAMP_AT = "modifyTimestamp";
 }



Mime
View raw message