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 <ma...@apache.org>
AuthorDate: Mon Dec 6 08:00:30 2021 +0000
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 found: {0}.{1}({2})
diff --git a/java/javax/el/LocalStrings_fr.properties
b/java/javax/el/LocalStrings_fr.properties
index 560f8a6..384b2a4 100644
--- a/java/javax/el/LocalStrings_fr.properties
+++ b/java/javax/el/LocalStrings_fr.properties
@@ -46,7 +46,7 @@ propertyWriteError=Erreur d''écriture [{1}] sur le type [{0}]
staticFieldELResolver.methodNotFound=Aucune méthode publique et statique
nommée [{0}] n''a été trouvée dans la classe [{1}]
staticFieldELResolver.notFound=Aucun champ public statique nommé [{0}] n''a
été trouvé dans la classe [{1}] (exportée pour Java 9+)
-staticFieldELResolver.notWriteable=L''écriture dans les champs statiques
(champ [{0}] dans la classe [{1}] dans le cas présent) est interdite
+staticFieldELResolver.notWritable=L''écriture dans les champs statiques (champ
[{0}] dans la classe [{1}] dans le cas présent) est interdite
util.method.ambiguous=Impossible de trouver une méthode non ambiguë :
{0}.{1}({2})
util.method.notfound=Méthode non trouvée : {0}.{1}({2})
diff --git a/java/javax/el/LocalStrings_ja.properties
b/java/javax/el/LocalStrings_ja.properties
index 50c662a..2fcb9b9 100644
--- a/java/javax/el/LocalStrings_ja.properties
+++ b/java/javax/el/LocalStrings_ja.properties
@@ -46,7 +46,7 @@ propertyWriteError=タイプ[{0}]の[{1}]への書き込みエラー
staticFieldELResolver.methodNotFound=クラス[{1}]に[{0}]という名前に一致するpublic
staticメソッドが見つかりません。
staticFieldELResolver.notFound=(Java 9 以降ではエクスポートされた)
クラス[{1}]に[{0}]という名前のpublic staticフィールドが見つかりませんでした。
-staticFieldELResolver.notWriteable=静的フィールド（この場合、クラス[{1}]のフィールド[{0}）への書き込みは許可されていません。
+staticFieldELResolver.notWritable=静的フィールド（この場合、クラス[{1}]のフィールド[{0}）への書き込みは許可されていません。
util.method.ambiguous=曖昧さのないメソッドを見つけることができません：{0}。{1}（{2}）
util.method.notfound=メソッドが見つかりません：{0}。{1}（{2}）
diff --git a/java/javax/el/LocalStrings_ko.properties
b/java/javax/el/LocalStrings_ko.properties
index 6d0fae9..d3d3dc5 100644
--- a/java/javax/el/LocalStrings_ko.properties
+++ b/java/javax/el/LocalStrings_ko.properties
@@ -46,7 +46,7 @@ propertyWriteError=타입 [{0}]에 [{1}]을(를) 쓰는 중 오류 발생
staticFieldELResolver.methodNotFound=클래스 [{1}]에 [{0}](이)라는 이름의 public static
메소드가 발견되지 않습니다.
staticFieldELResolver.notFound=클래스 [{1}]에, [{0}](이)라는 이름의 public static 필드가
없습니다.
-staticFieldELResolver.notWriteable=정적 필드들에 대해 쓰기는 허용되지 않습니다 (이번 경우는 클래스 [{1}]의
필드 [{0}]).
+staticFieldELResolver.notWritable=정적 필드들에 대해 쓰기는 허용되지 않습니다 (이번 경우는 클래스 [{1}]의
필드 [{0}]).
util.method.ambiguous=애매하지 않고 명백하게 메소드를 찾을 수 없습니다: {0}.{1}({2})
util.method.notfound=메소드를 찾을 수 없습니다: {0}.{1}({2})
diff --git a/java/javax/el/LocalStrings_zh_CN.properties
b/java/javax/el/LocalStrings_zh_CN.properties
index b8cc58b..434064f 100644
--- a/java/javax/el/LocalStrings_zh_CN.properties
+++ b/java/javax/el/LocalStrings_zh_CN.properties
@@ -46,7 +46,7 @@ propertyWriteError=在类型[{0}]上写入[{1}]时出错
staticFieldELResolver.methodNotFound=在类[{1}]上找不到名为[{0}]的匹配的公共静态方法
staticFieldELResolver.notFound=（Java 9+导出）类[{1}]上找不到名为[{0}]的公共静态字段
-staticFieldELResolver.notWriteable=不允许写入静态字段（当前情况中为类[{1}]上的字段[{0}]）
+staticFieldELResolver.notWritable=不允许写入静态字段（当前情况中为类[{1}]上的字段[{0}]）
util.method.ambiguous=无法找到明确的方法：{0}.{1}({2})
util.method.notfound=找不到方法：{0}.{1}({2})
diff --git a/java/javax/el/MapELResolver.java b/java/javax/el/MapELResolver.java
index f43a2db..5306bf3 100644
--- a/java/javax/el/MapELResolver.java
+++ b/java/javax/el/MapELResolver.java
@@ -74,7 +74,7 @@ public class MapELResolver extends ELResolver {
if (this.readOnly) {
throw new PropertyNotWritableException(Util.message(context,
- "resolverNotWriteable", base.getClass().getName()));
+ "resolverNotWritable", base.getClass().getName()));
}
try {
diff --git a/java/javax/el/ResourceBundleELResolver.java
b/java/javax/el/ResourceBundleELResolver.java
index 1c44165..a387232 100644
--- a/java/javax/el/ResourceBundleELResolver.java
+++ b/java/javax/el/ResourceBundleELResolver.java
@@ -70,7 +70,7 @@ public class ResourceBundleELResolver extends ELResolver {
if (base instanceof ResourceBundle) {
context.setPropertyResolved(base, property);
throw new PropertyNotWritableException(Util.message(context,
- "resolverNotWriteable", base.getClass().getName()));
+ "resolverNotWritable", base.getClass().getName()));
}
}
diff --git a/java/javax/el/StaticFieldELResolver.java
b/java/javax/el/StaticFieldELResolver.java
index e504601..717cba7 100644
--- a/java/javax/el/StaticFieldELResolver.java
+++ b/java/javax/el/StaticFieldELResolver.java
@@ -75,7 +75,7 @@ public class StaticFieldELResolver extends ELResolver {
String name = (String) property;
throw new PropertyNotWritableException(Util.message(context,
- "staticFieldELResolver.notWriteable", name,
+ "staticFieldELResolver.notWritable", name,
clazz.getName()));
}
}
diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml
b/java/org/apache/catalina/users/mbeans-descriptors.xml
index ea7acfd..1e77395 100644
--- a/java/org/apache/catalina/users/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/users/mbeans-descriptors.xml
@@ -50,8 +50,8 @@
type="boolean"
writeable="false"/>
- <attribute name="writeable"
- description="Check if user database is writeable"
+ <attribute name="writable"
+ description="Check if user database is writable"
is="true"
writeable="false"/>
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index ef9168a..1195997 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -762,7 +762,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
reduceOverheadCount(FrameType.DATA);
// Need to check this now since sending end of stream will change this.
- boolean writeable = stream.canWrite();
+ boolean writable = stream.canWrite();
byte[] header = new byte[9];
ByteUtil.setThreeBytes(header, 0, len);
header[3] = FrameType.DATA.getIdByte();
@@ -773,7 +773,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
}
}
- if (writeable) {
+ if (writable) {
ByteUtil.set31Bits(header, 5, stream.getIdAsInt());
synchronized (socketWrapper) {
try {
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index cd42a5c..7ef3528 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -393,7 +393,7 @@ public class SecureNioChannel extends NioChannel {
}
handshakeComplete = false;
boolean isReadable = false;
- boolean isWriteable = false;
+ boolean isWritable = false;
boolean handshaking = true;
Selector selector = null;
SelectionKey key = null;
@@ -401,7 +401,7 @@ public class SecureNioChannel extends NioChannel {
sslEngine.beginHandshake();
handshakeStatus = sslEngine.getHandshakeStatus();
while (handshaking) {
- int hsStatus = this.handshake(isReadable, isWriteable);
+ int hsStatus = this.handshake(isReadable, isWritable);
switch (hsStatus) {
case -1 : throw new
EOFException(sm.getString("channel.nio.ssl.eofDuringHandshake"));
case 0 : handshaking = false; break;
@@ -418,7 +418,7 @@ public class SecureNioChannel extends NioChannel {
throw new
SocketTimeoutException(sm.getString("channel.nio.ssl.timeoutDuringHandshake"));
}
isReadable = key.isReadable();
- isWriteable = key.isWritable();
+ isWritable = key.isWritable();
}
}
}
diff --git
a/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
b/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
index fb24aff..d61c15b 100644
--- a/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
+++ b/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
@@ -64,7 +64,7 @@ public abstract class AbstractTestFileResourceSet extends
AbstractTestResourceSe
}
@Override
- protected boolean isWriteable() {
+ protected boolean isWritable() {
return !readOnly;
}
diff --git a/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
b/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
index 095781e..ce4c31b 100644
--- a/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
+++ b/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
@@ -38,7 +38,7 @@ public abstract class AbstractTestResourceSet {
protected WebResourceRoot resourceRoot;
protected abstract WebResourceRoot getWebResourceRoot();
- protected abstract boolean isWriteable();
+ protected abstract boolean isWritable();
public String getMount() {
return "";
@@ -399,7 +399,7 @@ public abstract class AbstractTestResourceSet {
@Test
public final void testMkdirNew() {
String newDirName = getNewDirName();
- if (isWriteable()) {
+ if (isWritable()) {
Assert.assertTrue(resourceRoot.mkdir(getMount() + "/" +
newDirName));
File file = new File(getBaseDir(), newDirName);
@@ -472,7 +472,7 @@ public abstract class AbstractTestResourceSet {
public final void testWrite() {
String newFileName = getNewFileName();
InputStream is = new ByteArrayInputStream("test".getBytes());
- if (isWriteable()) {
+ if (isWritable()) {
Assert.assertTrue(resourceRoot.write(
getMount() + "/" + newFileName, is, false));
File file = new File(getBaseDir(), newFileName);
diff --git a/test/org/apache/catalina/webresources/TestDirResourceSet.java
b/test/org/apache/catalina/webresources/TestDirResourceSet.java
index 33a20cf..f636c18 100644
--- a/test/org/apache/catalina/webresources/TestDirResourceSet.java
+++ b/test/org/apache/catalina/webresources/TestDirResourceSet.java
@@ -60,7 +60,7 @@ public class TestDirResourceSet extends
AbstractTestResourceSet {
}
@Override
- protected boolean isWriteable() {
+ protected boolean isWritable() {
return true;
}
diff --git
a/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
b/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
index 108fc77..ffb7a6d 100644
--- a/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
+++ b/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
@@ -58,7 +58,7 @@ public class TestDirResourceSetInternal extends
AbstractTestResourceSet {
}
@Override
- protected boolean isWriteable() {
+ protected boolean isWritable() {
return true;
}
diff --git a/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
b/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
index dc413c9..9282669 100644
--- a/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
+++ b/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
@@ -59,7 +59,7 @@ public class TestDirResourceSetMount extends
AbstractTestResourceSetMount {
}
@Override
- protected boolean isWriteable() {
+ protected boolean isWritable() {
return true;
}
diff --git
a/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java
b/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java
index e8e0a58..02ba3b2 100644
--- a/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java
+++ b/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java
@@ -34,7 +34,7 @@ public class TestDirResourceSetReadOnly extends
AbstractTestResourceSet {
}
@Override
- protected boolean isWriteable() {
+ protected boolean isWritable() {
return false;
}
diff --git
a/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
b/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
index bf79b28..02c7736 100644
--- a/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
+++ b/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
@@ -76,7 +76,7 @@ public class TestDirResourceSetVirtual extends
AbstractTestResourceSet {
}
@Override
- protected boolean isWriteable() {
+ protected boolean isWritable() {
return true;
}
diff --git a/test/org/apache/catalina/webresources/TestJarResourceSet.java
b/test/org/apache/catalina/webresources/TestJarResourceSet.java
index ed6c65f..8aa14c9 100644
--- a/test/org/apache/catalina/webresources/TestJarResourceSet.java
+++ b/test/org/apache/catalina/webresources/TestJarResourceSet.java
@@ -36,7 +36,7 @@ public class TestJarResourceSet extends
AbstractTestResourceSet {
}
@Override
- protected boolean isWriteable() {
+ protected boolean isWritable() {
return false;
}
diff --git
a/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
b/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
index 1eb15f4..2718849 100644
--- a/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
+++ b/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
@@ -36,7 +36,7 @@ public class TestJarResourceSetInternal extends
AbstractTestResourceSet {
}
@Override
- protected boolean isWriteable() {
+ protected boolean isWritable() {
return false;
}
diff --git a/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
b/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
index 8d3eeef..31a04cd 100644
--- a/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
+++ b/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
@@ -34,7 +34,7 @@ public class TestJarResourceSetMount extends
AbstractTestResourceSetMount {
}
@Override
- protected boolean isWriteable() {
+ protected boolean isWritable() {
return false;
}
diff --git a/webapps/docs/jndi-resources-howto.xml
b/webapps/docs/jndi-resources-howto.xml
index 4cdba75..ec202f8 100644
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
@@ -476,7 +476,7 @@ public class MyBean2 {
</p>
<p>The <code>readonly</code> attribute is optional and defaults to
- <code>true</code> if not supplied. If the XML is writeable then it will be
+ <code>true</code> if not supplied. If the XML is writable then it will be
written to when Tomcat starts. <strong>WARNING:</strong> When the file is
written it will inherit the default file permissions for the user Tomcat
is running as. Ensure that these are appropriate to maintain the security
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
