You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/04/29 19:04:02 UTC
svn commit: r939379 [1/2] - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/
core-api/src/main/java/org/apache/directory/server/core/interceptor/
core-api/src/main/java/org/apache/directory/server/core/interceptor/...
Author: elecharny
Date: Thu Apr 29 17:04:00 2010
New Revision: 939379
URL: http://svn.apache.org/viewvc?rev=939379&view=rev
Log:
o The lookup operation now returns an Entry instead of a ClonedServerEntry
o Renamed Entry inner class to Element inside the InterceptorChain, to avoid a name collision with the Entry class
o The Exception interceptor does not anymore check that the entry exist before returning it : if the entry does not exist, then we will get a null value, and will generate the appropriate exception. We then save a call to the hasEntry() operation
o Added some missing Javadoc
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java
directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java Thu Apr 29 17:04:00 2010
@@ -26,7 +26,6 @@ import java.util.Set;
import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.changelog.LogChange;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
@@ -362,7 +361,7 @@ public interface CoreSession
* @param dn the name of the entry to lookup
* @throws Exception if there are failures while looking up the entry
*/
- ClonedServerEntry lookup( DN dn ) throws Exception;
+ Entry lookup( DN dn ) throws Exception;
/**
* Looks up an entry in the server returning all attributes: both user and
@@ -372,7 +371,7 @@ public interface CoreSession
* @param atIds The list of attributes to return
* @throws Exception if there are failures while looking up the entry
*/
- ClonedServerEntry lookup( DN dn, String[] atIds ) throws Exception;
+ Entry lookup( DN dn, String[] atIds ) throws Exception;
/**
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Thu Apr 29 17:04:00 2010
@@ -497,7 +497,7 @@ public class LdapCoreSessionConnection i
try
{
- ClonedServerEntry entry = session.lookup( new DN( dn ), attributes );
+ Entry entry = session.lookup( new DN( dn ), attributes );
resp = new SearchResultEntry();
resp.setEntry( entry );
}
@@ -518,7 +518,7 @@ public class LdapCoreSessionConnection i
SearchResultEntry resp = null;
try
{
- ClonedServerEntry entry = session.lookup( new DN( dn ) );
+ Entry entry = session.lookup( new DN( dn ) );
resp = new SearchResultEntry();
resp.setEntry( entry );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java Thu Apr 29 17:04:00 2010
@@ -41,6 +41,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.name.DN;
@@ -116,7 +117,7 @@ public interface OperationManager
/**
* TODO document after determining if this method should be here.
*/
- ClonedServerEntry lookup( LookupOperationContext opContext ) throws Exception;
+ Entry lookup( LookupOperationContext opContext ) throws Exception;
/**
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Thu Apr 29 17:04:00 2010
@@ -49,6 +49,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.name.DN;
@@ -174,7 +175,7 @@ public abstract class BaseInterceptor im
}
- public ClonedServerEntry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception
+ public Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception
{
return next.lookup( opContext );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Thu Apr 29 17:04:00 2010
@@ -43,6 +43,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
import org.apache.directory.server.core.partition.Partition;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.name.DN;
import java.util.Set;
@@ -209,7 +210,7 @@ public interface Interceptor
/**
* Filters {@link Partition#lookup( LookupOperationContext )} call.
*/
- ClonedServerEntry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception;
+ Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception;
/**
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Thu Apr 29 17:04:00 2010
@@ -57,6 +57,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.name.DN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -214,11 +215,11 @@ public class InterceptorChain
}
};
- private final Map<String, Entry> name2entry = new HashMap<String, Entry>();
+ private final Map<String, Element> name2entry = new HashMap<String, Element>();
- private final Entry tail;
+ private final Element tail;
- private Entry head;
+ private Element head;
private DirectoryService directoryService;
@@ -228,7 +229,7 @@ public class InterceptorChain
*/
public InterceptorChain()
{
- tail = new Entry( "tail", null, null, FINAL_INTERCEPTOR );
+ tail = new Element( "tail", null, null, FINAL_INTERCEPTOR );
head = tail;
}
@@ -280,8 +281,8 @@ public class InterceptorChain
*/
public synchronized void destroy()
{
- List<Entry> entries = new ArrayList<Entry>();
- Entry e = tail;
+ List<Element> entries = new ArrayList<Element>();
+ Element e = tail;
do
{
@@ -290,7 +291,7 @@ public class InterceptorChain
}
while ( e != null );
- for ( Entry entry:entries )
+ for ( Element entry:entries )
{
if ( entry != tail )
{
@@ -314,7 +315,7 @@ public class InterceptorChain
*/
public Interceptor get( String interceptorName )
{
- Entry e = name2entry.get( interceptorName );
+ Element e = name2entry.get( interceptorName );
if ( e == null )
{
return null;
@@ -331,7 +332,7 @@ public class InterceptorChain
public synchronized List<Interceptor> getAll()
{
List<Interceptor> result = new ArrayList<Interceptor>();
- Entry e = head;
+ Element e = head;
do
{
@@ -359,7 +360,7 @@ public class InterceptorChain
public synchronized void addBefore( String nextInterceptorName, Interceptor interceptor )
throws Exception
{
- Entry e = name2entry.get( nextInterceptorName );
+ Element e = name2entry.get( nextInterceptorName );
if ( e == null )
{
throw new ConfigurationException( I18n.err( I18n.ERR_330, nextInterceptorName ) );
@@ -377,7 +378,7 @@ public class InterceptorChain
public synchronized void addAfter( String prevInterceptorName, Interceptor interceptor )
throws Exception
{
- Entry e = name2entry.get( prevInterceptorName );
+ Element e = name2entry.get( prevInterceptorName );
if ( e == null )
{
throw new ConfigurationException( I18n.err( I18n.ERR_330, prevInterceptorName ) );
@@ -407,9 +408,9 @@ public class InterceptorChain
*/
private String deregister( String name ) throws ConfigurationException
{
- Entry entry = checkOldName( name );
- Entry prevEntry = entry.prevEntry;
- Entry nextEntry = entry.nextEntry;
+ Element entry = checkOldName( name );
+ Element prevEntry = entry.prevEntry;
+ Element nextEntry = entry.nextEntry;
if ( nextEntry == null )
{
@@ -435,27 +436,27 @@ public class InterceptorChain
}
- private void register0( Interceptor interceptor, Entry nextEntry ) throws Exception
+ private void register0( Interceptor interceptor, Element nextEntry ) throws Exception
{
String name = interceptor.getName();
interceptor.init( directoryService );
- Entry newEntry;
+ Element newEntry;
if ( nextEntry == head )
{
- newEntry = new Entry( interceptor.getName(), null, head, interceptor );
+ newEntry = new Element( interceptor.getName(), null, head, interceptor );
head.prevEntry = newEntry;
head = newEntry;
}
else if ( head == tail )
{
- newEntry = new Entry( interceptor.getName(), null, tail, interceptor );
+ newEntry = new Element( interceptor.getName(), null, tail, interceptor );
tail.prevEntry = newEntry;
head = newEntry;
}
else
{
- newEntry = new Entry( interceptor.getName(), nextEntry.prevEntry, nextEntry, interceptor );
+ newEntry = new Element( interceptor.getName(), nextEntry.prevEntry, nextEntry, interceptor );
nextEntry.prevEntry.nextEntry = newEntry;
nextEntry.prevEntry = newEntry;
}
@@ -471,9 +472,9 @@ public class InterceptorChain
* @return An interceptor entry with the specified name.
* @throws javax.naming.ConfigurationException if no interceptor has that name
*/
- private Entry checkOldName( String name ) throws ConfigurationException
+ private Element checkOldName( String name ) throws ConfigurationException
{
- Entry e = name2entry.get( name );
+ Element e = name2entry.get( name );
if ( e == null )
{
@@ -503,7 +504,7 @@ public class InterceptorChain
*
* @return the first entry to use.
*/
- private Entry getStartingEntry()
+ private Element getStartingEntry()
{
if ( InvocationStack.getInstance().isEmpty() )
{
@@ -522,7 +523,7 @@ public class InterceptorChain
return tail;
}
- Entry next = head;
+ Element next = head;
while ( next != tail )
{
@@ -542,7 +543,7 @@ public class InterceptorChain
public ClonedServerEntry getRootDSE( GetRootDSEOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
@@ -564,7 +565,7 @@ public class InterceptorChain
public DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
@@ -586,7 +587,7 @@ public class InterceptorChain
public DN getSuffix( GetSuffixOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
@@ -608,7 +609,7 @@ public class InterceptorChain
public boolean compare( CompareOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
@@ -630,7 +631,7 @@ public class InterceptorChain
public Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
@@ -652,7 +653,7 @@ public class InterceptorChain
public void addContextPartition( AddContextPartitionOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
@@ -674,7 +675,7 @@ public class InterceptorChain
public void removeContextPartition( RemoveContextPartitionOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
@@ -714,7 +715,7 @@ public class InterceptorChain
// We have to use the admin session here, otherwise we may have
// trouble reading the entry due to insufficient access rights
CoreSession adminSession = opContext.getSession().getDirectoryService().getAdminSession();
- opContext.setEntry( adminSession.lookup( opContext.getDn(), SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES_ARRAY ) );
+ opContext.setEntry( (ClonedServerEntry)adminSession.lookup( opContext.getDn(), SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES_ARRAY ) );
}
catch ( Exception e )
{
@@ -726,7 +727,7 @@ public class InterceptorChain
public void delete( DeleteOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
eagerlyPopulateFields( opContext );
@@ -748,7 +749,7 @@ public class InterceptorChain
public void add( AddOperationContext opContext ) throws Exception
{
- Entry node = getStartingEntry();
+ Element node = getStartingEntry();
Interceptor head = node.interceptor;
NextInterceptor next = node.nextInterceptor;
@@ -769,7 +770,7 @@ public class InterceptorChain
public void bind( BindOperationContext opContext ) throws Exception
{
- Entry node = getStartingEntry();
+ Element node = getStartingEntry();
Interceptor head = node.interceptor;
NextInterceptor next = node.nextInterceptor;
eagerlyPopulateFields( opContext );
@@ -791,7 +792,7 @@ public class InterceptorChain
public void unbind( UnbindOperationContext opContext ) throws Exception
{
- Entry node = getStartingEntry();
+ Element node = getStartingEntry();
Interceptor head = node.interceptor;
NextInterceptor next = node.nextInterceptor;
@@ -812,7 +813,7 @@ public class InterceptorChain
public void modify( ModifyOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
eagerlyPopulateFields( opContext );
@@ -834,7 +835,7 @@ public class InterceptorChain
public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
eagerlyPopulateFields( opContext );
@@ -858,7 +859,7 @@ public class InterceptorChain
public EntryFilteringCursor search( SearchOperationContext opContext )
throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
eagerlyPopulateFields( opContext );
@@ -879,9 +880,9 @@ public class InterceptorChain
}
- public ClonedServerEntry lookup( LookupOperationContext opContext ) throws Exception
+ public Entry lookup( LookupOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
@@ -903,7 +904,7 @@ public class InterceptorChain
public boolean hasEntry( EntryOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
@@ -925,7 +926,7 @@ public class InterceptorChain
public void rename( RenameOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
eagerlyPopulateFields( opContext );
@@ -947,7 +948,7 @@ public class InterceptorChain
public void move( MoveOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
eagerlyPopulateFields( opContext );
@@ -969,7 +970,7 @@ public class InterceptorChain
public void moveAndRename( MoveAndRenameOperationContext opContext ) throws Exception
{
- Entry entry = getStartingEntry();
+ Element entry = getStartingEntry();
Interceptor head = entry.interceptor;
NextInterceptor next = entry.nextInterceptor;
eagerlyPopulateFields( opContext );
@@ -991,11 +992,11 @@ public class InterceptorChain
/**
* Represents an internal entry of this chain.
*/
- private class Entry
+ private class Element
{
- private volatile Entry prevEntry;
+ private volatile Element prevEntry;
- private volatile Entry nextEntry;
+ private volatile Element nextEntry;
private final String name;
@@ -1010,7 +1011,7 @@ public class InterceptorChain
}
- private Entry( String name, Entry prevEntry, Entry nextEntry, Interceptor interceptor )
+ private Element( String name, Element prevEntry, Element nextEntry, Interceptor interceptor )
{
this.name = name;
@@ -1024,17 +1025,17 @@ public class InterceptorChain
this.interceptor = interceptor;
this.nextInterceptor = new NextInterceptor()
{
- private Entry getNextEntry()
+ private Element getNextEntry()
{
if ( InvocationStack.getInstance().isEmpty() )
{
- return Entry.this.nextEntry;
+ return Element.this.nextEntry;
}
OperationContext opContext = InvocationStack.getInstance().peek();
if ( !opContext.hasBypass() )
{
- return Entry.this.nextEntry;
+ return Element.this.nextEntry;
}
// I don't think we really need this since this check is performed by the chain when
@@ -1045,7 +1046,7 @@ public class InterceptorChain
// return tail;
// }
- Entry next = Entry.this.nextEntry;
+ Element next = Element.this.nextEntry;
while ( next != tail )
{
if ( opContext.isBypassed( next.getName() ) )
@@ -1064,7 +1065,7 @@ public class InterceptorChain
public boolean compare( CompareOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1085,7 +1086,7 @@ public class InterceptorChain
public ClonedServerEntry getRootDSE( GetRootDSEOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1106,7 +1107,7 @@ public class InterceptorChain
public DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1127,7 +1128,7 @@ public class InterceptorChain
public DN getSuffix( GetSuffixOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1148,7 +1149,7 @@ public class InterceptorChain
public Set<String> listSuffixes( ListSuffixOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1169,7 +1170,7 @@ public class InterceptorChain
public void delete( DeleteOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1189,7 +1190,7 @@ public class InterceptorChain
public void add( AddOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1209,7 +1210,7 @@ public class InterceptorChain
public void modify( ModifyOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1229,7 +1230,7 @@ public class InterceptorChain
public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1251,7 +1252,7 @@ public class InterceptorChain
public EntryFilteringCursor search( SearchOperationContext opContext )
throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1270,9 +1271,9 @@ public class InterceptorChain
}
- public ClonedServerEntry lookup( LookupOperationContext opContext ) throws Exception
+ public Entry lookup( LookupOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1293,7 +1294,7 @@ public class InterceptorChain
public boolean hasEntry( EntryOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1314,7 +1315,7 @@ public class InterceptorChain
public void rename( RenameOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1334,7 +1335,7 @@ public class InterceptorChain
public void move( MoveOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1355,7 +1356,7 @@ public class InterceptorChain
public void moveAndRename( MoveAndRenameOperationContext opContext )
throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1375,7 +1376,7 @@ public class InterceptorChain
public void bind( BindOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1395,7 +1396,7 @@ public class InterceptorChain
public void unbind( UnbindOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1415,7 +1416,7 @@ public class InterceptorChain
public void addContextPartition( AddContextPartitionOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
@@ -1436,7 +1437,7 @@ public class InterceptorChain
public void removeContextPartition( RemoveContextPartitionOperationContext opContext ) throws Exception
{
- Entry next = getNextEntry();
+ Element next = getNextEntry();
Interceptor interceptor = next.interceptor;
try
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Thu Apr 29 17:04:00 2010
@@ -43,6 +43,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.name.DN;
@@ -130,7 +131,7 @@ public interface NextInterceptor
/**
* Calls the next interceptor's {@link Interceptor#lookup( NextInterceptor, LookupOperationContext )}.
*/
- ClonedServerEntry lookup( LookupOperationContext opContext ) throws Exception;
+ Entry lookup( LookupOperationContext opContext ) throws Exception;
/**
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java Thu Apr 29 17:04:00 2010
@@ -328,17 +328,18 @@ public abstract class AbstractOperationC
}
- public ClonedServerEntry lookup( LookupOperationContext opContext ) throws Exception
+ public Entry lookup( LookupOperationContext opContext ) throws Exception
{
if ( opContext != next )
{
throw new IllegalStateException( I18n.err( I18n.ERR_319 ) );
}
+
return session.getDirectoryService().getOperationManager().lookup( opContext );
}
- public ClonedServerEntry lookup( DN dn, Collection<String> byPassed ) throws Exception
+ public Entry lookup( DN dn, Collection<String> byPassed ) throws Exception
{
LookupOperationContext opContext = newLookupContext( dn );
opContext.setByPassed( byPassed );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java Thu Apr 29 17:04:00 2010
@@ -389,13 +389,13 @@ public class BindOperationContext implem
}
- public ClonedServerEntry lookup( LookupOperationContext opContext ) throws Exception
+ public Entry lookup( LookupOperationContext opContext ) throws Exception
{
return session.getDirectoryService().getOperationManager().lookup( opContext );
}
- public ClonedServerEntry lookup( DN dn, Collection<String> byPassed ) throws Exception
+ public Entry lookup( DN dn, Collection<String> byPassed ) throws Exception
{
LookupOperationContext opContext = newLookupContext( dn );
opContext.setByPassed( byPassed );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java Thu Apr 29 17:04:00 2010
@@ -297,10 +297,10 @@ public interface OperationContext
LookupOperationContext newLookupContext( DN dn );
- ClonedServerEntry lookup( DN dn, Collection<String> byPass ) throws Exception;
+ Entry lookup( DN dn, Collection<String> byPass ) throws Exception;
- ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws Exception;
+ Entry lookup( LookupOperationContext lookupContext ) throws Exception;
void modify( DN dn, List<Modification> mods, Collection<String> byPass ) throws Exception;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Thu Apr 29 17:04:00 2010
@@ -383,7 +383,7 @@ public final class SchemaPartition exten
public void move( MoveOperationContext opContext ) throws Exception
{
boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
- ClonedServerEntry entry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
+ Entry entry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
synchronizer.move( opContext, entry, cascade );
wrapped.move( opContext );
updateSchemaModificationAttributes( opContext );
@@ -396,7 +396,7 @@ public final class SchemaPartition exten
public void moveAndRename( MoveAndRenameOperationContext opContext ) throws Exception
{
boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
- ClonedServerEntry entry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
+ Entry entry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
synchronizer.moveAndRename( opContext, entry, cascade );
wrapped.moveAndRename( opContext );
updateSchemaModificationAttributes( opContext );
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Thu Apr 29 17:04:00 2010
@@ -51,7 +51,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.LdapPrincipal;
import org.apache.directory.server.core.OperationManager;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntryUtils;
import org.apache.directory.server.core.event.DirectoryListener;
import org.apache.directory.server.core.event.NotificationCriteria;
@@ -452,7 +451,7 @@ public abstract class ServerContext impl
opCtx = new LookupOperationContext( session, target, attrIds );
opCtx.addRequestControls( JndiUtils.fromJndiControls( requestControls ) );
OperationManager operationManager = service.getOperationManager();
- ClonedServerEntry serverEntry = operationManager.lookup( opCtx );
+ Entry serverEntry = operationManager.lookup( opCtx );
// clear the request controls and set the response controls
requestControls = EMPTY_CONTROLS;
Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java Thu Apr 29 17:04:00 2010
@@ -27,7 +27,6 @@ import java.util.Set;
import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.changelog.LogChange;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.AbstractOperationContext;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -472,7 +471,7 @@ public class MockCoreSession implements
/**
* {@inheritDoc}
*/
- public ClonedServerEntry lookup( DN dn ) throws Exception
+ public Entry lookup( DN dn ) throws Exception
{
OperationManager operationManager = directoryService.getOperationManager();
return operationManager.lookup( new LookupOperationContext( this, dn ) );
@@ -482,7 +481,7 @@ public class MockCoreSession implements
/**
* {@inheritDoc}
*/
- public ClonedServerEntry lookup( DN dn, String[] attrId ) throws Exception
+ public Entry lookup( DN dn, String[] attrId ) throws Exception
{
OperationManager operationManager = directoryService.getOperationManager();
return operationManager.lookup(
Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockInterceptor.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockInterceptor.java Thu Apr 29 17:04:00 2010
@@ -45,6 +45,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.name.DN;
import javax.naming.NamingException;
@@ -177,7 +178,7 @@ public class MockInterceptor implements
}
- public ClonedServerEntry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception
+ public Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception
{
interceptors.add( this );
return next.lookup( opContext );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Thu Apr 29 17:04:00 2010
@@ -472,7 +472,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public ClonedServerEntry lookup( DN dn ) throws Exception
+ public Entry lookup( DN dn ) throws Exception
{
OperationManager operationManager = directoryService.getOperationManager();
return operationManager.lookup( new LookupOperationContext( this, dn ) );
@@ -482,7 +482,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public ClonedServerEntry lookup( DN dn, String[] attrId ) throws Exception
+ public Entry lookup( DN dn, String[] attrId ) throws Exception
{
OperationManager operationManager = directoryService.getOperationManager();
return operationManager.lookup(
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Thu Apr 29 17:04:00 2010
@@ -597,7 +597,7 @@ public class DefaultOperationManager imp
/**
* {@inheritDoc}
*/
- public ClonedServerEntry lookup( LookupOperationContext opContext ) throws Exception
+ public Entry lookup( LookupOperationContext opContext ) throws Exception
{
LOG.debug( ">> LookupOperation : {}", opContext );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Thu Apr 29 17:04:00 2010
@@ -55,6 +55,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
@@ -299,7 +300,7 @@ public class AuthenticationInterceptor e
}
- public ClonedServerEntry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception
+ public Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Thu Apr 29 17:04:00 2010
@@ -366,7 +366,7 @@ public class AciAuthorizationInterceptor
// will contain the subentryACI attributes that effect subentries
DN parentDn = ( DN ) dn.clone();
parentDn.remove( dn.size() - 1 );
- Entry administrativeEntry = opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS ).getOriginalEntry();
+ Entry administrativeEntry = ((ClonedServerEntry)opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS )).getOriginalEntry();
EntryAttribute subentryAci = administrativeEntry.get( subentryAciType );
@@ -507,7 +507,7 @@ public class AciAuthorizationInterceptor
return;
}
- ClonedServerEntry entry = deleteContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
+ Entry entry = deleteContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
protectCriticalEntries( name );
@@ -522,7 +522,7 @@ public class AciAuthorizationInterceptor
Set<DN> userGroups = groupCache.getGroups( principalDn.getNormName() );
Collection<ACITuple> tuples = new HashSet<ACITuple>();
- addPerscriptiveAciTuples( deleteContext, tuples, name, entry.getOriginalEntry() );
+ addPerscriptiveAciTuples( deleteContext, tuples, name, ((ClonedServerEntry)entry).getOriginalEntry() );
addEntryAciTuples( tuples, entry );
addSubentryAciTuples( deleteContext, tuples, name, entry );
@@ -540,7 +540,7 @@ public class AciAuthorizationInterceptor
DN name = opContext.getDn();
// Access the principal requesting the operation, and bypass checks if it is the admin
- ClonedServerEntry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
+ Entry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
LdapPrincipal principal = opContext.getSession().getEffectivePrincipal();
DN principalDn = principal.getClonedName();
@@ -569,7 +569,7 @@ public class AciAuthorizationInterceptor
Set<DN> userGroups = groupCache.getGroups( principalDn.getName() );
Collection<ACITuple> tuples = new HashSet<ACITuple>();
- addPerscriptiveAciTuples( opContext, tuples, name, entry.getOriginalEntry() );
+ addPerscriptiveAciTuples( opContext, tuples, name, ((ClonedServerEntry)entry).getOriginalEntry() );
addEntryAciTuples( tuples, entry );
addSubentryAciTuples( opContext, tuples, name, entry );
@@ -684,17 +684,17 @@ public class AciAuthorizationInterceptor
return answer;
}
- ClonedServerEntry entry = entryContext.lookup( name, ByPassConstants.HAS_ENTRY_BYPASS );
+ Entry entry = entryContext.lookup( name, ByPassConstants.HAS_ENTRY_BYPASS );
Set<DN> userGroups = groupCache.getGroups( principalDn.getNormName() );
Collection<ACITuple> tuples = new HashSet<ACITuple>();
- addPerscriptiveAciTuples( entryContext, tuples, name, entry.getOriginalEntry() );
- addEntryAciTuples( tuples, entry.getOriginalEntry() );
- addSubentryAciTuples( entryContext, tuples, name, entry.getOriginalEntry() );
+ addPerscriptiveAciTuples( entryContext, tuples, name, ((ClonedServerEntry)entry).getOriginalEntry() );
+ addEntryAciTuples( tuples, ((ClonedServerEntry)entry).getOriginalEntry() );
+ addSubentryAciTuples( entryContext, tuples, name, ((ClonedServerEntry)entry).getOriginalEntry() );
// check that we have browse access to the entry
engine.checkPermission( schemaManager, entryContext, userGroups, principalDn,
principal.getAuthenticationLevel(), name, null, null,
- BROWSE_PERMS, tuples, entry.getOriginalEntry(), null );
+ BROWSE_PERMS, tuples, ((ClonedServerEntry)entry).getOriginalEntry(), null );
return next.hasEntry( entryContext );
}
@@ -760,7 +760,7 @@ public class AciAuthorizationInterceptor
}
- public ClonedServerEntry lookup( NextInterceptor next, LookupOperationContext lookupContext ) throws Exception
+ public Entry lookup( NextInterceptor next, LookupOperationContext lookupContext ) throws Exception
{
CoreSession session = lookupContext.getSession();
DirectoryService directoryService = session.getDirectoryService();
@@ -844,7 +844,7 @@ public class AciAuthorizationInterceptor
DN oriChildName = moveAndRenameContext.getDn();
DN newParentName = moveAndRenameContext.getParent();
- ClonedServerEntry entry = moveAndRenameContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
+ Entry entry = moveAndRenameContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
LdapPrincipal principal = moveAndRenameContext.getSession().getEffectivePrincipal();
DN principalDn = principal.getClonedName();
@@ -871,7 +871,7 @@ public class AciAuthorizationInterceptor
Set<DN> userGroups = groupCache.getGroups( principalDn.getNormName() );
Collection<ACITuple> tuples = new HashSet<ACITuple>();
- addPerscriptiveAciTuples( moveAndRenameContext, tuples, oriChildName, entry.getOriginalEntry() );
+ addPerscriptiveAciTuples( moveAndRenameContext, tuples, oriChildName, ((ClonedServerEntry)entry).getOriginalEntry() );
addEntryAciTuples( tuples, entry );
addSubentryAciTuples( moveAndRenameContext, tuples, oriChildName, entry );
@@ -885,7 +885,7 @@ public class AciAuthorizationInterceptor
// This will certainly be fixed by the SubentryInterceptor,
// but after this service.
- ClonedServerEntry importedEntry = moveAndRenameContext.lookup( oriChildName,
+ Entry importedEntry = moveAndRenameContext.lookup( oriChildName,
ByPassConstants.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
// As the target entry does not exist yet and so
@@ -923,7 +923,7 @@ public class AciAuthorizationInterceptor
DN newParentName = moveContext.getParent();
// Access the principal requesting the operation, and bypass checks if it is the admin
- ClonedServerEntry entry = moveContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
+ Entry entry = moveContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
DN newName = ( DN ) newParentName.clone();
newName.add( oriChildName.get( oriChildName.size() - 1 ) );
@@ -950,7 +950,7 @@ public class AciAuthorizationInterceptor
Set<DN> userGroups = groupCache.getGroups( principalDn.getNormName() );
Collection<ACITuple> tuples = new HashSet<ACITuple>();
- addPerscriptiveAciTuples( moveContext, tuples, oriChildName, entry.getOriginalEntry() );
+ addPerscriptiveAciTuples( moveContext, tuples, oriChildName, ((ClonedServerEntry)entry).getOriginalEntry() );
addEntryAciTuples( tuples, entry );
addSubentryAciTuples( moveContext, tuples, oriChildName, entry );
@@ -1043,7 +1043,7 @@ public class AciAuthorizationInterceptor
String oid = opContext.getOid();
Value<?> value = ( Value<?> ) opContext.getValue();
- ClonedServerEntry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
+ Entry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
LdapPrincipal principal = opContext.getSession().getEffectivePrincipal();
DN principalDn = principal.getClonedName();
@@ -1055,7 +1055,7 @@ public class AciAuthorizationInterceptor
Set<DN> userGroups = groupCache.getGroups( principalDn.getNormName() );
Collection<ACITuple> tuples = new HashSet<ACITuple>();
- addPerscriptiveAciTuples( opContext, tuples, name, entry.getOriginalEntry() );
+ addPerscriptiveAciTuples( opContext, tuples, name, ((ClonedServerEntry)entry).getOriginalEntry() );
addEntryAciTuples( tuples, entry );
addSubentryAciTuples( opContext, tuples, name, entry );
@@ -1082,7 +1082,7 @@ public class AciAuthorizationInterceptor
}
// get the present matched name
- ClonedServerEntry entry;
+ Entry entry;
DN matched = next.getMatchedName( opContext );
// check if we have disclose on error permission for the entry at the matched dn
@@ -1094,7 +1094,7 @@ public class AciAuthorizationInterceptor
Set<DN> userGroups = groupCache.getGroups( principalDn.getNormName() );
Collection<ACITuple> tuples = new HashSet<ACITuple>();
- addPerscriptiveAciTuples( opContext, tuples, matched, entry.getOriginalEntry() );
+ addPerscriptiveAciTuples( opContext, tuples, matched, ((ClonedServerEntry)entry).getOriginalEntry() );
addEntryAciTuples( tuples, entry );
addSubentryAciTuples( opContext, tuples, matched, entry );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Thu Apr 29 17:04:00 2010
@@ -396,10 +396,10 @@ public class DefaultAuthorizationInterce
}
- public ClonedServerEntry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws Exception
+ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws Exception
{
CoreSession session = opContext.getSession();
- ClonedServerEntry entry = nextInterceptor.lookup( opContext );
+ Entry entry = nextInterceptor.lookup( opContext );
if ( session.getDirectoryService().isAccessControlEnabled() || ( entry == null ) )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Thu Apr 29 17:04:00 2010
@@ -25,7 +25,6 @@ import java.util.Set;
import org.apache.directory.server.constants.ApacheSchemaConstants;
import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntryUtils;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -42,7 +41,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.ldif.ChangeType;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifRevertor;
@@ -194,7 +192,7 @@ public class ChangeLogInterceptor extend
private Entry getAttributes( OperationContext opContext ) throws Exception
{
DN dn = opContext.getDn();
- ClonedServerEntry serverEntry;
+ Entry serverEntry;
// @todo make sure we're not putting in operational attributes that cannot be user modified
if ( schemaService.isSchemaSubentry( dn.getNormName() ) )
@@ -327,7 +325,7 @@ public class ChangeLogInterceptor extend
public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext opCtx )
throws Exception
{
- ClonedServerEntry serverEntry = null;
+ Entry serverEntry = null;
if ( changeLog.isEnabled() && opCtx.isFirstOperation() )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Thu Apr 29 17:04:00 2010
@@ -114,11 +114,11 @@ public class CollectiveAttributeIntercep
* @param retAttrs array or attribute type to be specifically included in the result entry(s)
* @throws NamingException if there are problems accessing subentries
*/
- private void addCollectiveAttributes( OperationContext opContext, ClonedServerEntry entry,
+ private void addCollectiveAttributes( OperationContext opContext, Entry entry,
String[] retAttrs ) throws Exception
{
EntryAttribute collectiveAttributeSubentries =
- entry.getOriginalEntry().get( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT );
+ ((ClonedServerEntry)entry).getOriginalEntry().get( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT );
/*
* If there are no collective attribute subentries referenced then we
@@ -136,7 +136,7 @@ public class CollectiveAttributeIntercep
* variance.
*/
EntryAttribute collectiveExclusions =
- entry.getOriginalEntry().get( SchemaConstants.COLLECTIVE_EXCLUSIONS_AT );
+ ((ClonedServerEntry)entry).getOriginalEntry().get( SchemaConstants.COLLECTIVE_EXCLUSIONS_AT );
Set<String> exclusions = new HashSet<String>();
if ( collectiveExclusions != null )
@@ -303,10 +303,10 @@ public class CollectiveAttributeIntercep
// ------------------------------------------------------------------------
- public ClonedServerEntry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext )
+ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext )
throws Exception
{
- ClonedServerEntry result = nextInterceptor.lookup( opContext );
+ Entry result = nextInterceptor.lookup( opContext );
if ( result == null )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Thu Apr 29 17:04:00 2010
@@ -189,7 +189,7 @@ public class EventInterceptor extends Ba
public void modify( NextInterceptor next, final ModifyOperationContext opContext ) throws Exception
{
- ClonedServerEntry oriEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
+ Entry oriEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(), oriEntry );
next.modify( opContext );
@@ -200,8 +200,8 @@ public class EventInterceptor extends Ba
}
// Get the modified entry
- ClonedServerEntry alteredEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
- opContext.setAlteredEntry( alteredEntry );
+ Entry alteredEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
+ opContext.setAlteredEntry( (ClonedServerEntry)alteredEntry );
for ( final RegistrationEntry registration : selecting )
{
@@ -215,7 +215,7 @@ public class EventInterceptor extends Ba
public void rename( NextInterceptor next, RenameOperationContext opContext ) throws Exception
{
- ClonedServerEntry oriEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
+ Entry oriEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(), oriEntry );
next.rename( opContext );
@@ -226,8 +226,8 @@ public class EventInterceptor extends Ba
}
// Get the modifed entry
- ClonedServerEntry alteredEntry = opContext.lookup( opContext.getNewDn(), ByPassConstants.LOOKUP_BYPASS );
- opContext.setAlteredEntry( alteredEntry );
+ Entry alteredEntry = opContext.lookup( opContext.getNewDn(), ByPassConstants.LOOKUP_BYPASS );
+ opContext.setAlteredEntry( (ClonedServerEntry)alteredEntry );
for ( final RegistrationEntry registration : selecting )
{
@@ -241,7 +241,7 @@ public class EventInterceptor extends Ba
public void moveAndRename( NextInterceptor next, final MoveAndRenameOperationContext opContext ) throws Exception
{
- ClonedServerEntry oriEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
+ Entry oriEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(), oriEntry );
next.moveAndRename( opContext );
@@ -250,7 +250,7 @@ public class EventInterceptor extends Ba
return;
}
- opContext.setAlteredEntry( opContext.lookup( opContext.getNewDn(), ByPassConstants.LOOKUP_BYPASS ) );
+ opContext.setAlteredEntry( (ClonedServerEntry)opContext.lookup( opContext.getNewDn(), ByPassConstants.LOOKUP_BYPASS ) );
for ( final RegistrationEntry registration : selecting )
{
@@ -270,7 +270,7 @@ public class EventInterceptor extends Ba
public void move( NextInterceptor next, MoveOperationContext opContext ) throws Exception
{
- ClonedServerEntry oriEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
+ Entry oriEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(), oriEntry );
next.move( opContext );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Thu Apr 29 17:04:00 2010
@@ -173,7 +173,7 @@ public class ExceptionInterceptor extend
{
// We don't know if the parent is an alias or not, so we will launch a
// lookup, and update the cache if it's not an alias
- ClonedServerEntry attrs;
+ Entry attrs;
try
{
@@ -188,7 +188,7 @@ public class ExceptionInterceptor extend
throw e2;
}
- EntryAttribute objectClass = attrs.getOriginalEntry().get( SchemaConstants.OBJECT_CLASS_AT );
+ EntryAttribute objectClass = ((ClonedServerEntry)attrs).getOriginalEntry().get( SchemaConstants.OBJECT_CLASS_AT );
if ( objectClass.contains( SchemaConstants.ALIAS_OC ) )
{
@@ -280,18 +280,25 @@ public class ExceptionInterceptor extend
/**
* Checks to see the base being searched exists, otherwise throws the appropriate LdapException.
*/
- public ClonedServerEntry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws Exception
+ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws Exception
{
- if ( opContext.getDn().getNormName().equals( subschemSubentryDn.getNormName() ) )
+ DN dn = opContext.getDn();
+
+ if ( dn.equals( subschemSubentryDn ) )
{
return nexus.getRootDSE( null );
}
- // check if entry to lookup exists
- String msg = "Attempt to lookup non-existant entry: ";
- assertHasEntry( nextInterceptor, opContext, msg, opContext.getDn() );
+ Entry result = nextInterceptor.lookup( opContext );
+
+ if ( result == null )
+ {
+ LdapNoSuchObjectException e = new LdapNoSuchObjectException( "Attempt to lookup non-existant entry: " + dn.getName() );
- return nextInterceptor.lookup( opContext );
+ throw e;
+ }
+
+ return result;
}
@@ -552,7 +559,7 @@ public class ExceptionInterceptor extend
private void assertHasEntry( NextInterceptor nextInterceptor, OperationContext opContext,
String msg, DN dn ) throws Exception
{
- if ( subschemSubentryDn.getNormName().equals( dn.getNormName() ) )
+ if ( subschemSubentryDn.equals( dn ) )
{
return;
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Thu Apr 29 17:04:00 2010
@@ -23,7 +23,6 @@ package org.apache.directory.server.core
import java.util.List;
import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.BaseInterceptor;
@@ -257,7 +256,7 @@ public class NormalizationInterceptor ex
/**
* {@inheritDoc}
*/
- public ClonedServerEntry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws Exception
+ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws Exception
{
opContext.getDn().normalize( schemaManager.getNormalizerMapping() );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Thu Apr 29 17:04:00 2010
@@ -390,9 +390,9 @@ public class OperationalAttributeInterce
}
- public ClonedServerEntry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws Exception
+ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext ) throws Exception
{
- ClonedServerEntry result = nextInterceptor.lookup( opContext );
+ Entry result = nextInterceptor.lookup( opContext );
if ( result == null )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Thu Apr 29 17:04:00 2010
@@ -778,10 +778,10 @@ public class SchemaInterceptor extends B
/**
* Search for an entry, using its DN. Binary attributes and ObjectClass attribute are removed.
*/
- public ClonedServerEntry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext )
+ public Entry lookup( NextInterceptor nextInterceptor, LookupOperationContext opContext )
throws Exception
{
- ClonedServerEntry result = nextInterceptor.lookup( opContext );
+ Entry result = nextInterceptor.lookup( opContext );
if ( result == null )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java Thu Apr 29 17:04:00 2010
@@ -24,7 +24,6 @@ import java.util.Map;
import javax.naming.NamingException;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.server.core.partition.ByPassConstants;
import org.apache.directory.shared.ldap.entry.Entry;
@@ -67,7 +66,7 @@ public class DeleteStoredProcedureParame
};
- private ClonedServerEntry getDeletedEntry( OperationContext opContext ) throws Exception
+ private Entry getDeletedEntry( OperationContext opContext ) throws Exception
{
/**
* Using LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS here to exclude operational attributes
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java Thu Apr 29 17:04:00 2010
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.server.core.partition.ByPassConstants;
@@ -101,7 +100,7 @@ public class ModifyStoredProcedureParame
};
- private ClonedServerEntry getEntry( OperationContext opContext ) throws Exception
+ private Entry getEntry( OperationContext opContext ) throws Exception
{
/**
* Using LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS here to exclude operational attributes
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Thu Apr 29 17:04:00 2010
@@ -302,7 +302,7 @@ public class TriggerInterceptor extends
}
// Gather supplementary data.
- ClonedServerEntry deletedEntry = deleteContext.lookup( name , ByPassConstants.LOOKUP_BYPASS );
+ Entry deletedEntry = deleteContext.lookup( name , ByPassConstants.LOOKUP_BYPASS );
StoredProcedureParameterInjector injector = new DeleteStoredProcedureParameterInjector( deleteContext, name );
@@ -335,7 +335,7 @@ public class TriggerInterceptor extends
DN normName = opContext.getDn();
// Gather supplementary data.
- ClonedServerEntry modifiedEntry = opContext.lookup( normName, ByPassConstants.LOOKUP_BYPASS );
+ Entry modifiedEntry = opContext.lookup( normName, ByPassConstants.LOOKUP_BYPASS );
StoredProcedureParameterInjector injector = new ModifyStoredProcedureParameterInjector( opContext );
@@ -416,7 +416,7 @@ public class TriggerInterceptor extends
}
// Gather supplementary data.
- ClonedServerEntry movedEntry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
+ Entry movedEntry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
DN oldRDN = new DN( oriChildName.getRdn().getName() );
DN oldSuperiorDN = ( DN ) oriChildName.clone();
@@ -439,7 +439,7 @@ public class TriggerInterceptor extends
// will not be valid at the new location.
// This will certainly be fixed by the SubentryInterceptor,
// but after this service.
- ClonedServerEntry importedEntry = opContext.lookup( oriChildName,
+ Entry importedEntry = opContext.lookup( oriChildName,
ByPassConstants.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
// As the target entry does not exist yet and so
@@ -490,7 +490,7 @@ public class TriggerInterceptor extends
DN newParentName = opContext.getParent();
// Gather supplementary data.
- ClonedServerEntry movedEntry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
+ Entry movedEntry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
DN oldRDN = new DN( oriChildName.getRdn().getName() );
RDN newRDN = new RDN( oriChildName.getRdn().getName() );
@@ -514,7 +514,7 @@ public class TriggerInterceptor extends
// will not be valid at the new location.
// This will certainly be fixed by the SubentryInterceptor,
// but after this service.
- ClonedServerEntry importedEntry = opContext.lookup( oriChildName,
+ Entry importedEntry = opContext.lookup( oriChildName,
ByPassConstants.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
// As the target entry does not exist yet and so
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java Thu Apr 29 17:04:00 2010
@@ -42,6 +42,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.name.DN;
import javax.naming.NamingException;
@@ -169,7 +170,7 @@ public class MockInterceptor implements
}
- public ClonedServerEntry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception
+ public Entry lookup( NextInterceptor next, LookupOperationContext opContext ) throws Exception
{
test.interceptors.add( this );
return next.lookup( opContext );
Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=939379&r1=939378&r2=939379&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Thu Apr 29 17:04:00 2010
@@ -296,14 +296,14 @@ public class KeyDerivationInterceptor ex
KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT
} );
- ClonedServerEntry userEntry = modContext.lookup( lookupContext );
+ Entry userEntry = modContext.lookup( lookupContext );
if ( userEntry == null )
{
throw new LdapAuthenticationException( I18n.err( I18n.ERR_512, principalDn ) );
}
- EntryAttribute objectClass = userEntry.getOriginalEntry().get( SchemaConstants.OBJECT_CLASS_AT );
+ EntryAttribute objectClass = ((ClonedServerEntry)userEntry).getOriginalEntry().get( SchemaConstants.OBJECT_CLASS_AT );
if ( !objectClass.contains( SchemaConstants.KRB5_PRINCIPAL_OC ) )
{
@@ -317,13 +317,13 @@ public class KeyDerivationInterceptor ex
if ( subContext.getPrincipalName() == null )
{
- EntryAttribute principalAttribute = userEntry.getOriginalEntry().get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT );
+ EntryAttribute principalAttribute = ((ClonedServerEntry)userEntry).getOriginalEntry().get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT );
String principalName = principalAttribute.getString();
subContext.setPrincipalName( principalName );
log.debug( "Found principal '{}' from lookup.", principalName );
}
- EntryAttribute keyVersionNumberAttr = userEntry.getOriginalEntry().get( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT );
+ EntryAttribute keyVersionNumberAttr = ((ClonedServerEntry)userEntry).getOriginalEntry().get( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT );
if ( keyVersionNumberAttr == null )
{