You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/02/01 18:07:25 UTC
svn commit: r905338 [1/4] - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/
apacheds/trunk/core-api/src/main/java/o...
Author: elecharny
Date: Mon Feb 1 17:07:13 2010
New Revision: 905338
URL: http://svn.apache.org/viewvc?rev=905338&view=rev
Log:
o Rename the Controls by removing the 'Codec' part
o Reorganized the Control classes hierarchy
Added:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControl.java
- copied, changed from r905297, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControl.java
- copied, changed from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlImpl.java
- copied, changed from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CodecControlImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControl.java
- copied, changed from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControl.java
- copied, changed from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControl.java
- copied, changed from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControl.java
- copied, changed from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControl.java
- copied, changed from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java
- copied, changed from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControl.java
- copied, changed from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControl.java
- copied, changed from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControl.java
- copied, changed from r905323, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlCodec.java
Removed:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/AbstractControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CodecControlImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlCodec.java
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/EventType.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/LdapMessageDecorator.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
directory/shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/JndiUtils.java
directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CodecControl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncDoneValueControlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/EventType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/EventType.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/EventType.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/EventType.java Mon Feb 1 17:07:13 2010
@@ -21,7 +21,7 @@
import java.util.ArrayList;
-import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
@@ -72,7 +72,7 @@
* NOTE: When the changeTypes mask includes a modDN(8) we include both the
* RENAME and MOVE EventType objects in the array.
*
- * @see PersistentSearchControlCodec
+ * @see PersistentSearchControl
* @param psearchChangeTypes the value of the changeTypes parameter
* @return array of EventType objects
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Mon Feb 1 17:07:13 2010
@@ -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.codec.controls.ManageDsaITControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
import org.apache.directory.shared.ldap.message.InternalAddRequest;
import org.apache.directory.shared.ldap.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -97,7 +97,7 @@
dn = addRequest.getEntry().getDn();
requestControls = addRequest.getControls();
- if ( requestControls.containsKey( ManageDsaITControlCodec.CONTROL_OID ) )
+ if ( requestControls.containsKey( ManageDsaITControl.CONTROL_OID ) )
{
ignoreReferral();
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java Mon Feb 1 17:07:13 2010
@@ -21,7 +21,7 @@
import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
import org.apache.directory.shared.ldap.message.InternalCompareRequest;
@@ -112,7 +112,7 @@
this.value = compareRequest.getAssertionValue();
this.requestControls = compareRequest.getControls();
- if ( requestControls.containsKey( ManageDsaITControlCodec.CONTROL_OID ) )
+ if ( requestControls.containsKey( ManageDsaITControl.CONTROL_OID ) )
{
ignoreReferral();
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java Mon Feb 1 17:07:13 2010
@@ -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.codec.controls.ManageDsaITControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
import org.apache.directory.shared.ldap.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -69,7 +69,7 @@
super( session, deleteRequest.getName() );
requestControls = deleteRequest.getControls();
- if ( requestControls.containsKey( ManageDsaITControlCodec.CONTROL_OID ) )
+ if ( requestControls.containsKey( ManageDsaITControl.CONTROL_OID ) )
{
ignoreReferral();
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Mon Feb 1 17:07:13 2010
@@ -30,7 +30,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerEntryUtils;
import org.apache.directory.server.core.entry.ServerModification;
-import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
@@ -90,7 +90,7 @@
requestControls = modifyRequest.getControls();
- if ( requestControls.containsKey( ManageDsaITControlCodec.CONTROL_OID ) )
+ if ( requestControls.containsKey( ManageDsaITControl.CONTROL_OID ) )
{
ignoreReferral();
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Mon Feb 1 17:07:13 2010
@@ -22,7 +22,7 @@
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.RDN;
@@ -78,7 +78,7 @@
throw new IllegalStateException( I18n.err( I18n.ERR_325, modifyDnRequest ) );
}
- if ( requestControls.containsKey( ManageDsaITControlCodec.CONTROL_OID ) )
+ if ( requestControls.containsKey( ManageDsaITControl.CONTROL_OID ) )
{
ignoreReferral();
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java Mon Feb 1 17:07:13 2010
@@ -22,7 +22,7 @@
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
import org.apache.directory.shared.ldap.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -77,7 +77,7 @@
throw new IllegalArgumentException( I18n.err( I18n.ERR_327, modifyDnRequest ) );
}
- if ( requestControls.containsKey( ManageDsaITControlCodec.CONTROL_OID ) )
+ if ( requestControls.containsKey( ManageDsaITControl.CONTROL_OID ) )
{
ignoreReferral();
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java Mon Feb 1 17:07:13 2010
@@ -23,7 +23,7 @@
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
import org.apache.directory.shared.ldap.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -91,7 +91,7 @@
this.delOldDn = modifyDnRequest.getDeleteOldRdn();
this.requestControls = modifyDnRequest.getControls();
- if ( requestControls.containsKey( ManageDsaITControlCodec.CONTROL_OID ) )
+ if ( requestControls.containsKey( ManageDsaITControl.CONTROL_OID ) )
{
ignoreReferral();
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java Mon Feb 1 17:07:13 2010
@@ -25,7 +25,7 @@
import javax.naming.directory.SearchControls;
import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
@@ -77,7 +77,7 @@
this.noAttributes = searchRequest.getTypesOnly();
setReturningAttributes( searchRequest.getAttributes() );
- if ( requestControls.containsKey( ManageDsaITControlCodec.CONTROL_OID ) )
+ if ( requestControls.containsKey( ManageDsaITControl.CONTROL_OID ) )
{
ignoreReferral();
}
@@ -131,7 +131,7 @@
*/
public boolean hasManageDsaItControl()
{
- return super.hasRequestControl( ManageDsaITControlCodec.CONTROL_OID );
+ return super.hasRequestControl( ManageDsaITControl.CONTROL_OID );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Mon Feb 1 17:07:13 2010
@@ -51,7 +51,7 @@
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.schema.registries.synchronizers.RegistrySynchronizerAdaptor;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.controls.CascadeControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.CascadeControl;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
@@ -311,7 +311,7 @@
*/
public void delete( DeleteOperationContext opContext ) throws Exception
{
- boolean cascade = opContext.hasRequestControl( CascadeControlCodec.CONTROL_OID );
+ boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
// The SchemaObject always exist when we reach this method.
synchronizer.delete( opContext, cascade );
@@ -373,7 +373,7 @@
ServerEntry targetEntry = ( ServerEntry ) SchemaUtils.getTargetEntry(
opContext.getModItems(), entry );
- boolean cascade = opContext.hasRequestControl( CascadeControlCodec.CONTROL_OID );
+ boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
boolean hasModification = synchronizer.modify( opContext, targetEntry, cascade );
@@ -394,7 +394,7 @@
*/
public void move( MoveOperationContext opContext ) throws Exception
{
- boolean cascade = opContext.hasRequestControl( CascadeControlCodec.CONTROL_OID );
+ boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
ClonedServerEntry entry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
synchronizer.move( opContext, entry, cascade );
wrapped.move( opContext );
@@ -407,7 +407,7 @@
*/
public void moveAndRename( MoveAndRenameOperationContext opContext ) throws Exception
{
- boolean cascade = opContext.hasRequestControl( CascadeControlCodec.CONTROL_OID );
+ boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
ClonedServerEntry entry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
synchronizer.moveAndRename( opContext, entry, cascade );
wrapped.moveAndRename( opContext );
@@ -420,7 +420,7 @@
*/
public void rename( RenameOperationContext opContext ) throws Exception
{
- boolean cascade = opContext.hasRequestControl( CascadeControlCodec.CONTROL_OID );
+ boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
// First update the registries
synchronizer.rename( opContext, cascade );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Mon Feb 1 17:07:13 2010
@@ -43,7 +43,7 @@
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
import org.apache.directory.shared.ldap.jndi.JndiUtils;
@@ -902,7 +902,7 @@
// now add the control with visibility set to true where all entries
// except subentries disappear
- SubentriesControlCodec ctl = new SubentriesControlCodec();
+ SubentriesControl ctl = new SubentriesControl();
ctl.setVisibility( true );
sysRoot.setRequestControls( JndiUtils.toJndiControls( new Control[] { ctl } ) );
list = sysRoot.search( "", "(objectClass=*)", searchControls );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Mon Feb 1 17:07:13 2010
@@ -69,16 +69,16 @@
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.MultiException;
import org.apache.directory.shared.ldap.NotImplementedException;
-import org.apache.directory.shared.ldap.codec.controls.CascadeControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.CascadeControl;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControl;
+import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControl;
+import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControl;
+import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.SingletonCursor;
@@ -169,17 +169,17 @@
// Add the supported controls
rootDSE.put(
SchemaConstants.SUPPORTED_CONTROL_AT,
- PersistentSearchControlCodec.CONTROL_OID,
- EntryChangeControlCodec.CONTROL_OID,
- SubentriesControlCodec.CONTROL_OID,
- ManageDsaITControlCodec.CONTROL_OID,
- CascadeControlCodec.CONTROL_OID,
- PagedResultsControlCodec.CONTROL_OID,
+ PersistentSearchControl.CONTROL_OID,
+ EntryChangeControl.CONTROL_OID,
+ SubentriesControl.CONTROL_OID,
+ ManageDsaITControl.CONTROL_OID,
+ CascadeControl.CONTROL_OID,
+ PagedResultsControl.CONTROL_OID,
// Replication controls
- SyncDoneValueControlCodec.CONTROL_OID,
- SyncInfoValueControlCodec.CONTROL_OID,
- SyncRequestValueControlCodec.CONTROL_OID,
- SyncStateValueControlCodec.CONTROL_OID
+ SyncDoneValueControl.CONTROL_OID,
+ SyncInfoValueControl.CONTROL_OID,
+ SyncRequestValueControl.CONTROL_OID,
+ SyncStateValueControl.CONTROL_OID
);
// Add the objectClasses
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Mon Feb 1 17:07:13 2010
@@ -58,7 +58,7 @@
import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.controls.CascadeControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.CascadeControl;
import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.EmptyCursor;
@@ -1405,7 +1405,7 @@
opContext.setModItems( cleanMods );
// Now that the entry has been modified, update the SSSE
- schemaSubEntryManager.modifySchemaSubentry( opContext, opContext.hasRequestControl( CascadeControlCodec.CONTROL_OID ) );
+ schemaSubEntryManager.modifySchemaSubentry( opContext, opContext.hasRequestControl( CascadeControl.CONTROL_OID ) );
return;
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Mon Feb 1 17:07:13 2010
@@ -58,7 +58,7 @@
import org.apache.directory.server.core.partition.ByPassConstants;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -99,7 +99,7 @@
public class SubentryInterceptor extends BaseInterceptor
{
/** the subentry control OID */
- private static final String SUBENTRY_CONTROL = SubentriesControlCodec.CONTROL_OID;
+ private static final String SUBENTRY_CONTROL = SubentriesControl.CONTROL_OID;
public static final String AC_AREA = "accessControlSpecificArea";
public static final String AC_INNERAREA = "accessControlInnerArea";
@@ -299,7 +299,7 @@
// found the subentry request control so we return its value
if ( opContext.hasRequestControl( SUBENTRY_CONTROL ) )
{
- SubentriesControlCodec subentriesControl = ( SubentriesControlCodec ) opContext.getRequestControl( SUBENTRY_CONTROL );
+ SubentriesControl subentriesControl = ( SubentriesControl ) opContext.getRequestControl( SUBENTRY_CONTROL );
return subentriesControl.isVisible();
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Mon Feb 1 17:07:13 2010
@@ -60,16 +60,16 @@
import org.apache.directory.server.protocol.shared.transport.TcpTransport;
import org.apache.directory.server.protocol.shared.transport.Transport;
import org.apache.directory.server.protocol.shared.transport.UdpTransport;
-import org.apache.directory.shared.ldap.codec.controls.CascadeControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControlCodec;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.CascadeControl;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControl;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControl;
+import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControl;
+import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControl;
+import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl;
import org.apache.directory.shared.ldap.constants.SaslQoP;
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
import org.apache.directory.shared.ldap.message.InternalAbandonRequest;
@@ -241,17 +241,17 @@
saslRealms.add( "example.com" );
this.supportedControls = new HashSet<String>();
- this.supportedControls.add( PersistentSearchControlCodec.CONTROL_OID );
- this.supportedControls.add( EntryChangeControlCodec.CONTROL_OID );
- this.supportedControls.add( SubentriesControlCodec.CONTROL_OID );
- this.supportedControls.add( ManageDsaITControlCodec.CONTROL_OID );
- this.supportedControls.add( CascadeControlCodec.CONTROL_OID );
- this.supportedControls.add( PagedResultsControlCodec.CONTROL_OID );
+ this.supportedControls.add( PersistentSearchControl.CONTROL_OID );
+ this.supportedControls.add( EntryChangeControl.CONTROL_OID );
+ this.supportedControls.add( SubentriesControl.CONTROL_OID );
+ this.supportedControls.add( ManageDsaITControl.CONTROL_OID );
+ this.supportedControls.add( CascadeControl.CONTROL_OID );
+ this.supportedControls.add( PagedResultsControl.CONTROL_OID );
// Replication controls
- this.supportedControls.add( SyncDoneValueControlCodec.CONTROL_OID );
- this.supportedControls.add( SyncInfoValueControlCodec.CONTROL_OID );
- this.supportedControls.add( SyncRequestValueControlCodec.CONTROL_OID );
- this.supportedControls.add( SyncStateValueControlCodec.CONTROL_OID );
+ this.supportedControls.add( SyncDoneValueControl.CONTROL_OID );
+ this.supportedControls.add( SyncInfoValueControl.CONTROL_OID );
+ this.supportedControls.add( SyncRequestValueControl.CONTROL_OID );
+ this.supportedControls.add( SyncStateValueControl.CONTROL_OID );
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java Mon Feb 1 17:07:13 2010
@@ -33,8 +33,8 @@
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
-import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControl;
+import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
import org.apache.directory.shared.ldap.message.AbandonListener;
import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
import org.apache.directory.shared.ldap.message.InternalSearchRequest;
@@ -62,7 +62,7 @@
private static final Logger LOG = LoggerFactory.getLogger( PersistentSearchListener.class );
final LdapSession session;
final InternalSearchRequest req;
- final PersistentSearchControlCodec control;
+ final PersistentSearchControl control;
PersistentSearchListener( LdapSession session, InternalSearchRequest req )
@@ -70,7 +70,7 @@
this.session = session;
this.req = req;
req.addAbandonListener( this );
- this.control = ( PersistentSearchControlCodec ) req.getControls().get( PersistentSearchControlCodec.CONTROL_OID );
+ this.control = ( PersistentSearchControl ) req.getControls().get( PersistentSearchControl.CONTROL_OID );
}
@@ -111,7 +111,7 @@
{
if ( control.isReturnECs() )
{
- EntryChangeControlCodec ecControl = new EntryChangeControlCodec();
+ EntryChangeControl ecControl = new EntryChangeControl();
ecControl.setChangeType( type );
if ( opContext.getChangeLogEvent() != null )
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java Mon Feb 1 17:07:13 2010
@@ -28,7 +28,7 @@
import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Value;
@@ -74,7 +74,7 @@
// First, if we have the ManageDSAIt control, go directly
// to the handling without pre-processing the request
- if ( req.getControls().containsKey( ManageDsaITControlCodec.CONTROL_OID ) )
+ if ( req.getControls().containsKey( ManageDsaITControl.CONTROL_OID ) )
{
// If the ManageDsaIT control is present, we will
// consider that the user wants to get entry which
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Mon Feb 1 17:07:13 2010
@@ -28,7 +28,6 @@
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
-import javax.naming.ldap.PagedResultsControl;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.ReferralManager;
@@ -41,9 +40,9 @@
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.server.ldap.handlers.controls.PagedSearchContext;
-import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControlCodec;
-import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
+import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControl;
+import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -53,7 +52,6 @@
import org.apache.directory.shared.ldap.filter.OrNode;
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.message.InternalLdapResult;
import org.apache.directory.shared.ldap.message.InternalReferral;
import org.apache.directory.shared.ldap.message.InternalResponse;
@@ -124,7 +122,7 @@
* @throws Exception if failures are encountered while searching
*/
private void handlePersistentSearch( LdapSession session, InternalSearchRequest req,
- PersistentSearchControlCodec psearchControl ) throws Exception
+ PersistentSearchControl psearchControl ) throws Exception
{
/*
* We want the search to complete first before we start listening to
@@ -409,8 +407,10 @@
}
}
- pagedResultsControl = new PagedResultsControl( 0, true );
- req.getResultResponse().add( JndiUtils.fromJndiControl( pagedResultsControl ) );
+ pagedResultsControl = new PagedResultsControl();
+ pagedResultsControl.setCritical( true );
+ pagedResultsControl.setSize( 0 );
+ req.getResultResponse().add( pagedResultsControl );
return;
}
@@ -423,7 +423,7 @@
// We stop here. We have to add a ResponseControl
// DO NOT WRITE THE RESPONSE - JUST RETURN IT
ldapResult.setResultCode( ResultCodeEnum.SUCCESS );
- req.getResultResponse().add( JndiUtils.fromJndiControl( pagedResultsControl ) );
+ req.getResultResponse().add( pagedResultsControl );
// Stores the cursor current position
pagedContext.incrementCurrentPosition( pageCount );
@@ -455,8 +455,8 @@
throws Exception
{
PagedResultsControl pagedResultsControl = null;
- PagedResultsControlCodec pagedSearchControl =
- ( PagedResultsControlCodec )req.getControls().get( PagedResultsControlCodec.CONTROL_OID );
+ PagedResultsControl pagedSearchControl =
+ ( PagedResultsControl )req.getControls().get( PagedResultsControl.CONTROL_OID );
byte [] cookie= pagedSearchControl.getCookie();
if ( !StringTools.isEmpty( cookie ) )
@@ -465,7 +465,10 @@
// cursor stored into the session (if any)
int cookieValue = pagedSearchControl.getCookieValue();
PagedSearchContext psCookie = session.removePagedSearchContext( cookieValue );
- pagedResultsControl = new PagedResultsControl( 0, psCookie.getCookie(), true );
+ pagedResultsControl = new PagedResultsControl();
+ pagedResultsControl.setCookie( psCookie.getCookie() );
+ pagedResultsControl.setSize( 0 );
+ pagedResultsControl.setCritical( true );
// Close the cursor
EntryFilteringCursor cursor = psCookie.getCursor();
@@ -477,14 +480,16 @@
}
else
{
- pagedResultsControl = new PagedResultsControl( 0, true );
+ pagedResultsControl = new PagedResultsControl();
+ pagedResultsControl.setSize( 0 );
+ pagedResultsControl.setCritical( true );
}
// and return
// DO NOT WRITE THE RESPONSE - JUST RETURN IT
InternalLdapResult ldapResult = req.getResultResponse().getLdapResult();
ldapResult.setResultCode( ResultCodeEnum.SUCCESS );
- req.getResultResponse().add( JndiUtils.fromJndiControl( pagedResultsControl ) );
+ req.getResultResponse().add( pagedResultsControl );
return ( InternalSearchResponseDone ) req.getResultResponse();
}
@@ -508,10 +513,10 @@
/**
* Handle a Paged Search request.
*/
- private InternalSearchResponseDone doPagedSearch( LdapSession session, InternalSearchRequest req, PagedResultsControlCodec control )
+ private InternalSearchResponseDone doPagedSearch( LdapSession session, InternalSearchRequest req, PagedResultsControl control )
throws Exception
{
- PagedResultsControlCodec pagedSearchControl = ( PagedResultsControlCodec )control;
+ PagedResultsControl pagedSearchControl = ( PagedResultsControl )control;
PagedResultsControl pagedResultsControl = null;
// Get the size limits
@@ -593,7 +598,11 @@
session.addPagedSearchContext( pagedContext );
cookie = pagedContext.getCookie();
- pagedResultsControl = new PagedResultsControl( 0, cookie, true );
+ pagedResultsControl = new PagedResultsControl();
+ pagedResultsControl.setCookie( cookie );
+ pagedResultsControl.setSize( 0 );
+ pagedResultsControl.setCritical( true );
+
// No cursor : do a search.
cursor = session.getCoreSession().search( req );
@@ -629,7 +638,11 @@
// get the cookie
cookie = pagedContext.getCookie();
- pagedResultsControl = new PagedResultsControl( 0, cookie, true );
+ pagedResultsControl = new PagedResultsControl();
+ pagedResultsControl.setCookie( cookie );
+ pagedResultsControl.setSize( 0 );
+ pagedResultsControl.setCritical( true );
+
}
else
{
@@ -648,7 +661,11 @@
session.addPagedSearchContext( pagedContext );
cookie = pagedContext.getCookie();
- pagedResultsControl = new PagedResultsControl( 0, cookie, true );
+ pagedResultsControl = new PagedResultsControl();
+ pagedResultsControl.setCookie( cookie );
+ pagedResultsControl.setSize( 0 );
+ pagedResultsControl.setCritical( true );
+
}
}
@@ -697,12 +714,12 @@
InternalLdapResult ldapResult = req.getResultResponse().getLdapResult();
// Check if we are using the Paged Search Control
- Object control = req.getControls().get( PagedResultsControlCodec.CONTROL_OID );
+ Object control = req.getControls().get( PagedResultsControl.CONTROL_OID );
if ( control != null )
{
// Let's deal with the pagedControl
- return doPagedSearch( session, req, (PagedResultsControlCodec)control );
+ return doPagedSearch( session, req, (PagedResultsControl)control );
}
// A normal search
@@ -767,7 +784,7 @@
private InternalResponse generateResponse( LdapSession session, InternalSearchRequest req, ClonedServerEntry entry ) throws Exception
{
EntryAttribute ref = entry.getOriginalEntry().get( SchemaConstants.REF_AT );
- boolean hasManageDsaItControl = req.getControls().containsKey( ManageDsaITControlCodec.CONTROL_OID );
+ boolean hasManageDsaItControl = req.getControls().containsKey( ManageDsaITControl.CONTROL_OID );
if ( ( ref != null ) && ! hasManageDsaItControl )
{
@@ -856,7 +873,7 @@
*/
public void modifyFilter( LdapSession session, InternalSearchRequest req ) throws Exception
{
- if ( req.hasControl( ManageDsaITControlCodec.CONTROL_OID ) )
+ if ( req.hasControl( ManageDsaITControl.CONTROL_OID ) )
{
return;
}
@@ -942,8 +959,8 @@
// Handle psearch differently
// ===============================================================
- PersistentSearchControlCodec psearchControl = ( PersistentSearchControlCodec )
- req.getControls().get( PersistentSearchControlCodec.CONTROL_OID );
+ PersistentSearchControl psearchControl = ( PersistentSearchControl )
+ req.getControls().get( PersistentSearchControl.CONTROL_OID );
if ( psearchControl != null )
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java Mon Feb 1 17:07:13 2010
@@ -22,10 +22,10 @@
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControl;
import org.apache.directory.shared.ldap.codec.search.SearchResultDoneCodec;
import org.apache.directory.shared.ldap.message.InternalSearchResponseDone;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,8 +53,8 @@
SearchResultDoneCodec searchResult = (SearchResultDoneCodec)response;
// Get the control
- CodecControl control = searchResult.getCurrentControl();
- SyncDoneValueControlCodec syncDoneCtrl = ( SyncDoneValueControlCodec ) control;
+ Control control = searchResult.getCurrentControl();
+ SyncDoneValueControl syncDoneCtrl = ( SyncDoneValueControl ) control;
/** the sync cookie sent by the server */
byte[] syncCookie;
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java Mon Feb 1 17:07:13 2010
@@ -64,7 +64,7 @@
import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
import org.apache.directory.shared.asn1.util.Asn1StringUtils;
-import org.apache.directory.shared.ldap.codec.controls.CodecControlImpl;
+import org.apache.directory.shared.ldap.codec.controls.ControlImpl;
import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.message.control.Control;
@@ -351,7 +351,7 @@
@Test
public void testFailureWithUnsupportedControl() throws Exception
{
- Control unsupported = new CodecControlImpl( "1.1.1.1" )
+ Control unsupported = new ControlImpl( "1.1.1.1" )
{
boolean isCritical = true;
private static final long serialVersionUID = 1L;
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java Mon Feb 1 17:07:13 2010
@@ -42,7 +42,7 @@
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.ldap.LdapServer;
-import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControl;
import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -203,7 +203,7 @@
SearchControls controls = new SearchControls();
controls.setCountLimit( sizeLimit );
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- PagedResultsControlCodec pagedSearchControl = new PagedResultsControlCodec();
+ PagedResultsControl pagedSearchControl = new PagedResultsControl();
pagedSearchControl.setSize( pagedSize );
((LdapContext)ctx).setRequestControls( JndiUtils.toJndiControls( new Control[] {pagedSearchControl} ) );
@@ -218,7 +218,7 @@
private void createNextSearchControls( DirContext ctx, byte[] cookie, int pagedSize )
throws NamingException
{
- PagedResultsControlCodec pagedSearchControl = new PagedResultsControlCodec();
+ PagedResultsControl pagedSearchControl = new PagedResultsControl();
pagedSearchControl.setCookie( cookie );
pagedSearchControl.setSize( pagedSize );
((LdapContext)ctx).setRequestControls( JndiUtils.toJndiControls( new Control[] {pagedSearchControl} ) );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java Mon Feb 1 17:07:13 2010
@@ -52,9 +52,9 @@
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
-import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControl;
import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlDecoder;
-import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.control.Control;
@@ -119,11 +119,11 @@
private void setUpListenerReturnECs() throws Exception
{
- setUpListener( true, new PersistentSearchControlCodec(), false );
+ setUpListener( true, new PersistentSearchControl(), false );
}
- private void setUpListener( boolean returnECs, PersistentSearchControlCodec control, boolean ignoreEmptyRegistryCheck )
+ private void setUpListener( boolean returnECs, PersistentSearchControl control, boolean ignoreEmptyRegistryCheck )
throws Exception
{
ctx = ( EventDirContext ) getWiredContext( ldapServer).lookup( BASE );
@@ -331,7 +331,7 @@
@Test
public void testPsearchAddModifyEnabledWithEC() throws Exception
{
- PersistentSearchControlCodec control = new PersistentSearchControlCodec();
+ PersistentSearchControl control = new PersistentSearchControl();
control.setReturnECs( true );
control.setChangeTypes( ChangeType.ADD_VALUE );
control.enableNotification( ChangeType.MODIFY );
@@ -521,17 +521,17 @@
{
boolean isReady = false;
PSearchNotification result;
- final PersistentSearchControlCodec control;
+ final PersistentSearchControl control;
LdapContext ctx;
NamingEnumeration<SearchResult> list;
PSearchListener()
{
- control = new PersistentSearchControlCodec();
+ control = new PersistentSearchControl();
}
- PSearchListener(PersistentSearchControlCodec control)
+ PSearchListener(PersistentSearchControl control)
{
this.control = control;
}
@@ -585,7 +585,7 @@
LOG.debug( "PSearchListener is ready and about to issue persistent search request." );
list = ctx.search( "", "objectClass=*", null );
LOG.debug( "PSearchListener search request returned." );
- EntryChangeControlCodec ecControl = null;
+ EntryChangeControl ecControl = null;
while ( list.hasMore() )
{
@@ -602,10 +602,10 @@
for ( javax.naming.ldap.Control control : controls )
{
if ( control.getID().equals(
- EntryChangeControlCodec.CONTROL_OID ) )
+ EntryChangeControl.CONTROL_OID ) )
{
EntryChangeControlDecoder decoder = new EntryChangeControlDecoder();
- ecControl = ( EntryChangeControlCodec ) decoder.decode( control.getEncodedValue(), new EntryChangeControlCodec() );
+ ecControl = ( EntryChangeControl ) decoder.decode( control.getEncodedValue(), new EntryChangeControl() );
}
}
}
@@ -632,10 +632,10 @@
class PSearchNotification extends SearchResult
{
private static final long serialVersionUID = 1L;
- final EntryChangeControlCodec control;
+ final EntryChangeControl control;
- public PSearchNotification(SearchResult result, EntryChangeControlCodec control)
+ public PSearchNotification(SearchResult result, EntryChangeControl control)
{
super( result.getName(), result.getClassName(), result.getObject(), result.getAttributes(), result
.isRelative() );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Mon Feb 1 17:07:13 2010
@@ -60,7 +60,7 @@
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.server.ldap.LdapServer;
-import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.message.control.Control;
@@ -816,7 +816,7 @@
);
// prepare the subentry control to make the subentry visible
- SubentriesControlCodec control = new SubentriesControlCodec();
+ SubentriesControl control = new SubentriesControl();
control.setVisibility( true );
Control[] reqControls = new Control[] { control };
SearchControls searchControls = new SearchControls();
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/LdapMessageDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/LdapMessageDecorator.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/LdapMessageDecorator.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/LdapMessageDecorator.java Mon Feb 1 17:07:13 2010
@@ -37,7 +37,6 @@
import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.del.DelRequestCodec;
import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
import org.apache.directory.shared.ldap.codec.extended.ExtendedRequestCodec;
@@ -51,6 +50,7 @@
import org.apache.directory.shared.ldap.codec.search.SearchResultEntryCodec;
import org.apache.directory.shared.ldap.codec.search.SearchResultReferenceCodec;
import org.apache.directory.shared.ldap.codec.unbind.UnBindRequestCodec;
+import org.apache.directory.shared.ldap.message.control.Control;
/**
@@ -82,7 +82,7 @@
* @see org.apache.directory.shared.ldap.codec.LdapMessageCodec#addControl(org.apache.directory.shared.ldap.codec.Control)
*/
@Override
- public void addControl( CodecControl control )
+ public void addControl( Control control )
{
instance.addControl( control );
}
@@ -182,7 +182,7 @@
* @see org.apache.directory.shared.ldap.codec.LdapMessageCodec#getControls()
*/
@Override
- public List<CodecControl> getControls()
+ public List<Control> getControls()
{
return instance.getControls();
}
@@ -192,7 +192,7 @@
* @see org.apache.directory.shared.ldap.codec.LdapMessageCodec#getControls(int)
*/
@Override
- public CodecControl getControls( int i )
+ public Control getControls( int i )
{
return instance.getControls( i );
}
@@ -202,7 +202,7 @@
* @see org.apache.directory.shared.ldap.codec.LdapMessageCodec#getCurrentControl()
*/
@Override
- public CodecControl getCurrentControl()
+ public Control getCurrentControl()
{
return instance.getCurrentControl();
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java Mon Feb 1 17:07:13 2010
@@ -33,8 +33,8 @@
import org.apache.directory.shared.dsmlv2.request.BatchRequest;
import org.apache.directory.shared.dsmlv2.request.BatchRequest.Processing;
import org.apache.directory.shared.dsmlv2.request.BatchRequest.ResponseOrder;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.util.Base64;
import org.apache.directory.shared.ldap.util.StringTools;
import org.dom4j.Document;
@@ -197,13 +197,13 @@
* @param controls
* a List of Controls
*/
- public static void addControls( Element element, List<CodecControl> controls )
+ public static void addControls( Element element, List<Control> controls )
{
if ( controls != null )
{
for ( int i = 0; i < controls.size(); i++ )
{
- CodecControl control = controls.get( i );
+ Control control = controls.get( i );
Element controlElement = element.addElement( "control" );
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java Mon Feb 1 17:07:13 2010
@@ -66,7 +66,6 @@
import org.apache.directory.shared.ldap.codec.bind.LdapAuthentication;
import org.apache.directory.shared.ldap.codec.bind.SimpleAuthentication;
import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
import org.apache.directory.shared.ldap.codec.extended.ExtendedResponseCodec;
import org.apache.directory.shared.ldap.codec.modify.ModifyResponseCodec;
@@ -75,6 +74,7 @@
import org.apache.directory.shared.ldap.codec.search.SearchResultEntryCodec;
import org.apache.directory.shared.ldap.codec.search.SearchResultReferenceCodec;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.xmlpull.v1.XmlPullParserException;
@@ -465,7 +465,7 @@
{
to.setMessageId( from.getMessageId() );
- for ( CodecControl control : from.getControls() )
+ for ( Control control : from.getControls() )
{
to.addControl( control );
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=905338&r1=905337&r2=905338&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Mon Feb 1 17:07:13 2010
@@ -46,8 +46,7 @@
import org.apache.directory.shared.ldap.codec.add.AddResponseCodec;
import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
-import org.apache.directory.shared.ldap.codec.controls.CodecControl;
-import org.apache.directory.shared.ldap.codec.controls.CodecControlImpl;
+import org.apache.directory.shared.ldap.codec.controls.ControlImpl;
import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
import org.apache.directory.shared.ldap.codec.extended.ExtendedResponseCodec;
import org.apache.directory.shared.ldap.codec.modify.ModifyResponseCodec;
@@ -57,6 +56,7 @@
import org.apache.directory.shared.ldap.codec.search.SearchResultReferenceCodec;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.Base64;
import org.apache.directory.shared.ldap.util.LdapURL;
@@ -1168,7 +1168,7 @@
*/
private void createAndAddControl( Dsmlv2Container container, LdapMessageCodec parent ) throws XmlPullParserException
{
- CodecControl control = null;
+ Control control = null;
XmlPullParser xpp = container.getParser();
@@ -1184,7 +1184,7 @@
throw new XmlPullParserException( "Incorrect value for 'type' attribute. This is not an OID.", xpp, null );
}
- control = new CodecControlImpl( attributeValue );
+ control = new ControlImpl( attributeValue );
parent.addControl( control );
}
else
@@ -1267,7 +1267,7 @@
private void createAndAddControlValue( Dsmlv2Container container, LdapMessageCodec parent )
throws XmlPullParserException
{
- CodecControl control = parent.getCurrentControl();
+ Control control = parent.getCurrentControl();
XmlPullParser xpp = container.getParser();
try