Mailing-List: contact chukwa-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: chukwa-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r785463 - in /hadoop/chukwa: branches/chukwa-0.2/
 branches/chukwa-0.2/bin/ branches/chukwa-0.2/conf/ trunk/ trunk/bin/
 trunk/conf/
Date: Wed, 17 Jun 2009 01:04:40 -0000
To: chukwa-commits@hadoop.apache.org
From: eyang@apache.org
Message-Id: <20090617010440.CEB2A2388876@eris.apache.org>

Author: eyang
Date: Wed Jun 17 01:04:40 2009
New Revision: 785463

URL: http://svn.apache.org/viewvc?rev=785463&view=rev
Log:
CHUKWA-302. Removed hard coded dependency of Hadoop jar file. (Eric Yang)

Modified:
    hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt
    hadoop/chukwa/branches/chukwa-0.2/bin/agent.sh
    hadoop/chukwa/branches/chukwa-0.2/bin/chukwa-config.sh
    hadoop/chukwa/branches/chukwa-0.2/conf/chukwa-env.sh.template
    hadoop/chukwa/trunk/CHANGES.txt
    hadoop/chukwa/trunk/bin/agent.sh
    hadoop/chukwa/trunk/bin/chukwa-config.sh
    hadoop/chukwa/trunk/conf/chukwa-env.sh.template

Modified: hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt?rev=785463&r1=785462&r2=785463&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt (original)
+++ hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt Wed Jun 17 01:04:40 2009
@@ -64,6 +64,8 @@
 
   BUG FIXES
 
+    CHUKWA-302. Removed hard coded dependency of Hadoop jar file. (Eric Yang)
+
     CHUKWA-298. Update branch 0.2 and trunk version number. (Eric Yang)
 
     CHUKWA-296. Fix jsp syntax error. (Terence Kwan via Eric Yang)

Modified: hadoop/chukwa/branches/chukwa-0.2/bin/agent.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/bin/agent.sh?rev=785463&r1=785462&r2=785463&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/bin/agent.sh (original)
+++ hadoop/chukwa/branches/chukwa-0.2/bin/agent.sh Wed Jun 17 01:04:40 2009
@@ -30,7 +30,7 @@
 }
 
 trap stop SIGHUP SIGINT SIGTERM
-echo "hadoop jar for agent is " ${HADOOP_20_JAR}
+echo "hadoop jar for agent is " ${HADOOP_JAR}
 
 if [ "X$1" = "Xstop" ]; then
    stop
@@ -41,4 +41,4 @@
   chmod 777 ${CHUKWA_LOG_DIR}/metrics
 fi
 
-exec ${JAVA_HOME}/bin/java -Xms32M -Xmx64M -DAPP=agent -Dlog4j.configuration=chukwa-log4j.properties -DCHUKWA_HOME=${CHUKWA_HOME} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR} -classpath ${CHUKWA_CONF_DIR}:${CLASSPATH}:${CHUKWA_AGENT}:${CHUKWA_CORE}:${HADOOP_20_JAR}:${COMMON} org.apache.hadoop.chukwa.datacollection.agent.ChukwaAgent $@
+exec ${JAVA_HOME}/bin/java -Xms32M -Xmx64M -DAPP=agent -Dlog4j.configuration=chukwa-log4j.properties -DCHUKWA_HOME=${CHUKWA_HOME} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR} -classpath ${CHUKWA_CONF_DIR}:${CLASSPATH}:${CHUKWA_AGENT}:${CHUKWA_CORE}:${HADOOP_JAR}:${COMMON} org.apache.hadoop.chukwa.datacollection.agent.ChukwaAgent $@

