chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r1204365 - in /incubator/chukwa/trunk: ./ ivy/ src/docs/src/documentation/resources/images/ src/java/ src/main/ src/main/java/ src/main/java/org/apache/hadoop/chukwa/inputtools/ src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/ src/m...
Date Mon, 21 Nov 2011 06:39:39 GMT
Author: eyang
Date: Mon Nov 21 06:39:38 2011
New Revision: 1204365

URL: http://svn.apache.org/viewvc?rev=1204365&view=rev
Log:
CHUKWA-590. Migrate from ant to maven. (Eric Yang)

Added:
    incubator/chukwa/trunk/pom.xml
    incubator/chukwa/trunk/src/main/
    incubator/chukwa/trunk/src/main/java/
      - copied from r1202951, incubator/chukwa/trunk/src/java/
    incubator/chukwa/trunk/src/main/web/
      - copied from r1202951, incubator/chukwa/trunk/src/web/
    incubator/chukwa/trunk/src/packages/
    incubator/chukwa/trunk/src/packages/tarball/
    incubator/chukwa/trunk/src/packages/tarball/all.xml
    incubator/chukwa/trunk/src/site/
    incubator/chukwa/trunk/src/site/apt/
    incubator/chukwa/trunk/src/site/resources/
    incubator/chukwa/trunk/src/site/resources/images/
      - copied from r1202951, incubator/chukwa/trunk/src/docs/src/documentation/resources/images/
    incubator/chukwa/trunk/src/test/java/
    incubator/chukwa/trunk/src/test/java/org/
      - copied from r1202951, incubator/chukwa/trunk/src/test/org/
    incubator/chukwa/trunk/src/test/resources/
    incubator/chukwa/trunk/src/test/resources/Hadoop18JobHistoryLog.txt
      - copied unchanged from r1202951, incubator/chukwa/trunk/src/test/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/Hadoop18JobHistoryLog.txt
    incubator/chukwa/trunk/src/test/resources/TestJobLog.txt
      - copied unchanged from r1202951, incubator/chukwa/trunk/src/test/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJobLog.txt
    incubator/chukwa/trunk/src/test/resources/hbase-site.xml
      - copied unchanged from r1202951, incubator/chukwa/trunk/src/test/hbase-site.xml
    incubator/chukwa/trunk/src/test/resources/late-log4j.properties
      - copied unchanged from r1202951, incubator/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/late-log4j.properties
    incubator/chukwa/trunk/src/test/resources/log4j.properties
    incubator/chukwa/trunk/src/test/resources/tasklog-log4j.properties
      - copied unchanged from r1202951, incubator/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/tasklog-log4j.properties
Removed:
    incubator/chukwa/trunk/ivy/
    incubator/chukwa/trunk/ivy.xml
    incubator/chukwa/trunk/src/docs/src/documentation/resources/images/
    incubator/chukwa/trunk/src/java/
    incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/ChukwaTTInstru.java
    incubator/chukwa/trunk/src/test/hbase-site.xml
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/database/TestDatabaseIostat.java
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/Hadoop18JobHistoryLog.txt
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJobLog.txt
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/late-log4j.properties
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/tasklog-log4j.properties
    incubator/chukwa/trunk/src/test/org/
    incubator/chukwa/trunk/src/web/
Modified:
    incubator/chukwa/trunk/CHANGES.txt
    incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TestFSMBuilder.java
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/TestOffsetStatsManager.java
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestDirTailingAdaptor.java
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJobLogEntry.java
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestChukwaDailyRollingFileAppender.java
    incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestTaskLogAppender.java

Modified: incubator/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1204365&r1=1204364&r2=1204365&view=diff
==============================================================================
--- incubator/chukwa/trunk/CHANGES.txt (original)
+++ incubator/chukwa/trunk/CHANGES.txt Mon Nov 21 06:39:38 2011
@@ -4,6 +4,8 @@ Trunk (unreleased changes)
 
   NEW FEATURES
 
+    CHUKWA-590. Migrate from ant to maven. (Eric Yang)
+
     CHUKWA-599. Added Metrics 2 support for Hadoop 0.20.203+. (Eric Yang)
 
     CHUKWA-575. Added cluster summary pig script. (Eric Yang)

