directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r758120 - in /directory/apacheds/branches/ldif-partition: core-service-api/ core-service-api/src/main/java/org/apache/directory/server/core/ core-service-api/src/main/java/org/apache/directory/server/core/changelog/ core-service-api/src/mai...
Date Wed, 25 Mar 2009 01:37:56 GMT
Author: akarasulu
Date: Wed Mar 25 01:37:54 2009
New Revision: 758120

URL: http://svn.apache.org/viewvc?rev=758120&view=rev
Log:
more separation between interface and implementation classes

Added:
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java   (props changed)
      - copied unchanged from r758028, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java   (props changed)
      - copied unchanged from r758028, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java   (props changed)
      - copied unchanged from r758028, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java   (props changed)
      - copied unchanged from r758028, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java   (props changed)
      - copied unchanged from r758028, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/RevisionOrder.java   (props changed)
      - copied unchanged from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/RevisionOrder.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/Scope.java   (props changed)
      - copied unchanged from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/Scope.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/Tag.java   (props changed)
      - copied unchanged from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/Tag.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/TagSearchEngine.java   (props changed)
      - copied unchanged from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/TagSearchEngine.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/event/
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/event/DirectoryListener.java   (props changed)
      - copied unchanged from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/event/DirectoryListener.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/event/EventService.java   (props changed)
      - copied unchanged from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/event/EventService.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/event/EventType.java   (props changed)
      - copied unchanged from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/event/EventType.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java   (props changed)
      - copied unchanged from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/event/RegistrationEntry.java   (props changed)
      - copied unchanged from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/event/RegistrationEntry.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/filtering/   (props changed)
      - copied from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/filtering/
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/
      - copied from r758038, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java
      - copied, changed from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
      - copied, changed from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java
      - copied, changed from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
      - copied, changed from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/ChangeOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/ChangeOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetSuffixOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/GetSuffixOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListSuffixOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/ListSuffixOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
      - copied, changed from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/RemoveContextPartitionOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/RemoveContextPartitionOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
      - copied unchanged from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/partition/
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/partition/Partition.java   (props changed)
      - copied unchanged from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java   (props changed)
      - copied unchanged from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/schema/
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java   (contents, props changed)
      - copied, changed from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Removed:
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/RevisionOrder.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/Scope.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/Tag.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/TagSearchEngine.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/event/DirectoryListener.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/event/EventService.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/event/EventType.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/event/RegistrationEntry.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/filtering/
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Modified:
    directory/apacheds/branches/ldif-partition/core-service-api/pom.xml
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/CoreSession.java
    directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/branches/ldif-partition/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/branches/ldif-partition/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java

Modified: directory/apacheds/branches/ldif-partition/core-service-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-service-api/pom.xml?rev=758120&r1=758119&r2=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-service-api/pom.xml (original)
+++ directory/apacheds/branches/ldif-partition/core-service-api/pom.xml Wed Mar 25 01:37:54 2009
@@ -40,6 +40,12 @@
       <artifactId>apacheds-core-entry</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-cursor</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/CoreSession.java?rev=758120&r1=758119&r2=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/CoreSession.java (original)
+++ directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/CoreSession.java Wed Mar 25 01:37:54 2009
@@ -27,7 +27,6 @@
 import javax.naming.ldap.Control;
 
 import org.apache.directory.server.constants.ServerDNConstants;
-import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;

Modified: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=758120&r1=758119&r2=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Wed Mar 25 01:37:54 2009
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core;
 
 
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.changelog.ChangeLog;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerEntryFactory;

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Wed Mar 25 01:37:54 2009
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/RevisionOrder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/RevisionOrder.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/RevisionOrder.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/Scope.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/Scope.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/Scope.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/Tag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/Tag.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/Tag.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/TagSearchEngine.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/TagSearchEngine.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/changelog/TagSearchEngine.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/event/DirectoryListener.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/event/EventService.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/event/EventType.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/event/RegistrationEntry.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/filtering/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java (from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java?p2=directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java&p1=directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java&r1=758039&r2=758120&rev=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java Wed Mar 25 01:37:54 2009
@@ -81,6 +81,6 @@
      */
     public boolean isLogChange()
     {
-        return logChange != logChange.FALSE;
+        return logChange != LogChange.FALSE;
     }
 }

