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 14:11:23 UTC
[tomcat] branch 10.0.x updated: Revert "Fix the typos in the XML schemas" due to license concerns
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 7ba0658d1f Revert "Fix the typos in the XML schemas" due to license concerns
7ba0658d1f is described below
commit 7ba0658d1f4d6fee59ea861ffebe48d3844cf741
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Wed Sep 28 16:10:49 2022 +0200
Revert "Fix the typos in the XML schemas" due to license concerns
This reverts commit 43c66d94fa71cec746d6a4018194ee40fc6f2248.
---
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/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-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-jsptaglibrary_3_0.xsd | 4 ++--
19 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/java/jakarta/servlet/jsp/resources/jspxml.xsd b/java/jakarta/servlet/jsp/resources/jspxml.xsd
index 1634d208d9..0e5eba0b36 100644
--- a/java/jakarta/servlet/jsp/resources/jspxml.xsd
+++ b/java/jakarta/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/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
index c9963a7540..9f5716b32f 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
- 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
@@ -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 interfaces used by
+ describes the Jakarta XML RPC mapping between the Java interaces 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 5547d5e50a..dd01c6f5a3 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 interfaces used by
+ describes the Jakarta XML RPC mapping between the Java interaces 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 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/jakarta/servlet/resources/javaee_web_services_1_2.xsd b/java/jakarta/servlet/resources/javaee_web_services_1_2.xsd
index ec5540dd6c..43914742ff 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
- 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/jakarta/servlet/resources/javaee_web_services_1_3.xsd b/java/jakarta/servlet/resources/javaee_web_services_1_3.xsd
index 71d4b33f73..d69d723e1d 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
- 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/jakarta/servlet/resources/javaee_web_services_1_4.xsd b/java/jakarta/servlet/resources/javaee_web_services_1_4.xsd
index 032e6b7492..e32c5b7d0c 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
- 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/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd b/java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd
index e32af449b3..e95308a0a8 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 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/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd b/java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd
index 4508a1071b..b0d0985a94 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 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/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd b/java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd
index 4c0415c17d..fbd00cee7f 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 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/jakarta/servlet/resources/jsp_3_0.xsd b/java/jakarta/servlet/resources/jsp_3_0.xsd
index 3b627b8001..4bb863911d 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
- multiple mechanisms.
+ mulitple 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 6105db1c81..01526f02f5 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 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/jakarta/servlet/resources/web-app_3_1.xsd b/java/jakarta/servlet/resources/web-app_3_1.xsd
index 75481dd005..84ad8b9b21 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 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/jakarta/servlet/resources/web-app_4_0.xsd b/java/jakarta/servlet/resources/web-app_4_0.xsd
index 3a72f2d540..b5cfa9eeea 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 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/jakarta/servlet/resources/web-app_5_0.xsd b/java/jakarta/servlet/resources/web-app_5_0.xsd
index ed3d98a8d5..de09e13438 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 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/jakarta/servlet/resources/web-fragment_3_0.xsd b/java/jakarta/servlet/resources/web-fragment_3_0.xsd
index 3a1f9a41a2..bd4e961611 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 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/jakarta/servlet/resources/web-fragment_3_1.xsd b/java/jakarta/servlet/resources/web-fragment_3_1.xsd
index bd06b0ae2d..0373a66ed1 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 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/jakarta/servlet/resources/web-fragment_4_0.xsd b/java/jakarta/servlet/resources/web-fragment_4_0.xsd
index e93c92a0eb..ed2d7600c8 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 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/jakarta/servlet/resources/web-fragment_5_0.xsd b/java/jakarta/servlet/resources/web-fragment_5_0.xsd
index bea06eb976..a5c8450f71 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 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/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd b/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd
index cd1f664d6a..30c34443c3 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 preferred prefix
+ the it may be used as the prefered 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 variable
+ scope The scope of the scripting varaible
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