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-07-17 12:28:22
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv1572/src/org/cdchamber/gui
Modified Files:
FileTreeModel.java
Log Message:
Fix the build error on continuous integrate server.
The build error maybe of the reason of different version of JDK.
Index: FileTreeModel.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/FileTreeModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileTreeModel.java 17 Jul 2002 10:55:22 -0000 1.1
--- FileTreeModel.java 17 Jul 2002 12:27:46 -0000 1.2
***************
*** 17,22 ****
public FileTreeModel( DirectoryType roots) {
! super( null);
! DefaultMutableTreeNode troots = new DefaultMutableTreeNode( roots);
addFilesToNode( roots.getFiles(), troots);
this.setRoot( troots);
--- 17,22 ----
public FileTreeModel( DirectoryType roots) {
! super( new DefaultMutableTreeNode( roots));
! DefaultMutableTreeNode troots = (DefaultMutableTreeNode)this.getRoot();
addFilesToNode( roots.getFiles(), troots);
this.setRoot( troots);
|
|
From: <sim...@us...> - 2002-07-17 12:18:03
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv24397/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameTest.java
Log Message:
Let the testcase works. And load data files from ~/data directory.
Index: CDCMainFrameTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CDCMainFrameTest.java 17 Jul 2002 10:55:22 -0000 1.6
--- CDCMainFrameTest.java 17 Jul 2002 12:17:55 -0000 1.7
***************
*** 43,48 ****
if ( dirDatas.size() != files.length) fail( "The roots' number should be the same");
for ( int i=0; i<files.length; i++) {
! if ( !dirDatas.contains( files[i])) fail( "Should contain all data files in the tree");
}
}
--- 43,55 ----
if ( dirDatas.size() != files.length) fail( "The roots' number should be the same");
for ( int i=0; i<files.length; i++) {
! if ( !contains( dirDatas, files[i])) fail( "Should contain all data files in the tree");
}
+ }
+
+ private boolean contains(Vector dirDatas, FileType file) {
+ for ( int i=0; i<dirDatas.size(); i++) {
+ if ( dirDatas.elementAt(i).equals( file)) return true;
+ }
+ return false;
}
|
|
From: <sim...@us...> - 2002-07-17 12:18:02
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv24397/aspect/src/org/cdchamber/elements
Modified Files:
FileTypeWrapper.java
Log Message:
Let the testcase works. And load data files from ~/data directory.
Index: FileTypeWrapper.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements/FileTypeWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FileTypeWrapper.java 26 Jun 2002 10:05:35 -0000 1.3
--- FileTypeWrapper.java 17 Jul 2002 12:17:54 -0000 1.4
***************
*** 14,16 ****
--- 14,20 ----
setDate( file.lastModified());
}
+
+ public String FileType.toString() {
+ return getName();
+ }
}
|
|
From: <sim...@us...> - 2002-07-17 12:18:02
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv24397/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java
Log Message:
Let the testcase works. And load data files from ~/data directory.
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CDCMainFrame.java 17 Jul 2002 10:55:22 -0000 1.4
--- CDCMainFrame.java 17 Jul 2002 12:17:55 -0000 1.5
***************
*** 73,78 ****
}
return root;
-
}
--- 73,78 ----
}
+ root.setName( "CDRoms");
return root;
}
|
|
From: <sim...@us...> - 2002-07-17 12:18:02
|
Update of /cvsroot/cdchamber/CDChamber/lib In directory usw-pr-cvs1:/tmp/cvs-serv24397/lib Modified Files: castorbuilder.properties Log Message: Let the testcase works. And load data files from ~/data directory. Index: castorbuilder.properties =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/lib/castorbuilder.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** castorbuilder.properties 24 Jun 2002 10:19:55 -0000 1.1 --- castorbuilder.properties 17 Jul 2002 12:17:54 -0000 1.2 *************** *** 30,34 **** # for each generated class # false by default ! #org.exolab.castor.builder.equalsmethod=true # Set to true if you want to use Object Wrappers instead --- 30,34 ---- # for each generated class # false by default ! org.exolab.castor.builder.equalsmethod=true # Set to true if you want to use Object Wrappers instead |
|
From: <sim...@us...> - 2002-07-17 10:55:25
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui In directory usw-pr-cvs1:/tmp/cvs-serv19623/test/src/org/cdchamber/gui Modified Files: CDCMainFrameTest.java Log Message: Add the tree to the gui, and the testcase. Index: CDCMainFrameTest.java =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CDCMainFrameTest.java 17 Jul 2002 09:29:59 -0000 1.5 --- CDCMainFrameTest.java 17 Jul 2002 10:55:22 -0000 1.6 *************** *** 10,15 **** --- 10,18 ---- import org.cdchamber.elements.DirectoryType; import org.cdchamber.elements.FileType; + import org.cdchamber.util.DirPath; + import javax.swing.tree.DefaultMutableTreeNode; import java.util.Vector; + import java.io.*; public class CDCMainFrameTest extends TestCase { *************** *** 35,46 **** public void testDataLoad() { ! /* ! DirectoryType root = (DirectoryType)frame.directoryTree.getModel().getRoot(); FileType []files = root.getFiles(); Vector dirDatas = loadFromDataDir(); for ( int i=0; i<files.length; i++) { if ( !dirDatas.contains( files[i])) fail( "Should contain all data files in the tree"); } ! */ } } --- 38,64 ---- public void testDataLoad() { ! DirectoryType root = (DirectoryType)(((DefaultMutableTreeNode)frame.directoryTree.getModel().getRoot()).getUserObject()); FileType []files = root.getFiles(); Vector dirDatas = loadFromDataDir(); + if ( dirDatas.size() != files.length) fail( "The roots' number should be the same"); for ( int i=0; i<files.length; i++) { if ( !dirDatas.contains( files[i])) fail( "Should contain all data files in the tree"); } ! } ! ! private Vector loadFromDataDir() { ! Vector dirs = new Vector(); ! File dataDir = new File( DirPath.DataDir); ! File[] rootFiles = dataDir.listFiles(); ! for ( int i=0; i<rootFiles.length; i++) { ! try { ! dirs.add( DirectoryType.unmarshalDirectoryType( new FileReader( rootFiles[i]))); ! } catch (org.exolab.castor.xml.MarshalException e) { ! } catch (org.exolab.castor.xml.ValidationException e) { ! } catch (FileNotFoundException e) { ! } ! } ! ! return dirs; } } |
|
From: <sim...@us...> - 2002-07-17 10:55:25
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv19623/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java
Added Files:
FileTreeModel.java
Log Message:
Add the tree to the gui, and the testcase.
--- NEW FILE: FileTreeModel.java ---
/*
* Created by IntelliJ IDEA.
* User: Administrator
* Date: Jul 17, 2002
* Time: 6:24:07 PM
* To change template for new class use
* Code Style | Class Templates options (Tools | IDE Options).
*/
package org.cdchamber.gui;
import org.cdchamber.elements.DirectoryType;
import org.cdchamber.elements.FileType;
import javax.swing.tree.*;
public class FileTreeModel extends DefaultTreeModel {
public FileTreeModel( DirectoryType roots) {
super( null);
DefaultMutableTreeNode troots = new DefaultMutableTreeNode( roots);
addFilesToNode( roots.getFiles(), troots);
this.setRoot( troots);
}
public static void addFilesToNode( FileType []files, DefaultMutableTreeNode pnode ) {
for ( int i=0; i<files.length; i++) {
if ( !(files[i] instanceof DirectoryType)) continue;
DefaultMutableTreeNode node = new DefaultMutableTreeNode( files[i]);
addFilesToNode( ((DirectoryType)files[i]).getFiles(), node);
pnode.add( node);
}
}
}
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CDCMainFrame.java 17 Jul 2002 09:29:58 -0000 1.3
--- CDCMainFrame.java 17 Jul 2002 10:55:22 -0000 1.4
***************
*** 7,14 ****
--- 7,18 ----
package org.cdchamber.gui;
+ import org.cdchamber.elements.DirectoryType;
+ import org.cdchamber.util.DirPath;
+
import javax.swing.*;
import javax.swing.border.EtchedBorder;
import java.awt.event.*;
import java.awt.*;
+ import java.io.*;
public class CDCMainFrame extends JFrame {
***************
*** 48,54 ****
contentPane.add( BorderLayout.CENTER, mainPane);
mainPane.setBorder( new EtchedBorder());
! mainPane.add( JSplitPane.LEFT, directoryTree);
! mainPane.add( JSplitPane.RIGHT, filesTable);
}
private void initMenuBar() {
--- 52,80 ----
contentPane.add( BorderLayout.CENTER, mainPane);
mainPane.setBorder( new EtchedBorder());
!
! mainPane.add( JSplitPane.LEFT, new JScrollPane().getViewport().add( directoryTree));
! mainPane.add( JSplitPane.RIGHT, new JScrollPane().getViewport().add( filesTable));
!
! directoryTree.setModel( new FileTreeModel( loadDataFiles()));
! }
!
! private DirectoryType loadDataFiles() {
! DirectoryType root = new DirectoryType();
!
! File dataDir = new File( DirPath.DataDir);
! File[] rootFiles = dataDir.listFiles();
! for ( int i=0; i<rootFiles.length; i++) {
! try {
! root.addFiles( DirectoryType.unmarshalDirectoryType( new FileReader( rootFiles[i])));
! } catch (org.exolab.castor.xml.MarshalException e) {
! } catch (org.exolab.castor.xml.ValidationException e) {
! } catch (FileNotFoundException e) {
! }
! }
!
! return root;
!
}
+
private void initMenuBar() {
|
|
From: <sim...@us...> - 2002-07-17 10:55:25
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util
In directory usw-pr-cvs1:/tmp/cvs-serv19623/src/org/cdchamber/util
Modified Files:
DirPath.java
Log Message:
Add the tree to the gui, and the testcase.
Index: DirPath.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util/DirPath.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DirPath.java 28 Jun 2002 03:04:14 -0000 1.6
--- DirPath.java 17 Jul 2002 10:55:22 -0000 1.7
***************
*** 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 DataDir = BaseDir + SEP + "data";
}
|
|
From: <sim...@us...> - 2002-07-17 10:54:56
|
Update of /cvsroot/cdchamber/CDChamber/data In directory usw-pr-cvs1:/tmp/cvs-serv19456/data Log Message: Directory /cvsroot/cdchamber/CDChamber/data added to the repository |
|
From: <sim...@us...> - 2002-07-17 09:30:04
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv14962/test/src/org/cdchamber/elements
Modified Files:
DirectoryTypeTest.java
Log Message:
Let the txt files under testcase have no newline, so that
their sizes on linux and windows will be the same.
Add some gui actions too.
Index: DirectoryTypeTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements/DirectoryTypeTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DirectoryTypeTest.java 27 Jun 2002 05:03:37 -0000 1.10
--- DirectoryTypeTest.java 17 Jul 2002 09:29:59 -0000 1.11
***************
*** 55,59 ****
assertEquals( "Name should be difffiles", dirType.getName(), "difffiles");
! assertEquals( 4763, dirType.getSize()); // the size
assertEquals( getFileDate(dirName), dirType.getDate());
}
--- 55,59 ----
assertEquals( "Name should be difffiles", dirType.getName(), "difffiles");
! assertEquals( 155, dirType.getSize()); // the size
assertEquals( getFileDate(dirName), dirType.getDate());
}
***************
*** 66,70 ****
assertEquals( "Name should be testtools", dirType.getName(), "testtools");
! assertEquals( 9525, dirType.getSize()); // the size
assertEquals( getFileDate(dirName), dirType.getDate());
}
--- 66,70 ----
assertEquals( "Name should be testtools", dirType.getName(), "testtools");
! assertEquals( 309, dirType.getSize()); // the size
assertEquals( getFileDate(dirName), dirType.getDate());
}
|
|
From: <sim...@us...> - 2002-07-17 09:30:03
|
Update of /cvsroot/cdchamber/CDChamber/test/testcase/testtools/difffiles In directory usw-pr-cvs1:/tmp/cvs-serv14962/test/testcase/testtools/difffiles Modified Files: file1.txt file2.txt Log Message: Let the txt files under testcase have no newline, so that their sizes on linux and windows will be the same. Add some gui actions too. Index: file1.txt =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/test/testcase/testtools/difffiles/file1.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** file1.txt 22 Jun 2002 06:41:10 -0000 1.1.1.1 --- file1.txt 17 Jul 2002 09:29:59 -0000 1.2 *************** *** 1,29 **** ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! --- 1 ---- ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing \ No newline at end of file Index: file2.txt =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/test/testcase/testtools/difffiles/file2.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** file2.txt 22 Jun 2002 06:41:10 -0000 1.1.1.1 --- file2.txt 17 Jul 2002 09:29:59 -0000 1.2 *************** *** 1,29 **** ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing2 ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! --- 1 ---- ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing2 \ No newline at end of file |
|
From: <sim...@us...> - 2002-07-17 09:30:03
|
Update of /cvsroot/cdchamber/CDChamber/test/testcase/testtools/samefiles In directory usw-pr-cvs1:/tmp/cvs-serv14962/test/testcase/testtools/samefiles Modified Files: file1.txt file2.txt Log Message: Let the txt files under testcase have no newline, so that their sizes on linux and windows will be the same. Add some gui actions too. Index: file1.txt =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/test/testcase/testtools/samefiles/file1.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** file1.txt 22 Jun 2002 06:41:10 -0000 1.1.1.1 --- file1.txt 17 Jul 2002 09:29:59 -0000 1.2 *************** *** 1,29 **** ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! --- 1 ---- ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing \ No newline at end of file Index: file2.txt =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/test/testcase/testtools/samefiles/file2.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** file2.txt 22 Jun 2002 06:41:10 -0000 1.1.1.1 --- file2.txt 17 Jul 2002 09:29:59 -0000 1.2 *************** *** 1,29 **** ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing ! --- 1 ---- ! NothingNothingNothingNothingNothingNothingNothingNothingNothingNothingNothing \ No newline at end of file |
|
From: <sim...@us...> - 2002-07-17 09:30:03
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv14962/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameTest.java
Log Message:
Let the txt files under testcase have no newline, so that
their sizes on linux and windows will be the same.
Add some gui actions too.
Index: CDCMainFrameTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CDCMainFrameTest.java 3 Jul 2002 09:39:06 -0000 1.4
--- CDCMainFrameTest.java 17 Jul 2002 09:29:59 -0000 1.5
***************
*** 29,39 ****
public void testComponentPresent() {
- // empty testcase until we found a solution to test GUI on UNIX server
-
assertNotNull( frame.mainMenu);
- /*
assertNotNull( frame.directoryTree);
assertNotNull( frame.filesTable);
- */
}
--- 29,35 ----
|
|
From: <sim...@us...> - 2002-07-17 09:30:03
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv14962/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java
Log Message:
Let the txt files under testcase have no newline, so that
their sizes on linux and windows will be the same.
Add some gui actions too.
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CDCMainFrame.java 2 Jul 2002 10:41:30 -0000 1.2
--- CDCMainFrame.java 17 Jul 2002 09:29:58 -0000 1.3
***************
*** 8,12 ****
import javax.swing.*;
! import java.awt.event.WindowEvent;
import java.awt.*;
--- 8,13 ----
import javax.swing.*;
! import javax.swing.border.EtchedBorder;
! import java.awt.event.*;
import java.awt.*;
***************
*** 24,27 ****
--- 25,29 ----
JTree directoryTree = new JTree();
JTable filesTable = new JTable();
+ JSplitPane mainPane = new JSplitPane();
public CDCMainFrame() {
***************
*** 36,44 ****
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");
--- 38,57 ----
private void jbInit() throws Exception {
//setIconImage(Toolkit.getDefaultToolkit().createImage(Frame3.class.getResource("[Your Icon]")));
+ this.setSize(new Dimension(640, 480));
+ this.setTitle("CDChamber");
+
+ initMenuBar();
+
contentPane = (JPanel) this.getContentPane();
contentPane.setLayout(borderLayout1);
+
+ contentPane.add( BorderLayout.CENTER, mainPane);
+ mainPane.setBorder( new EtchedBorder());
+ mainPane.add( JSplitPane.LEFT, directoryTree);
+ mainPane.add( JSplitPane.RIGHT, filesTable);
+ }
+
+ private void initMenuBar() {
this.setJMenuBar(mainMenu);
cdromMenu.setMnemonic('C');
cdromMenu.setText("CDrom");
***************
*** 53,56 ****
--- 66,74 ----
cdromExitMenuItem.setMnemonic('X');
cdromExitMenuItem.setText("Exit");
+ cdromExitMenuItem.addActionListener( new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ cdromExit_actionPerformed();
+ }
+ });
mainMenu.add(cdromMenu);
mainMenu.add(helpMenu);
***************
*** 62,69 ****
}
protected void processWindowEvent(WindowEvent e) {
super.processWindowEvent(e);
if (e.getID() == WindowEvent.WINDOW_CLOSING) {
! System.exit(0);
}
}
--- 80,91 ----
}
+ private void cdromExit_actionPerformed() {
+ System.exit(0);
+ }
+
protected void processWindowEvent(WindowEvent e) {
super.processWindowEvent(e);
if (e.getID() == WindowEvent.WINDOW_CLOSING) {
! cdromExit_actionPerformed();
}
}
|
|
From: <sim...@us...> - 2002-07-17 08:18:57
|
Update of /cvsroot/cdchamber/CDChamber In directory usw-pr-cvs1:/tmp/cvs-serv18498 Modified Files: TODO.txt Log Message: GUI Testcases needed. Index: TODO.txt =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/TODO.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TODO.txt 27 Jun 2002 03:15:28 -0000 1.8 --- TODO.txt 17 Jul 2002 08:18:50 -0000 1.9 *************** *** 9,11 **** + : write FileType testcases + : Code Standard should be wrote. ! + : Add filter to ignore files/dirs like CVS, *.bak, *~, etc. \ No newline at end of file --- 9,12 ---- + : write FileType testcases + : Code Standard should be wrote. ! + : Add filter to ignore files/dirs like CVS, *.bak, *~, etc. ! + : Add GUI Testcases \ No newline at end of file |
|
From: <cry...@us...> - 2002-07-03 09:39:09
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv22364
Modified Files:
CDCMainFrameTest.java
Log Message:
test for server's gui
Index: CDCMainFrameTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CDCMainFrameTest.java 2 Jul 2002 10:41:31 -0000 1.3
--- CDCMainFrameTest.java 3 Jul 2002 09:39:06 -0000 1.4
***************
*** 20,24 ****
protected void setUp() throws Exception {
super.setUp();
! // frame = new CDCMainFrame();
}
CDCMainFrame frame;
--- 20,24 ----
protected void setUp() throws Exception {
super.setUp();
! frame = new CDCMainFrame();
}
CDCMainFrame frame;
***************
*** 30,35 ****
public void testComponentPresent() {
// empty testcase until we found a solution to test GUI on UNIX server
! /*
assertNotNull( frame.mainMenu);
assertNotNull( frame.directoryTree);
assertNotNull( frame.filesTable);
--- 30,36 ----
public void testComponentPresent() {
// empty testcase until we found a solution to test GUI on UNIX server
!
assertNotNull( frame.mainMenu);
+ /*
assertNotNull( frame.directoryTree);
assertNotNull( frame.filesTable);
|
|
From: <cry...@us...> - 2002-07-03 09:38:08
|
Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv22125
Modified Files:
continuousintegrate.sh acceptance.sh
Log Message:
script special for crystal's machine
Index: continuousintegrate.sh
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/continuousintegrate.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** continuousintegrate.sh 28 Jun 2002 03:22:56 -0000 1.5
--- continuousintegrate.sh 3 Jul 2002 09:38:05 -0000 1.6
***************
*** 1,22 ****
! #!/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
cd $BUILD_DIR/CDChamber
if [[ -n `cvs update -d 2>&1 | egrep -e '^U|^P|^A'` ]]
--- 1,11 ----
! #!/bin/ksh
! . /u/yangjing/.kshrc
! . /u/yangjing/.profile
! PROJECTHOME=/u/yangjing/CDChamber
! BUILD_DIR=$PROJECTHOME
PROJECT_LIB_DIR=$BUILD_DIR/CDChamber/lib
! CLASSPATH=$PROJECT_LIB_DIR:$CLASSPATH
! export CLASSPATH BUILD_DIR
cd $BUILD_DIR/CDChamber
if [[ -n `cvs update -d 2>&1 | egrep -e '^U|^P|^A'` ]]
***************
*** 35,42 ****
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
--- 24,31 ----
if [[ -n `grep 'BUILD FAILED' $BUILD_DIR/log/build.log` ]]
then
! $BUILD_DIR/remote-mailx "Build Failed!" 2>&1 > /dev/null
elif [[ -n `grep 'BUILD FAILED' $BUILD_DIR/log/build.log.old` ]]
then
! $BUILD_DIR/remote-mailx "Build Fixed! Build Number:$build_number" 2>&1 > /dev/null
fi
cp $BUILD_DIR/log/build.log $BUILD_DIR/log/build.log.old
Index: acceptance.sh
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/script/acceptance.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** acceptance.sh 1 Jul 2002 07:18:53 -0000 1.3
--- acceptance.sh 3 Jul 2002 09:38:05 -0000 1.4
***************
*** 1,5 ****
! #!/bin/bash
cd $BUILD_DIR/CDChamber
! java org.apache.tools.ant.Main jar 2>&1
if [[ -f $BUILD_DIR/CDChamber/build/lib/CDChamber.jar ]]
then
--- 1,5 ----
! #!/bin/ksh
cd $BUILD_DIR/CDChamber
! ant jar 2>&1
if [[ -f $BUILD_DIR/CDChamber/build/lib/CDChamber.jar ]]
then
***************
*** 10,12 ****
fi
cd $BUILD_DIR/CDChamber
! java org.apache.tools.ant.Main clean 2>&1
--- 10,12 ----
fi
cd $BUILD_DIR/CDChamber
! ant clean 2>&1
|
|
From: <cry...@us...> - 2002-07-03 09:32:41
|
Update of /cvsroot/cdchamber/CDChamber/acceptance/case1/check In directory usw-pr-cvs1:/tmp/cvs-serv20560 Modified Files: repository.xml Log Message: crystal's machine date with repository.xml Index: repository.xml =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/acceptance/case1/check/repository.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** repository.xml 28 Jun 2002 01:53:27 -0000 1.1 --- repository.xml 3 Jul 2002 09:32:38 -0000 1.2 *************** *** 1,2 **** <?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> \ No newline at end of file --- 1,2 ---- <?xml version="1.0" encoding="UTF-8"?> ! <directory-type files-count="2" date="1025685715000" size="2" valid="true"><name>foo</name><files files-count="1" date="1025685715000" 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="1025685715000" size="1" valid="true"><name>world</name></files><content></content></files><files date="1025685715000" size="1" valid="true"><name>hello</name></files><content></content></directory-type> \ No newline at end of file |
|
From: <sim...@us...> - 2002-07-02 10:41:35
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv20342/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java
Log Message:
Add loadData testcase, but comment them because the build server can't test GUI yet.
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CDCMainFrame.java 29 Jun 2002 12:39:46 -0000 1.1
--- CDCMainFrame.java 2 Jul 2002 10:41:30 -0000 1.2
***************
*** 22,25 ****
--- 22,27 ----
JMenuItem helpAboutMenuItem = new JMenuItem();
JMenuItem cdromExitMenuItem = new JMenuItem();
+ JTree directoryTree = new JTree();
+ JTable filesTable = new JTable();
public CDCMainFrame() {
|
|
From: <sim...@us...> - 2002-07-02 10:41:35
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv20342/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameTest.java
Log Message:
Add loadData testcase, but comment them because the build server can't test GUI yet.
Index: CDCMainFrameTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CDCMainFrameTest.java 1 Jul 2002 07:05:05 -0000 1.2
--- CDCMainFrameTest.java 2 Jul 2002 10:41:31 -0000 1.3
***************
*** 8,11 ****
--- 8,15 ----
import junit.framework.TestCase;
+ import org.cdchamber.elements.DirectoryType;
+ import org.cdchamber.elements.FileType;
+
+ import java.util.Vector;
public class CDCMainFrameTest extends TestCase {
***************
*** 16,20 ****
--- 20,26 ----
protected void setUp() throws Exception {
super.setUp();
+ // frame = new CDCMainFrame();
}
+ CDCMainFrame frame;
protected void tearDown() throws Exception {
***************
*** 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);
}
}
--- 29,49 ----
public void testComponentPresent() {
! // empty testcase until we found a solution to test GUI on UNIX server
! /*
! assertNotNull( frame.mainMenu);
! assertNotNull( frame.directoryTree);
! assertNotNull( frame.filesTable);
! */
! }
!
! public void testDataLoad() {
! /*
! DirectoryType root = (DirectoryType)frame.directoryTree.getModel().getRoot();
! FileType []files = root.getFiles();
! Vector dirDatas = loadFromDataDir();
! for ( int i=0; i<files.length; i++) {
! if ( !dirDatas.contains( files[i])) fail( "Should contain all data files in the tree");
! }
! */
}
}
|
|
From: <cry...@us...> - 2002-07-02 08:33:30
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv12189
Modified Files:
build.xml
Log Message:
jar normal class first, then aspect class
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** build.xml 2 Jul 2002 08:14:51 -0000 1.20
--- build.xml 2 Jul 2002 08:33:25 -0000 1.21
***************
*** 68,72 ****
<src>
<pathelement path="${aspect.src}"/>
- <!-- <pathelement path="${src.dir}"/> -->
</src>
<classpath>
--- 68,71 ----
***************
*** 105,110 ****
<target name="jar" depends="test.run" description="Jar the classes files">
<jar jarfile="${jar.dir}/CDChamber.jar">
- <fileset dir="${aspect.classes}"/>
<fileset dir="${build.dest}"/>
</jar>
</target>
--- 104,109 ----
<target name="jar" depends="test.run" description="Jar the classes files">
<jar jarfile="${jar.dir}/CDChamber.jar">
<fileset dir="${build.dest}"/>
+ <fileset dir="${aspect.classes}"/>
</jar>
</target>
|
|
From: <cry...@us...> - 2002-07-02 08:27:29
|
Update of /cvsroot/cdchamber/CDChamber/acceptance/case1 In directory usw-pr-cvs1:/tmp/cvs-serv10318 Modified Files: execute Log Message: check if the output file exists Index: execute =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/acceptance/case1/execute,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** execute 28 Jun 2002 02:16:49 -0000 1.2 --- execute 2 Jul 2002 08:27:25 -0000 1.3 *************** *** 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 --- 1,10 ---- #!/bin/bash ! java -cp $BUILD_DIR/CDChamber/build/lib/CDChamber.jar:$CLASSPATH org.cdchamber.Main -i $PWD/foo -o $PWD/repository.xml 2>&1 ! if [[ -f $PWD/repository.xml && -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-07-02 08:14:55
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv6371
Modified Files:
build.xml
Log Message:
jar file include build/classes as well as build/aspect
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** build.xml 1 Jul 2002 07:08:52 -0000 1.19
--- build.xml 2 Jul 2002 08:14:51 -0000 1.20
***************
*** 106,109 ****
--- 106,110 ----
<jar jarfile="${jar.dir}/CDChamber.jar">
<fileset dir="${aspect.classes}"/>
+ <fileset dir="${build.dest}"/>
</jar>
</target>
|
|
From: <cry...@us...> - 2002-07-01 07:18:56
|
Update of /cvsroot/cdchamber/CDChamber/script In directory usw-pr-cvs1:/tmp/cvs-serv10556 Modified Files: acceptance.sh Log Message: add jar file check in acceptance Index: acceptance.sh =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/script/acceptance.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** acceptance.sh 28 Jun 2002 03:06:01 -0000 1.2 --- acceptance.sh 1 Jul 2002 07:18:53 -0000 1.3 *************** *** 2,7 **** 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 2>&1 cd $BUILD_DIR/CDChamber java org.apache.tools.ant.Main clean 2>&1 --- 2,12 ---- cd $BUILD_DIR/CDChamber java org.apache.tools.ant.Main jar 2>&1 ! if [[ -f $BUILD_DIR/CDChamber/build/lib/CDChamber.jar ]] ! then ! cd $BUILD_DIR/CDChamber/acceptance/case1 ! $BUILD_DIR/CDChamber/acceptance/case1/execute 2>&1 ! else ! echo "BUILD FAILED,jar file is not successfully generated" ! fi cd $BUILD_DIR/CDChamber java org.apache.tools.ant.Main clean 2>&1 |
|
From: <cry...@us...> - 2002-07-01 07:08:54
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv8077
Modified Files:
build.xml
Log Message:
remove the declaration about awt.headless
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** build.xml 1 Jul 2002 07:01:02 -0000 1.18
--- build.xml 1 Jul 2002 07:08:52 -0000 1.19
***************
*** 92,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" />
--- 92,95 ----
|
