You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/03/29 11:24:14 UTC
[1/4] ant git commit: whitespace
Repository: ant
Updated Branches:
refs/heads/master f7f58eeec -> d1736c7bb
whitespace
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b7ef1bcd
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b7ef1bcd
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b7ef1bcd
Branch: refs/heads/master
Commit: b7ef1bcd034c37e9088c32f8bedc748ef1d24a57
Parents: a8d6367
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 29 11:11:18 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 29 11:11:18 2016 +0200
----------------------------------------------------------------------
src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/b7ef1bcd/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java b/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
index 8419037..31740f7 100644
--- a/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
+++ b/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
@@ -40,8 +40,8 @@ import org.junit.Test;
*/
public class AntClassLoaderTest {
- @Rule
- public BuildFileRule buildRule = new BuildFileRule();
+ @Rule
+ public BuildFileRule buildRule = new BuildFileRule();
private AntClassLoader loader;
[3/4] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9f50f363
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9f50f363
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9f50f363
Branch: refs/heads/master
Commit: 9f50f363b9e9d93f22ceb2710b59af37e32e3b40
Parents: f7f58ee 17527b6
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 29 11:22:55 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 29 11:22:55 2016 +0200
----------------------------------------------------------------------
.../org/apache/tools/ant/AntClassLoader.java | 34 +++------
.../tools/ant/loader/AntClassLoader5.java | 20 +-----
.../apache/tools/ant/AntClassLoaderTest.java | 47 ++++++++++++-
.../tools/ant/loader/AntClassLoader5Test.java | 73 --------------------
4 files changed, 58 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/9f50f363/src/main/org/apache/tools/ant/AntClassLoader.java
----------------------------------------------------------------------
[4/4] ant git commit: try-with-resource for AntClassLoader
Posted by bo...@apache.org.
try-with-resource for AntClassLoader
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d1736c7b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d1736c7b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d1736c7b
Branch: refs/heads/master
Commit: d1736c7bb7a72cd4bf9344f5b2b01b70fb87b034
Parents: 9f50f36
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 29 11:23:45 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 29 11:23:45 2016 +0200
----------------------------------------------------------------------
.../org/apache/tools/ant/taskdefs/WhichResource.java | 13 ++++---------
.../apache/tools/ant/taskdefs/optional/ANTLR.java | 9 ++-------
.../tools/ant/taskdefs/optional/depend/Depend.java | 8 +-------
.../taskdefs/optional/ejb/JonasDeploymentTool.java | 9 +--------
.../tools/ant/taskdefs/optional/javacc/JavaCC.java | 15 +++++----------
.../apache/tools/ant/taskdefs/optional/jsp/JspC.java | 11 ++---------
.../ant/taskdefs/optional/jsp/compilers/JasperC.java | 8 +-------
.../tools/ant/taskdefs/optional/junit/JUnitTask.java | 14 ++++----------
8 files changed, 20 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/d1736c7b/src/main/org/apache/tools/ant/taskdefs/WhichResource.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/WhichResource.java b/src/main/org/apache/tools/ant/taskdefs/WhichResource.java
index 3f315a8..d19918a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/WhichResource.java
+++ b/src/main/org/apache/tools/ant/taskdefs/WhichResource.java
@@ -135,11 +135,10 @@ public class WhichResource extends Task {
getProject().log("using system classpath: " + classpath,
Project.MSG_DEBUG);
}
- AntClassLoader loader = null;
- try {
- loader = AntClassLoader.newAntClassLoader(getProject().getCoreLoader(),
- getProject(),
- classpath, false);
+ try (AntClassLoader loader =
+ AntClassLoader.newAntClassLoader(getProject().getCoreLoader(),
+ getProject(),
+ classpath, false)) {
String loc = null;
if (classname != null) {
//convert a class name into a resource
@@ -162,10 +161,6 @@ public class WhichResource extends Task {
loc = url.toExternalForm();
getProject().setNewProperty(property, loc);
}
- } finally {
- if (loader != null) {
- loader.cleanup();
- }
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/d1736c7b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index 605b336..2ed40e5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -422,17 +422,12 @@ public class ANTLR extends Task {
* @since Ant 1.6
*/
protected boolean is272() {
- AntClassLoader l = null;
- try {
- l = getProject().createClassLoader(commandline.getClasspath());
+ try (AntClassLoader l =
+ getProject().createClassLoader(commandline.getClasspath())) {
l.loadClass("antlr.Version");
return true;
} catch (ClassNotFoundException e) {
return false;
- } finally {
- if (l != null) {
- l.cleanup();
- }
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/d1736c7b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
index cc65129..ae62afe 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
@@ -379,9 +379,7 @@ public class Depend extends MatchingTask {
if (checkPath != null) {
// now determine which jars each class depends upon
classpathDependencies = new Hashtable();
- AntClassLoader loader = null;
- try {
- loader = getProject().createClassLoader(checkPath);
+ try (AntClassLoader loader = getProject().createClassLoader(checkPath)) {
Hashtable classpathFileCache = new Hashtable();
Object nullFileMarker = new Object();
@@ -443,10 +441,6 @@ public class Depend extends MatchingTask {
}
}
}
- } finally {
- if (loader != null) {
- loader.cleanup();
- }
}
} else {
log("No classpath to check", Project.MSG_DEBUG);
http://git-wip-us.apache.org/repos/asf/ant/blob/d1736c7b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
index 81fe805..00fd180 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
@@ -681,10 +681,7 @@ public class JonasDeploymentTool extends GenericDeploymentTool {
log("Looking for GenIC class in classpath: "
+ classpath.toString(), Project.MSG_VERBOSE);
- AntClassLoader cl = null;
-
- try {
- cl = classpath.getProject().createClassLoader(classpath);
+ try (AntClassLoader cl = classpath.getProject().createClassLoader(classpath)) {
try {
cl.loadClass(JonasDeploymentTool.GENIC_CLASS);
@@ -723,10 +720,6 @@ public class JonasDeploymentTool extends GenericDeploymentTool {
+ "' not found in classpath.",
Project.MSG_VERBOSE);
}
- } finally {
- if (cl != null) {
- cl.cleanup();
- }
}
return null;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/d1736c7b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
index 219cc9c..bd7aba5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
@@ -425,12 +425,11 @@ public class JavaCC extends Task {
String packagePrefix = null;
String mainClass = null;
- AntClassLoader l = null;
- try {
- l = AntClassLoader.newAntClassLoader(null, null,
- path
- .concatSystemClasspath("ignore"),
- true);
+ try (AntClassLoader l =
+ AntClassLoader.newAntClassLoader(null, null,
+ path
+ .concatSystemClasspath("ignore"),
+ true)) {
String javaccClass = COM_PACKAGE + COM_JAVACC_CLASS;
InputStream is = l.getResourceAsStream(javaccClass.replace('.', '/')
+ ".class");
@@ -498,10 +497,6 @@ public class JavaCC extends Task {
throw new BuildException("unknown task type " + type);
}
return packagePrefix + mainClass;
- } finally {
- if (l != null) {
- l.cleanup();
- }
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/d1736c7b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
index 4274bf0..9832e3e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
@@ -439,13 +439,10 @@ public class JspC extends MatchingTask {
File dest = getActualDestDir();
- AntClassLoader al = null;
- try {
+ try (AntClassLoader al = getProject().createClassLoader(compilerClasspath)) {
//bind to a compiler
JspCompilerAdapter compiler =
- JspCompilerAdapterFactory
- .getCompiler(compilerName, this,
- al = getProject().createClassLoader(compilerClasspath));
+ JspCompilerAdapterFactory.getCompiler(compilerName, this, al);
//if we are a webapp, hand off to the compiler, which had
//better handle it
@@ -514,10 +511,6 @@ public class JspC extends MatchingTask {
log("all files are up to date", Project.MSG_VERBOSE);
}
}
- } finally {
- if (al != null) {
- al.cleanup();
- }
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/d1736c7b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
index f0becac..80ed601 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
@@ -166,17 +166,11 @@ public class JasperC extends DefaultJspCompilerAdapter {
* @since Ant 1.6.2
*/
private boolean isTomcat5x() {
- AntClassLoader l = null;
- try {
- l = getProject().createClassLoader(getClasspath());
+ try (AntClassLoader l = getProject().createClassLoader(getClasspath())) {
l.loadClass("org.apache.jasper.tagplugins.jstl.If");
return true;
} catch (ClassNotFoundException e) {
return false;
- } finally {
- if (l != null) {
- l.cleanup();
- }
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/d1736c7b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index 459bd3d..3c0912f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -1360,12 +1360,10 @@ public class JUnitTask extends Task {
if (!cmd.haveClasspath()) {
return;
}
- AntClassLoader loader = null;
- try {
- loader =
- AntClassLoader.newAntClassLoader(null, getProject(),
- cmd.createClasspath(getProject()),
- true);
+ try (AntClassLoader loader =
+ AntClassLoader.newAntClassLoader(null, getProject(),
+ cmd.createClasspath(getProject()),
+ true)) {
final String projectResourceName =
LoaderUtils.classNameToResource(Project.class.getName());
URL previous = null;
@@ -1386,10 +1384,6 @@ public class JUnitTask extends Task {
} catch (final Exception ex) {
// Ignore exception
}
- } finally {
- if (loader != null) {
- loader.cleanup();
- }
}
}
[2/4] ant git commit: AntClassLoader5 has become obsolete long ago
Posted by bo...@apache.org.
AntClassLoader5 has become obsolete long ago
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/17527b64
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/17527b64
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/17527b64
Branch: refs/heads/master
Commit: 17527b6490851a728623c1dcbf5078cc63a982dd
Parents: b7ef1bc
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 29 11:15:03 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 29 11:15:03 2016 +0200
----------------------------------------------------------------------
.../org/apache/tools/ant/AntClassLoader.java | 34 +++------
.../tools/ant/loader/AntClassLoader5.java | 20 +-----
.../apache/tools/ant/AntClassLoaderTest.java | 43 ++++++++++++
.../tools/ant/loader/AntClassLoader5Test.java | 73 --------------------
4 files changed, 56 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/17527b64/src/main/org/apache/tools/ant/AntClassLoader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java
index 607ada7..129b004 100644
--- a/src/main/org/apache/tools/ant/AntClassLoader.java
+++ b/src/main/org/apache/tools/ant/AntClassLoader.java
@@ -18,6 +18,7 @@
package org.apache.tools.ant;
import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -48,7 +49,6 @@ import org.apache.tools.ant.util.CollectionUtils;
import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.JavaEnvUtils;
import org.apache.tools.ant.util.LoaderUtils;
-import org.apache.tools.ant.util.ReflectUtil;
import org.apache.tools.ant.util.VectorSet;
import org.apache.tools.zip.ZipLong;
@@ -69,7 +69,7 @@ import org.apache.tools.zip.ZipLong;
* </p>
*
*/
-public class AntClassLoader extends ClassLoader implements SubBuildListener {
+public class AntClassLoader extends ClassLoader implements SubBuildListener, Closeable {
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
@@ -1550,20 +1550,15 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
return "AntClassLoader[" + getClasspath() + "]";
}
- private static Class<?> subClassToLoad = null;
- private static final Class<?>[] CONSTRUCTOR_ARGS = new Class[] {
- ClassLoader.class, Project.class, Path.class, Boolean.TYPE
- };
+ /** {@inheritDoc} */
+ @Override
+ public Enumeration<URL> getResources(String name) throws IOException {
+ return getNamedResources(name);
+ }
- static {
- if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_5)) {
- try {
- subClassToLoad =
- Class.forName("org.apache.tools.ant.loader.AntClassLoader5");
- } catch (final ClassNotFoundException e) {
- // this is Java5 but the installation is lacking our subclass
- }
- }
+ /** {@inheritDoc} */
+ public void close() {
+ cleanup();
}
/**
@@ -1573,15 +1568,6 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
final Project project,
final Path path,
final boolean parentFirst) {
- if (subClassToLoad != null) {
- return (AntClassLoader)
- ReflectUtil.newInstance(subClassToLoad,
- CONSTRUCTOR_ARGS,
- new Object[] {
- parent, project, path,
- Boolean.valueOf(parentFirst)
- });
- }
return new AntClassLoader(parent, project, path, parentFirst);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/17527b64/src/main/org/apache/tools/ant/loader/AntClassLoader5.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/loader/AntClassLoader5.java b/src/main/org/apache/tools/ant/loader/AntClassLoader5.java
index a91ed41..15c29df 100644
--- a/src/main/org/apache/tools/ant/loader/AntClassLoader5.java
+++ b/src/main/org/apache/tools/ant/loader/AntClassLoader5.java
@@ -18,20 +18,15 @@
package org.apache.tools.ant.loader;
-import java.io.Closeable;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
-
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path;
/**
- * Overrides getResources which became non-final in Java5 and
- * implements Closeable
+ * @deprecated since 1.9.7
+ * Just use {@link AntClassLoader} itself.
*/
-public class AntClassLoader5 extends AntClassLoader implements Closeable {
+public class AntClassLoader5 extends AntClassLoader {
/**
* Creates a classloader for the given project using the classpath given.
*
@@ -53,13 +48,4 @@ public class AntClassLoader5 extends AntClassLoader implements Closeable {
super(parent, project, classpath, parentFirst);
}
- /** {@inheritDoc} */
- public Enumeration<URL> getResources(String name) throws IOException {
- return getNamedResources(name);
- }
-
- /** {@inheritDoc} */
- public void close() {
- cleanup();
- }
}
http://git-wip-us.apache.org/repos/asf/ant/blob/17527b64/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java b/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
index 31740f7..e22bd05 100644
--- a/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
+++ b/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java
@@ -19,16 +19,21 @@
package org.apache.tools.ant;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
+import java.io.IOException;
import java.io.PrintStream;
import java.net.URL;
+import java.util.Enumeration;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.CollectionUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -199,6 +204,44 @@ public class AntClassLoaderTest {
}
}
+ /**
+ * Asserts that getResources won't return resources that cannot be
+ * seen by AntClassLoader but by ClassLoader.this.parent.
+ *
+ * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=46752">
+ * https://issues.apache.org/bugzilla/show_bug.cgi?id=46752</a>
+ */
+ @Test
+ public void testGetResources() throws IOException {
+ AntClassLoader acl = new AntClassLoader(new EmptyLoader(), null,
+ new Path(null), true);
+ assertNull(acl.getResource("META-INF/MANIFEST.MF"));
+ assertFalse(acl.getResources("META-INF/MANIFEST.MF").hasMoreElements());
+
+ // double check using system classloader as parent
+ acl = new AntClassLoader(null, null, new Path(null), true);
+ assertNotNull(acl.getResource("META-INF/MANIFEST.MF"));
+ assertTrue(acl.getResources("META-INF/MANIFEST.MF").hasMoreElements());
+ }
+
+ @Test
+ public void testGetResourcesUsingFactory() throws IOException {
+ AntClassLoader acl =
+ AntClassLoader.newAntClassLoader(new EmptyLoader(), null,
+ new Path(null), true);
+ assertNull(acl.getResource("META-INF/MANIFEST.MF"));
+ assertFalse(acl.getResources("META-INF/MANIFEST.MF").hasMoreElements());
+ }
+
+ private static class EmptyLoader extends ClassLoader {
+ public URL getResource(String n) {
+ return null;
+ }
+ public Enumeration getResources(String n) {
+ return new CollectionUtils.EmptyEnumeration();
+ }
+ }
+
private static class GetPackageWrapper extends ClassLoader {
GetPackageWrapper(ClassLoader parent) {
super(parent);
http://git-wip-us.apache.org/repos/asf/ant/blob/17527b64/src/tests/junit/org/apache/tools/ant/loader/AntClassLoader5Test.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/loader/AntClassLoader5Test.java b/src/tests/junit/org/apache/tools/ant/loader/AntClassLoader5Test.java
deleted file mode 100644
index a01a940..0000000
--- a/src/tests/junit/org/apache/tools/ant/loader/AntClassLoader5Test.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.tools.ant.loader;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
-import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.util.CollectionUtils;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-public class AntClassLoader5Test {
-
- /**
- * Asserts that getResources won't return resources that cannot be
- * seen by AntClassLoader but by ClassLoader.this.parent.
- *
- * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=46752">
- * https://issues.apache.org/bugzilla/show_bug.cgi?id=46752</a>
- */
- @Test
- public void testGetResources() throws IOException {
- AntClassLoader acl = new AntClassLoader5(new EmptyLoader(), null,
- new Path(null), true);
- assertNull(acl.getResource("META-INF/MANIFEST.MF"));
- assertFalse(acl.getResources("META-INF/MANIFEST.MF").hasMoreElements());
-
- // double check using system classloader as parent
- acl = new AntClassLoader5(null, null, new Path(null), true);
- assertNotNull(acl.getResource("META-INF/MANIFEST.MF"));
- assertTrue(acl.getResources("META-INF/MANIFEST.MF").hasMoreElements());
- }
-
- @Test
- public void testGetResourcesUsingFactory() throws IOException {
- AntClassLoader acl =
- AntClassLoader.newAntClassLoader(new EmptyLoader(), null,
- new Path(null), true);
- assertNull(acl.getResource("META-INF/MANIFEST.MF"));
- assertFalse(acl.getResources("META-INF/MANIFEST.MF").hasMoreElements());
- }
-
- private static class EmptyLoader extends ClassLoader {
- public URL getResource(String n) {
- return null;
- }
- public Enumeration getResources(String n) {
- return new CollectionUtils.EmptyEnumeration();
- }
- }
-}
\ No newline at end of file