Author: markt
Date: Sat Jul 21 18:57:54 2012
New Revision: 1364150
URL: http://svn.apache.org/viewvc?rev=1364150&view=rev
Log:
Deprecate unused / unnecessary code
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1364149
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=1364150&r1=1364149&r2=1364150&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
Sat Jul 21 18:57:54 2012
@@ -68,7 +68,10 @@ public class CatalinaProperties {
/**
* Return specified property value.
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public static String getProperty(String name, String defaultValue) {
return properties.getProperty(name, defaultValue);
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1364150&r1=1364149&r2=1364150&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Sat Jul 21 18:57:54 2012
@@ -1142,7 +1142,10 @@ public class ContextConfig implements Li
/**
* Get config base.
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
protected File getConfigBase() {
File configBase = new File(getBaseDir(), "conf");
if (!configBase.exists()) {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java?rev=1364150&r1=1364149&r2=1364150&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java
Sat Jul 21 18:57:54 2012
@@ -40,7 +40,10 @@ public class DigesterFactory {
/**
* Create a <code>Digester</code> parser with no <code>Rule</code>
* associated and XML validation turned off.
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public static Digester newDigester(){
return newDigester(false, false, null);
}
@@ -49,7 +52,10 @@ public class DigesterFactory {
/**
* Create a <code>Digester</code> parser with XML validation turned off.
* @param rule an instance of <code>RuleSet</code> used for parsing the
xml.
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public static Digester newDigester(RuleSet rule){
return newDigester(false,false,rule);
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1364150&r1=1364149&r2=1364150&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Sat
Jul 21 18:57:54 2012
@@ -190,10 +190,18 @@ public final class TldConfig implements
}
}
+ /**
+ * @deprecated Unused - will be removed in 8.0.x
+ */
+ @Deprecated
public Context getContext() {
return context;
}
+ /**
+ * @deprecated Unused - will be removed in 8.0.x
+ */
+ @Deprecated
public void setContext(Context context) {
this.context = context;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
