You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2005/03/28 17:54:58 UTC
svn commit: r159247 - in
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server: auth/
authn/ interceptor/ jndi/
Author: akarasulu
Date: Mon Mar 28 07:54:54 2005
New Revision: 159247
URL: http://svn.apache.org/viewcvs?view=rev&rev=159247
Log:
moving auth package to authn to differentiate from authz stuff
Added:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/
- copied from r159246, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/
Removed:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorConfig.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorConfig.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticatorConfigBuilder.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java Mon Mar 28 07:54:54 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.auth;
+package org.apache.ldap.server.authn;
import org.apache.ldap.server.jndi.ServerContext;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AnonymousAuthenticator.java Mon Mar 28 07:54:54 2005
@@ -14,9 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.auth;
+package org.apache.ldap.server.authn;
import org.apache.ldap.server.jndi.ServerContext;
+import org.apache.ldap.server.authn.AbstractAuthenticator;
import org.apache.ldap.common.exception.LdapNoPermissionException;
import javax.naming.NamingException;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java Mon Mar 28 07:54:54 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.auth;
+package org.apache.ldap.server.authn;
import org.apache.ldap.server.jndi.ServerContext;
@@ -28,9 +28,9 @@
* <p>An Authenticator is a program that performs client authentication based on the authentication
* method/type that the client specifies in the JNDI properties.
*
- * <p>To implement this interface, you can write an authenticator that extends org.apache.ldap.server.auth.AbstractAuthenticator.
+ * <p>To implement this interface, you can write an authenticator that extends org.apache.ldap.server.authn.AbstractAuthenticator.
*
- * @see AbstractAuthenticator
+ * @see org.apache.ldap.server.authn.AbstractAuthenticator
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorConfig.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorConfig.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorConfig.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorConfig.java Mon Mar 28 07:54:54 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.auth;
+package org.apache.ldap.server.authn;
import java.util.Enumeration;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticatorContext.java Mon Mar 28 07:54:54 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.auth;
+package org.apache.ldap.server.authn;
import org.apache.ldap.server.PartitionNexus;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorConfig.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorConfig.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorConfig.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorConfig.java Mon Mar 28 07:54:54 2005
@@ -14,7 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.auth;
+package org.apache.ldap.server.authn;
+
+import org.apache.ldap.server.authn.AuthenticatorConfig;
+import org.apache.ldap.server.authn.AuthenticatorContext;
import java.util.Enumeration;
import java.util.Properties;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/GenericAuthenticatorContext.java Mon Mar 28 07:54:54 2005
@@ -14,10 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.auth;
+package org.apache.ldap.server.authn;
import org.apache.ldap.server.PartitionNexus;
+import org.apache.ldap.server.authn.AuthenticatorContext;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java Mon Mar 28 07:54:54 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.auth;
+package org.apache.ldap.server.authn;
import java.io.Serializable;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/SimpleAuthenticator.java Mon Mar 28 07:54:54 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.server.auth;
+package org.apache.ldap.server.authn;
import javax.naming.Context;
@@ -27,6 +27,8 @@
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.util.ArrayUtils;
import org.apache.ldap.server.PartitionNexus;
+import org.apache.ldap.server.authn.AbstractAuthenticator;
+import org.apache.ldap.server.authn.LdapPrincipal;
import org.apache.ldap.server.jndi.ServerContext;
@@ -51,7 +53,7 @@
/**
* Uses the userPassword field of the user to authenticate.
*
- * @see Authenticator#authenticate(org.apache.ldap.server.jndi.ServerContext)
+ * @see org.apache.ldap.server.authn.Authenticator#authenticate(org.apache.ldap.server.jndi.ServerContext)
*/
public LdapPrincipal authenticate( ServerContext ctx ) throws NamingException
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java Mon Mar 28 07:54:54 2005
@@ -17,7 +17,7 @@
package org.apache.ldap.server.interceptor;
-import org.apache.ldap.server.auth.LdapPrincipal;
+import org.apache.ldap.server.authn.LdapPrincipal;
import org.apache.ldap.server.jndi.ServerContext;
import org.apache.ldap.server.invocation.*;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java Mon Mar 28 07:54:54 2005
@@ -32,18 +32,16 @@
import org.apache.ldap.common.exception.LdapAuthenticationNotSupportedException;
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.server.auth.AbstractAuthenticator;
-import org.apache.ldap.server.auth.AnonymousAuthenticator;
-import org.apache.ldap.server.auth.GenericAuthenticatorConfig;
-import org.apache.ldap.server.auth.GenericAuthenticatorContext;
-import org.apache.ldap.server.auth.LdapPrincipal;
-import org.apache.ldap.server.auth.SimpleAuthenticator;
+import org.apache.ldap.server.authn.SimpleAuthenticator;
import org.apache.ldap.server.invocation.Invocation;
import org.apache.ldap.server.interceptor.Interceptor;
import org.apache.ldap.server.interceptor.InterceptorContext;
import org.apache.ldap.server.interceptor.NextInterceptor;
import org.apache.ldap.server.interceptor.Interceptor;
import org.apache.ldap.server.interceptor.NextInterceptor;
+import org.apache.ldap.server.authn.AbstractAuthenticator;
+import org.apache.ldap.server.authn.GenericAuthenticatorConfig;
+import org.apache.ldap.server.authn.*;
/**
* An {@link Interceptor} that authenticates users.
@@ -92,7 +90,7 @@
authenticatorConfig.setAuthenticatorName( "none" );
authenticatorConfig.setAuthenticatorContext( authenticatorContext );
- org.apache.ldap.server.auth.Authenticator authenticator = new AnonymousAuthenticator();
+ org.apache.ldap.server.authn.Authenticator authenticator = new AnonymousAuthenticator();
authenticator.init( authenticatorConfig );
this.register( authenticator );
@@ -150,7 +148,7 @@
* @param authenticator Authenticator component to register with this
* AuthenticatorService.
*/
- public void register( org.apache.ldap.server.auth.Authenticator authenticator )
+ public void register( org.apache.ldap.server.authn.Authenticator authenticator )
{
Collection authenticatorList = getAuthenticators( authenticator.getAuthenticatorType() );
if ( authenticatorList == null )
@@ -170,7 +168,7 @@
* @param authenticator Authenticator component to unregister with this
* AuthenticatorService.
*/
- public void unregister( org.apache.ldap.server.auth.Authenticator authenticator )
+ public void unregister( org.apache.ldap.server.authn.Authenticator authenticator )
{
Collection authenticatorList = getAuthenticators( authenticator.getAuthenticatorType() );
if ( authenticatorList == null )
@@ -248,8 +246,8 @@
{
try
{
- org.apache.ldap.server.auth.Authenticator authenticator =
- ( org.apache.ldap.server.auth.Authenticator ) i.next();
+ org.apache.ldap.server.authn.Authenticator authenticator =
+ ( org.apache.ldap.server.authn.Authenticator ) i.next();
// perform the authentication
LdapPrincipal authorizationId = authenticator.authenticate( ctx );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticatorConfigBuilder.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticatorConfigBuilder.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticatorConfigBuilder.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticatorConfigBuilder.java Mon Mar 28 07:54:54 2005
@@ -24,7 +24,8 @@
import javax.naming.NamingException;
import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.server.auth.GenericAuthenticatorConfig;
+import org.apache.ldap.server.authn.GenericAuthenticatorConfig;
+import org.apache.ldap.server.authn.GenericAuthenticatorConfig;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java Mon Mar 28 07:54:54 2005
@@ -34,7 +34,8 @@
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.util.NamespaceTools;
import org.apache.ldap.server.PartitionNexus;
-import org.apache.ldap.server.auth.LdapPrincipal;
+import org.apache.ldap.server.authn.LdapPrincipal;
+import org.apache.ldap.server.authn.LdapPrincipal;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java Mon Mar 28 07:54:54 2005
@@ -31,7 +31,7 @@
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.util.NamespaceTools;
import org.apache.ldap.server.PartitionNexus;
-import org.apache.ldap.server.auth.LdapPrincipal;
+import org.apache.ldap.server.authn.LdapPrincipal;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java?view=diff&r1=159246&r2=159247
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java Mon Mar 28 07:54:54 2005
@@ -27,7 +27,8 @@
import org.apache.ldap.common.NotImplementedException;
import org.apache.ldap.server.PartitionNexus;
-import org.apache.ldap.server.auth.LdapPrincipal;
+import org.apache.ldap.server.authn.LdapPrincipal;
+import org.apache.ldap.server.authn.LdapPrincipal;
/**