Added: incubator/chukwa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/pom.xml?rev=1204365&view=auto
==============================================================================
--- incubator/chukwa/trunk/pom.xml (added)
+++ incubator/chukwa/trunk/pom.xml Mon Nov 21 06:39:38 2011
@@ -0,0 +1,573 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <properties>
+        <buildtype>test</buildtype>
+        <BUILD_NUMBER>${env.BUILD_NUMBER}</BUILD_NUMBER>
+        <VERSION>0.5.0-SNAPSHOT</VERSION>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <package.prefix>/usr</package.prefix>
+        <package.conf.dir>/etc/chukwa</package.conf.dir>
+        <package.log.dir>/var/log/chukwa</package.log.dir>
+        <package.pid.dir>/var/run/chukwa</package.pid.dir>
+        <package.release>1</package.release>
+        <package.version>0.5.0</package.version>
+        <final.name>${project.artifactId}-incubating-${package.version}</final.name>
+        <test.build.dir>${basedir}/target/test</test.build.dir>
+        <test.build.data>${test.build.dir}/data</test.build.data>
+        <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>
+    </properties>
+
+    <name>Apache Chukwa</name>
+    <description>Chukwa is an open source data collection system for monitoring large distributed systems. 
+    Chukwa is built on top of the Hadoop Distributed File System (HDFS) and Map/Reduce framework and 
+    inherits Hadoop’s scalability and robustness. Chukwa also includes a flexible and powerful toolkit 
+    for displaying, monitoring and analyzing results to make the best use of the collected data.</description>
+
+    <url>http://incubator.apache.org/chukwa</url>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.apache.incubator</groupId>
+    <version>0.5.0</version>
+    <artifactId>chukwa</artifactId>
+    <packaging>jar</packaging>
+
+    <issueManagement>
+        <system>Chukwa JIRA</system>
+        <url>http://issues.apache.org/jira/browse/CHUKWA</url>
+    </issueManagement>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/chukwa</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/chukwa</developerConnection>
+        <tag></tag>
+    </scm>
+
+    <mailingLists>
+        <mailingList>
+            <name>chukwa</name>
+            <subscribe>chukwa-dev-subscribe@incubator.apache.org</subscribe>
+            <unsubscribe>chukwa-dev-unsubscribe@incubator.apache.org</unsubscribe>
+            <post>mailto:chukwa-user@incubator.apache.org</post>
+            <archive></archive>
+        </mailingList>
+    </mailingLists>
+
+    <dependencies>
+          <dependency>
+            <groupId>com.josephoconnell.html</groupId>
+            <artifactId>html-filter</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/html-filter-1.0.jar</systemPath>
+          </dependency>
+          <dependency>
+            <groupId>edu.berkeley.confspell</groupId>
+            <artifactId>confspellcheck</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/confspellcheck.jar</systemPath>
+          </dependency>
+          <dependency>
+            <groupId>com.mdimension</groupId>
+            <artifactId>jchronic</artifactId>
+            <version>0.2.3</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/jchronic-0.2.3.jar</systemPath>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.log4j</groupId>
+            <artifactId>NagiosAppender</artifactId>
+            <version>1.5.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/NagiosAppender-1.5.0.jar</systemPath>
+          </dependency>
+          <dependency>
+            <groupId>org.hyperic</groupId>
+            <artifactId>sigar</artifactId>
+            <version>1.6.4</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/sigar.jar</systemPath>
+          </dependency>
+          <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20090211</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.5.1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.prefuse</groupId>
+            <artifactId>prefuse</artifactId>
+            <version>beta-20071021</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.7</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.2</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.4</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.4</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.1</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>1.4.1</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+            <version>1.1</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.8.0</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>jasper</artifactId>
+            <version>6.0.33</version>
+          </dependency>
+          <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.26</version>
+          </dependency>
+          <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>6.1.26</version>
+          </dependency>
+          <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+          </dependency>
+          <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <version>2.0.8</version>
+          </dependency>
+          <dependency>
+            <groupId>jdiff</groupId>
+            <artifactId>jdiff</artifactId>
+            <version>1.0.9</version>
+          </dependency>
+          <dependency>
+            <groupId>xmlenc</groupId>
+            <artifactId>xmlenc</artifactId>
+            <version>0.52</version>
+          </dependency>
+          <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.10.0</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase</artifactId>
+            <version>0.90.4</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase</artifactId>
+            <classifier>tests</classifier>
+            <version>0.90.4</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>libthrift</artifactId>
+            <version>0.5.0</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>3.3.1</version>
+          </dependency>
+          <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-bundle</artifactId>
+            <version>1.10</version>
+          </dependency>
+          <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>10.0.1</version>
+          </dependency>
+          <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-core</artifactId>
+            <version>0.20.205.0</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-test</artifactId>
+            <version>0.20.205.0</version>
+          </dependency>
+    </dependencies>
+
+    <developers>
+        <developer>
+            <id>eyang</id>
+            <name>Eric Yang</name>
+            <email>eric818@gmail.com</email>
+            <timezone>(GMT-08:00) Pacific Time(US &amp; Canada)</timezone>
+            <roles>
+                <role></role>
+            </roles>
+        </developer>
+    </developers>
+
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.4.3</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <compilerVersion>1.5</compilerVersion>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.1</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.10</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <skip>false</skip>
+                            <argLine>-Xmx1024m</argLine>
+                            <reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
+                            <forkMode>pertest</forkMode>
+                            <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                            <includes>
+                                <include>**/Test*.java</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/TestFSMBuilder.java</exclude>
+                                <exclude>**/TestDatabase*.java</exclude>
+                                <exclude>**/TestArchive.java</exclude>
+                                <exclude>**/*$*</exclude>
+                            </excludes>
+                            <systemPropertyVariables>
+                                <test.build.classes>${project.build.directory}/test/classes</test.build.classes>
+                                <CHUKWA_LOG_DIR>${project.build.directory}/logs</CHUKWA_LOG_DIR>
+                                <CHUKWA_CONF_DIR>${test.build.dir}/conf</CHUKWA_CONF_DIR>
+                                <CHUKWA_DATA_DIR>${test.build.dir}/var</CHUKWA_DATA_DIR>
+                                <CHUKWA_PID_DIR>${test.build.dir}/var/run</CHUKWA_PID_DIR>
+                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
+                                <CHUKWA_HOME>${basedir}/target</CHUKWA_HOME>
+                            </systemPropertyVariables>
+                            <environmentVariables>
+                                <CHUKWA_LOG_DIR>${project.build.directory}/logs</CHUKWA_LOG_DIR>
+                                <CHUKWA_CONF_DIR>${test.build.dir}/conf</CHUKWA_CONF_DIR>
+                                <CHUKWA_DATA_DIR>${test.build.dir}/var</CHUKWA_DATA_DIR>
+                                <CHUKWA_PID_DIR>${test.build.dir}/var/run</CHUKWA_PID_DIR>
+                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
+                                <CHUKWA_HOME>${basedir}/target</CHUKWA_HOME>
+                            </environmentVariables>
+                            <workingDirectory>${project.build.directory}/test/classes</workingDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <skip>false</skip>
+                            <argLine>-Xmx1024m</argLine>
+                            <reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
+                            <forkMode>pertest</forkMode>
+                            <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                            <includes>
+                                <include>**/TestFSMBuilder.java</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/TestDatabase*.java</exclude>
+                                <exclude>**/TestArchive.java</exclude>
+                                <exclude>**/*$*</exclude>
+                            </excludes>
+                            <systemPropertyVariables>
+                                <CHUKWA_LOG_DIR>${project.build.directory}/logs</CHUKWA_LOG_DIR>
+                                <CHUKWA_CONF_DIR>${test.build.dir}/conf</CHUKWA_CONF_DIR>
+                                <CHUKWA_DATA_DIR>${test.build.dir}/var</CHUKWA_DATA_DIR>
+                                <CHUKWA_PID_DIR>${test.build.dir}/var/run</CHUKWA_PID_DIR>
+                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
+                                <CHUKWA_HOME>${basedir}/target</CHUKWA_HOME>
+                            </systemPropertyVariables>
+                            <environmentVariables>
+                                <CHUKWA_LOG_DIR>${project.build.directory}/logs</CHUKWA_LOG_DIR>
+                                <CHUKWA_CONF_DIR>${test.build.dir}/conf</CHUKWA_CONF_DIR>
+                                <CHUKWA_DATA_DIR>${test.build.dir}/var</CHUKWA_DATA_DIR>
+                                <CHUKWA_PID_DIR>${test.build.dir}/var/run</CHUKWA_PID_DIR>
+                                <CHUKWA_HDFS>/chukwa</CHUKWA_HDFS>
+                                <CHUKWA_HOME>${basedir}/target</CHUKWA_HOME>
+                            </environmentVariables>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <finalName>${final.name}</finalName>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                    <descriptors>
+                        <descriptor>src/packages/tarball/all.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>build-tarball</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <id>setup</id>
+                        <phase>validate</phase>
+                        <configuration>
+                            <tasks name="setup">
+                                <mkdir dir="${basedir}/target"/>
+                                <echo message="0.1.0" file="${basedir}/target/VERSION"/>
+                                <mkdir dir="${basedir}/target/clover"/>
+                                <chmod dir="${basedir}/target/clover" perm="a+w" />
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test-setup</id>
+                        <phase>generate-test-resources</phase>
+                        <configuration>
+                            <tasks name="test-setup">
+                                <delete dir="/tmp/chukwa/hicc" />
+                                <mkdir dir="${test.build.dir}/var" />
+                                <mkdir dir="${test.build.dir}/var/log" />
+                                <mkdir dir="${test.build.dir}/var/run" />
+                                <copy todir="${test.build.dir}/var/log">
+                                    <fileset dir="${basedir}/test/samples/">
+                                        <include name="*.log" />
+                                    </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">
+                                    <filterchain>
+                                        <replacetokens>
+                                            <token key="CHUKWA_DIR" value="/tmp/chukwa" />
+                                        </replacetokens>
+                                    </filterchain>
+                                </copy>
+                                <copy file="${basedir}/conf/chukwa-agent-conf.xml.template" tofile="${test.build.dir}/conf/chukwa-agent-conf.xml">
+                                    <filterchain>
+                                        <replacetokens>
+                                            <token key="TODO-CLUSTER-NAME" value="${TODO-CLUSTER-NAME}" />
+                                        </replacetokens>
+                                    </filterchain>
+                                </copy>
+                                <copy file="${basedir}/conf/chukwa-demux-conf.xml.template" 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>
+
+                                    </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>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>hudson</id>
+            <activation>
+                <property>
+                    <name>!env.BUILD_NUMBER</name>
+                </property>
+            </activation>
+            <properties>
+                <BUILD_NUMBER>0</BUILD_NUMBER>
+            </properties>
+        </profile>
+    </profiles>
+
+    <repositories>
+        <repository>
+            <id>maven2-repository.dev.java.net</id>
+            <name>Java.net Repository for Maven</name>
+            <url>http://download.java.net/maven/2/</url>
+            <layout>default</layout>
+        </repository>
+        <repository>
+            <id>codehaus</id>
+            <url>http://repository.codehaus.org/</url>
+        </repository>
+        <repository>
+            <id>Sonatype-public</id>
+            <name>SnakeYAML repository</name>
+            <url>http://oss.sonatype.org/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>clojars</id>
+            <url>http://clojars.org/repo/</url>
+        </repository>
+    </repositories>
+
+    <dependencyManagement>
+        <dependencies>
+        </dependencies>
+    </dependencyManagement>
+
+</project>
+

Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java?rev=1204365&r1=1202951&r2=1204365&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java Mon Nov 21 06:39:38 2011
@@ -94,99 +94,3 @@ public class Log4jMetricsSink implements
   public void flush() {
   }
 }
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.chukwa.inputtools.log4j;
-
-import org.json.simple.JSONObject;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import org.apache.commons.configuration.SubsetConfiguration;
-import org.apache.hadoop.metrics2.Metric;
-import org.apache.hadoop.metrics2.MetricsException;
-import org.apache.hadoop.metrics2.MetricsRecord;
-import org.apache.hadoop.metrics2.MetricsSink;
-import org.apache.hadoop.metrics2.MetricsTag;
-
-public class Log4jMetricsSink implements MetricsSink {
-  /* Configuration attribute names */
-  private static final String HOST_PROPERTY = "host";
-  private static final String PORT_PROPERTY = "port";
-  private static final String TIMESTAMP = "timestamp";
-  private static String CONTEXT = "context";
-  private static final String CONTEXT_NAME = "contextName";
-  private static final String RECORD_NAME = "recordName";
-  protected String context = "HadoopMetrics";
-  protected String host = "localhost";
-  protected int port = 9095;
-  protected Logger out = null;
-
-  @Override
-  public void init(SubsetConfiguration conf) {
-    String host = conf.getString(HOST_PROPERTY);
-    if (host != null) {
-      this.host = host;
-    }
-    String port = conf.getString(PORT_PROPERTY);
-    if (port != null) {
-      this.port = Integer.parseInt(port);
-    }
-    String context = conf.getString(CONTEXT);
-    if (context != null) {
-      this.context = context;
-    }
-
-    PatternLayout layout = new PatternLayout("%d{ISO8601} %p %c: %m%n");
-
-    org.apache.log4j.net.SocketAppender appender = new org.apache.log4j.net.SocketAppender(this.host, this.port);
-
-    appender.setName("chukwa.metrics." + this.context);
-    appender.setLayout(layout);
-
-    Logger logger = Logger.getLogger("chukwa.metrics." + this.context);
-    logger.setAdditivity(false);
-    logger.addAppender(appender);
-    appender.activateOptions();
-    out = logger;
-  }
-  
-  @Override
-  @SuppressWarnings("unchecked")
-  public void putMetrics(MetricsRecord record) {
-      JSONObject json = new JSONObject();
-      json.put(TIMESTAMP, Long.valueOf(record.timestamp()));
-      json.put(CONTEXT_NAME, record.context());
-      json.put(RECORD_NAME, record.name());
-      for (MetricsTag tag : record.tags()) {
-        json.put(tag.name(), tag.value());
-      }
-      for (Metric metric : record.metrics()) {
-        json.put(metric.name(), metric.value());
-      }
-      out.info(json);
-  }
-
-  @Override
-  public void flush() {
-  }
-}

