cvs commit: jakarta-tomcat-5/resources welcome.bin.html welcome.main.html
remm2005/08/31 09:30:48
Modified:.build.xml tomcat.nsi
resources welcome.bin.html welcome.main.html
Log:
- Update some Strings and bundle names to tomcat.apache.org.
- The repositories will likely not be renamed until moving to SVN.
- The biggest issue are the jakarta.apache.org images (incl the one in the
installer).
Revision ChangesPath
1.236 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- build.xml 23 Aug 2005 12:40:51 - 1.235
+++ build.xml 31 Aug 2005 16:30:48 - 1.236
@@ -20,7 +20,7 @@
property name=version value=5.5.0-dev /
property name=version.number
value=${version.major}.${version.minor}.${version.build}.${version.patch} /
- property name=project value=jakarta-tomcat /
+ property name=project value=apache-tomcat /
property name=final.namevalue=${project}-${version} /
property name=final-src.namevalue=${project}-${version}-src /
1.83 +5 -5 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- tomcat.nsi4 Aug 2005 06:52:35 - 1.82
+++ tomcat.nsi31 Aug 2005 16:30:48 - 1.83
@@ -17,8 +17,8 @@
VIAddVersionKey FileDescription Apache Tomcat Installer
VIAddVersionKey FileVersion 2.0
VIAddVersionKey ProductVersion @VERSION@
- VIAddVersionKey Comments jakarta.apache.org/tomcat
- VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe
+ VIAddVersionKey Comments tomcat.apache.org
+ VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe
VIProductVersion @VERSION_NUMBER@
!include MUI.nsh
@@ -164,7 +164,7 @@
InstallRetry:
ClearErrors
- nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //IS//Tomcat5 --DisplayName
Apache Tomcat --Description Apache Tomcat @VERSION@ Server -
http://jakarta.apache.org/tomcat/; --LogPath $INSTDIR\logs --Install
$INSTDIR\bin\tomcat5.exe --Jvm $2 --StartPath $INSTDIR --StopPath
$INSTDIR'
+ nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //IS//Tomcat5 --DisplayName
Apache Tomcat --Description Apache Tomcat @VERSION@ Server -
http://tomcat.apache.org/; --LogPath $INSTDIR\logs --Install
$INSTDIR\bin\tomcat5.exe --Jvm $2 --StartPath $INSTDIR --StopPath
$INSTDIR'
Pop $0
StrCmp $0 0 InstallOk
MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \
@@ -233,7 +233,7 @@
SetOutPath $SMPROGRAMS\Apache Tomcat 5.5
CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Tomcat Home Page.lnk \
- http://jakarta.apache.org/tomcat;
+ http://tomcat.apache.org/;
CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Welcome.lnk \
http://127.0.0.1:$R0/;
1.5 +43 -43jakarta-tomcat-5/resources/welcome.bin.html
Index: welcome.bin.html
===
RCS file: /home/cvs/jakarta-tomcat-5/resources/welcome.bin.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- welcome.bin.html 7 Sep 2004 21:54:30 - 1.4
+++ welcome.bin.html 31 Aug 2005 16:30:48 - 1.5
@@ -1,43 +1,43 @@
-!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN
-HTMLHEADTITLEApache Tomcat @VERSION@/TITLE
-META http-equiv=Content-Type content=text/html
-/HEAD
-BODY
-P
-H3Apache Tomcat @VERSION@/H3
-P/P
-pUseful references:
-ul
-lia href=RELEASE-NOTESRelease notes/a, with important information
-about known issues/li
-lia
href=http://jakarta.apache.org/tomcat/tomcat-5.5-doc/changelog.html;Changelog/a/li
-lia
href=http://jakarta.apache.org/tomcat/tomcat-5.5-doc/status.html;Status/a/li
-/ul
-/p
-
-pbNOTE: The tar files in this distribution use GNU tar extensions,
-and must be untarred with a GNU compatible version of tar. The version
-of CODEtar/CODE on Solaris and Mac OS X will not work with
-these files./b/P
-
-pfont color=redTomcat 5.5 requires JRE 5.0 by default. Read the
-RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
-/font/p
-
-pPackaging Details (or What Should I Download?)
- ul
-lijakarta-tomcat-[version].zip or .tar.gz: base distro, all
non-embedded users download this./li
-lijakarta-tomcat-[version].exe: Windows installer with base distro
contents + Windows installation./li
-lijakarta-tomcat-[version]-admin.zip or .tar.gz: the Tomcat
Administration webapp only./li
-
cvs commit: jakarta-tomcat-5/resources welcome.bin.html welcome.main.html
yoavs 2004/09/07 14:54:30 Modified:resources welcome.bin.html welcome.main.html Log: Updated these files after manually updating them for 5.5 releases. Revision ChangesPath 1.4 +43 -18jakarta-tomcat-5/resources/welcome.bin.html Index: welcome.bin.html === RCS file: /home/cvs/jakarta-tomcat-5/resources/welcome.bin.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- welcome.bin.html 30 Mar 2004 11:23:21 - 1.3 +++ welcome.bin.html 7 Sep 2004 21:54:30 - 1.4 @@ -1,18 +1,43 @@ -!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN -HTMLHEADTITLEApache Tomcat @VERSION@/TITLE -META http-equiv=Content-Type content=text/html; charset=windows-1252 -/HEAD -BODY -P -H3Apache Tomcat @VERSION@/H3 -p/p -pThis version of Tomcat can use the AJP 1.3 protocol or JNI to connect to -native webservers. Among the native connectors available from the Jakarta -Tomcat Connectors subproject, using the JK 2 native connector -is recommended. Binaries can be downloaded -a href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk2/release;here/a./p -pbNOTE: The tar files in this distribution use GNU tar extensions, -and must be untarred with a GNU compatible version of tar. The version -of CODEtar/CODE on Solaris and Mac OS X will not work with -these files./b/P -P/P/BODY/HTML +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN +HTMLHEADTITLEApache Tomcat @VERSION@/TITLE +META http-equiv=Content-Type content=text/html +/HEAD +BODY +P +H3Apache Tomcat @VERSION@/H3 +P/P +pUseful references: +ul +lia href=RELEASE-NOTESRelease notes/a, with important information +about known issues/li +lia href=http://jakarta.apache.org/tomcat/tomcat-5.5-doc/changelog.html;Changelog/a/li +lia href=http://jakarta.apache.org/tomcat/tomcat-5.5-doc/status.html;Status/a/li +/ul +/p + +pbNOTE: The tar files in this distribution use GNU tar extensions, +and must be untarred with a GNU compatible version of tar. The version +of CODEtar/CODE on Solaris and Mac OS X will not work with +these files./b/P + +pfont color=redTomcat 5.5 requires JRE 5.0 by default. Read the +RELEASE-NOTES and the RUNNING.txt file in the distribution for more details. +/font/p + +pPackaging Details (or What Should I Download?) + ul +lijakarta-tomcat-[version].zip or .tar.gz: base distro, all non-embedded users download this./li +lijakarta-tomcat-[version].exe: Windows installer with base distro contents + Windows installation./li +lijakarta-tomcat-[version]-admin.zip or .tar.gz: the Tomcat Administration webapp only./li +lijakarta-tomcat-[version]-compat.zip or .tar.gz: required in addition to the base distro for using tomcat with a Java 1.4 environment./li +lijakarta-tomcat-[version]-deployer.zip or .tar.gz: the standalone Tomcat Web Application Deployer./li +lijakarta-tomcat-[version]-embed.zip or .tar.gz: for using Tomcat only as an embedded servlet container./li + /ul +/p + +PThank you for using A href=http://jakarta.apache.org/tomcat;Tomcat/A!. +/P +PBThe Apache Jakarta Project/B BRA +href=http://jakarta.apache.org/;http://jakarta.apache.org//A /P +P +P/P/BODY/HTML 1.5 +43 -26jakarta-tomcat-5/resources/welcome.main.html Index: welcome.main.html === RCS file: /home/cvs/jakarta-tomcat-5/resources/welcome.main.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- welcome.main.html 30 Mar 2004 11:23:21 - 1.4 +++ welcome.main.html 7 Sep 2004 21:54:30 - 1.5 @@ -1,26 +1,43 @@ -!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN -HTMLHEADTITLEApache Tomcat @VERSION@/TITLE -META http-equiv=Content-Type content=text/html -/HEAD -BODY -P -H3Apache Tomcat @VERSION@/H3 -P/P -pUseful references: -ul -lia href=RELEASE-NOTESRelease notes/a, with important information -about known issues/li -lia href=http://jakarta.apache.org/tomcat/tomcat-5.0-doc/changelog.html;Changelog/a/li -lia href=http://jakarta.apache.org/tomcat/tomcat-5.0-doc/status.html;Status/a/li -/ul -/p -pbNOTE: The tar files in this distribution use GNU tar extensions, -and must be untarred with a GNU compatible version of tar. The version -of CODEtar/CODE on Solaris and Mac OS X will not work with -these files./b/P -PThank you for using A href=http://jakarta.apache.org/tomcat;Tomcat/A!. -/P -PBThe Apache Jakarta Project/B BRA -href=http://jakarta.apache.org/;http://jakarta.apache.org//A /P -P -P/P/BODY/HTML +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN +HTMLHEADTITLEApache Tomcat @VERSION@/TITLE +META
cvs commit: jakarta-tomcat-5/resources welcome.bin.html welcome.main.html
remm2004/03/30 03:23:21
Modified:.RELEASE-NOTES
resources welcome.bin.html welcome.main.html
Log:
- Include jmx.jar again.
Revision ChangesPath
1.14 +1 -16 jakarta-tomcat-5/RELEASE-NOTES
Index: RELEASE-NOTES
===
RCS file: /home/cvs/jakarta-tomcat-5/RELEASE-NOTES,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RELEASE-NOTES 22 Mar 2004 18:51:50 - 1.13
+++ RELEASE-NOTES 30 Mar 2004 11:23:21 - 1.14
@@ -11,7 +11,6 @@
KNOWN ISSUES IN THIS RELEASE:
-* JMX required
* Tomcat 5.0 and JNI Based Applications
* Tomcat 5.0 Standard APIs Available
* Tomcat 5.0 and XML Parsers
@@ -23,20 +22,6 @@
* Symlinking static resources
* Enabling invoker servlet
* When all else fails
-
-
-
-JMX required
-
-
-Due to new licensing guidelines mandated by the Apache Software
-Foundation Board of Directors, a JMX implementation can no longer
-be distributed with the Apache Tomcat binaries. As a result, you
-must download a JMX 1.2 implementation (such as the Sun Reference
-Implementation) and copy the JAR containing the API and
-implementation of the JMX specification to: ${catalina.home}/bin/jmx.jar
-
-For similar reasons, a Windows installer for Tomcat is no longer available.
-
1.3 +0 -8 jakarta-tomcat-5/resources/welcome.bin.html
Index: welcome.bin.html
===
RCS file: /home/cvs/jakarta-tomcat-5/resources/welcome.bin.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- welcome.bin.html 22 Mar 2004 18:53:19 - 1.2
+++ welcome.bin.html 30 Mar 2004 11:23:21 - 1.3
@@ -15,12 +15,4 @@
and must be untarred with a GNU compatible version of tar. The version
of CODEtar/CODE on Solaris and Mac OS X will not work with
these files./b/P
-pbNOTE: Due to new licensing guidelines mandated by the Apache Software
-Foundation Board of Directors, a JMX implementation can no longer
-be distributed with the Apache Tomcat binaries. As a result, you
-must download a JMX 1.2 implementation (such as the Sun Reference
-Implementation) and copy the JAR containing the API and
-implementation of the JMX specification to: ${catalina.home}/bin/jmx.jarbr
-For similar reasons, a Windows installer for Tomcat is no longer available.
-/b/P
P/P/BODY/HTML
1.4 +0 -8 jakarta-tomcat-5/resources/welcome.main.html
Index: welcome.main.html
===
RCS file: /home/cvs/jakarta-tomcat-5/resources/welcome.main.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- welcome.main.html 22 Mar 2004 18:53:19 - 1.3
+++ welcome.main.html 30 Mar 2004 11:23:21 - 1.4
@@ -18,14 +18,6 @@
and must be untarred with a GNU compatible version of tar. The version
of CODEtar/CODE on Solaris and Mac OS X will not work with
these files./b/P
-pbNOTE: Due to new licensing guidelines mandated by the Apache Software
-Foundation Board of Directors, a JMX implementation can no longer
-be distributed with the Apache Tomcat binaries. As a result, you
-must download a JMX 1.2 implementation (such as the Sun Reference
-Implementation) and copy the JAR containing the API and
-implementation of the JMX specification to: ${catalina.home}/bin/jmx.jarbr
-For similar reasons, a Windows installer for Tomcat is no longer available.
-/b/P
PThank you for using A href=http://jakarta.apache.org/tomcat;Tomcat/A!.
/P
PBThe Apache Jakarta Project/B BRA
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5/resources welcome.bin.html welcome.main.html
remm2004/03/22 10:53:19
Modified:resources welcome.bin.html welcome.main.html
Log:
- Add a note that JMX is required and that there's no Win installer.
Revision ChangesPath
1.2 +12 -0 jakarta-tomcat-5/resources/welcome.bin.html
Index: welcome.bin.html
===
RCS file: /home/cvs/jakarta-tomcat-5/resources/welcome.bin.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- welcome.bin.html 9 Oct 2002 10:06:07 - 1.1
+++ welcome.bin.html 22 Mar 2004 18:53:19 - 1.2
@@ -11,4 +11,16 @@
Tomcat Connectors subproject, using the JK 2 native connector
is recommended. Binaries can be downloaded
a
href=http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk2/release;here/a./p
+pbNOTE: The tar files in this distribution use GNU tar extensions,
+and must be untarred with a GNU compatible version of tar. The version
+of CODEtar/CODE on Solaris and Mac OS X will not work with
+these files./b/P
+pbNOTE: Due to new licensing guidelines mandated by the Apache Software
+Foundation Board of Directors, a JMX implementation can no longer
+be distributed with the Apache Tomcat binaries. As a result, you
+must download a JMX 1.2 implementation (such as the Sun Reference
+Implementation) and copy the JAR containing the API and
+implementation of the JMX specification to: ${catalina.home}/bin/jmx.jarbr
+For similar reasons, a Windows installer for Tomcat is no longer available.
+/b/P
P/P/BODY/HTML
1.3 +8 -0 jakarta-tomcat-5/resources/welcome.main.html
Index: welcome.main.html
===
RCS file: /home/cvs/jakarta-tomcat-5/resources/welcome.main.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- welcome.main.html 2 Aug 2003 17:16:27 - 1.2
+++ welcome.main.html 22 Mar 2004 18:53:19 - 1.3
@@ -18,6 +18,14 @@
and must be untarred with a GNU compatible version of tar. The version
of CODEtar/CODE on Solaris and Mac OS X will not work with
these files./b/P
+pbNOTE: Due to new licensing guidelines mandated by the Apache Software
+Foundation Board of Directors, a JMX implementation can no longer
+be distributed with the Apache Tomcat binaries. As a result, you
+must download a JMX 1.2 implementation (such as the Sun Reference
+Implementation) and copy the JAR containing the API and
+implementation of the JMX specification to: ${catalina.home}/bin/jmx.jarbr
+For similar reasons, a Windows installer for Tomcat is no longer available.
+/b/P
PThank you for using A href=http://jakarta.apache.org/tomcat;Tomcat/A!.
/P
PBThe Apache Jakarta Project/B BRA
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5/resources welcome.bin.html welcome.main.html INSTALLLICENSE
remm2002/10/09 03:06:07
Modified:.build.xml
resources INSTALLLICENSE
Added: .CHANGELOG RELEASE-NOTES
resources welcome.bin.html welcome.main.html
Log:
- Improve release target, so that it will create a ready to upload package.
Revision ChangesPath
1.38 +46 -5 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build.xml 8 Oct 2002 09:36:39 - 1.37
+++ build.xml 9 Oct 2002 10:06:07 - 1.38
@@ -44,6 +44,7 @@
property name=servlet.home value=../jakarta-servletapi-4/dist/
property name=tomcat.build value=${basedir}/build/
property name=tomcat.dist value=${basedir}/dist/
+ property name=tomcat.release value=${basedir}/release/
property name=webapps.buildvalue=${catalina.home}/webapps/build/
property name=webapps.dist value=${catalina.home}/webapps/dist/
@@ -129,6 +130,8 @@
delete dir=${tomcat.dist}/
+delete dir=${tomcat.release}/
+
/target
@@ -418,7 +421,42 @@
!-- RELEASE: Create Release === --
target name=release
depends=prepare-release,clean,dist,dist-source,installer,package-zip,package-tgz,package-src-zip,package-src-tgz
- description=Create a Tomcat 5 packaged distribution /
+ description=Create a Tomcat 5 packaged distribution if=full-dist
+
+mkdir dir=${tomcat.release}/
+mkdir dir=${tomcat.release}/v${version}/
+mkdir dir=${tomcat.release}/v${version}/bin/
+mkdir dir=${tomcat.release}/v${version}/src/
+
+move file=${tomcat.dist}/${final.name}.tar.gz
+ todir=${tomcat.release}/v${version}/bin/
+move file=${tomcat.dist}/${final.name}.zip
+ todir=${tomcat.release}/v${version}/bin/
+move file=${tomcat.dist}/${final.name}.exe
+ todir=${tomcat.release}/v${version}/bin/
+
+move file=${tomcat.dist}/${final-src.name}.tar.gz
+ todir=${tomcat.release}/v${version}/src/
+move file=${tomcat.dist}/${final-src.name}.zip
+ todir=${tomcat.release}/v${version}/src/
+
+filter token=VERSION value=${version}/
+copy file=KEYS
+ todir=${tomcat.release}/v${version}/
+copy file=RELEASE-NOTES
+ todir=${tomcat.release}/v${version}
+ filtering=true/
+copy file=CHANGELOG
+ todir=${tomcat.release}/v${version}
+ filtering=true/
+copy file=resources/welcome.main.html
+tofile=${tomcat.release}/v${version}/README.html
+ filtering=true/
+copy file=resources/welcome.bin.html
+tofile=${tomcat.release}/v${version}/bin/README.html
+ filtering=true/
+
+ /target
target name=package-zip
zip zipfile=${tomcat.dist}/${final.name}.zip
@@ -445,11 +483,13 @@
zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=README.txt /
zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=RELEASE-NOTES-* /
+ includes=RELEASE-NOTES /
zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=RELEASE-PLAN-* /
+ includes=CHANGELOG /
zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=RUNNING.txt /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}
+ includes=BENCHMARKS.txt /
/zip
/target
@@ -479,9 +519,10 @@
include name=temp/** /
include name=LICENSE /
include name=README.txt /
-include name=RELEASE-NOTES-* /
-include name=RELEASE-PLAN-* /
+include name=RELEASE-NOTES /
+include name=CHANGELOG /
include name=RUNNING.txt /
+include name=BENCHMARKS.txt /
/fileset
/copy
fixcrlf srcdir=${tomcat.dist}/${final.name}
1.1 jakarta-tomcat-5/CHANGELOG
Binary file
1.1 jakarta-tomcat-5/RELEASE-NOTES
Index: RELEASE-NOTES
===
Apache Tomcat Version @VERSION@
Release Notes
$Id: RELEASE-NOTES,v 1.1 2002/10/09 10:06:07 remm Exp $
KNOWN ISSUES IN THIS RELEASE:
* Tomcat 5.0 and JNI Based Applications
* Tomcat 5.0 Standard APIs Available
* Tomcat 5.0 and XML Parsers
* Web application reloading and static fields in shared libraries
* JAVAC leaking memory
* Linux and Sun JDK 1.2.x - 1.3.x
* Enabling SSI and CGI Support
* Security manager URLs
* Symlinking static resources
* Enabling invoker servlet
