You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/11/13 01:04:28 UTC
svn commit: r1201365 [2/2] - in
/directory/apacheds/branches/apacheds-osgi/core-api/src:
main/java/org/apache/directory/server/core/api/
main/java/org/apache/directory/server/core/api/interceptor/
main/java/org/apache/directory/server/core/api/intercep...
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ModifyOperationContext.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ModifyOperationContext.java Sun Nov 13 00:04:27 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.api.interceptor.context;
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.OperationEnum;
import org.apache.directory.server.core.api.entry.ServerEntryUtils;
import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
@@ -60,6 +61,11 @@ public class ModifyOperationContext exte
public ModifyOperationContext( CoreSession session )
{
super( session );
+
+ if ( session != null )
+ {
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.MODIFY ) );
+ }
}
@@ -73,6 +79,11 @@ public class ModifyOperationContext exte
{
super( session, dn );
+ if ( session != null )
+ {
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.MODIFY ) );
+ }
+
this.modItems = modItems;
}
@@ -81,6 +92,11 @@ public class ModifyOperationContext exte
{
super( session, modifyRequest.getName() );
+ if ( session != null )
+ {
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.MODIFY ) );
+ }
+
modItems = ServerEntryUtils.toServerModification( modifyRequest.getModifications().toArray(
new DefaultModification[0] ), session.getDirectoryService().getSchemaManager() );
@@ -118,7 +134,7 @@ public class ModifyOperationContext exte
public static List<Modification> createModItems( Entry serverEntry, ModificationOperation modOp )
throws LdapException
- {
+ {
List<Modification> items = new ArrayList<Modification>( serverEntry.size() );
for ( Attribute attribute : serverEntry )
@@ -127,7 +143,7 @@ public class ModifyOperationContext exte
}
return items;
- }
+ }
/**
@@ -140,7 +156,7 @@ public class ModifyOperationContext exte
/**
- * Returns the entry after it has been renamed and potentially changed for
+ * Returns the entry after it has been renamed and potentially changed for
* Rdn alterations.
*
* @return the new renamed entry
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveAndRenameOperationContext.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveAndRenameOperationContext.java Sun Nov 13 00:04:27 2011
@@ -21,6 +21,7 @@ package org.apache.directory.server.core
import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.OperationEnum;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.model.message.ModifyDnRequest;
@@ -46,6 +47,7 @@ public class MoveAndRenameOperationConte
public MoveAndRenameOperationContext( CoreSession session )
{
super( session );
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.MOVE_AND_RENAME ) );
}
@@ -61,7 +63,8 @@ public class MoveAndRenameOperationConte
{
super( session, oldDn, newRdn, delOldRdn );
this.newSuperiorDn = newSuperiorDn;
-
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.MOVE_AND_RENAME ) );
+
try
{
newDn = newSuperiorDn.add( newRdn );
@@ -78,6 +81,7 @@ public class MoveAndRenameOperationConte
// super sets the newRdn and the delOldRdn members and tests
super( session, modifyDnRequest );
this.newSuperiorDn = modifyDnRequest.getNewSuperior();
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.MOVE_AND_RENAME ) );
if ( newSuperiorDn == null )
{
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveOperationContext.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveOperationContext.java Sun Nov 13 00:04:27 2011
@@ -6,21 +6,22 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.api.interceptor.context;
import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.OperationEnum;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
@@ -43,13 +44,13 @@ public class MoveOperationContext extend
/** The entry Rdn */
private Rdn rdn;
-
+
/** The newSuperior Dn */
private Dn newSuperior;
-
+
/** The New target Dn */
private Dn newDn;
-
+
/**
* Creates a new instance of MoveOperationContext.
@@ -57,8 +58,9 @@ public class MoveOperationContext extend
public MoveOperationContext( CoreSession session )
{
super( session );
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.MOVE ) );
}
-
+
/**
* Creates a new instance of MoveOperationContext.
@@ -68,8 +70,9 @@ public class MoveOperationContext extend
super( session, oldDn );
this.newSuperior = newSuperior;
oldSuperior = oldDn.getParent();
- rdn = (Rdn)( oldDn.getRdn().clone() );
-
+ rdn = ( oldDn.getRdn().clone() );
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.MOVE ) );
+
try
{
newDn = newSuperior.add( rdn );
@@ -80,24 +83,25 @@ public class MoveOperationContext extend
}
}
-
+
public MoveOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
{
super( session, modifyDnRequest.getName() );
this.newSuperior = modifyDnRequest.getNewSuperior();
-
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.MOVE ) );
+
if ( newSuperior == null )
{
throw new IllegalArgumentException( I18n.err( I18n.ERR_326_NEW_SUPERIROR_CANNOT_BE_NULL, modifyDnRequest ) );
}
-
+
this.requestControls = modifyDnRequest.getControls();
-
+
if ( modifyDnRequest.getNewRdn() != null )
{
throw new IllegalArgumentException( I18n.err( I18n.ERR_327_MOVE_AND_RENAME_OPERATION, modifyDnRequest ) );
}
-
+
if ( requestControls.containsKey( ManageDsaIT.OID ) )
{
ignoreReferral();
@@ -108,10 +112,10 @@ public class MoveOperationContext extend
}
oldSuperior = modifyDnRequest.getName().getParent();
- rdn = (Rdn)(modifyDnRequest.getName().getRdn().clone());
-
+ rdn = (modifyDnRequest.getName().getRdn().clone());
+
try
- {
+ {
newDn = newSuperior.add( rdn );
}
catch ( LdapInvalidDnException lide )
@@ -137,7 +141,7 @@ public class MoveOperationContext extend
{
return newSuperior;
}
-
+
/**
* @return The Rdn
@@ -146,8 +150,8 @@ public class MoveOperationContext extend
{
return rdn;
}
-
-
+
+
/**
* @return The new Dn
*/
@@ -155,7 +159,7 @@ public class MoveOperationContext extend
{
return newDn;
}
-
+
/**
* @return the operation name
@@ -165,13 +169,13 @@ public class MoveOperationContext extend
return MessageTypeEnum.MODIFYDN_REQUEST.name();
}
-
+
/**
* @see Object#toString()
*/
public String toString()
{
return "ReplaceContext for old Dn '" + getDn().getName() + "'" +
- ", newSuperior '" + newSuperior + "'";
+ ", newSuperior '" + newSuperior + "'";
}
}
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/OperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/OperationContext.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/OperationContext.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/OperationContext.java Sun Nov 13 00:04:27 2011
@@ -272,6 +272,22 @@ public interface OperationContext
*/
Collection<String> getByPassed();
+ /**
+ * Gets the next interceptor in the list of interceptors. The
+ * position in the list will be incremented.
+ *
+ * @return The next interceptor from the list of interceptors
+ */
+ String getNextInterceptor();
+
+
+ /**
+ * Sets the list of interceptors to go through for an operation
+ *
+ * @param interceptors The list of interceptors
+ */
+ void setInterceptors( List<String> interceptors );
+
/**
* Sets the set of bypassed Interceptors.
@@ -312,7 +328,14 @@ public interface OperationContext
void add( Entry entry, Collection<String> byPass ) throws LdapException;
- void delete( Dn dn, Collection<String> byPass ) throws LdapException;
+ /**
+ * Process the delete for inner operations. This is only valid for SubschemaSubentry
+ * operations, and will most certainly be removed later.
+ *
+ * @param dn
+ * @throws LdapException
+ */
+ void delete( Dn dn ) throws LdapException;
/**
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/RenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/RenameOperationContext.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/RenameOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/RenameOperationContext.java Sun Nov 13 00:04:27 2011
@@ -6,21 +6,22 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.api.interceptor.context;
import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.OperationEnum;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
@@ -54,6 +55,7 @@ public class RenameOperationContext exte
public RenameOperationContext( CoreSession session )
{
super( session );
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.RENAME ) );
}
@@ -69,6 +71,7 @@ public class RenameOperationContext exte
super( session, oldDn );
this.newRdn = newRdn;
this.deleteOldRdn = deleteOldRdn;
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.RENAME ) );
}
@@ -76,15 +79,16 @@ public class RenameOperationContext exte
{
super( session, modifyDnRequest.getName() );
this.newRdn = modifyDnRequest.getNewRdn();
-
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.RENAME ) );
+
if ( newRdn == null )
{
throw new IllegalStateException( I18n.err( I18n.ERR_328, modifyDnRequest ) );
}
-
+
this.deleteOldRdn = modifyDnRequest.getDeleteOldRdn();
this.requestControls = modifyDnRequest.getControls();
-
+
if ( requestControls.containsKey( ManageDsaIT.OID ) )
{
ignoreReferral();
@@ -99,7 +103,7 @@ public class RenameOperationContext exte
/**
* @return The delete old Rdn flag
*/
- public boolean getDeleteOldRdn()
+ public boolean getDeleteOldRdn()
{
return deleteOldRdn;
}
@@ -109,7 +113,7 @@ public class RenameOperationContext exte
* Set the flag to delete the old Rdn
* @param deleteOldRdn the flag to set
*/
- public void setDelOldDn( boolean deleteOldRdn )
+ public void setDelOldDn( boolean deleteOldRdn )
{
this.deleteOldRdn = deleteOldRdn;
}
@@ -160,15 +164,15 @@ public class RenameOperationContext exte
{
return MessageTypeEnum.MODIFYDN_REQUEST.name();
}
-
-
+
+
/**
* @see Object#toString()
*/
public String toString()
{
return "RenameContext for old Dn '" + getDn().getName() + "'" +
- ", new Rdn '" + newRdn + "'" +
- ( deleteOldRdn ? ", delete old Rdn" : "" ) ;
+ ", new Rdn '" + newRdn + "'" +
+ ( deleteOldRdn ? ", delete old Rdn" : "" ) ;
}
}
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java Sun Nov 13 00:04:27 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.api.interceptor.context;
@@ -28,6 +28,7 @@ import java.util.Set;
import javax.naming.directory.SearchControls;
import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.OperationEnum;
import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -57,41 +58,43 @@ public class SearchOperationContext exte
public SearchOperationContext( CoreSession session )
{
super( session );
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.SEARCH ) );
}
/**
* Creates a new instance of SearchOperationContext.
- * @throws Exception
+ * @throws Exception
*/
public SearchOperationContext( CoreSession session, SearchRequest searchRequest ) throws LdapException
{
super( session );
-
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.SEARCH ) );
+
this.dn = searchRequest.getBase();
this.filter = searchRequest.getFilter();
this.abandoned = searchRequest.isAbandoned();
this.aliasDerefMode = searchRequest.getDerefAliases();
-
+
this.requestControls = searchRequest.getControls();
this.scope = searchRequest.getScope();
this.sizeLimit = searchRequest.getSizeLimit();
this.timeLimit = searchRequest.getTimeLimit();
this.typesOnly = searchRequest.getTypesOnly();
-
+
List<String> ats = searchRequest.getAttributes();
-
+
// section 4.5.1.8 of RFC 4511
//1. An empty list with no attributes requests the return of all user attributes.
if ( ats.isEmpty() )
{
ats = new ArrayList<String>();
ats.add( SchemaConstants.ALL_USER_ATTRIBUTES );
- ats = Collections.unmodifiableList( ats );
+ ats = Collections.unmodifiableList( ats );
}
-
+
setReturningAttributes( ats );
-
+
throwReferral = !requestControls.containsKey( ManageDsaIT.OID );
}
@@ -111,6 +114,7 @@ public class SearchOperationContext exte
timeLimit = searchControls.getTimeLimit();
sizeLimit = searchControls.getCountLimit();
typesOnly = searchControls.getReturningObjFlag();
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.SEARCH ) );
if ( searchControls.getReturningAttributes() != null )
{
@@ -139,11 +143,12 @@ public class SearchOperationContext exte
super( session, dn, returningAttributes );
super.setScope( scope );
this.filter = filter;
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.SEARCH ) );
}
/**
- * Checks whether or not the ManageDsaITControl is present. If not
+ * Checks whether or not the ManageDsaITControl is present. If not
* present then the filter is modified to force the return of all referral
* entries regardless of whether or not the filter matches the referral
* entry.
@@ -152,8 +157,8 @@ public class SearchOperationContext exte
{
return super.hasRequestControl( ManageDsaIT.OID );
}
-
-
+
+
/**
* @return The filter
*/
@@ -180,7 +185,7 @@ public class SearchOperationContext exte
public String toString()
{
return "SearchContext for Dn '" + getDn().getName() + "', filter :'"
- + filter + "'";
+ + filter + "'";
}
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/UnbindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/UnbindOperationContext.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/UnbindOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/UnbindOperationContext.java Sun Nov 13 00:04:27 2011
@@ -21,6 +21,7 @@ package org.apache.directory.server.core
import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.OperationEnum;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.model.message.UnbindRequest;
@@ -39,13 +40,15 @@ public class UnbindOperationContext exte
public UnbindOperationContext( CoreSession session )
{
super( session, session.getEffectivePrincipal().getDn() );
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.UNBIND ) );
}
public UnbindOperationContext( CoreSession session, UnbindRequest unbindRequest )
{
super( session, session.getEffectivePrincipal().getDn() );
- this.setRequestControls( unbindRequest.getControls() );
+ setRequestControls( unbindRequest.getControls() );
+ setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.UNBIND ) );
}
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java Sun Nov 13 00:04:27 2011
@@ -28,7 +28,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
@@ -230,7 +230,7 @@ public interface Partition
* @return true if the entry exists, false if it does not
* @throws Exception if there are any problems
*/
- boolean hasEntry( EntryOperationContext hasEntryContext ) throws LdapException;
+ boolean hasEntry( HasEntryOperationContext hasEntryContext ) throws LdapException;
/**
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java Sun Nov 13 00:04:27 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.api.partition;
@@ -23,7 +23,7 @@ package org.apache.directory.server.core
import java.util.Set;
import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.name.Dn;
@@ -55,7 +55,7 @@ public interface PartitionNexus extends
*
* @return the attributes of the RootDSE
*/
- public Entry getRootDSE( GetRootDSEOperationContext getRootDSEContext );
+ public Entry getRootDse( GetRootDseOperationContext getRootDseContext );
/**
@@ -78,9 +78,9 @@ public interface PartitionNexus extends
/**
- * Get's the partition corresponding to a distinguished name. This
- * name need not be the name of the partition suffix. When used in
- * conjunction with get suffix this can properly find the partition
+ * Get's the partition corresponding to a distinguished name. This
+ * name need not be the name of the partition suffix. When used in
+ * conjunction with get suffix this can properly find the partition
* associated with the Dn. Make sure to use the normalized Dn.
*
* @param dn the normalized distinguished name to get a partition for
@@ -115,7 +115,7 @@ public interface PartitionNexus extends
/**
* Adds a set of supportedExtension (OID Strings) to the RootDSE.
*
- * @param extensionOids a set of OID strings to add to the supportedExtension
+ * @param extensionOids a set of OID strings to add to the supportedExtension
* attribute in the RootDSE
*/
public void registerSupportedExtensions( Set<String> extensionOids ) throws LdapException;
@@ -124,7 +124,7 @@ public interface PartitionNexus extends
/**
* Adds a set of supportedSaslMechanisms (OID Strings) to the RootDSE.
*
- * @param extensionOids a set of OID strings to add to the supportedSaslMechanisms
+ * @param extensionOids a set of OID strings to add to the supportedSaslMechanisms
* attribute in the RootDSE
*/
public void registerSupportedSaslMechanisms( Set<String> supportedSaslMechanisms ) throws LdapException;
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java Sun Nov 13 00:04:27 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
@@ -318,7 +318,7 @@ public final class SchemaPartition exten
/**
* {@inheritDoc}
*/
- public boolean hasEntry( EntryOperationContext hasEntryContext ) throws LdapException
+ public boolean hasEntry( HasEntryOperationContext hasEntryContext ) throws LdapException
{
return wrapped.hasEntry( hasEntryContext );
}
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java Sun Nov 13 00:04:27 2011
@@ -38,7 +38,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
@@ -864,8 +864,9 @@ public class MockCoreSession implements
public boolean exists( Dn dn ) throws LdapException
{
- EntryOperationContext hasEntryContext = new EntryOperationContext( this, dn );
+ HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( this, dn );
OperationManager operationManager = directoryService.getOperationManager();
+
return operationManager.hasEntry( hasEntryContext );
}
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java Sun Nov 13 00:04:27 2011
@@ -6,35 +6,28 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.api;
import java.io.File;
+import java.util.Collections;
import java.util.Hashtable;
import java.util.List;
import java.util.Set;
import javax.naming.ldap.LdapContext;
-import org.apache.directory.server.core.api.CacheService;
-import org.apache.directory.server.core.api.CoreSession;
-import org.apache.directory.server.core.api.DirectoryService;
-import org.apache.directory.server.core.api.DnFactory;
-import org.apache.directory.server.core.api.InstanceLayout;
-import org.apache.directory.server.core.api.LdapPrincipal;
-import org.apache.directory.server.core.api.OperationManager;
-import org.apache.directory.server.core.api.ReferralManager;
import org.apache.directory.server.core.api.administrative.AccessControlAdministrativePoint;
import org.apache.directory.server.core.api.administrative.CollectiveAttributeAdministrativePoint;
import org.apache.directory.server.core.api.administrative.SubschemaAdministrativePoint;
@@ -42,7 +35,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.changelog.ChangeLog;
import org.apache.directory.server.core.api.event.EventService;
import org.apache.directory.server.core.api.interceptor.Interceptor;
-import org.apache.directory.server.core.api.interceptor.InterceptorChain;
import org.apache.directory.server.core.api.journal.Journal;
import org.apache.directory.server.core.api.partition.Partition;
import org.apache.directory.server.core.api.partition.PartitionNexus;
@@ -67,22 +59,22 @@ import org.apache.directory.shared.ldap.
public class MockDirectoryService implements DirectoryService
{
int count;
-
+
/** The schemaManager */
SchemaManager schemaManager;
-
-
+
+
public MockDirectoryService()
{
this( 0 );
}
-
-
+
+
public MockDirectoryService( int count )
{
this.count = count;
}
-
+
public Hashtable<String, Object> getEnvironment()
{
return null;
@@ -112,12 +104,6 @@ public class MockDirectoryService implem
}
- public InterceptorChain getInterceptorChain()
- {
- return null;
- }
-
-
public void addPartition( Partition partition ) throws LdapException
{
}
@@ -243,7 +229,7 @@ public class MockDirectoryService implem
public List<Interceptor> getInterceptors()
{
- return null;
+ return Collections.EMPTY_LIST;
}
@@ -345,12 +331,12 @@ public class MockDirectoryService implem
{
}
-
+
public void setChangeLog( ChangeLog changeLog )
{
-
+
}
-
+
public ChangeLog getChangeLog()
{
return null;
@@ -367,7 +353,7 @@ public class MockDirectoryService implem
{
return null;
}
-
+
public Entry newEntry( String ldif, String dn )
{
return null;
@@ -397,12 +383,12 @@ public class MockDirectoryService implem
return null;
}
-
+
public CoreSession getSession( Dn principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
throws LdapException
- {
+ {
return null;
- }
+ }
public CoreSession getAdminSession()
{
@@ -417,19 +403,19 @@ public class MockDirectoryService implem
public void setEventService( EventService eventService )
{
}
-
-
+
+
public boolean isPasswordHidden()
{
return false;
}
-
-
+
+
public void setPasswordHidden( boolean passwordHidden )
{
}
-
+
public int getMaxPDUSize()
{
return Integer.MAX_VALUE;
@@ -441,25 +427,25 @@ public class MockDirectoryService implem
// Do nothing
}
-
+
public Interceptor getInterceptor( String interceptorName )
{
return null;
}
-
-
+
+
public Csn getCSN()
{
return null;
}
-
-
+
+
public int getReplicaId()
{
return 0;
}
-
-
+
+
public void setReplicaId( int replicaId )
{
}
@@ -578,4 +564,40 @@ public class MockDirectoryService implem
// TODO Auto-generated method stub
return null;
}
+
+
+ @Override
+ public List<String> getInterceptors( OperationEnum operation )
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+ @Override
+ public void addFirst( Interceptor interceptor ) throws LdapException
+ {
+ // TODO Auto-generated method stub
+ }
+
+
+ @Override
+ public void addLast( Interceptor interceptor ) throws LdapException
+ {
+ // TODO Auto-generated method stub
+ }
+
+
+ @Override
+ public void addAfter( String interceptorName, Interceptor interceptor )
+ {
+ // TODO Auto-generated method stub
+ }
+
+
+ @Override
+ public void remove( String interceptorName )
+ {
+ // TODO Auto-generated method stub
+ }
}
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java Sun Nov 13 00:04:27 2011
@@ -22,16 +22,14 @@ package org.apache.directory.server.core
import java.util.List;
-import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
-import org.apache.directory.server.core.api.interceptor.Interceptor;
-import org.apache.directory.server.core.api.interceptor.NextInterceptor;
+import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
@@ -44,7 +42,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.exception.LdapException;
-public class MockInterceptor implements Interceptor
+public class MockInterceptor extends BaseInterceptor
{
final String name;
final List<MockInterceptor> interceptors;
@@ -79,102 +77,145 @@ public class MockInterceptor implements
}
- public Entry getRootDSE( NextInterceptor next, GetRootDSEOperationContext getRootDseContext )
- throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public void add( AddOperationContext addContext ) throws LdapException
{
interceptors.add( this );
- return next.getRootDSE( getRootDseContext );
+ next( addContext );
}
- public boolean compare( NextInterceptor next, CompareOperationContext compareContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public void bind( BindOperationContext bindContext ) throws LdapException
{
interceptors.add( this );
- return next.compare( compareContext );
+ next( bindContext );
}
- public void delete( NextInterceptor next, DeleteOperationContext deleteContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public boolean compare( CompareOperationContext compareContext ) throws LdapException
{
interceptors.add( this );
- next.delete( deleteContext );
+ return next( compareContext );
}
- public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public void delete( DeleteOperationContext deleteContext ) throws LdapException
{
interceptors.add( this );
- next.add( addContext );
+ next( deleteContext );
}
- public void modify( NextInterceptor next, ModifyOperationContext modifyContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException
{
interceptors.add( this );
- next.modify( modifyContext );
+ return next( getRootDseContext );
}
- public EntryFilteringCursor list( NextInterceptor next, ListOperationContext listContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public boolean hasEntry( HasEntryOperationContext hasEntryContext ) throws LdapException
{
interceptors.add( this );
- return next.list( listContext );
+ return next( hasEntryContext );
}
- public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext searchContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
{
interceptors.add( this );
- return next.search( searchContext );
+ return next( listContext );
}
- public Entry lookup( NextInterceptor next, LookupOperationContext lookupContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
{
interceptors.add( this );
- return next.lookup( lookupContext );
+
+ return next( lookupContext );
}
- public boolean hasEntry( NextInterceptor next, EntryOperationContext hasEntryContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public void modify( ModifyOperationContext modifyContext ) throws LdapException
{
interceptors.add( this );
- return next.hasEntry( hasEntryContext );
+ next( modifyContext );
}
- public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public void move( MoveOperationContext moveContext ) throws LdapException
{
interceptors.add( this );
- next.rename( renameContext );
+ next( moveContext );
}
- public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public void moveAndRename( MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException
{
interceptors.add( this );
- next.move( moveContext );
+ next( moveAndRenameContext );
}
- public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public void rename( RenameOperationContext renameContext ) throws LdapException
{
interceptors.add( this );
- next.moveAndRename( moveAndRenameContext );
+ next( renameContext );
}
- public void bind( NextInterceptor next, BindOperationContext bindContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException
{
interceptors.add( this );
- next.bind( bindContext );
+
+ return next( searchContext );
}
- public void unbind( NextInterceptor next, UnbindOperationContext unbindContext ) throws LdapException
+ /**
+ * {@inheritDoc}
+ */
+ public void unbind( UnbindOperationContext unbindContext ) throws LdapException
{
interceptors.add( this );
- next.unbind( unbindContext );
+ next( unbindContext );
}
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java Sun Nov 13 00:04:27 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.api;
@@ -44,7 +44,7 @@ public class MockOperation implements Op
final CoreSession session;
- public MockOperation( SchemaManager schemaManager, int count ) throws Exception
+ public MockOperation( SchemaManager schemaManager, int count ) throws Exception
{
this.count = count;
this.session = new MockCoreSession( new LdapPrincipal( schemaManager, new Dn( schemaManager ), AuthenticationLevel.STRONG ),
@@ -250,7 +250,7 @@ public class MockOperation implements Op
}
- public void delete( Dn dn, Collection<String> bypass ) throws LdapException
+ public void delete( Dn dn ) throws LdapException
{
}
@@ -308,4 +308,20 @@ public class MockOperation implements Op
{
return false;
}
+
+
+ @Override
+ public void setInterceptors( List<String> interceptors )
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public String getNextInterceptor()
+ {
+ // TODO Auto-generated method stub
+ return "";
+ }
}
Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java?rev=1201365&r1=1201364&r2=1201365&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java Sun Nov 13 00:04:27 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.api;
@@ -26,8 +26,8 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
@@ -68,12 +68,12 @@ public class MockOperationManager implem
{
}
- public Entry getRootDSE( GetRootDSEOperationContext getRootDseContext ) throws LdapException
+ public Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException
{
return null;
}
- public boolean hasEntry( EntryOperationContext hasEntryContext ) throws LdapException
+ public boolean hasEntry( HasEntryOperationContext hasEntryContext ) throws LdapException
{
return false;
}