This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 2ada85d Remove deprecated code.
2ada85d is described below
commit 2ada85d0acc170b48d6799bef8f62d39fd0058d9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 2 16:06:17 2020 +0100
Remove deprecated code.
---
.../tribes/membership/LocalStrings.properties | 1 -
.../tribes/membership/LocalStrings_fr.properties | 1 -
.../tribes/membership/LocalStrings_ja.properties | 1 -
.../tribes/membership/LocalStrings_ko.properties | 1 -
.../catalina/tribes/membership/MemberImpl.java | 27 +++++-----------------
webapps/docs/changelog.xml | 9 ++++++++
webapps/docs/config/systemprops.xml | 15 ------------
7 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
index 6237640..2816301 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
@@ -51,7 +51,6 @@ memberImpl.invalid.package.end=Invalid package, should end
with:[{0}]
memberImpl.large.payload=Payload is too large for tribes to handle.
memberImpl.notEnough.bytes=Not enough bytes in member package.
memberImpl.package.small=Member package too small to validate.
-memberImpl.unableParse.hostname=Unable to parse hostname.
staticMember.invalid.uuidLength=UUID must be exactly 16 bytes, not:[{0}]
diff --git
a/java/org/apache/catalina/tribes/membership/LocalStrings_fr.properties
b/java/org/apache/catalina/tribes/membership/LocalStrings_fr.properties
index 558c801..4d9d6aa 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings_fr.properties
@@ -51,7 +51,6 @@ memberImpl.invalid.package.end=le paquet est invalide, il
devrait se terminer pa
memberImpl.large.payload=Le contenu est trop gros pour être géré par Tribes
memberImpl.notEnough.bytes=Pas assez d'octets dans le paquet membre
memberImpl.package.small=Le paquet du membre est trop petit pour être validé
-memberImpl.unableParse.hostname=Incapable d'analyser le nom d'hôte (hostname)
staticMember.invalid.uuidLength=Un UUID doit faire exactement 16 octets et non
[{0}]
diff --git
a/java/org/apache/catalina/tribes/membership/LocalStrings_ja.properties
b/java/org/apache/catalina/tribes/membership/LocalStrings_ja.properties
index 60a639d..fd34211 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings_ja.properties
@@ -51,7 +51,6 @@ memberImpl.invalid.package.end=不正なパッケージです。[{0}] で終端
memberImpl.large.payload=ペイロードはtribes が処理するには大きすぎます。
memberImpl.notEnough.bytes=メンバーパッケージのバイト長が不足しています。
memberImpl.package.small=メンバーパッケージが小さすぎて検証できません。
-memberImpl.unableParse.hostname=ホスト名を解析できません。
staticMember.invalid.uuidLength=UUIDは正確に16バイトでなければなりません。[{0}]
diff --git
a/java/org/apache/catalina/tribes/membership/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/membership/LocalStrings_ko.properties
index 7f53838..258ade1 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings_ko.properties
@@ -51,7 +51,6 @@ memberImpl.invalid.package.end=유효하지 않은 패키지. [{0}](으)로 끝
memberImpl.large.payload=Payload가 너무 커서 tribe들이 처리할 수 없습니다.
memberImpl.notEnough.bytes=멤버 데이터 바이트 배열에 충분한 데이터가 존재하지 않습니다.
memberImpl.package.small=멤버 패키지가 너무 작아서, 유효한지 확인할 수 없습니다.
-memberImpl.unableParse.hostname=호스트 이름을 파싱할 수 없습니다.
staticMember.invalid.uuidLength=UUID는 정확히 16 바이트여야만 합니다. [{0}]이어서는 안됩니다.
diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java
b/java/org/apache/catalina/tribes/membership/MemberImpl.java
index eb52eae..8e994e0 100644
--- a/java/org/apache/catalina/tribes/membership/MemberImpl.java
+++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java
@@ -35,15 +35,6 @@ import org.apache.catalina.tribes.util.StringManager;
*/
public class MemberImpl implements Member, java.io.Externalizable {
- /**
- * Should a call to getName or getHostName try to do a DNS lookup?
- * default is false
- *
- * @deprecated This will be removed without replacement in Tomact 10
onwards
- */
- @Deprecated
- public static final boolean DO_DNS_LOOKUPS =
Boolean.parseBoolean(System.getProperty("org.apache.catalina.tribes.dns_lookups","false"));
-
public static final transient byte[] TRIBES_MBR_BEGIN = new byte[] {84,
82, 73, 66, 69, 83, 45, 66, 1, 0};
public static final transient byte[] TRIBES_MBR_END = new byte[] {84,
82, 73, 66, 69, 83, 45, 69, 1, 0};
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
@@ -456,18 +447,12 @@ public class MemberImpl implements Member,
java.io.Externalizable {
}
public String getHostname() {
- if ( this.hostname != null ) return hostname;
- else {
- try {
- byte[] host = this.host;
- if (DO_DNS_LOOKUPS)
- this.hostname =
java.net.InetAddress.getByAddress(host).getHostName();
- else
- this.hostname =
org.apache.catalina.tribes.util.Arrays.toString(host,0,host.length,true);
- return this.hostname;
- }catch ( IOException x ) {
- throw new
RuntimeException(sm.getString("memberImpl.unableParse.hostname"),x);
- }
+ if (this.hostname != null) {
+ return hostname;
+ } else {
+ byte[] host = this.host;
+ this.hostname =
org.apache.catalina.tribes.util.Arrays.toString(host, 0, host.length, true);
+ return this.hostname;
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8864446..fd64a5c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -211,6 +211,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Tribes">
+ <changelog>
+ <scode>
+ Remove support for the deprecated system property
+ <code>org.apache.catalina.tribes.dns_lookups</code>. The default value
+ of <code>false</code> will now always be used. (markt)
+ </scode>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<add>
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index f4391ca..f7dc92c 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -65,21 +65,6 @@
</section>
-<section name="Clustering">
- <properties>
-
- <property name="org.apache.catalina. tribes.dns_lookups">
- <p>This system property is deprecated and will be removed without
- replacement in Apache Tomcat 10 onwards.</p>
- <p>If <code>true</code>, the clustering module will attempt to use DNS to
- resolve any host names provided in the cluster configuration.</p>
- <p>If not specified, the default value of <code>false</code> will be
used.</p>
- </property>
-
- </properties>
-
-</section>
-
<section name="Expression Language">
<properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
