keith 2002/06/06 11:37:19
Modified: src/share/org/apache/tomcat/ant Tomcat3Precompiler.java
Log:
The bleeding edge: Work with Ant > 1.5 B2.
Revision Changes Path
1.2 +6 -6
jakarta-tomcat/src/share/org/apache/tomcat/ant/Tomcat3Precompiler.java
Index: Tomcat3Precompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/ant/Tomcat3Precompiler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Tomcat3Precompiler.java 16 May 2002 03:15:13 -0000 1.1
+++ Tomcat3Precompiler.java 6 Jun 2002 18:37:18 -0000 1.2
@@ -56,7 +56,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler;
@@ -90,7 +90,7 @@
Vector sources = getJspc().getCompileList();
Enumeration enum = sources.elements();
while (enum.hasMoreElements()) {
- Commandline cmd = setupJasperCommand();
+ CommandlineJava cmd = setupJasperCommand();
String source = (String) enum.nextElement();
String base = getBase(source);
addArg(cmd, "-c", base + "_1");
@@ -101,7 +101,7 @@
}
/** Execute Jasper */
- private boolean compile(Commandline cmd) throws BuildException {
+ private boolean compile(CommandlineJava cmd) throws BuildException {
try {
// Create an instance of the compiler, redirecting output to
// the project log
@@ -113,7 +113,7 @@
java.setClasspath(Path.systemClasspath);
}
java.setClassname("org.apache.jasper.JspC");
- String args[] = cmd.getArguments();
+ String args[] = cmd.getJavaCommand().getArguments();
for (int i = 0; i < args.length; i++) {
java.createArg().setValue(args[i]);
}
@@ -154,8 +154,8 @@
* build up a command line
* @return a command line for jasper
*/
- private Commandline setupJasperCommand() {
- Commandline cmd = new Commandline();
+ private CommandlineJava setupJasperCommand() {
+ CommandlineJava cmd = new CommandlineJava();
JspC jspc = getJspc();
addArg(cmd, "-d", jspc.getDestdir());
addArg(cmd, "-p", jspc.getPackage());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
