Browse Source

Nested websphere element for ejbjar does not support spaces in file name.

This commit addresses this issue
PR: 21298
Submitted by: Lee Carver (leeca at pnambic dot com)


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274754 13f79535-47bb-0310-9956-ffa450edef68
master
Antoine Levy-Lambert 22 years ago
parent
commit
09f141b765
1 changed files with 8 additions and 16 deletions
  1. +8
    -16
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java

+ 8
- 16
src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java View File

@@ -573,19 +573,6 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool {
private void buildWebsphereJar(File sourceJar, File destJar) { private void buildWebsphereJar(File sourceJar, File destJar) {
try { try {
if (ejbdeploy) { if (ejbdeploy) {
String args =
" " + sourceJar.getPath() +
" " + tempdir +
" " + destJar.getPath() +
" " + getOptions();

if (getCombinedClasspath() != null && getCombinedClasspath().toString().length() > 0) {
args += " -cp " + getCombinedClasspath();
}

// Why do my ""'s get stripped away???
log("EJB Deploy Options: " + args, Project.MSG_VERBOSE);

Java javaTask = (Java) getTask().getProject().createTask("java"); Java javaTask = (Java) getTask().getProject().createTask("java");
// Set the JvmArgs // Set the JvmArgs
javaTask.createJvmarg().setValue("-Xms64m"); javaTask.createJvmarg().setValue("-Xms64m");
@@ -606,9 +593,14 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool {
javaTask.setTaskName("ejbdeploy"); javaTask.setTaskName("ejbdeploy");
javaTask.setClassname("com.ibm.etools.ejbdeploy.EJBDeploy"); javaTask.setClassname("com.ibm.etools.ejbdeploy.EJBDeploy");


Commandline.Argument arguments = javaTask.createArg();

arguments.setLine(args);
javaTask.createArg().setValue(sourceJar.getPath());
javaTask.createArg().setValue(tempdir);
javaTask.createArg().setValue(destJar.getPath());
javaTask.createArg().setLine(getOptions());
if (getCombinedClasspath() != null && getCombinedClasspath().toString().length() > 0) {
javaTask.createArg().setValue("-cp");
javaTask.createArg().setValue(getCombinedClasspath().toString());
}


Path classpath = wasClasspath; Path classpath = wasClasspath;




Loading…
Cancel
Save