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 2007/04/10 14:55:19 UTC
svn commit: r527114 - in
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor:
BaseInterceptor.java Interceptor.java InterceptorChain.java
NextInterceptor.java
Author: elecharny
Date: Tue Apr 10 05:55:18 2007
New Revision: 527114
URL: http://svn.apache.org/viewvc?view=rev&rev=527114
Log:
Modified the interceptors classes to use the ServiceContext class as a parameter
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?view=diff&rev=527114&r1=527113&r2=527114
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Tue Apr 10 05:55:18 2007
@@ -99,15 +99,15 @@
// Interceptor's Invoke Method
// ------------------------------------------------------------------------
- public void add(NextInterceptor next, LdapDN normName, Attributes entry) throws NamingException
+ public void add(NextInterceptor next, ServiceContext addContext ) throws NamingException
{
- next.add(normName, entry );
+ next.add( addContext );
}
- public void delete( NextInterceptor next, LdapDN name ) throws NamingException
+ public void delete( NextInterceptor next, ServiceContext deleteContext ) throws NamingException
{
- next.delete( name );
+ next.delete( deleteContext );
}
@@ -153,9 +153,9 @@
}
- public void modify( NextInterceptor next, LdapDN name, int modOp, Attributes mods ) throws NamingException
+ public void modify( NextInterceptor next, ServiceContext modifyContext ) throws NamingException
{
- next.modify( name, modOp, mods );
+ next.modify( modifyContext );
}
@@ -203,9 +203,9 @@
}
- public boolean compare( NextInterceptor next, LdapDN name, String oid, Object value ) throws NamingException
+ public boolean compare( NextInterceptor next, ServiceContext compareContext ) throws NamingException
{
- return next.compare( name, oid, value );
+ return next.compare( compareContext );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?view=diff&rev=527114&r1=527113&r2=527114
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Tue Apr 10 05:55:18 2007
@@ -155,27 +155,27 @@
/**
- * Filters {@link PartitionNexus#compare(org.apache.directory.shared.ldap.name.LdapDN,String,Object)} call.
+ * Filters {@link PartitionNexus#compare( ServiceContext )} call.
*/
- boolean compare( NextInterceptor next, LdapDN name, String oid, Object value ) throws NamingException;
+ boolean compare( NextInterceptor next, ServiceContext compareContext) throws NamingException;
/**
- * Filters {@link Partition#delete(org.apache.directory.shared.ldap.name.LdapDN)} call.
+ * Filters {@link Partition#delete(ServiceContext)} call.
*/
- void delete( NextInterceptor next, LdapDN name ) throws NamingException;
+ void delete( NextInterceptor next, ServiceContext deleteContext ) throws NamingException;
/**
- * Filters {@link Partition#add(org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.Attributes)} call.
+ * Filters {@link Partition#add(ServiceContext)} call.
*/
- void add( NextInterceptor next, LdapDN name, Attributes entry ) throws NamingException;
+ void add( NextInterceptor next, ServiceContext addContext ) throws NamingException;
/**
- * Filters {@link Partition#modify(org.apache.directory.shared.ldap.name.LdapDN,int,javax.naming.directory.Attributes)} call.
+ * Filters {@link Partition#modify(ServiceContext)} call.
*/
- void modify( NextInterceptor next, LdapDN name, int modOp, Attributes attributes ) throws NamingException;
+ void modify( NextInterceptor next, ServiceContext modifyContext ) throws NamingException;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?view=diff&rev=527114&r1=527113&r2=527114
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Tue Apr 10 05:55:18 2007
@@ -79,9 +79,9 @@
}
- public boolean compare( NextInterceptor next, LdapDN name, String oid, Object value ) throws NamingException
+ public boolean compare( NextInterceptor next, ServiceContext compareContext ) throws NamingException
{
- return nexus.compare( name, oid, value );
+ return nexus.compare( compareContext );
}
@@ -109,21 +109,21 @@
}
- public void delete( NextInterceptor next, LdapDN name ) throws NamingException
+ public void delete( NextInterceptor next, ServiceContext deleteContext ) throws NamingException
{
- nexus.delete( name );
+ nexus.delete( deleteContext );
}
- public void add(NextInterceptor next, LdapDN normName, Attributes entry) throws NamingException
+ public void add(NextInterceptor next, ServiceContext addContext ) throws NamingException
{
- nexus.add( normName, entry );
+ nexus.add( addContext );
}
- public void modify( NextInterceptor next, LdapDN name, int modOp, Attributes mods ) throws NamingException
+ public void modify( NextInterceptor next, ServiceContext modifyContext ) throws NamingException
{
- nexus.modify( name, modOp, mods );
+ nexus.modify( modifyContext );
}
@@ -585,14 +585,14 @@
}
- public boolean compare( LdapDN name, String oid, Object value ) throws NamingException
+ public boolean compare( ServiceContext compareContext ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
NextInterceptor next = entry.nextInterceptor;
try
{
- return head.compare( next, name, oid, value );
+ return head.compare( next, compareContext );
}
catch ( NamingException ne )
{
@@ -669,14 +669,14 @@
}
- public void delete( LdapDN name ) throws NamingException
+ public void delete( ServiceContext deleteContext ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
NextInterceptor next = entry.nextInterceptor;
try
{
- head.delete( next, name );
+ head.delete( next, deleteContext );
}
catch ( NamingException ne )
{
@@ -689,14 +689,14 @@
}
- public void add( LdapDN normName, Attributes entry ) throws NamingException
+ public void add( ServiceContext addContext ) throws NamingException
{
Entry node = getStartingEntry();
Interceptor head = node.configuration.getInterceptor();
NextInterceptor next = node.nextInterceptor;
try
{
- head.add( next, normName, entry );
+ head.add( next, addContext );
}
catch ( NamingException ne )
{
@@ -750,14 +750,14 @@
}
- public void modify( LdapDN name, int modOp, Attributes mods ) throws NamingException
+ public void modify( ServiceContext modifyContext ) throws NamingException
{
Entry entry = getStartingEntry();
Interceptor head = entry.configuration.getInterceptor();
NextInterceptor next = entry.nextInterceptor;
try
{
- head.modify( next, name, modOp, mods );
+ head.modify( next, modifyContext );
}
catch ( NamingException ne )
{
@@ -998,14 +998,14 @@
}
- public boolean compare( LdapDN name, String oid, Object value ) throws NamingException
+ public boolean compare( ServiceContext compareContext ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
try
{
- return interceptor.compare( next.nextInterceptor, name, oid, value );
+ return interceptor.compare( next.nextInterceptor, compareContext );
}
catch ( NamingException ne )
{
@@ -1103,14 +1103,14 @@
}
- public void delete( LdapDN name ) throws NamingException
+ public void delete( ServiceContext deleteContext ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
try
{
- interceptor.delete( next.nextInterceptor, name );
+ interceptor.delete( next.nextInterceptor, deleteContext );
}
catch ( NamingException ne )
{
@@ -1123,14 +1123,14 @@
}
- public void add( LdapDN normName, Attributes entry ) throws NamingException
+ public void add( ServiceContext addContext ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
try
{
- interceptor.add( next.nextInterceptor, normName, entry );
+ interceptor.add( next.nextInterceptor, addContext );
}
catch ( NamingException ne )
{
@@ -1143,14 +1143,14 @@
}
- public void modify( LdapDN name, int modOp, Attributes mods ) throws NamingException
+ public void modify( ServiceContext modifyContext ) throws NamingException
{
Entry next = getNextEntry();
Interceptor interceptor = next.configuration.getInterceptor();
try
{
- interceptor.modify( next.nextInterceptor, name, modOp, mods );
+ interceptor.modify( next.nextInterceptor, modifyContext );
}
catch ( NamingException ne )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?view=diff&rev=527114&r1=527113&r2=527114
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Tue Apr 10 05:55:18 2007
@@ -48,7 +48,7 @@
/**
* Calls the next interceptor's {@link Interceptor#compare(NextInterceptor,org.apache.directory.shared.ldap.name.LdapDN,String,Object)}.
*/
- boolean compare( LdapDN name, String oid, Object value ) throws NamingException;
+ boolean compare( ServiceContext compareContext ) throws NamingException;
/**
@@ -90,19 +90,19 @@
/**
* Calls the next interceptor's {@link Interceptor#delete(NextInterceptor, org.apache.directory.shared.ldap.name.LdapDN)}.
*/
- void delete( LdapDN name ) throws NamingException;
+ void delete( ServiceContext deleteContext ) throws NamingException;
/**
- * Calls the next interceptor's {@link Interceptor#add(NextInterceptor,org.apache.directory.shared.ldap.name.LdapDN,javax.naming.directory.Attributes)}.
+ * Calls the next interceptor's {@link Interceptor#add(NextInterceptor,ServiceContext)}.
*/
- void add(LdapDN normName, Attributes entry) throws NamingException;
+ void add( ServiceContext addContext ) throws NamingException;
/**
- * Calls the next interceptor's {@link Interceptor#modify(NextInterceptor,org.apache.directory.shared.ldap.name.LdapDN,int,javax.naming.directory.Attributes)}.
+ * Calls the next interceptor's {@link Interceptor#modify(NextInterceptor,ServiceContext)}.
*/
- void modify( LdapDN name, int modOp, Attributes attributes ) throws NamingException;
+ void modify( ServiceContext modifyContext ) throws NamingException;
/**