Author: markt
Date: Wed Feb 1 18:42:19 2012
New Revision: 1239255
URL: http://svn.apache.org/viewvc?rev=1239255&view=rev
Log:
Remove deprecated Embedded class and the references to it
Removed:
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1239255&r1=1239254&r2=1239255&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Wed Feb 1
18:42:19 2012
@@ -89,9 +89,7 @@ public class StandardService extends Lif
protected ArrayList<Executor> executors = new ArrayList<Executor>();
/**
- * The Container associated with this Service. (In the case of the
- * org.apache.catalina.startup.Embedded subclass, this holds the most
- * recently added Engine.)
+ * The Container associated with this Service.
*/
protected Container container = null;
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=1239255&r1=1239254&r2=1239255&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Wed Feb 1
18:42:19 2012
@@ -64,8 +64,6 @@ import org.xml.sax.SAXParseException;
* <li><b>stop</b> - Stop the currently running instance of Catalina.
* </u>
*
- * Should do the same thing as Embedded, but using a server.xml file.
- *
* @author Craig R. McClanahan
* @author Remy Maucherat
* @version $Id$
@@ -748,11 +746,7 @@ public class Catalina {
String catalinaHome = System.getProperty(Globals.CATALINA_HOME_PROP);
if (catalinaHome == null) {
- // Backwards compatibility patch for J2EE RI 1.3
- String j2eeHome = System.getProperty("com.sun.enterprise.home");
- if (j2eeHome != null) {
- catalinaHome=System.getProperty("com.sun.enterprise.home");
- } else if (System.getProperty(Globals.CATALINA_BASE_PROP) != null)
{
+ if (System.getProperty(Globals.CATALINA_BASE_PROP) != null) {
catalinaHome = System.getProperty(Globals.CATALINA_BASE_PROP);
} else {
// Use IntrospectionUtils and guess the dir
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
