chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r1206674 - in /incubator/chukwa/trunk: ./ bin/ conf/ lib/ src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ src/main/java/org/apache/hadoop/chukwa/datacollection/collector/ src/main/web/hicc/WEB-INF/ src/packages/rpm/ src/package...
Date Sun, 27 Nov 2011 07:22:11 GMT
Author: eyang
Date: Sun Nov 27 07:22:05 2011
New Revision: 1206674

URL: http://svn.apache.org/viewvc?rev=1206674&view=rev
Log:
CHUKWA-605. Update directory structure to be aligned with Hadoop. (Eric Yang)

Added:
    incubator/chukwa/trunk/bin/start-chukwa.sh
      - copied, changed from r1204808, incubator/chukwa/trunk/bin/start-all.sh
    incubator/chukwa/trunk/bin/stop-chukwa.sh
      - copied, changed from r1204808, incubator/chukwa/trunk/bin/stop-all.sh
    incubator/chukwa/trunk/conf/agents
      - copied unchanged from r1204808, incubator/chukwa/trunk/conf/agents.template
    incubator/chukwa/trunk/conf/alert
      - copied, changed from r1204808, incubator/chukwa/trunk/conf/alert.template
    incubator/chukwa/trunk/conf/chukwa-agent-conf.xml
      - copied, changed from r1204808, incubator/chukwa/trunk/conf/chukwa-agent-conf.xml.template
    incubator/chukwa/trunk/conf/chukwa-collector-conf.xml
      - copied, changed from r1204808, incubator/chukwa/trunk/conf/chukwa-collector-conf.xml.template
    incubator/chukwa/trunk/conf/chukwa-common.xml
      - copied, changed from r1204808, incubator/chukwa/trunk/conf/chukwa-common.xml.template
    incubator/chukwa/trunk/conf/chukwa-demux-conf.xml
      - copied, changed from r1204808, incubator/chukwa/trunk/conf/chukwa-demux-conf.xml.template
    incubator/chukwa/trunk/conf/chukwa-env.sh
      - copied, changed from r1204808, incubator/chukwa/trunk/conf/chukwa-env.sh.template
    incubator/chukwa/trunk/conf/collectors
      - copied unchanged from r1204808, incubator/chukwa/trunk/conf/collectors.template
    incubator/chukwa/trunk/conf/hadoop-metrics.properties
      - copied unchanged from r1204808, incubator/chukwa/trunk/conf/hadoop-metrics.properties.template
    incubator/chukwa/trunk/conf/hadoop-metrics2.properties
      - copied unchanged from r1204808, incubator/chukwa/trunk/conf/hadoop-metrics2.properties.template
    incubator/chukwa/trunk/conf/initial_adaptors
      - copied unchanged from r1204808, incubator/chukwa/trunk/conf/initial_adaptors.template
    incubator/chukwa/trunk/conf/nagios.properties
      - copied unchanged from r1204808, incubator/chukwa/trunk/conf/nagios.properties.template
    incubator/chukwa/trunk/src/packages/rpm/
    incubator/chukwa/trunk/src/packages/rpm/specs/
      - copied from r1204758, incubator/chukwa/trunk/tools/specs/
Removed:
    incubator/chukwa/trunk/bin/start-all.sh
    incubator/chukwa/trunk/bin/stop-all.sh
    incubator/chukwa/trunk/conf/agents.template
    incubator/chukwa/trunk/conf/alert.template
    incubator/chukwa/trunk/conf/chukwa-agent-conf.xml.template
    incubator/chukwa/trunk/conf/chukwa-collector-conf.xml.template
    incubator/chukwa/trunk/conf/chukwa-common.xml.template
    incubator/chukwa/trunk/conf/chukwa-demux-conf.xml.template
    incubator/chukwa/trunk/conf/chukwa-env.sh.template
    incubator/chukwa/trunk/conf/collectors.template
    incubator/chukwa/trunk/conf/hadoop-metrics.properties.template
    incubator/chukwa/trunk/conf/hadoop-metrics2.properties.template
    incubator/chukwa/trunk/conf/initial_adaptors.template
    incubator/chukwa/trunk/conf/nagios.properties.template
    incubator/chukwa/trunk/default.properties
    incubator/chukwa/trunk/lib/asm-3.1-LICENSE.txt
    incubator/chukwa/trunk/lib/asm-3.1.jar
    incubator/chukwa/trunk/tools/specs/
Modified:
    incubator/chukwa/trunk/CHANGES.txt
    incubator/chukwa/trunk/README.txt
    incubator/chukwa/trunk/bin/chukwa
    incubator/chukwa/trunk/bin/chukwa-config.sh
    incubator/chukwa/trunk/bin/chukwa-daemon.sh
    incubator/chukwa/trunk/bin/chukwa-daemons.sh
    incubator/chukwa/trunk/bin/dailyRolling.sh
    incubator/chukwa/trunk/bin/downSampling.sh
    incubator/chukwa/trunk/bin/hourlyRolling.sh
    incubator/chukwa/trunk/bin/slaves.sh
    incubator/chukwa/trunk/bin/start-agents.sh
    incubator/chukwa/trunk/bin/start-collectors.sh
    incubator/chukwa/trunk/bin/start-data-processors.sh
    incubator/chukwa/trunk/bin/stop-agents.sh
    incubator/chukwa/trunk/bin/stop-collectors.sh
    incubator/chukwa/trunk/bin/stop-data-processors.sh
    incubator/chukwa/trunk/pom.xml
    incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java
    incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java
    incubator/chukwa/trunk/src/main/web/hicc/WEB-INF/jetty.xml
    incubator/chukwa/trunk/src/packages/tarball/all.xml
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/dataloader/TestSocketDataLoader.java

Modified: incubator/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/CHANGES.txt (original)
+++ incubator/chukwa/trunk/CHANGES.txt Sun Nov 27 07:22:05 2011
@@ -36,6 +36,8 @@ Trunk (unreleased changes)
 
   IMPROVEMENTS
 
+    CHUKWA-605. Update directory structure to be aligned with Hadoop. (Eric Yang)
+
     CHUKWA-601. Removed legacy mysql upgrade script. (Eric Yang)
 
     CHUKWA-596. Updated schema retrieve REST API to use end time for scanning columns. (Eric Yang)

