larryi 02/03/27 18:29:00
Modified: . build.xml
src/shell tomcat.bat
src/webpages index.html
Log:
Update build to install version name in tomcat.bat and "root' webapp
index.html
Revision Changes Path
1.165 +22 -0 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- build.xml 24 Feb 2002 03:49:37 -0000 1.164
+++ build.xml 28 Mar 2002 02:29:00 -0000 1.165
@@ -8,6 +8,13 @@
<property name="optimize" value="false"/>
<property name="debug" value="on"/>
+ <!-- Version properties -->
+ <property name="version" value="3.3.2" />
+ <property name="release" value="Dev" />
+ <property name="version.release" value="${version} ${release}"/>
+ <property name="tomcat.name" value="Tomcat ${version}" />
+ <property name="tomcat.name.release" value="Tomcat ${version.release}" />
+
<!-- Directories -->
<!-- Where source packages are located -->
<property name="ws" value=".." />
@@ -156,6 +163,13 @@
<copy todir="${tomcat.build}/bin">
<fileset dir="src/shell"/>
</copy>
+ <copy todir="${tomcat.build}/bin"
+ file="src/shell/tomcat.bat"
+ overwrite="yes">
+ <filterset>
+ <filter token="TITLE" value="${tomcat.name.release}"/>
+ </filterset>
+ </copy>
<copy todir="${tomcat.build}/conf">
<fileset dir="src/etc"/>
</copy>
@@ -522,6 +536,14 @@
<copy todir="${tomcat.build}/webapps/ROOT">
<fileset dir="src/webpages"/>
</copy>
+ <copy todir="${tomcat.build}/webapps/ROOT"
+ file="src/webpages/index.html"
+ overwrite="yes">
+ <filterset>
+ <filter token="NAME" value="${tomcat.name.release}"/>
+ <filter token="VERSION" value="${version.release}"/>
+ </filterset>
+ </copy>
<copy todir="${tomcat.build}/webapps/ROOT/doc">
<fileset dir="src/doc"/>
</copy>
1.46 +3 -3 jakarta-tomcat/src/shell/tomcat.bat
Index: tomcat.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- tomcat.bat 21 Oct 2001 17:34:12 -0000 1.45
+++ tomcat.bat 28 Mar 2002 02:29:00 -0000 1.46
@@ -29,7 +29,7 @@
rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found
rem in the "doc" directory.
rem
-rem $Id: tomcat.bat,v 1.45 2001/10/21 17:34:12 larryi Exp $
+rem $Id: tomcat.bat,v 1.46 2002/03/28 02:29:00 larryi Exp $
rem -------------------------------------------------------------------------
@@ -85,8 +85,8 @@
rem ----- Prepare Appropriate Java Execution Commands -----------------------
if not "%OS%" == "Windows_NT" goto noTitle
-set _SECSTARTJAVA=start "Secure Tomcat 3.3" "%JAVA_HOME%\bin\java"
-set _STARTJAVA=start "Tomcat 3.3" "%JAVA_HOME%\bin\java"
+set _SECSTARTJAVA=start "Secure @TITLE@" "%JAVA_HOME%\bin\java"
+set _STARTJAVA=start "@TITLE@" "%JAVA_HOME%\bin\java"
set _RUNJAVA="%JAVA_HOME%\bin\java"
goto setClasspath
1.27 +3 -3 jakarta-tomcat/src/webpages/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/webpages/index.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- index.html 23 Mar 2002 03:08:45 -0000 1.26
+++ index.html 28 Mar 2002 02:29:00 -0000 1.27
@@ -4,13 +4,13 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="GENERATOR" content="Mozilla/4.72 [en] (WinNT; U) [Netscape]">
<meta name="Author" content="Anil K. Vijendran">
-<title>Tomcat v3.3.1 Final</title>
+<title>Apache @NAME@</title>
</head>
<body bgcolor="#FFFFFF">
-<img SRC="tomcat.gif" height=92 width=130 align=LEFT><b><font face="Arial,
Helvetica, sans-serif"><font size=+3>Tomcat</font></font></b>
+<img SRC="tomcat.gif" height=92 width=130 align=LEFT><b><font face="Arial,
Helvetica, sans-serif"><font size=+3>Apache Tomcat</font></font></b>
<br>
<b><font face="Arial, Helvetica, sans-serif"><font size=-1>Version
-3.3.1 Final</font></font></b>
+@VERSION@</font></font></b>
<p>This is the default Tomcat home page. This page serves as a quick reference
guide to related resources and is located at:
<ul>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
