hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdoug...@apache.org
Subject svn commit: r758425 - in /hadoop/core/trunk: CHANGES.txt src/contrib/hdfsproxy/bin/hdfsproxy src/contrib/hdfsproxy/build.xml
Date Wed, 25 Mar 2009 20:02:10 GMT
Author: cdouglas
Date: Wed Mar 25 20:02:04 2009
New Revision: 758425

URL: http://svn.apache.org/viewvc?rev=758425&view=rev
Log:
HADOOP-5390. Remove duplicate jars from tarball, src from binary tarball
added by hdfsproxy. Contributed by Zhiyong Zhang

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/contrib/hdfsproxy/bin/hdfsproxy
    hadoop/core/trunk/src/contrib/hdfsproxy/build.xml

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=758425&r1=758424&r2=758425&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Mar 25 20:02:04 2009
@@ -1101,6 +1101,9 @@
     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

Modified: hadoop/core/trunk/src/contrib/hdfsproxy/bin/hdfsproxy
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hdfsproxy/bin/hdfsproxy?rev=758425&r1=758424&r2=758425&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hdfsproxy/bin/hdfsproxy (original)
+++ hadoop/core/trunk/src/contrib/hdfsproxy/bin/hdfsproxy Wed Mar 25 20:02:04 2009
@@ -103,9 +103,28 @@
 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

Modified: hadoop/core/trunk/src/contrib/hdfsproxy/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hdfsproxy/build.xml?rev=758425&r1=758424&r2=758425&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hdfsproxy/build.xml (original)
+++ hadoop/core/trunk/src/contrib/hdfsproxy/build.xml Wed Mar 25 20:02:04 2009
@@ -104,9 +104,6 @@
                             </section>
                         </manifest>
 
-			<fileset dir="${basedir}/src/java">
-				<include name="org/apache/hadoop/hdfsproxy/**/*.java"/>
-			</fileset>
 		</jar>
 	</target>
 	
@@ -370,12 +367,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>
 
 	<!-- ================================================================== -->



Mime
View raw message