chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r785440 - in /hadoop/chukwa: branches/chukwa-0.2/CHANGES.txt branches/chukwa-0.2/build.xml trunk/CHANGES.txt trunk/build.xml
Date Tue, 16 Jun 2009 22:41:09 GMT
Author: eyang
Date: Tue Jun 16 22:41:09 2009
New Revision: 785440

URL: http://svn.apache.org/viewvc?rev=785440&view=rev
Log:
CHUKWA-298. Update branch 0.2 and trunk version number. (Eric Yang)

Modified:
    hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt
    hadoop/chukwa/branches/chukwa-0.2/build.xml
    hadoop/chukwa/trunk/CHANGES.txt
    hadoop/chukwa/trunk/build.xml

Modified: hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt?rev=785440&r1=785439&r2=785440&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt (original)
+++ hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt Tue Jun 16 22:41:09 2009
@@ -64,6 +64,8 @@
 
   BUG FIXES
 
+    CHUKWA-298. Update branch 0.2 and trunk version number. (Eric Yang)
+
     CHUKWA-296. Fix jsp syntax error. (Terence Kwan via Eric Yang)
 
     CHUKWA-294. Added post process data loader configuration.  (Eric Yang)

Modified: hadoop/chukwa/branches/chukwa-0.2/build.xml
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/build.xml?rev=785440&r1=785439&r2=785440&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/build.xml (original)
+++ hadoop/chukwa/branches/chukwa-0.2/build.xml Tue Jun 16 22:41:09 2009
@@ -20,8 +20,8 @@
 <project name="chukwa" default="main" xmlns:ivy="antlib:org.apache.ivy.ant">
 
 	<property name="name" value="chukwa" />
-	<property name="chukwaVersion" value="0.1.2" />
-	<property name="chukwaRelease" value="alpha" />
+	<property name="chukwaVersion" value="0.2.0" />
+	<property name="chukwaRelease" value="dev" />
 	<property name="final.name" value="${name}-${chukwaVersion}" />
 	<property name="contrib.dir" value="${basedir}/contrib"/>
 	

Modified: hadoop/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=785440&r1=785439&r2=785440&view=diff
==============================================================================
--- hadoop/chukwa/trunk/CHANGES.txt (original)
+++ hadoop/chukwa/trunk/CHANGES.txt Tue Jun 16 22:41:09 2009
@@ -62,6 +62,8 @@
 
   BUG FIXES
 
+    CHUKWA-298. Update branch 0.2 and trunk version number. (Eric Yang)
+
     CHUKWA-296. Fix jsp syntax error. (Terence Kwan via Eric Yang)
 
     CHUKWA-294. Added post process data loader configuration.  (Eric Yang)

Modified: hadoop/chukwa/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/build.xml?rev=785440&r1=785439&r2=785440&view=diff
==============================================================================
--- hadoop/chukwa/trunk/build.xml (original)
+++ hadoop/chukwa/trunk/build.xml Tue Jun 16 22:41:09 2009
@@ -20,8 +20,8 @@
 <project name="chukwa" default="main" xmlns:ivy="antlib:org.apache.ivy.ant">
 
 	<property name="name" value="chukwa" />
-	<property name="chukwaVersion" value="0.1.2" />
-	<property name="chukwaRelease" value="alpha" />
+	<property name="chukwaVersion" value="0.3.0" />
+	<property name="chukwaRelease" value="dev" />
 	<property name="final.name" value="${name}-${chukwaVersion}" />
 	<property name="contrib.dir" value="${basedir}/contrib"/>
 	
@@ -92,6 +92,7 @@
 		<path id="testClasspath">
 			<pathelement location="${build.classes}" />
 			<pathelement location="${test.build.classes}" />
+			<pathelement location="${test.build.dir}/conf" />
 			<fileset dir="${lib.dir}">
 				<include name="**/*.jar" />
 				<exclude name="**/excluded/" />
@@ -476,13 +477,16 @@
                         </fileset>
                 </copy>
                 <copy file="${basedir}/conf/chukwa-demux-conf.xml.template" tofile="${test.build.dir}/conf/chukwa-demux-conf.xml"></copy>
+                <copy file="${basedir}/conf/log4j.properties" tofile="${test.build.dir}/conf/log4j.properties"></copy>
 		<junit showoutput="${test.output}" fork="yes" printsummary="withOutAndErr" forkmode="${test.junit.fork.mode}"
maxmemory="${test.junit.maxmemory}" dir="${test.build.dir}/classes/" timeout="${test.timeout}"
errorProperty="tests.failed" failureProperty="tests.failed">
 			<classpath refid="testClasspath" />
 			<env key="CHUKWA_CONF_DIR" value="${test.build.dir}/conf" />
 			<env key="CHUKWA_DATA_DIR" value="${test.build.dir}/var" />
+			<env key="CHUKWA_LOG_DIR" value="${test.build.dir}/var/log" />
 			<env key="CHUKWA_HOME" value="${test.build.dir}" />
 			<sysproperty key="test.src.dir" value="${test.src.dir}" />
 			<sysproperty key="test.build.classes" value="${test.build.classes}" />
+			<sysproperty key="log4j.configuration" value="log4j.properties" />
 			<formatter type="${test.junit.output.format}" />
 			<batchtest todir="${test.build.dir}" unless="testcase">
 				<fileset dir="${test.src.dir}">



Mime
View raw message