glenn 01/02/08 05:37:55 Modified: jasper/src/share/org/apache/jasper/compiler JikesJavaCompiler.java Log: Put runtime jsp page servlets in a package Revision Changes Path 1.4 +23 -11 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java Index: JikesJavaCompiler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JikesJavaCompiler.java 2000/11/24 13:38:33 1.3 +++ JikesJavaCompiler.java 2001/02/08 13:37:54 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v 1.3 2000/11/24 13:38:33 pierred Exp $ - * $Revision: 1.3 $ - * $Date: 2000/11/24 13:38:33 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v 1.4 2001/02/08 13:37:54 glenn Exp $ + * $Revision: 1.4 $ + * $Date: 2001/02/08 13:37:54 $ * * ==================================================================== * @@ -153,14 +153,26 @@ } } - String[] compilerCmd = new String[] { - quote + compilerPath + quote, - //XXX - add encoding once Jikes supports it - "-classpath", quote + classpath + MicrosoftClasspath + quote, - "-d", quote + outdir + quote, - "-nowarn", - quote + source + quote - }; + String[] compilerCmd = null; + + if( outdir != null ) { + compilerCmd = new String[] { + quote + compilerPath + quote, + //XXX - add encoding once Jikes supports it + "-classpath", quote + classpath + MicrosoftClasspath + quote, + "-d", quote + outdir + quote, + "-nowarn", + quote + source + quote + }; + } else { + compilerCmd = new String[] { + quote + compilerPath + quote, + //XXX - add encoding once Jikes supports it + "-classpath", quote + classpath + MicrosoftClasspath + quote, + "-nowarn", + quote + source + quote + }; + } ByteArrayOutputStream tmpErr = new ByteArrayOutputStream(OUTPUT_BUFFER_SIZE); try { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]