directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r764357 [1/3] - in /directory/apacheds/branches/ldif-partition: core-api/src/main/java/org/apache/directory/server/core/ core-api/src/main/java/org/apache/directory/server/core/changelog/ core-api/src/main/java/org/apache/directory/server/c...
Date Mon, 13 Apr 2009 04:50:30 GMT
Author: akarasulu
Date: Mon Apr 13 04:50:28 2009
New Revision: 764357

URL: http://svn.apache.org/viewvc?rev=764357&view=rev
Log:
adjusting to changes from Emmanuels recent merge with client API - still have to do a full merge

Modified:
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/changelog/TaggableSearchableChangeLogStore.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
    directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
    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-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
    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-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
    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-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
    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-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
    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/src/main/java/org/apache/directory/server/core/impl/DefaultCoreSession.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
    directory/apacheds/branches/ldif-partition/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java
    directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
    directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
    directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java Mon Apr 13 04:50:28 2009
@@ -35,14 +35,14 @@
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.AddRequest;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.DeleteRequest;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.UnbindRequest;
+import org.apache.directory.shared.ldap.message.InternalCompareRequest;
+import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -258,7 +258,7 @@
      * @param AddRequest the request to execute
      * @exception Exception on failures to add the entry
      */
-    void add( AddRequest addRequest ) throws Exception;
+    void add( InternalAddRequest addRequest ) throws Exception;
     
     
     /**
@@ -269,7 +269,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @exception Exception on failures to add the entry
      */
-    void add( AddRequest addRequest, LogChange log ) throws Exception;
+    void add( InternalAddRequest addRequest, LogChange log ) throws Exception;
     
     
     /**
@@ -303,7 +303,7 @@
      * @param compareRequest the received request
      * @throws Exception if there are failures while comparing
      */
-    boolean compare( CompareRequest compareRequest ) throws Exception;
+    boolean compare( InternalCompareRequest compareRequest ) throws Exception;
 
     
     /**
@@ -325,10 +325,10 @@
     void delete( LdapDN dn, LogChange log ) throws Exception;
     
     
-    void delete( DeleteRequest deleteRequest ) throws Exception;
+    void delete( InternalDeleteRequest deleteRequest ) throws Exception;
     
     
-    void delete( DeleteRequest deleteRequest, LogChange log ) throws Exception;
+    void delete( InternalDeleteRequest deleteRequest, LogChange log ) throws Exception;
 
     
     /**
@@ -434,10 +434,10 @@
     void modify( LdapDN dn, List<Modification> mods, boolean ignoreReferral, LogChange log ) throws Exception;
     
     
-    void modify( ModifyRequest modifyRequest ) throws Exception;
+    void modify( InternalModifyRequest modifyRequest ) throws Exception;
     
     
-    void modify( ModifyRequest modifyRequest, LogChange log ) throws Exception;
+    void modify( InternalModifyRequest modifyRequest, LogChange log ) throws Exception;
 
     
     /**
@@ -494,7 +494,7 @@
      * @param modifyDnRequest The ModifyDN request
      * @throws Exception if there are failures while moving the entry/branch
      */
-    void move( ModifyDnRequest modifyDnRequest ) throws Exception;
+    void move( InternalModifyDnRequest modifyDnRequest ) throws Exception;
     
     
     /**
@@ -504,7 +504,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while moving the entry/branch
      */
