subject:"\[tomcat\] 01\/02\: writeable \-> writable for consistency"

[tomcat] 01/02: writeable -> writable for consistency

2021-12-06 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 22740949763e0e00aefc45f9ab39a885e568afa7
Author: Mark Thomas 
AuthorDate: Mon Dec 6 08:00:30 2021 +

writeable -> writable for consistency

Excludes MBean descriptors as DTD uses writeable
---
 java/javax/el/ArrayELResolver.java  | 2 +-
 java/javax/el/BeanELResolver.java   | 2 +-
 java/javax/el/ListELResolver.java   | 2 +-
 java/javax/el/LocalStrings.properties   | 2 +-
 java/javax/el/LocalStrings_fr.properties| 2 +-
 java/javax/el/LocalStrings_ja.properties| 2 +-
 java/javax/el/LocalStrings_ko.properties| 2 +-
 java/javax/el/LocalStrings_zh_CN.properties | 2 +-
 java/javax/el/MapELResolver.java| 2 +-
 java/javax/el/ResourceBundleELResolver.java | 2 +-
 java/javax/el/StaticFieldELResolver.java| 2 +-
 java/org/apache/catalina/users/mbeans-descriptors.xml   | 4 ++--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java   | 4 ++--
 java/org/apache/tomcat/util/net/SecureNioChannel.java   | 6 +++---
 .../apache/catalina/webresources/AbstractTestFileResourceSet.java   | 2 +-
 test/org/apache/catalina/webresources/AbstractTestResourceSet.java  | 6 +++---
 test/org/apache/catalina/webresources/TestDirResourceSet.java   | 2 +-
 .../apache/catalina/webresources/TestDirResourceSetInternal.java| 2 +-
 test/org/apache/catalina/webresources/TestDirResourceSetMount.java  | 2 +-
 .../apache/catalina/webresources/TestDirResourceSetReadOnly.java| 2 +-
 .../org/apache/catalina/webresources/TestDirResourceSetVirtual.java | 2 +-
 test/org/apache/catalina/webresources/TestJarResourceSet.java   | 2 +-
 .../apache/catalina/webresources/TestJarResourceSetInternal.java| 2 +-
 test/org/apache/catalina/webresources/TestJarResourceSetMount.java  | 2 +-
 webapps/docs/jndi-resources-howto.xml   | 2 +-
 25 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/java/javax/el/ArrayELResolver.java 
