You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ru...@locus.apache.org on 2000/02/26 20:41:48 UTC
cvs commit: jakarta-tomcat/src/shell shutdown.bat startup.bat tomcat.bat tomcatEnv.bat
rubys 00/02/26 11:41:48
Modified: src/share/org/apache/tomcat/context DefaultCMSetter.java
src/share/org/apache/tomcat/core ContextManager.java
src/share/org/apache/tomcat/startup Tomcat.java
src/share/org/apache/tomcat/task ApacheConfig.java
src/shell shutdown.bat startup.bat tomcat.bat tomcatEnv.bat
Log:
Progress towards respecting the tomcat.home property (and fixed a few
typos along the way).
Revision Changes Path
1.18 +1 -0 jakarta-tomcat/src/share/org/apache/tomcat/context/DefaultCMSetter.java
Index: DefaultCMSetter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/DefaultCMSetter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultCMSetter.java 2000/02/22 22:53:22 1.17
+++ DefaultCMSetter.java 2000/02/26 19:41:42 1.18
@@ -144,6 +144,7 @@
errorWrapper.loadServlet();
} catch( Exception ex ) {
System.out.println("Error loading default servlet ");
+ ex.printStackTrace();
// XXX remove this context from CM
throw new TomcatException( "Error loading default error servlet ", ex );
}
1.55 +16 -7 jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ContextManager.java 2000/02/24 20:24:55 1.54
+++ ContextManager.java 2000/02/26 19:41:43 1.55
@@ -419,18 +419,27 @@
/** The root directory of tomcat
*/
public String getHome() {
- if( home != null ) return home;
- // XXX check if TOMCAT_HOME env is set
-
- // Convert "." to absolute path
- home=new File("").getAbsolutePath();
+ if( home == null ) setHome(".");
return home;
}
- /** Set instalation directory
+ /**
+ * Set installation directory. If path specified is relative, evaluate
+ * it relative to the tomcat.home property if available, otherwise,
+ * evaluate it relative to the current working directory.
*/
public void setHome(String home) {
- this.home=home;
+ File homeFile = new File(home);
+ if (!homeFile.isAbsolute()) {
+ String tomcat_home = System.getProperty("tomcat.home");
+ if (tomcat_home != null) homeFile = new File(tomcat_home, home);
+ }
+
+ try {
+ this.home = homeFile.getCanonicalPath();
+ } catch (IOException ioe) {
+ this.home = home; // oh well, we tried...
+ }
}
/**
1.14 +3 -2 jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java
Index: Tomcat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Tomcat.java 2000/02/24 23:01:29 1.13
+++ Tomcat.java 2000/02/26 19:41:44 1.14
@@ -84,12 +84,13 @@
return;
}
- File f=new File(configFile);
-
XmlMapper xh=new XmlMapper();
xh.setDebug( 0 );
ContextManager cm=new ContextManager();
setHelper( xh );
+
+ File f=new File(cm.getHome(), configFile);
+
try {
xh.readXml(f,cm);
} catch( Exception ex ) {
1.5 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/task/ApacheConfig.java
Index: ApacheConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/ApacheConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApacheConfig.java 2000/02/22 21:06:46 1.4
+++ ApacheConfig.java 2000/02/26 19:41:46 1.5
@@ -181,7 +181,7 @@
} catch( Exception ex ) {
// ex.printStackTrace();
//throw new TomcatException( "Error generating Apache config", ex );
- System.out.println("Failed to generate automactic apache confiugration " + ex.toString());
+ System.out.println("Failed to generate automatic apache configuration " + ex.toString());
}
}
1.4 +14 -6 jakarta-tomcat/src/shell/shutdown.bat
Index: shutdown.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/shutdown.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shutdown.bat 2000/02/05 18:28:43 1.3
+++ shutdown.bat 2000/02/26 19:41:46 1.4
@@ -1,12 +1,20 @@
@echo off
-rem $Id: shutdown.bat,v 1.3 2000/02/05 18:28:43 rubys Exp $
+rem $Id: shutdown.bat,v 1.4 2000/02/26 19:41:46 rubys Exp $
rem Startup batch file for tomcat server.
-if "%TOMCAT_HOME%" == "" goto bin
-cmd /c "cd %TOMCAT_HOME% & bin\tomcat stop"
-goto :eof
+if not "%TOMCAT_HOME%" == "" goto start
-:bin
-call bin\tomcat stop
+SET TOMCAT_HOME=.
+if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+
+SET TOMCAT_HOME=..
+if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+
+SET TOMCAT_HOME=
+echo Unable to determine the value of TOMCAT_HOME.
+goto eof
+
+:start
+call %TOMCAT_HOME%\bin\tomcat stop %*
:eof
1.6 +13 -6 jakarta-tomcat/src/shell/startup.bat
Index: startup.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/startup.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- startup.bat 2000/02/05 18:28:43 1.5
+++ startup.bat 2000/02/26 19:41:46 1.6
@@ -1,16 +1,23 @@
@echo off
-rem $Id: startup.bat,v 1.5 2000/02/05 18:28:43 rubys Exp $
+rem $Id: startup.bat,v 1.6 2000/02/26 19:41:46 rubys Exp $
rem Startup batch file for tomcat servner.
rem This batch file written and tested under Windows NT
rem Improvements to this file are welcome
+if not "%TOMCAT_HOME%" == "" goto start
-if "%TOMCAT_HOME%" == "" goto bin
-cmd /c "cd %TOMCAT_HOME% & bin\tomcat start %1 %2 %3 %4 %5 %6 %7 %8 %9"
-goto :eof
+SET TOMCAT_HOME=.
+if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
-:bin
-call bin\tomcat start %1 %2 %3 %4 %5 %6 %7 %8 %9
+SET TOMCAT_HOME=..
+if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+
+SET TOMCAT_HOME=
+echo Unable to determine the value of TOMCAT_HOME.
+goto eof
+
+:start
+call %TOMCAT_HOME%\bin\tomcat start %*
:eof
1.13 +6 -7 jakarta-tomcat/src/shell/tomcat.bat
Index: tomcat.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tomcat.bat 2000/02/25 15:50:58 1.12
+++ tomcat.bat 2000/02/26 19:41:47 1.13
@@ -1,18 +1,17 @@
@echo off
-rem $Id: tomcat.bat,v 1.12 2000/02/25 15:50:58 rubys Exp $
+rem $Id: tomcat.bat,v 1.13 2000/02/26 19:41:47 rubys Exp $
rem A batch file to start/stop tomcat server.
rem This batch file written and tested under Windows NT
rem Improvements to this file are welcome
-set jsdkJars=.\lib\webserver.jar;.\lib\servlet.jar
-set jspJars=.\lib\jasper.jar
-set beanJars=.\webpages\WEB-INF\classes\jsp\beans
-set miscJars=.\lib\xml.jar
-set appJars=%jsdkJars%;%jspJars%;%beanJars%;%miscJars%
+set jsdkJars=%TOMCAT_HOME%\lib\webserver.jar;%TOMCAT_HOME%\lib\servlet.jar
+set jspJars=%TOMCAT_HOME%\lib\jasper.jar
+set miscJars=%TOMCAT_HOME%\lib\xml.jar
+set appJars=%jsdkJars%;%jspJars%;%miscJars%
set sysJars=%JAVA_HOME%\lib\tools.jar
-set appClassPath=.\classes;%appJars%
+set appClassPath=%TOMCAT_HOME%\classes;%appJars%
set cp=%CLASSPATH%
set CLASSPATH=%appClassPath%;%sysJars%
1.4 +17 -5 jakarta-tomcat/src/shell/tomcatEnv.bat
Index: tomcatEnv.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcatEnv.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcatEnv.bat 2000/02/09 15:37:14 1.3
+++ tomcatEnv.bat 2000/02/26 19:41:47 1.4
@@ -3,16 +3,28 @@
if "%1" == "restore" goto restore
set TOM_PREV_CLASSPATH=%CLASSPATH%
+set TOM_PREV_HOME=%TOMCAT_HOME%
-if "%TOMCAT_HOME%" == "" goto bin
-call %TOMCAT_HOME%\bin\tomcat env
-goto :eof
+if not "%TOMCAT_HOME%" == "" goto start
-:bin
-CALL bin\tomcat env
+SET TOMCAT_HOME=.
+if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+
+SET TOMCAT_HOME=..
+if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+
+SET TOMCAT_HOME=
+echo Unable to determine the value of TOMCAT_HOME.
+goto eof
+
+:start
+call %TOMCAT_HOME%\bin\tomcat env %*
goto eof
:restore
set CLASSPATH=%TOM_PREV_CLASSPATH%
+set TOMCAT_HOME=%TOM_PREV_HOME%
+set TOM_PREV_CLASSPATH=
+set TOM_PREV_HOME=
:eof