Author: akarasulu
Date: Tue Mar 22 22:38:26 2005
New Revision: 158738
URL: http://svn.apache.org/viewcvs?view=rev&rev=158738
Log:
Invocation.getResponse() should be getReturnValue()
- don't want to confuse people thinking its a protocol response ;)
- also no need to call it a response this is not servlet chaining anymore
but I understand where it came from
Modified:
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/PartitionNexus.java
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java
Modified:
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/PartitionNexus.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/PartitionNexus.java?view=diff&r1=158737&r2=158738
==============================================================================
---
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/PartitionNexus.java
(original)
+++
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/PartitionNexus.java
Tue Mar 22 22:38:26 2005
@@ -100,7 +100,7 @@
* ContextPartition's naming context online.
*
* Operations against the naming context should result in an LDAP BUSY
- * result code in the response if the naming context is not online.
+ * result code in the returnValue if the naming context is not online.
*
* @param partition ContextPartition component to register with this
* BackendNexus.
@@ -114,7 +114,7 @@
* the ContextPartition's naming context offline.
*
* Operations against the naming context should result in an LDAP BUSY
- * result code in the response if the naming context is not online.
+ * result code in the returnValue if the naming context is not online.
*
* @param partition ContextPartition component to unregister with this
* BackendNexus.
Modified:
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java?view=diff&r1=158737&r2=158738
==============================================================================
---
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java
(original)
+++
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java
Tue Mar 22 22:38:26 2005
@@ -186,7 +186,7 @@
public Object invoke( Invocation call ) throws NamingException
{
interceptor.process( null, call );
- return call.getResponse();
+ return call.getReturnValue();
}
/**
Modified:
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java?view=diff&r1=158737&r2=158738
==============================================================================
---
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java
(original)
+++
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java
Tue Mar 22 22:38:26 2005
@@ -36,7 +36,7 @@
public abstract class Invocation
{
- protected Object response;
+ protected Object returnValue;
protected Stack contextStack;
@@ -50,20 +50,20 @@
/**
- * Returns the response object for this invocation.
+ * Returns the returnValue object for this invocation.
*/
- public Object getResponse()
+ public Object getReturnValue()
{
- return response;
+ return returnValue;
}
/**
- * Sets the response object for this invocation.
+ * Sets the returnValue object for this invocation.
*/
- public void setResponse( Object response )
+ public void setReturnValue( Object returnValue )
{
- this.response = response;
+ this.returnValue = returnValue;
}
@@ -94,19 +94,19 @@
/**
* Executes this invocation on the specified <code>store</code>. The
default
* implementation calls an abstract method [EMAIL PROTECTED]
#doExecute(BackingStore)}
- * and sets the <code>response</code> property of this invocation to its
return value.
+ * and sets the <code>returnValue</code> property of this invocation to
its return value.
*
* @throws NamingException if the operation failed
*/
public void execute( BackingStore store ) throws NamingException
{
- setResponse( doExecute( store ) );
+ setReturnValue( doExecute( store ) );
}
/**
* Implement this method to invoke the appropriate operation on the
specified
- * <code>store</code>. Returned value will be set as the
<code>response</code> proeprty of this invocation.
+ * <code>store</code>. Returned value will be set as the
<code>returnValue</code> proeprty of this invocation.
*
* @throws NamingException if the operation failed
*/
Modified:
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java?view=diff&r1=158737&r2=158738
==============================================================================
---
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java
(original)
+++
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java
Tue Mar 22 22:38:26 2005
@@ -296,7 +296,7 @@
{
super.process( nextInterceptor, call );
- Attributes attributes = ( Attributes ) call.getResponse();
+ Attributes attributes = ( Attributes ) call.getReturnValue();
if ( attributes == null )
{
return;
@@ -305,7 +305,7 @@
Attributes retval = ( Attributes ) attributes.clone();
LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
protectLookUp( ctx, call.getName() );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
@@ -313,7 +313,7 @@
{
super.process( nextInterceptor, call );
- Attributes attributes = ( Attributes ) call.getResponse();
+ Attributes attributes = ( Attributes ) call.getReturnValue();
if ( attributes == null )
{
return;
@@ -322,7 +322,7 @@
Attributes retval = ( Attributes ) attributes.clone();
LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
protectLookUp( ctx, call.getName() );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
@@ -390,7 +390,7 @@
NamingEnumeration e;
ResultFilteringEnumeration retval;
LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
- e = ( NamingEnumeration ) call.getResponse();
+ e = ( NamingEnumeration ) call.getReturnValue();
retval = new ResultFilteringEnumeration( e, searchControls, ctx,
new SearchResultFilter()
{
@@ -402,7 +402,7 @@
}
} );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
@@ -413,7 +413,7 @@
NamingEnumeration e;
ResultFilteringEnumeration retval;
LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
- e = ( NamingEnumeration ) call.getResponse();
+ e = ( NamingEnumeration ) call.getReturnValue();
retval = new ResultFilteringEnumeration( e, null, ctx,
new SearchResultFilter()
{
@@ -425,7 +425,7 @@
}
} );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
Modified:
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java?view=diff&r1=158737&r2=158738
==============================================================================
---
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java
(original)
+++
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java
Tue Mar 22 22:38:26 2005
@@ -207,10 +207,10 @@
{
nextInterceptor.process( call );
- Attributes attributes = ( Attributes ) call.getResponse();
+ Attributes attributes = ( Attributes ) call.getReturnValue();
Attributes retval = ( Attributes ) attributes.clone();
filter( retval );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
@@ -218,7 +218,7 @@
{
nextInterceptor.process( call );
- Attributes attributes = ( Attributes ) call.getResponse();
+ Attributes attributes = ( Attributes ) call.getReturnValue();
if ( attributes == null )
{
return;
@@ -226,7 +226,7 @@
Attributes retval = ( Attributes ) attributes.clone();
filter( call.getName(), retval, call.getAttributeIds() );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
@@ -237,9 +237,9 @@
NamingEnumeration e;
ResultFilteringEnumeration retval;
LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
- e = ( NamingEnumeration ) call.getResponse();
+ e = ( NamingEnumeration ) call.getReturnValue();
retval = new ResultFilteringEnumeration( e, new SearchControls(), ctx,
SEARCH_FILTER );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
@@ -256,9 +256,9 @@
NamingEnumeration e;
ResultFilteringEnumeration retval;
LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
- e = ( NamingEnumeration ) call.getResponse();
+ e = ( NamingEnumeration ) call.getReturnValue();
retval = new ResultFilteringEnumeration( e, searchControls, ctx,
SEARCH_FILTER );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
Modified:
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java?view=diff&r1=158737&r2=158738
==============================================================================
---
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java
(original)
+++
directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java
Tue Mar 22 22:38:26 2005
@@ -120,9 +120,9 @@
NamingEnumeration e;
ResultFilteringEnumeration retval;
LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
- e = ( NamingEnumeration ) call.getResponse();
+ e = ( NamingEnumeration ) call.getReturnValue();
retval = new ResultFilteringEnumeration( e, new SearchControls(), ctx,
binaryAttributeFilter );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
@@ -152,7 +152,7 @@
Attributes attrs = getSubschemaEntry(
searchControls.getReturningAttributes() );
SearchResult result = new SearchResult(
call.getBaseName().toString(), null, attrs );
SingletonEnumeration e = new SingletonEnumeration( result );
- call.setResponse( e );
+ call.setReturnValue( e );
bypass = true;
}
}
@@ -167,7 +167,7 @@
Attributes attrs = getSubschemaEntry(
searchControls.getReturningAttributes() );
SearchResult result = new SearchResult(
call.getBaseName().toString(), null, attrs );
SingletonEnumeration e = new SingletonEnumeration( result );
- call.setResponse( e );
+ call.setReturnValue( e );
bypass = true;
}
}
@@ -185,9 +185,9 @@
NamingEnumeration e;
ResultFilteringEnumeration retval;
LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
- e = ( NamingEnumeration ) call.getResponse();
+ e = ( NamingEnumeration ) call.getReturnValue();
retval = new ResultFilteringEnumeration( e, searchControls, ctx,
binaryAttributeFilter );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
@@ -322,10 +322,10 @@
nextInterceptor.process( call );
ServerLdapContext ctx = ( ServerLdapContext )
call.getContextStack().peek();
- Attributes attributes = ( Attributes ) call.getResponse();
+ Attributes attributes = ( Attributes ) call.getReturnValue();
Attributes retval = ( Attributes ) attributes.clone();
doFilter( ctx, retval );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
@@ -334,7 +334,7 @@
nextInterceptor.process( call );
ServerLdapContext ctx = ( ServerLdapContext )
call.getContextStack().peek();
- Attributes attributes = ( Attributes ) call.getResponse();
+ Attributes attributes = ( Attributes ) call.getReturnValue();
if ( attributes == null )
{
return;
@@ -342,7 +342,7 @@
Attributes retval = ( Attributes ) attributes.clone();
doFilter( ctx, retval );
- call.setResponse( retval );
+ call.setReturnValue( retval );
}
