Author: markt
Date: Mon Jan 27 19:50:54 2014
New Revision: 1561812
URL: http://svn.apache.org/r1561812
Log:
Correct typo in definition of default value for contentType attribute of
jsp:directive.page element in jspxml Schema and DTD. (kkolinko)
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/java/javax/servlet/jsp/resources/jspxml.xsd
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1561640
Merged /tomcat/tc7.0.x/trunk:r1561641
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1561812&r1=1561811&r2=1561812&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 27 19:50:54 2014
@@ -28,12 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Correct typo in definition of default value for contentType attribute of
- jsp:directive.page element in jspxml Schema and DTD.
- http://svn.apache.org/r1561641
- +1: kkolinko, rjung, markt
- -1:
-
* Additional fixes for jspxml DTD
for issues found by validating the file in Eclipse IDE.
http://svn.apache.org/r1561737
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=1561812&r1=1561811&r2=1561812&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
19:50:54 2014
@@ -96,7 +96,7 @@
<!ATTLIST jsp:directive.page
language CDATA "java"
extends %ClassName; #IMPLIED
- contentType %Content; "text/html; ISO-8859-1"
+ contentType %Content; "text/html; charset=ISO-8859-1"
import CDATA #IMPLIED
session %Bool; "true"
buffer CDATA "8kb"
Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd?rev=1561812&r1=1561811&r2=1561812&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd Mon Jan 27
19:50:54 2014
@@ -322,7 +322,7 @@
<xsd:complexType>
<xsd:attribute name = "language" default = "java" type = "xsd:string"/>
<xsd:attribute name = "extends" type = "TypeName"/>
- <xsd:attribute name = "contentType" default = "text/html; ISO-8859-1"
type = "ContentType"/>
+ <xsd:attribute name = "contentType" default = "text/html;
charset=ISO-8859-1" type = "ContentType"/>
<xsd:attribute name = "pageEncoding" use = "optional" type =
"PageEncoding"/>
<xsd:attribute name = "import" type = "ImportList"/>
<xsd:attribute name = "session" default = "true" type = "Bool"/>
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=1561812&r1=1561811&r2=1561812&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 27 19:50:54 2014
@@ -50,6 +50,10 @@
<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">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
