HADOOP-5390. Remove duplicate jars from tarball, src from binary tarball

added by hdfsproxy. Contributed by Zhiyong Zhang


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@758426 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -802,6 +802,9 @@ Release 0.20.0 - Unreleased
     HADOOP-5565. Add API for failing/finalized jobs to the JT metrics
     instrumentation. (Jerome Boulon via cdouglas)
 
+    HADOOP-5390. Remove duplicate jars from tarball, src from binary tarball
+    added by hdfsproxy. (Zhiyong Zhang via cdouglas)
+
 Release 0.19.2 - Unreleased
 
   BUG FIXES

src/contrib/hdfsproxy/bin/hdfsproxy

@@ -103,9 +103,28 @@ for f in $HDFSPROXY_HOME/hdfsproxy-*.jar; do
 done
 
 # add libs to CLASSPATH
-for f in $HDFSPROXY_HOME/lib/*.jar; do
-  CLASSPATH=${CLASSPATH}:$f;
-done
+if [ -d "$HDFSPROXY_HOME/lib" ]; then
+	for f in $HDFSPROXY_HOME/lib/*.jar; do
+	  CLASSPATH=${CLASSPATH}:$f;
+	done
+fi
+
+if [ -d "$HDFSPROXY_HOME/../../" ]; then
+	for f in $HDFSPROXY_HOME/../../*.jar; do
+    CLASSPATH=${CLASSPATH}:$f;
+  done
+fi
+if [ -d "$HDFSPROXY_HOME/../../lib" ]; then
+	for f in $HDFSPROXY_HOME/../../lib/*.jar; do
+    CLASSPATH=${CLASSPATH}:$f;
+  done
+fi
+if [ -d "$HDFSPROXY_HOME/../../lib/jsp-2.1" ]; then
+	for f in $HDFSPROXY_HOME/../../lib/jsp-2.1/*.jar; do
+    CLASSPATH=${CLASSPATH}:$f;
+  done
+fi
+
 
 # add user-specified CLASSPATH last
 if [ "$HDFSPROXY_CLASSPATH" != "" ]; then

src/contrib/hdfsproxy/build.xml

@@ -39,9 +39,6 @@
                             </section>
                         </manifest>
 
-			<fileset dir="${basedir}/src/java">
-				<include name="org/apache/hadoop/hdfsproxy/**/*.java"/>
-			</fileset>
 		</jar>
 	</target>
 
@@ -124,12 +121,16 @@
 		</chmod>
 
 	</target>
+	
 	<target name="package" depends="local-package" description="Build distribution">
-                <mkdir dir="${dist.dir}/contrib/${name}"/>
-                <copy todir="${dist.dir}/contrib/${name}">
-                        <fileset dir="${build.dir}/${final.name}"/>
-                </copy>
-                <chmod dir="${dist.dir}/contrib/${name}/bin" perm="a+x" includes="*"/>
+    <mkdir dir="${dist.dir}/contrib/${name}"/>
+    <copy todir="${dist.dir}/contrib/${name}">
+      <fileset dir="${build.dir}/${final.name}">
+      	<exclude name="**/lib/**" />
+      	<exclude name="**/src/**" />
+      </fileset>
+    </copy>
+    <chmod dir="${dist.dir}/contrib/${name}/bin" perm="a+x" includes="*"/>                
 	</target>
 
 	<!-- ================================================================== -->