Author: markt
Date: Sat Jul 21 19:00:28 2012
New Revision: 1364151
URL: http://svn.apache.org/viewvc?rev=1364151&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=1364151&r1=1364150&r2=1364151&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Sat
Jul 21 19:00:28 2012
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.startup;
import java.io.File;
@@ -32,12 +30,8 @@ import java.util.Properties;
* @author Remy Maucherat
* @version $Id$
*/
-
public class CatalinaProperties {
-
- // ------------------------------------------------------- Static Variables
-
private static final org.apache.juli.logging.Log log=
org.apache.juli.logging.LogFactory.getLog( CatalinaProperties.class );
@@ -45,41 +39,18 @@ public class CatalinaProperties {
static {
-
loadProperties();
-
}
- // --------------------------------------------------------- Public Methods
-
-
/**
* Return specified property value.
*/
public static String getProperty(String name) {
-
return properties.getProperty(name);
-
- }
-
-
- /**
- * 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);
-
}
- // --------------------------------------------------------- Public Methods
-
-
/**
* Load properties.
*/
@@ -144,7 +115,6 @@ public class CatalinaProperties {
System.setProperty(name, value);
}
}
-
}
@@ -155,6 +125,7 @@ public class CatalinaProperties {
return System.getProperty("catalina.config");
}
+
// Copied from ExceptionUtils since that class is not visible during start
private static void handleThrowable(Throwable t) {
if (t instanceof ThreadDeath) {
@@ -165,5 +136,4 @@ public class CatalinaProperties {
}
// All other instances of Throwable will be silently swallowed
}
-
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1364151&r1=1364150&r2=1364151&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Sat Jul 21
19:00:28 2012
@@ -1088,25 +1088,6 @@ public class ContextConfig implements Li
}
- /**
- * Get config base.
- *
- * @deprecated Unused - will be removed in 8.0.x
- */
- @Deprecated
- protected File getConfigBase() {
- File catalinaBase = context.getCatalinaBase();
- if (catalinaBase == null) {
- return null;
- }
-
- File configBase = new File(catalinaBase, "conf");
- if (!configBase.exists()) {
- return null;
- }
- return configBase;
- }
-
protected File getHostConfigBase() {
File file = null;
if (context.getParent() instanceof Host) {
Modified: tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java?rev=1364151&r1=1364150&r2=1364151&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java Sat Jul
21 19:00:28 2012
@@ -37,29 +37,6 @@ public class DigesterFactory {
*/
private static final Log log = LogFactory.getLog(DigesterFactory.class);
- /**
- * 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);
- }
-
-
- /**
- * 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);
- }
-
/**
* Create a <code>Digester</code> parser.
Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1364151&r1=1364150&r2=1364151&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Sat Jul 21
19:00:28 2012
@@ -190,21 +190,6 @@ 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;
- }
public void addApplicationListener( String s ) {
if(log.isDebugEnabled())
@@ -212,6 +197,7 @@ public final class TldConfig implements
listeners.add(s);
}
+
public String[] getTldListeners() {
String result[]=new String[listeners.size()];
listeners.toArray(result);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