Modified: incubator/chukwa/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/README.txt?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/README.txt (original)
+++ incubator/chukwa/trunk/README.txt Sun Nov 27 07:22:05 2011
@@ -1,4 +1,4 @@
-Chukwa 0.4 -- April 2010
+Chukwa 0.5 -- April 2010
 
 This is the second formal release of Chukwa, an Apache Hadoop subproject 
 dedicated to scalable log collection and processing. If you have large 
@@ -10,7 +10,8 @@ The notes for this release are in docs/r
 BUILDING CHUKWA
 
 To build chukwa from source:
-In the Chukwa root directory, say 'ant', and then 'cp build/*.jar build/*.war .'
+
+mvn clean package
 
 To check that things are ok, run 'ant test'. It should take roughly fifteen minutes.
 

Modified: incubator/chukwa/trunk/bin/chukwa
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/chukwa?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/chukwa (original)
+++ incubator/chukwa/trunk/bin/chukwa Sun Nov 27 07:22:05 2011
@@ -27,7 +27,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 # if no args specified, show usage
 if [ $# = 0 ]; then
@@ -107,7 +107,7 @@ elif [ "$COMMAND" = "demux" ]; then
   CLASS='org.apache.hadoop.chukwa.extraction.demux.DemuxManager'
   PID='DemuxManager'
 elif [ "$COMMAND" = "hicc" ]; then
-  WEB_SERVICE_COMMON=`ls ${CHUKWA_HOME}/webapps/hicc.war`
+  WEB_SERVICE_COMMON=`ls ${CHUKWA_HOME}/share/chukwa/webapps/hicc.war`
   APP='hicc'
   CLASS='org.apache.hadoop.chukwa.hicc.HiccWebServer'
   CLASSPATH=${CLASSPATH}:${WEB_SERVICE_COMMON}:${HICC_JAR}
@@ -165,9 +165,9 @@ if [ "$1" = "stop" ]; then
 else 
   # run command
   if [ "$BACKGROUND" = "false" ]; then
-    ${JAVA_HOME}/bin/java ${JAVA_OPT} -Djava.library.path=${JAVA_LIBRARY_PATH} -DCHUKWA_HOME=${CHUKWA_HOME} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR} -DCHUKWA_DATA_DIR=${CHUKWA_DATA_DIR} -DAPP=${APP} -Dlog4j.configuration=chukwa-log4j.properties -classpath ${CHUKWA_CONF_DIR}:${CLASSPATH}:${CHUKWA_CORE}:${HADOOP_JAR}:${COMMON}:${tools} ${CLASS} $OPTS $@
+    ${JAVA_HOME}/bin/java ${JAVA_OPT} -Djava.library.path=${JAVA_LIBRARY_PATH} -DCHUKWA_HOME=${CHUKWA_HOME} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR} -DCHUKWA_DATA_DIR=${CHUKWA_DATA_DIR} -DAPP=${APP} -Dlog4j.configuration=chukwa-log4j.properties -classpath ${CHUKWA_CONF_DIR}:${CLASSPATH}:${CHUKWA_CLASSPATH}:${tools} ${CLASS} $OPTS $@
   else
-    exec ${JAVA_HOME}/bin/java ${JAVA_OPT} -Djava.library.path=${JAVA_LIBRARY_PATH} -DCHUKWA_HOME=${CHUKWA_HOME} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR} -DCHUKWA_DATA_DIR=${CHUKWA_DATA_DIR} -DAPP=${APP} -Dlog4j.configuration=chukwa-log4j.properties -classpath ${CHUKWA_CONF_DIR}:${CLASSPATH}:${CHUKWA_CORE}:${HADOOP_JAR}:${COMMON}:${tools} ${CLASS} $OPTS $@ &
+    exec ${JAVA_HOME}/bin/java ${JAVA_OPT} -Djava.library.path=${JAVA_LIBRARY_PATH} -DCHUKWA_HOME=${CHUKWA_HOME} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR} -DCHUKWA_DATA_DIR=${CHUKWA_DATA_DIR} -DAPP=${APP} -Dlog4j.configuration=chukwa-log4j.properties -classpath ${CHUKWA_CONF_DIR}:${CLASSPATH}:${CHUKWA_CLASSPATH}:${tools} ${CLASS} $OPTS $@ &
   fi
 fi
 

Modified: incubator/chukwa/trunk/bin/chukwa-config.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/chukwa-config.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/chukwa-config.sh (original)
+++ incubator/chukwa/trunk/bin/chukwa-config.sh Sun Nov 27 07:22:05 2011
@@ -20,26 +20,15 @@
 
 # resolve links - $0 may be a softlink
 
