sbailliez 01/11/16 14:25:59
Modified: src/main/org/apache/tools/ant/taskdefs/optional/sitraka
CovMerge.java
Log:
Use the coverage home directory...not the JProbe home.
Be consistent with other tasks.
May need to refactor some code in an abstract class.
Reported by stefan hardege <[EMAIL PROTECTED]>
Revision Changes Path
1.3 +6 -4
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
Index: CovMerge.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CovMerge.java 2001/10/28 21:30:23 1.2
+++ CovMerge.java 2001/11/16 22:25:59 1.3
@@ -157,14 +157,16 @@
if (tofile == null) {
throw new BuildException("'tofile' attribute must be
set.");
}
- if (home == null) {
- throw new BuildException("'home' attribute must be set
to JProbe Coverage home directory");
+
+ // check coverage home
+ if (home == null || !home.isDirectory() ) {
+ throw new BuildException("Invalid home directory. Must
point to JProbe home directory");
}
+ home = new File(home,"Coverage");
File jar = new File(home, "coverage.jar");
if (!jar.exists()) {
- throw new BuildException("'home' attribute is not set
to Coverage home directory: " + home);
+ throw new BuildException("Cannot find Coverage
directory: " + home);
}
-
}
/** get the snapshots from the filesets */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