Modified: hadoop/chukwa/branches/chukwa-0.2/bin/chukwa-config.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/bin/chukwa-config.sh?rev=785463&r1=785462&r2=785463&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/bin/chukwa-config.sh (original)
+++ hadoop/chukwa/branches/chukwa-0.2/bin/chukwa-config.sh Wed Jun 17 01:04:40 2009
@@ -100,8 +100,6 @@
 export COMMON=`echo ${COMMON} | sed 'y/ /:/'`
 export CHUKWA_CORE=${CHUKWA_HOME}/chukwa-core-${CHUKWA_VERSION}.jar
 export CHUKWA_AGENT=${CHUKWA_HOME}/chukwa-agent-${CHUKWA_VERSION}.jar
-export HADOOP_20_JAR=${CHUKWA_HOME}/hadoopjars/hadoop-0.20.0-core.jar
-export HADOOP_18_JAR=${CHUKWA_HOME}/hadoopjars/hadoop-0.18.0-core.jar
 
 export CURRENT_DATE=`date +%Y%m%d%H%M`
 

Modified: hadoop/chukwa/branches/chukwa-0.2/conf/chukwa-env.sh.template
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/conf/chukwa-env.sh.template?rev=785463&r1=785462&r2=785463&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/conf/chukwa-env.sh.template (original)
+++ hadoop/chukwa/branches/chukwa-0.2/conf/chukwa-env.sh.template Wed Jun 17 01:04:40 2009
@@ -25,16 +25,15 @@
 export HADOOP_CONF_DIR="@TODO-HADOOP-CONF-DIR@"
 
 # Optional (i.e. will try sensible defaults)
-# The location of a hadoop jars. Setting this will overrided the search for 
+# The location of a hadoop jars. Setting this will override the search for 
 # hadoop jars described above (using HADOOP_HOME). If HADOOP_JAR is not set, 
 # the default is to check HADOOP_HOME/build (above) for 
 # jars or classes, if those are not found, uses hadoop jars which
 # come with chukwa in $CHUKWA_HOME/hadoopjars. YOU SHOULD ONLY NEED TO 
-# USE THIS IF YOU ARE RUNNING A COLLECTOR WITHOUT A RUNNING 
-# HDFS! (i.e. writing datasink sequence files to local disk). Be careful 
-# if you use HDFS for chukwa storage, but haven't built the 
-# hadoop classes or jar because chukwa will use the default hadoop jars 
-# that come with ckukwa, you can easily suffer
+# USE THIS IF YOU ARE RUNNING AN AGENT WITH ANOTHER HADOOP VERSION RUNNING
+# ON THE SAME MACHINE.  Be careful if you use HDFS for chukwa storage, but 
+# haven't built the hadoop classes or jar because chukwa will use the 
+# default hadoop jars that come with chukwa, you can easily suffer
 # errors due to protocol mismatch between hadoop versions.
 #export HADOOP_JAR=${HADOOP_HOME}/build/hadoop-*-core.jar
 

Modified: hadoop/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=785463&r1=785462&r2=785463&view=diff
==============================================================================
--- hadoop/chukwa/trunk/CHANGES.txt (original)
+++ hadoop/chukwa/trunk/CHANGES.txt Wed Jun 17 01:04:40 2009
@@ -64,6 +64,8 @@
 
   BUG FIXES
 
+    CHUKWA-302. Removed hard coded dependency of Hadoop jar file. (Eric Yang)
+
     CHUKWA-298. Update branch 0.2 and trunk version number. (Eric Yang)
 
     CHUKWA-296. Fix jsp syntax error. (Terence Kwan via Eric Yang)

Modified: hadoop/chukwa/trunk/bin/agent.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/agent.sh?rev=785463&r1=785462&r2=785463&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/agent.sh (original)
+++ hadoop/chukwa/trunk/bin/agent.sh Wed Jun 17 01:04:40 2009
@@ -30,7 +30,7 @@
 }
 
 trap stop SIGHUP SIGINT SIGTERM
-echo "hadoop jar for agent is " ${HADOOP_20_JAR}
+echo "hadoop jar for agent is " ${HADOOP_JAR}
 
 if [ "X$1" = "Xstop" ]; then
    stop
@@ -41,4 +41,4 @@
   chmod 777 ${CHUKWA_LOG_DIR}/metrics
 fi
 
