directory-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	elecha...@apache.org
Subject	svn commit: r1066743 - in /directory: apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/event/ apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/ apacheds/branches/m1/core-jndi/src/main/ja...
Date	Thu, 03 Feb 2011 07:39:40 GMT
Author: elecharny Date: Thu Feb 3 07:39:38 2011 New Revision: 1066743 URL: http://svn.apache.org/viewvc?rev=1066743&view=rev Log: Moved around codec controls in one single controls package for clarity Added: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecoder.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeCodecControl.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeCodecControl.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeContainer.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeGrammar.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeStates.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeStates.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsContainer.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsGrammar.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsStates.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchContainer.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchGrammar.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchStates.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesContainer.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesContainer.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesGrammar.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesStates.java - copied, changed from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesStates.java Removed: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeCodecControl.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeContainer.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeGrammar.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeStates.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsContainer.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsGrammar.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsStates.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchContainer.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchGrammar.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchStates.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesContainer.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesFactory.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesGrammar.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesStates.java Modified: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/event/EventType.java directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java Modified: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/event/EventType.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/event/EventType.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/event/EventType.java (original) +++ directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/event/EventType.java Thu Feb 3 07:39:38 2011 @@ -21,7 +21,7 @@ package org.apache.directory.server.core import java.util.ArrayList; -import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; /** Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original) +++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Thu Feb 3 07:39:38 2011 @@ -50,7 +50,7 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.model.message.controls.Subentries; import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.ILdapCodecService; -import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.shared.ldap.model.cursor.Cursor; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.entry.EntryAttribute; Modified: directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original) +++ directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Thu Feb 3 07:39:38 2011 @@ -73,8 +73,8 @@ import org.apache.directory.server.core. import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.ldap.codec.ICodecControl; -import org.apache.directory.shared.ldap.codec.controls.CascadeDecorator; -import org.apache.directory.shared.ldap.codec.controls.ManageDsaITDecorator; +import org.apache.directory.shared.ldap.codec.controls.cascade.CascadeDecorator; +import org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator; import org.apache.directory.shared.ldap.codec.controls.ppolicy.IPasswordPolicy; // @TODO - all these controls should not be imported !!!! ALEX !!! @@ -91,10 +91,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueDecorator; import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.ISyncModifyDn; import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.SyncModifyDnDecorator; -import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeDecorator; -import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsDecorator; -import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchDecorator; -import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.shared.ldap.model.constants.JndiPropertyConstants; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.cursor.EmptyCursor; Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original) +++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Thu Feb 3 07:39:38 2011 @@ -52,7 +52,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.message.controls.Subentries; -import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.DefaultEntry; Modified: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original) +++ directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Thu Feb 3 07:39:38 2011 @@ -39,7 +39,7 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.controls.PagedSearchContext; import org.apache.directory.server.ldap.replication.ReplicationProvider; import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.ISyncRequestValue; -import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.entry.EntryAttribute; Modified: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original) +++ directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Thu Feb 3 07:39:38 2011 @@ -39,7 +39,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -import org.apache.directory.shared.ldap.codec.controls.ManageDsaITDecorator; +import org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator; import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.ISyncDoneValue; import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.ISyncInfoValue; import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueDecorator; Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java (original) +++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java Thu Feb 3 07:39:38 2011 @@ -47,7 +47,7 @@ import org.apache.directory.server.ldap. import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.ILdapCodecService; -import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; import org.apache.directory.shared.ldap.model.message.Control; import org.apache.directory.shared.ldap.util.JndiUtils; import org.apache.directory.shared.util.Strings; Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java (original) +++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java Thu Feb 3 07:39:38 2011 @@ -52,8 +52,8 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.codec.ICodecControl; import org.apache.directory.shared.ldap.codec.ILdapCodecService; -import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeDecorator; -import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.ldif.LdifUtils; import org.apache.directory.shared.ldap.model.message.Control; Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java Thu Feb 3 07:39:38 2011 @@ -28,8 +28,8 @@ import java.util.Map; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.ldap.codec.controls.CascadeFactory; -import org.apache.directory.shared.ldap.codec.controls.ManageDsaITFactory; +import org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory; +import org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory; import org.apache.directory.shared.ldap.codec.controls.ppolicy.PasswordPolicy; import org.apache.directory.shared.ldap.codec.controls.ppolicy.PasswordPolicyFactory; import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.ISyncDoneValue; @@ -42,10 +42,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueFactory; import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.ISyncModifyDn; import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.SyncModifyDnFactory; -import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeFactory; -import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsFactory; -import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchFactory; -import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesFactory; +import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory; +import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory; +import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory; +import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory; import org.apache.directory.shared.ldap.model.message.Control; import org.apache.directory.shared.ldap.model.message.controls.BasicControl; import org.apache.directory.shared.ldap.model.message.controls.Cascade; Added: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecoder.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecoder.java?rev=1066743&view=auto ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecoder.java (added) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecoder.java Thu Feb 3 07:39:38 2011 @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + / +package org.apache.directory.shared.ldap.codec.controls; + + +import org.apache.directory.shared.asn1.Asn1Object; +import org.apache.directory.shared.asn1.DecoderException; +import org.apache.directory.shared.ldap.model.message.Control; + + +/* + * An interface for decoders of controls. + * + * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a> + / +public interface ControlDecoder<E extends Control> +{ + /* + * Decodes raw ASN.1 encoded bytes into an Asn1Object for the control. + * + * @param controlBytes the encoded control bytes + * @return the decoded Asn1Object for the control + * @throws DecoderException if anything goes wrong + / + Asn1Object decode( byte[] controlBytes ) throws DecoderException; +} Added: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java?rev=1066743&view=auto ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java (added) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java Thu Feb 3 07:39:38 2011 @@ -0,0 +1,212 @@ +/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + / +package org.apache.directory.shared.ldap.codec.controls; + +import org.apache.directory.shared.asn1.AbstractAsn1Object; +import org.apache.directory.shared.ldap.codec.ICodecControl; +import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.model.message.Control; + + +/* + * Decorates Control objects by wrapping them, and enabling them as CodecControls + * so the codec to store transient information associated with the Control in the + * decorator while processing. + * + * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a> + * @param <E> + / +public abstract class ControlDecorator<E extends Control> extends AbstractAsn1Object implements ICodecControl<E> +{ + /* The decorated Control / + private E decorated; + + /* The encoded value length / + protected int valueLength; + + /* The encoded value of the control. / + protected byte[] value; + + /* The codec service responsible for encoding decoding this object / + private ILdapCodecService codec; + + + /* + * Creates a ControlDecorator to codec enable it. + * + * @param decoratedControl The Control to decorate. + / + public ControlDecorator( ILdapCodecService codec, E decoratedControl ) + { + this.decorated = decoratedControl; + this.codec = codec; + } + + + /* + * {@inheritDoc} + / + public E getDecorated() + { + return decorated; + } + + + /* + * {@inheritDoc} + / + public void setDecorated( E decorated ) + { + this.decorated = decorated; + } + + + /* + * {@inheritDoc} + / + public ILdapCodecService getCodecService() + { + return codec; + } + + + // ------------------------------------------------------------------------ + // Control Methods + // ------------------------------------------------------------------------ + /* + * Get the OID + * + * @return A string which represent the control oid + / + public String getOid() + { + return decorated.getOid(); + } + + + /* + * {@inheritDoc} + / + public boolean hasValue() + { + return value != null; + } + + + /* + * Get the control value + * + * @return The control value + / + public byte[] getValue() + { + return value; + } + + + /* + * Set the encoded control value + * + * @param value The encoded control value to store + / + public void setValue( byte[] value ) + { + if ( value != null ) + { + byte[] copy = new byte[ value.length ]; + System.arraycopy( value, 0, copy, 0, value.length ); + this.value = copy; + } + else + { + this.value = null; + } + } + + + /* + * Get the criticality + * + * @return <code>true</code> if the criticality flag is true. + / + public boolean isCritical() + { + return decorated.isCritical(); + } + + + /* + * Set the criticality + * + * @param criticality The criticality value + / + public void setCritical( boolean criticality ) + { + decorated.setCritical( criticality ); + } + + + // ------------------------------------------------------------------------ + // CodecControl Methods + // ------------------------------------------------------------------------ + /* + * {@inheritDoc} + / + public int computeLength() + { + return 0; + } + + + // ------------------------------------------------------------------------ + // Object Method Overrides + // ------------------------------------------------------------------------ + /* + * @see Object#hashCode() + / + public int hashCode() + { + return decorated.hashCode(); + } + + /* + * @see Object#equals(Object) + / + public boolean equals( Object o ) + { + if ( decorated == null ) + { + return o == null; + } + else + { + return decorated.equals( o ); + } + } + + + /* + * Return a String representing a Control + / + public String toString() + { + return decorated.toString(); + } +} Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeCodecControl.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeCodecControl.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeCodecControl.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeCodecControl.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeCodecControl.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeCodecControl.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeCodecControl.java Thu Feb 3 07:39:38 2011 @@ -16,7 +16,7 @@ specific language governing permissions and limitations * under the License. / -package org.apache.directory.shared.ldap.codec.controls; +package org.apache.directory.shared.ldap.codec.controls.cascade; import org.apache.directory.shared.ldap.codec.ICodecControl; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeDecorator.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.controls; +package org.apache.directory.shared.ldap.codec.controls.cascade; import java.nio.ByteBuffer; @@ -26,6 +26,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.controls.ControlDecorator; import org.apache.directory.shared.ldap.model.message.controls.Cascade; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeFactory.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeFactory.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.controls; +package org.apache.directory.shared.ldap.codec.controls.cascade; import javax.naming.ldap.BasicControl; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITDecorator.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.controls; +package org.apache.directory.shared.ldap.codec.controls.manageDsaIT; import java.nio.ByteBuffer; @@ -26,6 +26,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.ldap.codec.ILdapCodecService; +import org.apache.directory.shared.ldap.codec.controls.ControlDecorator; import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITFactory.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITFactory.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.controls; +package org.apache.directory.shared.ldap.codec.controls.manageDsaIT; import javax.naming.ldap.BasicControl; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeContainer.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeContainer.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeContainer.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.entryChange; +package org.apache.directory.shared.ldap.codec.controls.search.entryChange; import org.apache.directory.shared.asn1.ber.AbstractContainer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeDecorator.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.entryChange; +package org.apache.directory.shared.ldap.codec.controls.search.entryChange; import java.nio.ByteBuffer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeFactory.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeFactory.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.entryChange; +package org.apache.directory.shared.ldap.codec.controls.search.entryChange; import java.nio.ByteBuffer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeGrammar.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeGrammar.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeGrammar.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeGrammar.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.entryChange; +package org.apache.directory.shared.ldap.codec.controls.search.entryChange; import org.apache.directory.shared.asn1.DecoderException; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeStates.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeStates.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeStates.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeStates.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeStates.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeStates.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeStates.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.entryChange; +package org.apache.directory.shared.ldap.codec.controls.search.entryChange; import org.apache.directory.shared.asn1.ber.grammar.Grammar; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsContainer.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsContainer.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsContainer.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.pagedSearch; +package org.apache.directory.shared.ldap.codec.controls.search.pagedSearch; import org.apache.directory.shared.asn1.ber.AbstractContainer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsDecorator.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.pagedSearch; +package org.apache.directory.shared.ldap.codec.controls.search.pagedSearch; import java.nio.ByteBuffer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsFactory.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsFactory.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.pagedSearch; +package org.apache.directory.shared.ldap.codec.controls.search.pagedSearch; import java.nio.ByteBuffer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsGrammar.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsGrammar.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsGrammar.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsGrammar.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.pagedSearch; +package org.apache.directory.shared.ldap.codec.controls.search.pagedSearch; import org.apache.directory.shared.asn1.DecoderException; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsStates.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsStates.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsStates.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.pagedSearch; +package org.apache.directory.shared.ldap.codec.controls.search.pagedSearch; import org.apache.directory.shared.asn1.ber.grammar.Grammar; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchContainer.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchContainer.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchContainer.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.persistentSearch; +package org.apache.directory.shared.ldap.codec.controls.search.persistentSearch; import org.apache.directory.shared.asn1.ber.AbstractContainer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchDecorator.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.persistentSearch; +package org.apache.directory.shared.ldap.codec.controls.search.persistentSearch; import java.nio.ByteBuffer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchFactory.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchFactory.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.persistentSearch; +package org.apache.directory.shared.ldap.codec.controls.search.persistentSearch; import java.nio.ByteBuffer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchGrammar.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchGrammar.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchGrammar.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchGrammar.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.persistentSearch; +package org.apache.directory.shared.ldap.codec.controls.search.persistentSearch; import org.apache.directory.shared.asn1.DecoderException; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchStates.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchStates.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchStates.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.persistentSearch; +package org.apache.directory.shared.ldap.codec.controls.search.persistentSearch; import org.apache.directory.shared.asn1.ber.grammar.Grammar; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesContainer.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesContainer.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesContainer.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesContainer.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesContainer.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesContainer.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesContainer.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.subentries; +package org.apache.directory.shared.ldap.codec.controls.search.subentries; import org.apache.directory.shared.asn1.ber.AbstractContainer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesDecorator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesDecorator.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.subentries; +package org.apache.directory.shared.ldap.codec.controls.search.subentries; import java.nio.ByteBuffer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesFactory.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesFactory.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.subentries; +package org.apache.directory.shared.ldap.codec.controls.search.subentries; import java.nio.ByteBuffer; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesGrammar.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesGrammar.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesGrammar.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesGrammar.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * / -package org.apache.directory.shared.ldap.codec.search.controls.subentries; +package org.apache.directory.shared.ldap.codec.controls.search.subentries; import org.apache.directory.shared.asn1.DecoderException; Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesStates.java (from r1066738, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesStates.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesStates.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesStates.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesStates.java&r1=1066738&r2=1066743&rev=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesStates.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesStates.java Thu Feb 3 07:39:38 2011 @@ -17,7 +17,7 @@ under the License. * */ -package org.apache.directory.shared.ldap.codec.search.controls.subentries; +package org.apache.directory.shared.ldap.codec.controls.search.subentries; import org.apache.directory.shared.asn1.ber.grammar.Grammar; Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java Thu Feb 3 07:39:38 2011 @@ -39,9 +39,9 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.ILdapCodecService; import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; +import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; import org.apache.directory.shared.ldap.codec.decorators.BindResponseDecorator; import org.apache.directory.shared.ldap.codec.decorators.MessageDecorator; -import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsDecorator; import org.apache.directory.shared.ldap.model.message.BindResponse; import org.apache.directory.shared.ldap.model.message.Control; import org.apache.directory.shared.ldap.model.message.Message; Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Thu Feb 3 07:39:38 2011 @@ -43,8 +43,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.LdapEncoder; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.ResponseCarryingException; +import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator; -import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesDecorator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.filter.AndNode; import org.apache.directory.shared.ldap.model.filter.ApproximateNode; Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java Thu Feb 3 07:39:38 2011 @@ -30,7 +30,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.ILdapCodecService; -import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeDecorator; import org.apache.directory.shared.ldap.model.message.controls.ChangeType; import org.apache.directory.shared.ldap.model.message.controls.EntryChange; import org.apache.directory.shared.ldap.model.name.Dn; Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java Thu Feb 3 07:39:38 2011 @@ -30,7 +30,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.ILdapCodecService; -import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; import org.apache.directory.shared.ldap.model.message.controls.ChangeType; import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch; import org.apache.directory.shared.util.Strings; Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java Thu Feb 3 07:39:38 2011 @@ -32,7 +32,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.ILdapCodecService; -import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; import org.apache.directory.shared.ldap.model.message.controls.PagedResults; import org.apache.directory.shared.util.Strings; import org.junit.Test; Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java?rev=1066743&r1=1066742&r2=1066743&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java Thu Feb 3 07:39:38 2011 @@ -33,7 +33,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.ILdapCodecService; -import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesDecorator; +import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.shared.ldap.model.message.controls.Subentries; import org.apache.directory.shared.util.Strings; import org.junit.Test;
Mime	Unnamed text/plain (inline, 7-Bit, 83413 bytes)
	View raw message