You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by eb...@apache.org on 2022/09/28 11:52:13 UTC
[tomcat] 01/06: Fix the typos in the XML schemas
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2609b760e969cdbd096816fac65dd4a97cdc585c
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Wed Sep 28 13:20:59 2022 +0200
Fix the typos in the XML schemas
enpoint -> endpoint
expressable -> expressible
interaces -> interfaces
mulitple -> multiple
occurence -> occurrence
prefered -> preferred
refered -> referred
varaible -> variable
---
java/jakarta/servlet/jsp/resources/jspxml.xsd | 2 +-
java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd | 4 ++--
java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd | 4 ++--
java/jakarta/servlet/resources/javaee_web_services_1_2.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_1_3.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_1_4.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd | 2 +-
java/jakarta/servlet/resources/jsp_3_0.xsd | 2 +-
java/jakarta/servlet/resources/jsp_3_1.xsd | 2 +-
java/jakarta/servlet/resources/web-app_3_0.xsd | 2 +-
java/jakarta/servlet/resources/web-app_3_1.xsd | 2 +-
java/jakarta/servlet/resources/web-app_4_0.xsd | 2 +-
java/jakarta/servlet/resources/web-app_5_0.xsd | 2 +-
java/jakarta/servlet/resources/web-app_6_0.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_3_0.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_3_1.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_4_0.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_5_0.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_6_0.xsd | 2 +-
java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd | 4 ++--
java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd | 4 ++--
23 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/java/jakarta/servlet/jsp/resources/jspxml.xsd b/java/jakarta/servlet/jsp/resources/jspxml.xsd
index 4cad6bb2bc..d93c6156e6 100644
--- a/java/jakarta/servlet/jsp/resources/jspxml.xsd
+++ b/java/jakarta/servlet/jsp/resources/jspxml.xsd
@@ -415,7 +415,7 @@
jsp:useBean action or a custom action with an associated
VariableInfo entry for this name.
- Exact valid combinations are not expressable in XML Schema.
+ Exact valid combinations are not expressible in XML Schema.
They are:
name="Identifier" property="*"
diff --git a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
index 9f5716b32f..c9963a7540 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
@@ -303,7 +303,7 @@
<remote>com.wombat.empl.EmployeeService</remote>
This may not be specified in case there is no Service
- Enpoint Interface as is the case with directly using an
+ Endpoint Interface as is the case with directly using an
implementation class with the @WebService annotation.
When the port component is a Provider implementation
@@ -464,7 +464,7 @@
<xsd:documentation>
The jaxrpc-mapping-file element contains the name of a file that
- describes the Jakarta XML RPC mapping between the Java interaces used by
+ describes the Jakarta XML RPC mapping between the Java interfaces used by
the application and the WSDL description in the wsdl-file. The
file name is a relative path within the module.
diff --git a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
index dd01c6f5a3..5547d5e50a 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
@@ -122,7 +122,7 @@
<xsd:documentation>
The jaxrpc-mapping-file element contains the name of a file that
- describes the Jakarta XML RPC mapping between the Java interaces used by
+ describes the Jakarta XML RPC mapping between the Java interfaces used by
the application and the WSDL description in the wsdl-file. The
file name is a relative path within the module file.
@@ -140,7 +140,7 @@
<xsd:documentation>
The service-qname element declares the specific WSDL service
- element that is being refered to. It is not specified if no
+ element that is being referred to. It is not specified if no
wsdl-file is declared.
</xsd:documentation>
diff --git a/java/jakarta/servlet/resources/javaee_web_services_1_2.xsd b/java/jakarta/servlet/resources/javaee_web_services_1_2.xsd
index 43914742ff..ec5540dd6c 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_1_2.xsd
+++ b/java/jakarta/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
- Enpoint Interface as is the case with directly using an
+ Endpoint 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/jakarta/servlet/resources/javaee_web_services_1_3.xsd b/java/jakarta/servlet/resources/javaee_web_services_1_3.xsd
index d69d723e1d..71d4b33f73 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_1_3.xsd
+++ b/java/jakarta/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
- Enpoint Interface as is the case with directly using an
+ Endpoint 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/jakarta/servlet/resources/javaee_web_services_1_4.xsd b/java/jakarta/servlet/resources/javaee_web_services_1_4.xsd
index e32c5b7d0c..032e6b7492 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_1_4.xsd
+++ b/java/jakarta/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
- Enpoint Interface as is the case with directly using an
+ Endpoint 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/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd b/java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd
index e95308a0a8..e32af449b3 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd
+++ b/java/jakarta/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 refered to. It is not specified if no
+ element that is being referred to. It is not specified if no
wsdl-file is declared.
</xsd:documentation>
diff --git a/java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd b/java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd
index b0d0985a94..4508a1071b 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd
+++ b/java/jakarta/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 refered to. It is not specified if no
+ element that is being referred to. It is not specified if no
wsdl-file is declared.
</xsd:documentation>
diff --git a/java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd b/java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd
index fbd00cee7f..4c0415c17d 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd
+++ b/java/jakarta/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 refered to. It is not specified if no
+ element that is being referred to. It is not specified if no
wsdl-file is declared.
</xsd:documentation>
diff --git a/java/jakarta/servlet/resources/jsp_3_0.xsd b/java/jakarta/servlet/resources/jsp_3_0.xsd
index 4bb863911d..3b627b8001 100644
--- a/java/jakarta/servlet/resources/jsp_3_0.xsd
+++ b/java/jakarta/servlet/resources/jsp_3_0.xsd
@@ -168,7 +168,7 @@
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.
+ multiple mechanisms.
</xsd:documentation>
</xsd:annotation>
diff --git a/java/jakarta/servlet/resources/jsp_3_1.xsd b/java/jakarta/servlet/resources/jsp_3_1.xsd
index 4e896ca17c..52cf5c74f4 100644
--- a/java/jakarta/servlet/resources/jsp_3_1.xsd
+++ b/java/jakarta/servlet/resources/jsp_3_1.xsd
@@ -181,7 +181,7 @@
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.
+ multiple mechanisms.
</xsd:documentation>
</xsd:annotation>
diff --git a/java/jakarta/servlet/resources/web-app_3_0.xsd b/java/jakarta/servlet/resources/web-app_3_0.xsd
index 01526f02f5..6105db1c81 100644
--- a/java/jakarta/servlet/resources/web-app_3_0.xsd
+++ b/java/jakarta/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 occurence
+ must concatenate the element contents. The multiple occurrence
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/jakarta/servlet/resources/web-app_3_1.xsd b/java/jakarta/servlet/resources/web-app_3_1.xsd
index 84ad8b9b21..75481dd005 100644
--- a/java/jakarta/servlet/resources/web-app_3_1.xsd
+++ b/java/jakarta/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 occurence
+ must concatenate the element contents. The multiple occurrence
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/jakarta/servlet/resources/web-app_4_0.xsd b/java/jakarta/servlet/resources/web-app_4_0.xsd
index b5cfa9eeea..3a72f2d540 100644
--- a/java/jakarta/servlet/resources/web-app_4_0.xsd
+++ b/java/jakarta/servlet/resources/web-app_4_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 occurence
+ must concatenate the element contents. The multiple occurrence
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/jakarta/servlet/resources/web-app_5_0.xsd b/java/jakarta/servlet/resources/web-app_5_0.xsd
index de09e13438..ed3d98a8d5 100644
--- a/java/jakarta/servlet/resources/web-app_5_0.xsd
+++ b/java/jakarta/servlet/resources/web-app_5_0.xsd
@@ -95,7 +95,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 occurence
+ must concatenate the element contents. The multiple occurrence
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/jakarta/servlet/resources/web-app_6_0.xsd b/java/jakarta/servlet/resources/web-app_6_0.xsd
index 4cb6e8ddc4..888a0f4f5e 100644
--- a/java/jakarta/servlet/resources/web-app_6_0.xsd
+++ b/java/jakarta/servlet/resources/web-app_6_0.xsd
@@ -95,7 +95,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 occurence
+ must concatenate the element contents. The multiple occurrence
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/jakarta/servlet/resources/web-fragment_3_0.xsd b/java/jakarta/servlet/resources/web-fragment_3_0.xsd
index bd4e961611..3a1f9a41a2 100644
--- a/java/jakarta/servlet/resources/web-fragment_3_0.xsd
+++ b/java/jakarta/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 occurence
+ must concatenate the element contents. The multiple occurrence
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/jakarta/servlet/resources/web-fragment_3_1.xsd b/java/jakarta/servlet/resources/web-fragment_3_1.xsd
index 0373a66ed1..bd06b0ae2d 100644
--- a/java/jakarta/servlet/resources/web-fragment_3_1.xsd
+++ b/java/jakarta/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 occurence
+ must concatenate the element contents. The multiple occurrence
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/jakarta/servlet/resources/web-fragment_4_0.xsd b/java/jakarta/servlet/resources/web-fragment_4_0.xsd
index ed2d7600c8..e93c92a0eb 100644
--- a/java/jakarta/servlet/resources/web-fragment_4_0.xsd
+++ b/java/jakarta/servlet/resources/web-fragment_4_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 occurence
+ must concatenate the element contents. The multiple occurrence
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/jakarta/servlet/resources/web-fragment_5_0.xsd b/java/jakarta/servlet/resources/web-fragment_5_0.xsd
index a5c8450f71..bea06eb976 100644
--- a/java/jakarta/servlet/resources/web-fragment_5_0.xsd
+++ b/java/jakarta/servlet/resources/web-fragment_5_0.xsd
@@ -95,7 +95,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 occurence
+ must concatenate the element contents. The multiple occurrence
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/jakarta/servlet/resources/web-fragment_6_0.xsd b/java/jakarta/servlet/resources/web-fragment_6_0.xsd
index 65827efc11..a99d6e184a 100644
--- a/java/jakarta/servlet/resources/web-fragment_6_0.xsd
+++ b/java/jakarta/servlet/resources/web-fragment_6_0.xsd
@@ -95,7 +95,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 occurence
+ must concatenate the element contents. The multiple occurrence
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/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd b/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd
index 30c34443c3..cd1f664d6a 100644
--- a/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd
+++ b/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd
@@ -575,7 +575,7 @@
short-name a simple default short name that could be
used by a JSP authoring tool to create
names with a mnemonic value; for example,
- the it may be used as the prefered prefix
+ the it may be used as the preferred prefix
value in taglib directives
uri a uri uniquely identifying this taglib
@@ -722,7 +722,7 @@
declare Whether the variable is declared
or not. True is the default.
- scope The scope of the scripting varaible
+ scope The scope of the scripting variable
defined. NESTED is default.
</xsd:documentation>
diff --git a/java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd b/java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd
index acdaea8358..f3c49f93b3 100644
--- a/java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd
+++ b/java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd
@@ -575,7 +575,7 @@
short-name a simple default short name that could be
used by a JSP authoring tool to create
names with a mnemonic value; for example,
- the it may be used as the prefered prefix
+ the it may be used as the preferred prefix
value in taglib directives
uri a uri uniquely identifying this taglib
@@ -722,7 +722,7 @@
declare Whether the variable is declared
or not. True is the default.
- scope The scope of the scripting varaible
+ scope The scope of the scripting variable
defined. NESTED is default.
</xsd:documentation>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 01/06: Fix the typos in the XML schemas
Posted by Mark Thomas <ma...@apache.org>.
On 28/09/2022 12:52, ebourg@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> ebourg pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
> commit 2609b760e969cdbd096816fac65dd4a97cdc585c
> Author: Emmanuel Bourg <eb...@apache.org>
> AuthorDate: Wed Sep 28 13:20:59 2022 +0200
>
> Fix the typos in the XML schemas
-1. Veto. The changes to the following files MUST be reverted. We are
not permitted (by ASF policy) to modify EPL and/or CDDL licensed files.
> java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd | 4 ++--
> java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd | 4 ++--
> java/jakarta/servlet/resources/javaee_web_services_1_2.xsd | 2 +-
> java/jakarta/servlet/resources/javaee_web_services_1_3.xsd | 2 +-
> java/jakarta/servlet/resources/javaee_web_services_1_4.xsd | 2 +-
> java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd | 2 +-
> java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd | 2 +-
> java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd | 2 +-
> java/jakarta/servlet/resources/jsp_3_0.xsd | 2 +-
> java/jakarta/servlet/resources/jsp_3_1.xsd | 2 +-
> java/jakarta/servlet/resources/web-app_3_0.xsd | 2 +-
> java/jakarta/servlet/resources/web-app_3_1.xsd | 2 +-
> java/jakarta/servlet/resources/web-app_4_0.xsd | 2 +-
> java/jakarta/servlet/resources/web-app_5_0.xsd | 2 +-
> java/jakarta/servlet/resources/web-app_6_0.xsd | 2 +-
> java/jakarta/servlet/resources/web-fragment_3_0.xsd | 2 +-
> java/jakarta/servlet/resources/web-fragment_3_1.xsd | 2 +-
> java/jakarta/servlet/resources/web-fragment_4_0.xsd | 2 +-
> java/jakarta/servlet/resources/web-fragment_5_0.xsd | 2 +-
> java/jakarta/servlet/resources/web-fragment_6_0.xsd | 2 +-
> java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd | 4 ++--
> java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd | 4 ++--
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org