You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/05/16 18:42:46 UTC
svn commit: r775493 - in /directory/apacheds/trunk:
core-constants/src/main/java/org/apache/directory/server/constants/
core/src/main/java/org/apache/directory/server/core/changelog/
core/src/main/java/org/apache/directory/server/core/partition/impl/bt...
Author: elecharny
Date: Sat May 16 16:42:46 2009
New Revision: 775493
URL: http://svn.apache.org/viewvc?rev=775493&view=rev
Log:
Added AT_ before each OID constant when they are associated with an attributeType, to be consistent with the SchemaConstant class
Modified:
directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
Modified: directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java?rev=775493&r1=775492&r2=775493&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java (original)
+++ directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java Sat May 16 16:42:46 2009
@@ -86,31 +86,31 @@
// ---- AttributeType ----------------------------------------------------------
// ApacheNdn
String APACHE_N_DN_AT = "apacheNdn";
- String APACHE_N_DN_OID = "1.3.6.1.4.1.18060.0.4.1.2.1";
+ String APACHE_N_DN_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.1";
// ApacheUpdn
String APACHE_UP_DN_AT = "apacheUpdn";
- String APACHE_UP_DN_OID = "1.3.6.1.4.1.18060.0.4.1.2.2";
+ String APACHE_UP_DN_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.2";
- // ApacheExistance
- String APACHE_EXISTANCE_AT = "apacheExistance";
- String APACHE_EXISTANCE_OID = "1.3.6.1.4.1.18060.0.4.1.2.3";
+ // ApacheExistence
+ String APACHE_EXISTENCE_AT = "apacheExistence";
+ String APACHE_EXISTENCE_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.3";
// ApacheOneLevel
String APACHE_ONE_LEVEL_AT = "apacheOneLevel";
- String APACHE_ONE_LEVEL_OID = "1.3.6.1.4.1.18060.0.4.1.2.4";
+ String APACHE_ONE_LEVEL_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.4";
// ApacheOneAlias
String APACHE_ONE_ALIAS_AT = "apacheOneAlias";
- String APACHE_ONE_ALIAS_OID = "1.3.6.1.4.1.18060.0.4.1.2.5";
+ String APACHE_ONE_ALIAS_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.5";
// ApacheSubAlias
String APACHE_SUB_ALIAS_AT = "apacheSubAlias";
- String APACHE_SUB_ALIAS_OID = "1.3.6.1.4.1.18060.0.4.1.2.6";
+ String APACHE_SUB_ALIAS_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.6";
// ApacheAlias
String APACHE_ALIAS_AT = "apacheAlias";
- String APACHE_ALIAS_OID = "1.3.6.1.4.1.18060.0.4.1.2.7";
+ String APACHE_ALIAS_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.7";
// PrefNodeName
String PREF_NODE_NAME_AT = "prefNodeName";
@@ -133,15 +133,15 @@
// entryUUID
String ENTRY_UUID_AT = "entryUUID";
- String ENTRY_UUID_OID = "1.3.6.1.4.1.18060.0.4.1.2.29";
+ String ENTRY_UUID_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.29";
// entryCSN
String ENTRY_CSN_AT = "entryCSN";
- String ENTRY_CSN_OID = "1.3.6.1.4.1.18060.0.4.1.2.30";
+ String ENTRY_CSN_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.30";
// entryDeleted
String ENTRY_DELETED_AT = "entryDeleted";
- String ENTRY_DELETED_OID = "1.3.6.1.4.1.18060.0.4.1.2.31";
+ String ENTRY_DELETED_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.31";
// SchemaModifyTimestamp
String SCHEMA_MODIFY_TIMESTAMP_AT = "schemaModifyTimestamp";
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=775493&r1=775492&r2=775493&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Sat May 16 16:42:46 2009
@@ -77,7 +77,7 @@
private SchemaService schemaService;
/** OID of the 'rev' attribute used in changeLogEvent and tag objectclasses */
- private static final String REV_OID = "1.3.6.1.4.1.18060.0.4.1.2.47";
+ private static final String REV_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.47";
// -----------------------------------------------------------------------
// Overridden init() and destroy() methods
@@ -95,7 +95,7 @@
changeLog = directoryService.getChangeLog();
schemaService = directoryService.getSchemaService();
entryDeleted = directoryService.getRegistries().getAttributeTypeRegistry()
- .lookup( ApacheSchemaConstants.ENTRY_DELETED_OID );
+ .lookup( ApacheSchemaConstants.ENTRY_DELETED_AT_OID );
}
@@ -116,7 +116,7 @@
ServerEntry addEntry = opContext.getEntry();
// we don't want to record addition of a tag as a change
- if( addEntry.get( REV_OID ) != null )
+ if( addEntry.get( REV_AT_OID ) != null )
{
return;
}
@@ -160,7 +160,7 @@
}
// we don't want to record deleting a tag as a change
- if( serverEntry.get( REV_OID ) != null )
+ if( serverEntry.get( REV_AT_OID ) != null )
{
return;
}
@@ -361,4 +361,4 @@
LdifEntry reverse = LdifRevertor.reverseMove( opCtx.getParent(), opCtx.getDn() );
opCtx.setChangeLogEvent( changeLog.log( getPrincipal(), forward, reverse ) );
}
-}
\ No newline at end of file
+}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=775493&r1=775492&r2=775493&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Sat May 16 16:42:46 2009
@@ -67,15 +67,15 @@
static
{
Set<String> set = new HashSet<String>();
- set.add( ApacheSchemaConstants.APACHE_ALIAS_OID );
- set.add( ApacheSchemaConstants.APACHE_EXISTANCE_OID );
- set.add( ApacheSchemaConstants.APACHE_ONE_LEVEL_OID );
- set.add( ApacheSchemaConstants.APACHE_N_DN_OID );
- set.add( ApacheSchemaConstants.APACHE_ONE_ALIAS_OID );
- set.add( ApacheSchemaConstants.APACHE_SUB_ALIAS_OID );
- set.add( ApacheSchemaConstants.APACHE_UP_DN_OID );
- //set.add( ApacheSchemaConstants.ENTRY_CSN_OID );
- //set.add( ApacheSchemaConstants.ENTRY_UUID_OID );
+ set.add( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
+ set.add( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID );
+ set.add( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID );
+ set.add( ApacheSchemaConstants.APACHE_N_DN_AT_OID );
+ set.add( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID );
+ set.add( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID );
+ set.add( ApacheSchemaConstants.APACHE_UP_DN_AT_OID );
+ //set.add( ApacheSchemaConstants.ENTRY_CSN_AT_OID );
+ //set.add( ApacheSchemaConstants.ENTRY_UUID_AT_OID );
//set.add( SchemaConstants.OBJECT_CLASS_AT_OID );
SYS_INDEX_OIDS = Collections.unmodifiableSet( set );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=775493&r1=775492&r2=775493&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Sat May 16 16:42:46 2009
@@ -208,31 +208,31 @@
if ( SYS_INDEX_OIDS.contains( oid ) )
{
- if ( oid.equals( ApacheSchemaConstants.APACHE_ALIAS_OID ) )
+ if ( oid.equals( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) )
{
store.setAliasIndex( ( Index<String,ServerEntry> ) index );
}
- else if ( oid.equals( ApacheSchemaConstants.APACHE_EXISTANCE_OID ) )
+ else if ( oid.equals( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) )
{
store.setPresenceIndex( ( Index<String,ServerEntry> ) index );
}
- else if ( oid.equals( ApacheSchemaConstants.APACHE_ONE_LEVEL_OID ) )
+ else if ( oid.equals( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID ) )
{
store.setOneLevelIndex( ( Index<Long,ServerEntry> ) index );
}
- else if ( oid.equals( ApacheSchemaConstants.APACHE_N_DN_OID ) )
+ else if ( oid.equals( ApacheSchemaConstants.APACHE_N_DN_AT_OID ) )
{
store.setNdnIndex( ( Index<String,ServerEntry> ) index );
}
- else if ( oid.equals( ApacheSchemaConstants.APACHE_ONE_ALIAS_OID ) )
+ else if ( oid.equals( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID ) )
{
store.setOneAliasIndex( ( Index<Long,ServerEntry> ) index );
}
- else if ( oid.equals( ApacheSchemaConstants.APACHE_SUB_ALIAS_OID ) )
+ else if ( oid.equals( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID ) )
{
store.setSubAliasIndex( ( Index<Long,ServerEntry> ) index );
}
- else if ( oid.equals( ApacheSchemaConstants.APACHE_UP_DN_OID ) )
+ else if ( oid.equals( ApacheSchemaConstants.APACHE_UP_DN_AT_OID ) )
{
store.setUpdnIndex( ( Index<String,ServerEntry> ) index );
}
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=775493&r1=775492&r2=775493&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Sat May 16 16:42:46 2009
@@ -312,57 +312,57 @@
if ( ndnIdx == null )
{
ndnIdx = new JdbmIndex<String,E>();
- ndnIdx.setAttributeId( ApacheSchemaConstants.APACHE_N_DN_OID );
- systemIndices.put( ApacheSchemaConstants.APACHE_N_DN_OID, ndnIdx );
- ndnIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_N_DN_OID ), workingDirectory );
+ ndnIdx.setAttributeId( ApacheSchemaConstants.APACHE_N_DN_AT_OID );
+ systemIndices.put( ApacheSchemaConstants.APACHE_N_DN_AT_OID, ndnIdx );
+ ndnIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_N_DN_AT_OID ), workingDirectory );
}
if ( updnIdx == null )
{
updnIdx = new JdbmIndex<String,E>();
- updnIdx.setAttributeId( ApacheSchemaConstants.APACHE_UP_DN_OID );
- systemIndices.put( ApacheSchemaConstants.APACHE_UP_DN_OID, updnIdx );
- updnIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_UP_DN_OID ), workingDirectory );
+ updnIdx.setAttributeId( ApacheSchemaConstants.APACHE_UP_DN_AT_OID );
+ systemIndices.put( ApacheSchemaConstants.APACHE_UP_DN_AT_OID, updnIdx );
+ updnIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_UP_DN_AT_OID ), workingDirectory );
}
if ( existenceIdx == null )
{
existenceIdx = new JdbmIndex<String,E>();
- existenceIdx.setAttributeId( ApacheSchemaConstants.APACHE_EXISTANCE_OID );
- systemIndices.put( ApacheSchemaConstants.APACHE_EXISTANCE_OID, existenceIdx );
- existenceIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_EXISTANCE_OID ), workingDirectory );
+ existenceIdx.setAttributeId( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID );
+ systemIndices.put( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID, existenceIdx );
+ existenceIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ), workingDirectory );
}
if ( oneLevelIdx == null )
{
oneLevelIdx = new JdbmIndex<Long,E>();
- oneLevelIdx.setAttributeId( ApacheSchemaConstants.APACHE_ONE_LEVEL_OID );
- systemIndices.put( ApacheSchemaConstants.APACHE_ONE_LEVEL_OID, oneLevelIdx );
- oneLevelIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_ONE_LEVEL_OID ), workingDirectory );
+ oneLevelIdx.setAttributeId( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID );
+ systemIndices.put( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID, oneLevelIdx );
+ oneLevelIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID ), workingDirectory );
}
if ( oneAliasIdx == null )
{
oneAliasIdx = new JdbmIndex<Long,E>();
- oneAliasIdx.setAttributeId( ApacheSchemaConstants.APACHE_ONE_ALIAS_OID );
- systemIndices.put( ApacheSchemaConstants.APACHE_ONE_ALIAS_OID, oneAliasIdx );
- oneAliasIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_ONE_ALIAS_OID ), workingDirectory );
+ oneAliasIdx.setAttributeId( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID );
+ systemIndices.put( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID, oneAliasIdx );
+ oneAliasIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID ), workingDirectory );
}
if ( subAliasIdx == null )
{
subAliasIdx = new JdbmIndex<Long,E>();
- subAliasIdx.setAttributeId( ApacheSchemaConstants.APACHE_SUB_ALIAS_OID );
- systemIndices.put( ApacheSchemaConstants.APACHE_SUB_ALIAS_OID, subAliasIdx );
- subAliasIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_SUB_ALIAS_OID ), workingDirectory );
+ subAliasIdx.setAttributeId( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID );
+ systemIndices.put( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID, subAliasIdx );
+ subAliasIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID ), workingDirectory );
}
if ( aliasIdx == null )
{
aliasIdx = new JdbmIndex<String,E>();
- aliasIdx.setAttributeId( ApacheSchemaConstants.APACHE_ALIAS_OID );
- systemIndices.put( ApacheSchemaConstants.APACHE_ALIAS_OID, aliasIdx );
- aliasIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_ALIAS_OID ), workingDirectory );
+ aliasIdx.setAttributeId( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
+ systemIndices.put( ApacheSchemaConstants.APACHE_ALIAS_AT_OID, aliasIdx );
+ aliasIdx.init( attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ), workingDirectory );
}
if ( subLevelIdx == null )