conor 00/11/19 14:28:01
Modified: src/main/org/apache/tools/ant/taskdefs/optional/ejb
WLRun.java
Log:
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 <[EMAIL PROTECTED]>
Revision Changes Path
1.7 +5 -6
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
Index: WLRun.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WLRun.java 2000/10/16 13:22:18 1.6
+++ WLRun.java 2000/11/19 22:28:01 1.7
@@ -156,7 +156,7 @@
weblogicServer.setFork(true);
weblogicServer.setClassname(weblogicMainClass);
- String jvmArgs = "";
+ String jvmArgs = additionalJvmArgs;
if (weblogicClasspath != null) {
jvmArgs += " -Dweblogic.class.path=" + weblogicClasspath;
@@ -166,7 +166,6 @@
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 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;
}
}
