continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r440149 - in /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main: java/org/apache/maven/continuum/web/filter/FilterToComponentProxy.java webapp/WEB-INF/web.xml
Date Mon, 04 Sep 2006 18:27:00 GMT
Author: carlos
Date: Mon Sep  4 11:26:59 2006
New Revision: 440149

URL: http://svn.apache.org/viewvc?view=rev&rev=440149
Log:
Move FilterToComponentProxy to plexus-xwork

Modified:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/filter/FilterToComponentProxy.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/filter/FilterToComponentProxy.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/filter/FilterToComponentProxy.java?view=diff&rev=440149&r1=440148&r2=440149
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/filter/FilterToComponentProxy.java
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/filter/FilterToComponentProxy.java
Mon Sep  4 11:26:59 2006
@@ -31,21 +31,7 @@
  * limitations under the License.
  */
 
-import java.io.IOException;
-
 import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.xwork.PlexusLifecycleListener;
 
 /**
  * <p>Delegates <code>Filter</code> requests to a Plexus component.</p>
@@ -70,141 +56,14 @@
  * case, set the <code>lifecycle</code> initialization parameter to <code>servlet-container-managed</code>.
If the
  * parameter is any other value, servlet container lifecycle methods will not be delegated
through to the proxy.</p>
  * 
+ * @deprecated use {@link org.codehaus.plexus.xwork.filter.FilterToComponentProxy}
+ * 
  * @author Ben Alex
  * @author Emmanuel Venisse (evenisse at apache dot org)
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
  * @version $Id$
  */
 public class FilterToComponentProxy
