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: <cry...@us...> - 2002-07-01 07:05:14
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv7494
Modified Files:
CDCMainFrameTest.java
Log Message:
empty testcase until we found a solution to test GUI on UNIX server
Index: CDCMainFrameTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CDCMainFrameTest.java 29 Jun 2002 12:39:46 -0000 1.1
--- CDCMainFrameTest.java 1 Jul 2002 07:05:05 -0000 1.2
***************
*** 23,28 ****
public void testComponentPresent() {
! CDCMainFrame frame = new CDCMainFrame();
! assertNotNull( frame.mainMenu);
}
}
--- 23,29 ----
public void testComponentPresent() {
! // empty testcase until we found a solution to test GUI on UNIX server
! // CDCMainFrame frame = new CDCMainFrame();
! // assertNotNull( frame.mainMenu);
}
}
|
|
From: <cry...@us...> - 2002-07-01 07:01:06
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber In directory usw-pr-cvs1:/tmp/cvs-serv6358/src/org/cdchamber Removed Files: Main.java Log Message: build.xml --- Main.java DELETED --- |
|
From: <cry...@us...> - 2002-07-01 07:01:05
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv6358
Modified Files:
build.xml
Log Message:
build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** build.xml 29 Jun 2002 12:39:46 -0000 1.17
--- build.xml 1 Jul 2002 07:01:02 -0000 1.18
***************
*** 64,72 ****
! <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>
--- 64,72 ----
! <target name="compilewithajc" depends="compile">
<ajc destdir="${aspect.classes}" argfiles="${aspect.dir}/file.lst">
<src>
<pathelement path="${aspect.src}"/>
! <!-- <pathelement path="${src.dir}"/> -->
</src>
<classpath>
***************
*** 76,80 ****
</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" />
--- 76,80 ----
</target>
! <target name="compile" depends="src_gen" description="Compile application without aspectj">
<javac srcdir="${src.dir}" destdir="${build.dest}" classpathref="classpath"
includes="**/*.java" debug="true" deprecation="true" />
***************
*** 91,95 ****
<target name="test.run" depends="test.compile" description="Run unit tests">
! <junit fork="yes" haltonfailure="yes" dir=".">
<classpath>
<path refid="classpath" />
--- 91,96 ----
<target name="test.run" depends="test.compile" description="Run unit tests">
! <junit fork="yes" haltonfailure="yes" dir=".">
! <jvmarg value="-Djava.awt.headless=true"/>
<classpath>
<path refid="classpath" />
|
|
From: <cry...@us...> - 2002-07-01 07:00:49
|
Update of /cvsroot/cdchamber/CDChamber/aspect In directory usw-pr-cvs1:/tmp/cvs-serv6281 Modified Files: file.lst Log Message: move Main.java from normal src to aspect/src Index: file.lst =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/aspect/file.lst,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** file.lst 25 Jun 2002 09:14:38 -0000 1.3 --- file.lst 1 Jul 2002 07:00:45 -0000 1.4 *************** *** 4,5 **** --- 4,6 ---- ../src/org/cdchamber/elements/DirectoryType.java ../src/org/cdchamber/elements/FileType.java + src/org/cdchamber/Main.java |
|
From: <cry...@us...> - 2002-07-01 07:00:49
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber
In directory usw-pr-cvs1:/tmp/cvs-serv6281/src/org/cdchamber
Added Files:
Main.java
Log Message:
move Main.java from normal src to aspect/src
--- NEW FILE: Main.java ---
/*
* User: Simon
* Date: 2002-6-27
* Time: 13:22:44
* $Id: Main.java,v 1.1 2002/07/01 07:00:46 crystal_y Exp $
*/
package org.cdchamber;
import org.cdchamber.elements.DirectoryType;
import org.cdchamber.parser.FileParseException;
import org.exolab.castor.xml.MarshalException;
import org.exolab.castor.xml.ValidationException;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
public class Main {
public static void main( String []args) throws IOException, MarshalException, ValidationException, FileParseException {
if ( args.length != 4) reportUsage();
if ( !args[0].equalsIgnoreCase( "-i")) reportUsage();
if ( !args[2].equalsIgnoreCase( "-o")) reportUsage();
File inDir = new File( args[1]);
File outFile = new File( args[3]);
if ( !inDir.isDirectory()) reportUsage();
DirectoryType dirType = new DirectoryType();
dirType.parse( inDir.getAbsolutePath());
dirType.marshal( new FileWriter( outFile));
}
private static void reportUsage() {
System.out.println( "Usage: java org.cdchamber.Main -i inputdir -o outputfilename");
System.out.println( "And make sure the inputdir can read, the outputfilename can write");
System.exit( 1);
}
}
|
|
From: <sim...@us...> - 2002-06-29 12:39:49
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv9531/test/src/org/cdchamber/gui
Added Files:
CDCMainFrameTest.java
Log Message:
Add the gui classes. But more refactoring and testcases needed.
--- NEW FILE: CDCMainFrameTest.java ---
/*
* User: Simon
* Date: 2002-6-29
* Time: 20:24:20
* $Id: CDCMainFrameTest.java,v 1.1 2002/06/29 12:39:46 simon_lei Exp $
*/
package org.cdchamber.gui;
import junit.framework.TestCase;
public class CDCMainFrameTest extends TestCase {
public CDCMainFrameTest(String s) {
super(s);
}
protected void setUp() throws Exception {
super.setUp();
}
protected void tearDown() throws Exception {
super.tearDown();
}
public void testComponentPresent() {
CDCMainFrame frame = new CDCMainFrame();
assertNotNull( frame.mainMenu);
}
}
|
|
From: <sim...@us...> - 2002-06-29 12:39:49
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv9531/src/org/cdchamber/gui
Added Files:
CDCMainFrame.java CDChamber.java
Log Message:
Add the gui classes. But more refactoring and testcases needed.
--- NEW FILE: CDCMainFrame.java ---
/*
* User: Simon
* Date: 2002-6-29
* Time: 20:20:49
* $Id: CDCMainFrame.java,v 1.1 2002/06/29 12:39:46 simon_lei Exp $
*/
package org.cdchamber.gui;
import javax.swing.*;
import java.awt.event.WindowEvent;
import java.awt.*;
public class CDCMainFrame extends JFrame {
JPanel contentPane;
BorderLayout borderLayout1 = new BorderLayout();
JMenuBar mainMenu = new JMenuBar();
JMenu cdromMenu = new JMenu();
JMenuItem cdromCreateMenuItem = new JMenuItem();
JMenuItem cdromShowMenuItem = new JMenuItem();
JMenu helpMenu = new JMenu();
JMenuItem helpAboutMenuItem = new JMenuItem();
JMenuItem cdromExitMenuItem = new JMenuItem();
public CDCMainFrame() {
enableEvents(AWTEvent.WINDOW_EVENT_MASK);
try {
jbInit();
} catch(Exception e) {
e.printStackTrace();
}
}
//Component initialization
private void jbInit() throws Exception {
//setIconImage(Toolkit.getDefaultToolkit().createImage(Frame3.class.getResource("[Your Icon]")));
contentPane = (JPanel) this.getContentPane();
contentPane.setLayout(borderLayout1);
this.setJMenuBar(mainMenu);
this.setSize(new Dimension(431, 376));
this.setTitle("Frame Title");
cdromMenu.setMnemonic('C');
cdromMenu.setText("CDrom");
cdromCreateMenuItem.setMnemonic('C');
cdromCreateMenuItem.setText("Create");
cdromShowMenuItem.setMnemonic('S');
cdromShowMenuItem.setText("Show");
helpMenu.setMnemonic('H');
helpMenu.setText("Help");
helpAboutMenuItem.setMnemonic('A');
helpAboutMenuItem.setText("About");
cdromExitMenuItem.setMnemonic('X');
cdromExitMenuItem.setText("Exit");
mainMenu.add(cdromMenu);
mainMenu.add(helpMenu);
cdromMenu.add(cdromCreateMenuItem);
cdromMenu.add(cdromShowMenuItem);
helpMenu.add(helpAboutMenuItem);
cdromMenu.addSeparator();
cdromMenu.add(cdromExitMenuItem);
}
protected void processWindowEvent(WindowEvent e) {
super.processWindowEvent(e);
if (e.getID() == WindowEvent.WINDOW_CLOSING) {
System.exit(0);
}
}
}
--- NEW FILE: CDChamber.java ---
/*
* User: Simon
* Date: 2002-6-29
* Time: 20:17:41
* $Id: CDChamber.java,v 1.1 2002/06/29 12:39:46 simon_lei Exp $
*/
package org.cdchamber.gui;
import javax.swing.*;
import java.awt.*;
public class CDChamber {
public static void main(String[] args) {
try {
UIManager.setLookAndFeel( UIManager.getCrossPlatformLookAndFeelClassName());
} catch(Exception e) {
e.printStackTrace();
}
CDCMainFrame mainFrame = new CDCMainFrame();
showWinowAtCenter( mainFrame);
}
static void showWinowAtCenter( Window window) {
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
Dimension windowSize = window.getSize();
if (windowSize.height > screenSize.height) {
windowSize.height = screenSize.height;
}
if (windowSize.width > screenSize.width) {
windowSize.width = screenSize.width;
}
window.setLocation((screenSize.width - windowSize.width) / 2, (screenSize.height - windowSize.height) / 2);
window.setVisible(true);
}
}
|
|
From: <sim...@us...> - 2002-06-29 12:39:49
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv9531
Modified Files:
build.xml
Log Message:
Add the gui classes. But more refactoring and testcases needed.
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** build.xml 28 Jun 2002 02:49:08 -0000 1.16
--- build.xml 29 Jun 2002 12:39:46 -0000 1.17
***************
*** 109,114 ****
</target>
! <target name="all" depends="jar" description="Build application">
! <echo message="Application built!"/>
</target>
--- 109,118 ----
</target>
! <target name="run" depends="test.run" description="Run the application">
! <java classname="org.cdchamber.gui.CDChamber" fork="true" dir="${basedir}">
! <classpath>
! <path refid="classpath" />
! </classpath>
! </java>
</target>
|
|
From: <sim...@us...> - 2002-06-29 12:23:46
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui In directory usw-pr-cvs1:/tmp/cvs-serv4743/gui Log Message: Directory /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui added to the repository |
|
From: <sim...@us...> - 2002-06-29 08:49:35
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui In directory usw-pr-cvs1:/tmp/cvs-serv31216/gui Log Message: Directory /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui added to the repository |
|
From: <cry...@us...> - 2002-06-28 03:22:59
|
Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv23455
Modified Files:
continuousintegrate.sh
Log Message:
bug fix about script
Index: continuousintegrate.sh
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousintegrate.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** continuousintegrate.sh 28 Jun 2002 03:21:52 -0000 1.4
--- continuousintegrate.sh 28 Jun 2002 03:22:56 -0000 1.5
***************
*** 20,24 ****
export CLASSPATH BUILD_DIR ANT_DIR JAVA_HOME CVSROOT CVS_RSH
cd $BUILD_DIR/CDChamber
! if [[ -n `cvs update -d 2>&1 | egrep -e '^U|^P|^A' ]]
then
>${BUILD_DIR}/log/build.log
--- 20,24 ----
export CLASSPATH BUILD_DIR ANT_DIR JAVA_HOME CVSROOT CVS_RSH
cd $BUILD_DIR/CDChamber
! if [[ -n `cvs update -d 2>&1 | egrep -e '^U|^P|^A'` ]]
then
>${BUILD_DIR}/log/build.log
|
|
From: <cry...@us...> - 2002-06-28 03:21:58
|
Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv23178
Modified Files:
continuousintegrate.sh
Log Message:
script refactor
Index: continuousintegrate.sh
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousintegrate.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** continuousintegrate.sh 28 Jun 2002 03:11:20 -0000 1.3
--- continuousintegrate.sh 28 Jun 2002 03:21:52 -0000 1.4
***************
*** 20,24 ****
export CLASSPATH BUILD_DIR ANT_DIR JAVA_HOME CVSROOT CVS_RSH
cd $BUILD_DIR/CDChamber
! if [[ -n `cvs update -d 2>&1 | grep -e '^U' -e '^P' -e '^A'` ]]
then
>${BUILD_DIR}/log/build.log
--- 20,24 ----
export CLASSPATH BUILD_DIR ANT_DIR JAVA_HOME CVSROOT CVS_RSH
cd $BUILD_DIR/CDChamber
! if [[ -n `cvs update -d 2>&1 | egrep -e '^U|^P|^A' ]]
then
>${BUILD_DIR}/log/build.log
|
|
From: <cry...@us...> - 2002-06-28 03:11:24
|
Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv20632
Modified Files:
continuousintegrate.sh
Log Message:
script fix about cvs update checking
Index: continuousintegrate.sh
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousintegrate.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** continuousintegrate.sh 28 Jun 2002 03:06:01 -0000 1.2
--- continuousintegrate.sh 28 Jun 2002 03:11:20 -0000 1.3
***************
*** 20,24 ****
export CLASSPATH BUILD_DIR ANT_DIR JAVA_HOME CVSROOT CVS_RSH
cd $BUILD_DIR/CDChamber
! if [[ -n `cvs update -d 2>&1 | grep -e '^U' -e '^P'` ]]
then
>${BUILD_DIR}/log/build.log
--- 20,24 ----
export CLASSPATH BUILD_DIR ANT_DIR JAVA_HOME CVSROOT CVS_RSH
cd $BUILD_DIR/CDChamber
! if [[ -n `cvs update -d 2>&1 | grep -e '^U' -e '^P' -e '^A'` ]]
then
>${BUILD_DIR}/log/build.log
|
|
From: <cry...@us...> - 2002-06-28 03:06:05
|
Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv19515
Modified Files:
acceptance.sh continuousintegrate.sh
Log Message:
script fixed
Index: acceptance.sh
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/acceptance.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** acceptance.sh 28 Jun 2002 02:16:49 -0000 1.1
--- acceptance.sh 28 Jun 2002 03:06:01 -0000 1.2
***************
*** 3,7 ****
java org.apache.tools.ant.Main jar 2>&1
cd $BUILD_DIR/CDChamber/acceptance/case1
! $BUILD_DIR/CDChamber/acceptance/case1/execute
cd $BUILD_DIR/CDChamber
java org.apache.tools.ant.Main clean 2>&1
--- 3,7 ----
java org.apache.tools.ant.Main jar 2>&1
cd $BUILD_DIR/CDChamber/acceptance/case1
! $BUILD_DIR/CDChamber/acceptance/case1/execute 2>&1
cd $BUILD_DIR/CDChamber
java org.apache.tools.ant.Main clean 2>&1
Index: continuousintegrate.sh
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousintegrate.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** continuousintegrate.sh 28 Jun 2002 02:16:49 -0000 1.1
--- continuousintegrate.sh 28 Jun 2002 03:06:01 -0000 1.2
***************
*** 19,23 ****
CLASSPATH=$PROJECT_LIB_DIR:$CLASSPATH:$JAVA_HOME/lib/tools.jar
export CLASSPATH BUILD_DIR ANT_DIR JAVA_HOME CVSROOT CVS_RSH
! if cvs update -d CDChamber 2>&1 | grep -e "^U|^P"
then
>${BUILD_DIR}/log/build.log
--- 19,24 ----
CLASSPATH=$PROJECT_LIB_DIR:$CLASSPATH:$JAVA_HOME/lib/tools.jar
export CLASSPATH BUILD_DIR ANT_DIR JAVA_HOME CVSROOT CVS_RSH
! cd $BUILD_DIR/CDChamber
! if [[ -n `cvs update -d 2>&1 | grep -e '^U' -e '^P'` ]]
then
>${BUILD_DIR}/log/build.log
|
|
From: <cry...@us...> - 2002-06-28 03:04:16
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util
In directory usw-pr-cvs1:/tmp/cvs-serv19115
Modified Files:
DirPath.java
Log Message:
then for a succesful build, should no mail sent out
we can check the build.number to see if it is build
Index: DirPath.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util/DirPath.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DirPath.java 28 Jun 2002 03:01:47 -0000 1.5
--- DirPath.java 28 Jun 2002 03:04:14 -0000 1.6
***************
*** 12,15 ****
public static final String TestCaseDir = BaseDir + SEP + "test" + SEP + "testcase";
public static final String BuildDir = BaseDir + SEP + "build";
- public static final String NullString = "this is for test!";
}
--- 12,14 ----
|
|
From: <cry...@us...> - 2002-06-28 03:01:49
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util
In directory usw-pr-cvs1:/tmp/cvs-serv18330
Modified Files:
DirPath.java
Log Message:
now i fix it for test
Index: DirPath.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util/DirPath.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DirPath.java 28 Jun 2002 02:47:29 -0000 1.4
--- DirPath.java 28 Jun 2002 03:01:47 -0000 1.5
***************
*** 12,15 ****
public static final String TestCaseDir = BaseDir + SEP + "test" + SEP + "testcase";
public static final String BuildDir = BaseDir + SEP + "build";
! public static final String NullString = "this is for test!"
}
--- 12,15 ----
public static final String TestCaseDir = BaseDir + SEP + "test" + SEP + "testcase";
public static final String BuildDir = BaseDir + SEP + "build";
! public static final String NullString = "this is for test!";
}
|
|
From: <sim...@us...> - 2002-06-28 02:49:12
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber In directory usw-pr-cvs1:/tmp/cvs-serv15180/test/src/org/cdchamber Removed Files: MainTest.java Log Message: Remove unnecessary acceptance test, crystal_y write script to do it. --- MainTest.java DELETED --- |
|
From: <sim...@us...> - 2002-06-28 02:49:12
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv15180
Modified Files:
build.xml
Log Message:
Remove unnecessary acceptance test, crystal_y write script to do it.
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** build.xml 27 Jun 2002 08:34:00 -0000 1.15
--- build.xml 28 Jun 2002 02:49:08 -0000 1.16
***************
*** 47,51 ****
<srcfiles dir= "${src.dir}" includes="**/*.xsd"/>
</uptodate>
- <available property="result.xml.exist" file="${build.dir}/result.xml"/>
</target>
--- 47,50 ----
***************
*** 82,95 ****
</target>
! <target name="result_gen" depends="compilewithajc" description="Generate the test result, if it isn't exist" unless="result.xml.exist">
! <java classname="org.cdchamber.Main" fork="true" dir="${basedir}">
! <arg line="-i test/testcase -o build/result.xml"/>
! <classpath>
! <path refid="classpath" />
! </classpath>
! </java>
! </target>
!
! <target name="test.compile" depends="result_gen">
<javac srcdir="${test.src}" destdir="${test.classes}">
<classpath>
--- 81,85 ----
</target>
! <target name="test.compile" depends="compilewithajc">
<javac srcdir="${test.src}" destdir="${test.classes}">
<classpath>
|
|
From: <cry...@us...> - 2002-06-28 02:47:33
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util
In directory usw-pr-cvs1:/tmp/cvs-serv14866
Modified Files:
DirPath.java
Log Message:
for build test
Index: DirPath.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util/DirPath.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DirPath.java 27 Jun 2002 06:57:50 -0000 1.3
--- DirPath.java 28 Jun 2002 02:47:29 -0000 1.4
***************
*** 12,14 ****
--- 12,15 ----
public static final String TestCaseDir = BaseDir + SEP + "test" + SEP + "testcase";
public static final String BuildDir = BaseDir + SEP + "build";
+ public static final String NullString = "this is for test!"
}
|
|
From: <cry...@us...> - 2002-06-28 02:16:52
|
Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv8020/script
Added Files:
acceptance.sh continuousintegrate.sh
Log Message:
unix scripts for continuous integration
--- NEW FILE: acceptance.sh ---
#!/bin/bash
cd $BUILD_DIR/CDChamber
java org.apache.tools.ant.Main jar 2>&1
cd $BUILD_DIR/CDChamber/acceptance/case1
$BUILD_DIR/CDChamber/acceptance/case1/execute
cd $BUILD_DIR/CDChamber
java org.apache.tools.ant.Main clean 2>&1
--- NEW FILE: continuousintegrate.sh ---
#!/bin/bash
CVS_RSH=ssh
CVSROOT=:ext:crystal_y@cvs1:/cvsroot/cdchamber
PROJECTHOME=/home/groups/c/cd/cdchamber
JAVA_HOME=/usr/java/j2sdk1.4.0_01
ANT_DIR=$PROJECTHOME/ant
ANT_LIB_DIR=$ANT_DIR/lib
BUILD_DIR=$PROJECTHOME/crystal_build
# Set other lib dir
OTHER_LIB_DIR=$PROJECTHOME/lib
PROJECT_LIB_DIR=$BUILD_DIR/CDChamber/lib
for c in $ANT_LIB_DIR/*.jar $OTHER_LIB_DIR/*.jar
do
CLASSPATH=$CLASSPATH:$c
done
CLASSPATH=$PROJECT_LIB_DIR:$CLASSPATH:$JAVA_HOME/lib/tools.jar
export CLASSPATH BUILD_DIR ANT_DIR JAVA_HOME CVSROOT CVS_RSH
if cvs update -d CDChamber 2>&1 | grep -e "^U|^P"
then
>${BUILD_DIR}/log/build.log
#unit test will run because build.jar depends on build.test.run
#while acceptance depends on jar file
$BUILD_DIR/acceptance.sh >> $BUILD_DIR/log/build.log
if [[ -z `grep 'BUILD FAILED' $BUILD_DIR/log/build.log` ]]
then
build_number=`cat $BUILD_DIR/log/build.number`
let build_number=$build_number+1
echo $build_number > $BUILD_DIR/log/build.number
fi
if [[ -n `grep 'BUILD FAILED' $BUILD_DIR/log/build.log` ]]
then
cat $BUILD_DIR/log/build.log | mail -s "Build Failed!" cdc...@li...
elif [[ -n `grep 'BUILD FAILED' $BUILD_DIR/log/build.log.old` ]]
then
cat $BUILD_DIR/log/build.log | mail -s "Build Fixed! Build Number:$build_number" cdc...@li...
fi
cp $BUILD_DIR/log/build.log $BUILD_DIR/log/build.log.old
fi
|
|
From: <cry...@us...> - 2002-06-28 02:16:52
|
Update of /cvsroot/cdchamber/CDChamber/acceptance/case1 In directory usw-pr-cvs1:/tmp/cvs-serv8020/acceptance/case1 Modified Files: execute Log Message: unix scripts for continuous integration Index: execute =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/acceptance/case1/execute,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** execute 22 Jun 2002 06:41:10 -0000 1.1.1.1 --- execute 28 Jun 2002 02:16:49 -0000 1.2 *************** *** 1,9 **** ! #!/bin/ksh ! cdchamber -i ./foo -o ./result/respository.xml ! if [[ -z `diff ./check/repository.xml ./result/repository.xml` ]] then ! echo "pass" ! rm -f ./result/repository.xml else ! echo "difference occurred between ./check/repository.xml ./result/repository.xml" fi --- 1,10 ---- ! #!/bin/bash ! java -cp $BUILD_DIR/CDChamber/build/lib/CDChamber.jar:$CLASSPATH org.cdchamber.Main -i $PWD/foo -o $PWD/repository.xml ! if [[ -z `diff $PWD/check/repository.xml $PWD/repository.xml` ]] then ! echo "BUILD SUCCESSFUL" ! rm -f $PWD/repository.xml else ! echo "BUILD FAILED difference occurred between $PWD/check/repository.xml $PWD/repository.xml" fi + |
|
From: <cry...@us...> - 2002-06-28 01:53:30
|
Update of /cvsroot/cdchamber/CDChamber/acceptance/case1/check In directory usw-pr-cvs1:/tmp/cvs-serv2111 Added Files: repository.xml Log Message: put correct acceptance test result xml --- NEW FILE: repository.xml --- <?xml version="1.0" encoding="UTF-8"?> <directory-type files-count="2" date="1025157238000" size="2" valid="true"><name>foo</name><files files-count="1" date="1025157238000" size="1" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>bar</name><files date="1024728070000" size="1" valid="true"><name>world</name></files><content></content></files><files date="1024728070000" size="1" valid="true"><name>hello</name></files><content></content></directory-type> |
|
From: <cry...@us...> - 2002-06-28 01:53:03
|
Update of /cvsroot/cdchamber/CDChamber/acceptance/case1/check In directory usw-pr-cvs1:/tmp/cvs-serv2002 Removed Files: respository.xml Log Message: put correct acceptance test result xml --- respository.xml DELETED --- |
|
From: <sim...@us...> - 2002-06-28 01:27:18
|
Update of /cvsroot/cdchamber/CDChamber/script In directory usw-pr-cvs1:/tmp/cvs-serv29120/script Modified Files: continuousbuild Log Message: add more detail directory information in the script. So that crontab will work correctly. Index: continuousbuild =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/script/continuousbuild,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** continuousbuild 26 Jun 2002 06:00:37 -0000 1.5 --- continuousbuild 28 Jun 2002 01:27:14 -0000 1.6 *************** *** 14,27 **** # ./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 $OTHER_LIB_DIR/*.jar --- 14,29 ---- # ./continuousbuild > std.out 2> err.out & + # set the current directory. + CURRDIR=/home/groups/c/cd/cdchamber/simon_build/ JAVA_HOME=/usr/java/j2sdk1.4.0_01/ # Set the classpath of ant. ! ANT_DIR=$CURRDIR/../ant ANT_LIB_DIR=$ANT_DIR/lib # Set the project lib dir ! PROJECT_LIB_DIR=$CURRDIR/CDChamber/lib # Set other lib dir ! OTHER_LIB_DIR=$CURRDIR/../lib for c in $ANT_LIB_DIR/*.jar $OTHER_LIB_DIR/*.jar *************** *** 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 --- 34,41 ---- export CLASS_PATH=$PROJECT_LIB_DIR:$CLASS_PATH:$JAVA_HOME/lib/tools.jar ! #while true ! #do ! cd $CURRDIR; $JAVA_HOME/bin/java -cp $CLASS_PATH org.apache.tools.ant.Main -buildfile continuousbuild.xml $@ >> $CURRDIR/out 2>> $CURRDIR/err ! # $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 |
|
From: <sim...@us...> - 2002-06-27 08:34:04
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv24057
Modified Files:
build.xml
Log Message:
Delete usless target from build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** build.xml 27 Jun 2002 07:59:33 -0000 1.14
--- build.xml 27 Jun 2002 08:34:00 -0000 1.15
***************
*** 113,117 ****
</target>
! <target name="jar">
<jar jarfile="${jar.dir}/CDChamber.jar">
<fileset dir="${aspect.classes}"/>
--- 113,117 ----
</target>
! <target name="jar" depends="test.run" description="Jar the classes files">
<jar jarfile="${jar.dir}/CDChamber.jar">
<fileset dir="${aspect.classes}"/>
***************
*** 119,161 ****
</target>
! <target name="all" depends="clean,init,compilewithajc,compile,test.compile,test.run,jar" description="Build application">
<echo message="Application built!"/>
</target>
-
- <!-- The lines below are added for the contious integrate -->
- <property name="cvs.repository" value=":ext:simon_lei@cvs1:/cvsroot/cdchamber"/>
- <property name="cvs.package" value="CDChamber"/>
-
- <target name="checkout" description="Update package from CVS">
- <cvs cvsroot="${cvs.repository}" package="${cvs.package}" dest=".."/>
- </target>
-
- <target name="convertLogs" description="Convert the log files from xml to html">
- <java dir="." fork="true" classname="Xml2Html">
- <arg value="logs"/>
- <arg value="script/log.xsl"/>
- <classpath>
- <path refid="classpath" />
- </classpath>
- </java>
- </target>
-
- <target name="modificationcheck" depends="init,convertLogs" description="Check modifications since last build">
- <taskdef name="modificationset" classname="net.sourceforge.cruisecontrol.ModificationSet"/>
- <echo message="Checking for modifications..."/>
- <modificationset lastbuild="${lastBuildAttemptTime}" quietperiod="30"
- dateformat="yyyy-MMM-dd HH:mm:ss">
- <cvselement cvsroot="${cvs.repository}"/>
- </modificationset>
- </target>
-
- <target name="masterbuild" depends="modificationcheck,checkout,compile,test.run,jar" description="Cruise control master build">
- <echo message="hahahahaha"/>
- </target>
-
-
- <target name="cleanbuild" depends="clean,masterbuild" description="Cruise control clean build"/>
-
-
</project>
--- 119,125 ----
</target>
! <target name="all" depends="jar" description="Build application">
<echo message="Application built!"/>
</target>
</project>
|
