hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkesa...@apache.org
Subject svn commit: r782118 - in /hadoop/core/branches/HADOOP-4687/hdfs: build.xml src/contrib/hdfsproxy/ivy.xml
Date Fri, 05 Jun 2009 19:54:15 GMT
Author: gkesavan
Date: Fri Jun  5 19:54:14 2009
New Revision: 782118

URL: http://svn.apache.org/viewvc?rev=782118&view=rev
Log:
Fix the hdfsproxy test failure

Modified:
    hadoop/core/branches/HADOOP-4687/hdfs/build.xml
    hadoop/core/branches/HADOOP-4687/hdfs/src/contrib/hdfsproxy/ivy.xml

Modified: hadoop/core/branches/HADOOP-4687/hdfs/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/hdfs/build.xml?rev=782118&r1=782117&r2=782118&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/hdfs/build.xml (original)
+++ hadoop/core/branches/HADOOP-4687/hdfs/build.xml Fri Jun  5 19:54:14 2009
@@ -256,6 +256,17 @@
         <include name="webapps/**"/>
       </patternset>
     </unzip>
+
+    <copy todir="${conf.dir}" verbose="true">
+      <fileset dir="${conf.dir}" includes="**/*.template"/>
+      <mapper type="glob" from="*.template" to="*"/>
+    </copy>
+
+    <copy todir="${contrib.dir}" verbose="true">
+      <fileset dir="${contrib.dir}" includes="**/*.template"/>
+      <mapper type="glob" from="*.template" to="*"/>
+    </copy>
+
   </target>
 
   <target name="compile-hdfs-classes" depends="init">

Modified: hadoop/core/branches/HADOOP-4687/hdfs/src/contrib/hdfsproxy/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/hdfs/src/contrib/hdfsproxy/ivy.xml?rev=782118&r1=782117&r2=782118&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/hdfs/src/contrib/hdfsproxy/ivy.xml (original)
+++ hadoop/core/branches/HADOOP-4687/hdfs/src/contrib/hdfsproxy/ivy.xml Fri Jun  5 19:54:14
2009
@@ -22,6 +22,10 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+    <dependency org="commons-cli"
+      name="commons-cli"
+      rev="${commons-cli.version}"
+      conf="common->default"/>
     <dependency org="log4j"
       name="log4j"
       rev="${log4j.version}"
@@ -55,6 +59,14 @@
       rev="${jetty.version}"
       conf="common->master"/>
     <dependency org="org.mortbay.jetty"
+      name="jsp-api-2.1"
+      rev="${jetty.version}"
+      conf="common->master"/>
+    <dependency org="org.mortbay.jetty"
+      name="jsp-2.1"
+      rev="${jetty.version}"
+      conf="common->master"/>
+    <dependency org="org.mortbay.jetty"
       name="jetty-util"
       rev="${jetty-util.version}"
       conf="common->master"/>



Mime
View raw message