cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/request JspInterceptor.java
larryi 01/01/11 20:47:00
Modified:src/share/org/apache/jasper Tag: tomcat_32
EmbededServletOptions.java JspC.java Options.java
src/share/org/apache/jasper/compiler Tag: tomcat_32
Compiler.java JavaCompiler.java
JikesJavaCompiler.java SunJavaCompiler.java
src/share/org/apache/jasper/resources Tag: tomcat_32
messages.properties messages_es.properties
messages_fr.properties
src/share/org/apache/tomcat/request Tag: tomcat_32
JspInterceptor.java
Log:
Add classDebugInfo property to Options.java and related classes.
Update handling so that Jasper can compile classes with debugging
information if requested.
Revision ChangesPath
No revision
No revision
1.4.2.2 +24 -3
jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java
Index: EmbededServletOptions.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- EmbededServletOptions.java2000/12/22 14:19:10 1.4.2.1
+++ EmbededServletOptions.java2001/01/12 04:46:58 1.4.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v
1.4.2.1 2000/12/22 14:19:10 pierred Exp $
- * $Revision: 1.4.2.1 $
- * $Date: 2000/12/22 14:19:10 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v
1.4.2.2 2001/01/12 04:46:58 larryi Exp $
+ * $Revision: 1.4.2.2 $
+ * $Date: 2001/01/12 04:46:58 $
*
*
*
@@ -103,6 +103,11 @@
public boolean sendErrorToClient = false;
/**
+ * Do we want to include debugging information in the class file?
+ */
+public boolean classDebugInfo = false;
+
+/**
* I want to see my generated servlets. Which directory are they
* in?
*/
@@ -170,6 +175,13 @@
}
/**
+ * Should class files be compiled with debug information?
+ */
+public boolean getClassDebugInfo() {
+return classDebugInfo;
+}
+
+/**
* Class ID for use in the plugin tag when the browser is IE.
*/
public String getIeClassId() {
@@ -256,6 +268,15 @@
else if (senderr.equalsIgnoreCase("false"))
this.sendErrorToClient = false;
else Constants.message ("jsp.warning.sendErrToClient", Logger.WARNING);
+}
+
+String debugInfo = config.getInitParameter("classdebuginfo");
+if (debugInfo != null) {
+if (debugInfo.equalsIgnoreCase("true"))
+this.classDebugInfo = true;
+else if (debugInfo.equalsIgnoreCase("false"))
+this.classDebugInfo = false;
+else Constants.message ("jsp.warning.classDebugInfo", Logger.WARNING);
}
String ieClassId = config.getInitParameter("ieClassId");
1.15.2.3 +8 -3 jakarta-tomcat/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -r1.15.2.2 -r1.15.2.3
--- JspC.java 2000/12/22 14:19:10 1.15.2.2
+++ JspC.java 2001/01/12 04:46:58 1.15.2.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
1.15.2.2 2000/12/22 14:19:10 pierred Exp $
- * $Revision: 1.15.2.2 $
- * $Date: 2000/12/22 14:19:10 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
1.15.2.3 2001/01/12 04:46:58 larryi Exp $
+ * $Revision: 1.15.2.3 $
+ * $Date: 2001/01/12 04:46:58 $
*
*
*
@@ -174,6 +174,11 @@
return true;
}
+public boolean getClassDebugInfo() {
+// compile with debug info
+return false;
+}
+
public String getIeClassId() {
return ieClassId;
}
1.11.2.2 +8 -3 jakarta-tomcat/src/share/org/apache/jasper/Options.java
Index: Options.java
===
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- Options.java 2000/12/22 14:19:11 1.11.2.1
+++ Options.java
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/request JspInterceptor.java
pierred 00/12/22 06:19:15
Modified:src/share/org/apache/jasper Tag: tomcat_32
EmbededServletOptions.java JspC.java Options.java
src/share/org/apache/jasper/compiler Tag: tomcat_32
Compiler.java
src/share/org/apache/jasper/resources Tag: tomcat_32
messages.properties
src/share/org/apache/tomcat/request Tag: tomcat_32
JspInterceptor.java
Log:
Bug fix: bug report #269 -- java.io.UnsupportedEncodingException when processing JSP
From the bug report:
"A "java.io.UnsupportedEncodingException: UTF8" is thrown when generating
the servlet for a JSP file when the Kaffe VM is used. The "UTF8" encoding
name is hardcoded in the Compiler class as the encoding for the generated
servlet source code file. I believe the reason for using "UTF8" as opposed
to "UTF-8" (note the dash) is that this is the only name supported in
JDK 1.1. I suggest adding an init parameter to JspServlet for setting
the encoding name when "UTF8" doesn't work."
Given that there are several possible representations of Unicode data
(UTF-8, UTF-16, UTF-32), and given that the supported encodings vary
between different implementations of the Java platform,
the best way to tackle this is probably as suggested by Hans.
Submitted by: Hans Bergsten ( [EMAIL PROTECTED] )
Revision ChangesPath
No revision
No revision
1.4.2.1 +14 -4
jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java
Index: EmbededServletOptions.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- EmbededServletOptions.java2000/05/26 18:55:09 1.4
+++ EmbededServletOptions.java2000/12/22 14:19:10 1.4.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v 1.4
2000/05/26 18:55:09 costin Exp $
- * $Revision: 1.4 $
- * $Date: 2000/05/26 18:55:09 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v
1.4.2.1 2000/12/22 14:19:10 pierred Exp $
+ * $Revision: 1.4.2.1 $
+ * $Date: 2000/12/22 14:19:10 $
*
*
*
@@ -135,6 +135,11 @@
*/
public String jspCompilerPath = null;
+/**
+ * Java platform encoding to generate the JSP
+ * page servlet.
+ */
+private String javaEncoding;
/**
* Are we keeping generated code around?
@@ -207,6 +212,10 @@
return jspCompilerPath;
}
+public String getJavaEncoding() {
+ return javaEncoding;
+}
+
/**
* Create an EmbededServletOptions object using data available from
* ServletConfig and ServletContext.
@@ -309,7 +318,8 @@
Logger.FATAL);
}
}
-
+
+this.javaEncoding = config.getInitParameter("javaEncoding");
}
}
1.15.2.2 +7 -3 jakarta-tomcat/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- JspC.java 2000/07/12 16:04:20 1.15.2.1
+++ JspC.java 2000/12/22 14:19:10 1.15.2.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
1.15.2.1 2000/07/12 16:04:20 shemnon Exp $
- * $Revision: 1.15.2.1 $
- * $Date: 2000/07/12 16:04:20 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
1.15.2.2 2000/12/22 14:19:10 pierred Exp $
+ * $Revision: 1.15.2.2 $
+ * $Date: 2000/12/22 14:19:10 $
*
*
*
@@ -198,6 +198,10 @@
public String getJspCompilerPath() {
// we don't compile, so this is meanlingless
return null;
+}
+
+public String getJavaEncoding() {
+ return "UTF-8";
}
public String getClassPath() {
1.11.2.1 +9 -3 jakarta-tomcat/src/share/org/apache/jasper/Options.java
Index: Options.java
===
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- Options.java 2000/05/26 18:55:10 1.11
+++ Options.java 2000/12/22 14:19:11
