Author: aching
Date: Fri Mar 23 06:45:12 2012
New Revision: 1304208
URL: http://svn.apache.org/viewvc?rev=1304208&view=rev
Log:
GIRAPH-163: bin/giraph script overwrites CLASSPATH if "dev
environment" detected (this also removes USER_JAR from CLASSPATH)
(metaman via aching).
Modified:
incubator/giraph/trunk/CHANGELOG
incubator/giraph/trunk/bin/giraph
Modified: incubator/giraph/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/incubator/giraph/trunk/CHANGELOG?rev=1304208&r1=1304207&r2=1304208&view=diff
==============================================================================
--- incubator/giraph/trunk/CHANGELOG (original)
+++ incubator/giraph/trunk/CHANGELOG Fri Mar 23 06:45:12 2012
@@ -2,6 +2,10 @@ Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-163: bin/giraph script overwrites CLASSPATH if "dev
+ environment" detected (this also removes USER_JAR from CLASSPATH)
+ (metaman via aching).
+
GIRAPH-164: fix 5 "Line is longer than 80 characters" style errors
in GiraphRunner (ekoontz via aching).
Modified: incubator/giraph/trunk/bin/giraph
URL:
http://svn.apache.org/viewvc/incubator/giraph/trunk/bin/giraph?rev=1304208&r1=1304207&r2=1304208&view=diff
==============================================================================
--- incubator/giraph/trunk/bin/giraph (original)
+++ incubator/giraph/trunk/bin/giraph Fri Mar 23 06:45:12 2012
@@ -84,8 +84,9 @@ else
exit 1
fi
- CLASSPATH=`mvn dependency:build-classpath | grep -v "[INFO]"`
-
+ CLASSPATH2=`mvn dependency:build-classpath | grep -v "[INFO]"`
+ CLASSPATH=$CLASSPATH:$CLASSPATH2
+
for f in $GIRAPH_HOME/target/giraph*.jar ; do
if [ -e "$f" ]; then
JAR=$f