svn commit: rev 30987 - in avalon/trunk/planet/facilities/http/impl/src/main/org: apache/avalon/http/impl mortbay/http mortbay/jetty

Author: niclas
Date: Fri Jul 30 04:05:55 2004
New Revision: 30987

Removed:
   avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/BasicAuthenticator.java
   avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/DigestAuthenticator.java
   avalon/trunk/planet/facilities/http/impl/src/main/org/mortbay/http/ClientCertAuthenticator.xinfo
   avalon/trunk/planet/facilities/http/impl/src/main/org/mortbay/jetty/
Modified:
   avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ClientCertAuthenticator.java
   avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/FormAuthenticator.java
Log:
Cleaning up the Authenticator system. Two types are not configurable and can be kept as Mortbay classes, by adding .xinfo file only.

Modified: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ClientCertAuthenticator.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ClientCertAuthenticator.java	(original)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ClientCertAuthenticator.java	Fri Jul 30 04:05:55 2004
@@ -17,62 +17,22 @@
 
 package org.apache.avalon.http.impl;
 
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
-
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
 
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-
-import org.apache.avalon.http.HttpContextService;
-
-import org.mortbay.http.Authenticator;
-
 /** Wrapper for the Jetty ClientCertAuthenticator
  *
  * @avalon.component name="http-authenticator-clientcert" lifestyle="singleton"
  * @avalon.service type="org.mortbay.http.Authenticator"
  */
 public class ClientCertAuthenticator extends org.mortbay.http.ClientCertAuthenticator
-    implements Serviceable, LogEnabled
+    implements Parameterizable
 {
-    private HttpContextService  m_Context;
-    private Logger              m_Logger;
-    
     public ClientCertAuthenticator()
     {
     }
     
-    /**
-     * Enable the logging system.
-     *
-     * @avalon.logger name="http"
-     */
-    public void enableLogging( Logger logger )
-    {
-        m_Logger = logger;
-    }
-    
-    public Logger getLogger()
-    {
-        return m_Logger;
-    }
-    
-    /**  
-     * @avalon.dependency type="org.apache.avalon.http.HttpContextService"
-     *                    key="httpcontext" 
-     */
-    public void service( ServiceManager man )
-        throws ServiceException
-    {
-        m_Context = (HttpContextService) man.lookup( "httpcontext" );
-        m_Context.setAuthenticator( this );
-    }
-
     public void parameterize( Parameters params )
         throws ParameterException
     {

Modified: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/FormAuthenticator.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/FormAuthenticator.java	(original)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/FormAuthenticator.java	Fri Jul 30 04:05:55 2004
@@ -17,21 +17,10 @@
 
 package org.apache.avalon.http.impl;
 
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
-
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
 
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-
-import org.apache.avalon.http.HttpContextService;
-
-import org.mortbay.http.Authenticator;
-
 /** Wrapper for the Jetty FormAuthenticator.
  *
  * @avalon.component name="http-authenticator-form" lifestyle="singleton"
@@ -40,39 +29,6 @@
 public class FormAuthenticator extends org.mortbay.jetty.servlet.FormAuthenticator
     implements Serviceable, LogEnabled, Parameterizable
 {
-    private HttpContextService  m_Context;
-    private Logger              m_Logger;
-    
-    public FormAuthenticator()
-    {
-    }
-    
-    /**
-     * Enable the logging system.
-     *
-     * @avalon.logger name="http"
-     */
-    public void enableLogging( Logger logger )
-    {
-        m_Logger = logger;
-    }
-    
-    public Logger getLogger()
-    {
-        return m_Logger;
-    }
-    
-    /**  
-     * @avalon.dependency type="org.apache.avalon.http.HttpContextService"
-     *                    key="httpcontext" 
-     */
-    public void service( ServiceManager man )
-        throws ServiceException
-    {
-        m_Context = (HttpContextService) man.lookup( "httpcontext" );
-        m_Context.setAuthenticator( this );
-    }
-    
     public void parameterize( Parameters params )
         throws ParameterException
     {