keith 2002/06/11 15:50:03
Modified: src/share/org/apache/tomcat/ant Tomcat3Precompiler.java
Log:
Minor fixes that came up with cygwin
Revision Changes Path
1.3 +6 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Tomcat3Precompiler.java 6 Jun 2002 18:37:18 -0000 1.2
+++ Tomcat3Precompiler.java 11 Jun 2002 22:50:03 -0000 1.3
@@ -93,8 +93,12 @@
CommandlineJava cmd = setupJasperCommand();
String source = (String) enum.nextElement();
String base = getBase(source);
- addArg(cmd, "-c", base + "_1");
+ String classname = base + "_1";
+ addArg(cmd, "-c", classname);
cmd.createArgument().setValue(source);
+ getJspc().log(
+ "Compiling file [" + source + "] to class [" + classname + "]",
+ Project.MSG_VERBOSE);
compile(cmd);
}
return true;
@@ -139,7 +143,7 @@
* Returns filename sans extension and prefix
*/
private String getBase(String filename) {
- int lastslash = filename.lastIndexOf('/');
+ int lastslash = filename.lastIndexOf(File.separator);
if (lastslash == -1) {
lastslash = 0;
}
@@ -161,7 +165,6 @@
addArg(cmd, "-p", jspc.getPackage());
addArg(cmd, "-v" + jspc.getVerbose());
addArg(cmd, "-uriroot", jspc.getUriroot());
- addArg(cmd, "-uribase", jspc.getUribase());
addArg(cmd, "-ieplugin", jspc.getIeplugin());
addArg(cmd, "-die9");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