-this="$0"
-while [ -h "$this" ]; do
-  ls=`ls -ld "$this"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '.*/.*' > /dev/null; then
-    this="$link"
-  else
-    this=`dirname "$this"`/"$link"
-  fi
-done
+this="${BASH_SOURCE-$0}"
 
 # convert relative path to absolute path
-bin=`dirname "$this"`
-script=`basename "$this"`
-bin=`cd "$bin"; pwd`
-this="$bin/$script"
-
+CHUKWA_LIBEXEC=$(cd -P -- "$(dirname -- "$this")" && pwd -P)
+script="$(basename -- "$this")"
+this="$CHUKWA_PREFIX/$script"
 
 # the root of the Chukwa installation
-export CHUKWA_HOME=`dirname "$this"`/..
+export CHUKWA_HOME=`pwd -P ${CHUKWA_LIBEXEC}/..`
 
 #check to see if the conf dir is given as an optional argument
 if [ $# -gt 1 ]
@@ -74,56 +63,22 @@ if [ -z ${CHUKWA_PID_DIR} ]; then
     export CHUKWA_PID_DIR="${CHUKWA_HOME}/var/run"
 fi
 
-CHUKWA_VERSION=`cat ${CHUKWA_HOME}/bin/VERSION`
+CHUKWA_VERSION=`cat ${CHUKWA_HOME}/share/chukwa/VERSION`
 
 # Allow alternate conf dir location.
 if [ -z "$CHUKWA_CONF_DIR" ]; then
-    CHUKWA_CONF_DIR="${CHUKWA_CONF_DIR:-$CHUKWA_HOME/conf}"
-    export CHUKWA_CONF_DIR=${CHUKWA_HOME}/conf
+    export CHUKWA_CONF_DIR="${CHUKWA_CONF_DIR:-$CHUKWA_HOME/etc/chukwa}"
 fi
 
 if [ -f "${CHUKWA_CONF_DIR}/chukwa-env.sh" ]; then
   . "${CHUKWA_CONF_DIR}/chukwa-env.sh"
 fi
 
-if [ -d "${CHUKWA_HOME}/build/ivy/lib/chukwa/common" ]; then
-  COMMON=`ls ${CHUKWA_HOME}/lib/*.jar ${CHUKWA_HOME}/build/ivy/lib/chukwa/common/*.jar`
-else
-  COMMON=`ls ${CHUKWA_HOME}/lib/*.jar`
-fi
-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 HICC_JAR=${CHUKWA_HOME}/hicc.war
-export CURRENT_DATE=`date +%Y%m%d%H%M`
-
-# Deprecated configuration for loading data to database.
-export DATACONFIG=${CHUKWA_CONF_DIR}/mdl.xml
+CHUKWA_CLASSPATH="${CHUKWA_HOME}/share/chukwa/*:${CHUKWA_HOME}/share/chukwa/lib/*"
 
-if [ -z ${HADOOP_JAR} ]; then
-  if [ -z ${HADOOP_HOME} ]; then
-    if [ -d ${CHUKWA_HOME}/hadoopjars ]; then
-      echo "WARNING: neither HADOOP_HOME nor HADOOP_JAR is set we we are reverting to defaults in $CHUKWA_HOME/hadoopjars dir"
-      export HADOOP_JAR=`ls ${CHUKWA_HOME}/hadoopjars/hadoop-*-core.jar`
-    else
-      echo "Please make sure hadoop-*-core.jar exists in ${CHUKWA_HOME}/hadoopjars"
-      exit -1
-    fi
-  else
-    if [ -d ${HADOOP_HOME} ]; then
-      export HADOOP_JAR=`ls ${HADOOP_HOME}/hadoop-*-core.jar`
-      if [ -z ${HADOOP_JAR} ]; then
-        echo "Please make sure hadoop-*-core.jar exists in ${HADOOP_HOME}"
-        exit -1
-      fi
-    fi
-  fi    #end if no HADOOP_HOME 
-fi    
+export CURRENT_DATE=`date +%Y%m%d%H%M`
 
 if [ -z "$JAVA_HOME" ] ; then
-  echo ERROR! You forgot to set JAVA_HOME in conf/chukwa-env.sh   
+  echo ERROR! You forgot to set JAVA_HOME in CHUKWA_CONF_DIR/chukwa-env.sh   
 fi
 
-export JPS="ps ax"
-

Modified: incubator/chukwa/trunk/bin/chukwa-daemon.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/chukwa-daemon.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/chukwa-daemon.sh (original)
+++ incubator/chukwa/trunk/bin/chukwa-daemon.sh Sun Nov 27 07:22:05 2011
@@ -39,7 +39,7 @@ fi
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 # get arguments
 startStop=$1

Modified: incubator/chukwa/trunk/bin/chukwa-daemons.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/chukwa-daemons.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/chukwa-daemons.sh (original)
+++ incubator/chukwa/trunk/bin/chukwa-daemons.sh Sun Nov 27 07:22:05 2011
@@ -29,6 +29,6 @@ fi
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. $bin/chukwa-config.sh
+. $bin/../libexec/chukwa-config.sh
 
 exec "$bin/slaves.sh" --config $CHUKWA_CONF_DIR cd "$CHUKWA_HOME" \; "$bin/chukwa-daemon.sh" --config $CHUKWA_CONF_DIR "$@"

Modified: incubator/chukwa/trunk/bin/dailyRolling.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/dailyRolling.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/dailyRolling.sh (original)
+++ incubator/chukwa/trunk/bin/dailyRolling.sh Sun Nov 27 07:22:05 2011
@@ -18,7 +18,7 @@ pid=$$
 
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 
 pidFile=${CHUKWA_PID_DIR}/DailyChukwaRecordRolling.pid

Modified: incubator/chukwa/trunk/bin/downSampling.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/downSampling.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/downSampling.sh (original)
+++ incubator/chukwa/trunk/bin/downSampling.sh Sun Nov 27 07:22:05 2011
@@ -38,7 +38,7 @@ pid=$$
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 while getopts ":c:d:m:n:t:" OPTION
 do

Modified: incubator/chukwa/trunk/bin/hourlyRolling.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/hourlyRolling.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/hourlyRolling.sh (original)
+++ incubator/chukwa/trunk/bin/hourlyRolling.sh Sun Nov 27 07:22:05 2011
@@ -18,7 +18,7 @@ pid=$$
 
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 pidFile=${CHUKWA_PID_DIR}/HourlyChukwaRecordRolling.pid
 if [ -f $pidFile ]; then

Modified: incubator/chukwa/trunk/bin/slaves.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/slaves.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/slaves.sh (original)
+++ incubator/chukwa/trunk/bin/slaves.sh Sun Nov 27 07:22:05 2011
@@ -38,7 +38,7 @@ fi
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 # If the slaves file is specified in the command line,
 # then it takes precedence over the definition in 

Modified: incubator/chukwa/trunk/bin/start-agents.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/start-agents.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/start-agents.sh (original)
+++ incubator/chukwa/trunk/bin/start-agents.sh Sun Nov 27 07:22:05 2011
@@ -25,7 +25,7 @@ usage="Usage: start-agent.sh"
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 # start chukwa agents
 "$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts agents start agent

Copied: incubator/chukwa/trunk/bin/start-chukwa.sh (from r1204808, incubator/chukwa/trunk/bin/start-all.sh)
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/start-chukwa.sh?p2=incubator/chukwa/trunk/bin/start-chukwa.sh&p1=incubator/chukwa/trunk/bin/start-all.sh&r1=1204808&r2=1206674&rev=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/start-all.sh (original)
+++ incubator/chukwa/trunk/bin/start-chukwa.sh Sun Nov 27 07:22:05 2011
@@ -21,7 +21,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 # start collectors
 "$bin"/start-collectors.sh --config $CHUKWA_CONF_DIR

Modified: incubator/chukwa/trunk/bin/start-collectors.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/start-collectors.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/start-collectors.sh (original)
+++ incubator/chukwa/trunk/bin/start-collectors.sh Sun Nov 27 07:22:05 2011
@@ -25,7 +25,7 @@ usage="Usage: start-collectors.sh"
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 # start jetty collectors
 "$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts collectors start collector

Modified: incubator/chukwa/trunk/bin/start-data-processors.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/start-data-processors.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/start-data-processors.sh (original)
+++ incubator/chukwa/trunk/bin/start-data-processors.sh Sun Nov 27 07:22:05 2011
@@ -19,7 +19,7 @@ bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 java=$JAVA_HOME/bin/java
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 # start data processors
 "$bin"/chukwa-daemon.sh --config $CHUKWA_CONF_DIR start archive

Modified: incubator/chukwa/trunk/bin/stop-agents.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/stop-agents.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/stop-agents.sh (original)
+++ incubator/chukwa/trunk/bin/stop-agents.sh Sun Nov 27 07:22:05 2011
@@ -21,6 +21,6 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 "$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts agents stop agent

Copied: incubator/chukwa/trunk/bin/stop-chukwa.sh (from r1204808, incubator/chukwa/trunk/bin/stop-all.sh)
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/stop-chukwa.sh?p2=incubator/chukwa/trunk/bin/stop-chukwa.sh&p1=incubator/chukwa/trunk/bin/stop-all.sh&r1=1204808&r2=1206674&rev=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/stop-all.sh (original)
+++ incubator/chukwa/trunk/bin/stop-chukwa.sh Sun Nov 27 07:22:05 2011
@@ -21,7 +21,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 "$bin"/stop-data-processors.sh --config $CHUKWA_CONF_DIR
 "$bin"/stop-agents.sh --config $CHUKWA_CONF_DIR

Modified: incubator/chukwa/trunk/bin/stop-collectors.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/stop-collectors.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/stop-collectors.sh (original)
+++ incubator/chukwa/trunk/bin/stop-collectors.sh Sun Nov 27 07:22:05 2011
@@ -21,6 +21,6 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 "$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts collectors stop collector

Modified: incubator/chukwa/trunk/bin/stop-data-processors.sh
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/stop-data-processors.sh?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/bin/stop-data-processors.sh (original)
+++ incubator/chukwa/trunk/bin/stop-data-processors.sh Sun Nov 27 07:22:05 2011
@@ -19,7 +19,7 @@ bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 java=$JAVA_HOME/bin/java
 
-. "$bin"/chukwa-config.sh
+. "$bin"/../libexec/chukwa-config.sh
 
 # stop demux
 pidFile=$CHUKWA_PID_DIR/DemuxManager.pid

Copied: incubator/chukwa/trunk/conf/alert (from r1204808, incubator/chukwa/trunk/conf/alert.template)
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/conf/alert?p2=incubator/chukwa/trunk/conf/alert&p1=incubator/chukwa/trunk/conf/alert.template&r1=1204808&r2=1206674&rev=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/conf/alert.template (original)
+++ incubator/chukwa/trunk/conf/alert Sun Nov 27 07:22:05 2011
@@ -1 +1 @@
-@TODO-ALERT-EMAIL@
+${TODO_ALERT_EMAIL}

Copied: incubator/chukwa/trunk/conf/chukwa-agent-conf.xml (from r1204808, incubator/chukwa/trunk/conf/chukwa-agent-conf.xml.template)
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/conf/chukwa-agent-conf.xml?p2=incubator/chukwa/trunk/conf/chukwa-agent-conf.xml&p1=incubator/chukwa/trunk/conf/chukwa-agent-conf.xml.template&r1=1204808&r2=1206674&rev=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/conf/chukwa-agent-conf.xml.template (original)
+++ incubator/chukwa/trunk/conf/chukwa-agent-conf.xml Sun Nov 27 07:22:05 2011
@@ -24,7 +24,7 @@
   
   <property>
     <name>chukwaAgent.tags</name>
-    <value>cluster="@TODO-CLUSTER-NAME@"</value>
+    <value>cluster="${TODO_CLUSTER_NAME}"</value>
     <description>The cluster's name for this agent</description>
   </property>
   

Copied: incubator/chukwa/trunk/conf/chukwa-collector-conf.xml (from r1204808, incubator/chukwa/trunk/conf/chukwa-collector-conf.xml.template)
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/conf/chukwa-collector-conf.xml?p2=incubator/chukwa/trunk/conf/chukwa-collector-conf.xml&p1=incubator/chukwa/trunk/conf/chukwa-collector-conf.xml.template&r1=1204808&r2=1206674&rev=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/conf/chukwa-collector-conf.xml.template (original)
+++ incubator/chukwa/trunk/conf/chukwa-collector-conf.xml Sun Nov 27 07:22:05 2011
@@ -34,7 +34,7 @@
 <!-- LocalWriter parameters
   <property>
     <name>chukwaCollector.localOutputDir</name>
-    <value>@TODO-COLLECTORS-LOCAL-OUTPUT-DIR@</value>
+    <value>${TODO_COLLECTORS_LOCAL_OUTPUT_DIR}</value>
     <description>Chukwa local data sink directory, see LocalWriter.java</description>
   </property>
 
@@ -80,7 +80,7 @@ your hbase.zookeeper.quorum setting to t
 
   <property>
     <name>writer.hdfs.filesystem</name>
-    <value>@TODO-COLLECTORS-NAMENODE@</value>
+    <value>${TODO_COLLECTORS_NAMENODE}</value>
     <description>HDFS to dump to</description>
   </property>
   
@@ -92,13 +92,13 @@ your hbase.zookeeper.quorum setting to t
 
   <property>
     <name>chukwaCollector.rotateInterval</name>
-    <value>@TODO-COLLECTORS-ROTATEINTERVAL@</value>
+    <value>${TODO_COLLECTORS_ROTATEINTERVAL}</value>
     <description>Chukwa rotate interval (ms)</description>
   </property>
 
   <property>
     <name>chukwaCollector.isFixedTimeRotatorScheme</name>
-    <value>@TODO-COLLECTORS-ISFIXEDTIMEROTATORSCHEME</value>
+    <value>${TODO_COLLECTORS_ISFIXEDTIMEROTATORSCHEME}</value>
     <description>A flag to indicate that the collector should close at a fixed
     offset after every rotateInterval. The default value is false which uses
     the default scheme where collectors close after regular rotateIntervals.
@@ -113,13 +113,13 @@ your hbase.zookeeper.quorum setting to t
 
   <property>
     <name>chukwaCollector.fixedTimeIntervalOffset</name>
-    <value>@TODO-COLLECTORS-FIXEDTIMEINTERVALOFFSET@</value>
+    <value>${TODO_COLLECTORS_FIXEDTIMEINTERVALOFFSET}</value>
     <description>Chukwa fixed time interval offset value (ms)</description>
   </property>
 
   <property>
     <name>chukwaCollector.http.port</name>
-    <value>@TODO-COLLECTORS-PORT@</value>
+    <value>${TODO_COLLECTORS_PORT}</value>
     <description>The HTTP port number the collector will listen on</description>
   </property>
 

Copied: incubator/chukwa/trunk/conf/chukwa-common.xml (from r1204808, incubator/chukwa/trunk/conf/chukwa-common.xml.template)
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/conf/chukwa-common.xml?p2=incubator/chukwa/trunk/conf/chukwa-common.xml&p1=incubator/chukwa/trunk/conf/chukwa-common.xml.template&r1=1204808&r2=1206674&rev=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/conf/chukwa-common.xml.template (original)
+++ incubator/chukwa/trunk/conf/chukwa-common.xml Sun Nov 27 07:22:05 2011
@@ -23,13 +23,13 @@
 
   <property>
     <name>chukwa.data.dir</name>
-    <value>@CHUKWA_DIR@</value>
+    <value>${CHUKWA_DIR}</value>
     <description>Location of Chukwa data on HDFS</description>
   </property>
   
   <property>
     <name>chukwa.tmp.data.dir</name>
-    <value>@CHUKWA_DIR@/temp</value>
+    <value>${CHUKWA_DIR}/temp</value>
     <description>Location of Chukwa data on HDFS</description>
   </property>
 

Copied: incubator/chukwa/trunk/conf/chukwa-demux-conf.xml (from r1204808, incubator/chukwa/trunk/conf/chukwa-demux-conf.xml.template)
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/conf/chukwa-demux-conf.xml?p2=incubator/chukwa/trunk/conf/chukwa-demux-conf.xml&p1=incubator/chukwa/trunk/conf/chukwa-demux-conf.xml.template&r1=1204808&r2=1206674&rev=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/conf/chukwa-demux-conf.xml.template (original)
+++ incubator/chukwa/trunk/conf/chukwa-demux-conf.xml Sun Nov 27 07:22:05 2011
@@ -24,7 +24,7 @@
 <!-- Chukwa Job parameters -->
 	<property>
 	  <name>io.sort.mb</name>
-	  <value>@TODO-DEMUX-IO-SORT-MB@</value>
+	  <value>${TODO_DEMUX_IO_SORT_MB}</value>
 	  <description>The total amount of buffer memory to use while sorting
 	  files, in megabytes.  By default, gives each merge stream 1MB, which
 	  should minimize seeks.</description>
@@ -32,13 +32,13 @@
 
 	<property>
 	  <name>fs.inmemory.size.mb</name>
-	  <value>@TODO-DEMUX-FS-INMEMORY-SIZE_MB@</value>
+	  <value>${TODO_DEMUX_FS_INMEMORY_SIZE_MB}</value>
 	  <description>The size of the in-memory filsystem instance in MB</description>
 	</property>
 
 	<property>
 	  <name>io.sort.factor</name>
-	  <value>@TODO-DEMUX-IO-SORT-FACTOR@</value>
+	  <value>${TODO_DEMUX_IO_SORT_FACTOR}</value>
 	  <description>The number of streams to merge at once while sorting
 	  files.  This determines the number of open file handles.</description>
 	</property>

Copied: incubator/chukwa/trunk/conf/chukwa-env.sh (from r1204808, incubator/chukwa/trunk/conf/chukwa-env.sh.template)
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/conf/chukwa-env.sh?p2=incubator/chukwa/trunk/conf/chukwa-env.sh&p1=incubator/chukwa/trunk/conf/chukwa-env.sh.template&r1=1204808&r2=1206674&rev=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/conf/chukwa-env.sh.template (original)
+++ incubator/chukwa/trunk/conf/chukwa-env.sh Sun Nov 27 07:22:05 2011
@@ -22,83 +22,38 @@
 # remote nodes.
 
 # The java implementation to use.  Required.
-export JAVA_HOME=@TODO-JAVA-HOME@
-
-# Optional (.ie. will try sensible defaults)
-# The location of the Hadoop the collector should use. Chukwa uses this to 
-# find the hadoop classes or jars as well as the hadoop executables
-# for running the mapreduce demux job. Chukwa will look first in
-# HADOOP_HOME/build for a hadoop-*-core.jar file, 
-# then in HADOOP_HOME/build/classes for hadoop classes.
-# If you want to use a hadoop jar straight up, without
-# a HADOOP_HOME/bin directory, you should set HADOOP_JAR (below), but
-# then chukwa mapreduce jobs wont work. If HADOOP_HOME is not set, default
-# assumes that this chukwa is living in hadoop's src/contrib directory, but
-# if jars or classes can not be found using that default assumption, 
-# Chukwa will default to the hadoop jars that come with it
-# in the hadoopjars directory. 
-export HADOOP_HOME="@TODO-HADOOP-HOME@"
-export HADOOP_CONF_DIR="@TODO-HADOOP-CONF-DIR@"
-
-# Optional (i.e. will try sensible defaults)
-# 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 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
-
-# Optional (i.e. will try sensible defaults)
-# The location of HBase jars.  For writing data to HBase, you need to set
-# environment variable HBASE_HOME to HBase home directory.
-#export HBASE_HOME="@TODO-HBASE-HOME@"
-#export HBASE_JAR="${HBASE_HOME}/hbase-0.20.6.jar"
-#export ZOO_KEEPER_JAR="${HBASE_HOME}/lib/zookeeper-3.2.2.jar"
+export JAVA_HOME=${JAVA_HOME}
 
 # Optional
 # The location of HBase Configuration directory.  For writing data to
 # HBase, you need to set environment variable HBASE_CONF to HBase conf
 # directory.
-export HBASE_CONF_DIR="@TODO-HBASE-CONF-DIR@"
+export HBASE_CONF_DIR="${TODO_HBASE_CONF_DIR}"
 
 # The location of chukwa data repository (in either HDFS or your local
 # file system, whichever you are using)
 export chukwaRecordsRepository="/chukwa/repos/"
 
 # The directory where pid files are stored. CHUKWA_HOME/var/run by default.
-export CHUKWA_PID_DIR=@TODO-CHUKWA_PID_DIR@
+export CHUKWA_PID_DIR=${TODO_CHUKWA_PID_DIR}
 
 # The location of chukwa logs, defaults to CHUKWA_HOME/logs
-export CHUKWA_LOG_DIR=@TODO-CHUKWA_LOG_DIR@
+export CHUKWA_LOG_DIR=${TODO_CHUKWA_LOG_DIR}
 
 # The location to store chukwa data, defaults to CHUKWA_HOME/data
 #export CHUKWA_DATA_DIR="${CHUKWA_HOME}/data"
 
-# The location of torque pbsnodes command
-#export nodeActivityCmde="
-
-# The server which contain pbsnodes, qstat and tracejob.
-#export TORQUE_SERVER=localhost
-
-# The location contain torque binaries.
-#export TORQUE_HOME=/usr/local/torque
-
 # Instance name for chukwa deployment
-export CHUKWA_IDENT_STRING=@TODO-AGENTS-INSTANCE-NAME@
+export CHUKWA_IDENT_STRING=$USER
 
 export JAVA_PLATFORM=Linux-i386-32
 export JAVA_LIBRARY_PATH=${HADOOP_HOME}/lib/native/${JAVA_PLATFORM}
 
 # Datatbase driver name for storing Chukwa Data.
-export JDBC_DRIVER=@TODO_CHUKWA_JDBC_DRIVER@
+export JDBC_DRIVER=${TODO_CHUKWA_JDBC_DRIVER}
 
 # Database URL prefix for Database Loader.
-export JDBC_URL_PREFIX=@TODO_CHUKWA_JDBC_URL_PREFIX@
+export JDBC_URL_PREFIX=${TODO_CHUKWA_JDBC_URL_PREFIX}
 
 # HICC Jetty Server heap memory settings 
 # Specify min and max size of heap to JVM, e.g. 300M
@@ -108,4 +63,4 @@ export CHUKWA_HICC_MAX_MEM=
 # HICC Jetty Server port, defaults to 4080
 #export CHUKWA_HICC_PORT=
 
-#export CLASSPATH=${CLASSPATH}:${HBASE_JAR}:${HBASE_CONF_DIR}:${ZOO_KEEPER_JAR}
+export CLASSPATH=${CLASSPATH}:${HBASE_CONF_DIR}

Modified: incubator/chukwa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/pom.xml?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/pom.xml (original)
+++ incubator/chukwa/trunk/pom.xml Sun Nov 27 07:22:05 2011
@@ -36,6 +36,23 @@
         <test.cache.data>${test.build.dir}/cache</test.cache.data>
         <test.debug.data>${test.build.dir}/debug</test.debug.data>
         <test.log.dir>${test.build.dir}/logs</test.log.dir>
+        <TODO_ALERT_EMAIL>user@example.com</TODO_ALERT_EMAIL>
+        <TODO_CLUSTER_NAME>chukwa</TODO_CLUSTER_NAME>
+        <TODO_COLLECTORS_LOCAL_OUTPUT_DIR>/tmp/chukwa/dataSink/</TODO_COLLECTORS_LOCAL_OUTPUT_DIR>
+        <TODO_COLLECTORS_NAMENODE>hdfs://localhost:9000</TODO_COLLECTORS_NAMENODE>
+        <TODO_COLLECTORS_ROTATEINTERVAL>300000</TODO_COLLECTORS_ROTATEINTERVAL>
+        <TODO_COLLECTORS_PORT>8080</TODO_COLLECTORS_PORT>
+        <TODO_COLLECTORS_ISFIXEDTIMEROTATORSCHEME>false</TODO_COLLECTORS_ISFIXEDTIMEROTATORSCHEME>
+        <TODO_COLLECTORS_FIXEDTIMEINTERVALOFFSET>30000</TODO_COLLECTORS_FIXEDTIMEINTERVALOFFSET>
+        <TODO_CHUKWA_PID_DIR>/tmp/chukwa/pidDir</TODO_CHUKWA_PID_DIR>
+        <TODO_CHUKWA_LOG_DIR>/tmp/chukwa/log</TODO_CHUKWA_LOG_DIR>
+        <TODO_AGENTS_INSTANCE_NAME>chukwa</TODO_AGENTS_INSTANCE_NAME>
+        <TODO_NAGIOS_SERVER>localhost</TODO_NAGIOS_SERVER>
+        <TODO_DEMUX_IO_SORT_MB>64</TODO_DEMUX_IO_SORT_MB>
+        <TODO_DEMUX_FS_INMEMORY_SIZE_MB>64</TODO_DEMUX_FS_INMEMORY_SIZE_MB>
+        <TODO_DEMUX_IO_SORT_FACTOR>10</TODO_DEMUX_IO_SORT_FACTOR>
+        <CHUKWA_DIR>/tmp/chukwa</CHUKWA_DIR>
+        <JAVA_HOME>${java.home}</JAVA_HOME>
     </properties>
 
     <name>Apache Chukwa</name>
@@ -179,11 +196,11 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.8.0</version>
           </dependency>
-          <dependency>
+<!--          <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>jasper</artifactId>
             <version>6.0.33</version>
-          </dependency>
+          </dependency> -->
           <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
@@ -241,16 +258,31 @@
             <version>0.5.0</version>
           </dependency>
           <dependency>
-            <groupId>org.apache.hadoop</groupId>
+            <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
-            <version>3.3.1</version>
+            <version>3.3.2</version>
           </dependency>
           <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-bundle</artifactId>
-            <version>1.10</version>
+            <version>1.1.0-ea</version>
+          </dependency>
+<!--          <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-server</artifactId>
+            <version>1.1</version>
           </dependency>
           <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-json</artifactId>
+            <version>1.1</version>
+          </dependency>
+          <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>1.1</version>
+          </dependency> -->
+          <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>10.0.1</version>
@@ -276,8 +308,35 @@
         <developer>
             <id>eyang</id>
             <name>Eric Yang</name>
-            <email>eric818@gmail.com</email>
-            <timezone>(GMT-08:00) Pacific Time(US &amp; Canada)</timezone>
+            <email>eyang@apache.org</email>
+            <timezone>(GMT-08:00)</timezone>
+            <roles>
+                <role></role>
+            </roles>
+        </developer>
+        <developer>
+            <id>asrabkin</id>
+            <name>Ariel Rabkin</name>
+            <email>asrabkin@apache.org</email>
+            <timezone>(GMT-05:00)</timezone>
+            <roles>
+                <role></role>
+            </roles>
+        </developer>
+        <developer>
+            <id>billgraham</id>
+            <name>Bill Graham</name>
+            <email>billgraham@apache.org</email>
+            <timezone>(GMT-08:00)</timezone>
+            <roles>
+                <role></role>
+            </roles>
+        </developer>
+        <developer>
+            <id>jboulon</id>
+            <name>Jerome Boulon</name>
+            <email>jboulon@apache.org</email>
+            <timezone>(GMT-08:00)</timezone>
             <roles>
                 <role></role>
             </roles>
@@ -304,6 +363,24 @@
                 <configuration>
                     <encoding>UTF-8</encoding>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>copy-configuration</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/conf</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>conf</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -311,10 +388,26 @@
                 <version>2.3.1</version>
                 <executions>
                     <execution>
+                        <id>test</id>
                         <goals>
                             <goal>test-jar</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>client</id>
+                        <configuration>
+                            <classifier>client</classifier>
+                            <includes>
+                                <include>**/inputtools/log4j/**/*</include>
+                                <include>**/datacollection/client/**/*</include>
+                                <include>**/chukwa/util/**/*</include>
+                                <include>**/chukwa/datacollection/controller/**/*</include>
+                            </includes>
+                        </configuration>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -430,6 +523,25 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.1.1</version>
+                <configuration>
+                    <phase>package</phase>
+                    <warName>hicc</warName>
+                    <warSourceDirectory>src/main/web/hicc</warSourceDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>build-hicc</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>war</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
                     <finalName>${final.name}</finalName>
