tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1239483 - /tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Date Thu, 02 Feb 2012 08:39:26 GMT
Author: markt
Date: Thu Feb  2 08:39:26 2012
New Revision: 1239483

URL: http://svn.apache.org/viewvc?rev=1239483&view=rev
Log:
Remove code that was added for handling the embedded case.

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=1239483&r1=1239482&r2=1239483&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Feb  2 08:39:26 2012
@@ -38,7 +38,6 @@ import org.apache.catalina.core.Standard
 import org.apache.catalina.security.SecurityConfig;
 import org.apache.juli.ClassLoaderLogManager;
 import org.apache.tomcat.util.ExceptionUtils;
-import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.digester.Digester;
 import org.apache.tomcat.util.digester.Rule;
 import org.apache.tomcat.util.digester.RuleSet;
@@ -748,14 +747,6 @@ public class Catalina {
         if (catalinaHome == null) {
             if (System.getProperty(Globals.CATALINA_BASE_PROP) != null) {
                 catalinaHome = System.getProperty(Globals.CATALINA_BASE_PROP);
-            } else {
-                // Use IntrospectionUtils and guess the dir
-                catalinaHome = IntrospectionUtils.guessInstall
-                    (Globals.CATALINA_HOME_PROP, Globals.CATALINA_BASE_PROP, "catalina.jar");
-                if (catalinaHome == null) {
-                    catalinaHome = IntrospectionUtils.guessInstall
-                        ("tomcat.install", Globals.CATALINA_HOME_PROP, "tomcat.jar");
-                }
             }
         }
         // last resort - for minimal/embedded cases.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message