Author: kkolinko
Date: Mon Jan 27 21:41:00 2014
New Revision: 1561864
URL: http://svn.apache.org/r1561864
Log:
Merged revision r1561737 from tomcat/tc7.0.x/trunk:
Fix two more errors in jspxml.dtd, found by validating the file in Eclipse IDE.
1. Complained for missing '(' in definition of jsp:text.
2. Element jsp:fallback (mentioned in jsp:plugin) was not defined.
That file is distributed with jsp-api.jar so I attribute it to Jasper.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1561732
Merged /tomcat/tc7.0.x/trunk:r1561737
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1561864&r1=1561863&r2=1561864&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 27 21:41:00 2014
@@ -28,12 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Additional fixes for jspxml DTD
- for issues found by validating the file in Eclipse IDE.
- http://svn.apache.org/r1561737
- +1: kkolinko, markt, rjung
- -1:
-
* Remove svn keywords and similar constructs for other source code
management systems from schema and DTD files
1.
Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd?rev=1561864&r1=1561863&r2=1561864&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd Mon Jan 27
21:41:00 2014
@@ -186,5 +186,6 @@
value CDATA #REQUIRED
>
-<!ELEMENT jsp:text #PCDATA>
+<!ELEMENT jsp:text (#PCDATA)>
+<!ELEMENT jsp:fallback %Body;>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1561864&r1=1561863&r2=1561864&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 27 21:41:00 2014
@@ -50,10 +50,6 @@
<bug>55166</bug>: Fix regression that broke XML validation when running
on some Java 5 JVMs. (kkolinko)
</fix>
- <fix>
- Correct typo in definition of default value for contentType attribute
- of jsp:directive.page element in jspxml Schema and DTD. (kkolinko)
- </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -68,6 +64,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Correct several errors in jspxml Schema and DTD. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Cluster">
<changelog>
<scode>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