@@ -459,7 +571,7 @@
                         <configuration>
                             <tasks name="setup">
                                 <mkdir dir="${basedir}/target"/>
-                                <echo message="0.1.0" file="${basedir}/target/VERSION"/>
+                                <echo message="${VERSION}" file="${basedir}/target/VERSION"/>
                                 <mkdir dir="${basedir}/target/clover"/>
                                 <chmod dir="${basedir}/target/clover" perm="a+w" />
                             </tasks>
@@ -483,40 +595,27 @@
                                     </fileset>
                                 </copy>
                                 <echo message="localhost" file="${test.build.dir}/conf/collectors"/>
-                                <copy file="${basedir}/conf/chukwa-common.xml.template" tofile="${test.build.dir}/conf/chukwa-common.xml">
+                                <copy file="${basedir}/conf/chukwa-common.xml" tofile="${test.build.dir}/conf/chukwa-common.xml">
                                     <filterchain>
-                                        <replacetokens>
+                                        <expandproperties/>
+<!--                                        <replacetokens>
                                             <token key="CHUKWA_DIR" value="/tmp/chukwa" />
-                                        </replacetokens>
+                                        </replacetokens> -->
                                     </filterchain>
                                 </copy>
-                                <copy file="${basedir}/conf/chukwa-agent-conf.xml.template" tofile="${test.build.dir}/conf/chukwa-agent-conf.xml">
+                                <copy file="${basedir}/conf/chukwa-agent-conf.xml" tofile="${test.build.dir}/conf/chukwa-agent-conf.xml">
                                     <filterchain>