-exec ${JAVA_HOME}/bin/java -Xms32M -Xmx64M -DAPP=agent -Dlog4j.configuration=chukwa-log4j.properties -DCHUKWA_HOME=${CHUKWA_HOME} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR} -classpath ${CHUKWA_CONF_DIR}:${CLASSPATH}:${CHUKWA_AGENT}:${CHUKWA_CORE}:${HADOOP_20_JAR}:${COMMON} org.apache.hadoop.chukwa.datacollection.agent.ChukwaAgent $@
+exec ${JAVA_HOME}/bin/java -Xms32M -Xmx64M -DAPP=agent -Dlog4j.configuration=chukwa-log4j.properties -DCHUKWA_HOME=${CHUKWA_HOME} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR} -classpath ${CHUKWA_CONF_DIR}:${CLASSPATH}:${CHUKWA_AGENT}:${CHUKWA_CORE}:${HADOOP_JAR}:${COMMON} org.apache.hadoop.chukwa.datacollection.agent.ChukwaAgent $@

Modified: hadoop/chukwa/trunk/bin/chukwa-config.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/chukwa-config.sh?rev=785463&r1=785462&r2=785463&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/chukwa-config.sh (original)
+++ hadoop/chukwa/trunk/bin/chukwa-config.sh Wed Jun 17 01:04:40 2009
@@ -100,8 +100,6 @@
 export COMMON=`echo ${COMMON} | sed 'y/ /:/'`
 export CHUKWA_CORE=${CHUKWA_HOME}/chukwa-core-${CHUKWA_VERSION}.jar
 export CHUKWA_AGENT=${CHUKWA_HOME}/chukwa-agent-${CHUKWA_VERSION}.jar
-export HADOOP_20_JAR=${CHUKWA_HOME}/hadoopjars/hadoop-0.20.0-core.jar
-export HADOOP_18_JAR=${CHUKWA_HOME}/hadoopjars/hadoop-0.18.0-core.jar
 
 export CURRENT_DATE=`date +%Y%m%d%H%M`
 

Modified: hadoop/chukwa/trunk/conf/chukwa-env.sh.template
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/conf/chukwa-env.sh.template?rev=785463&r1=785462&r2=785463&view=diff
==============================================================================
--- hadoop/chukwa/trunk/conf/chukwa-env.sh.template (original)
+++ hadoop/chukwa/trunk/conf/chukwa-env.sh.template Wed Jun 17 01:04:40 2009
@@ -25,16 +25,15 @@
 export HADOOP_CONF_DIR="@TODO-HADOOP-CONF-DIR@"
 
 # Optional (i.e. will try sensible defaults)
-# The location of a hadoop jars. Setting this will overrided the search for 
+# The location of a hadoop jars. Setting this will override the search for 
 # hadoop jars described above (using HADOOP_HOME). If HADOOP_JAR is not set, 
 # the default is to check HADOOP_HOME/build (above) for 
 # jars or classes, if those are not found, uses hadoop jars which
 # come with chukwa in $CHUKWA_HOME/hadoopjars. YOU SHOULD ONLY NEED TO 
-# USE THIS IF YOU ARE RUNNING A COLLECTOR WITHOUT A RUNNING 
-# HDFS! (i.e. writing datasink sequence files to local disk). Be careful 
-# if you use HDFS for chukwa storage, but haven't built the 
-# hadoop classes or jar because chukwa will use the default hadoop jars 
-# that come with ckukwa, you can easily suffer
+# USE THIS IF YOU ARE RUNNING AN AGENT WITH ANOTHER HADOOP VERSION RUNNING
+# ON THE SAME MACHINE.  Be careful if you use HDFS for chukwa storage, but 
+# haven't built the hadoop classes or jar because chukwa will use the 
+# default hadoop jars that come with chukwa, you can easily suffer
 # errors due to protocol mismatch between hadoop versions.
 #export HADOOP_JAR=${HADOOP_HOME}/build/hadoop-*-core.jar