You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by gl...@apache.org on 2001/02/08 14:38:03 UTC
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler SunJavaCompiler.java
glenn 01/02/08 05:38:03
Modified: jasper/src/share/org/apache/jasper/compiler
SunJavaCompiler.java
Log:
Put runtime jsp page servlets in a package
Revision Changes Path
1.2 +20 -10 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SunJavaCompiler.java
Index: SunJavaCompiler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SunJavaCompiler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SunJavaCompiler.java 2000/08/12 00:52:08 1.1
+++ SunJavaCompiler.java 2001/02/08 13:38:02 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SunJavaCompiler.java,v 1.1 2000/08/12 00:52:08 pierred Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/12 00:52:08 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SunJavaCompiler.java,v 1.2 2001/02/08 13:38:02 glenn Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/02/08 13:38:02 $
*
* ====================================================================
*
@@ -126,14 +126,24 @@
public boolean compile(String source) {
Main compiler = new Main(out, "jsp->javac");
+ String[] args = null;
- String[] args = new String[]
- {
- "-encoding", encoding,
- "-classpath", classpath,
- "-d", outdir,
- source
- };
+ if( outdir != null ) {
+ args = new String[]
+ {
+ "-encoding", encoding,
+ "-classpath", classpath,
+ "-d", outdir,
+ source
+ };
+ } else {
+ args = new String[]
+ {
+ "-encoding", encoding,
+ "-classpath", classpath,
+ source
+ };
+ }
return compiler.compile(args);
}