-                                        <replacetokens>
-                                            <token key="TODO-CLUSTER-NAME" value="${TODO-CLUSTER-NAME}" />
-                                        </replacetokens>
+                                        <expandproperties/>
                                     </filterchain>
                                 </copy>
-                                <copy file="${basedir}/conf/chukwa-demux-conf.xml.template" tofile="${test.build.dir}/conf/chukwa-demux-conf.xml">
+                                <copy file="${basedir}/conf/chukwa-demux-conf.xml" tofile="${test.build.dir}/conf/chukwa-demux-conf.xml">
                                     <filterchain>
-
-                                        <replacetokens>
-                                            <token key="TODO-DEMUX-IO-SORT-MB" value="${TODO-DEMUX-IO-SORT-MB}" />
-                                        </replacetokens>
-                                        <replacetokens>
-                                            <token key="TODO-DEMUX-FS-INMEMORY-SIZE_MB" value="${TODO-DEMUX-FS-INMEMORY-SIZE_MB}" />
-                                        </replacetokens>
-                                        <replacetokens>
-                                            <token key="TODO-DEMUX-IO-SORT-FACTOR" value="${TODO-DEMUX-IO-SORT-FACTOR}" />
-                                        </replacetokens>
-
+                                        <expandproperties/>
                                     </filterchain>
                                 </copy>
                                 <copy file="${basedir}/src/test/resources/hbase-site.xml" tofile="${test.build.dir}/classes/hbase-site.xml"></copy>
                                 <copy file="${basedir}/conf/log4j.properties" tofile="${test.build.dir}/conf/log4j.properties"></copy>
                                 <copy file="${basedir}/conf/auth.conf" tofile="${test.build.dir}/conf/auth.conf"></copy>
