Author: markt
Date: Wed Dec 2 18:00:40 2009
New Revision: 886227
URL: http://svn.apache.org/viewvc?rev=886227&view=rev
Log:
Remove use of deprecated code
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=886227&r1=886226&r2=886227&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Wed Dec 2
18:00:40 2009
@@ -182,8 +182,7 @@
public void process(String args[]) {
setAwait(true);
- setCatalinaHome();
- setCatalinaBase();
+ initDirs();
try {
if (arguments(args)) {
if (starting) {
@@ -442,26 +441,6 @@
/**
- * Set the <code>catalina.base</code> System property to the current
- * working directory if it has not been set.
- * @deprecated Use initDirs()
- */
- @Deprecated
- public void setCatalinaBase() {
- initDirs();
- }
-
- /**
- * Set the <code>catalina.home</code> System property to the current
- * working directory if it has not been set.
- * @deprecated Use initDirs()
- */
- @Deprecated
- public void setCatalinaHome() {
- initDirs();
- }
-
- /**
* Start a new server instance.
*/
public void load() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
