On Fri, Jun 26, 2009 at 11:48 PM, <[EMAIL PROTECTED]> wrote:
> Author: cdouglas
> Date: Fri Jun 26 22:48:23 2009
> New Revision: 788898
>
> URL: http://svn.apache.org/viewvc?rev=788898&view=rev
> Log:
> HDFS-447. Add LDAP lookup to hdfsproxy. Contributed by Zhiyong Zhang
>
> Added:
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/LdapIpDirFilter.java
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/test/org/apache/hadoop/hdfsproxy/DummyLdapContext.java
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/test/org/apache/hadoop/hdfsproxy/TestLdapIpDirFilter.java
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/test/resources/tomcat-web.xml
> Modified:
>    hadoop/hdfs/trunk/CHANGES.txt
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/build.xml
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/conf/hdfsproxy-default.xml
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/conf/tomcat-forward-web.xml
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/conf/tomcat-web.xml
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFileDataServlet.java
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyForwardServlet.java
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyListPathsServlet.java
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyStreamFile.java
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyUtil.java
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/test/resources/proxy-config/hdfsproxy-default.xml
>    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/test/resources/proxy-config/user-certs.xml
>    hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/HsftpFileSystem.java
>
> Modified: hadoop/hdfs/trunk/CHANGES.txt
> URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=788898&r1=788897&r2=788898&view=diff
> =============================================================================> --- hadoop/hdfs/trunk/CHANGES.txt (original)
> +++ hadoop/hdfs/trunk/CHANGES.txt Fri Jun 26 22:48:23 2009
> @@ -7,6 +7,8 @@
>     HDFS-436. Introduce AspectJ framework for HDFS code and tests.
>     (Konstantin Boudnik via szetszwo)
>
> +    HDFS-447. Add LDAP lookup to hdfsproxy. (Zhiyong Zhang via cdouglas)
> +
>   IMPROVEMENTS
>
>     HDFS-381. Remove blocks from DataNode maps when corresponding file
>
> Modified: hadoop/hdfs/trunk/src/contrib/hdfsproxy/build.xml
> URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/hdfsproxy/build.xml?rev=788898&r1=788897&r2=788898&view=diff
> =============================================================================> --- hadoop/hdfs/trunk/src/contrib/hdfsproxy/build.xml (original)
> +++ hadoop/hdfs/trunk/src/contrib/hdfsproxy/build.xml Fri Jun 26 22:48:23 2009
> @@ -60,6 +60,7 @@
>        <and>
>            <or>
>                <equals arg1="${testcase}" arg2="TestProxyFilter" />
> +               <equals arg1="${testcase}" arg2="TestLdapIpDirFilter" />
>                                <equals arg1="${testcase}" arg2="TestProxyUtil" />
>                                <equals arg1="${testcase}" arg2="TestProxyForwardServlet" />
>                                <not>
> @@ -118,22 +119,21 @@
>          <war destfile="${build.dir}/${final.name}.war" webxml="${basedir}/conf/tomcat-web.xml">
>            <lib dir="${common.ivy.lib.dir}">
>              <include name="commons-logging-${commons-logging.version}.jar"/>
> -              <include name="junit-${junit.version}.jar"/>
> -              <include name="log4j-${log4j.version}.jar"/>
> -              <include name="slf4j-api-${slf4j-api.version}.jar"/>
> -              <include name="slf4j-log4j12-${slf4j-log4j12.version}.jar"/>
> -              <include name="xmlenc-${xmlenc.version}.jar"/>
> -              <include name="core-${core.version}.jar"/>
> +        <include name="junit-${junit.version}.jar"/>
> +        <include name="log4j-${log4j.version}.jar"/>