antoine 2003/07/03 14:48:07
Modified: src/main/org/apache/tools/ant/taskdefs/optional/ejb
WebsphereDeploymentTool.java
Log:
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)
Revision Changes Path
1.22 +8 -16
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
Index: WebsphereDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WebsphereDeploymentTool.java 25 Jun 2003 11:52:47 -0000 1.21
+++ WebsphereDeploymentTool.java 3 Jul 2003 21:48:06 -0000 1.22
@@ -573,19 +573,6 @@
private void buildWebsphereJar(File sourceJar, File destJar) {
try {
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");
// Set the JvmArgs
javaTask.createJvmarg().setValue("-Xms64m");
@@ -606,9 +593,14 @@
javaTask.setTaskName("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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
