conor 01/02/13 02:19:45
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_13_BRANCH
Execute.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
ANT_13_BRANCH WLStop.java
Log:
Allow wlstop to take a nested classpath element
Revision Changes Path
No revision
No revision
1.12.2.1 +6 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
Index: Execute.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- Execute.java 2001/01/12 14:08:50 1.12
+++ Execute.java 2001/02/13 10:19:44 1.12.2.1
@@ -428,6 +428,8 @@
*/
public Process exec(Project project, String[] cmd, String[] env)
throws IOException
{
+ project.log("Execute:CommandLauncher: " +
+ Commandline.toString(cmd), Project.MSG_DEBUG);
return Runtime.getRuntime().exec(cmd, env);
}
@@ -469,6 +471,8 @@
for ( int i = 0; i < cmd.length; i++ ) {
newcmd[i] = Commandline.quoteArgument(cmd[i]);
}
+ project.log("Execute:Java11CommandLauncher: " +
+ Commandline.toString(newcmd), Project.MSG_DEBUG);
return Runtime.getRuntime().exec(newcmd, env);
}
}
@@ -493,6 +497,8 @@
throws IOException
{
try {
+ project.log("Execute:Java13CommandLauncher: " +
+ Commandline.toString(cmd), Project.MSG_DEBUG);
Object[] arguments = { cmd, env, workingDir };
return (Process)_execWithCWD.invoke(Runtime.getRuntime(),
arguments);
}
No revision
No revision
1.6.2.1 +10 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java
Index: WLStop.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- WLStop.java 2001/02/04 08:34:38 1.6
+++ WLStop.java 2001/02/13 10:19:45 1.6.2.1
@@ -149,6 +149,16 @@
}
/**
+ * Add the classpath for the user classes
+ */
+ public Path createClasspath() {
+ if (classpath == null) {
+ classpath = new Path(project);
+ }
+ return classpath.createPath();
+ }
+
+ /**
* Set the username to use to request shutdown of the server.
*
* @param s the username.