-    implements Filter
+    extends org.codehaus.plexus.xwork.filter.FilterToComponentProxy
 {
-    private static final Log log = LogFactory.getLog( FilterToComponentProxy.class );
-
-    private ServletContext ctx;
-
-    private Filter delegate;
-
-    private FilterConfig filterConfig;
-
-    private boolean initialized = false;
-
-    private boolean servletContainerManaged = false;
-
-    public void init( FilterConfig filterConfig )
-        throws ServletException
-    {
-        this.filterConfig = filterConfig;
-
-        doInit();
-    }
-
-    /**
-     * Lookup the delegate {@link Filter} in Plexus container
-     * 
-     * @throws ServletException if this Filter or the delegate Filter are not correctly configured
-     */
-    private synchronized void doInit()
-        throws ServletException
-    {
-        if ( initialized )
-        {
-            // already initialized, so don't re-initialize
-            return;
-        }
-
-        String componentName = null;
-
-        String param = filterConfig.getInitParameter( "component" );
-
-        if ( ( param != null ) && !param.equals( "" ) )
-        {
-            componentName = param;
-        }
-
-        if ( componentName == null )
-        {
-            throw new ServletException( this.getClass().getName() + " require a \"component\"
init-param." );
-        }
-
-        String lifecycle = filterConfig.getInitParameter( "lifecycle" );
-
-        if ( "servlet-container-managed".equals( lifecycle ) )
-        {
-            servletContainerManaged = true;
-        }
-
-        PlexusContainer container = getContainer( filterConfig );
-
-        if ( container == null )
-        {
-            throw new ServletException( "Plexus container not found" );
-        }
-
-        Object object = null;
-        try
-        {
-            object = container.lookup( componentName );
-        }
-        catch ( ComponentLookupException e )
-        {
-            /* need to log as the web server doesn't print the cause */
-            log.error( "Component '" + componentName + "' not found in container", e );
-            throw new ServletException( "Component '" + componentName + "' not found in container",
e );
-        }
-
-        if ( object == null )
-        {
-            throw new ServletException( "Component '" + componentName + "' not found in container"
);
-        }
-
-        if ( !( object instanceof Filter ) )
-        {
-            throw new ServletException( "Component '" + componentName + "' does not implement
javax.servlet.Filter" );
-        }
-
-        delegate = (Filter) object;
-
-        if ( servletContainerManaged )
-        {
-            delegate.init( filterConfig );
-        }
-
-        // Set initialized to true at the end of the synchronized method, so
-        // that invocations of doFilter() before this method has completed will not
-        // cause NullPointerException
-        initialized = true;
-    }
-
-    public void doFilter( ServletRequest request, ServletResponse response, FilterChain chain
)
-        throws IOException, ServletException
-    {
-        if ( !initialized )
-        {
-            doInit();
-        }
-
-        delegate.doFilter( request, response, chain );
-    }
-
-    public void destroy()
-    {
-        if ( ( delegate != null ) && servletContainerManaged )
-        {
-            delegate.destroy();
-        }
-    }
-
-    /**
-     * Allows test cases to override where container is obtained from.
-     *
-     * @param filterConfig which can be used to find the <code>ServletContext</code>
-     *
-     * @return the Plexus container
-     */
-    protected PlexusContainer getContainer( FilterConfig filterConfig )
-    {
-        ctx = filterConfig.getServletContext();
-
-        return (PlexusContainer) ctx.getAttribute( PlexusLifecycleListener.KEY );
-    }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml?view=diff&rev=440149&r1=440148&r2=440149
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml
Mon Sep  4 11:26:59 2006
@@ -20,7 +20,7 @@
   Not integrated with plexus
   <filter>
     <filter-name>Acegi Filter Chain Proxy</filter-name>
-    <filter-class>org.apache.maven.continuum.web.filter.FilterToComponentProxy</filter-class>
+    <filter-class>org.codehaus.plexus.xwork.filter.FilterToComponentProxy</filter-class>
     <init-param>
       <param-name>component</param-name>
       <param-value>org.acegisecurity.util.FilterChainProxy</param-value>
@@ -30,7 +30,7 @@
 
   <filter>
     <filter-name>Acegi HttpSessionContextIntegrationFilter</filter-name>
-    <filter-class>org.apache.maven.continuum.web.filter.FilterToComponentProxy</filter-class>
+    <filter-class>org.codehaus.plexus.xwork.filter.FilterToComponentProxy</filter-class>
     <init-param>
       <param-name>component</param-name>
       <param-value>org.acegisecurity.context.HttpSessionContextIntegrationFilter</param-value>
@@ -39,7 +39,7 @@
 
   <filter>
     <filter-name>Acegi AuthenticationProcessingFilter</filter-name>
-    <filter-class>org.apache.maven.continuum.web.filter.FilterToComponentProxy</filter-class>
+    <filter-class>org.codehaus.plexus.xwork.filter.FilterToComponentProxy</filter-class>
     <init-param>
       <param-name>component</param-name>
       <param-value>org.acegisecurity.ui.webapp.AuthenticationProcessingFilter</param-value>
@@ -49,7 +49,7 @@
 <!--
   <filter>
     <filter-name>Acegi RememberMeProcessingFilter</filter-name>
-    <filter-class>org.apache.maven.continuum.web.filter.FilterToComponentProxy</filter-class>
+    <filter-class>org.codehaus.plexus.xwork.filter.FilterToComponentProxy</filter-class>
     <init-param>
       <param-name>component</param-name>
       <param-value>org.acegisecurity.ui.rememberme.RememberMeProcessingFilter</param-value>
@@ -58,7 +58,7 @@
 
   <filter>
     <filter-name>Acegi AnonymousProcessingFilter</filter-name>
-    <filter-class>org.apache.maven.continuum.web.filter.FilterToComponentProxy</filter-class>
+    <filter-class>org.codehaus.plexus.xwork.filter.FilterToComponentProxy</filter-class>
     <init-param>
       <param-name>component</param-name>
       <param-value>org.acegisecurity.providers.anonymous.AnonymousProcessingFilter</param-value>
@@ -68,7 +68,7 @@
 
   <filter>
     <filter-name>Acegi ExceptionTranslationFilter</filter-name>
-    <filter-class>org.apache.maven.continuum.web.filter.FilterToComponentProxy</filter-class>
+    <filter-class>org.codehaus.plexus.xwork.filter.FilterToComponentProxy</filter-class>
     <init-param>
       <param-name>component</param-name>
       <param-value>org.acegisecurity.ui.ExceptionTranslationFilter</param-value>
@@ -77,7 +77,7 @@
 
   <filter>
     <filter-name>Acegi FilterSecurityInterceptor</filter-name>
-    <filter-class>org.apache.maven.continuum.web.filter.FilterToComponentProxy</filter-class>
+    <filter-class>org.codehaus.plexus.xwork.filter.FilterToComponentProxy</filter-class>
     <init-param>
       <param-name>component</param-name>
       <param-value>org.acegisecurity.intercept.web.FilterSecurityInterceptor</param-value>



Mime
View raw message