Author: kkolinko
Date: Mon Jan 27 16:37:16 2014
New Revision: 1561737
URL: http://svn.apache.org/r1561737
Log:
Merged r1561732 from tomcat/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.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1561732
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd?rev=1561737&r1=1561736&r2=1561737&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd Mon Jan 27
16:37:16 2014
@@ -186,5 +186,6 @@
value CDATA #REQUIRED
>
-<!ELEMENT jsp:text #PCDATA>
+<!ELEMENT jsp:text (#PCDATA)>
+<!ELEMENT jsp:fallback %Body;>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1561737&r1=1561736&r2=1561737&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 27 16:37:16 2014
@@ -187,8 +187,7 @@
a compilation error would occur for some expressions. (markt)
</fix>
<fix>
- Correct typo in definition of default value for contentType attribute
- of jsp:directive.page element in jspxml Schema and DTD. (kkolinko)
+ Correct several errors in jspxml Schema and DTD. (kkolinko)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