Added: incubator/chukwa/trunk/src/packages/tarball/all.xml
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/packages/tarball/all.xml?rev=1204365&view=auto
==============================================================================
--- incubator/chukwa/trunk/src/packages/tarball/all.xml (added)
+++ incubator/chukwa/trunk/src/packages/tarball/all.xml Mon Nov 21 06:39:38 2011
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <!--This 'all' id is not appended to the produced bundle because we do this:
+    http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
+  -->
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>${basedir}/*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <includes>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+    <fileSet>
+      <directory>conf</directory>
+    </fileSet>
+    <fileSet>
+      <directory>bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+          <include>${artifactId}-${project.version}.jar</include>
+          <include>${artifactId}-${project.version}-tests.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/site</directory>
+      <outputDirectory>docs</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/packages</directory>
+      <outputDirectory>sbin</outputDirectory>
+      <fileMode>755</fileMode>
+      <includes>
+          <include>update-${artifactId}-env.sh</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Modified: incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TestFSMBuilder.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TestFSMBuilder.java?rev=1204365&r1=1202951&r2=1204365&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TestFSMBuilder.java (original)
+++ incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/TestFSMBuilder.java Mon Nov 21 06:39:38 2011
@@ -236,13 +236,13 @@ public class TestFSMBuilder extends Test
           return name.endsWith(".log");
         }
       });
-
+      System.out.println(System.getenv("CHUKWA_DATA_DIR") + File.separator + "log");
       for(String fname : source) {
         if (!(fname.equals("JobHistory.log") || fname.equals("ClientTrace.log"))) {
           continue;
         }
         StringBuilder fullPath = new StringBuilder();
-        fullPath.append(System.getenv("CHUKWA_DATA_DIR"));
+        fullPath.append(System.getProperty("CHUKWA_DATA_DIR"));
         fullPath.append(File.separator);
         fullPath.append("log");
         fullPath.append(File.separator);        
@@ -309,7 +309,7 @@ public class TestFSMBuilder extends Test
       //assertEquals(ToolRunner.run(job, new Demux(), sortArgs), 0);
       JobClient.runJob(job);
     } catch (Exception e) {
-      fail(e.toString());
+      fail(ExceptionUtil.getStackTrace(e));
     }
 
     System.out.println("Done initialTasks()");

Modified: incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/TestOffsetStatsManager.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/TestOffsetStatsManager.java?rev=1204365&r1=1202951&r2=1204365&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/TestOffsetStatsManager.java (original)
+++ incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/TestOffsetStatsManager.java Mon Nov 21 06:39:38 2011
@@ -74,5 +74,5 @@ public class TestOffsetStatsManager exte
     assertEquals("Should have gotten a stale data response", -1.0, rate);
   }
 
-  private class DummyKey {}
+  private static class DummyKey {}
 }

Modified: incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestDirTailingAdaptor.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestDirTailingAdaptor.java?rev=1204365&r1=1202951&r2=1204365&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestDirTailingAdaptor.java (original)
+++ incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/TestDirTailingAdaptor.java Mon Nov 21 06:39:38 2011
@@ -84,7 +84,7 @@ public class TestDirTailingAdaptor exten
     agent.shutdown();
 
     conf.setBoolean("chukwaAgent.checkpoint.enabled", true);
-    Thread.sleep(500); //wait a little bit to make sure new file ts is > last checkpoint time.
+    Thread.sleep(1500); //wait a little bit to make sure new file ts is > last checkpoint time.
     File anOldFile = File.createTempFile("oldXYZ","file", dirWithFile);
     File aNewFile = File.createTempFile("new", "file", dirWithFile);
     anOldFile.deleteOnExit();
@@ -100,10 +100,12 @@ public class TestDirTailingAdaptor exten
       System.out.println(adaptors.getKey() +": " + adaptors.getValue());
       assertFalse(adaptors.getValue().contains("oldXYZ"));
     }
+    Thread.sleep(3 * SCAN_INTERVAL); //wait a bit for the new file to be detected.
     //should be four adaptors: the DirTailer on emptyDir, the DirTailer on the full dir,
     //and FileTailers for File inDir and file newfile and not the noread file.
     assertEquals(4, agent.adaptorCount());
     agent.shutdown();
+    Thread.sleep(1500); //wait a little bit to make sure new file ts is > last checkpoint time.
     
     nukeDirContents(checkpointDir);//nuke dir
     checkpointDir.delete();
@@ -128,8 +130,16 @@ public class TestDirTailingAdaptor exten
     conf.set("chukwaAgent.checkpoint.name", "checkpoint_");
     conf.setInt("chukwaAgent.control.port", 0);
     conf.setBoolean("chukwaAgent.checkpoint.enabled", false);
-    
-    agent = new ChukwaAgent(conf);
+   
+    boolean retry = true; 
+    while(retry) {
+      try {
+        retry = false;
+        agent = new ChukwaAgent(conf);
+      } catch(Exception e) {
+        retry = true;
+      }
+    }
     File emptyDir = new File(baseDir, "emptyDir");
     createEmptyDir(emptyDir);
     
@@ -151,7 +161,7 @@ public class TestDirTailingAdaptor exten
     agent.shutdown();
 
     conf.setBoolean("chukwaAgent.checkpoint.enabled", true);
-    Thread.sleep(500); //wait a little bit to make sure new file ts is > last checkpoint time.
+    Thread.sleep(1500); //wait a little bit to make sure new file ts is > last checkpoint time.
     File anOldFile = File.createTempFile("oldXYZ","file", dirWithFile);
     File aNewFile = File.createTempFile("new", "file", dirWithFile);
     anOldFile.deleteOnExit();
@@ -169,6 +179,7 @@ public class TestDirTailingAdaptor exten
     }
     //should be four adaptors: the DirTailer on emptyDir, the DirTailer on the full dir,
     //and FileTailers for File inDir and file newfile
+    Thread.sleep(3 * SCAN_INTERVAL); //wait a bit for the new file to be detected.
     assertEquals(4, agent.adaptorCount());
     agent.shutdown();
     

Modified: incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java?rev=1204365&r1=1202951&r2=1204365&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java (original)
+++ incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java Mon Nov 21 06:39:38 2011
@@ -31,7 +31,6 @@ import org.apache.hadoop.chukwa.extracti
 
 public class TestDemuxManager extends TestCase {
 
-  
   /**
    * Standard workflow
    */
