Return-Path: 
 <dev-return-146647-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5425710107
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Mon, 27 Jan 2014 11:36:38 +0000 (UTC)
Received: (qmail 90401 invoked by uid 500); 27 Jan 2014 11:36:36 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 90347 invoked by uid 500); 27 Jan 2014 11:36:36 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 90337 invoked by uid 99); 27 Jan 2014 11:36:35 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jan 2014 11:36:35 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jan 2014 11:36:34 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D35552388868
	for <dev@tomcat.apache.org>; Mon, 27 Jan 2014 11:36:14 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1561640 - in
 /tomcat/trunk/java/javax/servlet/jsp/resources:
 jspxml.dtd jspxml.xsd
Date: Mon, 27 Jan 2014 11:36:14 -0000
To: dev@tomcat.apache.org
From: kkolinko@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140127113614.D35552388868@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kkolinko
Date: Mon Jan 27 11:36:14 2014
New Revision: 1561640

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

Modified:
    tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.dtd
    tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.xsd

Modified: tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.dtd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.dtd?rev=1561640&r1=1561639&r2=1561640&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.dtd (original)
+++ tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.dtd Mon Jan 27 11:36:14 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/trunk/java/javax/servlet/jsp/resources/jspxml.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.xsd?rev=1561640&r1=1561639&r2=1561640&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.xsd (original)
+++ tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.xsd Mon Jan 27 11:36:14 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"/>



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