From 5308826fb8917216e1dae571770e797c74731a0c Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Mon, 16 Oct 2000 13:22:18 +0000 Subject: [PATCH] Make the flatdestdir attribute work when using deployment descriptors in the root directory Minor javadoc fix in wlrun git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268096 13f79535-47bb-0310-9956-ffa450edef68 --- .../ant/taskdefs/optional/ejb/GenericDeploymentTool.java | 4 ++++ .../org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index f095395f2..0ea083a83 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -280,6 +280,10 @@ public class GenericDeploymentTool implements EJBDeploymentTool { // a flat destination dir, then we need to redefine baseName! if (flatDestDir && baseName.length() != 0) { int startName = baseName.lastIndexOf(File.separator); + if (startName == -1) { + startName = 0; + } + int endName = baseName.length(); baseName = baseName.substring(startName, endName); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java index 3fe6b51b0..dcbe84e7d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java @@ -72,7 +72,7 @@ public class WLRun extends Task { static private final String defaultPolicyFile = "weblogic.policy"; /** - * The classpath to be used in the weblogic ejbc calls. It must contain the weblogic + * The classpath to be used when running the Java VM. It must contain the weblogic * classes and the implementation classes of the home and remote interfaces. */ private Path classpath;