-    void move( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
+    void move( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
     
     
     /**
@@ -578,7 +578,7 @@
      * @throws Exception if there are failures while moving and renaming the entry
      * or branch
      */
-    void moveAndRename( ModifyDnRequest modifyDnRequest ) throws Exception;
+    void moveAndRename( InternalModifyDnRequest modifyDnRequest ) throws Exception;
     
     
     /**
@@ -589,7 +589,7 @@
      * @throws Exception if there are failures while moving and renaming the entry
      * or branch
      */
-    void moveAndRename( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
+    void moveAndRename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
     
     
     /**
@@ -662,7 +662,7 @@
      * @param modifyDnRequest The requested modification
      * @throws Exception if there are failures while renaming the entry
      */
-    void rename( ModifyDnRequest modifyDnRequest ) throws Exception;
+    void rename( InternalModifyDnRequest modifyDnRequest ) throws Exception;
     
     
     /**
@@ -672,7 +672,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while renaming the entry
      */
-    void rename( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
+    void rename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception;
     
     
     /**
@@ -775,11 +775,11 @@
         Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception;
 
 
-    EntryFilteringCursor search( SearchRequest searchRequest ) throws Exception;
+    EntryFilteringCursor search( InternalSearchRequest searchRequest ) throws Exception;
 
 
     void unbind() throws Exception;
     
     
-    void unbind( UnbindRequest unbindRequest ) throws Exception;
+    void unbind( InternalUnbindRequest unbindRequest ) throws Exception;
 }

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Mon Apr 13 04:50:28 2009
@@ -20,7 +20,6 @@
 package org.apache.directory.server.core;
 
 
-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;

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/changelog/TaggableSearchableChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/changelog/TaggableSearchableChangeLogStore.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/changelog/TaggableSearchableChangeLogStore.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/changelog/TaggableSearchableChangeLogStore.java Mon Apr 13 04:50:28 2009
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.core.changelog;
 
+
 import org.apache.directory.server.core.partition.Partition;
 
 

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java Mon Apr 13 04:50:28 2009
@@ -26,7 +26,7 @@
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.SearchRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -56,7 +56,7 @@
     }
     
     
-    public NotificationCriteria( SearchRequest req )
+    public NotificationCriteria( InternalSearchRequest req )
     {
         this.scope = req.getScope();
         this.aliasDerefMode = req.getDerefAliases();

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Mon Apr 13 04:50:28 2009
@@ -24,7 +24,7 @@
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.shared.ldap.message.AddRequest;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -89,7 +89,7 @@
     }
 
 
-    public AddOperationContext( CoreSession session, AddRequest addRequest ) throws Exception
+    public AddOperationContext( CoreSession session, InternalAddRequest addRequest ) throws Exception
     {
         super( session );
         entry = new ClonedServerEntry( 

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java Mon Apr 13 04:50:28 2009
@@ -24,7 +24,7 @@
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
-import org.apache.directory.shared.ldap.message.CompareRequest;
+import org.apache.directory.shared.ldap.message.InternalCompareRequest;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -106,7 +106,7 @@
     }
 
     
-    public CompareOperationContext( CoreSession session, CompareRequest compareRequest )
+    public CompareOperationContext( CoreSession session, InternalCompareRequest compareRequest )
     {
         super( session, compareRequest.getName() );
         this.oid = compareRequest.getAttributeId();

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java Mon Apr 13 04:50:28 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.shared.ldap.message.DeleteRequest;
+import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -64,7 +64,7 @@
     }
 
 
-    public DeleteOperationContext( CoreSession session, DeleteRequest deleteRequest )
+    public DeleteOperationContext( CoreSession session, InternalDeleteRequest deleteRequest )
     {
         super( session, deleteRequest.getName() );
         requestControls = deleteRequest.getControls();

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Mon Apr 13 04:50:28 2009
@@ -35,7 +35,7 @@
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ModifyRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -81,7 +81,7 @@
     }
 
 
-    public ModifyOperationContext( CoreSession session, ModifyRequest modifyRequest ) throws Exception
+    public ModifyOperationContext( CoreSession session, InternalModifyRequest modifyRequest ) throws Exception
     {
         super( session, modifyRequest.getName() );
         

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Mon Apr 13 04:50:28 2009
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
@@ -66,7 +66,7 @@
     }
 
 
-    public MoveAndRenameOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
+    public MoveAndRenameOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
     {
         // super sets the newRdn and the delOldRdn members and tests
         super( session, modifyDnRequest );

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java Mon Apr 13 04:50:28 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -59,7 +59,7 @@
     }
 
     
-    public MoveOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
+    public MoveOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
     {
         super( session, modifyDnRequest.getName() );
         this.parent = modifyDnRequest.getNewSuperior();

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java Mon Apr 13 04:50:28 2009
@@ -23,7 +23,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
@@ -77,7 +77,7 @@
     }
 
 
-    public RenameOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
+    public RenameOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
     {
         super( session, modifyDnRequest.getName() );
         this.newRdn = modifyDnRequest.getNewRdn();

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java Mon Apr 13 04:50:28 2009
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.SearchRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -61,7 +61,7 @@
      * Creates a new instance of SearchOperationContext.
      * @throws Exception 
      */
-    public SearchOperationContext( CoreSession session, SearchRequest searchRequest ) throws Exception
+    public SearchOperationContext( CoreSession session, InternalSearchRequest searchRequest ) throws Exception
     {
         super( session );
         

Modified: directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java Mon Apr 13 04:50:28 2009
@@ -21,8 +21,8 @@
 
 
 import org.apache.directory.server.core.CoreSession;
+import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.UnbindRequest;
 
 
 /**
@@ -43,7 +43,7 @@
     }
     
 
-    public UnbindOperationContext( CoreSession session, UnbindRequest unbindRequest )
+    public UnbindOperationContext( CoreSession session, InternalUnbindRequest unbindRequest )
     {
         super( session, session.getEffectivePrincipal().getJndiName() );
         this.setRequestControls( unbindRequest.getControls() );

Modified: directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Mon Apr 13 04:50:28 2009
@@ -24,7 +24,7 @@
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.shared.ldap.message.AddRequest;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -89,7 +89,7 @@
     }
 
 
-    public AddOperationContext( CoreSession session, AddRequest addRequest ) throws Exception
+    public AddOperationContext( CoreSession session, InternalAddRequest addRequest ) throws Exception
     {
         super( session );
         entry = new ClonedServerEntry( 

Modified: directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java Mon Apr 13 04:50:28 2009
@@ -24,7 +24,7 @@
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
-import org.apache.directory.shared.ldap.message.CompareRequest;
+import org.apache.directory.shared.ldap.message.InternalCompareRequest;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -106,7 +106,7 @@
     }
 
     
-    public CompareOperationContext( CoreSession session, CompareRequest compareRequest )
+    public CompareOperationContext( CoreSession session, InternalCompareRequest compareRequest )
     {
         super( session, compareRequest.getName() );
         this.oid = compareRequest.getAttributeId();

Modified: directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java Mon Apr 13 04:50:28 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.shared.ldap.message.DeleteRequest;
+import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -64,7 +64,7 @@
     }
 
 
-    public DeleteOperationContext( CoreSession session, DeleteRequest deleteRequest )
+    public DeleteOperationContext( CoreSession session, InternalDeleteRequest deleteRequest )
     {
         super( session, deleteRequest.getName() );
         requestControls = deleteRequest.getControls();

Modified: directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Mon Apr 13 04:50:28 2009
@@ -35,7 +35,7 @@
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ModifyRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -81,7 +81,7 @@
     }
 
 
-    public ModifyOperationContext( CoreSession session, ModifyRequest modifyRequest ) throws Exception
+    public ModifyOperationContext( CoreSession session, InternalModifyRequest modifyRequest ) throws Exception
     {
         super( session, modifyRequest.getName() );
         

Modified: directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Mon Apr 13 04:50:28 2009
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
@@ -66,7 +66,7 @@
     }
 
 
-    public MoveAndRenameOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
+    public MoveAndRenameOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
     {
         // super sets the newRdn and the delOldRdn members and tests
         super( session, modifyDnRequest );

Modified: directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java Mon Apr 13 04:50:28 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -59,7 +59,7 @@
     }
 
     
-    public MoveOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
+    public MoveOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
     {
         super( session, modifyDnRequest.getName() );
         this.parent = modifyDnRequest.getNewSuperior();

Modified: directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java Mon Apr 13 04:50:28 2009
@@ -23,7 +23,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
@@ -77,7 +77,7 @@
     }
 
 
-    public RenameOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
+    public RenameOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
     {
         super( session, modifyDnRequest.getName() );
         this.newRdn = modifyDnRequest.getNewRdn();

Modified: directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java Mon Apr 13 04:50:28 2009
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.SearchRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -61,7 +61,7 @@
      * Creates a new instance of SearchOperationContext.
      * @throws Exception 
      */
-    public SearchOperationContext( CoreSession session, SearchRequest searchRequest ) throws Exception
+    public SearchOperationContext( CoreSession session, InternalSearchRequest searchRequest ) throws Exception
     {
         super( session );
         

Modified: directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java (original)
+++ directory/apacheds/branches/ldif-partition/core-interceptor/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java Mon Apr 13 04:50:28 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.UnbindRequest;
+import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
 
 
 /**
@@ -43,7 +43,7 @@
     }
     
 
-    public UnbindOperationContext( CoreSession session, UnbindRequest unbindRequest )
+    public UnbindOperationContext( CoreSession session, InternalUnbindRequest unbindRequest )
     {
         super( session, session.getEffectivePrincipal().getJndiName() );
         this.setRequestControls( unbindRequest.getControls() );

Modified: directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/impl/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/impl/DefaultCoreSession.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/impl/DefaultCoreSession.java (original)
+++ directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/impl/DefaultCoreSession.java Mon Apr 13 04:50:28 2009
@@ -59,14 +59,14 @@
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.AddRequest;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.DeleteRequest;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.UnbindRequest;
+import org.apache.directory.shared.ldap.message.InternalCompareRequest;
+import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -166,7 +166,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void add( AddRequest addRequest ) throws Exception
+    public void add( InternalAddRequest addRequest ) throws Exception
     {
         add( addRequest, LogChange.TRUE );
     }
@@ -175,7 +175,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void add( AddRequest addRequest, LogChange log ) throws Exception
+    public void add( InternalAddRequest addRequest, LogChange log ) throws Exception
     {
         AddOperationContext opContext = new AddOperationContext( this, addRequest );
 
@@ -767,7 +767,7 @@
     /**
      * {@inheritDoc}
      */
-    public boolean compare( CompareRequest compareRequest ) throws Exception
+    public boolean compare( InternalCompareRequest compareRequest ) throws Exception
     {
         CompareOperationContext opContext = new CompareOperationContext( this, compareRequest );
         OperationManager operationManager = directoryService.getOperationManager();
@@ -780,7 +780,7 @@
     /**
      * {@inheritDoc}
      */
-    public void delete( DeleteRequest deleteRequest ) throws Exception
+    public void delete( InternalDeleteRequest deleteRequest ) throws Exception
     {
         delete( deleteRequest, LogChange.TRUE );
     }
@@ -789,7 +789,7 @@
     /**
      * {@inheritDoc}
      */
-    public void delete( DeleteRequest deleteRequest, LogChange log ) throws Exception
+    public void delete( InternalDeleteRequest deleteRequest, LogChange log ) throws Exception
     {
         DeleteOperationContext opContext = new DeleteOperationContext( this, deleteRequest );
         
@@ -812,7 +812,7 @@
     /**
      * {@inheritDoc}
      */
-    public void modify( ModifyRequest modifyRequest ) throws Exception
+    public void modify( InternalModifyRequest modifyRequest ) throws Exception
     {
         modify( modifyRequest, LogChange.TRUE );
     }
@@ -821,7 +821,7 @@
     /**
      * {@inheritDoc}
      */
-    public void modify( ModifyRequest modifyRequest, LogChange log ) throws Exception
+    public void modify( InternalModifyRequest modifyRequest, LogChange log ) throws Exception
     {
         ModifyOperationContext opContext = new ModifyOperationContext( this, modifyRequest );
 
@@ -836,7 +836,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void move( ModifyDnRequest modifyDnRequest ) throws Exception
+    public void move( InternalModifyDnRequest modifyDnRequest ) throws Exception
     {
         move( modifyDnRequest, LogChange.TRUE );
     }
@@ -845,7 +845,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void move( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
+    public void move( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
     {
         MoveOperationContext opContext = new MoveOperationContext( this, modifyDnRequest );
         
@@ -860,7 +860,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( ModifyDnRequest modifyDnRequest ) throws Exception
+    public void moveAndRename( InternalModifyDnRequest modifyDnRequest ) throws Exception
     {
         moveAndRename( modifyDnRequest, LogChange.TRUE );
     }
@@ -869,7 +869,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
+    public void moveAndRename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
     {
         MoveAndRenameOperationContext opContext = new MoveAndRenameOperationContext( this, modifyDnRequest );
 
@@ -884,7 +884,7 @@
     /**
      * {@inheritDoc}
      */
-    public void rename( ModifyDnRequest modifyDnRequest ) throws Exception
+    public void rename( InternalModifyDnRequest modifyDnRequest ) throws Exception
     {
         rename( modifyDnRequest, LogChange.TRUE );
     }
@@ -893,7 +893,7 @@
     /**
      * {@inheritDoc}
      */
-    public void rename( ModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
+    public void rename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws Exception
     {
         RenameOperationContext opContext = new RenameOperationContext( this, modifyDnRequest );
 
@@ -905,7 +905,7 @@
     }
 
 
-    public EntryFilteringCursor search( SearchRequest searchRequest ) throws Exception
+    public EntryFilteringCursor search( InternalSearchRequest searchRequest ) throws Exception
     {
         SearchOperationContext opContext = new SearchOperationContext( this, searchRequest );
         OperationManager operationManager = directoryService.getOperationManager();
@@ -922,9 +922,7 @@
     }
 
 
-    public void unbind( UnbindRequest unbindRequest )
+    public void unbind( InternalUnbindRequest unbindRequest )
     {
-        // TODO Auto-generated method stub
-        
     }
 }

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java Mon Apr 13 04:50:28 2009
@@ -22,7 +22,7 @@
 
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.message.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
 
 
 /**
@@ -61,7 +61,7 @@
      * 
      * @throws Exception if failed to handle the operation
      */
-    void handleExtendedOperation( LdapSession session, ExtendedRequest req ) throws Exception;
+    void handleExtendedOperation( LdapSession session, InternalExtendedRequest req ) throws Exception;
 
 
     /**

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Mon Apr 13 04:50:28 2009
@@ -22,14 +22,14 @@
 
 import javax.naming.ldap.Control;
 
-import org.apache.directory.shared.ldap.message.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.InternalControl;
+import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
 import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
-import org.apache.directory.shared.ldap.message.MutableControl;
-import org.apache.directory.shared.ldap.message.Request;
+import org.apache.directory.shared.ldap.message.InternalRequest;
 import org.apache.directory.shared.ldap.message.ResponseCarryingMessageException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.ResultResponse;
-import org.apache.directory.shared.ldap.message.ResultResponseRequest;
+import org.apache.directory.shared.ldap.message.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.InternalResultResponseRequest;
 import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.ssl.SslFilter;
@@ -161,28 +161,29 @@
 
         if ( message == SslFilter.SESSION_SECURED )
         {
-            ExtendedRequest req = new ExtendedRequestImpl( 0 );
+            InternalExtendedRequest req = new ExtendedRequestImpl( 0 );
             req.setOid( "1.3.6.1.4.1.1466.20037" );
             req.setPayload( "SECURED".getBytes( "ISO-8859-1" ) );
             message = req;
         }
         else if ( message == SslFilter.SESSION_UNSECURED )
         {
-            ExtendedRequest req = new ExtendedRequestImpl( 0 );
+            InternalExtendedRequest req = new ExtendedRequestImpl( 0 );
             req.setOid( "1.3.6.1.4.1.1466.20037" );
             req.setPayload( "UNSECURED".getBytes( "ISO-8859-1" ) );
             message = req;
         }
 
-        if ( ( ( Request ) message ).getControls().size() > 0 && message instanceof ResultResponseRequest )
+        if ( ( ( InternalRequest ) message ).getControls().size() > 0 
+            && message instanceof InternalResultResponseRequest )
         {
-            ResultResponseRequest req = ( ResultResponseRequest ) message;
+            InternalResultResponseRequest req = ( InternalResultResponseRequest ) message;
             for ( Control control1 : req.getControls().values() )
             {
-                MutableControl control = ( MutableControl ) control1;
+                InternalControl control = ( InternalControl ) control1;
                 if ( control.isCritical() && ! ldapService.getSupportedControls().contains( control.getID() ) )
                 {
-                    ResultResponse resp = req.getResultResponse();
+                    InternalResultResponse resp = req.getResultResponse();
                     resp.getLdapResult().setErrorMessage( "Unsupport critical control: " + control.getID() );
                     resp.getLdapResult().setResultCode( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
                     session.write( resp );

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java Mon Apr 13 04:50:28 2009
@@ -21,8 +21,8 @@
 
 
 import org.apache.directory.server.core.interceptor.context.OperationContext;
-import org.apache.directory.shared.ldap.message.Request;
-import org.apache.directory.shared.ldap.message.Response;
+import org.apache.directory.shared.ldap.message.InternalRequest;
+import org.apache.directory.shared.ldap.message.InternalResponse;
 
 
 /**
@@ -40,7 +40,7 @@
      * @param opContext the context to populate with request controls
      * @param request the request to extract controls from
      */
-    public static void setRequestControls( OperationContext opContext, Request request ) throws Exception
+    public static void setRequestControls( OperationContext opContext, InternalRequest request ) throws Exception
     {
         if ( request.getControls() != null )
         {
@@ -56,7 +56,7 @@
      * @param opContext the context to extract controls from
      * @param response the response to populate with response controls
      */
-    public static void setResponseControls( OperationContext opContext, Response response ) throws Exception
+    public static void setResponseControls( OperationContext opContext, InternalResponse response ) throws Exception
     {
         opContext.addRequestControls( opContext.getResponseControls() );
     }

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java Mon Apr 13 04:50:28 2009
@@ -54,16 +54,16 @@
 import org.apache.directory.server.protocol.shared.DirectoryBackedService;
 import org.apache.directory.shared.ldap.constants.SaslQoP;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
-import org.apache.directory.shared.ldap.message.AbandonRequest;
-import org.apache.directory.shared.ldap.message.AddRequest;
-import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.DeleteRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.UnbindRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonRequest;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.InternalCompareRequest;
+import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
+import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
 import org.apache.directory.shared.ldap.message.control.CascadeControl;
 import org.apache.directory.shared.ldap.message.control.EntryChangeControl;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
@@ -184,16 +184,16 @@
     private List<String> saslRealms;
 
     /** The potocol handlers */
-    private LdapRequestHandler<AbandonRequest> abandonHandler;
-    private LdapRequestHandler<AddRequest> addHandler;
-    private LdapRequestHandler<BindRequest> bindHandler;
-    private LdapRequestHandler<CompareRequest> compareHandler;
-    private LdapRequestHandler<DeleteRequest> deleteHandler;
-    private LdapRequestHandler<ExtendedRequest> extendedHandler;
-    private LdapRequestHandler<ModifyRequest> modifyHandler;
-    private LdapRequestHandler<ModifyDnRequest> modifyDnHandler;
-    private LdapRequestHandler<SearchRequest> searchHandler;
-    private LdapRequestHandler<UnbindRequest> unbindHandler;
+    private LdapRequestHandler<InternalAbandonRequest> abandonHandler;
+    private LdapRequestHandler<InternalAddRequest> addHandler;
+    private LdapRequestHandler<InternalBindRequest> bindHandler;
+    private LdapRequestHandler<InternalCompareRequest> compareHandler;
+    private LdapRequestHandler<InternalDeleteRequest> deleteHandler;
+    private LdapRequestHandler<InternalExtendedRequest> extendedHandler;
+    private LdapRequestHandler<InternalModifyRequest> modifyHandler;
+    private LdapRequestHandler<InternalModifyDnRequest> modifyDnHandler;
+    private LdapRequestHandler<InternalSearchRequest> searchHandler;
+    private LdapRequestHandler<InternalUnbindRequest> unbindHandler;
 
 
     /** the underlying provider codec factory */
@@ -942,7 +942,7 @@
     }
 
 
-    public MessageHandler<AbandonRequest> getAbandonHandler()
+    public MessageHandler<InternalAbandonRequest> getAbandonHandler()
     {
         return abandonHandler;
     }
@@ -952,16 +952,16 @@
      * @org.apache.xbean.Property hidden="true"
      * @param abandonHandler The AbandonRequest handler
      */
-    public void setAbandonHandler( LdapRequestHandler<AbandonRequest> abandonHandler )
+    public void setAbandonHandler( LdapRequestHandler<InternalAbandonRequest> abandonHandler )
     {
-        this.handler.removeReceivedMessageHandler( AbandonRequest.class );
+        this.handler.removeReceivedMessageHandler( InternalAbandonRequest.class );
         this.abandonHandler = abandonHandler;
         this.abandonHandler.setLdapServer( this );
-        this.handler.addReceivedMessageHandler( AbandonRequest.class, this.abandonHandler );
+        this.handler.addReceivedMessageHandler( InternalAbandonRequest.class, this.abandonHandler );
     }
 
 
-    public LdapRequestHandler<AddRequest> getAddHandler()
+    public LdapRequestHandler<InternalAddRequest> getAddHandler()
     {
         return addHandler;
     }
@@ -971,16 +971,16 @@
      * @org.apache.xbean.Property hidden="true"
      * @param abandonHandler The AddRequest handler
      */
-    public void setAddHandler( LdapRequestHandler<AddRequest> addHandler )
+    public void setAddHandler( LdapRequestHandler<InternalAddRequest> addHandler )
     {
-        this.handler.removeReceivedMessageHandler( AddRequest.class );
+        this.handler.removeReceivedMessageHandler( InternalAddRequest.class );
         this.addHandler = addHandler;
         this.addHandler.setLdapServer( this );
-        this.handler.addReceivedMessageHandler( AddRequest.class, this.addHandler );
+        this.handler.addReceivedMessageHandler( InternalAddRequest.class, this.addHandler );
     }
 
 
-    public LdapRequestHandler<BindRequest> getBindHandler()
+    public LdapRequestHandler<InternalBindRequest> getBindHandler()
     {
         return bindHandler;
     }
@@ -990,17 +990,17 @@
      * @org.apache.xbean.Property hidden="true"
      * @param abandonHandler The BindRequest handler
      */
-    public void setBindHandler( LdapRequestHandler<BindRequest> bindHandler )
+    public void setBindHandler( LdapRequestHandler<InternalBindRequest> bindHandler )
     {
         this.bindHandler = bindHandler;
         this.bindHandler.setLdapServer( this );
 
-        handler.removeReceivedMessageHandler( BindRequest.class );
-        handler.addReceivedMessageHandler( BindRequest.class, this.bindHandler );
+        handler.removeReceivedMessageHandler( InternalBindRequest.class );
+        handler.addReceivedMessageHandler( InternalBindRequest.class, this.bindHandler );
     }
 
 
-    public LdapRequestHandler<CompareRequest> getCompareHandler()
+    public LdapRequestHandler<InternalCompareRequest> getCompareHandler()
     {
         return compareHandler;
     }
@@ -1010,16 +1010,16 @@
      * @org.apache.xbean.Property hidden="true"
      * @param abandonHandler The CompareRequest handler
      */
-    public void setCompareHandler( LdapRequestHandler<CompareRequest> compareHandler )
+    public void setCompareHandler( LdapRequestHandler<InternalCompareRequest> compareHandler )
     {
-        this.handler.removeReceivedMessageHandler( CompareRequest.class );
+        this.handler.removeReceivedMessageHandler( InternalCompareRequest.class );
         this.compareHandler = compareHandler;
         this.compareHandler.setLdapServer( this );
-        this.handler.addReceivedMessageHandler( CompareRequest.class, this.compareHandler );
+        this.handler.addReceivedMessageHandler( InternalCompareRequest.class, this.compareHandler );
     }
 
 
-    public LdapRequestHandler<DeleteRequest> getDeleteHandler()
+    public LdapRequestHandler<InternalDeleteRequest> getDeleteHandler()
     {
         return deleteHandler;
     }
@@ -1029,16 +1029,16 @@
      * @org.apache.xbean.Property hidden="true"
      * @param abandonHandler The DeleteRequest handler
      */
-    public void setDeleteHandler( LdapRequestHandler<DeleteRequest> deleteHandler )
+    public void setDeleteHandler( LdapRequestHandler<InternalDeleteRequest> deleteHandler )
     {
-        this.handler.removeReceivedMessageHandler( DeleteRequest.class );
+        this.handler.removeReceivedMessageHandler( InternalDeleteRequest.class );
         this.deleteHandler = deleteHandler;
         this.deleteHandler.setLdapServer( this );
-        this.handler.addReceivedMessageHandler( DeleteRequest.class, this.deleteHandler );
+        this.handler.addReceivedMessageHandler( InternalDeleteRequest.class, this.deleteHandler );
     }
 
 
-    public LdapRequestHandler<ExtendedRequest> getExtendedHandler()
+    public LdapRequestHandler<InternalExtendedRequest> getExtendedHandler()
     {
         return extendedHandler;
     }
@@ -1048,16 +1048,16 @@
      * @org.apache.xbean.Property hidden="true"
      * @param abandonHandler The ExtendedRequest handler
      */
-    public void setExtendedHandler( LdapRequestHandler<ExtendedRequest> extendedHandler )
+    public void setExtendedHandler( LdapRequestHandler<InternalExtendedRequest> extendedHandler )
     {
-        this.handler.removeReceivedMessageHandler( ExtendedRequest.class );
+        this.handler.removeReceivedMessageHandler( InternalExtendedRequest.class );
         this.extendedHandler = extendedHandler;
         this.extendedHandler.setLdapServer( this );
-        this.handler.addReceivedMessageHandler( ExtendedRequest.class, this.extendedHandler );
+        this.handler.addReceivedMessageHandler( InternalExtendedRequest.class, this.extendedHandler );
     }
 
 
-    public LdapRequestHandler<ModifyRequest> getModifyHandler()
+    public LdapRequestHandler<InternalModifyRequest> getModifyHandler()
     {
         return modifyHandler;
     }
@@ -1067,16 +1067,16 @@
      * @org.apache.xbean.Property hidden="true"
      * @param abandonHandler The ModifyRequest handler
      */
-    public void setModifyHandler( LdapRequestHandler<ModifyRequest> modifyHandler )
+    public void setModifyHandler( LdapRequestHandler<InternalModifyRequest> modifyHandler )
     {
-        this.handler.removeReceivedMessageHandler( ModifyRequest.class );
+        this.handler.removeReceivedMessageHandler( InternalModifyRequest.class );
         this.modifyHandler = modifyHandler;
         this.modifyHandler.setLdapServer( this );
-        this.handler.addReceivedMessageHandler( ModifyRequest.class, this.modifyHandler );
+        this.handler.addReceivedMessageHandler( InternalModifyRequest.class, this.modifyHandler );
     }
 
 
-    public LdapRequestHandler<ModifyDnRequest> getModifyDnHandler()
+    public LdapRequestHandler<InternalModifyDnRequest> getModifyDnHandler()
     {
         return modifyDnHandler;
     }
@@ -1086,16 +1086,16 @@
      * @org.apache.xbean.Property hidden="true"
      * @param abandonHandler The ModifyDNRequest handler
      */
-    public void setModifyDnHandler( LdapRequestHandler<ModifyDnRequest> modifyDnHandler )
+    public void setModifyDnHandler( LdapRequestHandler<InternalModifyDnRequest> modifyDnHandler )
     {
-        this.handler.removeReceivedMessageHandler( ModifyDnRequest.class );
+        this.handler.removeReceivedMessageHandler( InternalModifyDnRequest.class );
         this.modifyDnHandler = modifyDnHandler;
         this.modifyDnHandler.setLdapServer( this );
-        this.handler.addReceivedMessageHandler( ModifyDnRequest.class, this.modifyDnHandler );
+        this.handler.addReceivedMessageHandler( InternalModifyDnRequest.class, this.modifyDnHandler );
     }
 
 
-    public LdapRequestHandler<SearchRequest> getSearchHandler()
+    public LdapRequestHandler<InternalSearchRequest> getSearchHandler()
     {
         return searchHandler;
     }
@@ -1105,16 +1105,16 @@
      * @org.apache.xbean.Property hidden="true"
      * @param abandonHandler The SearchRequest handler
      */
-    public void setSearchHandler( LdapRequestHandler<SearchRequest> searchHandler )
+    public void setSearchHandler( LdapRequestHandler<InternalSearchRequest> searchHandler )
     {
-        this.handler.removeReceivedMessageHandler( SearchRequest.class );
+        this.handler.removeReceivedMessageHandler( InternalSearchRequest.class );
         this.searchHandler = searchHandler;
         this.searchHandler.setLdapServer( this );
-        this.handler.addReceivedMessageHandler( SearchRequest.class, this.searchHandler );
+        this.handler.addReceivedMessageHandler( InternalSearchRequest.class, this.searchHandler );
     }
 
 
-    public LdapRequestHandler<UnbindRequest> getUnbindHandler()
+    public LdapRequestHandler<InternalUnbindRequest> getUnbindHandler()
     {
         return unbindHandler;
     }
@@ -1134,12 +1134,12 @@
      * @org.apache.xbean.Property hidden="true"
      * @param abandonHandler The UnbindRequest handler
      */
-    public void setUnbindHandler( LdapRequestHandler<UnbindRequest> unbindHandler )
+    public void setUnbindHandler( LdapRequestHandler<InternalUnbindRequest> unbindHandler )
     {
-        this.handler.removeReceivedMessageHandler( UnbindRequest.class );
+        this.handler.removeReceivedMessageHandler( InternalUnbindRequest.class );
         this.unbindHandler = unbindHandler;
         this.unbindHandler.setLdapServer( this );
-        this.handler.addReceivedMessageHandler( UnbindRequest.class, this.unbindHandler );
+        this.handler.addReceivedMessageHandler( InternalUnbindRequest.class, this.unbindHandler );
     }
 
 

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java Mon Apr 13 04:50:28 2009
@@ -30,7 +30,7 @@
 import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.ldap.handlers.controls.PagedSearchContext;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
 import org.apache.directory.shared.ldap.message.BindStatus;
 import org.apache.mina.core.session.IoSession;
 import org.slf4j.Logger;
@@ -53,7 +53,7 @@
     private static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The list of requests we can abandon */
-    private static final AbandonableRequest[] EMPTY_ABANDONABLES = new AbandonableRequest[0]; 
+    private static final InternalAbandonableRequest[] EMPTY_ABANDONABLES = new InternalAbandonableRequest[0]; 
     
     /** A lock to protect the abandonableRequests against concurrent access */
     private final String outstandingLock;
@@ -71,7 +71,7 @@
     private LdapService ldapService;
     
     /** A map of all the running requests */
-    private Map<Integer, AbandonableRequest> outstandingRequests;
+    private Map<Integer, InternalAbandonableRequest> outstandingRequests;
     
     /** The current Bind status */
     private BindStatus bindStatus;
@@ -98,7 +98,7 @@
     {
         this.ioSession = ioSession;
         outstandingLock = "OutstandingRequestLock: " + ioSession.toString();
-        outstandingRequests = new ConcurrentHashMap<Integer, AbandonableRequest>();
+        outstandingRequests = new ConcurrentHashMap<Integer, InternalAbandonableRequest>();
         bindStatus = BindStatus.ANONYMOUS;
         saslProperties = new HashMap<String, Object>();
         pagedSearchContexts = new HashMap<Integer, PagedSearchContext>();
@@ -185,9 +185,9 @@
     {
         synchronized ( outstandingLock )
         {
-            AbandonableRequest[] abandonables = outstandingRequests.values().toArray( EMPTY_ABANDONABLES );
+            InternalAbandonableRequest[] abandonables = outstandingRequests.values().toArray( EMPTY_ABANDONABLES );
             
-            for ( AbandonableRequest abandonable : abandonables )
+            for ( InternalAbandonableRequest abandonable : abandonables )
             {
                 abandonOutstandingRequest( abandonable.getMessageId() );
             }
@@ -200,9 +200,9 @@
      * 
      * @param messageId The request ID to abandon
      */
-    public AbandonableRequest abandonOutstandingRequest( int messageId )
+    public InternalAbandonableRequest abandonOutstandingRequest( int messageId )
     {
-        AbandonableRequest request = null;
+        InternalAbandonableRequest request = null;
         
         synchronized ( outstandingLock )
         {
@@ -237,7 +237,7 @@
      *
      * @param request an outstanding request that can be abandoned
      */
-    public void registerOutstandingRequest( AbandonableRequest request )
+    public void registerOutstandingRequest( InternalAbandonableRequest request )
     {
         synchronized( outstandingLock )
         {
@@ -251,7 +251,7 @@
      *
      * @param request the request to unregister
      */
-    public void unregisterOutstandingRequest( AbandonableRequest request )
+    public void unregisterOutstandingRequest( InternalAbandonableRequest request )
     {
         synchronized( outstandingLock )
         {
@@ -263,7 +263,7 @@
     /**
      * @return A list of all the abandonable requests for this session. 
      */
-    public Map<Integer, AbandonableRequest> getOutstandingRequests()
+    public Map<Integer, InternalAbandonableRequest> getOutstandingRequests()
     {
         synchronized( outstandingLock )
         {

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java Mon Apr 13 04:50:28 2009
@@ -33,7 +33,7 @@
 
 import org.apache.directory.server.ldap.LdapService;
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
 import javax.swing.JTextArea;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -42,7 +42,7 @@
 public class OutstandingRequestsDialog extends JDialog
 {
     private static final long serialVersionUID = -3777123348215825711L;
-    private static final AbandonableRequest[] EMPTY_REQUEST_ARRAY = new AbandonableRequest[0];
+    private static final InternalAbandonableRequest[] EMPTY_REQUEST_ARRAY = new InternalAbandonableRequest[0];
     private JPanel jContentPane;
     private JPanel jPanel;
     private JScrollPane jScrollPane;
@@ -164,7 +164,7 @@
                 if ( row > -1 )
                 {
                     jButton2.setEnabled( true );
-                    AbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
+                    InternalAbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
                         .getAbandonableRequest( row );
                     jTextArea.setText( req.toString() );
                     jTextArea.setEnabled( true );
@@ -183,14 +183,14 @@
 
     private void setRequestsModel()
     {
-        AbandonableRequest[] requests;
-        Map<Integer, AbandonableRequest> reqsMap = session.getOutstandingRequests();
+        InternalAbandonableRequest[] requests;
+        Map<Integer, InternalAbandonableRequest> reqsMap = session.getOutstandingRequests();
         
         if ( reqsMap != null )
         {
-            requests = new AbandonableRequest[reqsMap.size()];
+            requests = new InternalAbandonableRequest[reqsMap.size()];
             //noinspection unchecked
-            requests = ( AbandonableRequest[] ) reqsMap.values().toArray( requests );
+            requests = ( InternalAbandonableRequest[] ) reqsMap.values().toArray( requests );
         }
         else
         {
@@ -324,7 +324,7 @@
                 public void actionPerformed( java.awt.event.ActionEvent e )
                 {
                     int row = jTable.getSelectedRow();
-                    AbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
+                    InternalAbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
                         .getAbandonableRequest( row );
                     req.abandon();
                     session.abandonOutstandingRequest( req.getMessageId() );

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java Mon Apr 13 04:50:28 2009
@@ -23,7 +23,7 @@
 import javax.swing.event.TableModelListener;
 import javax.swing.table.TableModel;
 
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
 
 
 public class OutstandingRequestsModel implements TableModel
@@ -32,16 +32,16 @@
         { "messageId", "type" };
     final Class<?>[] columnClasses = new Class[]
         { Integer.class, String.class };
-    final AbandonableRequest[] requests;
+    final InternalAbandonableRequest[] requests;
 
 
-    OutstandingRequestsModel(AbandonableRequest[] requests)
+    OutstandingRequestsModel(InternalAbandonableRequest[] requests)
     {
         this.requests = requests;
     }
 
 
-    AbandonableRequest getAbandonableRequest( int row )
+    InternalAbandonableRequest getAbandonableRequest( int row )
     {
         return requests[row];
     }
@@ -79,7 +79,7 @@
 
     public Object getValueAt( int rowIndex, int columnIndex )
     {
-        AbandonableRequest req = requests[rowIndex];
+        InternalAbandonableRequest req = requests[rowIndex];
 
         switch ( columnIndex )
         {

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java Mon Apr 13 04:50:28 2009
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.AbandonRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonRequest;
 
 
 /**
@@ -30,13 +30,13 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class AbandonHandler extends LdapRequestHandler<AbandonRequest>
+public class AbandonHandler extends LdapRequestHandler<InternalAbandonRequest>
 {
     /**
      * @see org.apache.directory.server.ldap.handlers.LdapRequestHandler#
      * handle(org.apache.directory.server.ldap.LdapSession, org.apache.directory.shared.ldap.message.Request)
      */
-    public void handle( LdapSession session, AbandonRequest request ) throws Exception
+    public void handle( LdapSession session, InternalAbandonRequest request ) throws Exception
     {
         int abandonedId = request.getAbandoned();
 



Mime
View raw message