remm 2005/08/25 05:30:18
Modified: jasper2/src/share/org/apache/jasper/resources
LocalStrings.properties
webapps/docs changelog.xml
jndi-datasource-examples-howto.xml
jasper2/src/share/org/apache/jasper
JspCompilationContext.java
Log:
- Message for no compiler available.
- 36319: DBCP docs, submitted by Xavier Poinsard.
Revision Changes Path
1.10 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LocalStrings.properties 21 Jul 2005 20:50:56 -0000 1.9
+++ LocalStrings.properties 25 Aug 2005 12:30:14 -0000 1.10
@@ -3,6 +3,7 @@
# Default localized string information
# Localized this the Default Locale as is en_US
+jsp.error.compiler=No Java compiler available
jsp.error.bad.servlet.engine=Incorrect servlet engine version!
jsp.error.no.scratch.dir=The JSP engine is not configured with a scratch
dir.\
\n Please add \"jsp.initparams=scratchdir=<dir-name>\" \
1.362 +41 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- changelog.xml 22 Aug 2005 09:14:58 -0000 1.361
+++ changelog.xml 25 Aug 2005 12:30:14 -0000 1.362
@@ -26,6 +26,47 @@
</p>
</section>
+<section name="Tomcat 5.5.12 (yoavs)">
+ <subsection name="General">
+ <changelog>
+ <fix>
+ Remove uneeded files in conf (remm)
+ </fix>
+ </changelog>
+ </subsection>
+
+ <subsection name="Catalina">
+ <changelog>
+ </changelog>
+ </subsection>
+
+ <subsection name="Coyote">
+ <changelog>
+ </changelog>
+ </subsection>
+
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Fix NPE with an error message when no Java compiler is available
(remm)
+ </fix>
+ </changelog>
+ </subsection>
+
+ <subsection name="Cluster">
+ <changelog>
+ </changelog>
+ </subsection>
+
+ <subsection name="Webapps">
+ <changelog>
+ <docs>
+ <bug>36319</bug>: Fix broken link to DBCP docs, submitted by Xavier
Poinsard (remm)
+ </docs>
+ </changelog>
+ </subsection>
+ </section>
+
<section name="Tomcat 5.5.11 (yoavs)">
<subsection name="General">
<changelog>
1.17 +2 -3
jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml
Index: jndi-datasource-examples-howto.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jndi-datasource-examples-howto.xml 11 Aug 2005 14:53:00 -0000
1.16
+++ jndi-datasource-examples-howto.xml 25 Aug 2005 12:30:16 -0000
1.17
@@ -64,9 +64,8 @@
JDBC 3.0 features with a 1.4 JVM.
</p>
-<p>See the <a href="http://jakarta.apache.org/commons/dbcp/api/index.html";>
-DBCP Javadocs</a> BasicDataSource class for a complete list
-of configuration parameters.
+<p>See the <a
href="http://jakarta.apache.org/commons/dbcp/configuration.html";>
+DBCP documentation</a> for a complete list of configuration parameters.
</p>
<subsection name="Installation">
1.55 +6 -0
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- JspCompilationContext.java 13 Sep 2004 07:30:53 -0000 1.54
+++ JspCompilationContext.java 25 Aug 2005 12:30:18 -0000 1.55
@@ -51,6 +51,9 @@
*/
public class JspCompilationContext {
+ protected org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(JspCompilationContext.class);
+
private Hashtable tagFileJarUrls;
private boolean isPackagedTagFile;
@@ -217,6 +220,9 @@
jspCompiler =
createCompiler("org.apache.jasper.compiler.JDTCompiler");
}
}
+ if (jspCompiler == null) {
+ throw new
IllegalStateException(Localizer.getMessage("jsp.error.compiler"));
+ }
jspCompiler.init(this, jsw);
return jspCompiler;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
