You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/26 08:41:54 UTC
svn commit: r1063623 - in /directory:
apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/
apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/
apacheds/trunk/core/src/main/java/org/apache/directory...
Author: akarasulu
Date: Wed Jan 26 07:41:54 2011
New Revision: 1063623
URL: http://svn.apache.org/viewvc?rev=1063623&view=rev
Log:
fixing various compilation errors resulting from controls
Modified:
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.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/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/SearchHandler.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/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlFactory.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearch.java
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=1063623&r1=1063622&r2=1063623&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 Wed Jan 26 07:41:54 2011
@@ -47,6 +47,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.Subentries;
import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesDecorator;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -1267,7 +1268,7 @@ public class SubentryServiceIT extends A
// now add the control with visibility set to true where all entries
// except subentries disappear
- SubentriesDecorator ctl = new SubentriesDecorator();
+ Subentries ctl = new Subentries();
ctl.setVisibility( true );
sysRoot.setRequestControls( JndiUtils.toJndiControls(new Control[]
{ctl}) );
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1063623&r1=1063622&r2=1063623&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Wed Jan 26 07:41:54 2011
@@ -189,7 +189,7 @@ public abstract class ServerContext impl
ADS_CONTROLS.put( ManageDsaIT.OID, ControlEnum.MANAGE_DSA_IT_CONTROL );
ADS_CONTROLS.put( PagedResults.OID, ControlEnum.PAGED_RESULTS_CONTROL );
ADS_CONTROLS.put( PasswordPolicyRequestControl.CONTROL_OID, ControlEnum.PASSWORD_POLICY_REQUEST_CONTROL );
- ADS_CONTROLS.put( PersistentSearch.CONTROL_OID, ControlEnum.PERSISTENT_SEARCH_CONTROL );
+ ADS_CONTROLS.put( PersistentSearch.OID, ControlEnum.PERSISTENT_SEARCH_CONTROL );
ADS_CONTROLS.put( Subentries.OID, ControlEnum.SUBENTRIES_CONTROL );
ADS_CONTROLS.put( SyncDoneValueControl.CONTROL_OID, ControlEnum.SYNC_DONE_VALUE_CONTROL );
ADS_CONTROLS.put( SyncInfoValueControl.CONTROL_OID, ControlEnum.SYNC_INFO_VALUE_CONTROL );
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=1063623&r1=1063622&r2=1063623&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 Wed Jan 26 07:41:54 2011
@@ -174,7 +174,7 @@ public class DefaultPartitionNexus exten
rootDSE.put( SchemaConstants.SUPPORTED_EXTENSION_AT, NoticeOfDisconnect.EXTENSION_OID );
// Add the supported controls
- rootDSE.put( SchemaConstants.SUPPORTED_CONTROL_AT, PersistentSearch.CONTROL_OID,
+ rootDSE.put( SchemaConstants.SUPPORTED_CONTROL_AT, PersistentSearch.OID,
EntryChange.OID, Subentries.OID, ManageDsaIT.OID,
Cascade.OID, PagedResults.OID,
// Replication controls
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=1063623&r1=1063622&r2=1063623&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 Wed Jan 26 07:41:54 2011
@@ -301,7 +301,7 @@ public class SubentryInterceptor extends
* Checks to see if subentries for the search and list operations should be
* made visible based on the availability of the search request control
*
- * @param invocation the invocation object to use for determining subentry visibility
+ * @param opContext the invocation object to use for determining subentry visibility
* @return true if subentries should be visible, false otherwise
* @throws Exception if there are problems accessing request controls
*/
@@ -316,8 +316,7 @@ public class SubentryInterceptor extends
if ( opContext.hasRequestControl( SUBENTRY_CONTROL ) )
{
SubentriesDecorator subentriesDecorator = ( SubentriesDecorator ) opContext.getRequestControl( SUBENTRY_CONTROL );
-
- return subentriesDecorator.isVisible();
+ return ( ( Subentries ) subentriesDecorator.getDecorated() ).isVisible();
}
return false;
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=1063623&r1=1063622&r2=1063623&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 Wed Jan 26 07:41:54 2011
@@ -235,7 +235,7 @@ public class LdapServer extends Director
saslRealms.add( "example.com" );
this.supportedControls = new HashSet<String>();
- this.supportedControls.add( PersistentSearch.CONTROL_OID );
+ this.supportedControls.add( PersistentSearch.OID );
this.supportedControls.add( EntryChange.OID );
this.supportedControls.add( Subentries.OID );
this.supportedControls.add( ManageDsaIT.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=1063623&r1=1063622&r2=1063623&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 Wed Jan 26 07:41:54 2011
@@ -31,9 +31,8 @@ import org.apache.directory.server.core.
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.EntryChangeDecorator;
+import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChange;
import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearch;
-import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchDecorator;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.message.*;
import org.apache.directory.shared.ldap.model.message.SearchResultEntryImpl;
@@ -58,7 +57,7 @@ public class PersistentSearchListener im
private static final Logger LOG = LoggerFactory.getLogger( PersistentSearchListener.class );
final LdapSession session;
final SearchRequest req;
- final PersistentSearchDecorator decorator;
+ final PersistentSearch psearchControl;
PersistentSearchListener( LdapSession session, SearchRequest req )
@@ -66,7 +65,7 @@ public class PersistentSearchListener im
this.session = session;
this.req = req;
req.addAbandonListener( this );
- this.decorator = ( PersistentSearchDecorator ) req.getControls().get( PersistentSearch.CONTROL_OID );
+ this.psearchControl = ( PersistentSearch ) req.getControls().get( PersistentSearch.OID );
}
@@ -105,9 +104,9 @@ public class PersistentSearchListener im
private void setECResponseControl( SearchResultEntry response, ChangeOperationContext opContext, ChangeType type )
{
- if ( decorator.isReturnECs() )
+ if ( psearchControl.isReturnECs() )
{
- EntryChangeDecorator ecControl = new EntryChangeDecorator();
+ EntryChange ecControl = new EntryChange();
ecControl.setChangeType( type );
if ( opContext.getChangeLogEvent() != null )
@@ -127,7 +126,7 @@ public class PersistentSearchListener im
public void entryAdded( AddOperationContext addContext )
{
- if ( !decorator.isNotificationEnabled( ChangeType.ADD ) )
+ if ( !psearchControl.isNotificationEnabled( ChangeType.ADD ) )
{
return;
}
@@ -142,7 +141,7 @@ public class PersistentSearchListener im
public void entryDeleted( DeleteOperationContext deleteContext )
{
- if ( !decorator.isNotificationEnabled( ChangeType.DELETE ) )
+ if ( !psearchControl.isNotificationEnabled( ChangeType.DELETE ) )
{
return;
}
@@ -157,7 +156,7 @@ public class PersistentSearchListener im
public void entryModified( ModifyOperationContext modifyContext )
{
- if ( !decorator.isNotificationEnabled( ChangeType.MODIFY ) )
+ if ( !psearchControl.isNotificationEnabled( ChangeType.MODIFY ) )
{
return;
}
@@ -172,7 +171,7 @@ public class PersistentSearchListener im
public void entryMoved( MoveOperationContext moveContext )
{
- if ( !decorator.isNotificationEnabled( ChangeType.MODDN ) )
+ if ( !psearchControl.isNotificationEnabled( ChangeType.MODDN ) )
{
return;
}
@@ -193,7 +192,7 @@ public class PersistentSearchListener im
public void entryRenamed( RenameOperationContext renameContext )
{
- if ( !decorator.isNotificationEnabled( ChangeType.MODDN ) )
+ if ( !psearchControl.isNotificationEnabled( ChangeType.MODDN ) )
{
return;
}
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=1063623&r1=1063622&r2=1063623&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 Wed Jan 26 07:41:54 2011
@@ -128,7 +128,10 @@ public class SearchHandler extends LdapR
* We want the search to complete first before we start listening to
* events when the decorator does NOT specify changes ONLY mode.
*/
- if ( !psearchDecorator.isChangesOnly() )
+
+ PersistentSearch psearchControl = ( PersistentSearch ) psearchDecorator.getDecorated();
+
+ if ( !psearchControl.isChangesOnly() )
{
SearchResultDone done = doSimpleSearch( session, req );
@@ -156,7 +159,7 @@ public class SearchHandler extends LdapR
criteria.setBase( req.getBase() );
criteria.setFilter( req.getFilter() );
criteria.setScope( req.getScope() );
- criteria.setEventMask( EventType.getEventTypes( psearchDecorator.getChangeTypes() ) );
+ criteria.setEventMask( EventType.getEventTypes( psearchControl.getChangeTypes() ) );
getLdapServer().getDirectoryService().getEventService().addListener( handler, criteria );
req.addAbandonListener( new SearchAbandonListener( ldapServer, handler ) );
}
@@ -1011,7 +1014,7 @@ public class SearchHandler extends LdapR
// ===============================================================
PersistentSearchDecorator psearchDecorator = ( PersistentSearchDecorator ) req.getControls().get(
- PersistentSearch.CONTROL_OID );
+ PersistentSearch.OID );
if ( psearchDecorator != null )
{
@@ -1214,7 +1217,6 @@ public class SearchHandler extends LdapR
* response.
*
* @param session the session to use for processing
- * @param reqTargetDn the dn of the target entry of the request
* @param req the request
* @param entry the entry associated with the request
*/
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=1063623&r1=1063622&r2=1063623&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 Wed Jan 26 07:41:54 2011
@@ -54,7 +54,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChange;
import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeDecorator;
import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeDecoder;
-import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchDecorator;
+import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearch;
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;
@@ -119,11 +119,11 @@ public class PersistentSearchIT extends
private void setUpListenerReturnECs() throws Exception
{
- setUpListener( true, new PersistentSearchDecorator(), false );
+ setUpListener( true, new PersistentSearch(), false );
}
- private void setUpListener( boolean returnECs, PersistentSearchDecorator decorator, boolean ignoreEmptyRegistryCheck )
+ private void setUpListener( boolean returnECs, PersistentSearch persistentSearch, boolean ignoreEmptyRegistryCheck )
throws Exception
{
ctx = ( EventDirContext ) getWiredContext( ldapServer).lookup( BASE );
@@ -135,8 +135,8 @@ public class PersistentSearchIT extends
assertTrue( registrationEntryList.isEmpty() );
}
- decorator.setReturnECs( returnECs );
- listener = new PSearchListener( decorator );
+ persistentSearch.setReturnECs( returnECs );
+ listener = new PSearchListener( persistentSearch );
t = new Thread( listener, "PSearchListener" );
t.start();
@@ -331,11 +331,11 @@ public class PersistentSearchIT extends
@Test
public void testPsearchAddModifyEnabledWithEC() throws Exception
{
- PersistentSearchDecorator decorator = new PersistentSearchDecorator();
- decorator.setReturnECs( true );
- decorator.setChangeTypes( ChangeType.ADD.getValue() );
- decorator.enableNotification( ChangeType.MODIFY );
- setUpListener( true, decorator, false );
+ PersistentSearch ctrl = new PersistentSearch();
+ ctrl.setReturnECs( true );
+ ctrl.setChangeTypes( ChangeType.ADD.getValue() );
+ ctrl.enableNotification( ChangeType.MODIFY );
+ setUpListener( true, ctrl, false );
ctx.createSubcontext( "cn=Jack Black", getPersonAttributes( "Black", "Jack Black" ) );
waitForThreadToDie( t );
@@ -344,7 +344,7 @@ public class PersistentSearchIT extends
assertEquals( listener.result.control.getChangeType(), ChangeType.ADD );
tearDownListener();
- setUpListener( true, decorator, true );
+ setUpListener( true, ctrl, true );
ctx.destroySubcontext( "cn=Jack Black" );
waitForThreadToDie( t );
assertNull( listener.result );
@@ -521,19 +521,19 @@ public class PersistentSearchIT extends
{
boolean isReady = false;
PSearchNotification result;
- final PersistentSearchDecorator decorator;
+ final PersistentSearch persistentSearch;
LdapContext ctx;
NamingEnumeration<SearchResult> list;
PSearchListener()
{
- decorator = new PersistentSearchDecorator();
+ persistentSearch = new PersistentSearch();
}
- PSearchListener(PersistentSearchDecorator decorator )
+ PSearchListener(PersistentSearch persistentSearch )
{
- this.decorator = decorator;
+ this.persistentSearch = persistentSearch;
}
@@ -570,12 +570,11 @@ public class PersistentSearchIT extends
public void run()
{
LOG.debug( "PSearchListener.run() called." );
- decorator.setCritical( true );
+ persistentSearch.setCritical( true );
- decorator.setValue( decorator.getValue() );
+ persistentSearch.setValue( persistentSearch.getValue() );
- Control[] ctxCtls = new Control[]
- { decorator };
+ Control[] ctxCtls = new Control[] { persistentSearch };
try
{
@@ -590,7 +589,7 @@ public class PersistentSearchIT extends
while ( list.hasMore() )
{
LOG.debug( "PSearchListener search request got an item." );
- javax.naming.ldap.Control[] controls = null;
+ javax.naming.ldap.Control[] controls;
SearchResult sresult = list.next();
if ( sresult instanceof HasControls )
@@ -605,13 +604,14 @@ public class PersistentSearchIT extends
EntryChange.OID ) )
{
EntryChangeDecoder decoder = new EntryChangeDecoder();
- ecControl = ( EntryChangeDecorator ) decoder.decode( control.getEncodedValue(), new EntryChangeDecorator() );
+ ecControl = ( EntryChangeDecorator ) decoder.decode( control.getEncodedValue(),
+ new EntryChangeDecorator() );
}
}
}
}
- result = new PSearchNotification( sresult, ecControl );
+ result = new PSearchNotification( sresult, ( EntryChange ) ecControl.getDecorated() );
break;
}
@@ -632,10 +632,10 @@ public class PersistentSearchIT extends
class PSearchNotification extends SearchResult
{
private static final long serialVersionUID = 1L;
- final EntryChangeDecorator control;
+ final EntryChange control;
- public PSearchNotification(SearchResult result, EntryChangeDecorator control)
+ public PSearchNotification( SearchResult result, EntryChange 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=1063623&r1=1063622&r2=1063623&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 Wed Jan 26 07:41:54 2011
@@ -54,7 +54,7 @@ import org.apache.directory.server.core.
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.subentries.SubentriesDecorator;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.Subentries;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
@@ -735,10 +735,10 @@ public class SearchIT extends AbstractLd
+ " } " + " } " + " } " + " } " + "}" );
// prepare the subentry decorator to make the subentry visible
- SubentriesDecorator decorator = new SubentriesDecorator();
- decorator.setVisibility( true );
+ Subentries ctl = new Subentries();
+ ctl.setVisibility( true );
Control[] reqControls = new Control[]
- { decorator };
+ { ctl };
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java?rev=1063623&r1=1063622&r2=1063623&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java Wed Jan 26 07:41:54 2011
@@ -44,7 +44,7 @@ public enum ControlEnum
MANAGE_DSA_IT_CONTROL( ManageDsaIT.OID ),
PAGED_RESULTS_CONTROL( PagedResults.OID ),
PASSWORD_POLICY_REQUEST_CONTROL( PasswordPolicyRequestControl.CONTROL_OID ),
- PERSISTENT_SEARCH_CONTROL( PersistentSearch.CONTROL_OID),
+ PERSISTENT_SEARCH_CONTROL( PersistentSearch.OID ),
SUBENTRIES_CONTROL( Subentries.OID ),
SYNC_DONE_VALUE_CONTROL( SyncDoneValueControl.CONTROL_OID ),
SYNC_INFO_VALUE_CONTROL( SyncInfoValueControl.CONTROL_OID ),
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlFactory.java?rev=1063623&r1=1063622&r2=1063623&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlFactory.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlFactory.java Wed Jan 26 07:41:54 2011
@@ -74,7 +74,7 @@ public class ControlFactory
return new PagedResultsDecorator();
}
- if ( PersistentSearch.CONTROL_OID.equals( oid ) )
+ if ( PersistentSearch.OID.equals( oid ) )
{
return new PersistentSearchDecorator();
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearch.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearch.java?rev=1063623&r1=1063622&r2=1063623&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearch.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearch.java Wed Jan 26 07:41:54 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
public class PersistentSearch extends BasicControlImpl
{
/** This control OID */
- public static final String CONTROL_OID = "2.16.840.1.113730.3.4.3";
+ public static final String OID = "2.16.840.1.113730.3.4.3";
/** Definition of the change types */
public static final int CHANGE_TYPE_ADD = 1;