Copied: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java (from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java?p2=directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java&p1=directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java&r1=758039&r2=758120&rev=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java Wed Mar 25 01:37:54 2009
@@ -29,7 +29,7 @@
 import javax.naming.ldap.Control;
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Modification;

Copied: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java (from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java?p2=directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java&p1=directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java&r1=758039&r2=758120&rev=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java Wed Mar 25 01:37:54 2009
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.interceptor.context;
 
 
-import org.apache.directory.server.core.CoreSession;
+import org.apache.directory.server.core.CoreSession; 
 import org.apache.directory.server.core.partition.Partition;
 
 

Copied: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java (from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java?p2=directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java&p1=directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java&r1=758039&r2=758120&rev=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java Wed Mar 25 01:37:54 2009
@@ -31,7 +31,7 @@
 import org.apache.commons.lang.NotImplementedException;
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.ReferralHandlingMode;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;

Copied: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java (from r758039, directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java?p2=directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java&p1=directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java&r1=758039&r2=758120&rev=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java Wed Mar 25 01:37:54 2009
@@ -26,7 +26,7 @@
 import javax.naming.ldap.Control;
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.authn.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.interceptor.Interceptor;

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Wed Mar 25 01:37:54 2009
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Wed Mar 25 01:37:54 2009
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (from r758026, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?p2=directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java&r1=758026&r2=758120&rev=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Wed Mar 25 01:37:54 2009
@@ -1,645 +1,57 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.directory.server.core.schema;
-
-
-import org.apache.directory.server.constants.ApacheSchemaConstants;
-import org.apache.directory.server.constants.ServerDNConstants;
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.DefaultServerAttribute;
-import org.apache.directory.server.core.entry.DefaultServerEntry;
-import org.apache.directory.server.core.entry.ServerAttribute;
-import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
-import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.schema.DITContentRule;
-import org.apache.directory.shared.ldap.schema.DITStructureRule;
-import org.apache.directory.shared.ldap.schema.MatchingRule;
-import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
-import org.apache.directory.shared.ldap.schema.NameForm;
-import org.apache.directory.shared.ldap.schema.ObjectClass;
-import org.apache.directory.shared.ldap.schema.SchemaUtils;
-import org.apache.directory.shared.ldap.schema.Syntax;
-import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescription;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
-
-import javax.naming.NamingException;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-
-/**
- * This class manage the Schema's operations. 
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$, $Date$
- */
-public class SchemaService
-{
-    private static final String[] EMPTY_STRING_ARRAY = new String[0];
-
-    /** cached version of the schema subentry with all attributes in it */
-    private ServerEntry schemaSubentry;
-    private final Object lock = new Object();
-    
-    /** The directory service instance */
-    private DirectoryService directoryService;
-
-    /** a handle on the registries */
-    private Registries registries;
-
-    /** a handle on the schema partition */
-    private JdbmPartition schemaPartition;
-
-    /** schema operation control */
-    private SchemaOperationControl schemaControl;
-
-    /**
-     * the normalized name for the schema modification attributes
-     */
-    private LdapDN schemaModificationAttributesDN;
-
-
-    /**
-     * Create a new instance of the schemaService
-     * 
-     * @param registries The associated registries
-     * @param schemaPartition The schema partition reference
-     * @param schemaControl The schema control instance
-     * @throws NamingException If somethi,ng went wrong during initialization
-     */
-    public SchemaService( DirectoryService directoryService, JdbmPartition schemaPartition, SchemaOperationControl schemaControl ) throws NamingException
-    {
-        this.directoryService = directoryService;
-        this.registries = directoryService.getRegistries();
-        this.schemaPartition = schemaPartition;
-        this.schemaControl = schemaControl;
-
-        schemaModificationAttributesDN = new LdapDN( ServerDNConstants.SCHEMA_TIMESTAMP_ENTRY_DN );
-        schemaModificationAttributesDN.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
-    }
-
-
-    /**
-     * Tells if the given DN is the schemaSubentry DN
-     * 
-     * @param dnString The DN we want to check
-     * @return <code>true</code> if the given DN is the Schema subentry DN
-     * @throws NamingException If the given DN is not valid
-     */
-    public boolean isSchemaSubentry( String dnString ) throws NamingException
-    {
-        if ( ServerDNConstants.CN_SCHEMA_DN.equalsIgnoreCase( dnString ) ||
-            ServerDNConstants.CN_SCHEMA_DN_NORMALIZED.equalsIgnoreCase( dnString ) )
-        {
-            return true;
-        }
-
-        LdapDN dn = new LdapDN( dnString ).normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
-        return dn.getNormName().equals( ServerDNConstants.CN_SCHEMA_DN_NORMALIZED );
-    }
-
-
-    /**
-     * @return The dirctoryService associated regirstries
-     */
-    public Registries getRegistries()
-    {
-        return registries;
-    }
-
-
-    /**
-     * Generate the comparators attribute from the registry
-     */
-    private ServerAttribute generateComparators() throws NamingException
-    {
-        ServerAttribute attr = new DefaultServerAttribute( 
-            registries.getAttributeTypeRegistry().lookup( SchemaConstants.COMPARATORS_AT ) );
-
-        Iterator<ComparatorDescription> list = 
-            registries.getComparatorRegistry().comparatorDescriptionIterator();
-        
-        while ( list.hasNext() )
-        {
-            ComparatorDescription description = list.next();
-            attr.add( SchemaUtils.render( description ) );
-        }
-
-        return attr;
-    }
-
-
-    private ServerAttribute generateNormalizers() throws NamingException
-    {
-        ServerAttribute attr = new DefaultServerAttribute( 
-            registries.getAttributeTypeRegistry().lookup( SchemaConstants.NORMALIZERS_AT ) );
-
-        Iterator<NormalizerDescription> list = registries.getNormalizerRegistry().normalizerDescriptionIterator();
-
-        while ( list.hasNext() )
-        {
-            NormalizerDescription normalizer = list.next();
-            attr.add( SchemaUtils.render( normalizer ) );
-        }
-        
-        return attr;
-    }
-
-
-    private ServerAttribute generateSyntaxCheckers() throws NamingException
-    {
-        ServerAttribute attr = new DefaultServerAttribute( 
-            registries.getAttributeTypeRegistry().lookup( SchemaConstants.SYNTAX_CHECKERS_AT ) );
-
-        Iterator<SyntaxCheckerDescription> list =
-            registries.getSyntaxCheckerRegistry().syntaxCheckerDescriptionIterator();
-
-        while ( list.hasNext() )
-        {
-            SyntaxCheckerDescription syntaxCheckerDescription = list.next();
-            attr.add( SchemaUtils.render( syntaxCheckerDescription ) );
-        }
-        
-        return attr;
-    }
-
-
-    private ServerAttribute generateObjectClasses() throws NamingException
-    {
-        ServerAttribute attr = new DefaultServerAttribute( 
-            registries.getAttributeTypeRegistry().lookup( SchemaConstants.OBJECT_CLASSES_AT ) );
-
-        Iterator<ObjectClass> list = registries.getObjectClassRegistry().iterator();
-
-        while ( list.hasNext() )
-        {
-            ObjectClass oc = list.next();
-            attr.add( SchemaUtils.render( oc ).toString() );
-        }
-        
-        return attr;
-    }
-
-
-    private ServerAttribute generateAttributeTypes() throws NamingException
-    {
-        ServerAttribute attr = new DefaultServerAttribute( 
-            registries.getAttributeTypeRegistry().lookup( SchemaConstants.ATTRIBUTE_TYPES_AT ) );
-
-        Iterator<AttributeType> list = registries.getAttributeTypeRegistry().iterator();
-
-        while ( list.hasNext() )
-        {
-            AttributeType at = list.next();
-            attr.add( SchemaUtils.render( at ).toString() );
-        }
-
-        return attr;
-    }
-
-
-    private ServerAttribute generateMatchingRules() throws NamingException
-    {
-        ServerAttribute attr = new DefaultServerAttribute( 
-            registries.getAttributeTypeRegistry().lookup( SchemaConstants.MATCHING_RULES_AT ) );
-
-        Iterator<MatchingRule> list = registries.getMatchingRuleRegistry().iterator();
-
-        while ( list.hasNext() )
-        {
-            MatchingRule mr = list.next();
-            attr.add( SchemaUtils.render( mr ).toString() );
-        }
-
-        return attr;
-    }
-
-
-    private ServerAttribute generateMatchingRuleUses() throws NamingException
-    {
-        ServerAttribute attr = new DefaultServerAttribute( 
-            registries.getAttributeTypeRegistry().lookup( SchemaConstants.MATCHING_RULE_USE_AT ) );
-
-        Iterator<MatchingRuleUse> list = registries.getMatchingRuleUseRegistry().iterator();
-
-        while ( list.hasNext() )
-        {
-            MatchingRuleUse mru = list.next();
-            attr.add( SchemaUtils.render( mru ).toString() );
-        }
-
-        return attr;
-    }
-
-
-    private ServerAttribute generateSyntaxes() throws NamingException
-    {
-        ServerAttribute attr = new DefaultServerAttribute( 
-            registries.getAttributeTypeRegistry().lookup( SchemaConstants.LDAP_SYNTAXES_AT ) );
-
-        Iterator<Syntax> list = registries.getSyntaxRegistry().iterator();
-
-        while ( list.hasNext() )
-        {
-            Syntax syntax = list.next();
-            attr.add( SchemaUtils.render( syntax ).toString() );
-        }
-
-        return attr;
-    }
-
-
-    private ServerAttribute generateDitContextRules() throws NamingException
-    {
-        ServerAttribute attr = new DefaultServerAttribute( 
-            registries.getAttributeTypeRegistry().lookup( SchemaConstants.DIT_CONTENT_RULES_AT ) );
-
-        Iterator<DITContentRule> list = registries.getDitContentRuleRegistry().iterator();
-
-        while ( list.hasNext() )
-        {
-            DITContentRule dcr = list.next();
-            attr.add( SchemaUtils.render( dcr ).toString() );
-        }
-        
-        return attr;
-    }
-
-
-    private ServerAttribute generateDitStructureRules() throws NamingException
-    {
-        ServerAttribute attr = new DefaultServerAttribute( 
-            registries.getAttributeTypeRegistry().lookup( SchemaConstants.DIT_STRUCTURE_RULES_AT ) );
-
-        Iterator<DITStructureRule> list = registries.getDitStructureRuleRegistry().iterator();
-
-        while ( list.hasNext() )
-        {
-            DITStructureRule dsr = list.next();
-            attr.add( SchemaUtils.render( dsr ).toString() );
-        }
-        
-        return attr;
-    }
-
-
-    private ServerAttribute generateNameForms() throws NamingException
-    {
-        ServerAttribute attr = new DefaultServerAttribute( 
-            registries.getAttributeTypeRegistry().lookup( SchemaConstants.NAME_FORMS_AT ) );
-
-        Iterator<NameForm> list = registries.getNameFormRegistry().iterator();
-
-        while ( list.hasNext() )
-        {
-            NameForm nf = list.next();
-            attr.add( SchemaUtils.render( nf ).toString() );
-        }
-        
-        return attr;
-    }
-
-
-    private void generateSchemaSubentry( ServerEntry mods ) throws NamingException
-    {
-        ServerEntry attrs = new DefaultServerEntry( registries, mods.getDn() );
-
-        // add the objectClass attribute
-        attrs.put( SchemaConstants.OBJECT_CLASS_AT, 
-            SchemaConstants.TOP_OC,
-            SchemaConstants.SUBSCHEMA_OC,
-            SchemaConstants.SUBENTRY_OC,
-            ApacheSchemaConstants.APACHE_SUBSCHEMA_OC
-            );
-
-        // add the cn attribute as required for the RDN
-        attrs.put( SchemaConstants.CN_AT, "schema" );
-
-        // generate all the other operational attributes
-        attrs.put( generateComparators() );
-        attrs.put( generateNormalizers() );
-        attrs.put( generateSyntaxCheckers() );
-        attrs.put( generateObjectClasses() );
-        attrs.put( generateAttributeTypes() );
-        attrs.put( generateMatchingRules() );
-        attrs.put( generateMatchingRuleUses() );
-        attrs.put( generateSyntaxes() );
-        attrs.put( generateDitContextRules() );
-        attrs.put( generateDitStructureRules() );
-        attrs.put( generateNameForms() );
-        attrs.put( SchemaConstants.SUBTREE_SPECIFICATION_AT, "{}" );
-
-        // -------------------------------------------------------------------
-        // set standard operational attributes for the subentry
-        // -------------------------------------------------------------------
-
-        // Add the createTimestamp
-        AttributeType createTimestampAT = registries.
-            getAttributeTypeRegistry().lookup( SchemaConstants.CREATE_TIMESTAMP_AT );
-        EntryAttribute createTimestamp = mods.get( createTimestampAT );
-        attrs.put( SchemaConstants.CREATE_TIMESTAMP_AT, createTimestamp.get() );
-
-        // Add the creatorsName
-        attrs.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN );
-
-        // Add the modifyTimestamp
-        AttributeType schemaModifyTimestampAT = registries.
-            getAttributeTypeRegistry().lookup( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT );
-        EntryAttribute schemaModifyTimestamp = mods.get( schemaModifyTimestampAT );
-        attrs.put( SchemaConstants.MODIFY_TIMESTAMP_AT, schemaModifyTimestamp.get() );
-
-        // Add the modifiersName
-        AttributeType schemaModifiersNameAT = registries.
-            getAttributeTypeRegistry().lookup( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT );
-        EntryAttribute schemaModifiersName = mods.get( schemaModifiersNameAT );
-        attrs.put( SchemaConstants.MODIFIERS_NAME_AT, schemaModifiersName.get() );
-
-        // don't swap out if a request for the subentry is in progress or we
-        // can give back an inconsistent schema back to the client so we block
-        synchronized ( lock )
-        {
-            schemaSubentry = attrs;
-        }
-    }
-
-
-    private void addAttribute( ServerEntry attrs, String id ) throws NamingException
-    {
-        EntryAttribute attr = schemaSubentry.get( id );
-
-        if ( attr != null )
-        {
-            attrs.put( attr );
-        }
-    }
-
-
-    /**
-     * A seriously unsafe (unsynchronized) means to access the schemaSubentry.
-     *
-     * @return the schemaSubentry
-     * @throws NamingException if there is a failure to access schema timestamps
-     */
-    public ServerEntry getSubschemaEntryImmutable() throws Exception
-    {
-        if ( schemaSubentry == null )
-        {
-            generateSchemaSubentry( schemaPartition.lookup(
-                    new LookupOperationContext( null, schemaModificationAttributesDN ) ) );
-        }
-
-        return ( ServerEntry ) schemaSubentry.clone();
-    }
-
-
-    /**
-     * A seriously unsafe (unsynchronized) means to access the schemaSubentry.
-     *
-     * @return the schemaSubentry
-     * @throws NamingException if there is a failure to access schema timestamps
-     */
-    public ServerEntry getSubschemaEntryCloned() throws Exception
-    {
-        if ( schemaSubentry == null )
-        {
-            generateSchemaSubentry( schemaPartition.lookup(
-                    new LookupOperationContext( null, schemaModificationAttributesDN ) ) );
-        }
-
-        return ( ServerEntry ) schemaSubentry.clone();
-    }
-
-
-    /**
-     * Gets the schemaSubentry based on specific search id parameters which
-     * include the special '*' and '+' operators.
-     *
-     * @param ids the ids of the attributes that should be returned from a search
-     * @return the subschema entry with the ids provided
-     * @throws NamingException if there are failures during schema info access
-     */
-    public ServerEntry getSubschemaEntry( String[] ids ) throws Exception
-    {
-        if ( ids == null )
-        {
-            ids = EMPTY_STRING_ARRAY;
-        }
-
-        Set<String> setOids = new HashSet<String>();
-        ServerEntry attrs = new DefaultServerEntry( registries, LdapDN.EMPTY_LDAPDN );
-        boolean returnAllOperationalAttributes = false;
-
-        synchronized( lock )
-        {
-            // ---------------------------------------------------------------
-            // Check if we need an update by looking at timestamps on disk
-            // ---------------------------------------------------------------
-
-            ServerEntry mods = 
-                schemaPartition.lookup( new LookupOperationContext( null, schemaModificationAttributesDN ) );
-// @todo enable this optimization at some point but for now it
-// is causing some problems so I will just turn it off
-//          Attribute modifyTimeDisk = mods.get( SchemaConstants.MODIFY_TIMESTAMP_AT );
-//
-//          Attribute modifyTimeMemory = null;
-//
-//            if ( schemaSubentry != null )
-//            {
-//                modifyTimeMemory = schemaSubentry.get( SchemaConstants.MODIFY_TIMESTAMP_AT );
-//                if ( modifyTimeDisk == null && modifyTimeMemory == null )
-//                {
-//                    // do nothing!
-//                }
-//                else if ( modifyTimeDisk != null && modifyTimeMemory != null )
-//                {
-//                    Date disk = DateUtils.getDate( ( String ) modifyTimeDisk.get() );
-//                    Date mem = DateUtils.getDate( ( String ) modifyTimeMemory.get() );
-//                    if ( disk.after( mem ) )
-//                    {
-//                        generateSchemaSubentry( mods );
-//                    }
-//                }
-//                else
-//                {
-//                    generateSchemaSubentry( mods );
-//                }
-//            }
-//            else
-//            {
-                generateSchemaSubentry( mods );
-//            }
-
-            // ---------------------------------------------------------------
-            // Prep Work: Transform the attributes to their OID counterpart
-            // ---------------------------------------------------------------
-
-            for ( String id:ids )
-            {
-                // Check whether the set contains a plus, and use it below to include all
-                // operational attributes.  Due to RFC 3673, and issue DIREVE-228 in JIRA
-                if ( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES.equals( id ) )
-                {
-                    returnAllOperationalAttributes = true;
-                }
-                else if ( SchemaConstants.ALL_USER_ATTRIBUTES.equals(  id ) )
-                {
-                    setOids.add( id );
-                }
-                else
-                {
-                    setOids.add( registries.getOidRegistry().getOid( id ) );
-                }
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.COMPARATORS_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.COMPARATORS_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.NORMALIZERS_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.NORMALIZERS_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.SYNTAX_CHECKERS_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.SYNTAX_CHECKERS_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.OBJECT_CLASSES_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.OBJECT_CLASSES_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.ATTRIBUTE_TYPES_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.ATTRIBUTE_TYPES_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.MATCHING_RULES_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.MATCHING_RULES_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.MATCHING_RULE_USE_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.MATCHING_RULE_USE_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.LDAP_SYNTAXES_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.LDAP_SYNTAXES_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.DIT_CONTENT_RULES_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.DIT_CONTENT_RULES_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.DIT_STRUCTURE_RULES_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.DIT_STRUCTURE_RULES_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.NAME_FORMS_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.NAME_FORMS_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.SUBTREE_SPECIFICATION_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.SUBTREE_SPECIFICATION_AT );
-            }
-
-            int minSetSize = 0;
-            if ( setOids.contains( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES ) )
-            {
-                minSetSize++;
-            }
-
-            if ( setOids.contains( SchemaConstants.ALL_USER_ATTRIBUTES ) )
-            {
-                minSetSize++;
-            }
-
-            if ( setOids.contains( SchemaConstants.REF_AT_OID ) )
-            {
-                minSetSize++;
-            }
-
-            // add the objectClass attribute
-            if ( setOids.contains( SchemaConstants.ALL_USER_ATTRIBUTES ) ||
-                 setOids.contains( SchemaConstants.OBJECT_CLASS_AT_OID ) ||
-                 setOids.size() == minSetSize )
-            {
-                addAttribute( attrs, SchemaConstants.OBJECT_CLASS_AT );
-            }
-
-            // add the cn attribute as required for the RDN
-            if ( setOids.contains( SchemaConstants.ALL_USER_ATTRIBUTES ) ||
-                 setOids.contains( SchemaConstants.CN_AT_OID ) ||
-                 setOids.size() == minSetSize )
-            {
-                addAttribute( attrs, SchemaConstants.CN_AT );
-            }
-
-            // -------------------------------------------------------------------
-            // set standard operational attributes for the subentry
-            // -------------------------------------------------------------------
-
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.CREATE_TIMESTAMP_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.CREATE_TIMESTAMP_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.CREATORS_NAME_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.CREATORS_NAME_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.MODIFY_TIMESTAMP_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.MODIFY_TIMESTAMP_AT );
-            }
-
-            if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.MODIFIERS_NAME_AT_OID ) )
-            {
-                addAttribute( attrs, SchemaConstants.MODIFIERS_NAME_AT );
-            }
-        }
-
-        return attrs;
-    }
-
-
-    SchemaOperationControl getSchemaControl()
-    {
-        return schemaControl;
-    }
-}
+package org.apache.directory.server.core.schema;
+
+
+import javax.naming.NamingException;
+
+import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.schema.registries.Registries;
+
+
+public interface SchemaService
+{
+
+    /**
+     * Tells if the given DN is the schemaSubentry DN
+     * 
+     * @param dnString The DN we want to check
+     * @return <code>true</code> if the given DN is the Schema subentry DN
+     * @throws NamingException If the given DN is not valid
+     */
+    public abstract boolean isSchemaSubentry( String dnString ) throws NamingException;
+
+
+    /**
+     * @return The dirctoryService associated regirstries
+     */
+    public abstract Registries getRegistries();
+
+
+    /**
+     * A seriously unsafe (unsynchronized) means to access the schemaSubentry.
+     *
+     * @return the schemaSubentry
+     * @throws NamingException if there is a failure to access schema timestamps
+     */
+    public abstract ServerEntry getSubschemaEntryImmutable() throws Exception;
+
+
+    /**
+     * A seriously unsafe (unsynchronized) means to access the schemaSubentry.
+     *
+     * @return the schemaSubentry
+     * @throws NamingException if there is a failure to access schema timestamps
+     */
+    public abstract ServerEntry getSubschemaEntryCloned() throws Exception;
+
+
+    /**
+     * Gets the schemaSubentry based on specific search id parameters which
+     * include the special '*' and '+' operators.
+     *
+     * @param ids the ids of the attributes that should be returned from a search
+     * @return the subschema entry with the ids provided
+     * @throws NamingException if there are failures during schema info access
+     */
+    public abstract ServerEntry getSubschemaEntry( String[] ids ) throws Exception;
+
+}
\ No newline at end of file

