Menu
▾
▴
cdchamber-cvscommit — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(111) |
Jul
(258) |
Aug
(21) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sim...@us...> - 2002-06-26 10:15:01
|
Update of /cvsroot/cdchamber/CDChamber In directory usw-pr-cvs1:/tmp/cvs-serv6293 Removed Files: contiousIntegrate.sh cruisecontrol.properties Log Message: The cruisecontrol script is useless now. remove them. --- contiousIntegrate.sh DELETED --- --- cruisecontrol.properties DELETED --- |
|
From: <sim...@us...> - 2002-06-26 10:05:38
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv4140/test/src/org/cdchamber/elements
Modified Files:
DirectoryTypeTest.java
Log Message:
Add test null directory testcase.
Index: DirectoryTypeTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements/DirectoryTypeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DirectoryTypeTest.java 25 Jun 2002 10:00:33 -0000 1.2
--- DirectoryTypeTest.java 26 Jun 2002 10:05:35 -0000 1.3
***************
*** 9,12 ****
--- 9,13 ----
import junit.framework.TestCase;
import org.cdchamber.parser.FileParseException;
+ import org.cdchamber.util.DirPath;
public class DirectoryTypeTest extends TestCase {
***************
*** 32,34 ****
--- 33,44 ----
fail( "Should throw an Exception when the dir is not exist");
}
+
+ public void testNullDir() throws Exception {
+ DirectoryType dirType = new DirectoryType( );
+ dirType.parse( DirPath.TestCaseDir + DirPath.SEP + "nulldir");
+ assertEquals( "Name should be nulldir", dirType.getName(), "nulldir");
+ assertEquals( 0, dirType.getSize()); // file size should be 0
+ // how to test date?
+ }
+
}
|
|
From: <sim...@us...> - 2002-06-26 10:05:38
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv4140/aspect/src/org/cdchamber/elements
Modified Files:
DirectoryTypeWrapper.java FileTypeWrapper.java
Log Message:
Add test null directory testcase.
Index: DirectoryTypeWrapper.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements/DirectoryTypeWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DirectoryTypeWrapper.java 25 Jun 2002 10:00:33 -0000 1.2
--- DirectoryTypeWrapper.java 26 Jun 2002 10:05:35 -0000 1.3
***************
*** 13,17 ****
public void DirectoryType.parse( String dirName) throws FileParseException {
super.parse( dirName);
- throw new FileParseException( "No such directory");
}
}
--- 13,16 ----
Index: FileTypeWrapper.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements/FileTypeWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileTypeWrapper.java 25 Jun 2002 10:00:33 -0000 1.2
--- FileTypeWrapper.java 26 Jun 2002 10:05:35 -0000 1.3
***************
*** 9,13 ****
public void FileType.parse( String fileName) throws FileParseException {
File file = new File( fileName);
! if ( !file.exists()) throw new FileParseException( "File not exist");
setName( file.getName());
setSize( file.length());
--- 9,13 ----
public void FileType.parse( String fileName) throws FileParseException {
File file = new File( fileName);
! if ( !file.exists()) throw new FileParseException( "File not exist"+fileName);
setName( file.getName());
setSize( file.length());
|
|
From: <sim...@us...> - 2002-06-26 09:39:03
|
Update of /cvsroot/cdchamber/CDChamber/test/testcase/nulldir In directory usw-pr-cvs1:/tmp/cvs-serv29024/nulldir Log Message: Directory /cvsroot/cdchamber/CDChamber/test/testcase/nulldir added to the repository |
|
From: <cry...@us...> - 2002-06-26 06:16:50
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util
In directory usw-pr-cvs1:/tmp/cvs-serv5649
Modified Files:
DirPath.java
Log Message:
remove unnecessary import
Index: DirPath.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util/DirPath.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DirPath.java 26 Jun 2002 02:32:54 -0000 1.1
--- DirPath.java 26 Jun 2002 06:16:46 -0000 1.2
***************
*** 7,15 ****
package org.cdchamber.util;
- import java.io.FileInputStream;
- import java.io.FileNotFoundException;
- import java.io.IOException;
- import java.util.Properties;
-
public class DirPath {
public static final String BaseDir = System.getProperty("user.dir");
--- 7,10 ----
|
|
From: <sim...@us...> - 2002-06-26 06:00:39
|
Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv2380/script
Modified Files:
continuousbuild continuousbuild.xml
Log Message:
fix the minor bug:Increase build number even without build.
Index: continuousbuild
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousbuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** continuousbuild 26 Jun 2002 05:48:12 -0000 1.4
--- continuousbuild 26 Jun 2002 06:00:37 -0000 1.5
***************
*** 32,38 ****
export CLASS_PATH=$PROJECT_LIB_DIR:$CLASS_PATH:$JAVA_HOME/lib/tools.jar
! #while true
! #do
! # $JAVA_HOME/bin/java -cp $CLASS_PATH org.apache.tools.ant.Main -quiet -buildfile continuousbuild.xml $@
! $JAVA_HOME/bin/java -cp $CLASS_PATH org.apache.tools.ant.Main -v -buildfile continuousbuild.xml $@
! #done
--- 32,38 ----
export CLASS_PATH=$PROJECT_LIB_DIR:$CLASS_PATH:$JAVA_HOME/lib/tools.jar
! while true
! do
! $JAVA_HOME/bin/java -cp $CLASS_PATH org.apache.tools.ant.Main -quiet -buildfile continuousbuild.xml $@
! # $JAVA_HOME/bin/java -cp $CLASS_PATH org.apache.tools.ant.Main -v -buildfile continuousbuild.xml $@
! done
Index: continuousbuild.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousbuild.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** continuousbuild.xml 26 Jun 2002 05:48:12 -0000 1.4
--- continuousbuild.xml 26 Jun 2002 06:00:37 -0000 1.5
***************
*** 94,100 ****
</and>
</condition>
</target>
! <target name="inc.build.number" depends="buildstatus" unless="build.fail">
<echo message="Increase build number"/>
<buildnumber file="${build.number.file}"/>
--- 94,103 ----
</and>
</condition>
+ <condition property="build.success">
+ <not> <isfalse value="${build.fail}"/></not>
+ </condition>
</target>
! <target name="inc.build.number" depends="buildstatus" if="build.success">
<echo message="Increase build number"/>
<buildnumber file="${build.number.file}"/>
|
|
From: <sim...@us...> - 2002-06-26 05:48:15
|
Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv423/script
Modified Files:
continuousbuild continuousbuild.xml
Log Message:
fix the continuous build.
The sender should be full mail address.
Index: continuousbuild
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousbuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** continuousbuild 26 Jun 2002 02:57:45 -0000 1.3
--- continuousbuild 26 Jun 2002 05:48:12 -0000 1.4
***************
*** 16,20 ****
JAVA_HOME=/usr/java/j2sdk1.4.0_01/
# Set the classpath of ant.
! ANT_DIR=ant
ANT_LIB_DIR=$ANT_DIR/lib
--- 16,20 ----
JAVA_HOME=/usr/java/j2sdk1.4.0_01/
# Set the classpath of ant.
! ANT_DIR=../ant
ANT_LIB_DIR=$ANT_DIR/lib
***************
*** 23,27 ****
# Set other lib dir
! OTHER_LIB_DIR=lib
for c in $ANT_LIB_DIR/*.jar $OTHER_LIB_DIR/*.jar
--- 23,27 ----
# Set other lib dir
! OTHER_LIB_DIR=../lib
for c in $ANT_LIB_DIR/*.jar $OTHER_LIB_DIR/*.jar
Index: continuousbuild.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousbuild.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** continuousbuild.xml 26 Jun 2002 02:57:45 -0000 1.3
--- continuousbuild.xml 26 Jun 2002 05:48:12 -0000 1.4
***************
*** 14,18 ****
<property name="build.number.file" value="${build.tmpdir}/build.number"/>
! <property name="mail.from" value="simon_lei"/>
<property name="mail.tolist" value="cdc...@li..."/>
<property name="mail.messagefile" value="${build.logfile}"/>
--- 14,18 ----
<property name="build.number.file" value="${build.tmpdir}/build.number"/>
! <property name="mail.from" value="sim...@us..."/>
<property name="mail.tolist" value="cdc...@li..."/>
<property name="mail.messagefile" value="${build.logfile}"/>
|
|
From: <cry...@us...> - 2002-06-26 03:00:54
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util In directory usw-pr-cvs1:/tmp/cvs-serv1650 Removed Files: Utility.java Log Message: remove Utility.java --- Utility.java DELETED --- |
|
From: <sim...@us...> - 2002-06-26 02:57:49
|
Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv920/script
Modified Files:
continuousbuild continuousbuild.xml
Log Message:
The java&ant continuous build doesn't work on
jdk1.4, need fix.
Index: continuousbuild
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousbuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** continuousbuild 26 Jun 2002 01:23:55 -0000 1.2
--- continuousbuild 26 Jun 2002 02:57:45 -0000 1.3
***************
*** 25,37 ****
OTHER_LIB_DIR=lib
! for c in $ANT_LIB_DIR/*.jar $PROJECT_LIB_DIR/*.jar $OTHER_LIB_DIR/*.jar
do
CLASS_PATH=$CLASS_PATH:$c
done
! export CLASS_PATH=$CLASS_PATH:$JAVA_HOME/lib/tools.jar
! while true
! do
! $JAVA_HOME/bin/java -cp $CLASS_PATH org.apache.tools.ant.Main -quiet -buildfile continuousbuild.xml $@
! done
--- 25,38 ----
OTHER_LIB_DIR=lib
! for c in $ANT_LIB_DIR/*.jar $OTHER_LIB_DIR/*.jar
do
CLASS_PATH=$CLASS_PATH:$c
done
! export CLASS_PATH=$PROJECT_LIB_DIR:$CLASS_PATH:$JAVA_HOME/lib/tools.jar
! #while true
! #do
! # $JAVA_HOME/bin/java -cp $CLASS_PATH org.apache.tools.ant.Main -quiet -buildfile continuousbuild.xml $@
! $JAVA_HOME/bin/java -cp $CLASS_PATH org.apache.tools.ant.Main -v -buildfile continuousbuild.xml $@
! #done
Index: continuousbuild.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousbuild.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** continuousbuild.xml 26 Jun 2002 01:23:55 -0000 1.2
--- continuousbuild.xml 26 Jun 2002 02:57:45 -0000 1.3
***************
*** 14,18 ****
<property name="build.number.file" value="${build.tmpdir}/build.number"/>
! <property name="mail.from" value="simon"/>
<property name="mail.tolist" value="cdc...@li..."/>
<property name="mail.messagefile" value="${build.logfile}"/>
--- 14,18 ----
<property name="build.number.file" value="${build.tmpdir}/build.number"/>
! <property name="mail.from" value="simon_lei"/>
<property name="mail.tolist" value="cdc...@li..."/>
<property name="mail.messagefile" value="${build.logfile}"/>
***************
*** 34,38 ****
<cvs output="${build.tmpdir}/patch">
<commandline>
! <argument line="-Q diff -u -N"/>
</commandline>
</cvs>
--- 34,38 ----
<cvs output="${build.tmpdir}/patch">
<commandline>
! <argument line="-q diff -u -N"/>
</commandline>
</cvs>
***************
*** 55,60 ****
<echo message="project building..."/>
<!-- Build clean first -->
! <ant dir="${project.basedir}" target="${build.cleantarget}"/>
! <java classname="org.apache.tools.ant.Main" fork="true" dir="${basedir}">
<arg line="-quiet -logfile ${build.logfile} -buildfile ${project.buildfile} ${build.defaulttarget}"/>
<classpath>
--- 55,60 ----
<echo message="project building..."/>
<!-- Build clean first -->
! <ant dir="${project.basedir}" antfile="${project.buildfile}" target="${build.cleantarget}"/>
! <java jvm="/usr/bin/java" classname="org.apache.tools.ant.Main" fork="true" dir="${basedir}">
<arg line="-quiet -logfile ${build.logfile} -buildfile ${project.buildfile} ${build.defaulttarget}"/>
<classpath>
***************
*** 64,68 ****
</target>
! <target name="buildstatus" depends="buildproject" description="Set the build status to the variable">
<!-- the previous build fail? -->
<loadfile property="prebuildresult" srcFile="${build.logfile}.old" failonerror="false"/>
--- 64,68 ----
</target>
! <target name="buildstatus" depends="buildproject" description="Set the build status to the variable" unless="cvs.uptodate">
<!-- the previous build fail? -->
<loadfile property="prebuildresult" srcFile="${build.logfile}.old" failonerror="false"/>
***************
*** 72,76 ****
<!-- current build fail? -->
! <loadfile property="buildresult" srcFile="${build.logfile}"/>
<condition property="build.fail">
<contains string="${buildresult}" substring="BUILD FAILED"/>
--- 72,76 ----
<!-- current build fail? -->
! <loadfile property="buildresult" srcFile="${build.logfile}" failonerror="false"/>
<condition property="build.fail">
<contains string="${buildresult}" substring="BUILD FAILED"/>
|
|
From: <cry...@us...> - 2002-06-26 02:32:56
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util
In directory usw-pr-cvs1:/tmp/cvs-serv28997
Added Files:
DirPath.java
Log Message:
rename Utility.java to DirPath.java
--- NEW FILE: DirPath.java ---
/*
* User: Simon
* Date: 2002-6-25
* Time: 16:51:37
* $Id: DirPath.java,v 1.1 2002/06/26 02:32:54 crystal_y Exp $
*/
package org.cdchamber.util;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Properties;
public class DirPath {
public static final String BaseDir = System.getProperty("user.dir");
public static final String SEP = System.getProperty("file.separator");
public static final String TestCaseDir = BaseDir + SEP + "test" + SEP + "testcase";
}
|
|
From: <cry...@us...> - 2002-06-26 02:32:12
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/util In directory usw-pr-cvs1:/tmp/cvs-serv28805/test/src/org/cdchamber/util Removed Files: UtilityTest.java Log Message: rename Utility.java to DirPath.java --- UtilityTest.java DELETED --- |
|
From: <cry...@us...> - 2002-06-26 02:32:12
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv28805/test/src/org/cdchamber/elements
Modified Files:
FileTypeTest.java
Log Message:
rename Utility.java to DirPath.java
Index: FileTypeTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements/FileTypeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileTypeTest.java 25 Jun 2002 10:00:34 -0000 1.2
--- FileTypeTest.java 26 Jun 2002 02:32:09 -0000 1.3
***************
*** 4,8 ****
import junit.framework.*;
import org.cdchamber.parser.FileParseException;
! import org.cdchamber.util.Utility;
public class FileTypeTest extends TestCase {
--- 4,8 ----
import junit.framework.*;
import org.cdchamber.parser.FileParseException;
! import org.cdchamber.util.DirPath;
public class FileTypeTest extends TestCase {
***************
*** 27,36 ****
return;
}
! fail( "Should throw an Exception when the file is not exist");
}
public void testNullFile( ) throws Exception{
FileType fileType = new FileType();
! fileType.parse( Utility.getProperty("TestCaseDir") + Utility.SEP + "nullFile");
assertEquals( "nullFile name should equals", "nullFile", fileType.getName() );
assertEquals( 0, fileType.getSize()); // File size should equals 0
--- 27,36 ----
return;
}
! fail( "Should throw an Exception when the file does not exist");
}
public void testNullFile( ) throws Exception{
FileType fileType = new FileType();
! fileType.parse( DirPath.TestCaseDir + DirPath.SEP + "nullFile");
assertEquals( "nullFile name should equals", "nullFile", fileType.getName() );
assertEquals( 0, fileType.getSize()); // File size should equals 0
|
|
From: <cry...@us...> - 2002-06-26 02:31:51
|
Update of /cvsroot/cdchamber/CDChamber In directory usw-pr-cvs1:/tmp/cvs-serv28697 Removed Files: cdchamber.conf Log Message: remove config file until later needed --- cdchamber.conf DELETED --- |
|
From: <sim...@us...> - 2002-06-26 01:23:58
|
Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv13678/script
Modified Files:
continuousbuild continuousbuild.xml
Log Message:
Config the continuous build to work on our own project.
Index: continuousbuild
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousbuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** continuousbuild 26 Jun 2002 00:57:28 -0000 1.1
--- continuousbuild 26 Jun 2002 01:23:55 -0000 1.2
***************
*** 5,21 ****
# shell script, need nothing else except Jakarta-ant
# 1.5Beta3 or higher.
# Simon, Jun.26,2002
! JAVA_HOME=/usr/local/j2sdk1.3.0/
! CCDIR=../cc/datamerge
! LIBDIR=$CCDIR/lib
! for c in $LIBDIR/*.zip $LIBDIR/*.jar
do
! export CRUISE_PATH=$c:$CRUISE_PATH
done
! export CRUISE_PATH=$CRUISE_PATH:.:../cruisecontrol.jar:$JAVA_HOME/lib/tools.jar
while true
do
! $JAVA_HOME/bin/java -cp $CRUISE_PATH org.apache.tools.ant.Main -quiet -buildfile continuousbuild.xml $@
done
--- 5,37 ----
# shell script, need nothing else except Jakarta-ant
# 1.5Beta3 or higher.
+ # Do not forget to config this file and the continuousbuild.xml.
# Simon, Jun.26,2002
+ # Usage: Checkout your project from cvs first, then copy these two
+ # fils at the parent directory of your project. Config the path and
+ # classpath information in this file, and config project information
+ # in continuousbuild.xml. Then run this file at background. My common
+ # usage is:
+ # ./continuousbuild > std.out 2> err.out &
! JAVA_HOME=/usr/java/j2sdk1.4.0_01/
! # Set the classpath of ant.
! ANT_DIR=ant
! ANT_LIB_DIR=$ANT_DIR/lib
!
! # Set the project lib dir
! PROJECT_LIB_DIR=CDChamber/lib
!
! # Set other lib dir
! OTHER_LIB_DIR=lib
!
! for c in $ANT_LIB_DIR/*.jar $PROJECT_LIB_DIR/*.jar $OTHER_LIB_DIR/*.jar
do
! CLASS_PATH=$CLASS_PATH:$c
done
!
! export CLASS_PATH=$CLASS_PATH:$JAVA_HOME/lib/tools.jar
while true
do
! $JAVA_HOME/bin/java -cp $CLASS_PATH org.apache.tools.ant.Main -quiet -buildfile continuousbuild.xml $@
done
Index: continuousbuild.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousbuild.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** continuousbuild.xml 26 Jun 2002 00:57:28 -0000 1.1
--- continuousbuild.xml 26 Jun 2002 01:23:55 -0000 1.2
***************
*** 3,7 ****
<project name="ContinuousIntegrate" basedir="." default="all">
! <property name="project.name" value="datamerge"/>
<property name="project.basedir" value="${basedir}/${project.name}"/>
<property name="project.buildfile" value="${project.basedir}/build.xml"/>
--- 3,7 ----
<project name="ContinuousIntegrate" basedir="." default="all">
! <property name="project.name" value="CDChamber"/>
<property name="project.basedir" value="${basedir}/${project.name}"/>
<property name="project.buildfile" value="${project.basedir}/build.xml"/>
***************
*** 15,19 ****
<property name="mail.from" value="simon"/>
! <property name="mail.tolist" value="simon"/>
<property name="mail.messagefile" value="${build.logfile}"/>
--- 15,19 ----
<property name="mail.from" value="simon"/>
! <property name="mail.tolist" value="cdc...@li..."/>
<property name="mail.messagefile" value="${build.logfile}"/>
|
|
From: <sim...@us...> - 2002-06-26 00:57:32
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv6590
Modified Files:
build.xml
Log Message:
Continuous integrate tools totally written by ant.
It's much simple and stable than cruisecontrol.
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** build.xml 25 Jun 2002 07:54:27 -0000 1.11
--- build.xml 26 Jun 2002 00:57:27 -0000 1.12
***************
*** 60,70 ****
</target>
! <target name="compilewithoutajc" depends="src_gen" description="Compile application without aspectj">
! <javac srcdir="${src.dir}" destdir="${build.dest}" classpathref="classpath"
! includes="**/*.java" debug="true" deprecation="true" />
! </target>
!
! <target name="compile" depends="compilewithoutajc">
! <ajc srcdir="${aspect.src}" destdir="${aspect.classes}" argfiles="${aspect.dir}/file.lst">
<classpath>
<path refid="classpath" />
--- 60,69 ----
</target>
! <target name="compilewithajc" depends="src_gen">
! <ajc destdir="${aspect.classes}" argfiles="${aspect.dir}/file.lst">
! <src>
! <pathelement path="${aspect.src}"/>
! <pathelement path="${src.dir}"/>
! </src>
<classpath>
<path refid="classpath" />
***************
*** 75,78 ****
--- 74,83 ----
</target>
+ <target name="compile" depends="compilewithajc" description="Compile application without aspectj">
+ <javac srcdir="${src.dir}" destdir="${build.dest}" classpathref="classpath"
+ includes="**/*.java" debug="true" deprecation="true" />
+ </target>
+
+
<target name="test.compile" depends="compile">
<javac srcdir="${test.src}" destdir="${test.classes}">
***************
*** 110,114 ****
</target>
! <target name="all" depends="clean,init,compilewithoutajc,compile,test.compile,test.run,jar" description="Build application">
<echo message="Application built!"/>
</target>
--- 115,119 ----
</target>
! <target name="all" depends="clean,init,compilewithajc,compile,test.compile,test.run,jar" description="Build application">
<echo message="Application built!"/>
</target>
|
|
From: <sim...@us...> - 2002-06-26 00:57:32
|
Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv6590/script
Added Files:
continuousbuild continuousbuild.xml
Log Message:
Continuous integrate tools totally written by ant.
It's much simple and stable than cruisecontrol.
--- NEW FILE: continuousbuild ---
#!/bin/bash
# $Id: continuousbuild,v 1.1 2002/06/26 00:57:28 simon_lei Exp $
# This script and the continuousbuild.xml is for
# continuous integrate. It all writed by ant and
# shell script, need nothing else except Jakarta-ant
# 1.5Beta3 or higher.
# Simon, Jun.26,2002
JAVA_HOME=/usr/local/j2sdk1.3.0/
CCDIR=../cc/datamerge
LIBDIR=$CCDIR/lib
for c in $LIBDIR/*.zip $LIBDIR/*.jar
do
export CRUISE_PATH=$c:$CRUISE_PATH
done
export CRUISE_PATH=$CRUISE_PATH:.:../cruisecontrol.jar:$JAVA_HOME/lib/tools.jar
while true
do
$JAVA_HOME/bin/java -cp $CRUISE_PATH org.apache.tools.ant.Main -quiet -buildfile continuousbuild.xml $@
done
--- NEW FILE: continuousbuild.xml ---
<?xml version="1.0"?>
<!-- $Id: continuousbuild.xml,v 1.1 2002/06/26 00:57:28 simon_lei Exp $ -->
<project name="ContinuousIntegrate" basedir="." default="all">
<property name="project.name" value="datamerge"/>
<property name="project.basedir" value="${basedir}/${project.name}"/>
<property name="project.buildfile" value="${project.basedir}/build.xml"/>
<property name="build.defaulttarget" value="test.run"/>
<property name="build.cleantarget" value="clean"/>
<property name="build.interval" value="30"/>
<property name="build.tmpdir" value="${basedir}/build.tmpdir"/>
<property name="build.logfile" value="${build.tmpdir}/buildlog.txt"/>
<property name="build.number.file" value="${build.tmpdir}/build.number"/>
<property name="mail.from" value="simon"/>
<property name="mail.tolist" value="simon"/>
<property name="mail.messagefile" value="${build.logfile}"/>
<!-- property name="mail.subject.success" value="Build Success!"/-->
<property name="mail.subject.fail" value="Build Fail!"/>
<property name="mail.subject.fix" value="Build Fixed!"/>
<!-- Not implemented yet. Should provide three types build result:
xml, html and txt.
<property name="mail.format" value="xml"/-->
<target name="init" description="Initial the continuous build">
<mkdir dir="${build.tmpdir}"/>
</target>
<target name="cvscheck" depends="init" description="Check whether the cvs changed.">
<echo message="cvs check begin"/>
<cvs output="${build.tmpdir}/patch">
<commandline>
<argument line="-Q diff -u -N"/>
</commandline>
</cvs>
<condition property="cvs.uptodate">
<filesmatch file1="${build.tmpdir}/patch" file2="${build.tmpdir}/patch.old"/>
</condition>
<copy file="${build.tmpdir}/patch" tofile="${build.tmpdir}/patch.old"/>
</target>
<target name="cvsupdate" depends="cvscheck" description="Update the files from cvs" unless="cvs.uptodate">
<echo message="cvs update begin"/>
<cvs>
<commandline>
<argument line="-Q update -d -P"/>
</commandline>
</cvs>
</target>
<target name="buildproject" depends="cvsupdate" description="Build the project" unless="cvs.uptodate">
<echo message="project building..."/>
<!-- Build clean first -->
<ant dir="${project.basedir}" target="${build.cleantarget}"/>
<java classname="org.apache.tools.ant.Main" fork="true" dir="${basedir}">
<arg line="-quiet -logfile ${build.logfile} -buildfile ${project.buildfile} ${build.defaulttarget}"/>
<classpath>
<pathelement path="${java.class.path}"/>
</classpath>
</java>
</target>
<target name="buildstatus" depends="buildproject" description="Set the build status to the variable">
<!-- the previous build fail? -->
<loadfile property="prebuildresult" srcFile="${build.logfile}.old" failonerror="false"/>
<condition property="prebuild.fail">
<contains string="${prebuildresult}" substring="BUILD FAILED"/>
</condition>
<!-- current build fail? -->
<loadfile property="buildresult" srcFile="${build.logfile}"/>
<condition property="build.fail">
<contains string="${buildresult}" substring="BUILD FAILED"/>
</condition>
<copy file="${build.logfile}" tofile="${build.logfile}.old"/>
<!-- send fail mail when previous build success and this build fail. -->
<condition property="send.fail.mail">
<and>
<isfalse value="${prebuild.fail}"/>
<istrue value="${build.fail}"/>
</and>
</condition>
<!-- send fix mail when previous build fail and this build success.-->
<condition property="send.fix.mail">
<and>
<istrue value="${prebuild.fail}"/>
<isfalse value="${build.fail}"/>
</and>
</condition>
</target>
<target name="inc.build.number" depends="buildstatus" unless="build.fail">
<echo message="Increase build number"/>
<buildnumber file="${build.number.file}"/>
</target>
<target name="send.fail.mail" depends="inc.build.number" description="Send the fail mail" if="send.fail.mail">
<echo message="Sending fail mail"/>
<mail from="${mail.from}" tolist="${mail.tolist}" messagefile="${build.logfile}" subject="${mail.subject.fail}" failonerror="false"/>
</target>
<target name="send.fix.mail" depends="send.fail.mail" description="Send the fix mail" if="send.fix.mail">
<echo message="Sending fix mail"/>
<mail from="${mail.from}" tolist="${mail.tolist}" messagefile="${build.logfile}" subject="${mail.subject.fix} BuildNumber: ${build.number}" failonerror="false"/>
</target>
<target name="all" depends="send.fix.mail" description="Continuous integrate use ant only.">
<sleep seconds="${build.interval}"/>
<echo message="Build finished."/>
</target>
</project>
|
|
From: <sim...@us...> - 2002-06-25 10:02:24
|
Update of /cvsroot/cdchamber/CDChamber/test/testcase In directory usw-pr-cvs1:/tmp/cvs-serv1823/test/testcase Added Files: nullFile Log Message: Add null file for nulltestcase --- NEW FILE: nullFile --- |
|
From: <sim...@us...> - 2002-06-25 10:00:38
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/util
In directory usw-pr-cvs1:/tmp/cvs-serv1130/test/src/org/cdchamber/util
Added Files:
UtilityTest.java
Log Message:
Add more testcase for FileTest
Add utility and config file.
--- NEW FILE: UtilityTest.java ---
/*
* User: Simon
* Date: 2002-6-25
* Time: 17:05:38
* $Id: UtilityTest.java,v 1.1 2002/06/25 10:00:34 simon_lei Exp $
*/
package org.cdchamber.util;
import junit.framework.TestCase;
public class UtilityTest extends TestCase {
public UtilityTest(String s) {
super(s);
}
protected void setUp() throws Exception {
super.setUp();
}
protected void tearDown() throws Exception {
super.tearDown();
}
public void testGetProperty() throws Exception {
assertEquals( "TestValue", Utility.getProperty( "TestKey"));
}
}
|
|
From: <sim...@us...> - 2002-06-25 10:00:37
|
Update of /cvsroot/cdchamber/CDChamber In directory usw-pr-cvs1:/tmp/cvs-serv1130 Added Files: cdchamber.conf Log Message: Add more testcase for FileTest Add utility and config file. --- NEW FILE: cdchamber.conf --- # Config files for cdchamber. # $Id: cdchamber.conf,v 1.1 2002/06/25 10:00:33 simon_lei Exp $ # Value and key for test. TestKey=TestValue # TestCaseDir for test TestCaseDir=test/testcase |
|
From: <sim...@us...> - 2002-06-25 10:00:37
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv1130/aspect/src/org/cdchamber/elements
Modified Files:
DirectoryTypeWrapper.java FileTypeWrapper.java
Log Message:
Add more testcase for FileTest
Add utility and config file.
Index: DirectoryTypeWrapper.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements/DirectoryTypeWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DirectoryTypeWrapper.java 25 Jun 2002 07:54:28 -0000 1.1
--- DirectoryTypeWrapper.java 25 Jun 2002 10:00:33 -0000 1.2
***************
*** 11,15 ****
public aspect DirectoryTypeWrapper {
! public DirectoryType.new( String dirName) throws FileParseException {
throw new FileParseException( "No such directory");
}
--- 11,16 ----
public aspect DirectoryTypeWrapper {
! public void DirectoryType.parse( String dirName) throws FileParseException {
! super.parse( dirName);
throw new FileParseException( "No such directory");
}
Index: FileTypeWrapper.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements/FileTypeWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileTypeWrapper.java 25 Jun 2002 09:15:23 -0000 1.1
--- FileTypeWrapper.java 25 Jun 2002 10:00:33 -0000 1.2
***************
*** 3,11 ****
import org.cdchamber.parser.FileParseException;
public aspect FileTypeWrapper {
! public FileType.new( String dirName) throws FileParseException {
! throw new FileParseException( "No such file");
}
}
--- 3,16 ----
import org.cdchamber.parser.FileParseException;
+ import java.io.File;
public aspect FileTypeWrapper {
! public void FileType.parse( String fileName) throws FileParseException {
! File file = new File( fileName);
! if ( !file.exists()) throw new FileParseException( "File not exist");
! setName( file.getName());
! setSize( file.length());
! setDate( file.lastModified());
}
}
|
|
From: <sim...@us...> - 2002-06-25 10:00:37
|
Update of /cvsroot/cdchamber/CDChamber/docs In directory usw-pr-cvs1:/tmp/cvs-serv1130/docs Modified Files: storycard.txt Log Message: Add more testcase for FileTest Add utility and config file. Index: storycard.txt =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/docs/storycard.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** storycard.txt 22 Jun 2002 06:41:10 -0000 1.1.1.1 --- storycard.txt 25 Jun 2002 10:00:33 -0000 1.2 *************** *** 11,15 **** 2.1 ! Äܹ»importÆäËüĿ¼ÏµļǼÎļþ¡£ 3: --- 11,15 ---- 2.1 ! Äܹ»½«ÆäËûÓû§Éú³ÉµÄ¼Ç¼ÎļþÌí¼Óµ½×Ô¼ºµÄcdÊý¾Ý¿âµ±ÖС£ 3: |
|
From: <sim...@us...> - 2002-06-25 10:00:37
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv1130/test/src/org/cdchamber/elements
Modified Files:
DirectoryTypeTest.java FileTypeTest.java
Log Message:
Add more testcase for FileTest
Add utility and config file.
Index: DirectoryTypeTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements/DirectoryTypeTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DirectoryTypeTest.java 25 Jun 2002 07:54:28 -0000 1.1
--- DirectoryTypeTest.java 25 Jun 2002 10:00:33 -0000 1.2
***************
*** 25,29 ****
public void testWrongDir() {
try {
! DirectoryType dt = new DirectoryType( "/no/such/file");
} catch ( FileParseException e) {
return;
--- 25,30 ----
public void testWrongDir() {
try {
! DirectoryType dirType = new DirectoryType( );
! dirType.parse( "/no/such/dir");
} catch ( FileParseException e) {
return;
Index: FileTypeTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements/FileTypeTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileTypeTest.java 25 Jun 2002 09:15:45 -0000 1.1
--- FileTypeTest.java 25 Jun 2002 10:00:34 -0000 1.2
***************
*** 4,30 ****
import junit.framework.*;
import org.cdchamber.parser.FileParseException;
public class FileTypeTest extends TestCase {
! public FileTypeTest(String name) {
! super(name);
! }
! public void setUp() {
! }
! public void tearDown() {
! }
! public void testWrongFile() {
! try {
! FileType file = new FileType("/no/such/file");
! } catch ( FileParseException e) {
! return;
! }
! fail( "Should throw an Exception when the file is not exist");
! }
}
--- 4,40 ----
import junit.framework.*;
import org.cdchamber.parser.FileParseException;
+ import org.cdchamber.util.Utility;
public class FileTypeTest extends TestCase {
! public FileTypeTest(String name) {
! super(name);
! }
! public void setUp() {
! }
! public void tearDown() {
! }
! public void testWrongFile() {
! try {
! FileType fileType = new FileType();
! fileType.parse("/no/such/file");
! } catch ( FileParseException e) {
! return;
! }
! fail( "Should throw an Exception when the file is not exist");
! }
!
! public void testNullFile( ) throws Exception{
! FileType fileType = new FileType();
! fileType.parse( Utility.getProperty("TestCaseDir") + Utility.SEP + "nullFile");
! assertEquals( "nullFile name should equals", "nullFile", fileType.getName() );
! assertEquals( 0, fileType.getSize()); // File size should equals 0
! //assertEquals( 0, fileType.getDate()); // File date should equals
! }
}
|
|
From: <sim...@us...> - 2002-06-25 10:00:37
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util
In directory usw-pr-cvs1:/tmp/cvs-serv1130/src/org/cdchamber/util
Added Files:
Utility.java
Log Message:
Add more testcase for FileTest
Add utility and config file.
--- NEW FILE: Utility.java ---
/*
* User: Simon
* Date: 2002-6-25
* Time: 16:51:37
* $Id: Utility.java,v 1.1 2002/06/25 10:00:33 simon_lei Exp $
*/
package org.cdchamber.util;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Properties;
public class Utility {
public static final String BaseDir = System.getProperty("user.dir");
public static final String SEP = System.getProperty("file.separator");
public static final String CONFIG_FILENAME = "cdchamber.conf";
private static Properties properties = null;
public static String getProperty( String key) throws FileNotFoundException, IOException {
if ( properties == null) {
properties = new Properties();
FileInputStream fis = new FileInputStream( BaseDir + SEP + CONFIG_FILENAME);
properties.load( fis);
}
return properties.getProperty( key);
}
}
|
|
From: <cry...@us...> - 2002-06-25 09:15:48
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv15572
Added Files:
FileTypeTest.java
Log Message:
add FileTypeTest
--- NEW FILE: FileTypeTest.java ---
// $Id: FileTypeTest.java,v 1.1 2002/06/25 09:15:45 crystal_y Exp $
package org.cdchamber.elements;
import junit.framework.*;
import org.cdchamber.parser.FileParseException;
public class FileTypeTest extends TestCase {
public FileTypeTest(String name) {
super(name);
}
public void setUp() {
}
public void tearDown() {
}
public void testWrongFile() {
try {
FileType file = new FileType("/no/such/file");
} catch ( FileParseException e) {
return;
}
fail( "Should throw an Exception when the file is not exist");
}
}
|
|
From: <cry...@us...> - 2002-06-25 09:15:26
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv15446
Added Files:
FileTypeWrapper.java
Log Message:
add FileTypeWrapper
--- NEW FILE: FileTypeWrapper.java ---
// $Id: FileTypeWrapper.java,v 1.1 2002/06/25 09:15:23 crystal_y Exp $
package org.cdchamber.elements;
import org.cdchamber.parser.FileParseException;
public aspect FileTypeWrapper {
public FileType.new( String dirName) throws FileParseException {
throw new FileParseException( "No such file");
}
}
|