b/java/javax/el/ArrayELResolver.java
index d5e221a..c143a6d 100644
--- a/java/javax/el/ArrayELResolver.java
+++ b/java/javax/el/ArrayELResolver.java
@@ -77,7 +77,7 @@ public class ArrayELResolver extends ELResolver {
 
 if (this.readOnly) {
 throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
 }
 
 int idx = coerce(property);
diff --git a/java/javax/el/BeanELResolver.java 
b/java/javax/el/BeanELResolver.java
index 7299c2f..3e7e1cf 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -111,7 +111,7 @@ public class BeanELResolver extends ELResolver {
 
 if (this.readOnly) {
 throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
 }
 
 Method m = this.property(context, base, property).write(context, base);
diff --git a/java/javax/el/ListELResolver.java 
b/java/javax/el/ListELResolver.java
index 52ea1f0..1c18baa 100644
--- a/java/javax/el/ListELResolver.java
+++ b/java/javax/el/ListELResolver.java
@@ -84,7 +84,7 @@ public class ListELResolver extends ELResolver {
 
 if (this.readOnly) {
 throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
 }
 
 int idx = coerce(property);
diff --git a/java/javax/el/LocalStrings.properties 
b/java/javax/el/LocalStrings.properties
index cead8de..3c51085 100644
--- a/java/javax/el/LocalStrings.properties
+++ b/java/javax/el/LocalStrings.properties
@@ -46,7 +46,7 @@ propertyWriteError=Error writing [{1}] on type [{0}]
 
 staticFieldELResolver.methodNotFound=No matching public static method named 
[{0}] found on class [{1}]
 staticFieldELResolver.notFound=No public static field named [{0}] was found on 
(exported for Java 9+) class [{1}]
-staticFieldELResolver.notWriteable=Writing to static fields (in this case 
field [{0}] on class [{1}]) is not permitted
+staticFieldELResolver.notWritable=Writing to static fields (in this case field 
[{0}] on class [{1}]) is not permitted
 
 util.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
 util.method.notfound=Method not

[tomcat] 01/02: writeable -> writable for consistency

2021-12-06 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 451ab4deb34c63f01c7f850ad7102a7d2734a487
Author: Mark Thomas 
AuthorDate: Mon Dec 6 08:00:30 2021 +

writeable -> writable for consistency

Excludes MBean descriptors as DTD uses writeable
---
 java/javax/el/ArrayELResolver.java   |  2 +-
 java/javax/el/BeanELResolver.java|  2 +-
 java/javax/el/ListELResolver.java|  2 +-
 java/javax/el/LocalStrings.properties|  2 +-
 java/javax/el/LocalStrings_fr.properties |  2 +-
 java/javax/el/LocalStrings_ja.properties |  2 +-
 java/javax/el/LocalStrings_ko.properties |  2 +-
 java/javax/el/LocalStrings_zh_CN.properties  |  2 +-
 java/javax/el/MapELResolver.java |  2 +-
 java/javax/el/ResourceBundleELResolver.java  |  2 +-
 java/javax/el/StaticFieldELResolver.java |  2 +-
 java/org/apache/catalina/users/mbeans-descriptors.xml|  4 ++--
 java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java   | 12 ++--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java|  4 ++--
 java/org/apache/tomcat/util/net/SecureNioChannel.java|  6 +++---
 .../catalina/webresources/AbstractTestFileResourceSet.java   |  2 +-
 .../catalina/webresources/AbstractTestResourceSet.java   |  6 +++---
 .../org/apache/catalina/webresources/TestDirResourceSet.java |  2 +-
 .../catalina/webresources/TestDirResourceSetInternal.java|  2 +-
 .../catalina/webresources/TestDirResourceSetMount.java   |  2 +-
 .../catalina/webresources/TestDirResourceSetReadOnly.java|  2 +-
 .../catalina/webresources/TestDirResourceSetVirtual.java |  2 +-
 .../org/apache/catalina/webresources/TestJarResourceSet.java |  2 +-
 .../catalina/webresources/TestJarResourceSetInternal.java|  2 +-
 .../catalina/webresources/TestJarResourceSetMount.java   |  2 +-
 test/org/apache/tomcat/util/net/TestSocketBufferHandler.java |  4 ++--
 webapps/docs/jndi-resources-howto.xml|  4 ++--
 27 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/java/javax/el/ArrayELResolver.java 
b/java/javax/el/ArrayELResolver.java
index d5e221a..c143a6d 100644
--- a/java/javax/el/ArrayELResolver.java
+++ b/java/javax/el/ArrayELResolver.java
@@ -77,7 +77,7 @@ public class ArrayELResolver extends ELResolver {
 
 if (this.readOnly) {
 throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
 }
 
 int idx = coerce(property);
diff --git a/java/javax/el/BeanELResolver.java 
b/java/javax/el/BeanELResolver.java
index d8e9489..b4372e0 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -105,7 +105,7 @@ public class BeanELResolver extends ELResolver {
 
 if (this.readOnly) {
 throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
 }
 
 Method m = this.property(context, base, property).write(context, base);
diff --git a/java/javax/el/ListELResolver.java 
b/java/javax/el/ListELResolver.java
index 52ea1f0..1c18baa 100644
--- a/java/javax/el/ListELResolver.java
+++ b/java/javax/el/ListELResolver.java
@@ -84,7 +84,7 @@ public class ListELResolver extends ELResolver {
 
 if (this.readOnly) {
 throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
 }
 
 int idx = coerce(property);
diff --git a/java/javax/el/LocalStrings.properties 
b/java/javax/el/LocalStrings.properties
index cead8de..3c51085 100644
--- a/java/javax/el/LocalStrings.properties
+++ b/java/javax/el/LocalStrings.properties
@@ -46,7 +46,7 @@ propertyWriteError=Error writing [{1}] on type [{0}]
 
 staticFieldELResolver.methodNotFound=No matching public static method named 
[{0}] found on class [{1}]
 staticFieldELResolver.notFound=No public static field named [{0}] was found on 
(exported for Java 9+) class [{1}]
-staticFieldELResolver.notWriteable=Writing to static fields (in this case 
field [{0}] on class [{1}]) is not permitted
+staticFieldELResolver.notWritable=Writing to static fields (in this case field 
[{0}] on class [{1}]) is not permitted
 
 util.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
 util.method.notfound=Method not

[tomcat] 01/02: writeable -> writable for consistency

2021-12-06 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit fbc43337ac851bdd21a4d5d7a7b327d89202bc98
Author: Mark Thomas 
AuthorDate: Mon Dec 6 08:00:30 2021 +

writeable -> writable for consistency

Excludes MBean descriptors as DTD uses writeable
---
 java/jakarta/el/ArrayELResolver.java |  2 +-
 java/jakarta/el/BeanELResolver.java  |  2 +-
 java/jakarta/el/ListELResolver.java  |  2 +-
 java/jakarta/el/LocalStrings.properties  |  2 +-
 java/jakarta/el/LocalStrings_fr.properties   |  2 +-
 java/jakarta/el/LocalStrings_ja.properties   |  2 +-
 java/jakarta/el/LocalStrings_ko.properties   |  2 +-
 java/jakarta/el/LocalStrings_zh_CN.properties|  2 +-
 java/jakarta/el/MapELResolver.java   |  2 +-
 java/jakarta/el/ResourceBundleELResolver.java|  2 +-
 java/jakarta/el/StaticFieldELResolver.java   |  2 +-
 java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java   | 12 ++--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java|  4 ++--
 java/org/apache/tomcat/util/net/SecureNioChannel.java|  6 +++---
 .../catalina/webresources/AbstractTestFileResourceSet.java   |  2 +-
 .../catalina/webresources/AbstractTestResourceSet.java   |  6 +++---
 .../org/apache/catalina/webresources/TestDirResourceSet.java |  2 +-
 .../catalina/webresources/TestDirResourceSetInternal.java|  2 +-
 .../catalina/webresources/TestDirResourceSetMount.java   |  2 +-
 .../catalina/webresources/TestDirResourceSetReadOnly.java|  2 +-
 .../catalina/webresources/TestDirResourceSetVirtual.java |  2 +-
 .../org/apache/catalina/webresources/TestJarResourceSet.java |  2 +-
 .../catalina/webresources/TestJarResourceSetInternal.java|  2 +-
 .../catalina/webresources/TestJarResourceSetMount.java   |  2 +-
 test/org/apache/tomcat/util/net/TestSocketBufferHandler.java |  4 ++--
 webapps/docs/jndi-resources-howto.xml|  4 ++--
 26 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/java/jakarta/el/ArrayELResolver.java 
b/java/jakarta/el/ArrayELResolver.java
index ce3d95b..7626deb 100644
--- a/java/jakarta/el/ArrayELResolver.java
+++ b/java/jakarta/el/ArrayELResolver.java
@@ -77,7 +77,7 @@ public class ArrayELResolver extends ELResolver {
 
 if (this.readOnly) {
 throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
 }
 
 int idx = coerce(property);
diff --git a/java/jakarta/el/BeanELResolver.java 
b/java/jakarta/el/BeanELResolver.java
index 7deca77..8057784 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -105,7 +105,7 @@ public class BeanELResolver extends ELResolver {
 
 if (this.readOnly) {
 throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
 }
 
 Method m = this.property(context, base, property).write(context, base);
diff --git a/java/jakarta/el/ListELResolver.java 
b/java/jakarta/el/ListELResolver.java
index 0184bdf..45006ba 100644
--- a/java/jakarta/el/ListELResolver.java
+++ b/java/jakarta/el/ListELResolver.java
@@ -84,7 +84,7 @@ public class ListELResolver extends ELResolver {
 
 if (this.readOnly) {
 throw new PropertyNotWritableException(Util.message(context,
-"resolverNotWriteable", base.getClass().getName()));
+"resolverNotWritable", base.getClass().getName()));
 }
 
 int idx = coerce(property);
diff --git a/java/jakarta/el/LocalStrings.properties 
b/java/jakarta/el/LocalStrings.properties
index cead8de..3c51085 100644
--- a/java/jakarta/el/LocalStrings.properties
+++ b/java/jakarta/el/LocalStrings.properties
@@ -46,7 +46,7 @@ propertyWriteError=Error writing [{1}] on type [{0}]
 
 staticFieldELResolver.methodNotFound=No matching public static method named 
[{0}] found on class [{1}]
 staticFieldELResolver.notFound=No public static field named [{0}] was found on 
(exported for Java 9+) class [{1}]
-staticFieldELResolver.notWriteable=Writing to static fields (in this case 
field [{0}] on class [{1}]) is not permitted
+staticFieldELResolver.notWritable=Writing to static fields (in this case field 
[{0}] on class [{1}]) is not permitted
 
 util.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
 util.method.notfound=Method not found: {0}.{1}({2})
diff --git

[tomcat] 01/02: writeable -> writable for consistency

[tomcat] 01/02: writeable -> writable for consistency

[tomcat] 01/02: writeable -> writable for consistency

3 matches

Site Navigation

Mail list logo

Footer information