tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1225631 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/ java/org/apache/naming/resources/
Date Thu, 29 Dec 2011 19:49:29 GMT
Author: markt
Date: Thu Dec 29 19:49:28 2011
New Revision: 1225631

URL: http://svn.apache.org/viewvc?rev=1225631&view=rev
Log:
UCDectetor: Deprecate / add TODOs to currently unused code

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/naming/ContextBindings.java
    tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ProxyDirContext.java
    tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ResourceAttributes.java
    tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ResourceCache.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 29 19:49:28 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
 753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1
 202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,1222201,1222276,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
 753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1
 202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,1222201,1222276,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627

Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/ContextBindings.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/ContextBindings.java?rev=1225631&r1=1225630&r2=1225631&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/ContextBindings.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/ContextBindings.java Thu Dec 29 19:49:28 2011
@@ -43,35 +43,35 @@ public class ContextBindings {
     /**
      * Bindings name - naming context. Keyed by name.
      */
-    private static Hashtable<Object,Context> contextNameBindings =
+    private static final Hashtable<Object,Context> contextNameBindings =
         new Hashtable<Object,Context>();
 
 
     /**
      * Bindings thread - naming context. Keyed by thread id.
      */
-    private static Hashtable<Thread,Context> threadBindings =
+    private static final Hashtable<Thread,Context> threadBindings =
         new Hashtable<Thread,Context>();
 
 
     /**
      * Bindings thread - name. Keyed by thread id.
      */
-    private static Hashtable<Thread,Object> threadNameBindings =
+    private static final Hashtable<Thread,Object> threadNameBindings =
         new Hashtable<Thread,Object>();
 
 
     /**
      * Bindings class loader - naming context. Keyed by CL id.
      */
-    private static Hashtable<ClassLoader,Context> clBindings =
+    private static final Hashtable<ClassLoader,Context> clBindings =
         new Hashtable<ClassLoader,Context>();
 
 
     /**
      * Bindings class loader - name. Keyed by CL id.
      */
-    private static Hashtable<ClassLoader,Object> clNameBindings =
+    private static final Hashtable<ClassLoader,Object> clNameBindings =
         new Hashtable<ClassLoader,Object>();
 
 
@@ -114,7 +114,10 @@ public class ContextBindings {
      * Unbind context name.
      * 
      * @param name Name of the context
+     *
+     * @deprecated - unused
      */
+    @Deprecated
     public static void unbindContext(Object name) {
         unbindContext(name, null);
     }
@@ -146,8 +149,11 @@ public class ContextBindings {
      * Binds a naming context to a thread.
      * 
      * @param name Name of the context
+     *
+     * @deprecated - unused
      */
-    public static void bindThread(Object name) 
+    @Deprecated
+    public static void bindThread(Object name)
         throws NamingException {
         bindThread(name, null);
     }
@@ -176,7 +182,10 @@ public class ContextBindings {
      * Unbinds a naming context to a thread.
      * 
      * @param name Name of the context
+     *
+     * @deprecated - unused
      */
+    @Deprecated
     public static void unbindThread(Object name) {
         unbindThread(name, null);
     }
@@ -234,8 +243,11 @@ public class ContextBindings {
      * Binds a naming context to a class loader.
      * 
      * @param name Name of the context
+     *
+     * @deprecated - unused
      */
-    public static void bindClassLoader(Object name) 
+    @Deprecated
+    public static void bindClassLoader(Object name)
         throws NamingException {
         bindClassLoader(name, null);
     }
@@ -246,8 +258,11 @@ public class ContextBindings {
      * 
      * @param name Name of the context
      * @param token Security token
+     *
+     * @deprecated - unused
      */
-    public static void bindClassLoader(Object name, Object token) 
+    @Deprecated
+    public static void bindClassLoader(Object name, Object token)
         throws NamingException {
         bindClassLoader
             (name, token, Thread.currentThread().getContextClassLoader());
@@ -278,7 +293,10 @@ public class ContextBindings {
      * Unbinds a naming context to a class loader.
      * 
      * @param name Name of the context
+     *
+     * @deprecated - unused
      */
+    @Deprecated
     public static void unbindClassLoader(Object name) {
         unbindClassLoader(name, null);
     }
@@ -289,7 +307,10 @@ public class ContextBindings {
      * 
      * @param name Name of the context
      * @param token Security token
+     *
+     * @deprecated - unused
      */
+    @Deprecated
     public static void unbindClassLoader(Object name, Object token) {
         unbindClassLoader(name, token, 
                           Thread.currentThread().getContextClassLoader());

Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ProxyDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ProxyDirContext.java?rev=1225631&r1=1225630&r2=1225631&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ProxyDirContext.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ProxyDirContext.java Thu Dec 29
19:49:28 2011
@@ -203,7 +203,9 @@ public class ProxyDirContext implements 
 
     /**
      * Return the actual directory context we are wrapping.
+     * @deprecated - unused
      */
+    @Deprecated
     public DirContext getDirContext() {
         return this.dirContext;
     }
@@ -211,7 +213,9 @@ public class ProxyDirContext implements 
 
     /**
      * Return the document root for this component.
+     * @deprecated - unused
      */
+    @Deprecated
     public String getDocBase() {
         if (dirContext instanceof BaseDirContext)
             return ((BaseDirContext) dirContext).getDocBase();

Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ResourceAttributes.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ResourceAttributes.java?rev=1225631&r1=1225630&r2=1225631&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ResourceAttributes.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ResourceAttributes.java Thu Dec
29 19:49:28 2011
@@ -375,7 +375,9 @@ public class ResourceAttributes implemen
      * Set creation.
      * 
      * @param creation New creation value
+     * @deprecated - unused
      */
+    @Deprecated
     public void setCreation(long creation) {
         this.creation = creation;
         this.creationDate = null;
@@ -560,7 +562,9 @@ public class ResourceAttributes implemen
      * Last modified date mutator.
      * 
      * @param lastModifiedDate New last modified date
+     * @deprecated - unused
      */
+    @Deprecated
     public void setLastModifiedDate(Date lastModifiedDate) {
         this.lastModified = lastModifiedDate.getTime();
         this.lastModifiedDate = lastModifiedDate;
@@ -591,7 +595,9 @@ public class ResourceAttributes implemen
     
     /**
      * @param lastModifiedHttp The lastModifiedHttp to set.
+     * @deprecated - unused
      */
+    @Deprecated
     public void setLastModifiedHttp(String lastModifiedHttp) {
         this.lastModifiedHttp = lastModifiedHttp;
     }

Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ResourceCache.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ResourceCache.java?rev=1225631&r1=1225630&r2=1225631&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ResourceCache.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ResourceCache.java Thu Dec 29 19:49:28
2011
@@ -111,6 +111,7 @@ public class ResourceCache {
      * Return the access count.
      * Note: Update is not synced, so the number may not be completely 
      * accurate.
+     * TODO: Currently unused. Expose via JMX?
      */
     public long getAccessCount() {
         return accessCount;
@@ -119,6 +120,7 @@ public class ResourceCache {
 
     /**
      * Return the maximum size of the cache in KB.
+     * TODO: Currently unused. Expose via JMX?
      */
     public int getCacheMaxSize() {
         return cacheMaxSize;
@@ -135,6 +137,7 @@ public class ResourceCache {
 
     /**
      * Return the current cache size in KB.
+     * TODO: Currently unused. Expose via JMX?
      */
     public int getCacheSize() {
         return cacheSize;
@@ -143,7 +146,9 @@ public class ResourceCache {
 
     /**
      * Return desired entry access ratio.
+     * @deprecated - unused
      */
+    @Deprecated
     public long getDesiredEntryAccessRatio() {
         return desiredEntryAccessRatio;
     }
@@ -151,7 +156,9 @@ public class ResourceCache {
 
     /**
      * Set the desired entry access ratio.
+     * @deprecated - unused
      */
+    @Deprecated
     public void setDesiredEntryAccessRatio(long desiredEntryAccessRatio) {
         this.desiredEntryAccessRatio = desiredEntryAccessRatio;
     }
@@ -161,6 +168,7 @@ public class ResourceCache {
      * Return the number of cache hits.
      * Note: Update is not synced, so the number may not be completely 
      * accurate.
+     * TODO: Currently unused. Expose via JMX?
      */
     public long getHitsCount() {
         return hitsCount;
@@ -169,7 +177,9 @@ public class ResourceCache {
 
     /**
      * Return the maximum amount of iterations during a space allocation.
+     * @deprecated - unused
      */
+    @Deprecated
     public int getMaxAllocateIterations() {
         return maxAllocateIterations;
     }
@@ -177,7 +187,9 @@ public class ResourceCache {
 
     /**
      * Set the maximum amount of iterations during a space allocation.
+     * @deprecated - unused
      */
+    @Deprecated
     public void setMaxAllocateIterations(int maxAllocateIterations) {
         this.maxAllocateIterations = maxAllocateIterations;
     }
@@ -185,7 +197,9 @@ public class ResourceCache {
 
     /**
      * Return the amount of spare not found entries.
+     * @deprecated - unused
      */
+    @Deprecated
     public int getSpareNotFoundEntries() {
         return spareNotFoundEntries;
     }
@@ -193,7 +207,9 @@ public class ResourceCache {
 
     /**
      * Set the amount of spare not found entries.
+     * @deprecated - unused
      */
+    @Deprecated
     public void setSpareNotFoundEntries(int spareNotFoundEntries) {
         this.spareNotFoundEntries = spareNotFoundEntries;
     }



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


Mime
View raw message