remm 2003/01/14 14:41:01
Modified: catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
- Oops.
Revision Changes Path
1.4 +7 -16
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Embedded.java 14 Jan 2003 22:39:42 -0000 1.3
+++ Embedded.java 14 Jan 2003 22:41:01 -0000 1.4
@@ -1140,18 +1140,6 @@
new MemoryRealm());
embedded.setDebug(5);
embedded.setLogger(new SystemOutLogger());
- /*
- String home = System.getProperty("catalina.home");
- if (home == null) {
- System.err.println("You must set the 'catalina.home' system property");
- System.exit(1);
- }
- String base = System.getProperty("catalina.base");
- if (base == null) {
- base = home;
- System.setProperty("catalina.base", base);
- }
- */
// Start up this embedded server (to prove we can dynamically
// add and remove containers and connectors later)
@@ -1161,6 +1149,9 @@
System.err.println("start: " + e.toString());
e.printStackTrace();
}
+
+ String home = System.getProperty("catalina.home");
+ String base = System.getProperty("catalina.base");
// Assemble and install a very basic container hierarchy
// that simulates a portion of the one configured in server.xml
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
