From 614d36db8a2d97939574dc278afb7afe95b6e6c4 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Mon, 5 Feb 2001 10:45:55 +0000 Subject: [PATCH] Fix up the location where the toplink element looks for descriptors. Thanks to much persistence by Cyril Bouteille git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268583 13f79535-47bb-0310-9956-ffa450edef68 --- .../ejb/WeblogicTOPLinkDeploymentTool.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java index d7acc68c3..02aa7dd66 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java @@ -108,12 +108,25 @@ public class WeblogicTOPLinkDeploymentTool extends WeblogicDeploymentTool { // Setup a naming standard here?. - File toplinkDD = new File(getConfig().descriptorDir, toplinkDescriptor); + File toplinkDD = null; + if (usingBaseJarName()) { + toplinkDD = new File(getConfig().descriptorDir, toplinkDescriptor); + } + else { + String ddPrefix = baseName + getConfig().baseNameTerminator; + File actualDir = (new File(getConfig().descriptorDir, ddPrefix)).getParentFile(); + toplinkDD = new File(actualDir, toplinkDescriptor); + } + if (toplinkDD.exists()) { ejbFiles.put(META_DIR + toplinkDescriptor, toplinkDD); } + else { + log("Unable to locate toplink deployment descriptor. It was expected to be in " + + toplinkDD.getPath(), Project.MSG_WARN); + } } /**