scripts > buildfiles
diff --git a/ant/org.eclipse.ant.tests.core/build.properties b/ant/org.eclipse.ant.tests.core/build.properties
index 32d7d6e..b5a6a8b 100644
--- a/ant/org.eclipse.ant.tests.core/build.properties
+++ b/ant/org.eclipse.ant.tests.core/build.properties
@@ -12,7 +12,7 @@
plugin.properties,\
test.xml,\
about.html,\
- testscripts/,\
+ testbuildfiles/,\
testresources/,\
testlib/,\
lib/,\
@@ -21,5 +21,5 @@
source.anttestscore.jar = test plugin/,\
tests/,\
- scripts/
+ buildfiles/
source.lib/antTestsSupport.jar = test support/
diff --git a/ant/org.eclipse.ant.tests.core/scripts/buildAntTestsSupportJAR.xml b/ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml
similarity index 100%
rename from ant/org.eclipse.ant.tests.core/scripts/buildAntTestsSupportJAR.xml
rename to ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml
diff --git a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java
index e69159f..56abbf1 100644
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java
+++ b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java
@@ -39,12 +39,6 @@
private List projects= new ArrayList();
- private String currentProject;
-
- private String currentTask;
-
- private String currentTarget;
-
private Hashtable userProperties;
private List nameOfListeners= new ArrayList();
@@ -81,7 +75,6 @@
public void buildStarted(String projectName) {
buildsStartedCount++;
projects.add(projectName);
- currentProject= projectName;
}
@@ -187,9 +180,6 @@
targets= new ArrayList();
projects= new ArrayList();
userProperties= null;
- currentProject= null;
- currentTarget= null;
- currentTask= null;
nameOfListeners= new ArrayList();
}
diff --git a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
index 0563fda..60132c3 100644
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
+++ b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
@@ -26,7 +26,7 @@
*/
public class ProjectHelper {
- public static final IPath TEST_SCRIPTS_DIR= new Path("testscripts");
+ public static final IPath TEST_BUILDFILES_DIR= new Path("testbuildfiles");
public static final IPath TEST_RESOURCES_DIR= new Path("testresources");
public static final IPath TEST_LIB_DIR= new Path("testlib");
diff --git a/ant/org.eclipse.ant.tests.core/testscripts/Bug32551.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/Bug32551.xml
similarity index 100%
rename from ant/org.eclipse.ant.tests.core/testscripts/Bug32551.xml
rename to ant/org.eclipse.ant.tests.core/testbuildfiles/Bug32551.xml
diff --git a/ant/org.eclipse.ant.tests.core/testscripts/Bug34663.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/Bug34663.xml
similarity index 100%
rename from ant/org.eclipse.ant.tests.core/testscripts/Bug34663.xml
rename to ant/org.eclipse.ant.tests.core/testbuildfiles/Bug34663.xml
diff --git a/ant/org.eclipse.ant.tests.core/testscripts/ClasspathOrdering.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/ClasspathOrdering.xml
similarity index 100%
rename from ant/org.eclipse.ant.tests.core/testscripts/ClasspathOrdering.xml
rename to ant/org.eclipse.ant.tests.core/testbuildfiles/ClasspathOrdering.xml
diff --git a/ant/org.eclipse.ant.tests.core/testscripts/CustomTask.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/CustomTask.xml
similarity index 100%
rename from ant/org.eclipse.ant.tests.core/testscripts/CustomTask.xml
rename to ant/org.eclipse.ant.tests.core/testbuildfiles/CustomTask.xml
diff --git a/ant/org.eclipse.ant.tests.core/testscripts/CustomType.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/CustomType.xml
similarity index 100%
rename from ant/org.eclipse.ant.tests.core/testscripts/CustomType.xml
rename to ant/org.eclipse.ant.tests.core/testbuildfiles/CustomType.xml
diff --git a/ant/org.eclipse.ant.tests.core/testscripts/NoDefault.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/NoDefault.xml
similarity index 100%
rename from ant/org.eclipse.ant.tests.core/testscripts/NoDefault.xml
rename to ant/org.eclipse.ant.tests.core/testbuildfiles/NoDefault.xml
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/TestForEcho.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/TestForEcho.xml
new file mode 100644
index 0000000..2213e5e
--- /dev/null
+++ b/ant/org.eclipse.ant.tests.core/testbuildfiles/TestForEcho.xml
@@ -0,0 +1,11 @@
+<project name="Echo Test" default="Test for Echo" basedir=".">
+ <target name="init">
+ <tstamp/>
+ </target>
+
+ <target name="Test for Echo" description= "Calls other echos" depends="init">
+ <ant antfile="buildfiles/echoing.xml" dir="../../AntTests" target="echo1"/>
+ <ant antfile="buildfiles/echoing.xml" dir="../../AntTests" target="echo2"/>
+ <ant antfile="buildfiles/echoing.xml" dir="../../AntTests" target="echo3"/>
+ </target>
+</project>
diff --git a/ant/org.eclipse.ant.tests.core/testscripts/build.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/build.xml
similarity index 100%
rename from ant/org.eclipse.ant.tests.core/testscripts/build.xml
rename to ant/org.eclipse.ant.tests.core/testbuildfiles/build.xml
diff --git a/ant/org.eclipse.ant.tests.core/testscripts/echoing.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/echoing.xml
similarity index 100%
rename from ant/org.eclipse.ant.tests.core/testscripts/echoing.xml
rename to ant/org.eclipse.ant.tests.core/testbuildfiles/echoing.xml
diff --git a/ant/org.eclipse.ant.tests.core/testscripts/input.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/input.xml
similarity index 100%
rename from ant/org.eclipse.ant.tests.core/testscripts/input.xml
rename to ant/org.eclipse.ant.tests.core/testbuildfiles/input.xml
diff --git a/ant/org.eclipse.ant.tests.core/testscripts/javac.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/javac.xml
similarity index 100%
rename from ant/org.eclipse.ant.tests.core/testscripts/javac.xml
rename to ant/org.eclipse.ant.tests.core/testbuildfiles/javac.xml
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java
index f4f6fff..8531967 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java
@@ -52,7 +52,7 @@
}
protected IFile getBuildFile(String buildFileName) {
- IFile file = getProject().getFolder("scripts").getFile(buildFileName);
+ IFile file = getProject().getFolder("buildfiles").getFile(buildFileName);
assertTrue("Could not find script file named: " + buildFileName, file.exists());
return file;
}
@@ -65,7 +65,7 @@
protected IFile checkFileExists(String fileName) throws CoreException {
getProject().refreshLocal(IProject.DEPTH_INFINITE, null);
- IFile file = getProject().getFolder("scripts").getFile(fileName);
+ IFile file = getProject().getFolder("buildfiles").getFile(fileName);
assertTrue("Could not find file named: " + fileName, file.exists());
return file;
}
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java
index b358f49..535089f 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java
@@ -33,10 +33,10 @@
if (pro.exists()) {
pro.delete(true, true, null);
}
- // create project and import scripts and support files
+ // create project and import buildfiles and support files
project = ProjectHelper.createProject("AntTests", "bin");
- IFolder folder = ProjectHelper.addFolder(project, "scripts");
- File root = AntTestPlugin.getDefault().getFileInPlugin(ProjectHelper.TEST_SCRIPTS_DIR);
+ IFolder folder = ProjectHelper.addFolder(project, "buildfiles");
+ File root = AntTestPlugin.getDefault().getFileInPlugin(ProjectHelper.TEST_BUILDFILES_DIR);
ProjectHelper.importFilesFromDirectory(root, folder.getFullPath(), null);
folder = ProjectHelper.addFolder(project, "resources");
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
index 3a8e4b2..bf69b53 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
@@ -242,8 +242,8 @@
* Tests specifying the -buildfile
*/
public void testBuildFile() throws CoreException {
- String buildFileName= getProject().getFolder("scripts").getFile("echoing.xml").getLocation().toFile().getAbsolutePath();
- run("TestForEcho.xml", new String[]{"-buildfile", buildFileName}, false, "scripts");
+ String buildFileName= getProject().getFolder("buildfiles").getFile("echoing.xml").getLocation().toFile().getAbsolutePath();
+ run("TestForEcho.xml", new String[]{"-buildfile", buildFileName}, false, "buildfiles");
assertTrue("Should have been 1 tasks, was: " + AntTestChecker.getDefault().getTaskStartedCount(), AntTestChecker.getDefault().getTaskStartedCount() == 1);
}
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java
index 291f6be..19de044 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java
@@ -86,7 +86,7 @@
public void testRunScript() throws CoreException {
run("TestForEcho.xml");
String message= (String)AntTestChecker.getDefault().getMessages().get(0);
- assertTrue("Build file location should be logged as the first message", message != null && message.endsWith("AntTests" + File.separator + "scripts" + File.separator + "TestForEcho.xml"));
+ assertTrue("Build file location should be logged as the first message", message != null && message.endsWith("AntTests" + File.separator + "buildfiles" + File.separator + "TestForEcho.xml"));
assertSuccessful();
}
}
diff --git a/ant/org.eclipse.ant.tests.core/testscripts/TestForEcho.xml b/ant/org.eclipse.ant.tests.core/testscripts/TestForEcho.xml
deleted file mode 100644
index d177497..0000000
--- a/ant/org.eclipse.ant.tests.core/testscripts/TestForEcho.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project name="Echo Test" default="Test for Echo" basedir=".">
- <target name="init">
- <tstamp/>
- </target>
-
- <target name="Test for Echo" description= "Calls other echos" depends="init">
- <ant antfile="scripts/echoing.xml" dir="../../AntTests" target="echo1"/>
- <ant antfile="scripts/echoing.xml" dir="../../AntTests" target="echo2"/>
- <ant antfile="scripts/echoing.xml" dir="../../AntTests" target="echo3"/>
- </target>
-</project>
