bodewig 2004/12/16 06:01:40
Modified: src/main/org/apache/tools/ant/types Path.java
src/main/org/apache/tools/ant/util JavaEnvUtils.java
src/testcases/org/apache/tools/ant/filters
ConcatFilterTest.java DynamicFilterTest.java
TokenFilterTest.java
src/testcases/org/apache/tools/ant/taskdefs CVSPassTest.java
ConcatTest.java ExecTaskTest.java
ExecuteOnTest.java ManifestTest.java
ParallelTest.java SQLExecTest.java StyleTest.java
XmlPropertyTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional/depend
DependTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional/junit
XMLFormatterWithCDATAOnSystemOut.java
src/testcases/org/apache/tools/ant/taskdefs/optional/sos
SOSTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional/vss
MSVSSTest.java
src/testcases/org/apache/tools/ant/types/selectors
ModifiedSelectorTest.java
Log:
Jikes again: shadows, some private finals that could be static and statics
used as instance methods
Revision Changes Path
1.66 +1 -1 ant/src/main/org/apache/tools/ant/types/Path.java
Index: Path.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Path.java 7 Dec 2004 22:14:13 -0000 1.65
+++ Path.java 16 Dec 2004 14:01:37 -0000 1.66
@@ -574,7 +574,7 @@
* Add the Java Runtime classes to this Path instance.
*/
public void addJavaRuntime() {
- if ("Kaffe".equals(System.getProperty("java.vm.name"))) {
+ if (JavaEnvUtils.isKaffe()) {
// newer versions of Kaffe (1.1.1+) won't have this,
// but this will be sorted by FileSet anyway.
File kaffeShare = new File(System.getProperty("java.home")
1.23 +20 -0 ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
Index: JavaEnvUtils.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JavaEnvUtils.java 22 Nov 2004 09:23:37 -0000 1.22
+++ JavaEnvUtils.java 16 Dec 2004 14:01:37 -0000 1.23
@@ -67,6 +67,9 @@
/** Version constant for Java 1.5 */
public static final String JAVA_1_5 = "1.5";
+ /** Whether this is the Kaffe VM */
+ private static boolean kaffeDetected;
+
/** array of packages in the runtime */
private static Vector jrePackages;
@@ -103,6 +106,13 @@
// swallow as we've hit the max class version that
// we have
}
+ kaffeDetected = false;
+ try {
+ Class.forName("kaffe.util.NotImplemented");
+ kaffeDetected = true;
+ } catch (Throwable t) {
+ // swallow as this simply doesn't seem to be Kaffe
+ }
}
/**
@@ -123,6 +133,16 @@
*/
public static boolean isJavaVersion(String version) {
return javaVersion.equals(version);
+ }
+
+ /**
+ * Checks whether the current Java VM is Kaffe.
+ * @return true if the current Java VM is Kaffe.
+ * @since Ant 1.6.3
+ * @see http://www.kaffe.org/
+ */
+ public static boolean isKaffe() {
+ return kaffeDetected;
}
/**
1.12 +1 -1
ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
Index: ConcatFilterTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ConcatFilterTest.java 13 May 2004 07:01:49 -0000 1.11
+++ ConcatFilterTest.java 16 Dec 2004 14:01:37 -0000 1.12
@@ -142,7 +142,7 @@
try {
File file = getProject().resolveFile(filename);
java.io.FileReader rdr = new java.io.FileReader(file);
- content = fu.readFully(rdr);
+ content = FileUtils.readFully(rdr);
rdr.close();
rdr = null;
} catch (Exception e) {
1.6 +1 -1
ant/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java
Index: DynamicFilterTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DynamicFilterTest.java 9 Mar 2004 16:48:56 -0000 1.5
+++ DynamicFilterTest.java 16 Dec 2004 14:01:37 -0000 1.6
@@ -68,7 +68,7 @@
Reader r = null;
try {
r = new FileReader(getProject().resolveFile(filename));
- return FileUtils.newFileUtils().readFully(r);
+ return FileUtils.readFully(r);
}
finally {
try {r.close();} catch (Throwable ignore) {}
1.9 +1 -1
ant/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
Index: TokenFilterTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TokenFilterTest.java 9 Mar 2004 16:48:56 -0000 1.8
+++ TokenFilterTest.java 16 Dec 2004 14:01:37 -0000 1.9
@@ -248,7 +248,7 @@
Reader r = null;
try {
r = new FileReader(getProject().resolveFile(filename));
- return FileUtils.newFileUtils().readFully(r);
+ return FileUtils.readFully(r);
}
finally {
try {r.close();} catch (Throwable ignore) {}
1.11 +3 -3
ant/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java
Index: CVSPassTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CVSPassTest.java 9 Mar 2004 16:48:57 -0000 1.10
+++ CVSPassTest.java 16 Dec 2004 14:01:37 -0000 1.11
@@ -27,11 +27,11 @@
*/
public class CVSPassTest extends BuildFileTest {
private final String EOL = System.getProperty("line.separator");
- private final String JAKARTA_URL =
+ private static final String JAKARTA_URL =
":pserver:[EMAIL PROTECTED]:/home/cvspublic Ay=0=h<Z";
- private final String XML_URL =
+ private static final String XML_URL =
":pserver:[EMAIL PROTECTED]:/home/cvspublic Ay=0=h<Z";
- private final String TIGRIS_URL =
+ private static final String TIGRIS_URL =
":pserver:[EMAIL PROTECTED]:/cvs AIbdZ,";
1.12 +1 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/ConcatTest.java
Index: ConcatTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ConcatTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ConcatTest.java 9 Mar 2004 16:48:57 -0000 1.11
+++ ConcatTest.java 16 Dec 2004 14:01:37 -0000 1.12
@@ -240,7 +240,7 @@
Reader r = null;
try {
r = new FileReader(getProject().resolveFile(filename));
- return FileUtils.newFileUtils().readFully(r);
+ return FileUtils.readFully(r);
}
finally {
try {r.close();} catch (Throwable ignore) {}
1.17 +4 -4
ant/src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java
Index: ExecTaskTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ExecTaskTest.java 7 Dec 2004 09:10:38 -0000 1.16
+++ ExecTaskTest.java 16 Dec 2004 14:01:37 -0000 1.17
@@ -34,10 +34,10 @@
public class ExecTaskTest extends BuildFileTest {
private static final String BUILD_PATH =
"src/etc/testcases/taskdefs/exec/";
private static final String BUILD_FILE = BUILD_PATH + "exec.xml";
- private final int TIME_TO_WAIT = 1;
+ private static final int TIME_TO_WAIT = 1;
/** maximum time allowed for the build in milliseconds */
- private final int MAX_BUILD_TIME = 4000;
- private final int SECURITY_MARGIN = 2000; // wait 2 second extras
+ private static final int MAX_BUILD_TIME = 4000;
+ private static final int SECURITY_MARGIN = 2000; // wait 2 second extras
// the test failed with 100 ms of margin on cvs.apache.org on August
1st, 2003
private File logFile;
private MonitoredBuild myBuild = null;
@@ -465,7 +465,7 @@
FileReader reader = null;
try {
reader = new FileReader(getProject().resolveFile(filename));
- result = FileUtils.newFileUtils().readFully(reader);
+ result = FileUtils.readFully(reader);
} catch (IOException eyeOhEx) {
} finally {
if (reader != null) {
1.9 +1 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java
Index: ExecuteOnTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExecuteOnTest.java 16 Nov 2004 21:46:46 -0000 1.8
+++ ExecuteOnTest.java 16 Dec 2004 14:01:37 -0000 1.9
@@ -564,7 +564,7 @@
FileReader reader = null;
try {
reader = new FileReader(getProject().resolveFile(filename));
- result = FileUtils.newFileUtils().readFully(reader);
+ result = FileUtils.readFully(reader);
} finally {
if (reader != null) {
try {
1.16 +2 -2
ant/src/testcases/org/apache/tools/ant/taskdefs/ManifestTest.java
Index: ManifestTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ManifestTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ManifestTest.java 7 Dec 2004 09:10:38 -0000 1.15
+++ ManifestTest.java 16 Dec 2004 14:01:37 -0000 1.16
@@ -191,8 +191,8 @@
* Tets long line wrapping
*/
public void testLongLine() throws IOException, ManifestException {
- Project project = getProject();
- project.setUserProperty("test.longline", LONG_LINE);
+ Project p = getProject();
+ p.setUserProperty("test.longline", LONG_LINE);
executeTarget("testLongLine");
Manifest manifest = getManifest(EXPANDED_MANIFEST);
1.11 +14 -14
ant/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java
Index: ParallelTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ParallelTest.java 9 Mar 2004 16:48:57 -0000 1.10
+++ ParallelTest.java 16 Dec 2004 14:01:37 -0000 1.11
@@ -58,9 +58,9 @@
/** tests basic operation of the parallel task */
public void testBasic() {
// should get no output at all
- Project project = getProject();
- project.setUserProperty("test.direct", DIRECT_MESSAGE);
- project.setUserProperty("test.delayed", DELAYED_MESSAGE);
+ Project p = getProject();
+ p.setUserProperty("test.direct", DIRECT_MESSAGE);
+ p.setUserProperty("test.delayed", DELAYED_MESSAGE);
expectOutputAndError("testBasic", "", "");
String log = getLog();
assertEquals("parallel tasks didn't output correct data", log,
@@ -71,9 +71,9 @@
/** tests basic operation of the parallel task */
public void testThreadCount() {
// should get no output at all
- Project project = getProject();
- project.setUserProperty("test.direct", DIRECT_MESSAGE);
- project.setUserProperty("test.delayed", DELAYED_MESSAGE);
+ Project p = getProject();
+ p.setUserProperty("test.direct", DIRECT_MESSAGE);
+ p.setUserProperty("test.delayed", DELAYED_MESSAGE);
expectOutputAndError("testThreadCount", "", "");
String log = getLog();
int pos = 0;
@@ -126,24 +126,24 @@
/** tests the failure of a task within a parallel construction */
public void testFail() {
// should get no output at all
- Project project = getProject();
- project.setUserProperty("test.failure", FAILURE_MESSAGE);
- project.setUserProperty("test.delayed", DELAYED_MESSAGE);
+ Project p = getProject();
+ p.setUserProperty("test.failure", FAILURE_MESSAGE);
+ p.setUserProperty("test.delayed", DELAYED_MESSAGE);
expectBuildExceptionContaining("testFail",
"fail task in one parallel branch", FAILURE_MESSAGE);
}
/** tests the demuxing of output streams in a multithreaded situation */
public void testDemux() {
- Project project = getProject();
- project.addTaskDefinition("demuxtest", DemuxOutputTask.class);
+ Project p = getProject();
+ p.addTaskDefinition("demuxtest", DemuxOutputTask.class);
PrintStream out = System.out;
PrintStream err = System.err;
- System.setOut(new PrintStream(new DemuxOutputStream(project,
false)));
- System.setErr(new PrintStream(new DemuxOutputStream(project, true)));
+ System.setOut(new PrintStream(new DemuxOutputStream(p, false)));
+ System.setErr(new PrintStream(new DemuxOutputStream(p, true)));
try {
- project.executeTarget("testDemux");
+ p.executeTarget("testDemux");
} finally {
System.setOut(out);
System.setErr(err);
1.9 +6 -6
ant/src/testcases/org/apache/tools/ant/taskdefs/SQLExecTest.java
Index: SQLExecTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/SQLExecTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SQLExecTest.java 9 Mar 2004 16:48:57 -0000 1.8
+++ SQLExecTest.java 16 Dec 2004 14:01:37 -0000 1.9
@@ -59,12 +59,12 @@
protected void setUp() throws Exception {
// make sure the cache is cleared.
- SQLExec.getLoaderMap().clear();
+ JDBCTask.getLoaderMap().clear();
}
// simple test to ensure that the caching does work...
public void testDriverCaching(){
- SQLExec sql = createTask(getProperties(NULL));
+ SQLExec sql = createTask(getProperties(NULL));
assertTrue(!SQLExec.getLoaderMap().containsKey(NULL_DRIVER));
try {
sql.execute();
@@ -72,20 +72,20 @@
assertTrue(e.getException().getMessage().indexOf("No suitable
Driver") != -1);
}
assertTrue(SQLExec.getLoaderMap().containsKey(NULL_DRIVER));
- assertSame(sql.getLoader(), SQLExec.getLoaderMap().get(NULL_DRIVER));
+ assertSame(sql.getLoader(),
JDBCTask.getLoaderMap().get(NULL_DRIVER));
ClassLoader loader1 = sql.getLoader();
// 2nd run..
sql = createTask(getProperties(NULL));
// the driver must still be cached.
- assertTrue(sql.getLoaderMap().containsKey(NULL_DRIVER));
+ assertTrue(JDBCTask.getLoaderMap().containsKey(NULL_DRIVER));
try {
sql.execute();
} catch (BuildException e){
assertTrue(e.getException().getMessage().indexOf("No suitable
Driver") != -1);
}
- assertTrue(sql.getLoaderMap().containsKey(NULL_DRIVER));
- assertSame(sql.getLoader(), sql.getLoaderMap().get(NULL_DRIVER));
+ assertTrue(JDBCTask.getLoaderMap().containsKey(NULL_DRIVER));
+ assertSame(sql.getLoader(),
JDBCTask.getLoaderMap().get(NULL_DRIVER));
assertSame(loader1, sql.getLoader());
}
1.12 +1 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java
Index: StyleTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StyleTest.java 16 Apr 2004 08:36:01 -0000 1.11
+++ StyleTest.java 16 Dec 2004 14:01:37 -0000 1.12
@@ -108,7 +108,7 @@
Reader r = null;
try {
r = new FileReader(getProject().resolveFile(filename));
- return FileUtils.newFileUtils().readFully(r);
+ return FileUtils.readFully(r);
}
finally {
try {r.close();} catch (Throwable ignore) {}
1.16 +9 -9
ant/src/testcases/org/apache/tools/ant/taskdefs/XmlPropertyTest.java
Index: XmlPropertyTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/XmlPropertyTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XmlPropertyTest.java 11 Dec 2004 22:43:05 -0000 1.15
+++ XmlPropertyTest.java 16 Dec 2004 14:01:37 -0000 1.16
@@ -141,10 +141,10 @@
// System.out.println(msg + " (" +
propertyFile.getName() + ") in (" + workingDir + ")");
- Project project = new Project();
+ Project p = new Project();
XmlProperty xmlproperty = new XmlProperty();
- xmlproperty.setProject(project);
+ xmlproperty.setProject(p);
xmlproperty.setFile(inputFile);
xmlproperty.setKeeproot(keepRoot);
@@ -156,17 +156,17 @@
// Set a property on the project to make sure that loading
// a property with the same name from an xml file will
// *not* change it.
- project.setNewProperty("override.property.test", "foo");
+ p.setNewProperty("override.property.test", "foo");
xmlproperty.execute();
Properties props = new Properties();
props.load(new FileInputStream(propertyFile));
- //printProperties(project.getProperties());
+ //printProperties(p.getProperties());
- ensureProperties(msg, inputFile, workingDir, project, props);
- ensureReferences(msg, inputFile, project.getReferences());
+ ensureProperties(msg, inputFile, workingDir, p, props);
+ ensureReferences(msg, inputFile, p.getReferences());
} catch (IOException ex) {
fail(ex.toString());
@@ -181,9 +181,9 @@
* to generic Project/Task configuration.
*/
private static void ensureProperties (String msg, File inputFile,
- File workingDir, Project project,
+ File workingDir, Project p,
Properties properties) {
- Hashtable xmlproperties = project.getProperties();
+ Hashtable xmlproperties = p.getProperties();
// Every key identified by the Properties must have been loaded.
Enumeration propertyKeyEnum = properties.propertyNames();
while(propertyKeyEnum.hasMoreElements()){
@@ -202,7 +202,7 @@
// We don't have an adequate way of testing the actual
// *value* of the Path object, though...
String id = currentKey;
- Object obj = project.getReferences().get(id);
+ Object obj = p.getReferences().get(id);
if ( obj == null ) {
fail(assertMsg + " Object ID does not exist.");
1.15 +1 -6
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java
Index: DependTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DependTest.java 9 Mar 2004 16:49:02 -0000 1.14
+++ DependTest.java 16 Dec 2004 14:01:39 -0000 1.15
@@ -55,7 +55,6 @@
* Test direct dependency removal
*/
public void testDirect() {
- Project project = getProject();
executeTarget("testdirect");
Hashtable files = getResultFiles();
assertEquals("Depend did not leave correct number of files", 3,
@@ -70,7 +69,6 @@
* Test dependency traversal (closure)
*/
public void testClosure() {
- Project project = getProject();
executeTarget("testclosure");
Hashtable files = getResultFiles();
assertEquals("Depend did not leave correct number of files", 2,
@@ -83,7 +81,6 @@
* Test that inner class dependencies trigger deletion of the outer class
*/
public void testInner() {
- Project project = getProject();
executeTarget("testinner");
assertEquals("Depend did not leave correct number of files", 0,
getResultFiles().size());
@@ -94,7 +91,6 @@
* the outer class
*/
public void testInnerInner() {
- Project project = getProject();
executeTarget("testinnerinner");
assertEquals("Depend did not leave correct number of files", 0,
getResultFiles().size());
@@ -123,7 +119,7 @@
* fileset
*/
private Hashtable getResultFiles() {
- FileSet resultFileSet =
(FileSet)project.getReference(RESULT_FILESET);
+ FileSet resultFileSet = (FileSet)
project.getReference(RESULT_FILESET);
DirectoryScanner scanner =
resultFileSet.getDirectoryScanner(project);
String[] scannedFiles = scanner.getIncludedFiles();
Hashtable files = new Hashtable();
@@ -139,7 +135,6 @@
* deleted
*/
public void testInnerClosure() {
- Project project = getProject();
executeTarget("testinnerclosure");
assertEquals("Depend did not leave correct number of files", 4,
getResultFiles().size());
1.5 +1 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/XMLFormatterWithCDATAOnSystemOut.java
Index: XMLFormatterWithCDATAOnSystemOut.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/XMLFormatterWithCDATAOnSystemOut.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLFormatterWithCDATAOnSystemOut.java 9 Feb 2004 21:05:44 -0000
1.4
+++ XMLFormatterWithCDATAOnSystemOut.java 16 Dec 2004 14:01:39 -0000
1.5
@@ -61,7 +61,7 @@
FileReader reader = null;
try {
reader = new FileReader(f);
- String content = FileUtils.newFileUtils().readFully(reader);
+ String content = FileUtils.readFully(reader);
assertTrue(content.indexOf("</RESPONSE>]]>"
+ "</ERROR>") > 0);
} finally {
1.11 +0 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java
Index: SOSTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SOSTest.java 9 Mar 2004 16:49:03 -0000 1.10
+++ SOSTest.java 16 Dec 2004 14:01:39 -0000 1.11
@@ -30,7 +30,6 @@
*/
public class SOSTest extends BuildFileTest {
- private Project project;
private Commandline commandline;
private static final String VSS_SERVER_PATH =
"\\\\server\\vss\\srcsafe.ini";
1.8 +0 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java
Index: MSVSSTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MSVSSTest.java 9 Mar 2004 16:49:04 -0000 1.7
+++ MSVSSTest.java 16 Dec 2004 14:01:40 -0000 1.8
@@ -35,7 +35,6 @@
*/
public class MSVSSTest extends BuildFileTest implements MSVSSConstants {
- private Project project;
private Commandline commandline;
private static final String VSS_SERVER_PATH =
"\\\\server\\vss\\srcsafe.ini";
1.11 +0 -3
ant/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
Index: ModifiedSelectorTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ModifiedSelectorTest.java 13 Jul 2004 14:20:42 -0000 1.10
+++ ModifiedSelectorTest.java 16 Dec 2004 14:01:40 -0000 1.11
@@ -330,7 +330,6 @@
/** Checks whether a cache file is created. */
public void testCreatePropertiesCacheDirect() {
- File basedir = getSelector().getProject().getBaseDir();
File cachefile = new File(basedir, "cachefile.properties");
PropertiesfileCache cache = new PropertiesfileCache();
@@ -348,7 +347,6 @@
/** Checks whether a cache file is created. */
public void testCreatePropertiesCacheViaModifiedSelector() {
- File basedir = getSelector().getProject().getBaseDir();
File cachefile = new File(basedir, "cachefile.properties");
try {
@@ -826,7 +824,6 @@
public void doScenarioTest(String target, String cachefilename) {
BFT bft = new BFT();
bft.setUp();
- File basedir = bft.getProject().getBaseDir();
File cachefile = new File(basedir, cachefilename);
try {
// do the actions
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
