remm 2005/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 Changes Path
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 -0000 1.235
+++ build.xml 31 Aug 2005 16:30:48 -0000 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.name" value="${project}-${version}" />
<property name="final-src.name" value="${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.nsi 4 Aug 2005 06:52:35 -0000 1.82
+++ tomcat.nsi 31 Aug 2005 16:30:48 -0000 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 -43 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- welcome.bin.html 7 Sep 2004 21:54:30 -0000 1.4
+++ welcome.bin.html 31 Aug 2005 16:30:48 -0000 1.5
@@ -1,43 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD><TITLE>Apache Tomcat @VERSION@</TITLE>
-<META http-equiv=Content-Type content="text/html">
-</HEAD>
-<BODY>
-<P>
-<H3>Apache Tomcat @VERSION@</H3>
-<P></P>
-<p>Useful references:
-<ul>
-<li><a href="RELEASE-NOTES">Release notes</a>, with important information
-about known issues</li>
-<li><a
href="http://jakarta.apache.org/tomcat/tomcat-5.5-doc/changelog.html";>Changelog</a></li>
-<li><a
href="http://jakarta.apache.org/tomcat/tomcat-5.5-doc/status.html";>Status</a></li>
-</ul>
-</p>
-
-<p><b>NOTE: The tar files in this distribution use GNU tar extensions,
-and must be untarred with a GNU compatible version of tar. The version
-of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
-these files.</b></P>
-
-<p><font color="red">Tomcat 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>
-
-<p>Packaging Details (or "What Should I Download?")
- <ul>
- <li>jakarta-tomcat-[version].zip or .tar.gz: base distro, all
non-embedded users download this.</li>
- <li>jakarta-tomcat-[version].exe: Windows installer with base distro
contents + Windows installation.</li>
- <li>jakarta-tomcat-[version]-admin.zip or .tar.gz: the Tomcat
Administration webapp only.</li>
- <li>jakarta-tomcat-[version]-compat.zip or .tar.gz: required in addition
to the base distro for using tomcat with a Java 1.4 environment.</li>
- <li>jakarta-tomcat-[version]-deployer.zip or .tar.gz: the standalone
Tomcat Web Application Deployer.</li>
- <li>jakarta-tomcat-[version]-embed.zip or .tar.gz: for using Tomcat only
as an embedded servlet container.</li>
- </ul>
-</p>
-
-<P>Thank you for using <A
href="http://jakarta.apache.org/tomcat";>Tomcat</A>!.
-</P>
-<P><B>The Apache Jakarta Project</B> <BR><A
-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">
+<HTML><HEAD><TITLE>Apache Tomcat @VERSION@</TITLE>
+<META http-equiv=Content-Type content="text/html">
+</HEAD>
+<BODY>
+<P>
+<H3>Apache Tomcat @VERSION@</H3>
+<P></P>
+<p>Useful references:
+<ul>
+<li><a href="RELEASE-NOTES">Release notes</a>, with important information
+about known issues</li>
+<li><a
href="http://tomcat.apache.org/tomcat-5.5-doc/changelog.html";>Changelog</a></li>
+<li><a
href="http://tomcat.apache.org/tomcat-5.5-doc/status.html";>Status</a></li>
+</ul>
+</p>
+
+<p><b>NOTE: The tar files in this distribution use GNU tar extensions,
+and must be untarred with a GNU compatible version of tar. The version
+of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
+these files.</b></P>
+
+<p><font color="red">Tomcat 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>
+
+<p>Packaging Details (or "What Should I Download?")
+ <ul>
+ <li>apache-tomcat-[version].zip or .tar.gz: base distro, all
non-embedded users download this.</li>
+ <li>apache-tomcat-[version].exe: Windows installer with base distro
contents + Windows installation.</li>
+ <li>apache-tomcat-[version]-admin.zip or .tar.gz: the Tomcat
Administration webapp only.</li>
+ <li>apache-tomcat-[version]-compat.zip or .tar.gz: required in addition
to the base distro for using tomcat with a Java 1.4 environment.</li>
+ <li>apache-tomcat-[version]-deployer.zip or .tar.gz: the standalone
Tomcat Web Application Deployer.</li>
+ <li>apache-tomcat-[version]-embed.zip or .tar.gz: for using Tomcat only
as an embedded servlet container.</li>
+ </ul>
+</p>
+
+<P>Thank you for using <A href="http://tomcat.apache.org/";>Tomcat</A>!.
+</P>
+<P><B>The Apache Tomcat Project</B> <BR><A
+href="http://tomcat.apache.org/";>http://tomcat.apache.org/</A> </P>
+<P>
+<P></P></BODY></HTML>
1.6 +43 -43 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- welcome.main.html 7 Sep 2004 21:54:30 -0000 1.5
+++ welcome.main.html 31 Aug 2005 16:30:48 -0000 1.6
@@ -1,43 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD><TITLE>Apache Tomcat @VERSION@</TITLE>
-<META http-equiv=Content-Type content="text/html">
-</HEAD>
-<BODY>
-<P>
-<H3>Apache Tomcat @VERSION@</H3>
-<P></P>
-<p>Useful references:
-<ul>
-<li><a href="RELEASE-NOTES">Release notes</a>, with important information
-about known issues</li>
-<li><a
href="http://jakarta.apache.org/tomcat/tomcat-5.5-doc/changelog.html";>Changelog</a></li>
-<li><a
href="http://jakarta.apache.org/tomcat/tomcat-5.5-doc/status.html";>Status</a></li>
-</ul>
-</p>
-
-<p><b>NOTE: The tar files in this distribution use GNU tar extensions,
-and must be untarred with a GNU compatible version of tar. The version
-of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
-these files.</b></P>
-
-<p><font color="red">Tomcat 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>
-
-<p>Packaging Details (or "What Should I Download?")
- <ul>
- <li>jakarta-tomcat-[version].zip or .tar.gz: base distro, all
non-embedded users download this.</li>
- <li>jakarta-tomcat-[version].exe: Windows installer with base distro
contents + Windows installation.</li>
- <li>jakarta-tomcat-[version]-admin.zip or .tar.gz: the Tomcat
Administration webapp only.</li>
- <li>jakarta-tomcat-[version]-compat.zip or .tar.gz: required in addition
to the base distro for using tomcat with a Java 1.4 environment.</li>
- <li>jakarta-tomcat-[version]-deployer.zip or .tar.gz: the standalone
Tomcat Web Application Deployer.</li>
- <li>jakarta-tomcat-[version]-embed.zip or .tar.gz: for using Tomcat only
as an embedded servlet container.</li>
- </ul>
-</p>
-
-<P>Thank you for using <A
href="http://jakarta.apache.org/tomcat";>Tomcat</A>!.
-</P>
-<P><B>The Apache Jakarta Project</B> <BR><A
-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">
+<HTML><HEAD><TITLE>Apache Tomcat @VERSION@</TITLE>
+<META http-equiv=Content-Type content="text/html">
+</HEAD>
+<BODY>
+<P>
+<H3>Apache Tomcat @VERSION@</H3>
+<P></P>
+<p>Useful references:
+<ul>
+<li><a href="RELEASE-NOTES">Release notes</a>, with important information
+about known issues</li>
+<li><a
href="http://tomcat.apache.org/tomcat-5.5-doc/changelog.html";>Changelog</a></li>
+<li><a
href="http://tomcat.apache.org/tomcat-5.5-doc/status.html";>Status</a></li>
+</ul>
+</p>
+
+<p><b>NOTE: The tar files in this distribution use GNU tar extensions,
+and must be untarred with a GNU compatible version of tar. The version
+of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
+these files.</b></P>
+
+<p><font color="red">Tomcat 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>
+
+<p>Packaging Details (or "What Should I Download?")
+ <ul>
+ <li>apache-tomcat-[version].zip or .tar.gz: base distro, all
non-embedded users download this.</li>
+ <li>apache-tomcat-[version].exe: Windows installer with base distro
contents + Windows installation.</li>
+ <li>apache-tomcat-[version]-admin.zip or .tar.gz: the Tomcat
Administration webapp only.</li>
+ <li>apache-tomcat-[version]-compat.zip or .tar.gz: required in addition
to the base distro for using tomcat with a Java 1.4 environment.</li>
+ <li>apache-tomcat-[version]-deployer.zip or .tar.gz: the standalone
Tomcat Web Application Deployer.</li>
+ <li>apache-tomcat-[version]-embed.zip or .tar.gz: for using Tomcat only
as an embedded servlet container.</li>
+ </ul>
+</p>
+
+<P>Thank you for using <A href="http://tomcat.apache.org/";>Tomcat</A>!.
+</P>
+<P><B>The Apache Tomcat Project</B> <BR><A
+href="http://tomcat.apache.org/";>http://tomcat.apache.org/</A> </P>
+<P>
+<P></P></BODY></HTML>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
