From c45e0c49f4640755c53e559447b9c562b66f43fa Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 9 Mar 2011 22:17:18 +0000
Subject: [PATCH] NIHVIVO-2211 Changes to RequestPolicyList and
 RequestIdentifiers mean that AuthSetupForrequest is no longer needed.

---
 webapp/config/web.xml                         |  9 ----
 .../auth/filters/AuthSetupForRequest.java     | 48 -------------------
 2 files changed, 57 deletions(-)
 delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/auth/filters/AuthSetupForRequest.java

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 0f7842ca4..8e38459e4 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -257,15 +257,6 @@
     <dispatcher>forward</dispatcher>
   </filter-mapping>
 
-  <!--filter>
-        <filter-name>AuthSetupForRequest</filter-name>
-        <filter-class>edu.cornell.mannlib.vitro.webapp.auth.filters.AuthSetupForRequest</filter-class>
-  </filter>
-  <filter-mapping>
-        <filter-name>AuthSetupForRequest</filter-name>
-        <url-pattern>/*</url-pattern>
-  </filter-mapping-->
-
   <!--  Spring setup ****************************************************  -->
 <!--
   <context-param>
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/filters/AuthSetupForRequest.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/filters/AuthSetupForRequest.java
deleted file mode 100644
index 45b85c4e9..000000000
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/filters/AuthSetupForRequest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.filters;
-
-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 edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyList;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.RequestPolicyList;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
-
-/**
- * Setup a PolicyList for the request and put it in the request scope.
- *
- * It expects to get the PolicyList from ServletPolicyList;
- *
- * @author bdc34
- *
- */
-public class AuthSetupForRequest implements Filter {
-    ServletContext context;
-
-    @Override
-	public void init(FilterConfig filterConfig) throws ServletException {
-        context = filterConfig.getServletContext();
-    }
-
-    @Override
-	public void doFilter(ServletRequest servletRequest,
-			ServletResponse servletResponse, FilterChain filterChain)
-			throws IOException, ServletException {
-        //get the policies that are in effect for the context and add to Request Scope
-        PolicyList plist = ServletPolicyList.getPolicies(context);        
-        servletRequest.setAttribute(RequestPolicyList.POLICY_LIST , plist);
-
-        filterChain.doFilter(servletRequest, servletResponse);
-    }
-
-    @Override
-	public void destroy() { /* Nothing to destroy */ }
-}
\ No newline at end of file