Browse Source

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 <SteMarie@digineer.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268954 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 24 years ago
parent
commit
e92225b1ae
1 changed files with 11 additions and 13 deletions
  1. +11
    -13
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java

+ 11
- 13
src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java View File

@@ -378,17 +378,6 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
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 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
}
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();


Loading…
Cancel
Save