tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1637926 - in /tomcat/trunk/java/org/apache/tomcat/util/net: ./ res/
Date Mon, 10 Nov 2014 16:46:22 GMT
Author: markt
Date: Mon Nov 10 16:46:21 2014
New Revision: 1637926

URL: http://svn.apache.org/r1637926
Log:
Move message resources to same package for consistency with other Tomcat
code

Added:
    tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties   (contents, props
changed)
      - copied, changed from r1637925, tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_es.properties   (contents, props
changed)
      - copied, changed from r1637925, tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_fr.properties   (contents, props
changed)
      - copied, changed from r1637925, tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ja.properties   (contents, props
changed)
      - copied, changed from r1637925, tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
Removed:
    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
    tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java
    tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1637926&r1=1637925&r2=1637926&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Nov 10 16:46:21
2014
@@ -52,7 +52,8 @@ public abstract class AbstractEndpoint<S
 
     protected static final String DEFAULT_CIPHERS = "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5";
 
-    protected static final StringManager sm = StringManager.getManager("org.apache.tomcat.util.net.res");
+    protected static final StringManager sm = StringManager.getManager(
+            AbstractEndpoint.class.getPackage().getName());
 
     public static interface Handler {
         /**

Copied: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties (from r1637925,
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?p2=tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties&p1=tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties&r1=1637925&r2=1637926&rev=1637926&view=diff
==============================================================================
    (empty)

Propchange: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_es.properties (from r1637925,
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_es.properties?p2=tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_es.properties&p1=tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties&r1=1637925&r2=1637926&rev=1637926&view=diff
==============================================================================
    (empty)

Propchange: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_fr.properties (from r1637925,
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_fr.properties?p2=tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_fr.properties&p1=tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties&r1=1637925&r2=1637926&rev=1637926&view=diff
==============================================================================
    (empty)

Propchange: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ja.properties (from r1637925,
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ja.properties?p2=tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ja.properties&p1=tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties&r1=1637925&r2=1637926&rev=1637926&view=diff
==============================================================================
    (empty)

Propchange: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java?rev=1637926&r1=1637925&r2=1637926&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java Mon Nov 10 16:46:21 2014
@@ -37,8 +37,8 @@ import org.apache.tomcat.util.res.String
  */
 public class NioChannel implements ByteChannel {
 
-    protected static final StringManager sm =
-            StringManager.getManager("org.apache.tomcat.util.net.res");
+    protected static final StringManager sm = StringManager.getManager(
+            NioChannel.class.getPackage().getName());
 
     protected static ByteBuffer emptyBuf = ByteBuffer.allocate(0);
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1637926&r1=1637925&r2=1637926&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Mon Nov 10 16:46:21
2014
@@ -41,7 +41,8 @@ import org.apache.tomcat.util.res.String
  */
 public class SecureNio2Channel extends Nio2Channel  {
 
-    protected static final StringManager sm = StringManager.getManager("org.apache.tomcat.util.net.res");
+    protected static final StringManager sm = StringManager.getManager(
+            SecureNio2Channel.class.getPackage().getName());
 
     protected ByteBuffer netInBuffer;
     protected ByteBuffer netOutBuffer;



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


Mime
View raw message