svn commit: r1836948 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership: StaticMembershipProvider.java StaticMembershipService.java

2018-07-28 Thread markt
Author: markt
Date: Sat Jul 28 21:56:58 2018
New Revision: 1836948

URL: http://svn.apache.org/viewvc?rev=1836948&view=rev
Log:
ws police. Remove duplicate semi-colons

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java?rev=1836948&r1=1836947&r2=1836948&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
 Sat Jul 28 21:56:58 2018
@@ -45,7 +45,7 @@ public class StaticMembershipProvider ex
 
 protected static final StringManager sm = 
StringManager.getManager(StaticMembershipProvider.class);
 private static final Log log = 
LogFactory.getLog(StaticMembershipProvider.class);
- 
+
 protected Channel channel;
 protected RpcChannel rpcChannel;
 protected MembershipService service;
@@ -66,7 +66,7 @@ public class StaticMembershipProvider ex
 this.connectTimeout = Integer.parseInt(connectTimeoutStr);
 String rpcTimeouStr = properties.getProperty("rpcTimeout");
 this.rpcTimeout = Long.parseLong(rpcTimeouStr);
-this.membershipName = properties.getProperty("membershipName");;
+this.membershipName = properties.getProperty("membershipName");
 this.membershipId = 
membershipName.getBytes(StandardCharsets.ISO_8859_1);
 membership = new Membership(service.getLocalMember(true));
 this.rpcChannel = new RpcChannel(this.membershipId, channel, this);

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java?rev=1836948&r1=1836947&r2=1836948&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
 Sat Jul 28 21:56:58 2018
@@ -73,7 +73,7 @@ public class StaticMembershipService ext
 if (provider != null && provider.stop(level)) {
 // TODO JMX unregister
 provider = null;
-channel = null;;
+channel = null;
 }
 } catch (Exception e) {
 log.error(sm.getString("staticMembershipService.stopFail", 
Integer.valueOf(level)), e);
@@ -89,7 +89,7 @@ public class StaticMembershipService ext
 }
 
 @Override
-public void setLocalMemberProperties(String listenHost, int listenPort, 
+public void setLocalMemberProperties(String listenHost, int listenPort,
 int securePort, int udpPort) {
 try {
 localMember.setHostname(listenHost);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1836949 - in /tomcat/trunk: ./ conf/ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ res/maven/ webapps/docs/

2018-07-28 Thread markt
Author: markt
Date: Sat Jul 28 23:02:08 2018
New Revision: 1836949

URL: http://svn.apache.org/viewvc?rev=1836949&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62558
Add Russian translations for the Manager and Host Manager web applications.
Based on a patch by Ivan Krasnov.

Added:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
tomcat/trunk/res/maven/tomcat-i18n-ru.pom
Modified:
tomcat/trunk/build.xml
tomcat/trunk/conf/catalina.properties
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1836949&r1=1836948&r2=1836949&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sat Jul 28 23:02:08 2018
@@ -916,6 +916,16 @@
   
 
+
+  
+
+  
+  
+  
+
 
   
 

Modified: tomcat/trunk/conf/catalina.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1836949&r1=1836948&r2=1836949&view=diff
==
--- tomcat/trunk/conf/catalina.properties (original)
+++ tomcat/trunk/conf/catalina.properties Sat Jul 28 23:02:08 2018
@@ -114,7 +114,7 @@ catalina-tribes.jar,\
 jasper.jar,jasper-el.jar,ecj-*.jar,\
 tomcat-api.jar,tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,\
 tomcat-dbcp.jar,tomcat-jni.jar,tomcat-websocket.jar,\
-tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
+tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,tomcat-i18n-ru.jar,\
 tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
 tomcat-jdbc.jar,\
 tools.jar,\

Added: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties?rev=1836949&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties 
(added)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties 
Sat Jul 28 23:02:08 2018
@@ -0,0 +1,138 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+htmlManagerServlet.appsAvailable=\u0417\u0430\u043f\u0443\u0449\u0435\u043d\u043e
+htmlManagerServlet.appsName=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
+htmlManagerServlet.appsPath=\u041f\u0443\u0442\u044c
+htmlManagerServlet.appsReload=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430
+htmlManagerServlet.appsUndeploy=\u0420\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u044c
+htmlManagerServlet.appsVersion=\u0412\u0435\u0440\u0441\u0438\u044f
+htmlManagerServlet.appsExpire=\u041f\u0440\u0438\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c
+htmlManagerServlet.appsSessions=\u0043\u0435\u0430\u043d\u0441
+htmlManagerServlet.appsStart=\u0421\u0442\u0430\u0440\u0442
+htmlManagerServlet.appsStop=\u0421\u0442\u043e\u043f
+htmlManagerServlet.appsTasks=\u041a\u043e\u043c\u0430\u043d\u0434\u044b
+htmlManagerServlet.appsTitle=\u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f
+htmlManagerServlet.noVersion=\u041d\u0435 
\u0443\u043a\u0430\u0437\u0430\u043d\u043e
+htmlManagerServlet.expire.explain=\u0441 
\u0431\u0435\u0437\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435\u043c ≥
+htmlManagerServlet.expire.unit=\u043c\u0438\u043d\u0443\u0442
+htmlManagerServlet.helpHtmlManager=\u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a
 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
+htmlManagerServlet.helpManager=\u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a
 \u043c\u0435\u043d\u0435\u0434\u0436\u0435\u0440\u0430 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
+htmlManagerServlet.configTitle=\u041a\u043e\u043d\u0444\u0438\u0433\u0443

[Bug 62558] Tomcat Russian localization

2018-07-28 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62558

--- Comment #5 from Mark Thomas  ---
Many thanks for the patch. I have applied it to 9.0.x. I'll look at back-ports
next.

I ran the translations through Google Translate and fixed what looked like a
couple of typos. I also fixed a couple of minor whitespace issues CheckStyle
was complaining about.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org