Przeglądaj źródła

Fix the hdfsproxy test failure

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-4687/hdfs@782118 13f79535-47bb-0310-9956-ffa450edef68
Giridharan Kesavan 16 lat temu
rodzic
commit
629fa0be5f
2 zmienionych plików z 23 dodań i 0 usunięć
  1. 11 0
      build.xml
  2. 12 0
      src/contrib/hdfsproxy/ivy.xml

+ 11 - 0
build.xml

@@ -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">

+ 12 - 0
src/contrib/hdfsproxy/ivy.xml

@@ -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}"
@@ -54,6 +58,14 @@
       name="jetty"
       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}"