Author: markt
Date: Sat Jul 21 18:31:59 2012
New Revision: 1364143
URL: http://svn.apache.org/viewvc?rev=1364143&view=rev
Log:
Remove 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=1364143&r1=1364142&r2=1364143&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Sat Jul 21
18:31:59 2012
@@ -103,24 +103,6 @@ public class Catalina {
/**
- * Are we starting a new server?
- *
- * @deprecated Unused - will be removed in Tomcat 8.0.x
- */
- @Deprecated
- protected boolean starting = false;
-
-
- /**
- * Are we stopping an existing server?
- *
- * @deprecated Unused - will be removed in Tomcat 8.0.x
- */
- @Deprecated
- protected boolean stopping = false;
-
-
- /**
* Use shutdown hook flag.
*/
protected boolean useShutdownHook = true;
@@ -147,15 +129,6 @@ public class Catalina {
// ------------------------------------------------------------- Properties
- /**
- * @deprecated Use {@link #setConfigFile(String)}
- */
- @Deprecated
- public void setConfig(String file) {
- configFile = file;
- }
-
-
public void setConfigFile(String file) {
configFile = file;
}
@@ -243,7 +216,7 @@ public class Catalina {
if (args.length < 1) {
usage();
- return (false);
+ return false;
}
for (int i = 0; i < args.length; i++) {
@@ -253,27 +226,23 @@ public class Catalina {
} else if (args[i].equals("-config")) {
isConfig = true;
} else if (args[i].equals("-nonaming")) {
- setUseNaming( false );
+ setUseNaming(false);
} else if (args[i].equals("-help")) {
usage();
- return (false);
+ return false;
} else if (args[i].equals("start")) {
- starting = true;
- stopping = false;
+ // NOOP
} else if (args[i].equals("configtest")) {
- starting = true;
- stopping = false;
+ // NOOP
} else if (args[i].equals("stop")) {
- starting = false;
- stopping = true;
+ // NOOP
} else {
usage();
- return (false);
+ return false;
}
}
- return (true);
-
+ return true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
