From: markt Date: Mon, 2 Aug 2010 15:13:34 +0000 (+0000) Subject: Tab police X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=691503427e042924498073219334fe56cd7f39a6;p=tomcat7.0 Tab police git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@981548 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/javax/servlet/jsp/resources/jsp_2_0.xsd b/java/javax/servlet/jsp/resources/jsp_2_0.xsd index a27f3bc7b..2a6b3205c 100644 --- a/java/javax/servlet/jsp/resources/jsp_2_0.xsd +++ b/java/javax/servlet/jsp/resources/jsp_2_0.xsd @@ -16,15 +16,15 @@ limitations under the License. --> + targetNamespace="http://java.sun.com/xml/ns/j2ee" + xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="2.0"> - @(#)jsp_2_0.xsds 1.17 03/18/03 + @(#)jsp_2_0.xsds 1.17 03/18/03 @@ -49,13 +49,13 @@ deployment descriptor elements unless indicated otherwise. - In elements that specify a pathname to a file within the - same JAR file, relative filenames (i.e., those not - starting with "/") are considered relative to the root of - the JAR file's namespace. Absolute filenames (i.e., those - starting with "/") also specify names in the root of the - JAR file's namespace. In general, relative names are - preferred. The exception is .war files where absolute - names are preferred for consistency with the Servlet API. + same JAR file, relative filenames (i.e., those not + starting with "/") are considered relative to the root of + the JAR file's namespace. Absolute filenames (i.e., those + starting with "/") also specify names in the root of the + JAR file's namespace. In general, relative names are + preferred. The exception is .war files where absolute + names are preferred for consistency with the Servlet API. @@ -69,22 +69,22 @@ - The jsp-configType is used to provide global configuration - information for the JSP files in a web application. It has - two subelements, taglib and jsp-property-group. + The jsp-configType is used to provide global configuration + information for the JSP files in a web application. It has + two subelements, taglib and jsp-property-group. + type="j2ee:taglibType" + minOccurs="0" + maxOccurs="unbounded"/> + type="j2ee:jsp-property-groupType" + minOccurs="0" + maxOccurs="unbounded"/> @@ -95,8 +95,8 @@ - The jsp-file element contains the full path to a JSP file - within the web application beginning with a `/'. + The jsp-file element contains the full path to a JSP file + within the web application beginning with a `/'. @@ -112,16 +112,16 @@ - The jsp-property-groupType is used to group a number of - files so they can be given global property information. - All files so described are deemed to be JSP files. The - following additional properties can be described: + The jsp-property-groupType is used to group a number of + files so they can be given global property information. + All files so described are deemed to be JSP files. The + following additional properties can be described: - - Control whether EL is ignored - - Control whether scripting elements are invalid - - Indicate pageEncoding information. - - Indicate that a resource is a JSP document (XML) - - Prelude and Coda automatic includes. + - Control whether EL is ignored + - Control whether scripting elements are invalid + - Indicate pageEncoding information. + - Indicate that a resource is a JSP document (XML) + - Prelude and Coda automatic includes. @@ -129,106 +129,106 @@ + type="j2ee:url-patternType" + maxOccurs="unbounded"/> - - - - Can be used to easily set the isELIgnored - property of a group of JSP pages. By default, the - EL evaluation is enabled for Web Applications using - a Servlet 2.4 or greater web.xml, and disabled - otherwise. - - - + type="j2ee:true-falseType" + minOccurs="0"> + + + + Can be used to easily set the isELIgnored + property of a group of JSP pages. By default, the + EL evaluation is enabled for Web Applications using + a Servlet 2.4 or greater web.xml, and disabled + otherwise. + + + - - - - The valid values of page-encoding are those of the - pageEncoding page directive. It is a - translation-time error to name different encodings - in the pageEncoding attribute of the page directive - of a JSP page and in a JSP configuration element - matching the page. It is also a translation-time - error to name different encodings in the prolog - or text declaration of a document in XML syntax and - in a JSP configuration element matching the document. - It is legal to name the same encoding through - mulitple mechanisms. - - - + type="j2ee:string" + minOccurs="0"> + + + + The valid values of page-encoding are those of the + pageEncoding page directive. It is a + translation-time error to name different encodings + in the pageEncoding attribute of the page directive + of a JSP page and in a JSP configuration element + matching the page. It is also a translation-time + error to name different encodings in the prolog + or text declaration of a document in XML syntax and + in a JSP configuration element matching the document. + It is legal to name the same encoding through + mulitple mechanisms. + + + - - + type="j2ee:true-falseType" + minOccurs="0"> + + - Can be used to easily disable scripting in a - group of JSP pages. By default, scripting is - enabled. + Can be used to easily disable scripting in a + group of JSP pages. By default, scripting is + enabled. - - + + - - - - If true, denotes that the group of resources - that match the URL pattern are JSP documents, - and thus must be interpreted as XML documents. - If false, the resources are assumed to not - be JSP documents, unless there is another - property group that indicates otherwise. - - - + type="j2ee:true-falseType" + minOccurs="0"> + + + + If true, denotes that the group of resources + that match the URL pattern are JSP documents, + and thus must be interpreted as XML documents. + If false, the resources are assumed to not + be JSP documents, unless there is another + property group that indicates otherwise. + + + - - - - The include-prelude element is a context-relative - path that must correspond to an element in the - Web Application. When the element is present, - the given path will be automatically included (as - in an include directive) at the beginning of each - JSP page in this jsp-property-group. - - - + type="j2ee:pathType" + minOccurs="0" + maxOccurs="unbounded"> + + + + The include-prelude element is a context-relative + path that must correspond to an element in the + Web Application. When the element is present, + the given path will be automatically included (as + in an include directive) at the beginning of each + JSP page in this jsp-property-group. + + + - - - - The include-coda element is a context-relative - path that must correspond to an element in the - Web Application. When the element is present, - the given path will be automatically included (as - in an include directive) at the end of each - JSP page in this jsp-property-group. - - - + type="j2ee:pathType" + minOccurs="0" + maxOccurs="unbounded"> + + + + The include-coda element is a context-relative + path that must correspond to an element in the + Web Application. When the element is present, + the given path will be automatically included (as + in an include directive) at the end of each + JSP page in this jsp-property-group. + + + @@ -240,44 +240,44 @@ - The taglibType defines the syntax for declaring in - the deployment descriptor that a tag library is - available to the application. This can be done - to override implicit map entries from TLD files and - from the container. + The taglibType defines the syntax for declaring in + the deployment descriptor that a tag library is + available to the application. This can be done + to override implicit map entries from TLD files and + from the container. - - - - A taglib-uri element describes a URI identifying a - tag library used in the web application. The body - of the taglib-uri element may be either an - absolute URI specification, or a relative URI. - There should be no entries in web.xml with the - same taglib-uri value. - - - + type="j2ee:string"> + + + + A taglib-uri element describes a URI identifying a + tag library used in the web application. The body + of the taglib-uri element may be either an + absolute URI specification, or a relative URI. + There should be no entries in web.xml with the + same taglib-uri value. + + + - - + type="j2ee:pathType"> + + - the taglib-location element contains the location - (as a resource relative to the root of the web - application) where to find the Tag Library - Description file for the tag library. + the taglib-location element contains the location + (as a resource relative to the root of the web + application) where to find the Tag Library + Description file for the tag library. - - + + diff --git a/java/javax/servlet/jsp/resources/jspxml.xsd b/java/javax/servlet/jsp/resources/jspxml.xsd index 2532dc4aa..9938b98eb 100644 --- a/java/javax/servlet/jsp/resources/jspxml.xsd +++ b/java/javax/servlet/jsp/resources/jspxml.xsd @@ -171,7 +171,7 @@ before the first /, ? or #, if any (RFC2396). - + @@ -340,7 +340,7 @@ directive.include is the "include directive". - This element does not appear on XML views of JSP pages. + This element does not appear on XML views of JSP pages. diff --git a/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd b/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd index cd15422de..a82ea8916 100644 --- a/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd +++ b/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd @@ -30,22 +30,22 @@ - + - + - + - + - + - + - +