-                                <copy file="${basedir}/conf/jdbc.conf.template" tofile="${test.build.dir}/conf/jdbc.conf"></copy>
-                                <copy file="${basedir}/conf/database_create_tables.sql" tofile="${test.build.dir}/conf/database_create_tables.sql"></copy>
                             </tasks>
                         </configuration>
                         <goals>

Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java Sun Nov 27 07:22:05 2011
@@ -749,7 +749,7 @@ public class ChukwaAgent implements Adap
     try { 
       Configuration chukwaAgentConf = new Configuration(false);
       chukwaAgentConf.addResource(new Path(agentConf.getAbsolutePath()));
-      Checker.checkConf(new OptDictionary(new File(new File(chukwaHome, "lib"), "agent.dict")),
+      Checker.checkConf(new OptDictionary(new File(new File(chukwaHome, "share/chukwa/lib"), "agent.dict")),
           HSlurper.fromHConf(chukwaAgentConf));
     } catch(Exception e) {e.printStackTrace();}
     

Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java Sun Nov 27 07:22:05 2011
@@ -60,7 +60,7 @@ public class CollectorStub {
         Configuration collectorConf = new Configuration(false);
         collectorConf.addResource(new Path(conf.getChukwaConf() + "/chukwa-common.xml"));
         collectorConf.addResource(new Path(conf.getChukwaConf() + "/chukwa-collector-conf.xml"));
-        Checker.checkConf(new OptDictionary(new File(new File(conf.getChukwaHome(), "lib"), "collector.dict")),
+        Checker.checkConf(new OptDictionary(new File(new File(conf.getChukwaHome(), "share/chukwa/lib"), "collector.dict")),
             HSlurper.fromHConf(collectorConf));
       } catch(Exception e) {e.printStackTrace();}
       

Modified: incubator/chukwa/trunk/src/main/web/hicc/WEB-INF/jetty.xml
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/web/hicc/WEB-INF/jetty.xml?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/web/hicc/WEB-INF/jetty.xml (original)
+++ incubator/chukwa/trunk/src/main/web/hicc/WEB-INF/jetty.xml Sun Nov 27 07:22:05 2011
@@ -128,7 +128,7 @@
       <Arg>
         <New class="org.mortbay.jetty.deployer.ContextDeployer">
           <Set name="contexts"><Ref id="Contexts"/></Set>
-          <Set name="configurationDir"><SystemProperty name="CHUKWA_HOME" default="."/>/webapps/sandbox</Set>
+          <Set name="configurationDir"><SystemProperty name="CHUKWA_HOME" default="."/>/share/chukwa/webapps/sandbox</Set>
           <Set name="scanInterval">1</Set>
         </New>
       </Arg>
@@ -151,7 +151,7 @@
       <Arg>
         <New class="org.mortbay.jetty.deployer.WebAppDeployer">
           <Set name="contexts"><Ref id="Contexts"/></Set>
-          <Set name="webAppDir"><SystemProperty name="CHUKWA_HOME" default="."/>/webapps</Set>
+          <Set name="webAppDir"><SystemProperty name="CHUKWA_HOME" default="."/>/share/chukwa/webapps</Set>
 	  <Set name="parentLoaderPriority">false</Set>
 	  <Set name="extract">false</Set>
 	  <Set name="allowDuplicates">false</Set>

Modified: incubator/chukwa/trunk/src/packages/tarball/all.xml
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/packages/tarball/all.xml?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/packages/tarball/all.xml (original)
+++ incubator/chukwa/trunk/src/packages/tarball/all.xml Sun Nov 27 07:22:05 2011
@@ -13,36 +13,77 @@
       <includes>
         <include>${basedir}/*.txt</include>
       </includes>
+      <outputDirectory>share/doc/${artifactId}</outputDirectory>
     </fileSet>
     <fileSet>
-      <includes>
-        <include>pom.xml</include>
-      </includes>
+      <directory>target/conf</directory>
+      <outputDirectory>etc/chukwa</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>src</directory>
+      <directory>bin</directory>
+      <includes>
+        <include>chukwa</include>
+        <include>dailyRolling.sh</include>
+        <include>hourlyRolling.sh</include>
+      </includes>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>755</fileMode>
     </fileSet>
     <fileSet>
-      <directory>conf</directory>
+      <directory>bin</directory>
+      <includes>
+        <include>chukwa-config.sh</include>
+      </includes>
+      <outputDirectory>libexec</outputDirectory>
+      <fileMode>755</fileMode>
     </fileSet>
     <fileSet>
       <directory>bin</directory>
-      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>chukwa-daemon.sh</include>
+        <include>chukwa-daemons.sh</include>
+        <include>slaves.sh</include>
+        <include>start-*.sh</include>
+        <include>stop-*.sh</include>
+      </includes>
+      <outputDirectory>sbin</outputDirectory>
       <fileMode>755</fileMode>
     </fileSet>
     <fileSet>
+      <directory>lib</directory>
+      <outputDirectory>share/${artifactId}/lib</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <includes>
+          <include>VERSION</include>
+      </includes>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>share/${artifactId}</outputDirectory>
+    </fileSet>
+    <fileSet>
       <directory>target</directory>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory>share/chukwa</outputDirectory>
       <includes>
           <include>${artifactId}-${project.version}.jar</include>
           <include>${artifactId}-${project.version}-tests.jar</include>
       </includes>
     </fileSet>
     <fileSet>
+      <directory>target</directory>
+      <outputDirectory>share/chukwa/webapps</outputDirectory>
+      <includes>
+          <include>hicc.war</include>
+      </includes>
+    </fileSet>
+    <fileSet>
       <directory>target/site</directory>
       <outputDirectory>docs</outputDirectory>
     </fileSet>
     <fileSet>
+      <directory>script</directory>
+      <outputDirectory>share/${artifactId}/script</outputDirectory>
+    </fileSet>
+    <fileSet>
       <directory>src/packages</directory>
       <outputDirectory>sbin</outputDirectory>
       <fileMode>755</fileMode>
@@ -54,7 +95,7 @@
   <dependencySets>
     <dependencySet>
       <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>/lib</outputDirectory>
+      <outputDirectory>share/${artifactId}/lib</outputDirectory>
       <unpack>false</unpack>
       <scope>runtime</scope>
     </dependencySet>

Modified: incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/dataloader/TestSocketDataLoader.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/dataloader/TestSocketDataLoader.java?rev=1206674&r1=1206673&r2=1206674&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/dataloader/TestSocketDataLoader.java (original)
+++ incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/dataloader/TestSocketDataLoader.java Sun Nov 27 07:22:05 2011
@@ -60,7 +60,7 @@ public class TestSocketDataLoader  exten
       Collection<Chunk> clist = sdl.read();
       for(Chunk c : clist) {
         if(c!=null && c.getData()!=null) {
-          assertEquals("a",c.getData().toString());
+          assertTrue("a".equals(c.getData().toString()));
         }
       }
     } catch(NoSuchElementException e) {



Mime
View raw message