User: salborini
Date: 00/11/15 17:31:33
Modified: tomcat/src/main/org/jboss/tomcat EmbeddedTomcatService.java
Log:
Don't need TOMCAT_HOME anymore. Tomcat directory is guessed from the classpath
Revision Changes Path
1.5 +13 -6
contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatService.java
Index: EmbeddedTomcatService.java
===================================================================
RCS file:
/products/cvs/ejboss/contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EmbeddedTomcatService.java 2000/11/02 23:31:12 1.4
+++ EmbeddedTomcatService.java 2000/11/16 01:31:32 1.5
@@ -8,6 +8,7 @@
package org.jboss.tomcat;
+import java.io.File;
import java.net.URL;
import java.net.InetAddress;
import java.lang.reflect.Method;
@@ -49,7 +50,7 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin Lewis</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class EmbeddedTomcatService extends ServiceMBeanSupport
implements EmbeddedTomcatServiceMBean, MBeanRegistration {
@@ -103,13 +104,19 @@
try {
// We need the tomcat home to set tomcat's working dir / ROOT
context
- // This is set by using "java -Dtomcat.home=$TOMCAT_HOME ..."
in run.sh/bat
- tomcatHome = System.getProperty("tomcat.home");
- if (tomcatHome == null) {
+ Class tomcatClass;
+ try {
+ tomcatClass =
Class.forName("org.apache.tomcat.startup.EmbededTomcat");
+
+ } catch (Exception e) {
+
Logger.log("failed");
- Logger.log("System property tomcat.home not found. Be
sure to set TOMCAT_HOME to the home of tomcat 3.2b4+");
+ Logger.log("Tomcat not found. You need tomcat
3.2b4+");
throw new Exception("start failed");
- }
+ }
+
+ URL tomcatUrl =
tomcatClass.getProtectionDomain().getCodeSource().getLocation();
+ tomcatHome = new File(new
File(tomcatUrl.getFile()).getParent()).getParent();
try {