@@ -430,7 +429,7 @@ public class TestDemuxManager extends Te
     //// HELPER CLASSES /////  \
    /////////////////////////____\
   
-  class DemuxManagerScenario6 extends DemuxManagerScenario {
+  private static class DemuxManagerScenario6 extends DemuxManagerScenario {
     int count = 0;
     public DemuxManagerScenario6(ChukwaConfiguration conf, int count) throws Exception {
       super(conf);
@@ -467,7 +466,7 @@ public class TestDemuxManager extends Te
   }
   
   
-  class DemuxManagerScenario5 extends DemuxManagerScenario {
+  private static class DemuxManagerScenario5 extends DemuxManagerScenario {
     public DemuxManagerScenario5(ChukwaConfiguration conf) throws Exception {
       super(conf);
     }
@@ -508,7 +507,7 @@ public class TestDemuxManager extends Te
     }
   }
   
-  class DemuxManagerScenario2 extends DemuxManagerScenario {
+  private static class DemuxManagerScenario2 extends DemuxManagerScenario {
     public DemuxManagerScenario2(ChukwaConfiguration conf) throws Exception {
       super(conf);
     }
@@ -542,7 +541,7 @@ public class TestDemuxManager extends Te
     }
   }
   
-  class DemuxManagerScenario1 extends DemuxManagerScenario {
+  private static class DemuxManagerScenario1 extends DemuxManagerScenario {
     int count = 0;
     public DemuxManagerScenario1(ChukwaConfiguration conf, int count) throws Exception {
       super(conf);
@@ -560,7 +559,7 @@ public class TestDemuxManager extends Te
     }
   }
   
-  class DemuxManagerScenario extends DemuxManager {
+  private static class DemuxManagerScenario extends DemuxManager {
     public List<String>actions = new ArrayList<String>();
  
     public DemuxManagerScenario(ChukwaConfiguration conf) throws Exception {

Modified: incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJobLogEntry.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJobLogEntry.java?rev=1204365&r1=1202951&r2=1204365&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJobLogEntry.java (original)
+++ incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJobLogEntry.java Mon Nov 21 06:39:38 2011
@@ -38,7 +38,7 @@ public class TestJobLogEntry extends Tes
 
 	protected void setUp() throws Exception {
 		super.setUp();
-		InputStream stream = this.getClass().getResourceAsStream("/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/TestJobLog.txt");
+		InputStream stream = this.getClass().getResourceAsStream("/TestJobLog.txt");
 		BufferedReader br = new BufferedReader(new InputStreamReader(stream));
 		while(true) {
 			String line = br.readLine();
@@ -47,7 +47,7 @@ public class TestJobLogEntry extends Tes
 			testLogList.add(line);
 		}
 		
-		stream = this.getClass().getResourceAsStream("/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/Hadoop18JobHistoryLog.txt");
+		stream = this.getClass().getResourceAsStream("/Hadoop18JobHistoryLog.txt");
 		br = new BufferedReader(new InputStreamReader(stream));
 		while(true) {
 			String line = br.readLine();

Modified: incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestChukwaDailyRollingFileAppender.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestChukwaDailyRollingFileAppender.java?rev=1204365&r1=1202951&r2=1204365&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestChukwaDailyRollingFileAppender.java (original)
+++ incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestChukwaDailyRollingFileAppender.java Mon Nov 21 06:39:38 2011
@@ -45,7 +45,7 @@ public class TestChukwaDailyRollingFileA
         LogManager.CONFIGURATOR_CLASS_KEY, null);
 
     URL url = TestChukwaDailyRollingFileAppender.class
-        .getResource("late-log4j.properties");
+        .getResource("/late-log4j.properties");
 
     System.getProperties().setProperty("CHUKWA_TEST_LOG_LATE_INIT", folder);
 

Modified: incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestTaskLogAppender.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestTaskLogAppender.java?rev=1204365&r1=1202951&r2=1204365&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestTaskLogAppender.java (original)
+++ incubator/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/inputtools/log4j/TestTaskLogAppender.java Mon Nov 21 06:39:38 2011
@@ -37,7 +37,7 @@ public class TestTaskLogAppender extends
   public void testTaskLogAppender() {
 
     String folder = System.getProperty("test.build.classes");
-    File logFile = new File(folder + "/userlogs/attempt_200905220200_13470_r_000000_0/syslog");
+    File logFile = new File(folder + "/userlogs/job_200905220200_13470/attempt_200905220200_13470_r_000000_0/syslog");
     if (logFile.exists()) {
       logFile.delete();
     }
@@ -51,7 +51,7 @@ public class TestTaskLogAppender extends
         LogManager.CONFIGURATOR_CLASS_KEY, null);
 
     URL url = TestTaskLogAppender.class
-        .getResource("tasklog-log4j.properties");
+        .getResource("/tasklog-log4j.properties");
 
     System.getProperties().setProperty("CHUKWA_LOG_DIR", folder);
 

Added: incubator/chukwa/trunk/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/resources/log4j.properties?rev=1204365&view=auto
==============================================================================
--- incubator/chukwa/trunk/src/test/resources/log4j.properties (added)
+++ incubator/chukwa/trunk/src/test/resources/log4j.properties Mon Nov 21 06:39:38 2011
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=${CHUKWA_LOG_DIR}/chukwa.log
+log4j.appender.R.MaxFileSize=10MB
+log4j.appender.R.MaxBackupIndex=10
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ISO8601} %p %t %c{1} - %m%n
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.follow=true
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p %t %c{1} - %m%n
+



Mime
View raw message