1:33 p.m.
Author: remy.maucherat(a)jboss.com
Date: 2009-03-27 08:33:33 -0400 (Fri, 27 Mar 2009)
New Revision: 970
Modified:
trunk/ROADMAP.txt
trunk/java/javax/el/ResourceBundleELResolver.java
trunk/java/org/apache/catalina/realm/LocalStrings.properties
trunk/java/org/apache/catalina/realm/MemoryRealm.java
trunk/java/org/apache/jasper/compiler/Compiler.java
trunk/webapps/docs/changelog.xml
Log:
- Pour 3 minor patches.
Modified: trunk/ROADMAP.txt
===================================================================
--- trunk/ROADMAP.txt 2009-03-23 10:50:08 UTC (rev 969)
+++ trunk/ROADMAP.txt 2009-03-27 12:33:33 UTC (rev 970)
@@ -2,11 +2,12 @@
Main development:
- Setup standalone TCK environment for testing compliance with the new features
-- Servlet 3.0 async API over IO events
+- Servlet 3.0 async API using event API
- Update digester XML parsing rules for web.xml updates
+- web.xml fragments scanning
- Annotation scanning for JBoss Web standalone (likely disabled by default using
conf/web.xml)
- Multipart support (and remove fileupload)
-- Other Servlet 3.0 changes (web.xml fragments, security, etc)
+- Other Servlet 3.0 changes (security, etc)
- JSP 2.2 changes
- EL 1.1 changes
- Coordinate with AS 6 to implement new web.xml parsing (out of tree)
Modified: trunk/java/javax/el/ResourceBundleELResolver.java
===================================================================
--- trunk/java/javax/el/ResourceBundleELResolver.java 2009-03-23 10:50:08 UTC (rev 969)
+++ trunk/java/javax/el/ResourceBundleELResolver.java 2009-03-27 12:33:33 UTC (rev 970)
@@ -38,12 +38,12 @@
}
if (base instanceof ResourceBundle) {
- context.setPropertyResolved(true);
-
if (property != null) {
try {
- return ((ResourceBundle) base).getObject(property
+ Object result = ((ResourceBundle) base).getObject(property
.toString());
+ context.setPropertyResolved(true);
+ return result;
} catch (MissingResourceException mre) {
return "???" + property.toString() + "???";
}
Modified: trunk/java/org/apache/catalina/realm/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/catalina/realm/LocalStrings.properties 2009-03-23 10:50:08 UTC
(rev 969)
+++ trunk/java/org/apache/catalina/realm/LocalStrings.properties 2009-03-27 12:33:33 UTC
(rev 970)
@@ -49,6 +49,7 @@
memoryRealm.loadExist=Memory database file {0} cannot be read
memoryRealm.loadPath=Loading users from memory database file {0}
memoryRealm.readXml=Exception while reading memory database file
+memoryRealm.xmlFeatureEncoding=Exception configuring digester to permit java encoding
names in XML files. Only IANA encoding names will be supported.
realmBase.algorithm=Invalid message digest algorithm {0} specified
realmBase.alreadyStarted=This Realm has already been started
realmBase.digest=Error digesting user credentials
Modified: trunk/java/org/apache/catalina/realm/MemoryRealm.java
===================================================================
--- trunk/java/org/apache/catalina/realm/MemoryRealm.java 2009-03-23 10:50:08 UTC (rev
969)
+++ trunk/java/org/apache/catalina/realm/MemoryRealm.java 2009-03-27 12:33:33 UTC (rev
970)
@@ -215,6 +215,13 @@
if (digester == null) {
digester = new Digester();
digester.setValidating(false);
+ try {
+ digester.setFeature(
+ "http://apache.org/xml/features/allow-java-encodings",
+ true);
+ } catch (Exception e) {
+ log.warn(sm.getString("memoryRealm.xmlFeatureEncoding"), e);
+ }
digester.addRuleSet(new MemoryRuleSet());
}
return (digester);
Modified: trunk/java/org/apache/jasper/compiler/Compiler.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Compiler.java 2009-03-23 10:50:08 UTC (rev 969)
+++ trunk/java/org/apache/jasper/compiler/Compiler.java 2009-03-27 12:33:33 UTC (rev 970)
@@ -333,6 +333,14 @@
String[] smap = generateJava();
if (compileClass) {
generateClass(smap);
+ // Set JspServletWrapper.servletClassLastModifiedTime after successful
compile
+ String targetFileName = ctxt.getClassFileName();
+ if (targetFileName != null) {
+ File targetFile = new File(targetFileName);
+ if (targetFile.exists() && jsw != null) {
+ jsw.setServletClassLastModifiedTime(targetFile.lastModified());
+ }
+ }
}
} finally {
if (tfp != null) {
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-03-23 10:50:08 UTC (rev 969)
+++ trunk/webapps/docs/changelog.xml 2009-03-27 12:33:33 UTC (rev 970)
@@ -41,6 +41,9 @@
<fix>
<bug>46866</bug>: Use nanoTime rather that a weaker init for the
Random fallback. (remm)
</fix>
+ <fix>
+ <bug>45332</bug>: Encoding fix for tomcat-users file. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -53,6 +56,13 @@
</update>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>46915</bug>: JSTL issues resolving resource bundle keys.
(markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="JBoss Web 2.1.3.CR1 (remm)">
@@ -79,6 +89,9 @@
<fix>
EL resolver improvements when using a security manager. (markt)
</fix>
+ <fix>
+ <bug>41606</bug>: Fix jspInit called twice. (markt)
+ </fix>
</changelog>
</subsection>
</section>