tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1561641 - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/jsp/resources/jspxml.dtd java/javax/servlet/jsp/resources/jspxml.xsd webapps/docs/changelog.xml
Date Mon, 27 Jan 2014 11:40:25 GMT
Author: kkolinko
Date: Mon Jan 27 11:40:25 2014
New Revision: 1561641

URL: http://svn.apache.org/r1561641
Log:
Merged r1561640 from tomcat/trunk:
Correct typo in definition of default value for contentType attribute of jsp:directive.page
element in jspxml Schema and DTD.

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/java/javax/servlet/jsp/resources/jspxml.xsd
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1561640

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=1561641&r1=1561640&r2=1561641&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 11:40:25 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/tc7.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd?rev=1561641&r1=1561640&r2=1561641&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd Mon Jan 27 11:40:25 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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1561641&r1=1561640&r2=1561641&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 27 11:40:25 2014
@@ -186,6 +186,10 @@
         that when EL containing a ternary expression was used in an attribute
         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)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message