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/12 19:24:43 UTC
svn commit: r1201297 [2/9] - in /directory/apacheds/branches/apacheds-txns:
all/ apache-felix/ core-annotations/ core-api/
core-api/src/main/java/org/apache/directory/server/core/api/
core-api/src/main/java/org/apache/directory/server/core/api/intercep...
Modified: directory/apacheds/branches/apacheds-txns/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-txns/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/RenameOperationContext.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/RenameOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/RenameOperationContext.java Sat Nov 12 18:24:38 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-txns/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-txns/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java Sat Nov 12 18:24:38 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-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java Sat Nov 12 18:24:38 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-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java Sat Nov 12 18:24:38 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-txns/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java Sat Nov 12 18:24:38 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-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java Sat Nov 12 18:24:38 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,7 +864,7 @@ 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-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockDirectoryService.java Sat Nov 12 18:24:38 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 )
{
}
@@ -580,38 +566,38 @@ public class MockDirectoryService implem
}
- @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
- }
+ @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-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java Sat Nov 12 18:24:38 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.BaseInterceptor;
-import org.apache.directory.server.core.api.interceptor.NextInterceptor;
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;
@@ -82,10 +80,10 @@ public class MockInterceptor extends Bas
/**
* {@inheritDoc}
*/
- public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
+ public void add( AddOperationContext addContext ) throws LdapException
{
interceptors.add( this );
- next.add( addContext );
+ next( addContext );
}
@@ -122,7 +120,7 @@ public class MockInterceptor extends Bas
/**
* {@inheritDoc}
*/
- public Entry getRootDSE( GetRootDSEOperationContext getRootDseContext ) throws LdapException
+ public Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException
{
interceptors.add( this );
return next( getRootDseContext );
@@ -132,7 +130,7 @@ public class MockInterceptor extends Bas
/**
* {@inheritDoc}
*/
- public boolean hasEntry( EntryOperationContext hasEntryContext ) throws LdapException
+ public boolean hasEntry( HasEntryOperationContext hasEntryContext ) throws LdapException
{
interceptors.add( this );
return next( hasEntryContext );
@@ -163,50 +161,51 @@ public class MockInterceptor extends Bas
/**
* {@inheritDoc}
*/
- public void modify( NextInterceptor next, ModifyOperationContext modifyContext ) throws LdapException
+ public void modify( ModifyOperationContext modifyContext ) throws LdapException
{
interceptors.add( this );
- next.modify( modifyContext );
+ next( modifyContext );
}
/**
* {@inheritDoc}
*/
- public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
+ public void move( MoveOperationContext moveContext ) throws LdapException
{
interceptors.add( this );
- next.move( moveContext );
+ next( moveContext );
}
/**
* {@inheritDoc}
*/
- public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException
+ public void moveAndRename( MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException
{
interceptors.add( this );
- next.moveAndRename( moveAndRenameContext );
+ next( moveAndRenameContext );
}
/**
* {@inheritDoc}
*/
- public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
+ public void rename( RenameOperationContext renameContext ) throws LdapException
{
interceptors.add( this );
- next.rename( renameContext );
+ next( renameContext );
}
/**
* {@inheritDoc}
*/
- public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext searchContext ) throws LdapException
+ public EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException
{
interceptors.add( this );
- return next.search( searchContext );
+
+ return next( searchContext );
}
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java Sat Nov 12 18:24:38 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 ),
@@ -310,18 +310,18 @@ public class MockOperation implements Op
}
- @Override
- public void setInterceptors( List<String> interceptors )
- {
- // TODO Auto-generated method stub
-
- }
+ @Override
+ public void setInterceptors( List<String> interceptors )
+ {
+ // TODO Auto-generated method stub
+
+ }
- @Override
- public String getNextInterceptor()
- {
- // TODO Auto-generated method stub
- return "";
- }
+ @Override
+ public String getNextInterceptor()
+ {
+ // TODO Auto-generated method stub
+ return "";
+ }
}
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java Sat Nov 12 18:24:38 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;
}
Propchange: directory/apacheds/branches/apacheds-txns/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 2011
@@ -4,6 +4,6 @@
/directory/apacheds/branches/apacheds-jdbm/core-avl:1160768-1164073
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765
/directory/apacheds/branches/milestones/core-avl:1072812-1075328
-/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1186967
+/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
/directory/apacheds/trunk/interceptors/core-avl:1183435-1186974
/directory/studio/trunk/core-avl:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-txns/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 2011
@@ -4,6 +4,6 @@
/directory/apacheds/branches/apacheds-jdbm/core-constants:1160768-1164075
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765
/directory/apacheds/branches/milestones/core-constants:1072812-1075328
-/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1186967
+/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
/directory/apacheds/trunk/interceptors/core-constants:1183435-1186974
/directory/studio/trunk/core-constants:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-txns/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 2011
@@ -5,6 +5,6 @@
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765
/directory/apacheds/branches/apacheds-osgi/core-integ:1185681-1199322
/directory/apacheds/branches/milestones/core-integ:1072812-1075328
-/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1200371
+/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
/directory/apacheds/trunk/interceptors/core-integ:1183435-1186974
/directory/studio/trunk/core-integ:1067786-1067997
Modified: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Sat Nov 12 18:24:38 2011
@@ -43,6 +43,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.server.core.api.InterceptorEnum;
import org.apache.directory.server.core.api.authn.ppolicy.PasswordPolicyConfiguration;
import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
@@ -91,7 +92,7 @@ public class PasswordPolicyTest extends
private static final LdapApiService codec = LdapApiServiceFactory.getSingleton();
- private static final PasswordPolicyDecorator PP_REQ_CTRL =
+ private static final PasswordPolicyDecorator PP_REQ_CTRL =
new PasswordPolicyDecorator( codec, new PasswordPolicyImpl() );
@@ -113,11 +114,11 @@ public class PasswordPolicyTest extends
PpolicyConfigContainer policyContainer = new PpolicyConfigContainer();
policyContainer.setDefaultPolicy( policyConfig );
- AuthenticationInterceptor authenticationInterceptor = (AuthenticationInterceptor)getService().getInterceptor( AuthenticationInterceptor.class.getSimpleName() );
+ AuthenticationInterceptor authenticationInterceptor = (AuthenticationInterceptor)getService().getInterceptor( InterceptorEnum.AUTHENTICATION_INTERCEPTOR.getName() );
authenticationInterceptor.setPwdPolicies( policyContainer );
AuthenticationInterceptor authInterceptor = ( AuthenticationInterceptor ) getService()
- .getInterceptor( AuthenticationInterceptor.class.getSimpleName() );
+ .getInterceptor( InterceptorEnum.AUTHENTICATION_INTERCEPTOR.getName() );
authInterceptor.loadPwdPolicyStateAtributeTypes();
}
@@ -136,12 +137,12 @@ public class PasswordPolicyTest extends
LdapConnection connection = getAdminNetworkConnection( getLdapServer() );
Dn userDn = new Dn( "cn=user,ou=system" );
- Entry userEntry = new DefaultEntry(
- userDn.toString(),
- "ObjectClass: top",
- "ObjectClass: person",
+ Entry userEntry = new DefaultEntry(
+ userDn.toString(),
+ "ObjectClass: top",
+ "ObjectClass: person",
"cn: user",
- "sn: user_sn",
+ "sn: user_sn",
"userPassword: 1234" );
AddRequest addRequest = new AddRequestImpl();
@@ -223,12 +224,12 @@ public class PasswordPolicyTest extends
LdapConnection adminConnection = getAdminNetworkConnection( getLdapServer() );
Dn userDn = new Dn( "cn=user2,ou=system" );
- Entry userEntry = new DefaultEntry(
- userDn.toString(),
- "ObjectClass: top",
- "ObjectClass: person",
+ Entry userEntry = new DefaultEntry(
+ userDn.toString(),
+ "ObjectClass: top",
+ "ObjectClass: person",
"cn: user2",
- "sn: user_sn",
+ "sn: user_sn",
"userPassword: 12345" );
AddRequest addRequest = new AddRequestImpl();
@@ -279,11 +280,11 @@ public class PasswordPolicyTest extends
Dn userDn = new Dn( "cn=userMinAge,ou=system" );
Entry userEntry = new DefaultEntry(
- userDn.toString(),
- "ObjectClass: top",
- "ObjectClass: person",
+ userDn.toString(),
+ "ObjectClass: top",
+ "ObjectClass: person",
"cn: userMinAge",
- "sn: userMinAge_sn",
+ "sn: userMinAge_sn",
"userPassword: 12345");
AddRequest addRequest = new AddRequestImpl();
@@ -327,11 +328,11 @@ public class PasswordPolicyTest extends
Dn userDn = new Dn( "cn=userPwdHist,ou=system" );
Entry userEntry = new DefaultEntry(
- userDn.toString(),
- "ObjectClass: top",
- "ObjectClass: person",
+ userDn.toString(),
+ "ObjectClass: top",
+ "ObjectClass: person",
"cn: userPwdHist",
- "sn: userPwdHist_sn",
+ "sn: userPwdHist_sn",
"userPassword: 12345" );
AddRequest addRequest = new AddRequestImpl();
@@ -396,11 +397,11 @@ public class PasswordPolicyTest extends
Dn userDn = new Dn( "cn=userLen,ou=system" );
Entry userEntry = new DefaultEntry(
- userDn.toString(),
- "ObjectClass: top",
- "ObjectClass: person",
+ userDn.toString(),
+ "ObjectClass: top",
+ "ObjectClass: person",
"cn: userLen",
- "sn: userLen_sn",
+ "sn: userLen_sn",
"userPassword: 1234");
AddRequest addRequest = new AddRequestImpl();
@@ -446,11 +447,11 @@ public class PasswordPolicyTest extends
Dn userDn = new Dn( "cn=userMaxAge,ou=system" );
String password = "12345";
Entry userEntry = new DefaultEntry(
- userDn.toString(),
- "ObjectClass: top",
- "ObjectClass: person",
+ userDn.toString(),
+ "ObjectClass: top",
+ "ObjectClass: person",
"cn: userMaxAge",
- "sn: userMaxAge_sn",
+ "sn: userMaxAge_sn",
"userPassword: " + password );
AddRequest addRequest = new AddRequestImpl();
Modified: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java Sat Nov 12 18:24:38 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.authz;
@@ -72,7 +72,7 @@ public class AuthzAuthnIT extends Abstra
* @throws Exception if the test encounters an error
*/
@Test
- public void testAuthnWithRootDSE() throws Exception
+ public void testAuthnWithRootDse() throws Exception
{
createUser( "billyd", "billyd" );
@@ -122,21 +122,21 @@ public class AuthzAuthnIT extends Abstra
// Note: In order to read contents of the bound context
// user will need appropriate Read permissions.
createAccessControlSubentry( "grantBrowseForTheWholeNamingContext", "{ maximum 0 }", // !!!!! Replace this with "{ minimum 1 }" for practicing !
- "{ " +
- " identificationTag \"browseACI\", " +
- " precedence 14, " +
+ "{ " +
+ " identificationTag \"browseACI\", " +
+ " precedence 14, " +
" authenticationLevel none, " +
- " itemOrUserFirst userFirst: " +
+ " itemOrUserFirst userFirst: " +
" { " +
- " userClasses { name { \"uid=billyd,ou=users,ou=system\" } }, " +
+ " userClasses { name { \"uid=billyd,ou=users,ou=system\" } }, " +
" userPermissions " +
- " { " +
- " { " +
+ " { " +
+ " { " +
" protectedItems { entry }, " +
- " grantsAndDenials { grantBrowse } " +
- " } " +
- " } " +
- " } " +
+ " grantsAndDenials { grantBrowse } " +
+ " } " +
+ " } " +
+ " } " +
"}" );
Dn userName = new Dn( "uid=billyd,ou=users,ou=system" );
Modified: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Sat Nov 12 18:24:38 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.authz.support;
@@ -113,7 +113,7 @@ public class MaxImmSubFilterTest extends
@Test
- public void testRootDSE() throws Exception
+ public void testRootDse() throws Exception
{
MaxImmSubFilter filter = new MaxImmSubFilter( schemaManager );
@@ -167,7 +167,7 @@ public class MaxImmSubFilterTest extends
@Test
@Ignore("test is failing cause of incorrect results from MaxImmSubFilter.filter() method after " +
- "started using real OperationContext instead of MockOperationContext")
+ "started using real OperationContext instead of MockOperationContext")
public void testGrantTuple() throws Exception
{
MaxImmSubFilter filter = new MaxImmSubFilter( schemaManager );
Propchange: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 2011
@@ -10,6 +10,6 @@
/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
/directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1200371
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
/directory/apacheds/trunk/interceptors/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1183435-1186974
/directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997
Modified: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java Sat Nov 12 18:24:38 2011
@@ -21,7 +21,7 @@ package org.apache.directory.server.core
import static org.junit.Assert.assertNotNull;
-import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -41,12 +41,12 @@ public class GetRootDsePerfIT extends Ab
* A GetRootDSE performance test
*/
@Test
- public void testPerfGetRootDSE() throws Exception
+ public void testPerfGetRootDse() throws Exception
{
- GetRootDSEOperationContext getRootDseContext = new GetRootDSEOperationContext( getService().getAdminSession() );
- Entry rootDSE = getService().getOperationManager().getRootDSE( getRootDseContext );
+ GetRootDseOperationContext getRootDseContext = new GetRootDseOperationContext( getService().getAdminSession() );
+ Entry rootDse = getService().getOperationManager().getRootDse( getRootDseContext );
- assertNotNull( rootDSE );
+ assertNotNull( rootDse );
int nbIterations = 150000;
long t0 = System.currentTimeMillis();
@@ -68,7 +68,7 @@ public class GetRootDsePerfIT extends Ab
t00 = System.currentTimeMillis();
}
- rootDSE = getService().getOperationManager().getRootDSE( getRootDseContext );
+ rootDse = getService().getOperationManager().getRootDse( getRootDseContext );
}
long t1 = System.currentTimeMillis();
Modified: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java Sat Nov 12 18:24:38 2011
@@ -22,7 +22,7 @@ package org.apache.directory.server.core
import static org.junit.Assert.assertTrue;
import org.apache.directory.server.core.api.OperationEnum;
-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.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.model.name.Dn;
@@ -45,7 +45,7 @@ public class hasEntryPerfIT extends Abst
public void testPerfHasEntry() throws Exception
{
Dn adminDn = new Dn( "uid=admin, ou=system" );
- EntryOperationContext hasEntryContext = new EntryOperationContext( getService().getAdminSession(), adminDn );
+ HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( getService().getAdminSession(), adminDn );
hasEntryContext.setInterceptors( getService().getInterceptors( OperationEnum.HAS_ENTRY ) );
boolean hasEntry = getService().getOperationManager().hasEntry( hasEntryContext );
Modified: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java Sat Nov 12 18:24:38 2011
@@ -120,8 +120,8 @@ public final class PartitionIT extends A
* Confirm presence and publishing of foo and bar partitions as
* namingContexts as values innamingContexts attribute of the rootDSE
*/
- LdapContext rootDSE = getRootContext( getService() );
- Attribute namingContexts = rootDSE.getAttributes( "", new String[]
+ LdapContext rootDse = getRootContext( getService() );
+ Attribute namingContexts = rootDse.getAttributes( "", new String[]
{ "namingContexts" } ).get( "namingContexts" );
assertTrue( namingContexts.contains( "dc=foo,dc=com" ) );
assertTrue( namingContexts.contains( "dc=bar,dc=com" ) );
@@ -143,22 +143,22 @@ public final class PartitionIT extends A
*/
public void addLookupDelete( String partitionSuffix ) throws Exception
{
- LdapContext rootDSE = getRootContext( getService() );
+ LdapContext rootDse = getRootContext( getService() );
Attributes attrs = new BasicAttributes( "objectClass", "organizationalUnit", true );
attrs.put( "ou", "people" );
String entryDn = "ou=people," + partitionSuffix;
- rootDSE.createSubcontext( entryDn, attrs );
+ rootDse.createSubcontext( entryDn, attrs );
LOG.debug( "added entry {} to partition {}", entryDn, partitionSuffix );
- Attributes reloaded = rootDSE.getAttributes( entryDn );
+ Attributes reloaded = rootDse.getAttributes( entryDn );
assertNotNull( reloaded );
assertTrue( reloaded.get( "ou" ).contains( "people" ) );
LOG.debug( "looked up entry {} from partition {}", entryDn, partitionSuffix );
- rootDSE.destroySubcontext( entryDn );
+ rootDse.destroySubcontext( entryDn );
try
{
- rootDSE.getAttributes( entryDn );
+ rootDse.getAttributes( entryDn );
fail( "should never get here" );
}
catch ( Exception e )
Propchange: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 2011
@@ -9,5 +9,6 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1180717-1201283
/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1067786-1067997
Modified: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Sat Nov 12 18:24:38 2011
@@ -144,7 +144,7 @@ public class SubschemaSubentryIT extends
* @throws NamingException on error
*/
@Test
- public void testRootDSEsSubschemaSubentry() throws Exception
+ public void testRootDseSubschemaSubentry() throws Exception
{
assertEquals( GLOBAL_SUBSCHEMA_DN, getSubschemaSubentryDN() );
Attributes subschemaSubentryAttrs = getSubschemaSubentryAttributes();
Propchange: directory/apacheds/branches/apacheds-txns/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 2011
@@ -4,6 +4,6 @@
/directory/apacheds/branches/apacheds-jdbm/core-jndi:1160768-1164075
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765
/directory/apacheds/branches/milestones/core-jndi:1072812-1075328
-/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1200385
+/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
/directory/apacheds/trunk/interceptors/core-jndi:1183435-1186974
/directory/studio/trunk/core-jndi:1067786-1067997
Modified: directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sat Nov 12 18:24:38 2011
@@ -60,8 +60,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.GetRootDseOperationContext;
+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;
@@ -223,7 +223,7 @@ public abstract class ServerContext impl
session = bindContext.getSession();
OperationManager operationManager = service.getOperationManager();
- EntryOperationContext hasEntryContext = new EntryOperationContext( session, dn );
+ HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, dn );
if ( ! operationManager.hasEntry( hasEntryContext ) )
{
@@ -258,7 +258,7 @@ public abstract class ServerContext impl
session = new DefaultCoreSession( principal, service );
OperationManager operationManager = service.getOperationManager();
- EntryOperationContext hasEntryContext = new EntryOperationContext( session, dn );
+ HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, dn );
if ( ! operationManager.hasEntry( hasEntryContext ) )
{
@@ -282,7 +282,7 @@ public abstract class ServerContext impl
this.session = session;
OperationManager operationManager = service.getOperationManager();
- EntryOperationContext hasEntryContext = new EntryOperationContext( session, dn );
+ HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, dn );
if ( ! operationManager.hasEntry( hasEntryContext ) )
{
@@ -410,7 +410,7 @@ public abstract class ServerContext impl
case PASSWORD_POLICY_REQUEST_CONTROL:
if ( isRequest )
{
- control = new PasswordPolicyDecorator( getDirectoryService().getLdapCodecService(),
+ control = new PasswordPolicyDecorator( getDirectoryService().getLdapCodecService(),
new PasswordPolicyImpl() );
}
else
@@ -600,16 +600,16 @@ public abstract class ServerContext impl
}
- protected Entry doGetRootDSEOperation( Dn target ) throws Exception
+ protected Entry doGetRootDseOperation( Dn target ) throws Exception
{
- GetRootDSEOperationContext getRootDseContext = new GetRootDSEOperationContext( session, target );
+ GetRootDseOperationContext getRootDseContext = new GetRootDseOperationContext( session, target );
getRootDseContext.addRequestControls( convertControls( true, requestControls ) );
// do not reset request controls since this is not an external
// operation and not do bother setting the response controls either
OperationManager operationManager = service.getOperationManager();
- return operationManager.getRootDSE( getRootDseContext );
+ return operationManager.getRootDse( getRootDseContext );
}
@@ -647,7 +647,7 @@ public abstract class ServerContext impl
// clear the request controls and set the response controls
requestControls = EMPTY_CONTROLS;
- responseControls = JndiUtils.toJndiControls(
+ responseControls = JndiUtils.toJndiControls(
getDirectoryService().getLdapCodecService(),
lookupContext.getResponseControls() );
@@ -710,7 +710,7 @@ public abstract class ServerContext impl
// clear the request controls and set the response controls
requestControls = EMPTY_CONTROLS;
- responseControls = JndiUtils.toJndiControls( getDirectoryService().getLdapCodecService(),
+ responseControls = JndiUtils.toJndiControls( getDirectoryService().getLdapCodecService(),
moveAndRenameContext.getResponseControls() );
}
@@ -733,7 +733,7 @@ public abstract class ServerContext impl
// clear the request controls and set the response controls
requestControls = EMPTY_CONTROLS;
- responseControls = JndiUtils.toJndiControls( getDirectoryService().getLdapCodecService(),
+ responseControls = JndiUtils.toJndiControls( getDirectoryService().getLdapCodecService(),
modifyContext.getResponseControls() );
}
@@ -1314,7 +1314,7 @@ public abstract class ServerContext impl
try
{
- EntryOperationContext hasEntryContext = new EntryOperationContext( session, target );
+ HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, target );
if ( operationManager.hasEntry( hasEntryContext ) )
{
@@ -1385,7 +1385,7 @@ public abstract class ServerContext impl
{
if ( name.size() == 0 )
{
- serverEntry = doGetRootDSEOperation( target );
+ serverEntry = doGetRootDseOperation( target );
}
else
{
Modified: directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Sat Nov 12 18:24:38 2011
@@ -54,7 +54,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.event.DirectoryListener;
import org.apache.directory.server.core.api.event.NotificationCriteria;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
-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.i18n.I18n;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
@@ -527,7 +527,7 @@ public abstract class ServerDirContext e
try
{
- EntryOperationContext hasEntryContext = new EntryOperationContext( getSession(), target );
+ HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( getSession(), target );
if ( getDirectoryService().getOperationManager().hasEntry( hasEntryContext ) )
{
Propchange: directory/apacheds/branches/apacheds-txns/core-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/core-shared:965203-965686
/directory/apacheds/branches/milestones/core-shared:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/core-shared:945827-946347
-/directory/apacheds/trunk/core-shared:1066126-1067785,1068026-1072718,1072800-1075329,1183559-1200380
+/directory/apacheds/trunk/core-shared:1066126-1067785,1068026-1072718,1072800-1075329,1183559-1201283
/directory/studio/trunk/core-shared:1067786-1067997
Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java Sat Nov 12 18:24:38 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;
@@ -87,7 +87,7 @@ import org.apache.directory.shared.util.
*/
public class DefaultCoreSession implements CoreSession
{
- /** The DirectoryService we are connected to */
+ /** The DirectoryService we are connected to */
private final DirectoryService directoryService;
/** The Principal used to process operations */
@@ -117,7 +117,7 @@ public class DefaultCoreSession implemen
* Set the ignoreRefferal flag for the current operationContext.
*
* @param opContext The current operationContext
- * @param ignoreReferral The flag
+ * @param ignoreReferral The flag
*/
private void setReferralHandling( AbstractOperationContext opContext, boolean ignoreReferral )
{
@@ -133,7 +133,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void add( Entry entry ) throws LdapException
{
@@ -142,7 +142,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void add( Entry entry, boolean ignoreReferral ) throws LdapException
{
@@ -151,7 +151,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void add( Entry entry, LogChange log ) throws LdapException
{
@@ -165,7 +165,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void add( Entry entry, boolean ignoreReferral, LogChange log ) throws LdapException
{
@@ -180,7 +180,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void add( AddRequest addRequest ) throws LdapException
{
@@ -189,7 +189,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void add( AddRequest addRequest, LogChange log ) throws LdapException
{
@@ -439,7 +439,7 @@ public class DefaultCoreSession implemen
/**
* TODO - perhaps we should just use a flag that is calculated on creation
* of this session
- *
+ *
* @see org.apache.directory.server.core.api.CoreSession#isAdministrator()
*/
public boolean isAdministrator()
@@ -451,13 +451,13 @@ public class DefaultCoreSession implemen
/**
- * TODO - this method impl does not check to see if the principal is in
+ * TODO - this method impl does not check to see if the principal is in
* the administrators group - it only returns true of the principal is
* the actual admin user. need to make it check groups.
*
* TODO - perhaps we should just use a flag that is calculated on creation
* of this session
- *
+ *
* @see org.apache.directory.server.core.api.CoreSession#isAnAdministrator()
*/
public boolean isAnAdministrator()
@@ -505,7 +505,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public Entry lookup( Dn dn ) throws LdapException
{
@@ -628,7 +628,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void move( Dn dn, Dn newParent ) throws LdapException
{
@@ -637,7 +637,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void move( Dn dn, Dn newParent, LogChange log ) throws LdapException
{
@@ -650,7 +650,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void move( Dn dn, Dn newParent, boolean ignoreReferral ) throws Exception
{
@@ -659,7 +659,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void move( Dn dn, Dn newParent, boolean ignoreReferral, LogChange log ) throws LdapException
{
@@ -674,7 +674,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn ) throws LdapException
{
@@ -683,7 +683,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void moveAndRename( Dn dn, Dn newSuperiorDn, Rdn newRdn, boolean deleteOldRdn, LogChange log )
throws LdapException
@@ -699,7 +699,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral )
throws LdapException
@@ -709,7 +709,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral,
LogChange log ) throws LdapException
@@ -793,7 +793,7 @@ public class DefaultCoreSession implemen
try
{
- filterNode = ( ExprNode ) FilterParser.parse( directoryService.getSchemaManager(), filter );
+ filterNode = FilterParser.parse( directoryService.getSchemaManager(), filter );
}
catch ( ParseException pe )
{
@@ -905,7 +905,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public boolean exists( String dn ) throws LdapException
{
@@ -914,11 +914,11 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
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 );
@@ -960,7 +960,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void move( ModifyDnRequest modifyDnRequest ) throws LdapException
{
@@ -969,7 +969,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void move( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
{
@@ -994,7 +994,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void moveAndRename( ModifyDnRequest modifyDnRequest ) throws LdapException
{
@@ -1003,7 +1003,7 @@ public class DefaultCoreSession implemen
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void moveAndRename( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
{
@@ -1089,8 +1089,8 @@ public class DefaultCoreSession implemen
*/
public void unbind() throws LdapException
{
- UnbindOperationContext unbindContext = new UnbindOperationContext( this );
-
+ UnbindOperationContext unbindContext = new UnbindOperationContext( this );
+
OperationManager operationManager = directoryService.getOperationManager();
operationManager.unbind( unbindContext );
}
@@ -1101,8 +1101,8 @@ public class DefaultCoreSession implemen
*/
public void unbind( UnbindRequest unbindRequest ) throws LdapException
{
- UnbindOperationContext unbindContext = new UnbindOperationContext( this, unbindRequest );
-
+ UnbindOperationContext unbindContext = new UnbindOperationContext( this, unbindRequest );
+
OperationManager operationManager = directoryService.getOperationManager();
operationManager.unbind( unbindContext );
}