From 3a1c15513edba83316ae1ca7adda4b66ea206031 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Sun, 19 Nov 2000 22:28:01 +0000 Subject: [PATCH] Make the additional JVM args supplied come at the front of the arg list so that any args, which must be at the front of the JVM arguments, can be specified. This is specifically to support the -server option of the JVM under Unix. Reported by: Cyril Bouteille git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268214 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/taskdefs/optional/ejb/WLRun.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 dcbe84e7d..626fab01a 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 @@ -156,7 +156,7 @@ public class WLRun extends Task { weblogicServer.setFork(true); weblogicServer.setClassname(weblogicMainClass); - String jvmArgs = ""; + String jvmArgs = additionalJvmArgs; if (weblogicClasspath != null) { jvmArgs += " -Dweblogic.class.path=" + weblogicClasspath; @@ -166,7 +166,6 @@ public class WLRun extends Task { jvmArgs += " -Dweblogic.system.home=" + weblogicSystemHome; jvmArgs += " -Dweblogic.system.name=" + weblogicSystemName; jvmArgs += " -Dweblogic.system.propertiesFile=" + weblogicPropertiesFile; - jvmArgs += " " + additionalJvmArgs; weblogicServer.createJvmarg().setLine(jvmArgs); weblogicServer.createArg().setLine(additionalArgs); @@ -244,12 +243,12 @@ public class WLRun extends Task { public void setJvmargs(String args) { this.additionalJvmArgs = args; } - public void setArgs(String args) - { + + public void setArgs(String args) { additionalArgs = args; } - public void setWeblogicMainClass(String c) - { + + public void setWeblogicMainClass(String c) { weblogicMainClass = c; } }