svn commit: rev 56560 - in incubator/beehive/trunk/controls/test: infra/tch tools/mantis/src/org/apache/beehive/test/tools/mantis

[js...@apache.org]

Author: jsong
Date: Wed Nov  3 19:25:21 2004
New Revision: 56560

Modified:
   incubator/beehive/trunk/controls/test/infra/tch/schema.jar
   incubator/beehive/trunk/controls/test/infra/tch/tchx.jar
   incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/test/tools/mantis/MantisTask.java
Log:
Reverse changes mande on MantisTask.java by r56407.
Update tchx.jar and schema.jar under test/infra, as a fix of JIRA BEEHIVE-53.
checkin.tests pass.


Modified: incubator/beehive/trunk/controls/test/infra/tch/schema.jar
==============================================================================
Binary files. No diff available.

Modified: incubator/beehive/trunk/controls/test/infra/tch/tchx.jar
==============================================================================
Binary files. No diff available.

Modified: incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/test/tools/mantis/MantisTask.java
==============================================================================
--- incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/test/tools/mantis/MantisTask.java	(original)
+++ incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/test/tools/mantis/MantisTask.java	Wed Nov  3 19:25:21 2004
@@ -33,7 +33,7 @@
   public void setSrcdir(String p_srcdir)
   {
     _srcdir = p_srcdir;
-    fileset.setDir(new File(getProject().getBaseDir(), _srcdir));
+    fileset.setDir(new File(_srcdir));
   }
 
   public void setSrcgen(String p_srcgen)
@@ -86,10 +86,9 @@
     // create the file of all files to process
     // this will allow processing on win32 given it's
     // limitation on command-line length
-    File baseDir = getProject().getBaseDir();
-    File fSrcgen = new File(baseDir, _srcgen);
+    File fSrcgen = new File(_srcgen);
     fSrcgen.mkdirs();
-    DirectoryScanner scanner = getDirectoryScanner(new File(baseDir, _srcdir));
+    DirectoryScanner scanner = getDirectoryScanner(new File(_srcdir));
     String[] files = scanner.getIncludedFiles();
     String filename = _srcgen+P+"files.txt";
     try
@@ -151,20 +150,18 @@
 
   private void logStreams(Process p_proc) throws IOException,InterruptedException
   {
-    File baseDir = getProject().getBaseDir();
-
     // ensure log dir exists
     if(null == _logdir)
       _logdir = _srcgen;
     else
     {
-      File fLogdir = new File(baseDir, _logdir);
+      File fLogdir = new File(_logdir);
       fLogdir.mkdirs();
     }
 
     // capture stderr and stdout to log files
-    StreamCapture stderr = new StreamCapture(p_proc.getErrorStream(),"file", baseDir+P+_logdir+P+"mantis.err");
-    StreamCapture stdout = new StreamCapture(p_proc.getInputStream(),"file", baseDir+P+_logdir+P+"mantis.out");
+    StreamCapture stderr = new StreamCapture(p_proc.getErrorStream(),"file", _logdir+P+"mantis.err");
+    StreamCapture stdout = new StreamCapture(p_proc.getInputStream(),"file", _logdir+P+"mantis.out");
     stderr.start();
     stdout.start();