From f4c6f96bae085938e99cf06c3d7007a0845be1b1 Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Thu, 18 Nov 2004 16:25:05 +0000 Subject: [PATCH] 1. Move from optional.repository to tasks.repository 2. rename git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277054 13f79535-47bb-0310-9956-ffa450edef68 --- .../getlibraries.xml => libraries.xml} | 14 +++++------ .../tools/ant/taskdefs/defaults.properties | 2 +- .../repository/AbsentFilesPolicy.java | 4 +-- .../taskdefs/repository/AssertDownloaded.java | 5 ++-- .../repository/BaseLibraryPolicy.java | 6 ++--- .../repository/ForceUpdatePolicy.java | 6 ++--- .../repository/HttpRepository.java | 10 ++++---- .../Libraries.java} | 16 ++++-------- .../{optional => }/repository/Library.java | 3 +-- .../taskdefs/repository/LibraryPolicy.java | 10 +++----- .../repository/MavenRepository.java | 2 +- .../taskdefs/repository/NoUpdatePolicy.java | 4 +-- .../{optional => }/repository/Repository.java | 6 ++--- .../repository/RepositoryRef.java | 2 +- .../repository/ScheduledUpdatePolicy.java | 7 ++---- .../taskdefs/repository/TimestampPolicy.java | 4 +-- .../tools/ant/types/defaults.properties | 2 +- ...tLibrariesTest.java => LibrariesTest.java} | 25 ++++++++++--------- 18 files changed, 53 insertions(+), 75 deletions(-) rename src/etc/testcases/taskdefs/{optional/getlibraries.xml => libraries.xml} (96%) rename src/main/org/apache/tools/ant/taskdefs/{optional => }/repository/HttpRepository.java (96%) rename src/main/org/apache/tools/ant/taskdefs/{optional/repository/GetLibraries.java => repository/Libraries.java} (96%) rename src/main/org/apache/tools/ant/taskdefs/{optional => }/repository/Library.java (98%) rename src/main/org/apache/tools/ant/taskdefs/{optional => }/repository/MavenRepository.java (98%) rename src/main/org/apache/tools/ant/taskdefs/{optional => }/repository/Repository.java (94%) rename src/main/org/apache/tools/ant/taskdefs/{optional => }/repository/RepositoryRef.java (97%) rename src/testcases/org/apache/tools/ant/taskdefs/{optional/repository/GetLibrariesTest.java => LibrariesTest.java} (85%) diff --git a/src/etc/testcases/taskdefs/optional/getlibraries.xml b/src/etc/testcases/taskdefs/libraries.xml similarity index 96% rename from src/etc/testcases/taskdefs/optional/getlibraries.xml rename to src/etc/testcases/taskdefs/libraries.xml index 0e242be02..e2f7c1502 100644 --- a/src/etc/testcases/taskdefs/optional/getlibraries.xml +++ b/src/etc/testcases/taskdefs/libraries.xml @@ -13,8 +13,8 @@ value="${commons.logging.project}/jars/${commons.logging.project}-1.0.1.jar"/> - - + + @@ -56,19 +56,19 @@ - + - + - + - + - + diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties index 75148c0db..bde9ce30a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties +++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties @@ -80,6 +80,7 @@ defaultexcludes=org.apache.tools.ant.taskdefs.DefaultExcludes presetdef=org.apache.tools.ant.taskdefs.PreSetDef macrodef=org.apache.tools.ant.taskdefs.MacroDef nice=org.apache.tools.ant.taskdefs.Nice +libraries=org.apache.tools.ant.taskdefs.repository.Libraries # optional tasks image=org.apache.tools.ant.taskdefs.optional.image.Image @@ -203,7 +204,6 @@ rexec=org.apache.tools.ant.taskdefs.optional.net.RExecTask scriptdef=org.apache.tools.ant.taskdefs.optional.script.ScriptDef ildasm=org.apache.tools.ant.taskdefs.optional.dotnet.Ildasm apt=org.apache.tools.ant.taskdefs.Apt -getlibraries=org.apache.tools.ant.taskdefs.optional.repository.GetLibraries # deprecated ant tasks (kept for back compatibility) starteam=org.apache.tools.ant.taskdefs.optional.scm.AntStarTeamCheckOut diff --git a/src/main/org/apache/tools/ant/taskdefs/repository/AbsentFilesPolicy.java b/src/main/org/apache/tools/ant/taskdefs/repository/AbsentFilesPolicy.java index 4a7c8b539..2f6ee67f6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/repository/AbsentFilesPolicy.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/AbsentFilesPolicy.java @@ -16,8 +16,6 @@ */ package org.apache.tools.ant.taskdefs.repository; -import org.apache.tools.ant.taskdefs.optional.repository.GetLibraries; - import java.util.ListIterator; /** @@ -36,7 +34,7 @@ public class AbsentFilesPolicy extends BaseLibraryPolicy { * @throws org.apache.tools.ant.BuildException * if needed */ - public boolean beforeConnect(GetLibraries owner, ListIterator libraries) { + public boolean beforeConnect(Libraries owner, ListIterator libraries) { owner.markMissingLibrariesForFetch(); return true; } diff --git a/src/main/org/apache/tools/ant/taskdefs/repository/AssertDownloaded.java b/src/main/org/apache/tools/ant/taskdefs/repository/AssertDownloaded.java index 9fe5bae25..a9d253879 100644 --- a/src/main/org/apache/tools/ant/taskdefs/repository/AssertDownloaded.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/AssertDownloaded.java @@ -17,7 +17,6 @@ package org.apache.tools.ant.taskdefs.repository; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.optional.repository.GetLibraries; import java.util.ListIterator; @@ -54,7 +53,7 @@ public class AssertDownloaded extends BaseLibraryPolicy { * @throws org.apache.tools.ant.BuildException * if needed */ - public boolean beforeConnect(GetLibraries owner, ListIterator libraries) { + public boolean beforeConnect(Libraries owner, ListIterator libraries) { if(count==null) { throw new BuildException(ERROR_NO_COUNT); } @@ -70,7 +69,7 @@ public class AssertDownloaded extends BaseLibraryPolicy { * @throws org.apache.tools.ant.BuildException * */ - public void afterFetched(GetLibraries owner, ListIterator libraries) { + public void afterFetched(Libraries owner, ListIterator libraries) { int fetched=owner.calculateDownloadedCount(); if(fetched!=count.intValue()) { throw new BuildException(ERROR_DOWNLOAD_FAILURE diff --git a/src/main/org/apache/tools/ant/taskdefs/repository/BaseLibraryPolicy.java b/src/main/org/apache/tools/ant/taskdefs/repository/BaseLibraryPolicy.java index bb70dbb3e..6494e4a22 100644 --- a/src/main/org/apache/tools/ant/taskdefs/repository/BaseLibraryPolicy.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/BaseLibraryPolicy.java @@ -16,8 +16,6 @@ */ package org.apache.tools.ant.taskdefs.repository; -import org.apache.tools.ant.taskdefs.optional.repository.GetLibraries; - import java.util.ListIterator; /** @@ -57,7 +55,7 @@ public abstract class BaseLibraryPolicy implements LibraryPolicy { * @throws org.apache.tools.ant.BuildException * if needed */ - public boolean beforeConnect(GetLibraries owner, ListIterator libraries) { + public boolean beforeConnect(Libraries owner, ListIterator libraries) { return true; } @@ -70,7 +68,7 @@ public abstract class BaseLibraryPolicy implements LibraryPolicy { * @throws org.apache.tools.ant.BuildException * */ - public void afterFetched(GetLibraries owner, ListIterator libraries) { + public void afterFetched(Libraries owner, ListIterator libraries) { } } diff --git a/src/main/org/apache/tools/ant/taskdefs/repository/ForceUpdatePolicy.java b/src/main/org/apache/tools/ant/taskdefs/repository/ForceUpdatePolicy.java index 38d677f2b..b5c19096d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/repository/ForceUpdatePolicy.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/ForceUpdatePolicy.java @@ -17,8 +17,6 @@ package org.apache.tools.ant.taskdefs.repository; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.optional.repository.GetLibraries; -import org.apache.tools.ant.taskdefs.optional.repository.Library; import java.util.Iterator; import java.util.ListIterator; @@ -47,7 +45,7 @@ public class ForceUpdatePolicy extends BaseLibraryPolicy { * @throws org.apache.tools.ant.BuildException * if needed */ - public boolean beforeConnect(GetLibraries owner, ListIterator libraries) { + public boolean beforeConnect(Libraries owner, ListIterator libraries) { owner.markAllLibrariesForFetch(true); owner._setUseTimestamp(false); return true; @@ -62,7 +60,7 @@ public class ForceUpdatePolicy extends BaseLibraryPolicy { * @throws org.apache.tools.ant.BuildException * */ - public void afterFetched(GetLibraries owner, ListIterator libraries) { + public void afterFetched(Libraries owner, ListIterator libraries) { //here verify that everything came in Iterator downloaded = owner.enabledLibrariesIterator(); while (downloaded.hasNext()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/repository/HttpRepository.java b/src/main/org/apache/tools/ant/taskdefs/repository/HttpRepository.java similarity index 96% rename from src/main/org/apache/tools/ant/taskdefs/optional/repository/HttpRepository.java rename to src/main/org/apache/tools/ant/taskdefs/repository/HttpRepository.java index ca88acb26..d1b89b8f5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/repository/HttpRepository.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/HttpRepository.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.tools.ant.taskdefs.optional.repository; +package org.apache.tools.ant.taskdefs.repository; import org.apache.tools.ant.BuildException; @@ -62,7 +62,7 @@ public abstract class HttpRepository extends Repository { /** * owner class */ - private GetLibraries owner; + private Libraries owner; /** * retry logic @@ -133,7 +133,7 @@ public abstract class HttpRepository extends Repository { } }*/ - public GetLibraries getOwner() { + public Libraries getOwner() { return owner; } @@ -161,7 +161,7 @@ public abstract class HttpRepository extends Repository { * @throws org.apache.tools.ant.BuildException * */ - public void connect(GetLibraries newOwner) { + public void connect(Libraries newOwner) { this.owner = newOwner; if (!url.endsWith("/")) { url = url + '/'; @@ -189,7 +189,7 @@ public abstract class HttpRepository extends Repository { /** * Test for a repository being reachable. This method is called after {@link - * #connect(org.apache.tools.ant.taskdefs.optional.repository.GetLibraries)} + * #connect(org.apache.tools.ant.taskdefs.repository.GetLibraries)} * is called, before any files are to be retrieved. *

