You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/06/29 21:01:22 UTC

svn commit: r1750723 - in /tomcat/trunk/java/org/apache/naming: Constants.java ContextBindings.java NamingContext.java SelectorContext.java StringManager.java

Author: markt
Date: Wed Jun 29 21:01:22 2016
New Revision: 1750723

URL: http://svn.apache.org/viewvc?rev=1750723&view=rev
Log:
Make the o.a.naming.Constants class unused and deprecated it.

Modified:
    tomcat/trunk/java/org/apache/naming/Constants.java
    tomcat/trunk/java/org/apache/naming/ContextBindings.java
    tomcat/trunk/java/org/apache/naming/NamingContext.java
    tomcat/trunk/java/org/apache/naming/SelectorContext.java
    tomcat/trunk/java/org/apache/naming/StringManager.java

Modified: tomcat/trunk/java/org/apache/naming/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/Constants.java?rev=1750723&r1=1750722&r2=1750723&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/Constants.java (original)
+++ tomcat/trunk/java/org/apache/naming/Constants.java Wed Jun 29 21:01:22 2016
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.naming;
 
 
 /**
  * Static constants for this package.
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9.
  */
-
+@Deprecated
 public final class Constants {
 
     public static final String Package = "org.apache.naming";

Modified: tomcat/trunk/java/org/apache/naming/ContextBindings.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ContextBindings.java?rev=1750723&r1=1750722&r2=1750723&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ContextBindings.java (original)
+++ tomcat/trunk/java/org/apache/naming/ContextBindings.java Wed Jun 29 21:01:22 2016
@@ -72,7 +72,7 @@ public class ContextBindings {
     /**
      * The string manager for this package.
      */
-    protected static final StringManager sm = StringManager.getManager(Constants.Package);
+    protected static final StringManager sm = StringManager.getManager(ContextBindings.class);
 
 
     // --------------------------------------------------------- Public Methods

Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=1750723&r1=1750722&r2=1750723&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Wed Jun 29 21:01:22 2016
@@ -114,7 +114,7 @@ public class NamingContext implements Co
     /**
      * The string manager for this package.
      */
-    protected static final StringManager sm = StringManager.getManager(Constants.Package);
+    protected static final StringManager sm = StringManager.getManager(NamingContext.class);
 
 
     /**

Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=1750723&r1=1750722&r2=1750723&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Wed Jun 29 21:01:22 2016
@@ -100,7 +100,7 @@ public class SelectorContext implements
     /**
      * The string manager for this package.
      */
-    protected static final StringManager sm = StringManager.getManager(Constants.Package);
+    protected static final StringManager sm = StringManager.getManager(SelectorContext.class);
 
 
     /**

Modified: tomcat/trunk/java/org/apache/naming/StringManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/StringManager.java?rev=1750723&r1=1750722&r2=1750723&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/naming/StringManager.java Wed Jun 29 21:01:22 2016
@@ -174,4 +174,8 @@ public class StringManager {
         return mgr;
     }
 
+
+    public static final StringManager getManager(Class<?> clazz) {
+        return getManager(clazz.getPackage().getName());
+    }
 }



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