Author: markt
Date: Thu Feb 2 10:35:04 2012
New Revision: 1239526
URL: http://svn.apache.org/viewvc?rev=1239526&view=rev
Log:
Remove duplicated code
Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.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=1239526&r1=1239525&r2=1239526&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Thu
Feb 2 10:35:04 2012
@@ -25,8 +25,6 @@ import java.net.URL;
import java.util.Enumeration;
import java.util.Properties;
-import org.apache.catalina.Globals;
-
/**
* Utility class to read the bootstrap Catalina configuration.
@@ -98,7 +96,7 @@ public class CatalinaProperties {
if (is == null) {
try {
- File home = new File(getCatalinaBase());
+ File home = new File(Bootstrap.getCatalinaBase());
File conf = new File(home, "conf");
File propsFile = new File(conf, "catalina.properties");
is = new FileInputStream(propsFile);
@@ -148,23 +146,6 @@ public class CatalinaProperties {
/**
- * Get the value of the catalina.home environment variable.
- */
- private static String getCatalinaHome() {
- return System.getProperty(Globals.CATALINA_HOME_PROP,
- System.getProperty("user.dir"));
- }
-
-
- /**
- * Get the value of the catalina.base environment variable.
- */
- private static String getCatalinaBase() {
- return System.getProperty(Globals.CATALINA_BASE_PROP,
getCatalinaHome());
- }
-
-
- /**
* Get the value of the configuration URL.
*/
private static String getConfigUrl() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
