From abf794a6a572d1ba8c88a5c42a6bb377d238a95f Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Mon, 13 Nov 2000 00:29:52 +0000 Subject: [PATCH] Ensure the bean classes can be loaded by appending the classpath, if specified. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268177 13f79535-47bb-0310-9956-ffa450edef68 --- .../optional/ejb/WeblogicDeploymentTool.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index 951058929..077a171f9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -59,11 +59,8 @@ import java.util.jar.*; import java.util.*; import java.net.*; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.*; +import org.apache.tools.ant.types.*; import org.apache.tools.ant.taskdefs.Java; public class WeblogicDeploymentTool extends GenericDeploymentTool { @@ -489,11 +486,14 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { */ protected ClassLoader getClassLoaderFromJar(File classjar) throws IOException { - URLClassLoader loader; - URL[] aURL = new URL[1]; - - aURL[0] = new URL("file","",0,classjar.getAbsolutePath()); - loader = new URLClassLoader(aURL); - return loader; + Path lookupPath = new Path(getTask().getProject()); + lookupPath.setLocation(classjar); + + Path classpath = getClasspath(); + if (classpath != null) { + lookupPath.append(classpath); + } + + return new AntClassLoader(getTask().getProject(), lookupPath); } }