Author: markt
Date: Fri Feb 3 18:48:52 2012
New Revision: 1240290
URL: http://svn.apache.org/viewvc?rev=1240290&view=rev
Log:
Restoring updating / setting of home/base system properties after they
have been processed in case other components depend on the updated
values.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1240290&r1=1240289&r2=1240290&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Fri Feb 3
18:48:52 2012
@@ -116,6 +116,8 @@ public final class Bootstrap {
}
catalinaHomeFile = homeFile;
+ System.setProperty(
+ Globals.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
// Then base
String base = System.getProperty(Globals.CATALINA_BASE_PROP);
@@ -130,6 +132,8 @@ public final class Bootstrap {
}
catalinaBaseFile = baseFile;
}
+ System.setProperty(
+ Globals.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
}
// -------------------------------------------------------------- Variables
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1240290&r1=1240289&r2=1240290&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Feb 3
18:48:52 2012
@@ -600,6 +600,7 @@ public class Tomcat {
baseFile = baseFile.getAbsoluteFile();
}
server.setCatalinaBase(baseFile);
+ System.setProperty(Globals.CATALINA_BASE_PROP, baseFile.getPath());
basedir = baseFile.getPath();
if (catalinaHome == null) {
@@ -614,6 +615,8 @@ public class Tomcat {
}
server.setCatalinaHome(homeFile);
}
+ System.setProperty(Globals.CATALINA_HOME_PROP,
+ server.getCatalinaHome().getPath());
}
static final String[] silences = new String[] {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
