This is an automated email from the ASF dual-hosted git repository. ebourg pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new d3c32685b9 Revert "Fix the typos in the XML schemas" due to license concerns d3c32685b9 is described below commit d3c32685b938647086f96a7baf9832541dbe5135 Author: Emmanuel Bourg <ebo...@apache.org> AuthorDate: Wed Sep 28 16:10:09 2022 +0200 Revert "Fix the typos in the XML schemas" due to license concerns This reverts commit ad7b58a80aca18c684491f724b9444bbf434d955. --- java/javax/servlet/jsp/resources/jspxml.xsd | 2 +- java/javax/servlet/resources/javaee_web_services_1_2.xsd | 2 +- java/javax/servlet/resources/javaee_web_services_1_3.xsd | 2 +- java/javax/servlet/resources/javaee_web_services_1_4.xsd | 2 +- java/javax/servlet/resources/javaee_web_services_client_1_2.xsd | 2 +- java/javax/servlet/resources/javaee_web_services_client_1_3.xsd | 2 +- java/javax/servlet/resources/javaee_web_services_client_1_4.xsd | 2 +- java/javax/servlet/resources/jsp_2_1.xsd | 2 +- java/javax/servlet/resources/web-app_3_0.xsd | 2 +- java/javax/servlet/resources/web-app_3_1.xsd | 2 +- java/javax/servlet/resources/web-fragment_3_0.xsd | 2 +- java/javax/servlet/resources/web-fragment_3_1.xsd | 2 +- java/javax/servlet/resources/web-jsptaglibrary_2_1.xsd | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/java/javax/servlet/jsp/resources/jspxml.xsd b/java/javax/servlet/jsp/resources/jspxml.xsd index 1634d208d9..0e5eba0b36 100644 --- a/java/javax/servlet/jsp/resources/jspxml.xsd +++ b/java/javax/servlet/jsp/resources/jspxml.xsd @@ -414,7 +414,7 @@ jsp:useBean action or a custom action with an associated VariableInfo entry for this name. - Exact valid combinations are not expressible in XML Schema. + Exact valid combinations are not expressable in XML Schema. They are: name="Identifier" property="*" diff --git a/java/javax/servlet/resources/javaee_web_services_1_2.xsd b/java/javax/servlet/resources/javaee_web_services_1_2.xsd index ec5540dd6c..43914742ff 100644 --- a/java/javax/servlet/resources/javaee_web_services_1_2.xsd +++ b/java/javax/servlet/resources/javaee_web_services_1_2.xsd @@ -336,7 +336,7 @@ <remote>com.wombat.empl.EmployeeService</remote> This may not be specified in case there is no Service - Endpoint Interface as is the case with directly using an + Enpoint Interface as is the case with directly using an implementation class with the @WebService annotation. When the port component is a Provider implementation diff --git a/java/javax/servlet/resources/javaee_web_services_1_3.xsd b/java/javax/servlet/resources/javaee_web_services_1_3.xsd index 71d4b33f73..d69d723e1d 100644 --- a/java/javax/servlet/resources/javaee_web_services_1_3.xsd +++ b/java/javax/servlet/resources/javaee_web_services_1_3.xsd @@ -332,7 +332,7 @@ <remote>com.wombat.empl.EmployeeService</remote> This may not be specified in case there is no Service - Endpoint Interface as is the case with directly using an + Enpoint Interface as is the case with directly using an implementation class with the @WebService annotation. When the port component is a Provider implementation diff --git a/java/javax/servlet/resources/javaee_web_services_1_4.xsd b/java/javax/servlet/resources/javaee_web_services_1_4.xsd index 032e6b7492..e32c5b7d0c 100644 --- a/java/javax/servlet/resources/javaee_web_services_1_4.xsd +++ b/java/javax/servlet/resources/javaee_web_services_1_4.xsd @@ -332,7 +332,7 @@ <remote>com.wombat.empl.EmployeeService</remote> This may not be specified in case there is no Service - Endpoint Interface as is the case with directly using an + Enpoint Interface as is the case with directly using an implementation class with the @WebService annotation. When the port component is a Provider implementation diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd b/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd index e32af449b3..e95308a0a8 100644 --- a/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd +++ b/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd @@ -260,7 +260,7 @@ <xsd:documentation> The service-qname element declares the specific WSDL service - element that is being referred to. It is not specified if no + element that is being refered to. It is not specified if no wsdl-file is declared. </xsd:documentation> diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd b/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd index 4508a1071b..b0d0985a94 100644 --- a/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd +++ b/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd @@ -170,7 +170,7 @@ <xsd:documentation> The service-qname element declares the specific WSDL service - element that is being referred to. It is not specified if no + element that is being refered to. It is not specified if no wsdl-file is declared. </xsd:documentation> diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd b/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd index 4c0415c17d..fbd00cee7f 100644 --- a/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd +++ b/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd @@ -170,7 +170,7 @@ <xsd:documentation> The service-qname element declares the specific WSDL service - element that is being referred to. It is not specified if no + element that is being refered to. It is not specified if no wsdl-file is declared. </xsd:documentation> diff --git a/java/javax/servlet/resources/jsp_2_1.xsd b/java/javax/servlet/resources/jsp_2_1.xsd index e58edba331..1c5c372c19 100644 --- a/java/javax/servlet/resources/jsp_2_1.xsd +++ b/java/javax/servlet/resources/jsp_2_1.xsd @@ -20,7 +20,7 @@ <!-- ** The actual Sun XSD for this stripped down XSD can be found at ** http://java.sun.com/xml/ns/javaee/jsp_2_1.xsd - ** This XSD contains only the functional elements for programmatic use. + ** This XSD contains only the functional elements for programatic use. --> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" diff --git a/java/javax/servlet/resources/web-app_3_0.xsd b/java/javax/servlet/resources/web-app_3_0.xsd index 6105db1c81..01526f02f5 100644 --- a/java/javax/servlet/resources/web-app_3_0.xsd +++ b/java/javax/servlet/resources/web-app_3_0.xsd @@ -126,7 +126,7 @@ file must not contain multiple elements of session-config, jsp-config, and login-config. When there are multiple elements of welcome-file-list or locale-encoding-mapping-list, the container - must concatenate the element contents. The multiple occurrence + must concatenate the element contents. The multiple occurence of the element distributable is redundant and the container treats that case exactly in the same way when there is only one distributable. diff --git a/java/javax/servlet/resources/web-app_3_1.xsd b/java/javax/servlet/resources/web-app_3_1.xsd index 75481dd005..84ad8b9b21 100644 --- a/java/javax/servlet/resources/web-app_3_1.xsd +++ b/java/javax/servlet/resources/web-app_3_1.xsd @@ -126,7 +126,7 @@ file must not contain multiple elements of session-config, jsp-config, and login-config. When there are multiple elements of welcome-file-list or locale-encoding-mapping-list, the container - must concatenate the element contents. The multiple occurrence + must concatenate the element contents. The multiple occurence of the element distributable is redundant and the container treats that case exactly in the same way when there is only one distributable. diff --git a/java/javax/servlet/resources/web-fragment_3_0.xsd b/java/javax/servlet/resources/web-fragment_3_0.xsd index 3a1f9a41a2..bd4e961611 100644 --- a/java/javax/servlet/resources/web-fragment_3_0.xsd +++ b/java/javax/servlet/resources/web-fragment_3_0.xsd @@ -126,7 +126,7 @@ file must not contain multiple elements of session-config, jsp-config, and login-config. When there are multiple elements of welcome-file-list or locale-encoding-mapping-list, the container - must concatenate the element contents. The multiple occurrence + must concatenate the element contents. The multiple occurence of the element distributable is redundant and the container treats that case exactly in the same way when there is only one distributable. diff --git a/java/javax/servlet/resources/web-fragment_3_1.xsd b/java/javax/servlet/resources/web-fragment_3_1.xsd index bd06b0ae2d..0373a66ed1 100644 --- a/java/javax/servlet/resources/web-fragment_3_1.xsd +++ b/java/javax/servlet/resources/web-fragment_3_1.xsd @@ -126,7 +126,7 @@ file must not contain multiple elements of session-config, jsp-config, and login-config. When there are multiple elements of welcome-file-list or locale-encoding-mapping-list, the container - must concatenate the element contents. The multiple occurrence + must concatenate the element contents. The multiple occurence of the element distributable is redundant and the container treats that case exactly in the same way when there is only one distributable. diff --git a/java/javax/servlet/resources/web-jsptaglibrary_2_1.xsd b/java/javax/servlet/resources/web-jsptaglibrary_2_1.xsd index 00975cd093..2714f78e78 100644 --- a/java/javax/servlet/resources/web-jsptaglibrary_2_1.xsd +++ b/java/javax/servlet/resources/web-jsptaglibrary_2_1.xsd @@ -18,7 +18,7 @@ --> <!-- - ** This XSD contains only the programmatic elements required for an implementation. + ** This XSD contains only the programatic elements required for an implementation. ** For the XSD from Sun that includes documentation and other copyrighted information ** please refer to http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd for a fully documented and latest ** XSD. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org