conor 01/04/19 07:36:14
Modified: src/main/org/apache/tools/ant/taskdefs/optional/ejb
WeblogicDeploymentTool.java
Log:
Create the ejbjar weblogic command line as a set of arguments rather than
as a single line. Avoids problems with paths which contain spaces.
Submitted by: Paul Ste. Marie <[EMAIL PROTECTED]>
Revision Changes Path
1.22 +11 -13
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
Index: WeblogicDeploymentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WeblogicDeploymentTool.java 2001/03/14 01:59:49 1.21
+++ WeblogicDeploymentTool.java 2001/04/19 14:36:11 1.22
@@ -378,17 +378,6 @@
String ejbcClassName = ejbcClass;
try {
- String args = additionalArgs;
- if (keepgenerated) {
- args += " -keepgenerated";
- }
-
- if (compiler != null) {
- args += " -compiler " + compiler;
- }
-
- args += " " + sourceJar.getPath() + " " + destJar.getPath();
-
javaTask = (Java) getTask().getProject().createTask("java");
javaTask.setTaskName("ejbc");
if (ejbcClassName == null) {
@@ -406,8 +395,17 @@
}
javaTask.setClassname(ejbcClassName);
- Commandline.Argument arguments = javaTask.createArg();
- arguments.setLine(args);
+ javaTask.createArg().setLine(additionalArgs);
+ if (keepgenerated) {
+ javaTask.createArg().setValue("-keepgenerated");
+ }
+ if (compiler != null) {
+ javaTask.createArg().setValue("-compiler");
+ javaTask.createArg().setValue(compiler);
+ }
+ javaTask.createArg().setValue(sourceJar.getPath());
+ javaTask.createArg().setValue(destJar.getPath());
+
Path classpath = wlClasspath;
if (classpath == null) {
classpath = getCombinedClasspath();
