From 5410d80ef4dea4304a33c0aa4ea4464e17021fd5 Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Mon, 5 Jan 2004 11:45:07 +0000 Subject: [PATCH] Use getDestDir of jboss element of ejbjar PR: 25826 Obtained from: Damon Sicore git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275854 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/OptionalTasks/ejb.html | 3 ++- .../ant/taskdefs/optional/ejb/JbossDeploymentTool.java | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/OptionalTasks/ejb.html index 1db596d83..60f5567ab 100644 --- a/docs/manual/OptionalTasks/ejb.html +++ b/docs/manual/OptionalTasks/ejb.html @@ -715,7 +715,8 @@ the value none.

namespace. Note that this attribute is only used if the task is generating generic jars (i.e. no vendor-specific deployment elements have been specified). - Yes + Yes, unless vendor-specific deployment elements + have been specified. cmpversion diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java index 4b0573093..851a2fbb4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java @@ -120,7 +120,14 @@ public class JbossDeploymentTool extends GenericDeploymentTool { * of this jar will be checked against the dependent bean classes. */ File getVendorOutputJarFile(String baseName) { - return new File(getParent().getDestdir(), baseName + jarSuffix); + if (getDestDir() == null && getParent().getDestdir() == null) { + throw new BuildException("DestDir not specified"); + } + if (getDestDir() == null) { + return new File(getParent().getDestdir(), baseName + jarSuffix); + } else { + return new File(getDestDir(), baseName + jarSuffix); + } } /**