Propchange: directory/apacheds/branches/ldif-partition/core-service-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=758120&r1=758119&r2=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Wed Mar 25 01:37:54 2009
@@ -40,7 +40,7 @@
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.partition.ByPassConstants;
-import org.apache.directory.server.core.schema.SchemaService;
+import org.apache.directory.server.core.schema.DefaultSchemaService;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
@@ -74,7 +74,7 @@
     private ChangeLog changeLog;
     
     /** we need the schema service to deal with special conditions */
-    private SchemaService schemaService;
+    private DefaultSchemaService 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";

Modified: directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=758120&r1=758119&r2=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Wed Mar 25 01:37:54 2009
@@ -167,7 +167,7 @@
 
     private SchemaOperationControl schemaManager;
 
-    private SchemaService schemaService;
+    private DefaultSchemaService schemaService;
 
     // the base DN (normalized) of the schema partition
     private LdapDN schemaBaseDN;

Modified: directory/apacheds/branches/ldif-partition/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=758120&r1=758119&r2=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/branches/ldif-partition/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Wed Mar 25 01:37:54 2009
@@ -61,7 +61,7 @@
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.schema.SchemaOperationControl;
-import org.apache.directory.server.core.schema.SchemaService;
+import org.apache.directory.server.core.schema.DefaultSchemaService;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.aci.ACITuple;
@@ -538,13 +538,13 @@
         }
 
 
-        public SchemaService getSchemaService()
+        public DefaultSchemaService getSchemaService()
         {
             return null;
         }
 
 
-        public void setSchemaService( SchemaService schemaService )
+        public void setSchemaService( DefaultSchemaService schemaService )
         {
 
         }

Modified: directory/apacheds/branches/ldif-partition/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?rev=758120&r1=758119&r2=758120&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original)
+++ directory/apacheds/branches/ldif-partition/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Wed Mar 25 01:37:54 2009
@@ -38,7 +38,7 @@
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.schema.SchemaOperationControl;
-import org.apache.directory.server.core.schema.SchemaService;
+import org.apache.directory.server.core.schema.DefaultSchemaService;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
@@ -323,13 +323,13 @@
         }
 
 
-        public SchemaService getSchemaService()
+        public DefaultSchemaService getSchemaService()
         {
             return null;
         }
 
 
-        public void setSchemaService( SchemaService schemaService )
+        public void setSchemaService( DefaultSchemaService schemaService )
         {
 
         }



Mime
View raw message