You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 04:45:12 UTC
svn commit: r1077140 - in
/hadoop/common/branches/branch-0.20-security-patches/src:
core/org/apache/hadoop/http/ test/org/apache/hadoop/http/
Author: omalley
Date: Fri Mar 4 03:45:12 2011
New Revision: 1077140
URL: http://svn.apache.org/viewvc?rev=1077140&view=rev
Log:
commit c2e202a4f73e29ea905c8394dee7db99612fffc5
Author: Jakob Homan <jh...@yahoo-inc.com>
Date: Mon Feb 1 21:26:52 2010 -0800
HADOOP-6337 from https://issues.apache.org/jira/secure/attachment/12434503/HADOOP-6337-Y.patch
+++ b/YAHOO-CHANGES.txt
+ HADOOP-6337. Update FilterInitializer class to be more visible
+ and take a conf for further development. (jhoman)
+
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/FilterInitializer.java
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/http/TestGlobalFilter.java
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/http/TestServletFilter.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/FilterInitializer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/FilterInitializer.java?rev=1077140&r1=1077139&r2=1077140&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/FilterInitializer.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/FilterInitializer.java Fri Mar 4 03:45:12 2011
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.http;
+import org.apache.hadoop.conf.Configuration;
+
/**
* Initialize a javax.servlet.Filter.
*/
@@ -24,6 +26,7 @@ public abstract class FilterInitializer
/**
* Initialize a Filter to a FilterContainer.
* @param container The filter container
+ * @param conf Configuration for run-time parameters
*/
- abstract void initFilter(FilterContainer container);
-}
\ No newline at end of file
+ abstract void initFilter(FilterContainer container, Configuration conf);
+}
Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java?rev=1077140&r1=1077139&r2=1077140&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java Fri Mar 4 03:45:12 2011
@@ -127,7 +127,7 @@ public class HttpServer implements Filte
final FilterInitializer[] initializers = getFilterInitializers(conf);
if (initializers != null) {
for(FilterInitializer c : initializers) {
- c.initFilter(this);
+ c.initFilter(this, conf);
}
}
addDefaultServlets();
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/http/TestGlobalFilter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/http/TestGlobalFilter.java?rev=1077140&r1=1077139&r2=1077140&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/http/TestGlobalFilter.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/http/TestGlobalFilter.java Fri Mar 4 03:45:12 2011
@@ -68,7 +68,7 @@ public class TestGlobalFilter extends ju
static public class Initializer extends FilterInitializer {
public Initializer() {}
- void initFilter(FilterContainer container) {
+ public void initFilter(FilterContainer container, Configuration conf) {
container.addGlobalFilter("recording", RecordingFilter.class.getName(), null);
}
}
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/http/TestServletFilter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/http/TestServletFilter.java?rev=1077140&r1=1077139&r2=1077140&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/http/TestServletFilter.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/http/TestServletFilter.java Fri Mar 4 03:45:12 2011
@@ -66,7 +66,7 @@ public class TestServletFilter extends j
static public class Initializer extends FilterInitializer {
public Initializer() {}
- void initFilter(FilterContainer container) {
+ public void initFilter(FilterContainer container, Configuration conf) {
container.addFilter("simple", SimpleFilter.class.getName(), null);
}
}