costin 01/06/09 14:26:21
Modified: jasper34/liaison/org/apache/jasper34/cli JspC.java
jasper34/liaison/org/apache/jasper34/servlet
EmbededServletOptions.java JspServlet.java
ServletEngine.java
jasper34/liaison/org/apache/jasper34/tomcat33
JasperOptionsImpl.java JspInterceptor.java
Log:
Added support for the new option.
The Option will be changed - it'll become a base class, with a reasonable
default implementation, and various liaisons will no longer have to
implement it ( there are few other big simplifications in the
container/jasper interface - before we start using the Liaison )
Also, few fixes in JspInterceptor ( the compiler class was using the old
package - it worked because we had both in classpath )
Revision Changes Path
1.3 +5 -0
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/cli/JspC.java
Index: JspC.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/cli/JspC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspC.java 2001/06/06 06:40:40 1.2
+++ JspC.java 2001/06/09 21:26:19 1.3
@@ -206,6 +206,11 @@
public String getClassPath() {
return System.getProperty("java.class.path");
}
+
+ public boolean getGenerateCommentMapping() {
+ return false;
+ }
+
int argPos;
// value set by beutifully obsfucscated java
1.2 +4 -0
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/EmbededServletOptions.java
Index: EmbededServletOptions.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/EmbededServletOptions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EmbededServletOptions.java 2001/05/28 02:17:58 1.1
+++ EmbededServletOptions.java 2001/06/09 21:26:19 1.2
@@ -226,6 +226,10 @@
return javaEncoding;
}
+ public boolean getGenerateCommentMapping() {
+ return false;
+ }
+
/**
* Create an EmbededServletOptions object using data available from
* ServletConfig and ServletContext.
1.3 +2 -2
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/JspServlet.java
Index: JspServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/JspServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspServlet.java 2001/06/06 06:40:46 1.2
+++ JspServlet.java 2001/06/09 21:26:20 1.3
@@ -273,10 +273,10 @@
if( loader==null ) {
if( jdk12 ) {
try {
- Class ld=Class.forName("org.apache.jasper.servlet.JasperLoader12");
+ Class
ld=Class.forName("org.apache.jasper34.servlet.JasperLoader12");
loader=(JasperLoader)ld.newInstance();
} catch(Throwable t ) {
- loghelper.log("Loading org.apache.jasper.servlet.JasperLoader12",
t);
+ loghelper.log("Loading
org.apache.jasper34.servlet.JasperLoader12", t);
}
}
if( loader==null )
1.2 +1 -1
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/ServletEngine.java
Index: ServletEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/ServletEngine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletEngine.java 2001/05/28 02:17:58 1.1
+++ ServletEngine.java 2001/06/09 21:26:20 1.2
@@ -86,7 +86,7 @@
if (tomcat == null) {
try {
tomcat = (ServletEngine)
-
Class.forName("org.apache.jasper.runtime.TomcatServletEngine").newInstance();
+
Class.forName("org.apache.jasper34.servlet.TomcatServletEngine").newInstance();
} catch (Exception ex) {
return null;
}
1.2 +4 -0
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/tomcat33/JasperOptionsImpl.java
Index: JasperOptionsImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/tomcat33/JasperOptionsImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JasperOptionsImpl.java 2001/05/28 02:18:58 1.1
+++ JasperOptionsImpl.java 2001/06/09 21:26:21 1.2
@@ -145,6 +145,10 @@
return args.getProperty( "jspCompilerPath" );
}
+ public boolean getGenerateCommentMapping() {
+ return false;
+ }
+
// -------------------- Setters --------------------
public void setProtectionDomain( Object pd ) {
1.5 +3 -3
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/tomcat33/JspInterceptor.java
Index: JspInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/tomcat33/JspInterceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JspInterceptor.java 2001/06/08 06:01:39 1.4
+++ JspInterceptor.java 2001/06/09 21:26:21 1.5
@@ -98,7 +98,7 @@
* @author Costin Manolache
*/
public class JspInterceptor extends BaseInterceptor {
- static final String JIKES="org.apache.jasper.compiler.JikesJavaCompiler";
+ static final String JIKES="org.apache.jasper34.javacompiler.JikesJavaCompiler";
static final String JSP_SERVLET="org.apache.jasper34.servlet.JspServlet";
Properties args=new Properties(); // args for jasper
@@ -213,7 +213,7 @@
if( "jikes".equals( type ) )
type=JIKES;
if( "javac".equals( type ) )
- type="org.apache.jasper.compiler.SunJavaCompiler";
+ type="org.apache.jasper34.javacompiler.SunJavaCompiler";
args.put( "jspCompilerPlugin", type );
}
@@ -725,7 +725,7 @@
try {
jspCompilerPlugin=Class.
- forName("org.apache.jasper.compiler.JikesJavaCompiler");
+ forName(JspInterceptor.JIKES);
JavaCompiler javaC=createJavaCompiler( jspCompilerPlugin );
prepareCompiler( javaC, options, ctxt );