* If it returns false the repository considers itself offline. Similarly, diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/repository/GetLibraries.java b/src/main/org/apache/tools/ant/taskdefs/repository/Libraries.java similarity index 96% rename from src/main/org/apache/tools/ant/taskdefs/optional/repository/GetLibraries.java rename to src/main/org/apache/tools/ant/taskdefs/repository/Libraries.java index 05a499303..c7ea66af3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/repository/GetLibraries.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/Libraries.java @@ -14,19 +14,11 @@ * limitations under the License. * */ -package org.apache.tools.ant.taskdefs.optional.repository; +package org.apache.tools.ant.taskdefs.repository; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.repository.AbsentFilesPolicy; -import org.apache.tools.ant.taskdefs.repository.AssertDownloaded; -import org.apache.tools.ant.taskdefs.repository.EnabledLibraryElementList; -import org.apache.tools.ant.taskdefs.repository.ForceUpdatePolicy; -import org.apache.tools.ant.taskdefs.repository.LibraryPolicy; -import org.apache.tools.ant.taskdefs.repository.NoUpdatePolicy; -import org.apache.tools.ant.taskdefs.repository.ScheduledUpdatePolicy; -import org.apache.tools.ant.taskdefs.repository.TimestampPolicy; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; @@ -38,15 +30,17 @@ import java.util.List; import java.util.ListIterator; /** - * This task will retrieve one or more libraries from a repository.

    + * This task will retrieve one or more libraries from a repository. + *
      *
    1. Users must declare a repository, either inline or by reference
      2. *
    2. Dependency checking is used (timestamps) unless forceDownload=true
      3. *
    3. It is an error if, at the end of the task, a library is missing. + *
    * * @ant.task * @since Ant 1.7 */ -public final class GetLibraries extends Task { +public final class Libraries extends Task { /** * destination diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/repository/Library.java b/src/main/org/apache/tools/ant/taskdefs/repository/Library.java similarity index 98% rename from src/main/org/apache/tools/ant/taskdefs/optional/repository/Library.java rename to src/main/org/apache/tools/ant/taskdefs/repository/Library.java index 30258431e..cb4912469 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/repository/Library.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/Library.java @@ -15,10 +15,9 @@ * */ -package org.apache.tools.ant.taskdefs.optional.repository; +package org.apache.tools.ant.taskdefs.repository; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.repository.EnabledLibraryElement; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/repository/LibraryPolicy.java b/src/main/org/apache/tools/ant/taskdefs/repository/LibraryPolicy.java index b0facedb1..16aeb8c20 100644 --- a/src/main/org/apache/tools/ant/taskdefs/repository/LibraryPolicy.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/LibraryPolicy.java @@ -17,8 +17,6 @@ package org.apache.tools.ant.taskdefs.repository; -import org.apache.tools.ant.taskdefs.optional.repository.GetLibraries; - import java.util.ListIterator; /** @@ -29,14 +27,14 @@ import java.util.ListIterator; * Here is the use *
      *
    1. Policies are executed in order of declaration. - *
    2. The {@link #beforeConnect(org.apache.tools.ant.taskdefs.optional.repository.GetLibraries, java.util.ListIterator)} call, + *
    3. The {@link #beforeConnect(org.apache.tools.ant.taskdefs.repository.Libraries, java.util.ListIterator)} call, * is called before any connection has been initiated; policies can manipulate * the library list, set/reset their toFetch list, rename destination files, etc. *
    4. If any policy returns false from the method, the connection does not proceed. * This is not an error, provided the files are actually present. *
    5. After running through the fetch of all files marked for download, * every policy implementation will again be called in order of declaration. - *
    6. The {@link #afterFetched(org.apache.tools.ant.taskdefs.optional.repository.GetLibraries, java.util.ListIterator)} method + *
    7. The {@link #afterFetched(org.apache.tools.ant.taskdefs.repository.Libraries, java.util.ListIterator)} method * does not return anything. *
    8. Either method can throw a BuildException to indicate some kind of error. *
    @@ -57,7 +55,7 @@ public interface LibraryPolicy extends EnabledLibraryElement { * @throws org.apache.tools.ant.BuildException * if needed */ - public boolean beforeConnect(GetLibraries owner, ListIterator libraries); + public boolean beforeConnect(Libraries owner, ListIterator libraries); /** * method called after a successful connection process. @@ -65,7 +63,7 @@ public interface LibraryPolicy extends EnabledLibraryElement { * @param libraries * @throws org.apache.tools.ant.BuildException */ - public void afterFetched(GetLibraries owner,ListIterator libraries); + public void afterFetched(Libraries owner,ListIterator libraries); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/repository/MavenRepository.java b/src/main/org/apache/tools/ant/taskdefs/repository/MavenRepository.java similarity index 98% rename from src/main/org/apache/tools/ant/taskdefs/optional/repository/MavenRepository.java rename to src/main/org/apache/tools/ant/taskdefs/repository/MavenRepository.java index 288152e3d..f8f20ad80 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/repository/MavenRepository.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/MavenRepository.java @@ -15,7 +15,7 @@ * */ -package org.apache.tools.ant.taskdefs.optional.repository; +package org.apache.tools.ant.taskdefs.repository; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/repository/NoUpdatePolicy.java b/src/main/org/apache/tools/ant/taskdefs/repository/NoUpdatePolicy.java index 7c5d0adaf..7229d16ea 100644 --- a/src/main/org/apache/tools/ant/taskdefs/repository/NoUpdatePolicy.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/NoUpdatePolicy.java @@ -16,8 +16,6 @@ */ package org.apache.tools.ant.taskdefs.repository; -import org.apache.tools.ant.taskdefs.optional.repository.GetLibraries; - import java.util.ListIterator; /** @@ -36,7 +34,7 @@ public class NoUpdatePolicy extends BaseLibraryPolicy { * @throws org.apache.tools.ant.BuildException * if needed */ - public boolean beforeConnect(GetLibraries owner, ListIterator libraries) { + public boolean beforeConnect(Libraries owner, ListIterator libraries) { // mark all files as no Fetch owner.markAllLibrariesForFetch(false); return true; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/repository/Repository.java b/src/main/org/apache/tools/ant/taskdefs/repository/Repository.java similarity index 94% rename from src/main/org/apache/tools/ant/taskdefs/optional/repository/Repository.java rename to src/main/org/apache/tools/ant/taskdefs/repository/Repository.java index 56b69b3a5..3d3f18d04 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/repository/Repository.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/Repository.java @@ -15,7 +15,7 @@ * */ -package org.apache.tools.ant.taskdefs.optional.repository; +package org.apache.tools.ant.taskdefs.repository; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.DataType; @@ -28,7 +28,7 @@ import java.io.IOException; * that ships with Ant, or one you implement and declare yourself. *

    * The <getlibraries> task lets you supply a repository by reference - * inline {@link GetLibraries#add(Repository)} or on the command line {@link + * inline {@link Libraries#add(Repository)} or on the command line {@link * GetLibraries#setRepositoryRef(org.apache.tools.ant.types.Reference)} * * @since Ant1.7 @@ -67,7 +67,7 @@ public abstract class Repository extends DataType { * * @throws BuildException */ - public void connect(GetLibraries owner) { + public void connect(Libraries owner) { } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/repository/RepositoryRef.java b/src/main/org/apache/tools/ant/taskdefs/repository/RepositoryRef.java similarity index 97% rename from src/main/org/apache/tools/ant/taskdefs/optional/repository/RepositoryRef.java rename to src/main/org/apache/tools/ant/taskdefs/repository/RepositoryRef.java index d2d750c33..5eb67af33 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/repository/RepositoryRef.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/RepositoryRef.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.tools.ant.taskdefs.optional.repository; +package org.apache.tools.ant.taskdefs.repository; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/repository/ScheduledUpdatePolicy.java b/src/main/org/apache/tools/ant/taskdefs/repository/ScheduledUpdatePolicy.java index 6fef41d5b..b78dabb01 100644 --- a/src/main/org/apache/tools/ant/taskdefs/repository/ScheduledUpdatePolicy.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/ScheduledUpdatePolicy.java @@ -18,9 +18,6 @@ package org.apache.tools.ant.taskdefs.repository; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.optional.repository.GetLibraries; -import org.apache.tools.ant.taskdefs.optional.repository.Library; -import org.apache.tools.ant.taskdefs.optional.repository.Repository; import org.apache.tools.ant.util.FileUtils; import java.io.BufferedInputStream; @@ -118,7 +115,7 @@ public class ScheduledUpdatePolicy extends BaseLibraryPolicy { * @throws org.apache.tools.ant.BuildException * if needed */ - public boolean beforeConnect(GetLibraries owner, ListIterator libraries) { + public boolean beforeConnect(Libraries owner, ListIterator libraries) { Repository repository=owner.getRepository(); if(markerFile==null) { @@ -161,7 +158,7 @@ public class ScheduledUpdatePolicy extends BaseLibraryPolicy { * @param owner * @param libraries */ - public void afterFetched(GetLibraries owner, ListIterator libraries) { + public void afterFetched(Libraries owner, ListIterator libraries) { if(markerFileToSave!=null) { //if we get here, we need to save the file diff --git a/src/main/org/apache/tools/ant/taskdefs/repository/TimestampPolicy.java b/src/main/org/apache/tools/ant/taskdefs/repository/TimestampPolicy.java index 39d0c8340..d87467822 100644 --- a/src/main/org/apache/tools/ant/taskdefs/repository/TimestampPolicy.java +++ b/src/main/org/apache/tools/ant/taskdefs/repository/TimestampPolicy.java @@ -16,8 +16,6 @@ */ package org.apache.tools.ant.taskdefs.repository; -import org.apache.tools.ant.taskdefs.optional.repository.GetLibraries; - import java.util.ListIterator; /** @@ -38,7 +36,7 @@ public class TimestampPolicy extends BaseLibraryPolicy { * @throws org.apache.tools.ant.BuildException * if needed */ - public boolean beforeConnect(GetLibraries owner, ListIterator libraries) { + public boolean beforeConnect(Libraries owner, ListIterator libraries) { owner.markAllLibrariesForFetch(true); owner._setUseTimestamp(true); return true; diff --git a/src/main/org/apache/tools/ant/types/defaults.properties b/src/main/org/apache/tools/ant/types/defaults.properties index f4cd8a1b9..a3309e7a6 100644 --- a/src/main/org/apache/tools/ant/types/defaults.properties +++ b/src/main/org/apache/tools/ant/types/defaults.properties @@ -34,4 +34,4 @@ propertyset=org.apache.tools.ant.types.PropertySet assertions=org.apache.tools.ant.types.Assertions concatfilter=org.apache.tools.ant.filters.ConcatFilter ispingable=org.apache.tools.ant.taskdefs.optional.condition.IsPingable -mavenrepository=org.apache.tools.ant.taskdefs.optional.repository.MavenRepository \ No newline at end of file +mavenrepository=org.apache.tools.ant.taskdefs.repository.MavenRepository \ No newline at end of file diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/repository/GetLibrariesTest.java b/src/testcases/org/apache/tools/ant/taskdefs/LibrariesTest.java similarity index 85% rename from src/testcases/org/apache/tools/ant/taskdefs/optional/repository/GetLibrariesTest.java rename to src/testcases/org/apache/tools/ant/taskdefs/LibrariesTest.java index ed91505cf..588bbc42f 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/repository/GetLibrariesTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/LibrariesTest.java @@ -14,25 +14,26 @@ * limitations under the License. * */ -package org.apache.tools.ant.taskdefs.optional.repository; +package org.apache.tools.ant.taskdefs; import org.apache.tools.ant.BuildFileTest; import org.apache.tools.ant.taskdefs.repository.AssertDownloaded; +import org.apache.tools.ant.taskdefs.repository.Libraries; /** * test the test libraries stuff. * skip all the tests if we are offline */ -public class GetLibrariesTest extends BuildFileTest { - private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/optional/"; +public class LibrariesTest extends BuildFileTest { + private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/"; - public GetLibrariesTest(String name) { + public LibrariesTest(String name) { super(name); } public void setUp() { - configureProject(TASKDEFS_DIR + "getlibraries.xml"); + configureProject(TASKDEFS_DIR + "libraries.xml"); } @@ -45,19 +46,19 @@ public class GetLibrariesTest extends BuildFileTest { } public void testEmpty() { - expectBuildException("testEmpty",GetLibraries.ERROR_NO_DEST_DIR); + expectBuildException("testEmpty",Libraries.ERROR_NO_DEST_DIR); } public void testEmpty2() { - expectBuildException("testEmpty2", GetLibraries.ERROR_NO_REPOSITORY); + expectBuildException("testEmpty2", Libraries.ERROR_NO_REPOSITORY); } public void testEmpty3() { - expectBuildException("testEmpty3", GetLibraries.ERROR_NO_LIBRARIES); + expectBuildException("testEmpty3", Libraries.ERROR_NO_LIBRARIES); } public void testNoRepo() { - expectBuildException("testNoRepo", GetLibraries.ERROR_NO_REPOSITORY); + expectBuildException("testNoRepo", Libraries.ERROR_NO_REPOSITORY); } public void testUnknownReference() { @@ -89,13 +90,13 @@ public class GetLibrariesTest extends BuildFileTest { public void testTwoRepositories() { expectBuildException("testTwoRepositories", - GetLibraries.ERROR_ONE_REPOSITORY_ONLY); + Libraries.ERROR_ONE_REPOSITORY_ONLY); } public void testMavenInlineBadURL() { expectExceptionIfOnline("testMavenInlineBadURL", "testMavenInlineBadURL", - GetLibraries.ERROR_INCOMPLETE_RETRIEVAL); + Libraries.ERROR_INCOMPLETE_RETRIEVAL); } /** @@ -160,7 +161,7 @@ public class GetLibrariesTest extends BuildFileTest { public void testNoUpdate() { expectExceptionIfOnline("testNoUpdate", "update disabled; dest file missing", - GetLibraries.ERROR_INCOMPLETE_RETRIEVAL); + Libraries.ERROR_INCOMPLETE_RETRIEVAL); } public void testTimestamp() {