svn commit: r314973 - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/
Author: yoavs Date: Wed Oct 12 10:24:11 2005 New Revision: 314973 URL: http://svn.apache.org/viewcvs?rev=314973view=rev Log: Misc fixes, updated, etc. Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-33.html tomcat/site/trunk/docs/download-41.html tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/findhelp.xml tomcat/site/trunk/xdocs/getinvolved.xml tomcat/site/trunk/xdocs/heritage.xml tomcat/site/trunk/xdocs/legal.xml tomcat/site/trunk/xdocs/lists.xml tomcat/site/trunk/xdocs/resources.xml tomcat/site/trunk/xdocs/stylesheets/project.xml tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl tomcat/site/trunk/xdocs/whoweare.xml Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/bugreport.html?rev=314973r1=314972r2=314973view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Wed Oct 12 10:24:11 2005 @@ -55,16 +55,16 @@ a href=./whichversion.htmlWhich version?/a /li li -a href=./download-55.cgiApache Tomcat 5.5/a +a href=./download-55.cgiTomcat 5.5/a /li li -a href=./download-41.cgiApache Tomcat 4.1/a +a href=./download-41.cgiTomcat 4.1/a /li li -a href=./download-33.cgiApache Tomcat 3.3/a +a href=./download-33.cgiTomcat 3.3/a /li li -a href=./download-connectors.cgiApache Tomcat Connectors/a +a href=./download-connectors.cgiTomcat Connectors/a /li li a href=http://archive.apache.org/dist/;Archives/a @@ -95,13 +95,16 @@ /p ul li -a href=./tomcat-5.5-doc/index.htmlApache Tomcat 5.5/a +a href=./tomcat-5.5-doc/index.htmlTomcat 5.5/a /li li -a href=./tomcat-4.1-doc/index.htmlApache Tomcat 4.1/a +a href=./tomcat-5.0-doc/index.htmlTomcat 5.0/a /li li -a href=./tomcat-3.3-doc/index.htmlApache Tomcat 3.3/a +a href=./tomcat-4.1-doc/index.htmlTomcat 4.1/a +/li +li +a href=./tomcat-3.3-doc/index.htmlTomcat 3.3/a /li /ul p Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/contact.html?rev=314973r1=314972r2=314973view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Wed Oct 12 10:24:11 2005 @@ -53,16 +53,16 @@ a href=./whichversion.htmlWhich version?/a /li li -a href=./download-55.cgiApache Tomcat 5.5/a +a href=./download-55.cgiTomcat 5.5/a /li li -a href=./download-41.cgiApache Tomcat 4.1/a +a href=./download-41.cgiTomcat 4.1/a /li li -a href=./download-33.cgiApache Tomcat 3.3/a +a href=./download-33.cgiTomcat 3.3/a /li li -a href=./download-connectors.cgiApache Tomcat Connectors/a +a href=./download-connectors.cgiTomcat Connectors/a /li li a href=http://archive.apache.org/dist/;Archives/a @@ -93,13 +93,16 @@ /p ul li -a href=./tomcat-5.5-doc/index.htmlApache Tomcat 5.5/a +a href=./tomcat-5.5-doc/index.htmlTomcat 5.5/a /li li -a href=./tomcat-4.1-doc/index.htmlApache Tomcat 4.1/a +a href=./tomcat-5.0-doc/index.htmlTomcat 5.0/a /li li -a href=./tomcat-3.3-doc/index.htmlApache Tomcat 3.3/a +a href=./tomcat-4.1-doc/index.htmlTomcat 4.1/a +/li +li +a href=./tomcat-3.3-doc/index.htmlTomcat 3.3/a /li /ul p Modified: tomcat/site/trunk/docs/download-33.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/download-33.html?rev=314973r1=314972r2=314973view=diff == --- tomcat/site/trunk/docs/download-33.html (original) +++ tomcat/site/trunk/docs/download-33.html Wed Oct 12 10:24:11 2005 @@ -53,16 +53,16 @@ a href=./whichversion.htmlWhich version?/a /li li -a href=./download-55.cgiApache Tomcat 5.5/a +a href=./download-55.cgiTomcat 5.5/a /li li -a href=./download-41.cgiApache Tomcat 4.1/a +a href=./download-41.cgiTomcat 4.1/a /li li -a href=./download-33.cgiApache Tomcat 3.3/a +a href=./download-33.cgiTomcat 3.3/a /li li -a href=./download-connectors.cgiApache Tomcat Connectors/a +a href=./download-connectors.cgiTomcat Connectors/a /li li a href=http://archive.apache.org/dist/;Archives/a @@ -93,13 +93,16 @@ /p ul li -a href=./tomcat-5.5-doc/index.htmlApache Tomcat 5.5/a +a href=./tomcat-5.5-doc/index.htmlTomcat 5.5/a /li li -a href=./tomcat-4.1-doc/index.htmlApache Tomcat 4.1/a +a href=./tomcat-5.0-doc
svn commit: r315007 - in /tomcat/site/trunk: docs/download-55.html xdocs/download-55.xml
Author: yoavs Date: Wed Oct 12 12:17:58 2005 New Revision: 315007 URL: http://svn.apache.org/viewcvs?rev=315007view=rev Log: Sorry for the multiple commits, I keep seeing new details. Updated 5.5.12 distro names from jakarta-* to apache-*, updated download path to use newly createds /www/www.apache.org/dist/tomcat root. Modified: tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/xdocs/download-55.xml Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/download-55.html?rev=315007r1=315006r2=315007view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Wed Oct 12 12:17:58 2005 @@ -308,7 +308,7 @@ blockquote p a name=5.5.12Please/a see the - a href=[preferred]/jakarta/tomcat-5/v5.5.12/README.htmlREADME/a + a href=[preferred]/tomcat/tomcat-5/v5.5.12/README.htmlREADME/a file for packaging information. It explains what every distribution contains. /p @@ -329,19 +329,19 @@ liCore: ul li - a href=[preferred]/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12.zipzip/a - (a href=http://www.apache.org/dist/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12.zip.asc;pgp/a, - a href=http://www.apache.org/dist/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12.zip.md5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12.zip.md5;md5/a) /li li - a href=[preferred]/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12.tar.gztar.gz/a - (a href=http://www.apache.org/dist/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12.tar.gz.asc;pgp/a, - a href=http://www.apache.org/dist/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12.tar.gz.md5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12.tar.gz.md5;md5/a) /li li - a href=[preferred]/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12.exeWindows Executable/a - (a href=http://www.apache.org/dist/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12.exe.asc;pgp/a, - a href=http://www.apache.org/dist/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12.exe.md5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12.exeWindows Executable/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12.exe.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12.exe.md5;md5/a) /li /ul /li @@ -349,28 +349,28 @@ liDeployer: ul li - a href=[preferred]/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12-deployer.zipzip/a - (a href=http://www.apache.org/dist/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12-deployer.zip.asc;pgp/a, - a href=http://www.apache.org/dist/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12-deployer.zip.md5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12-deployer.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12-deployer.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12-deployer.zip.md5;md5/a) /li li - a href=[preferred]/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12-deployer.tar.gztar.gz/a - (a href=http://www.apache.org/dist/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12-deployer.tar.gz.asc;pgp/a, - a href=http://www.apache.org/dist/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12-deployer.tar.gz.md5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12-deployer.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12-deployer.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.12/bin/apache-tomcat-5.5.12-deployer.tar.gz.md5;md5/a) /li /ul /li liEmbedded: ul li - a href=[preferred]/jakarta/tomcat-5/v5.5.12/bin/jakarta-tomcat-5.5.12-embed.zipzip/a - (a href=http://www.apache.org/dist/jakarta/tomcat-5
svn commit: r307444 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: yoavs Date: Sun Oct 9 08:11:14 2005 New Revision: 307444 URL: http://svn.apache.org/viewcvs?rev=307444view=rev Log: 5.5.12 is latest stable. Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/index.html?rev=307444r1=307443r2=307444view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Sun Oct 9 08:11:14 2005 @@ -222,7 +222,7 @@ font face=arial,helvetica,sanserif size=-1 color=#002.4/2.0/font /td td align=left valign=top bgcolor=#a0ddf0 -font face=arial,helvetica,sanserif size=-1 color=#005.5.9/font +font face=arial,helvetica,sanserif size=-1 color=#005.5.12/font /td /tr Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs/index.xml?rev=307444r1=307443r2=307444view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Sun Oct 9 08:11:14 2005 @@ -41,7 +41,7 @@ tr td2.4/2.0/td - td5.5.9/td + td5.5.12/td /tr tr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
yoavs 2005/09/23 06:40:26
Modified:.tomcat.nsi
Log:
${catalina.base} is not recognized by NSIS, $INSTDIR seems like the right fix.
Revision ChangesPath
1.84 +2 -2 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- tomcat.nsi31 Aug 2005 16:30:48 - 1.83
+++ tomcat.nsi23 Sep 2005 13:40:26 - 1.84
@@ -327,7 +327,7 @@
Section -post
nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --Classpath
$INSTDIR\bin\bootstrap.jar --StartClass org.apache.catalina.startup.Bootstrap
--StopClass org.apache.catalina.startup.Bootstrap --StartParams start
--StopParams stop --StartMode jvm --StopMode jvm'
- nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --JvmOptions
-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=${catalina.base}\conf\logging.properties
--StdOutput auto --StdError auto'
+ nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --JvmOptions
-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties
--StdOutput auto --StdError auto'
WriteUninstaller $INSTDIR\Uninstall.exe
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/09/22 06:34:06 Modified:catalina/src/bin service.bat webapps/docs changelog.xml Log: Bugzilla 35609: http://issues.apache.org/bugzilla/show_bug.cgi?id=35609 Revision ChangesPath 1.13 +3 -3 jakarta-tomcat-catalina/catalina/src/bin/service.bat Index: service.bat === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/service.bat,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- service.bat 5 May 2005 16:24:38 - 1.12 +++ service.bat 22 Sep 2005 13:34:05 - 1.13 @@ -54,7 +54,7 @@ if %1 == uninstall goto doRemove echo Unknown parameter %1 :displayUsage -echo +echo. echo Usage: service.bat install/remove [service_name] goto end @@ -71,7 +71,7 @@ echo Using CATALINA_BASE:%CATALINA_BASE% echo Using JAVA_HOME:%JAVA_HOME% -rem Use the environment variables as an exaple +rem Use the environment variables as an example rem Each command line option is prefixed with PR_ set PR_DESCRIPTION=Apache Tomcat Server - http://jakarta.apache.org/tomcat 1.376 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.375 retrieving revision 1.376 diff -u -r1.375 -r1.376 --- changelog.xml 20 Sep 2005 10:56:48 - 1.375 +++ changelog.xml 22 Sep 2005 13:34:05 - 1.376 @@ -66,6 +66,10 @@ fix bug36541/bug: Full synchronization for session objects attributes collections (remm) /fix + fix +bug35609/bug: service.bat echo command when wrong arguments given [patch by Robert +Longson] (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml cluster-howto.xml
yoavs 2005/09/22 06:39:32 Modified:webapps/docs changelog.xml cluster-howto.xml Log: Bugzilla 35613: http://issues.apache.org/bugzilla/show_bug.cgi?id=35613 Revision ChangesPath 1.377 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.376 retrieving revision 1.377 diff -u -r1.376 -r1.377 --- changelog.xml 22 Sep 2005 13:34:05 - 1.376 +++ changelog.xml 22 Sep 2005 13:39:32 - 1.377 @@ -109,6 +109,9 @@ fix bug36518/bug: Classname typos for senders, submitted by Christoph Bachhuber-Haller (remm) /fix + add +bug35613/bug: Added FAQ question and answer about tcpListenAddress=auto and /etc/hosts (yoavs) + /add /changelog /subsection 1.12 +5 -0 jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml Index: cluster-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cluster-howto.xml 8 Jul 2005 20:52:50 - 1.11 +++ cluster-howto.xml 22 Sep 2005 13:39:32 - 1.12 @@ -1131,6 +1131,11 @@ /ul p/p /li +liQ: I get localhost rather than eth0 or another interface when using tcpListenAddress=auto.p/p +A: Change /etc/hosts so that the localhost domain resolves to the actual IP address of the NIC, eth0. + Please see a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=35613;Bugzilla/a for more. +p/p +/li /ol /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r290948 [2/2] - in /tomcat/site/trunk: docs/faq/ docs/faq/printer/ xdocs-faq/
Added: tomcat/site/trunk/docs/faq/printer/cluster.html
URL:
http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/faq/printer/cluster.html?rev=290948view=auto
==
--- tomcat/site/trunk/docs/faq/printer/cluster.html (added)
+++ tomcat/site/trunk/docs/faq/printer/cluster.html Thu Sep 22 07:04:25 2005
@@ -0,0 +1,123 @@
+htmlheadMETA http-equiv=Content-Type content=text/html;
charset=iso-8859-1titleTomcat FAQ - Cluster/titlemeta value=Yoav
Shapira name=authormeta value=yoavs[at]apache[dot]org
name=emailstyle
+ dt { font-size : larger; font-weight : bold }
+ dd {padding-bottom : 10px;}
+/style/headbody vlink=#525D76 alink=#525D76 link=#525D76
text=#00 bgcolor=#fftable cellspacing=4 width=100%
border=0!--PAGE HEADER--trtd colspan=2!--JAKARTA LOGO--a
href=http://jakarta.apache.org/;img border=0 alt=The Jakarta Project
align=left
src=http://jakarta.apache.org//images/jakarta-logo.gif;/a!--PROJECT
LOGO--a href=http://jakarta.apache.org/tomcat/;img border=0 alt=
+ Tomcat FAQ
+ align=right src=../../images/tomcat.gif/a/td/tr!--HEADER
SEPARATOR--trtd colspan=2hr size=1 noshade=/td/trtr!--RIGHT
SIDE MAIN BODY--td align=left valign=top width=80%table
cellspacing=4 width=100% border=0trtd nowrap=true valign=top
align=lefth1Tomcat FAQ/h1h2Cluster/h2/tdtd nowrap=true
valign=top align=rightimg border=0 hspace=0 vspace=0 height=1
width=1 src=../../images/void.gif/td/tr/tabletable cellpadding=2
cellspacing=0 border=0trtd bgcolor=#525D76font
face=arial,helvetica.sanserif color=#ffa
name=PrefacestrongPreface/strong/a/font/td/trtrtdblockquote
+ p
+This page discusses cluster- and clustering-related questions. Please make
+sure to read the Clustering HowTo page in the main Tomcat documentation
+bundle as well.
+ /p
+/blockquote/td/tr/tabletable cellpadding=2 cellspacing=0
border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif
color=#ffa
name=QuestionsstrongQuestions/strong/a/font/td/trtrtdblockquote
+p
+ ul
+lia href=#1Can I configure a cluster at the codeEngine/code
level?/a/li
+lia href=#2Show me a simple cluster configuration example./a/li
+lia href=#3How do I turn on transport logging?/a/li
+lia href=#4How do I use JMX to monitor the cluster?/a/li
+lia href=#5Can I pause the message sending?/a/li
+lia href=#6Can I add more senders?/a/li
+lia href=#7What happens when I pull the network cable?/a/li
+lia href=#8At my windows laptop without network my cluster doesn't
work?/a/li
+lia href=#9The cluster dosen't work under linux with two nodes at
two boxes?/a/li
+lia href=#10I get localhost rather than eth0 or another
interface when using tcpListenAddress=auto./a/li
+ /ul
+/p
+/blockquote/td/tr/tabletable cellpadding=2 cellspacing=0
border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif
color=#ffa
name=AnswersstrongAnswers/strong/a/font/td/trtrtdblockquote
+ b style=font-size: larger
+a name=1Can I configure a cluster at the codeEngine/code level?/a
+ /b
+ div style=padding-left : 20px;
+Yes, beginning with Tomcat 5.5.10 you can configure clusters at both the
+codeEngine/code and codeHost/code levels. This helps support
+clustering for web hosting companies.
+ /divbr
+
+ b style=font-size: larger
+a name=Show me a simple cluster configuration example./a
+ /b
+ div style=padding-left : 20px;
+For Tomcat 5.5.10 and later:br
+codelt;Cluster
className=org.apache.catalina.cluster.tcp.SimpleTcpCluster defaultMode=true
/gt;/code
+ /divbr
+
+ b style=font-size: larger
+a name=3How do I turn on transport logging?/a
+ /b
+ div style=padding-left : 20px;
+ol
+ liUse org.apache.catalina.cluster as logger category and switch to
info, debug or trace as log level./li
+ liConfigure the bclusterLog/b attribute (logging category) to get
and send and receive message log./li
+/ol
+ /divbr
+
+ b style=font-size: larger
+a name=4How do I use JMX to monitor the cluster?/a
+ /b
+ div style=padding-left : 20px;
+With Java 5 you can use the bjconsole/b application to look inside the
runnnig cluster: please see the
+JMX configuration section in the Clustering HowTo document. br
+
+In ifastasyncmode/i replication mode you can got more information with
+sender attributes codedoProcessingStats=true/code and
codequeueDoStats=true/code.
+Finally, with the new JMX remote ant task you can access the state and
call operations.
+ /divbr
+
+ b style=font-size: larger
+a name=5Can I pause the message sending?/a
+ /b
+ div style=padding-left : 20px;
+Yes, the async senders buffer the messages, but make sure the membership
ping is active. With fastasyncqueue
+mode you can limit the max queue size.
+ /divbr
+
+ b style=font-size: larger
+a name=6Can I add more senders?/a
+ /b
+ div style=padding-left : 20px;
+Yes, with sender
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml cluster-howto.xml
yoavs 2005/09/22 07:21:19 Modified:webapps/docs changelog.xml cluster-howto.xml Log: Relocate clustering FAQ from howto to the main FAQ. Revision ChangesPath 1.378 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.377 retrieving revision 1.378 diff -u -r1.377 -r1.378 --- changelog.xml 22 Sep 2005 13:39:32 - 1.377 +++ changelog.xml 22 Sep 2005 14:21:18 - 1.378 @@ -112,6 +112,9 @@ add bug35613/bug: Added FAQ question and answer about tcpListenAddress=auto and /etc/hosts (yoavs) /add + update +Moved FAQ section for Clustering from Clustering HowTo page to its own FAQ page. (yoavs) + /update /changelog /subsection 1.13 +1 -72 jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml Index: cluster-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cluster-howto.xml 22 Sep 2005 13:39:32 - 1.12 +++ cluster-howto.xml 22 Sep 2005 14:21:18 - 1.13 @@ -1066,78 +1066,7 @@ /section section name=FAQ -pTo be completed once we receive questions about session replication:/p -ol -liQ: Can I configure as engine level?p/p - -A: Since Tomcat 5.5.10 you can configure a cluster as engine and host level. -This helps to support clustering at a web hosting szenario. - p/p - /li -liQ: What is the simples cluster config?p/p - -A: Since Tomcat 5.5.10 you can configure a cluster with following: codelt;Cluster className=org.apache.catalina.cluster.tcp.SimpleTcpCluster defaultMode=true /gt;/code - p/p - /li -liQ: How can I activated transparent logging?p/p - -A: Use org.apache.catalina.cluster as logger category and switch to info, debug or trace as log level. -A: Configure the bclusterLog/b attribute (logging category) to get and send and receive message log. - p/p - /li -liQ: How can I used JMX information to monitor the cluster?p/p - -A: Yes, it exists a lot ot usefull information to the cluster as MBeans. With Java 5 you can use the - jconsole to look inside the runnnig cluster (s. JMX section above). - At fastasyncmode replication mode you can got more information with - sender attributes codedoProcessingStats=true/code and codequeueDoStats=true/code. - With the new JMX remote ant task you can access the state and call operations. - p/p - /li -lip/pQ: Can I pause the message sending?p/p - -A: Yes, the async senders buffer the messages, but make sure the membership ping is active. - With fastasyncqueue mode you can limit the max queue size. - p/p - /li -liQ: Can I at more pooled senders?p/p - -A: Yes, with sender attribute codemaxPoolSocketLimit=40/code you can have more than the default - code25/code sockets to transfer more parallel messages. - p/p - /li -liQ: What happens when I pull the network cable?p/p - -A: Well, the other members will remove the instance from the cluster, - but when you insert the cable again, the Tomcat instance might have completely flipped out. - This is because the OS might start going 100% CPU when a multicast message is sent. - There has not yet been a good solution for this, I will let you know when I have come up with one. - (pero: I test this and I works correct with java 5 and exists when you use the cluster with JDK 1.4.x) - p/p - /li -liQ: At my windows laptop without network my cluster doesn't work?p/p - -A: The Membership attribute codemcastBindAddress=127.0.0.1/code must be set! - p/p - /li -liQ: The cluster dosen't work under linux with two nodes at two boxes?p/p - -A: Check the the following topics: -ul -liIs your network interface enabled for multicast? codeifconfig eth0 MULTICAST/code/li -liExists a multicast route to your network interface? coderoute add -host 228.0.0.4 dev eth0/code/li -liIs your firewall active? Then check that multicast port is on your UDP open list - and the receiver TCP port is also for both machines open!/li -/ul - p/p - /li -liQ: I get localhost rather than eth0 or another interface when using tcpListenAddress=auto.p/p -A: Change /etc/hosts so that the localhost domain resolves to the actual IP address of the NIC, eth0. - Please see a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=35613;Bugzilla/a for more. -p/p -/li - -/ol +pPlease see
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/09/01 11:28:25
Modified:.build.xml
webapps/docs changelog.xml
Log:
Bugzilla 36088: http://issues.apache.org/bugzilla/show_bug.cgi?id=36088
Revision ChangesPath
1.237 +1 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- build.xml 31 Aug 2005 16:30:48 - 1.236
+++ build.xml 1 Sep 2005 18:28:24 - 1.237
@@ -1748,6 +1748,7 @@
include name=LICENSE /
include name=NOTICE /
include name=README.txt /
+include name=RUNNING.txt /
/tarfileset
tarfileset dir=${tomcat.dist}/webapps/tomcat-docs
prefix=tomcat-5.5-doc
include name=** /
1.367 +8 -2 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- changelog.xml 31 Aug 2005 14:06:40 - 1.366
+++ changelog.xml 1 Sep 2005 18:28:24 - 1.367
@@ -30,8 +30,11 @@
subsection name=General
changelog
fix
-Remove uneeded files in conf (remm)
+Remove uneeded files in conf. (remm)
/fix
+ update
+Change distribution file names from jakarta-* to apache-*.
+ /update
/changelog
/subsection
@@ -41,8 +44,11 @@
bug36343/bug: Only normalize out backslash on Windows platforms.
(billbarker)
/fix
fix
-Allow configuring standard stream redirection (remm)
+Allow configuring standard stream redirection. (remm)
/fix
+ add
+bug36088/bug: Add RUNNING.txt and RELEASE-NOTES.txt to fulldocs
distro. (yoavs)
+ /add
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JspRuntimeContext.java
yoavs 2005/09/01 11:39:24
Modified:jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java
Log:
Minor logging enhancement for my own debugging purposes.
Revision ChangesPath
1.29 +6 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
Index: JspRuntimeContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- JspRuntimeContext.java30 Aug 2005 22:38:33 - 1.28
+++ JspRuntimeContext.java1 Sep 2005 18:39:24 - 1.29
@@ -338,6 +338,10 @@
}
classpath = cpath.toString() + cp;
+
+if(log.isDebugEnabled()) {
+log.debug(Compilation classpath initialized: +
getClassPath());
+}
}
/**
@@ -511,7 +515,7 @@
try {
checkCompile();
} catch (Throwable t) {
-t.printStackTrace();
+log.error(Exception checking if recompile needed: , t);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs jndi-datasource-examples-howto.xml
yoavs 2005/08/11 07:53:00
Modified:webapps/docs jndi-datasource-examples-howto.xml
Log:
Fix small typo as suggested by Robert Clarkson on mailing list.
Revision ChangesPath
1.16 +1 -1
jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml
Index: jndi-datasource-examples-howto.xml
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jndi-datasource-examples-howto.xml30 Mar 2005 17:23:23 -
1.15
+++ jndi-datasource-examples-howto.xml11 Aug 2005 14:53:00 -
1.16
@@ -439,7 +439,7 @@
DataSource ds = (DataSource) cxt.lookup( java:/comp/env/jdbc/postgres );
-if ( cxt == null ) {
+if ( ds == null ) {
throw new Exception(Data source not found!);
}
/source
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config http.xml
yoavs 2005/08/02 06:47:11 Modified:.build.properties.default webapps/docs changelog.xml webapps/docs/config http.xml Log: Bugzilla 34794: http://issues.apache.org/bugzilla/show_bug.cgi?id=34794 Revision ChangesPath 1.154 +4 -1 jakarta-tomcat-5/build.properties.default Index: build.properties.default === RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- build.properties.default 31 Jul 2005 13:18:37 - 1.153 +++ build.properties.default 2 Aug 2005 13:47:10 - 1.154 @@ -42,6 +42,9 @@ cvsroot=:pserver:[EMAIL PROTECTED]:/home/cvspublic # - Default Base Path for Dependent Packages - +# Please note this path must be absolute, not relative, +# as it is referenced with different working directory +# contexts by the various build scripts. base.path=/usr/share/java #base.path=C:/path/to/the/repository #base.path=/usr/local 1.349 +4 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.348 retrieving revision 1.349 diff -u -r1.348 -r1.349 --- changelog.xml 1 Aug 2005 09:40:14 - 1.348 +++ changelog.xml 2 Aug 2005 13:47:11 - 1.349 @@ -53,12 +53,15 @@ the JDK 1.4 JavaDoc tool. (yoavs) /fix fix -bug35865/bug: setclasspath.sh cannot be excutive under cygwin (funkman) +bug35865/bug: setclasspath.sh cannot be excutive under cygwin. (funkman) /fix fix bug33267/bug: Set working path in service installer, as suggested by Dominik Drzewiecki. (yoavs) /fix + update +bug34794/bug: Update connector documentation to include clientAuth attribute. (yoavs) + /update /changelog /subsection 1.27 +10 -0 jakarta-tomcat-catalina/webapps/docs/config/http.xml Index: http.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- http.xml 9 Jun 2005 20:25:31 - 1.26 +++ http.xml 2 Aug 2005 13:47:11 - 1.27 @@ -212,6 +212,16 @@ The default value is codetext/html,text/xml,text/plain/code./p /attribute +attribute name=clientAuth required=false + p +Set this value to codetrue/code if you want Tomcat to require +all SSL clients to present a client Certificate in order to use +this socket. Set this value to codewant/code if you want Tomcat +to request a client Certificate, but not fail if one isn't presented. +See the a href=../ssl-howto.htmlSSL HowTo/a for an example. + /p +/attribute + attribute name=compression required=false pThe strongConnector/strong may use HTTP/1.1 GZIP compression in an attempt to save server bandwidth. The acceptable values for the - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default
yoavs 2005/08/02 07:01:58
Modified:.build.properties.default
Log:
Update NSIS to 2.08: the releaes from 2.0 to 2.08 have many bug fixes.
Revision ChangesPath
1.155 +3 -3 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- build.properties.default 2 Aug 2005 13:47:10 - 1.154
+++ build.properties.default 2 Aug 2005 14:01:58 - 1.155
@@ -216,11 +216,11 @@
# - NSIS, version 2.0 or later -
-nsis.home=${base.path}/nsis-2.0
+nsis.home=${base.path}/nsis-2.08
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
-nsis.loc=${base-sf.loc}/nsis/nsis20.exe
+nsis.loc=${base-sf.loc}/nsis/nsis-2.08.exe
# - Struts, version 1.2.4 or later -
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/08/02 11:12:06
Modified:.tomcat.nsi
webapps/docs changelog.xml
Log:
Bugzilla 33261: http://issues.apache.org/bugzilla/show_bug.cgi?id=33261
Revision ChangesPath
1.78 +683 -651 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- tomcat.nsi29 Jul 2005 15:35:48 - 1.77
+++ tomcat.nsi2 Aug 2005 18:12:05 - 1.78
@@ -1,651 +1,683 @@
-
-; Tomcat script for Nullsoft Installer
-; $Id$
-
- ;Compression options
- CRCCheck on
- SetCompress force
- SetCompressor lzma
- SetDatablockOptimize on
-
- Name Apache Tomcat
-
- ;Product information
- VIAddVersionKey ProductName Apache Tomcat
- VIAddVersionKey CompanyName Apache Software Foundation
- VIAddVersionKey LegalCopyright Copyright (c) 1999-2004 The Apache
Software Foundation
- VIAddVersionKey FileDescription Apache Tomcat Installer
- VIAddVersionKey FileVersion 2.0
- VIAddVersionKey ProductVersion @VERSION@
- VIAddVersionKey Comments jakarta.apache.org/tomcat
- VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe
- VIProductVersion @VERSION_NUMBER@
-
-!include MUI.nsh
-!include StrFunc.nsh
-${StrRep}
- Var JavaHome
-
-
-
-;
-;Configuration
-
- !define MUI_HEADERIMAGE
- !define MUI_HEADERIMAGE_RIGHT
- !define MUI_HEADERIMAGE_BITMAP header.bmp
- !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp
- !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\webapps\ROOT\RELEASE-NOTES.txt
- !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat5w.exe
- !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//Tomcat5
- !define MUI_FINISHPAGE_NOREBOOTSUPPORT
-
- !define MUI_ABORTWARNING
-
- !define TEMP1 $R0
- !define TEMP2 $R1
-
- !define MUI_ICON tomcat.ico
- !define MUI_UNICON tomcat.ico
-
- ;General
- OutFile tomcat-installer.exe
-
- ;Install Options pages
- LangString TEXT_JVM_TITLE ${LANG_ENGLISH} Java Virtual Machine
- LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} Java Virtual Machine path
selection.
- LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} : Java Virtual Machine path
selection
-
- LangString TEXT_CONF_TITLE ${LANG_ENGLISH} Configuration
- LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} Tomcat basic configuration.
- LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} : Configuration Options
-
- ;Install Page order
- !insertmacro MUI_PAGE_WELCOME
- !insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
- !insertmacro MUI_PAGE_COMPONENTS
- !insertmacro MUI_PAGE_DIRECTORY
- Page custom SetConfiguration Void $(TEXT_CONF_PAGETITLE)
- Page custom SetChooseJVM Void $(TEXT_JVM_PAGETITLE)
- !insertmacro MUI_PAGE_INSTFILES
- !insertmacro MUI_PAGE_FINISH
-
- ;Uninstall Page order
- !insertmacro MUI_UNPAGE_CONFIRM
- !insertmacro MUI_UNPAGE_INSTFILES
-
- ;License dialog
- LicenseData License.rtf
-
- ;Component-selection page
-;Descriptions
-LangString DESC_SecTomcat ${LANG_ENGLISH} Install the Tomcat Servlet
container.
-LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the Tomcat
Servlet container core.
-LangString DESC_SecTomcatService ${LANG_ENGLISH} Automatically start
Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000
or Windows XP.
-;LangString DESC_SecTomcatSource ${LANG_ENGLISH} Install the Tomcat
source code.
-LangString DESC_SecMenu ${LANG_ENGLISH} Create a Start Menu program
group for Tomcat.
-LangString DESC_SecDocs ${LANG_ENGLISH} Install the Tomcat
documentation bundle. This include documentation on the servlet container and
its configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors.
-LangString DESC_SecExamples ${LANG_ENGLISH} Installs some examples web
applications.
-LangString DESC_SecAdmin ${LANG_ENGLISH} Installs the administration
web application.;
-;LangString DESC_SecWebapps ${LANG_ENGLISH} Installs other utility web
applications (WebDAV, balancer, etc).
-;LangString DESC_SecCompat ${LANG_ENGLISH} Installs Java2
compatibility package. This release of Apache Tomcat was packaged to run on
J2SE 5.0 or later. It can be run on earlier JVMs by installng this package.
-
- ;Language
- !insertmacro MUI_LANGUAGE English
-
- ;Folder-select dialog
- InstallDir $PROGRAMFILES\Apache Software Foundation\Tomcat 5.5
-
- ;Install types
- InstType Normal
- InstType Minimum
- InstType Full
-
- ; Main registry key
- InstallDirRegKey HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.5
-
- !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
- ReserveFile jvm.ini
- ReserveFile
cvs commit: jakarta-tomcat-5 tomcat.nsi
yoavs 2005/08/02 11:35:15
Modified:.tomcat.nsi
Log:
Corrected EOL characters.
Revision ChangesPath
1.79 +683 -683 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- tomcat.nsi2 Aug 2005 18:12:05 - 1.78
+++ tomcat.nsi2 Aug 2005 18:35:15 - 1.79
@@ -1,683 +1,683 @@
-
-; Tomcat script for Nullsoft Installer
-; $Id$
-
- ;Compression options
- CRCCheck on
- SetCompress force
- SetCompressor lzma
- SetDatablockOptimize on
-
- Name Apache Tomcat
-
- ;Product information
- VIAddVersionKey ProductName Apache Tomcat
- VIAddVersionKey CompanyName Apache Software Foundation
- VIAddVersionKey LegalCopyright Copyright (c) 1999-2005 The Apache
Software Foundation
- VIAddVersionKey FileDescription Apache Tomcat Installer
- VIAddVersionKey FileVersion 2.0
- VIAddVersionKey ProductVersion @VERSION@
- VIAddVersionKey Comments jakarta.apache.org/tomcat
- VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe
- VIProductVersion @VERSION_NUMBER@
-
-!include MUI.nsh
-!include StrFunc.nsh
-${StrRep}
- Var JavaHome
-
-
-
-;
-;Configuration
-
- !define MUI_HEADERIMAGE
- !define MUI_HEADERIMAGE_RIGHT
- !define MUI_HEADERIMAGE_BITMAP header.bmp
- !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp
- !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\webapps\ROOT\RELEASE-NOTES.txt
- !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat5w.exe
- !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//Tomcat5
- !define MUI_FINISHPAGE_NOREBOOTSUPPORT
-
- !define MUI_ABORTWARNING
-
- !define TEMP1 $R0
- !define TEMP2 $R1
-
- !define MUI_ICON tomcat.ico
- !define MUI_UNICON tomcat.ico
-
- ;General
- OutFile tomcat-installer.exe
-
- ;Install Options pages
- LangString TEXT_JVM_TITLE ${LANG_ENGLISH} Java Virtual Machine
- LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} Java Virtual Machine path
selection.
- LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} : Java Virtual Machine path
selection
-
- LangString TEXT_CONF_TITLE ${LANG_ENGLISH} Configuration
- LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} Tomcat basic configuration.
- LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} : Configuration Options
-
- ;Install Page order
- !insertmacro MUI_PAGE_WELCOME
- !insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
- !insertmacro MUI_PAGE_COMPONENTS
- !insertmacro MUI_PAGE_DIRECTORY
- Page custom SetConfiguration Void $(TEXT_CONF_PAGETITLE)
- Page custom SetChooseJVM Void $(TEXT_JVM_PAGETITLE)
- !insertmacro MUI_PAGE_INSTFILES
- Page custom CheckUserType
- !insertmacro MUI_PAGE_FINISH
-
- ;Uninstall Page order
- !insertmacro MUI_UNPAGE_CONFIRM
- !insertmacro MUI_UNPAGE_INSTFILES
-
- ;License dialog
- LicenseData License.rtf
-
- ;Component-selection page
-;Descriptions
-LangString DESC_SecTomcat ${LANG_ENGLISH} Install the Tomcat Servlet
container.
-LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the Tomcat
Servlet container core.
-LangString DESC_SecTomcatService ${LANG_ENGLISH} Automatically start
Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000
or Windows XP.
-;LangString DESC_SecTomcatSource ${LANG_ENGLISH} Install the Tomcat
source code.
-LangString DESC_SecMenu ${LANG_ENGLISH} Create a Start Menu program
group for Tomcat.
-LangString DESC_SecDocs ${LANG_ENGLISH} Install the Tomcat
documentation bundle. This include documentation on the servlet container and
its configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors.
-LangString DESC_SecExamples ${LANG_ENGLISH} Installs some examples web
applications.
-LangString DESC_SecAdmin ${LANG_ENGLISH} Installs the administration
web application.;
-;LangString DESC_SecWebapps ${LANG_ENGLISH} Installs other utility web
applications (WebDAV, balancer, etc).
-;LangString DESC_SecCompat ${LANG_ENGLISH} Installs Java2
compatibility package. This release of Apache Tomcat was packaged to run on
J2SE 5.0 or later. It can be run on earlier JVMs by installng this package.
-
- ;Language
- !insertmacro MUI_LANGUAGE English
-
- ;Folder-select dialog
- InstallDir $PROGRAMFILES\Apache Software Foundation\Tomcat 5.5
-
- ;Install types
- InstType Normal
- InstType Minimum
- InstType Full
-
- ; Main registry key
- InstallDirRegKey HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.5
-
- !insertmacro
cvs commit: jakarta-watchdog WARNING.txt
yoavs 2005/08/01 12:56:48 Added: .WARNING.txt Log: Added per guidelines at http://www.apache.org/dev/cvs2svn.html. Revision ChangesPath 1.1 jakarta-watchdog/WARNING.txt Index: WARNING.txt === *** WARNING.txt *** As of 1st August 2005, the jakarta-watchdog-4.0 CVS repository is closed. The repository has been migrated to Subversion (http://svn.apache.org/repos/asf/tomcat). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-watchdog-4.0 WARNING.txt
yoavs 2005/08/01 12:57:12 Added: .WARNING.txt Log: Added per the guidelines at http://www.apache.org/dev/cvs2svn.html. Revision ChangesPath 1.1 jakarta-watchdog-4.0/WARNING.txt Index: WARNING.txt === *** WARNING.txt *** As of 1st August 2005, the jakarta-watchdog-4.0 CVS repository is closed. The repository has been migrated to Subversion (http://svn.apache.org/repos/asf/tomcat). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default
yoavs 2005/07/31 06:18:37
Modified:.build.properties.default
Log:
Updating default JavaMail dependency to latest FCS.
Revision ChangesPath
1.153 +2 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- build.properties.default 30 Jul 2005 21:22:24 - 1.152
+++ build.properties.default 31 Jul 2005 13:18:37 - 1.153
@@ -271,7 +271,7 @@
# - Java Mail, version 1.2 or later -
-mail.home=${base.path}/javamail-1.3.1
+mail.home=${base.path}/javamail-1.3.2
mail.lib=${mail.home}
mail.jar=${mail.lib}/mail.jar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/28 07:01:50 Modified:.tomcat.nsi webapps/docs changelog.xml Log: Bugzilla 33267: http://issues.apache.org/bugzilla/show_bug.cgi?id=33267 Revision ChangesPath 1.75 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- tomcat.nsi28 Apr 2005 12:32:05 - 1.74 +++ tomcat.nsi28 Jul 2005 14:01:49 - 1.75 @@ -162,7 +162,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' + 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' Pop $0 StrCmp $0 0 InstallOk MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \ 1.346 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.345 retrieving revision 1.346 diff -u -r1.345 -r1.346 --- changelog.xml 27 Jul 2005 19:39:17 - 1.345 +++ changelog.xml 28 Jul 2005 14:01:49 - 1.346 @@ -49,6 +49,10 @@ fix bug35865/bug: setclasspath.sh cannot be excutive under cygwin (funkman) /fix + fix +bug33267/bug: Set working path in service installer, as suggested by Dominik + Drzewiecki. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser SymbolTable.java XMLChar.java
yoavs 2005/07/27 08:12:05 Modified:.build.xml catalina/src/share/org/apache/catalina/ant/jmx JMXAccessorCondition.java JMXAccessorEqualsCondition.java JMXAccessorGetTask.java JMXAccessorQueryTask.java JMXAccessorSetTask.java JMXAccessorTask.java catalina/src/share/org/apache/catalina/core NamingContextListener.java StandardContext.java catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java catalina/src/share/org/apache/catalina/ssi ByteArrayServletOutputStream.java ResponseIncludeWrapper.java catalina/src/share/org/apache/catalina/valves FastCommonAccessLogValve.java modules/cluster/src/share/org/apache/catalina/cluster CatalinaCluster.java ClusterManager.java ClusterMessage.java ClusterReceiver.java modules/cluster/src/share/org/apache/catalina/cluster/deploy FarmWarDeployer.java modules/cluster/src/share/org/apache/catalina/cluster/io ObjectReader.java SocketObjectReader.java modules/cluster/src/share/org/apache/catalina/cluster/mcast McastMember.java McastService.java modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java JvmRouteBinderValve.java JvmRouteSessionIDBinderLifecycleListener.java JvmRouteSessionIDBinderListener.java ReplicationStream.java modules/cluster/src/share/org/apache/catalina/cluster/tcp ClusterReceiverBase.java DataSender.java FastAsyncSocketSender.java IDataSenderFactory.java ReplicationTransmitter.java ReplicationValve.java SimpleTcpCluster.java SocketReplicationListener.java modules/cluster/src/share/org/apache/catalina/cluster/util FastQueue.java IDynamicProperty.java LinkObject.java modules/storeconfig/src/share/org/apache/catalina/storeconfig LoaderSF.java ManagerSF.java NamingResourcesSF.java StandardContextSF.java StandardServerSF.java StoreAppender.java StoreConfig.java StoreConfigLifecycleListener.java StoreContextAppender.java StoreDescription.java StoreFileMover.java StoreLoader.java StoreRegistry.java jk/java/org/apache/jk/common ChannelNioSocket.java ChannelSocket.java jk/java/org/apache/jk/server JkCoyoteHandler.java util/java/org/apache/tomcat/util/buf StringCache.java util/java/org/apache/tomcat/util/net AprEndpoint.java jasper2/src/share/org/apache/jasper JspC.java jasper2/src/share/org/apache/jasper/xmlparser SymbolTable.java XMLChar.java Log: JavaDoc corrections (and copyright adjustments). There are no code changes here, don't be alarmed by the large size of the commit ;) This patch makes all but the unknown symbol (due to J2SE 5 calls) JavaDoc warnings go away. Revision ChangesPath 1.231 +1 -1 jakarta-tomcat-5/build.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-5/build.xml.diff?r1=1.230r2=1.231 1.5 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCondition.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCondition.java.diff?r1=1.4r2=1.5 1.5 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java.diff?r1=1.4r2=1.5 1.4 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java.diff?r1=1.3r2=1.4 1.5 +6 -6 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java.diff?r1=1.4r2=1.5 1.4 +4 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/26 17:04:13
Modified:catalina build.xml
webapps/docs changelog.xml
Log:
Minimal, quick, ugly fix for Bugzilla 35880:
http://issues.apache.org/bugzilla/show_bug.cgi?id=35880
Revision ChangesPath
1.84 +16 -0 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- build.xml 26 Jul 2005 12:45:22 - 1.83
+++ build.xml 27 Jul 2005 00:04:12 - 1.84
@@ -741,6 +741,18 @@
target name=javadoc unless=docs.uptodate
delete dir=${catalina.build}/javadoc/
mkdir dir=${catalina.build}/javadoc/
+
+!-- To fix Bugzilla 35880, we need to ensure files that use J2SE 5.0
+ syntax are not JavaDoc'ed. Even though no other target uses
+ javadoc.sourcepath and I could rewrite the javadoc target below,
+ that might impact users who use javadoc.sourcepath in their own
+ build scripts. Accordingly, let's try this ugly temporary
+ fix. When we start building Tomcat with J2SE 5.0, we can remove
+ this ugliness.
+--
+move
file=${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java
+
tofile=${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.temp
/
+
javadoc packagenames=org.apache.*
classpathref=catalina.classpath
sourcepathref=javadoc.sourcepath
@@ -755,7 +767,11 @@
excludepackage name=org.apache.coyote.tomcat3 /
excludepackage name=org.apache.coyote.tomcat4 /
excludepackage name=org.apache.jk.apr /
+
/javadoc
+
+move
file=${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.temp
+
tofile=${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java
/
/target
1.341 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- changelog.xml 26 Jul 2005 16:39:14 - 1.340
+++ changelog.xml 27 Jul 2005 00:04:13 - 1.341
@@ -42,6 +42,10 @@
is not built for Java 5, the valve will have to be compiled from the
sources
using Java 5 (remm)
/add
+ fix
+bug35880/bug: Ignore JSSE15SocketFactory when generating
JavaDoc, as it breaks
+ the JDK 1.4 JavaDoc tool. (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp DataSender.java ReplicationTransmitter.java
yoavs 2005/07/26 17:36:26
Modified:catalina/src/share/org/apache/catalina/ant/jmx
JMXAccessorCondition.java
JMXAccessorEqualsCondition.java
JMXAccessorTask.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
DataSender.java ReplicationTransmitter.java
Log:
Minor JavaDoc fixes.
Revision ChangesPath
1.4 +18 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
Index: JMXAccessorCondition.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCondition.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMXAccessorCondition.java 1 Jul 2005 18:54:13 - 1.3
+++ JMXAccessorCondition.java 27 Jul 2005 00:36:26 - 1.4
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002,2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.catalina.ant.jmx;
import java.io.IOException;
@@ -287,7 +303,7 @@
/**
* Get value from MBeans attribute
- * @return
+ * @return The value
*/
protected String accessJMXValue() {
try {
1.4 +18 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
Index: JMXAccessorEqualsCondition.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMXAccessorEqualsCondition.java 30 Jun 2005 13:15:13 - 1.3
+++ JMXAccessorEqualsCondition.java 27 Jul 2005 00:36:26 - 1.4
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002,2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.catalina.ant.jmx;
import java.io.IOException;
@@ -201,7 +217,7 @@
}
/**
- * @return
+ * @return The value
*/
protected String accessJMXValue() {
try {
1.11 +3 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorTask.java
Index: JMXAccessorTask.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JMXAccessorTask.java 22 Jul 2005 11:39:08 - 1.10
+++ JMXAccessorTask.java 27 Jul 2005 00:36:26 - 1.11
@@ -1,5 +1,5 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation.
+ * Copyright 2002,2004-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -421,7 +421,7 @@
/**
* Get Current Connection from emref/em parameter or create a new
one!
*
- * @return
+ * @return The server connection
* @throws MalformedURLException
* @throws IOException
*/
1.16 +4 -5
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
Index: DataSender.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java,v
retrieving revision
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/22 05:52:32
Modified:webapps/ROOT index.jsp
webapps/docs changelog.xml
Log:
Bugzilla 34931: http://issues.apache.org/bugzilla/show_bug.cgi?id=34931
Revision ChangesPath
1.18 +218 -192 jakarta-tomcat-catalina/webapps/ROOT/index.jsp
Index: index.jsp
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/ROOT/index.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- index.jsp 15 Jan 2005 18:18:31 - 1.17
+++ index.jsp 22 Jul 2005 12:52:31 - 1.18
@@ -1,192 +1,218 @@
-!doctype html public -//w3c//dtd html 4.0 transitional//en
http://www.w3.org/TR/REC-html40/strict.dtd;
-%@ page session=false %
-html
-head
-meta http-equiv=Content-Type content=text/html; charset=iso-8859-1
-title%= application.getServerInfo() %/title
-style type=text/css
- !--
-body {
-color: #00;
-background-color: #FF;
-font-family: Arial, Times New Roman, Times;
-font-size: 16px;
-}
-
-A:link {
-color: blue
-}
-
-A:visited {
-color: blue
-}
-
-td {
-color: #00;
-font-family: Arial, Times New Roman, Times;
-font-size: 16px;
-}
-
-.code {
-color: #00;
-font-family: Courier New, Courier;
-font-size: 16px;
-}
- --
-/style
-/head
-
-body
-
-!-- Header --
-table width=100%
-tr
-td align=left width=130a
href=http://jakarta.apache.org/tomcat/index.html;img src=tomcat.gif
height=92 width=130 border=0 alt=The Mighty Tomcat - MEOW!/td
-td align=left valign=top
-table
-trtd align=left valign=topb%=
application.getServerInfo() %/b/td/tr
-/table
-/td
-td align=righta href=http://jakarta.apache.org/;img
src=jakarta-banner.gif height=48 width=505 border=0 alt=The Jakarta
Project/a/td
-/tr
-/table
-
-br
-
-table
-tr
-
-!-- Table of Contents --
-td valign=top
-table width=100% border=1 cellspacing=0 cellpadding=3
bordercolor=#00
-tr
-td bgcolor=#D2A41C bordercolor=#00 align=left
nowrap
-font face=Verdana
size=+1iAdministration/inbsp;nbsp;nbsp;nbsp;nbsp;nbsp;/font
-/td
-/tr
-tr
-td bgcolor=#FFDC75 bordercolor=#00 nowrap
-a href=manager/statusStatus/abr
-a href=adminTomcat Administration/abr
-a href=manager/htmlTomcat Manager/abr
-nbsp;
-/td
-/tr
-/table
-br
-table width=100% border=1 cellspacing=0 cellpadding=3
bordercolor=#00
-tr
-td bgcolor=#D2A41C bordercolor=#00 align=left
nowrap
-font face=Verdana
size=+1iDocumentation/inbsp;nbsp;nbsp;nbsp;nbsp;nbsp;/font
-/td
-/tr
-tr
-td bgcolor=#FFDC75 bordercolor=#00 nowrap
-a href=RELEASE-NOTES.txtRelease Notes/abr
-a href=tomcat-docs/changelog.htmlChange
Log/abr
-a href=tomcat-docsTomcat Documentation/abr
-nbsp;
-/td
-/tr
-/table
-br
-table width=100% border=1 cellspacing=0 cellpadding=3
bordercolor=#00
-tr
-td bgcolor=#D2A41C bordercolor=#00 align=left
nowrap
-font face=Verdana size=+1iTomcat
Online/inbsp;nbsp;nbsp;nbsp;nbsp;nbsp;/font
-/td
-/tr
-tr
-td bgcolor=#FFDC75 bordercolor=#00 nowrap
-a href=http://jakarta.apache.org/tomcat/;Home
Page/abr
-a
href=http://jakarta.apache.org/tomcat/bugreport.html;Bug Database/abr
-a
href=http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMEDamp;bug_status=NEWamp;bug_status=ASSIGNEDamp;bug_status=REOPENEDamp;bug_status=RESOLVEDamp;resolution=LATERamp;resolution=REMINDamp;resolution=---amp;bugidtype=includeamp;product=Tomcat+5amp;cmdtype=doitamp;order=Importance;Open
Bugs/abr
-a
href=http://nagoya.apache.org/eyebrowse/SummarizeList?listId=88;Users Mailing
List/abr
-a
href=http://nagoya.apache.org
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspWriterImpl.java
yoavs 2005/07/22 06:01:14
Modified:webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper/runtime
JspWriterImpl.java
Log:
Bugzilla 35410: http://issues.apache.org/bugzilla/show_bug.cgi?id=35410
Revision ChangesPath
1.332 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- changelog.xml 22 Jul 2005 12:52:32 - 1.331
+++ changelog.xml 22 Jul 2005 13:01:14 - 1.332
@@ -266,6 +266,9 @@
add
bug35114/bug: Add failOnError flag to JspC, by ziweth. (yoavs)
/add
+ fix
+bug35410/bug: Fixed NPE in JspWriterImpl. (yoavs)
+ /fix
/changelog
/subsection
1.16 +7 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java
Index: JspWriterImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JspWriterImpl.java24 Mar 2005 15:39:56 - 1.15
+++ JspWriterImpl.java22 Jul 2005 13:01:14 - 1.16
@@ -333,7 +333,13 @@
* because it must suppress I/O exceptions.
*/
public void write(String s) throws IOException {
-write(s, 0, s.length());
+// Simple fix for Bugzilla 35410
+// Calling the other write function so as to init the buffer anyways
+if(s == null) {
+write(s, 0, 0);
+} else {
+write(s, 0, s.length());
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 RELEASE-NOTES
yoavs 2005/07/22 06:07:52 Modified:.RELEASE-NOTES Log: Bugzilla 33739: http://issues.apache.org/bugzilla/show_bug.cgi?id=33739 Revision ChangesPath 1.26 +2 -2 jakarta-tomcat-5/RELEASE-NOTES Index: RELEASE-NOTES === RCS file: /home/cvs/jakarta-tomcat-5/RELEASE-NOTES,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- RELEASE-NOTES 19 Jan 2005 20:30:26 - 1.25 +++ RELEASE-NOTES 22 Jul 2005 13:07:52 - 1.26 @@ -29,7 +29,7 @@ === Tomcat 5.5 is designed to run on J2SE 5.0 and later, and requires configuration to run on J2SE 1.4. Make sure to read the RUNNING.txt -file in this directory if you are using J2SE 1.4. +file in the fulldocs downloadable file(s) if you are using J2SE 1.4. In addition, Tomcat 5.5 uses the Eclipse JDT Java compiler for compiling JSP pages. This means you no longer need to have the complete - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/22 06:47:53
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
SaveJDBCRealmAction.java
webapps/docs changelog.xml
Log:
Bugzilla 35758: http://issues.apache.org/bugzilla/show_bug.cgi?id=35758
Revision ChangesPath
1.13 +47 -21
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
Index: SaveJDBCRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SaveJDBCRealmAction.java 18 Oct 2004 06:37:54 - 1.12
+++ SaveJDBCRealmAction.java 22 Jul 2005 13:47:53 - 1.13
@@ -228,49 +228,51 @@
// Perform attribute updates as requested
String attribute = null;
+String value = null;
+
try {
ObjectName roname = new ObjectName(rObjectName);
attribute = digest;
-mBServer.setAttribute(roname,
- new Attribute(digest,
rform.getDigest()));
+value = rform.getDigest();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = driverName;
-mBServer.setAttribute(roname,
- new Attribute(driverName,
rform.getDriver()));
+value = rform.getDriver();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = roleNameCol;
-mBServer.setAttribute(roname,
- new Attribute(roleNameCol,
rform.getRoleNameCol()));
+value = rform.getRoleNameCol();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = userNameCol;
-mBServer.setAttribute(roname,
- new Attribute(userNameCol,
rform.getUserNameCol()));
+value = rform.getUserNameCol();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = userCredCol;
-mBServer.setAttribute(roname,
- new Attribute(userCredCol,
rform.getPasswordCol()));
+value = rform.getPasswordCol();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = userTable;
-mBServer.setAttribute(roname,
- new Attribute(userTable,
rform.getUserTable()));
+value = rform.getUserTable();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = userRoleTable;
-mBServer.setAttribute(roname,
- new Attribute(userRoleTable,
rform.getRoleTable()));
+value = rform.getRoleTable();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = connectionName;
-mBServer.setAttribute(roname,
- new Attribute(connectionName,
rform.getConnectionName()));
+value = rform.getConnectionName();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = connectionURL;
-mBServer.setAttribute(roname,
- new Attribute(connectionURL,
rform.getConnectionURL()));
+value = rform.getConnectionURL();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = connectionPassword;
-mBServer.setAttribute(roname,
- new Attribute(connectionPassword,
rform.getConnectionPassword()));
+value = rform.getConnectionPassword();
+setAttributeIfPresent(mBServer, roname, attribute, value);
} catch (Exception e) {
@@ -289,5 +291,29 @@
return (mapping.findForward(Save Successful));
}
+
+/**
+ * Sets the given attribute to the given value
+ * in the given server's object name, if the value
+ * is not null or empty.
+ *
+ * @param theServer The server
+ * @param roname The object name
+ * @param attribute The attribute name
+ * @param value The attribute value
+ * @throws JMException If a JMX error occurs
+ */
+protected void setAttributeIfPresent(MBeanServer mBServer, ObjectName
roname, String attribute, String value)
+throws JMException {
+
+if((mBServer == null) || (roname == null) || (attribute == null)) {
+throw new IllegalArgumentException
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspC.java
yoavs 2005/07/22 07:46:24
Modified:webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper JspC.java
Log:
Bugzilla 35571: http://issues.apache.org/bugzilla/show_bug.cgi?id=35571
Note: using a method (FileUtils.getFileUtils) which was deprecated in
Ant 1.6.3, but will be available for a while. If we ever require
Ant 1.6.3 or later for building, we can update the method call.
Revision ChangesPath
1.334 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- changelog.xml 22 Jul 2005 13:47:53 - 1.333
+++ changelog.xml 22 Jul 2005 14:46:24 - 1.334
@@ -269,6 +269,10 @@
fix
bug35410/bug: Fixed NPE in JspWriterImpl. (yoavs)
/fix
+ add
+bug35571/bug: JspC resolved uriRoot relative to Ant project
basedir, if any, as suggested
+ by Jason Pettiss. (yoavs)
+ /add
/changelog
/subsection
1.98 +49 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- JspC.java 21 Jul 2005 21:23:48 - 1.97
+++ JspC.java 22 Jul 2005 14:46:24 - 1.98
@@ -46,7 +46,10 @@
import org.apache.jasper.compiler.TagPluginManager;
import org.apache.jasper.compiler.TldLocationsCache;
import org.apache.jasper.servlet.JspCServletContext;
+
import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.FileUtils;
/**
* Shell for the jspc compiler. Handles all options associated with the
@@ -146,6 +149,7 @@
private String targetClassName;
private String uriBase;
private String uriRoot;
+private Project project;
private int dieLevel;
private boolean helpNeeded = false;
private boolean compile = false;
@@ -602,18 +606,37 @@
}
/**
+ * Sets the project.
+ *
+ * @param theProject The project
+ */
+public void setProject(final Project theProject) {
+project = theProject;
+}
+
+/**
+ * Returns the project: may be null if not running
+ * inside an Ant project.
+ *
+ * @return The project
+ */
+public Project getProject() {
+return project;
+}
+
+/**
* Base dir for the webapp. Used to generate class names and resolve
* includes
*/
public void setUriroot( String s ) {
if( s==null ) {
-uriRoot=s;
+uriRoot = s;
return;
}
try {
-uriRoot=new File( s ).getCanonicalPath();
+uriRoot = resolveFile(s).getCanonicalPath();
} catch( Exception ex ) {
-uriRoot=s;
+uriRoot = s;
}
}
@@ -654,7 +677,7 @@
public void setOutputDir( String s ) {
if( s!= null ) {
-scratchDir = new File(s).getAbsoluteFile();
+scratchDir = resolveFile(s).getAbsoluteFile();
} else {
scratchDir=null;
}
@@ -677,7 +700,7 @@
* File where we generate a web.xml fragment with the class definitions.
*/
public void setWebXmlFragment( String s ) {
-webxmlFile=s;
+webxmlFile=resolveFile(s).getAbsolutePath();
webxmlLevel=INC_WEBXML;
}
@@ -685,7 +708,7 @@
* File where we generate a complete web.xml with the class definitions.
*/
public void setWebXml( String s ) {
-webxmlFile=s;
+webxmlFile=resolveFile(s).getAbsolutePath();
webxmlLevel=ALL_WEBXML;
}
@@ -1280,4 +1303,24 @@
// pass straight through
}
}
+
+/**
+ * Resolves the relative or absolute pathname correctly
+ * in both Ant and command-line situations. If Ant launched
+ * us, we should use the basedir of the current project
+ * to resolve relative paths.
+ *
+ * See Bugzilla 35571.
+ *
+ * @param s The file
+ * @return The file resolved
+ */
+ protected File resolveFile(final String s) {
+ if(getProject() == null) {
+ // Note FileUtils.getFileUtils replaces FileUtils.newFileUtils
in Ant 1.6.3
+ return FileUtils.newFileUtils().resolveFile(null, s);
+ } else {
+ return
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/22 08:40:31
Modified:webapps/admin banner.jsp
webapps/docs changelog.xml
Log:
Bugzilla 34250: http://issues.apache.org/bugzilla/show_bug.cgi?id=34250
Revision ChangesPath
1.6 +1 -1 jakarta-tomcat-catalina/webapps/admin/banner.jsp
Index: banner.jsp
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/banner.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- banner.jsp4 Mar 2005 05:42:42 - 1.5
+++ banner.jsp22 Jul 2005 15:40:30 - 1.6
@@ -22,7 +22,7 @@
/td
form method='post'
action='%=request.getContextPath()%/commitChanges.do' target='_self'
td align=right valign=middle
-html:submit
+html:submit onclick=if(confirm('Are you sure? Committing changes
will restart modified web applications.')) { return true; } else { return
false; }
bean:message key=button.commit/
/html:submit
/td
1.335 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- changelog.xml 22 Jul 2005 14:46:24 - 1.334
+++ changelog.xml 22 Jul 2005 15:40:30 - 1.335
@@ -418,6 +418,9 @@
fix
bug35758/bug: Admin webapp mishandling digest attribute of
JDBCDataSourceRealm. (yoavs)
/fix
+ add
+bug34250/bug: Admin webapp Commit Changes button now asks for
confirmation. (yoavs)
+ /add
/changelog
/subsection
/section
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager Constants.java HTMLManagerServlet.java
yoavs 2005/07/22 09:09:10
Modified:webapps/docs changelog.xml
webapps/manager/WEB-INF/classes/org/apache/catalina/manager
Constants.java HTMLManagerServlet.java
Log:
Bugzilla 34818: http://issues.apache.org/bugzilla/show_bug.cgi?id=34818
Revision ChangesPath
1.336 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- changelog.xml 22 Jul 2005 15:40:30 - 1.335
+++ changelog.xml 22 Jul 2005 16:09:09 - 1.336
@@ -421,6 +421,10 @@
add
bug34250/bug: Admin webapp Commit Changes button now asks for
confirmation. (yoavs)
/add
+ add
+bug34818/bug: Alternating row for apps in HTML manager, as
suggested by Jeff
+ Domeyer. (yoavs)
+ /add
/changelog
/subsection
/section
1.13 +0 -4
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java
Index: Constants.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Constants.java11 Mar 2005 22:39:26 - 1.12
+++ Constants.java22 Jul 2005 16:09:10 - 1.13
@@ -65,21 +65,18 @@
vertical-align: middle;\n +
font-family:sans-serif,Tahoma,Arial;\n +
color: black;\n +
-background: white;\n +
}\n +
td.row-center {\n +
text-align: center;\n +
vertical-align: middle;\n +
font-family:sans-serif,Tahoma,Arial;\n +
color: black;\n +
-background: white;\n +
}\n +
td.row-right {\n +
text-align: right;\n +
vertical-align: middle;\n +
font-family:sans-serif,Tahoma,Arial;\n +
color: black;\n +
-background: white;\n +
}\n +
TH {\n +
text-align: center;\n +
@@ -93,7 +90,6 @@
vertical-align: middle;\n +
font-family:sans-serif,Tahoma,Arial;\n +
color: black;\n +
-background: white;\n +
}\n +
/style\n;
1.19 +28 -13
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
Index: HTMLManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- HTMLManagerServlet.java 5 Jan 2005 01:03:22 - 1.18
+++ HTMLManagerServlet.java 22 Jul 2005 16:09:10 - 1.19
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -332,7 +332,18 @@
String appsUndeploy =
sm.getString(htmlManagerServlet.appsUndeploy);
Iterator iterator = sortedContextPathsMap.entrySet().iterator();
+boolean isHighlighted = true;
+String highlightColor = null;
+
while (iterator.hasNext()) {
+// Bugzilla 34818, alternating row colors
+isHighlighted = !isHighlighted;
+if(isHighlighted) {
+highlightColor = #C3F3C3;
+} else {
+highlightColor = #FF;
+}
+
Map.Entry entry = (Map.Entry) iterator.next();
String displayPath = (String) entry.getKey();
String contextPath = (String) entry.getKey();
@@ -342,7 +353,7 @@
}
if (context != null ) {
-args = new Object[5];
+args = new Object[6];
args[0] = displayPath;
args[1] = context.getDisplayName();
if (args[1] == null) {
@@ -358,10 +369,13 @@
} else {
args[4] = new Integer(0);
}
+
+args[5] = highlightColor;
+
writer.print
(MessageFormat.format(APPS_ROW_DETAILS_SECTION, args));
-args = new Object[8
cvs commit: jakarta-tomcat-catalina/webapps/manager build.xml
yoavs 2005/07/22 14:25:45
Modified:webapps/docs changelog.xml
webapps/host-manager build.xml
webapps/manager build.xml
Log:
Bugzilla 35379: http://issues.apache.org/bugzilla/show_bug.cgi?id=35379
Revision ChangesPath
1.337 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- changelog.xml 22 Jul 2005 16:09:09 - 1.336
+++ changelog.xml 22 Jul 2005 21:25:44 - 1.337
@@ -425,6 +425,10 @@
bug34818/bug: Alternating row for apps in HTML manager, as
suggested by Jeff
Domeyer. (yoavs)
/add
+ add
+bug35379/bug: Added commons-logging to build path of manager and
host-manager apps,
+ to make them build with Jikes, as suggested by Aaron Isotton.
(yoavs)
+ /add
/changelog
/subsection
/section
1.2 +1 -0 jakarta-tomcat-catalina/webapps/host-manager/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/host-manager/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 11 Mar 2005 22:39:26 - 1.1
+++ build.xml 22 Jul 2005 21:25:45 - 1.2
@@ -23,6 +23,7 @@
path id=host-manager.classpath
pathelement location=${catalina.deploy}/classes/
pathelement location=${commons-fileupload.jar}/
+pathelement location=${commons-logging.jar}/
pathelement location=${commons-modeler.jar}/
pathelement location=${jmx.jar}/
pathelement location=${servlet-api.jar}/
1.6 +1 -0 jakarta-tomcat-catalina/webapps/manager/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 1 Sep 2004 22:54:46 - 1.5
+++ build.xml 22 Jul 2005 21:25:45 - 1.6
@@ -23,6 +23,7 @@
path id=manager.classpath
pathelement location=${catalina.deploy}/classes/
pathelement location=${commons-fileupload.jar}/
+pathelement location=${commons-logging.jar}/
pathelement location=${commons-modeler.jar}/
pathelement location=${jmx.jar}/
pathelement location=${servlet-api.jar}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/21 12:57:17
Modified:catalina/src/conf catalina.properties
catalina/src/share/org/apache/catalina/startup
catalina.properties
webapps/docs changelog.xml
Log:
Bugzilla 34746.
Revision ChangesPath
1.13 +2 -0
jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
Index: catalina.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- catalina.properties 20 Oct 2004 12:28:58 - 1.12
+++ catalina.properties 21 Jul 2005 19:57:17 - 1.13
@@ -54,6 +54,8 @@
# foo/*.jar: Add all the JARs of the specified folder as class
# repositories
# foo/bar.jar: Add bar.jar as a class repository
+# Please note that foe individual jar files, e.g. bar.jar, you need the URL
form
+# starting with file:.
shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
#
1.8 +2 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/catalina.properties
Index: catalina.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/catalina.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- catalina.properties 20 Oct 2004 12:28:57 - 1.7
+++ catalina.properties 21 Jul 2005 19:57:17 - 1.8
@@ -54,6 +54,8 @@
# foo/*.jar: Add all the JARs of the specified folder as class
# repositories
# foo/bar.jar: Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
#
1.325 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- changelog.xml 21 Jul 2005 04:12:33 - 1.324
+++ changelog.xml 21 Jul 2005 19:57:17 - 1.325
@@ -78,6 +78,9 @@
Update JULI to provide support for taking over java.util.logging
bootstrap configuration,
and move the default properties file to
${catalina.base}/conf/logging.properties (remm)
/update
+ fix
+ bug34746/bug: Updated catalina.properties instructions per Bill
Edwards' suggestion. (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/21 13:14:57
Modified:catalina/src/share/org/apache/catalina/deploy
SecurityCollection.java
webapps/docs changelog.xml
Log:
Bugzilla 34805: http://issues.apache.org/bugzilla/show_bug.cgi?id=34805
Revision ChangesPath
1.5 +21 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/SecurityCollection.java
Index: SecurityCollection.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/SecurityCollection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SecurityCollection.java 13 May 2004 20:40:49 - 1.4
+++ SecurityCollection.java 21 Jul 2005 20:14:57 - 1.5
@@ -19,6 +19,10 @@
import org.apache.catalina.util.RequestUtil;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.Serializable;
@@ -39,6 +43,8 @@
public class SecurityCollection implements Serializable {
+private static Log log = LogFactory.getLog(SecurityCollection.class);
+
// ---
Constructors
@@ -180,10 +186,23 @@
if (pattern == null)
return;
+
+// Bugzilla 34805: add friendly warning.
+if(pattern.endsWith(*)) {
+ if (pattern.charAt(pattern.length()-1) != '/') {
+if (log.isDebugEnabled()) {
+ log.warn(Suspicious url pattern: \ + pattern + \ +
+- see
http://java.sun.com/aboutJava/communityprocess/first/jsr053/servlet23_PFD.pdf; +
+ section 11.2 );
+}
+ }
+}
+
pattern = RequestUtil.URLDecode(pattern);
String results[] = new String[patterns.length + 1];
-for (int i = 0; i patterns.length; i++)
+for (int i = 0; i patterns.length; i++) {
results[i] = patterns[i];
+}
results[patterns.length] = pattern;
patterns = results;
1.326 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- changelog.xml 21 Jul 2005 19:57:17 - 1.325
+++ changelog.xml 21 Jul 2005 20:14:57 - 1.326
@@ -179,6 +179,9 @@
bug35769/bug: Correct implementation of
javax.naming.Context.composeName( Name, Name)
in multiple places. Patch provided by Laurent Simon. (markt)
/fix
+ add
+bug34805/bug: Add warning for suspicious security patterns, as
suggested by Ralf Hauser. (yoavs)
+ /add
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources LocalStrings.properties
yoavs 2005/07/21 13:50:56
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java
webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper/compiler
BeanRepository.java Validator.java
jasper2/src/share/org/apache/jasper/resources
LocalStrings.properties
Log:
Bugzilla 35386: http://issues.apache.org/bugzilla/show_bug.cgi?id=35386
Revision ChangesPath
1.62 +8 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- HostConfig.java 15 May 2005 16:29:24 - 1.61
+++ HostConfig.java 21 Jul 2005 20:50:56 - 1.62
@@ -547,14 +547,17 @@
* @param file
*/
protected void deployDescriptor(String contextPath, File contextXml,
String file) {
-DeployedApplication deployedApp = new
DeployedApplication(contextPath);
-
-if (deploymentExists(contextPath))
+if (deploymentExists(contextPath)) {
return;
+}
+
+DeployedApplication deployedApp = new
DeployedApplication(contextPath);
// Assume this is a configuration descriptor and deploy it
-if(log.isDebugEnabled())
+if(log.isDebugEnabled()) {
log.debug(sm.getString(hostConfig.deployDescriptor, file));
+}
+
Context context = null;
try {
synchronized (digester) {
1.327 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- changelog.xml 21 Jul 2005 20:14:57 - 1.326
+++ changelog.xml 21 Jul 2005 20:50:56 - 1.327
@@ -249,6 +249,9 @@
bug35696/bug: Make certain that release is called for custom
tags
when tag-pooling is disabled. (billbarker)
/fix
+ fix
+bug35386/bug: Make useBean resources use consistent spelling,
from Kurt Huwig. (yoavs)
+ /fix
/changelog
/subsection
1.5 +1 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/BeanRepository.java
Index: BeanRepository.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/BeanRepository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BeanRepository.java 17 Mar 2004 19:23:03 - 1.4
+++ BeanRepository.java 21 Jul 2005 20:50:56 - 1.5
@@ -63,7 +63,7 @@
} else if (scope.equals(application)) {
appBeans.addElement(s);
} else {
- errDispatcher.jspError(n, jsp.error.useBean.badScope);
+ errDispatcher.jspError(n, jsp.error.usebean.badScope);
}
putBeanType(s, type);
1.120 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- Validator.java25 Jun 2004 19:05:05 - 1.119
+++ Validator.java21 Jul 2005 20:50:56 - 1.120
@@ -510,13 +510,13 @@
BeanRepository beanInfo = pageInfo.getBeanRepository();
if (className == null type == null)
- err.jspError(n, jsp.error.useBean.missingType);
+ err.jspError(n, jsp.error.usebean.missingType);
if (beanInfo.checkVariable(name))
- err.jspError(n, jsp.error.useBean.duplicate);
+ err.jspError(n, jsp.error.usebean.duplicate);
if (session.equals(scope) !pageInfo.isSession())
- err.jspError(n, jsp.error.useBean.noSession);
+ err.jspError(n, jsp.error.usebean.noSession);
Node.JspAttribute jattr
= getJspAttribute(beanName, null, null,
@@ -524,7 +524,7 @@
java.lang.String.class, n, false);
n.setBeanName(jattr);
if (className != null jattr != null)
- err.jspError(n, jsp.error.useBean.notBoth
cvs commit: jakarta-tomcat-connectors/jk/xdocs index.xml
yoavs 2005/07/21 14:11:40 Modified:webapps/docs changelog.xml index.xml jasper-howto.xml ssl-howto.xml jk/xdocs index.xml Log: Bugzilla 35090: http://issues.apache.org/bugzilla/show_bug.cgi?id=35090 Revision ChangesPath 1.328 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.327 retrieving revision 1.328 diff -u -r1.327 -r1.328 --- changelog.xml 21 Jul 2005 20:50:56 - 1.327 +++ changelog.xml 21 Jul 2005 21:11:39 - 1.328 @@ -81,6 +81,9 @@ fix bug34746/bug: Updated catalina.properties instructions per Bill Edwards' suggestion. (yoavs) /fix + fix + bug35090/bug: Minor documentation typo fix. (yoavs) + /fix /changelog /subsection 1.23 +2 -2 jakarta-tomcat-catalina/webapps/docs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/index.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- index.xml 16 May 2005 11:18:59 - 1.22 +++ index.xml 21 Jul 2005 21:11:39 - 1.23 @@ -26,7 +26,7 @@ web applications and web services./p pSelect one of the links from the navigation menu (to the left) to drill -down to the more detailed documenation that is available. Each available +down to the more detailed documentation that is available. Each available manual is described in more detail below./p /section @@ -120,7 +120,7 @@ - Reference manual that documents all available elements and attributes that may be placed into a Apache Tomcat 5 codeconf/server.xml/code file. /li -lia href=http://jakarta.apache.org/tomcat/connectors-doc/index.html;strongJK Documenation/strong/a +lia href=http://jakarta.apache.org/tomcat/connectors-doc/index.html;strongJK Documentation/strong/a - Complete documentation and HOWTOs on the JK native webserver connector, used to interface Apache Tomcat with servers like Apache HTTPd, IIS and others./li 1.27 +1 -1 jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml Index: jasper-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- jasper-howto.xml 4 Apr 2005 11:11:51 - 1.26 +++ jasper-howto.xml 21 Jul 2005 21:11:39 - 1.27 @@ -74,7 +74,7 @@ code300/code seconds./li listrongcompiler/strong - Which compiler Ant should use to compile JSP -pages. See the Ant documenation for more information. If the value is not set, +pages. See the Ant documentation for more information. If the value is not set, then the default Eclipse JDT Java compiler will be used instead of using Ant. No default value./li 1.16 +1 -1 jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml Index: ssl-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ssl-howto.xml 23 Mar 2005 16:31:41 - 1.15 +++ ssl-howto.xml 21 Jul 2005 21:11:39 - 1.16 @@ -429,7 +429,7 @@ /li /ul pNow you have a file called codecertreq.csr/code that you can submit to the Certificate Authority (look at the -documenation of the Certificate Authority website on how to do this). In return you get a Certificate./p +documentation of the Certificate Authority website on how to do this). In return you get a Certificate./p /subsection subsection name=Importing the Certificate 1.40 +1 -1 jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- index.xml 13 Jul 2005 15:42:44 - 1.39 +++ index.xml 21 Jul 2005 21:11:40 - 1.40 @@ -20,7 +20,7 @@ /p pSelect one of the links from the navigation menu (to the left) to drill -down to the more detailed documenation that is available. Each available +down to the more detailed documentation that is available. Each available manual is described in more detail below./p /section - To unsubscribe, e
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/21 14:40:56 Modified:catalina/src/share/org/apache/catalina/startup ContextConfig.java webapps/docs changelog.xml Log: Bugzilla 35819: http://issues.apache.org/bugzilla/show_bug.cgi?id=35819 Revision ChangesPath 1.65 +4 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java Index: ContextConfig.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- ContextConfig.java16 Mar 2005 11:37:43 - 1.64 +++ ContextConfig.java21 Jul 2005 21:40:56 - 1.65 @@ -1240,7 +1240,9 @@ // Called from StandardContext.destroy() if (log.isDebugEnabled()) log.debug(sm.getString(contextConfig.destroy)); -String workDir = ((StandardContext) context).getWorkDir(); + +// Changed to getWorkPath per Bugzilla 35819. +String workDir = ((StandardContext) context).getWorkPath(); if (workDir != null) ExpandWar.delete(new File(workDir)); } 1.330 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- changelog.xml 21 Jul 2005 21:23:47 - 1.329 +++ changelog.xml 21 Jul 2005 21:40:56 - 1.330 @@ -182,6 +182,10 @@ add bug34805/bug: Add warning for suspicious security patterns, as suggested by Ralf Hauser. (yoavs) /add + fix +bug35819/bug: Use getWorkPath for deleting work directory on context destroy, as suggested + by Rob Steele. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm JDBCRealm.java
yoavs 2005/07/21 14:56:55
Modified:catalina/src/share/org/apache/catalina/realm JDBCRealm.java
Log:
Minor logging addition.
Revision ChangesPath
1.15 +6 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
Index: JDBCRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JDBCRealm.java8 Mar 2005 23:03:01 - 1.14
+++ JDBCRealm.java21 Jul 2005 21:56:54 - 1.15
@@ -487,6 +487,11 @@
sb.append( WHERE );
sb.append(userNameCol);
sb.append( = ?);
+
+if(containerLog.isDebugEnabled()) {
+containerLog.debug(credentials query: + sb.toString());
+}
+
preparedCredentials =
dbConnection.prepareStatement(sb.toString());
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs bugreport.xml
yoavs 2005/06/16 10:53:32 Modified:docs bugreport.html xdocsbugreport.xml Log: Moving security bug reporting to the bottom of the list, as requested by [EMAIL PROTECTED] Revision ChangesPath 1.34 +29 -5 jakarta-tomcat-site/docs/bugreport.html Index: bugreport.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/bugreport.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- bugreport.html26 May 2005 17:28:13 - 1.33 +++ bugreport.html16 Jun 2005 17:53:32 - 1.34 @@ -174,11 +174,6 @@ who assist on a day to day basis resolving bug reports do this for a wide variety of reasons, and almost all of them do this on their own time./p -pIf you have a verified security bug to report please do not post it -to email lists or submit a bug report. Security bugs should be reported -privately by email to a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/a. -/p - pMany bugs reported end up not being a bug in the Apache Tomcat code, but are due to misconfiguration, problems caused by installed applications, the operating system, etc. @@ -448,6 +443,35 @@ a href=http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%203; here/a.br / /p + +table width=100% cellpadding=2 cellspacing=0 border=0 +tr +td bgcolor=#828DA6 +font face=arial,helvetica,sanserif color=#ff +a name=Security Issues +strongSecurity Issues/strong +/a +/font +/td +/tr +tr +td +blockquote +pSecurity-related bugs are of special concern. If you have a verified +security bug to report please do not post it +to email lists or submit a bug report. Security bugs should be reported +privately by email to a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/a. +/p +/blockquote +/td +/tr +tr +td +br / +/td +/tr +/table + /blockquote /p /td 1.11 +9 -5 jakarta-tomcat-site/xdocs/bugreport.xml Index: bugreport.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs/bugreport.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bugreport.xml 16 May 2005 11:19:38 - 1.10 +++ bugreport.xml 16 Jun 2005 17:53:32 - 1.11 @@ -15,11 +15,6 @@ who assist on a day to day basis resolving bug reports do this for a wide variety of reasons, and almost all of them do this on their own time./p -pIf you have a verified security bug to report please do not post it -to email lists or submit a bug report. Security bugs should be reported -privately by email to a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/a. -/p - pMany bugs reported end up not being a bug in the Apache Tomcat code, but are due to misconfiguration, problems caused by installed applications, the operating system, etc. @@ -151,6 +146,15 @@ a href=http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%203; here/a.br / /p + +subsection name=Security Issues +pSecurity-related bugs are of special concern. If you have a verified +security bug to report please do not post it +to email lists or submit a bug report. Security bugs should be reported +privately by email to a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/a. +/p +/subsection + /section /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs/stylesheets project.xml
yoavs 2005/05/26 10:28:13 Modified:docs bugreport.html index.html irc.html resources.html xdocs/stylesheets project.xml Log: Using updatd download pages, not direct links to archive.apache.org. Revision ChangesPath 1.33 +10 -10jakarta-tomcat-site/docs/bugreport.html Index: bugreport.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/bugreport.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- bugreport.html16 May 2005 11:19:38 - 1.32 +++ bugreport.html26 May 2005 17:28:13 - 1.33 @@ -33,7 +33,7 @@ !--LEFT SIDE NAVIGATION-- td nowrap=true valign=top width=20% p -strongTomcat/strong +strongApache Tomcat/strong /p ul li @@ -57,16 +57,16 @@ /p ul li -a href=./tomcat-5.5-doc/index.htmlTomcat 5.5/a +a href=./tomcat-5.5-doc/index.htmlApache Tomcat 5.5/a /li li -a href=./tomcat-5.0-doc/index.htmlTomcat 5.0/a +a href=./tomcat-5.0-doc/index.htmlApache Tomcat 5.0/a /li li -a href=./tomcat-4.1-doc/index.htmlTomcat 4.1/a +a href=./tomcat-4.1-doc/index.htmlApache Tomcat 4.1/a /li li -a href=./tomcat-3.3-doc/index.htmlTomcat 3.3/a +a href=./tomcat-3.3-doc/index.htmlApache Tomcat 3.3/a /li /ul p @@ -77,13 +77,13 @@ a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Current Releases/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Tomcat 5.x/a +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Apache Tomcat 5.x/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-4/;Tomcat 4.x/a +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-4.cgi;Apache Tomcat 4.x/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-3/;Tomcat 3.x/a +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-3.cgi;Apache Tomcat 3.x/a /li /ul p @@ -91,10 +91,10 @@ /p ul li -a href=./tomcat-4.0-doc/index.htmlTomcat 4.0/a +a href=./tomcat-4.0-doc/index.htmlApache Tomcat 4.0/a /li li -a href=./tomcat-3.2-doc/index.htmlTomcat 3.2/a +a href=./tomcat-3.2-doc/index.htmlApache Tomcat 3.2/a /li /ul p 1.80 +3 -3 jakarta-tomcat-site/docs/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- index.html16 May 2005 11:19:38 - 1.79 +++ index.html26 May 2005 17:28:13 - 1.80 @@ -79,13 +79,13 @@ a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Current Releases/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Apache Tomcat 5.x/a +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Apache Tomcat 5.x/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-4/;Apache Tomcat 4.x/a +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-4.cgi;Apache Tomcat 4.x/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-3/;Apache Tomcat 3.x/a +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-3.cgi;Apache Tomcat 3.x/a /li /ul p 1.31 +10 -10jakarta-tomcat-site/docs/irc.html Index: irc.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/irc.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- irc.html 16 May 2005 11:19:38 - 1.30 +++ irc.html 26 May 2005 17:28:13 - 1.31 @@ -33,7 +33,7 @@ !--LEFT SIDE NAVIGATION-- td nowrap=true valign=top width=20% p -strongTomcat/strong +strongApache Tomcat/strong /p ul li @@ -57,16 +57,16 @@ /p ul li -a href=./tomcat-5.5-doc/index.htmlTomcat 5.5/a +a href=./tomcat-5.5-doc/index.htmlApache Tomcat 5.5/a /li li -a href=./tomcat-5.0-doc/index.htmlTomcat 5.0/a +a href=./tomcat-5.0-doc/index.htmlApache Tomcat 5.0/a /li li -a href=./tomcat-4.1-doc/index.htmlTomcat 4.1/a +a href=./tomcat-4.1-doc/index.htmlApache Tomcat 4.1/a /li li -a href=./tomcat-3.3-doc/index.htmlTomcat 3.3/a +a href=./tomcat-3.3-doc/index.htmlApache Tomcat 3.3/a /li /ul p @@ -77,13 +77,13 @@ a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Current Releases/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Tomcat 5.x/a +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Apache Tomcat 5.x/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-4/;Tomcat 4.x/a +a href=http://jakarta.apache.org/site/downloads
cvs commit: jakarta-tomcat-site/docs bugreport.html index.html irc.html resources.html
yoavs 2005/05/03 06:48:12 Modified:docs bugreport.html index.html irc.html resources.html Log: Previous update didn't work, touch and build again. Revision ChangesPath 1.31 +7 -1 jakarta-tomcat-site/docs/bugreport.html Index: bugreport.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/bugreport.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- bugreport.html31 Mar 2005 14:21:07 - 1.30 +++ bugreport.html3 May 2005 13:48:12 - 1.31 @@ -77,7 +77,13 @@ a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Current Releases/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Archived Releases/a +a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Tomcat 5.x/a +/li +li +a href=http://archive.apache.org/dist/jakarta/tomcat-4/;Tomcat 4.x/a +/li +li +a href=http://archive.apache.org/dist/jakarta/tomcat-3/;Tomcat 3.x/a /li /ul p 1.78 +7 -1 jakarta-tomcat-site/docs/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- index.html13 Apr 2005 01:19:46 - 1.77 +++ index.html3 May 2005 13:48:12 - 1.78 @@ -79,7 +79,13 @@ a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Current Releases/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Archived Releases/a +a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Tomcat 5.x/a +/li +li +a href=http://archive.apache.org/dist/jakarta/tomcat-4/;Tomcat 4.x/a +/li +li +a href=http://archive.apache.org/dist/jakarta/tomcat-3/;Tomcat 3.x/a /li /ul p 1.29 +7 -1 jakarta-tomcat-site/docs/irc.html Index: irc.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/irc.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- irc.html 31 Mar 2005 14:21:07 - 1.28 +++ irc.html 3 May 2005 13:48:12 - 1.29 @@ -77,7 +77,13 @@ a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Current Releases/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Archived Releases/a +a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Tomcat 5.x/a +/li +li +a href=http://archive.apache.org/dist/jakarta/tomcat-4/;Tomcat 4.x/a +/li +li +a href=http://archive.apache.org/dist/jakarta/tomcat-3/;Tomcat 3.x/a /li /ul p 1.34 +7 -1 jakarta-tomcat-site/docs/resources.html Index: resources.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/resources.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- resources.html31 Mar 2005 14:21:07 - 1.33 +++ resources.html3 May 2005 13:48:12 - 1.34 @@ -77,7 +77,13 @@ a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Current Releases/a /li li -a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Archived Releases/a +a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Tomcat 5.x/a +/li +li +a href=http://archive.apache.org/dist/jakarta/tomcat-4/;Tomcat 4.x/a +/li +li +a href=http://archive.apache.org/dist/jakarta/tomcat-3/;Tomcat 3.x/a /li /ul p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/05/03 07:00:07 Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java webapps/docs changelog.xml Log: Bugzilla 34578. Revision ChangesPath 1.24 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java Index: JNDIRealm.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- JNDIRealm.java25 Mar 2005 08:29:32 - 1.23 +++ JNDIRealm.java3 May 2005 14:00:07 - 1.24 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. + * Copyright 1999-2002,2004-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. @@ -1075,7 +1075,7 @@ Name contextName = parser.parse(context.getNameInNamespace()); Name baseName = parser.parse(userBase); -// Bugzilla 32267 +// Bugzilla 32269 Name entryName = parser.parse(new CompositeName(result.getName()).get(0)); Name name = contextName.addAll(baseName); 1.300 +18 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.299 retrieving revision 1.300 diff -u -r1.299 -r1.300 --- changelog.xml 2 May 2005 00:05:02 - 1.299 +++ changelog.xml 3 May 2005 14:00:07 - 1.300 @@ -26,6 +26,24 @@ /p /section +section name=Tomcat 5.5.11 (yoavs) + subsection name=General +changelog +/changelog + /subsection + + subsection name=Catalina +changelog + fix +bug34578/bug: Updated JNDIRealm comment. (yoavs) + /fix + add +[Placeholder for HttpAprConnector] + /add +/changelog + /subsection +/section + section name=Tomcat 5.5.10 (yoavs) subsection name=General changelog - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/05/03 07:05:44 Modified:webapps/docs changelog.xml Log: Oops, jumped the gun a bit with 5.5.11 in the changelog ;) Revision ChangesPath 1.301 +6 -18 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.300 retrieving revision 1.301 diff -u -r1.300 -r1.301 --- changelog.xml 3 May 2005 14:00:07 - 1.300 +++ changelog.xml 3 May 2005 14:05:44 - 1.301 @@ -26,24 +26,6 @@ /p /section -section name=Tomcat 5.5.11 (yoavs) - subsection name=General -changelog -/changelog - /subsection - - subsection name=Catalina -changelog - fix -bug34578/bug: Updated JNDIRealm comment. (yoavs) - /fix - add -[Placeholder for HttpAprConnector] - /add -/changelog - /subsection -/section - section name=Tomcat 5.5.10 (yoavs) subsection name=General changelog @@ -145,6 +127,12 @@ update Add missing CGI variables to SSI servlet. Patch submitted by Fritz Schneider. (markt) /update + fix +bug34578/bug: Updated JNDIRealm comment. (yoavs) + /fix + add +[Placeholder for HttpAprConnector] + /add /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/05/03 07:12:52
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
webapps/docs changelog.xml
Log:
Bugzilla 34273.
Revision ChangesPath
1.22 +3 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Bootstrap.java21 Aug 2004 19:34:59 - 1.21
+++ Bootstrap.java3 May 2005 14:12:52 - 1.22
@@ -409,6 +409,8 @@
daemon.start();
} else if (command.equals(stop)) {
daemon.stopServer(args);
+} else {
+log.warn(Bootsrap: command \ + command + \ does not
exist.);
}
} catch (Throwable t) {
t.printStackTrace();
1.302 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- changelog.xml 3 May 2005 14:05:44 - 1.301
+++ changelog.xml 3 May 2005 14:12:52 - 1.302
@@ -133,6 +133,9 @@
add
[Placeholder for HttpAprConnector]
/add
+ fix
+bug34273/bug: Better Bootstrap warning message. [Path from Ralf
Hauser] (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml proxy-howto.xml
yoavs 2005/05/03 07:29:26 Modified:webapps/docs changelog.xml proxy-howto.xml Log: Bugzilla 34675. Revision ChangesPath 1.303 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- changelog.xml 3 May 2005 14:12:52 - 1.302 +++ changelog.xml 3 May 2005 14:29:25 - 1.303 @@ -136,6 +136,9 @@ fix bug34273/bug: Better Bootstrap warning message. [Path from Ralf Hauser] (yoavs) /fix + update +bug34675/bug: Updated Proxy-HowTo page with Servlet API calls. (yoavs) + /update /changelog /subsection 1.7 +5 -3 jakarta-tomcat-catalina/webapps/docs/proxy-howto.xml Index: proxy-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/proxy-howto.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- proxy-howto.xml 8 Jan 2004 14:55:57 - 1.6 +++ proxy-howto.xml 3 May 2005 14:29:25 - 1.7 @@ -21,11 +21,13 @@ processing. When Tomcat is running standalone with the a href=config/coyote.htmlCoyote HTTP/1.1 Connector/a, it will generally report the server name specified in the request, and the port number on -which the strongConnector/strong is listening. The two servlet API +which the strongConnector/strong is listening. The servlet API calls of interest, for this purpose, are:/p ul -licodeServletRequest.getServerName()/code/li -licodeServletRequest.getServerPort()/code/li +licodeServletRequest.getServerName()/code: Returns the host name of the server to which the request was sent./li +licodeServletRequest.getServerPort()/code: Returns the host name of the server to which the request was sent./li +licodeServletRequest.getLocalName()/code: Returns the host name of the Internet Protocol (IP) interface on which the request was received./li +licodeServletRequest.getLocalPort()/code: Returns the Internet Protocol (IP) port number of the interface on which the request was received./li /ul pWhen you are running behind a proxy server (or a web server that is - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs/stylesheets project.xml
yoavs 2005/04/29 09:25:56 Modified:xdocs/stylesheets project.xml Log: Clarifying download links after recent change, per private requests. Revision ChangesPath 1.17 +3 -1 jakarta-tomcat-site/xdocs/stylesheets/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs/stylesheets/project.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- project.xml 31 Mar 2005 14:21:07 - 1.16 +++ project.xml 29 Apr 2005 16:25:56 - 1.17 @@ -23,7 +23,9 @@ menu name=Download item name=Current Releases href=/site/downloads/downloads_tomcat-5.cgi / -item name=Archived Releases href=http://archive.apache.org/dist/jakarta/tomcat-5/; / +item name=Tomcat 5.x href=http://archive.apache.org/dist/jakarta/tomcat-5/; / +item name=Tomcat 4.x href=http://archive.apache.org/dist/jakarta/tomcat-4/; / +item name=Tomcat 3.x href=http://archive.apache.org/dist/jakarta/tomcat-3/; / /menu menu name=Archives - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs index.xml
yoavs 2005/04/12 18:19:46 Modified:docs index.html xdocsindex.xml Log: 5.5.9 is now latest stable. Revision ChangesPath 1.77 +1 -1 jakarta-tomcat-site/docs/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- index.html31 Mar 2005 14:21:07 - 1.76 +++ index.html13 Apr 2005 01:19:46 - 1.77 @@ -226,7 +226,7 @@ font face=arial,helvetica,sanserif size=-1 color=#002.4/2.0/font /td td align=left valign=top bgcolor=#a0ddf0 -font face=arial,helvetica,sanserif size=-1 color=#005.5.7/font +font face=arial,helvetica,sanserif size=-1 color=#005.5.9/font /td /tr 1.62 +1 -1 jakarta-tomcat-site/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs/index.xml,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- index.xml 30 Jan 2005 17:15:16 - 1.61 +++ index.xml 13 Apr 2005 01:19:46 - 1.62 @@ -41,7 +41,7 @@ tr td2.4/2.0/td - td5.5.7/td + td5.5.9/td /tr tr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml jndi-resources-howto.xml
yoavs 2005/04/01 05:52:10 Modified:webapps/docs changelog.xml jndi-resources-howto.xml Log: Bugzilla 34248. Revision ChangesPath 1.279 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.278 retrieving revision 1.279 diff -u -r1.278 -r1.279 --- changelog.xml 31 Mar 2005 10:31:54 - 1.278 +++ changelog.xml 1 Apr 2005 13:52:10 - 1.279 @@ -36,6 +36,9 @@ bug34237/bug: Added note and links to context and host configuration references in JNDI DataSources HowTo to aid the clueless. (yoavs) /update + update +bug34248/bug: Update JavaMail download instructions to include JAF. (yoavs) + /update /changelog /subsection 1.10 +5 -2 jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml Index: jndi-resources-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jndi-resources-howto.xml 30 Nov 2004 17:24:46 - 1.9 +++ jndi-resources-howto.xml 1 Apr 2005 13:52:10 - 1.10 @@ -387,10 +387,13 @@ h34. Install the JavaMail libraries/h3 pa href=http://java.sun.com/products/javamail/downloads/index.html; target=_blank -Download the JavaMail API/a./p +Download the JavaMail API/a. The JavaMail API requires the Java Activation +Framework (JAF) API as well. The Java Activation Framework can be downloaded +from a href=http://java.sun.com/products/javabeans/glasgow/jaf.html;Sun's site/a. +/p pThis download includes 2 vital libraries for the configuration; -activation.jar and mail.jar. Unpackage the JavaMail distribution and place +activation.jar and mail.jar. Unpackage both distributions and place them into $CATALINA_HOME/common/lib so that they are available to Tomcat during the initialization of the mail Session Resource. strongNote:/strong placing these jars in both common/lib and a - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs/stylesheets project.xml
yoavs 2005/03/31 06:21:07 Modified:docs bugreport.html index.html irc.html resources.html xdocs/stylesheets project.xml Log: Update links to download pages, regen docs. Revision ChangesPath 1.30 +2 -2 jakarta-tomcat-site/docs/bugreport.html Index: bugreport.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/bugreport.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- bugreport.html3 Jan 2005 20:15:34 - 1.29 +++ bugreport.html31 Mar 2005 14:21:07 - 1.30 @@ -74,10 +74,10 @@ /p ul li -a href=http://jakarta.apache.org/site/binindex.cgi;Binaries/a +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Current Releases/a /li li -a href=http://jakarta.apache.org/site/sourceindex.cgi;Source Code/a +a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Archived Releases/a /li /ul p 1.76 +2 -2 jakarta-tomcat-site/docs/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- index.html30 Jan 2005 17:15:16 - 1.75 +++ index.html31 Mar 2005 14:21:07 - 1.76 @@ -76,10 +76,10 @@ /p ul li -a href=http://jakarta.apache.org/site/binindex.cgi;Binaries/a +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Current Releases/a /li li -a href=http://jakarta.apache.org/site/sourceindex.cgi;Source Code/a +a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Archived Releases/a /li /ul p 1.28 +2 -2 jakarta-tomcat-site/docs/irc.html Index: irc.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/irc.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- irc.html 3 Jan 2005 20:15:34 - 1.27 +++ irc.html 31 Mar 2005 14:21:07 - 1.28 @@ -74,10 +74,10 @@ /p ul li -a href=http://jakarta.apache.org/site/binindex.cgi;Binaries/a +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Current Releases/a /li li -a href=http://jakarta.apache.org/site/sourceindex.cgi;Source Code/a +a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Archived Releases/a /li /ul p 1.33 +2 -2 jakarta-tomcat-site/docs/resources.html Index: resources.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/resources.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- resources.html3 Feb 2005 15:12:26 - 1.32 +++ resources.html31 Mar 2005 14:21:07 - 1.33 @@ -74,10 +74,10 @@ /p ul li -a href=http://jakarta.apache.org/site/binindex.cgi;Binaries/a +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi;Current Releases/a /li li -a href=http://jakarta.apache.org/site/sourceindex.cgi;Source Code/a +a href=http://archive.apache.org/dist/jakarta/tomcat-5/;Archived Releases/a /li /ul p 1.16 +2 -2 jakarta-tomcat-site/xdocs/stylesheets/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs/stylesheets/project.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- project.xml 3 Jan 2005 20:15:34 - 1.15 +++ project.xml 31 Mar 2005 14:21:07 - 1.16 @@ -22,8 +22,8 @@ /menu menu name=Download -item name=Binaries href=/site/binindex.cgi/ -item name=Source Code href=/site/sourceindex.cgi/ +item name=Current Releases href=/site/downloads/downloads_tomcat-5.cgi / +item name=Archived Releases href=http://archive.apache.org/dist/jakarta/tomcat-5/; / /menu menu name=Archives - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml jasper-howto.xml
yoavs 2005/03/30 08:52:52 Modified:webapps/docs changelog.xml jasper-howto.xml Log: Bugzilla 33522. Revision ChangesPath 1.275 +8 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- changelog.xml 29 Mar 2005 21:54:14 - 1.274 +++ changelog.xml 30 Mar 2005 16:52:52 - 1.275 @@ -27,6 +27,14 @@ /section section name=Tomcat 5.5.10 (yoavs) + subsection name=General +changelog + update +bug33522/bug: Update jasper-howto to reflect use of javac switch. (yoavs) + /update +/changelog + /subsection + subsection name=Catalina changelog fix 1.25 +2 -1 jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml Index: jasper-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- jasper-howto.xml 3 Dec 2004 15:17:34 - 1.24 +++ jasper-howto.xml 30 Mar 2005 16:52:52 - 1.25 @@ -148,7 +148,8 @@ pApache Ant, which was used in previous Tomcat releases, can be used instead instead of the new compiler by simply removing the codecommon/lib/jasper-compiler-jdt.jar/code file, and placing the codeant.jar/code file from the latest Ant distribution in the -codecommon/lib/code folder./p +codecommon/lib/code folder. If you do this, you also need to use the javac +argument to catalina.sh./p /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/03/30 09:04:09
Modified:catalina/src/share/org/apache/catalina/startup Catalina.java
webapps/docs changelog.xml
Log:
Bugzilla 34220.
Revision ChangesPath
1.36 +5 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Catalina.java 23 Oct 2004 16:54:23 - 1.35
+++ Catalina.java 30 Mar 2005 17:04:08 - 1.36
@@ -443,8 +443,9 @@
Exception ex = null;
InputSource inputSource = null;
InputStream inputStream = null;
+File file = null;
try {
-File file = configFile();
+file = configFile();
inputStream = new FileInputStream(file);
inputSource = new InputSource(file:// +
file.getAbsolutePath());
} catch (Exception e) {
@@ -462,8 +463,8 @@
}
}
-if (inputStream == null) {
-log.warn(Can't load server.xml);
+if ((inputStream == null) (file != null)) {
+log.warn(Can't load server.xml from + file.getAbsolutePath());
return;
}
1.276 +4 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- changelog.xml 30 Mar 2005 16:52:52 - 1.275
+++ changelog.xml 30 Mar 2005 17:04:09 - 1.276
@@ -34,13 +34,16 @@
/update
/changelog
/subsection
-
subsection name=Catalina
changelog
fix
bug20380/bug: Access log timestamps now take account of Daylight
Saving
Time (DST). (markt)
/fix
+ add
+bug34220/bug: Provide better error message when server.xml can't
be located.
+ [Modified patch from Ralf Hauser] (yoavs)
+ /add
/changelog
/subsection
subsection name=Jasper
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml jndi-datasource-examples-howto.xml
yoavs 2005/03/30 09:23:23 Modified:webapps/docs changelog.xml jndi-datasource-examples-howto.xml Log: Bugzilla 34237. Revision ChangesPath 1.277 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- changelog.xml 30 Mar 2005 17:04:09 - 1.276 +++ changelog.xml 30 Mar 2005 17:23:23 - 1.277 @@ -32,6 +32,10 @@ update bug33522/bug: Update jasper-howto to reflect use of javac switch. (yoavs) /update + update +bug34237/bug: Added note and links to context and host configuration + references in JNDI DataSources HowTo to aid the clueless. (yoavs) + /update /changelog /subsection subsection name=Catalina 1.15 +15 -1 jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml Index: jndi-datasource-examples-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jndi-datasource-examples-howto.xml26 Mar 2005 03:16:18 - 1.14 +++ jndi-datasource-examples-howto.xml30 Mar 2005 17:23:23 - 1.15 @@ -47,6 +47,14 @@ resource configurations to match the syntax in the example below in order to make them work in Tomcat 5.5.x. /p + +p +Also, please note that JNDI DataSource configuration in general, and this +tutorial in particular, assumes that you have read and understood the +a href=config/context.htmlContext/a and +a href=config/host.htmlHost/a configuration references, including +the section about Automatic Application Deployment in the latter reference. +/p /section section name=Database Connection Pool (DBCP) Configurations @@ -189,7 +197,13 @@ pConfigure the JNDI DataSource in Tomcat by adding a declaration for your resource to code$CATALINA_HOME/conf/server.xml/code./p pAdd this in between the codelt;/Contextgt;/code tag of the examples -context and the codelt;/Hostgt;/code tag closing the localhost definition.source +context and the codelt;/Hostgt;/code tag closing the localhost definition. +If there is no such tag, you can add one as illustrated in the +a href=config/context.htmlContext/a and +a href=config/host.htmlHost/a configuration references, and repeated below +for your convenience. + +source lt;Context path=/DBTest docBase=DBTest debug=5 reloadable=true crossContext=truegt; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml jndi-datasource-examples-howto.xml
yoavs 2005/03/25 19:16:18 Modified:webapps/docs changelog.xml jndi-datasource-examples-howto.xml Log: Bugzilla 33755. Revision ChangesPath 1.272 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- changelog.xml 25 Mar 2005 22:24:20 - 1.271 +++ changelog.xml 26 Mar 2005 03:16:18 - 1.272 @@ -60,6 +60,10 @@ add bug33325/bug: Added top-level clean target to Netbuild build.xml file. (yoavs) /add + update +bug33755/bug: Clarified Postgresql JNDI datasource example. [patch submitted by + Tom Witmer] (yoavs) + /update /changelog /subsection 1.14 +84 -7 jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml Index: jndi-datasource-examples-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jndi-datasource-examples-howto.xml27 Sep 2004 16:00:31 - 1.13 +++ jndi-datasource-examples-howto.xml26 Mar 2005 03:16:18 - 1.14 @@ -30,7 +30,7 @@ section name=Introduction pJNDI Datasource configuration is covered extensively in the -JNDI-Resources-HOWTO however, feedback from codetomcat-user/code has +JNDI-Resources-HOWTO. However, feedback from codetomcat-user/code has shown that specifics for individual configurations can be rather tricky./p pHere then are some example configurations that have been posted to @@ -41,6 +41,12 @@ know if you have any other tested configurations that you feel may be of use to the wider audience, or if you feel we can improve this section in anyway./p +p +bPlease note that JNDI resource configuration has changed somewhat between +Tomcat 5.0.x and Tomcat 5.5.x./b You will most likely need to modify your JNDI +resource configurations to match the syntax in the example below in order +to make them work in Tomcat 5.5.x. +/p /section section name=Database Connection Pool (DBCP) Configurations @@ -335,16 +341,65 @@ subsection name=PostgreSQL h30.Introduction/h3 -pPostgreSQL is configured in a similar manner to Oracle. Again, highlighting the differences. -These notes are untested as yet and we would appreciate feedback./p -h31.server.xml configuration/h3 +pPostgreSQL is configured in a similar manner to Oracle./p + +h31. Required files /h3 +p +Copy the Postgres JDBC jar to $CATALINA_HOME/common/lib. As with Oracle, the +jars need to be in this directory in order for DBCP's Classloader to find +them. This has to be done regardless of which configuration step you take next. +/p + +h32. Resource configuration/h3 + +p +You have two choices here: define a datasource that is shared across all Tomcat +applications, or define a datasource specifically for one application. +/p + +h42a. Shared resource configuration/h4 +p +Use this option if you wish to define a datasource that is shared across +multiple Tomcat applications, or if you just prefer defining your datasource +in this file. +/p +piThis author has not had success here, although others have reported so. +Clarification would be appreciated here./i/p + source lt;Resource name=jdbc/postgres auth=Container type=javax.sql.DataSource driverClassName=org.postgresql.Driver url=jdbc:postgresql://127.0.0.1:5432/mydb - username=myuser password=mypasswd maxActive=20 maxIdle=10 maxWait=-1/ + username=myuser password=mypasswd maxActive=20 maxIdle=10 maxWait=-1/gt; /source -h32.web.xml configuration/h3 +h42b. Application-specific resource configuration/h4 + +p +Use this option if you wish to define a datasource specific to your application, +not visible to other Tomcat applications. This method is less invasive to your +Tomcat installation. +/p + +p +Create a resource definition file for your application defining the +datasource. This file must have the same name as your application, so if +your application deploys as codesomeApp.war/code, this filename must +be codesomeApp.xml/code. This file should look something like the following. +/p + +source +lt;Context path=/someApp docBase=someApp + crossContext=true reloadable=true debug=1gt; + +lt;Resource name=jdbc/postgres auth=Container + type=javax.sql.DataSource driverClassName=org.postgresql.Driver + url=jdbc:postgresql://127.0.0.1
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml realm-howto.xml
yoavs 2005/03/24 06:42:55 Modified:webapps/docs changelog.xml realm-howto.xml Log: Bugzilla 34139. Revision ChangesPath 1.260 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- changelog.xml 24 Mar 2005 13:27:37 - 1.259 +++ changelog.xml 24 Mar 2005 14:42:55 - 1.260 @@ -54,6 +54,9 @@ update Update to MX4J 3.0.1 (pero) /update + update +bug34139/bug: Updated Realm-HowTo to specify JMX, Commons-Logging jars for RealmBase. (yoavs) + /update /changelog /subsection 1.26 +5 -1 jakarta-tomcat-catalina/webapps/docs/realm-howto.xml Index: realm-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/realm-howto.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- realm-howto.xml 21 Jan 2005 22:49:22 - 1.25 +++ realm-howto.xml 24 Mar 2005 14:42:55 - 1.26 @@ -219,7 +219,11 @@ pTo use either of the above techniques, the code$CATALINA_HOME/server/lib/catalina.jar/code file will need to be -on your class path to make the codeRealmBase/code class available./p +on your class path to make the codeRealmBase/code class available. In +addition, you will need the JMX jar and the commons-logging jar (either +commons-logging-api.jar or commons-logging.jar). Both of these are included +with the Tomcat distribution. +/p pNon-ASCII usernames and/or passwords are supported using sourcejava org.apache.catalina.realm.RealmBase \ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/appdev/sample sample.war
yoavs 2005/03/24 06:58:43 Modified:webapps/docs/appdev/sample sample.war Log: Bugzilla 32382. Revision ChangesPath 1.2 +71 -11 jakarta-tomcat-catalina/webapps/docs/appdev/sample/sample.war Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/03/24 19:17:10
Modified:resources build.xml
webapps/docs changelog.xml
Log:
Bugzilla 33325
Revision ChangesPath
1.6 +13 -2 jakarta-tomcat-5/resources/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/resources/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 25 Apr 2004 12:01:28 - 1.5
+++ build.xml 25 Mar 2005 03:17:10 - 1.6
@@ -11,8 +11,8 @@
!-- Project Properties --
property name=name value=Apache Tomcat /
- property name=year value=2003 /
- property name=version value=5.0 /
+ property name=year value=2005 /
+ property name=version value=5.5 /
property name=project value=jakarta-tomcat /
property name=final.namevalue=${project}-${version} /
property name=final-src.namevalue=${project}-${version}-src /
@@ -51,6 +51,17 @@
/target
+ !-- Top-level clean target added per Bugzilla 33325 --
+ target name=clean
+ description=Clean (delete) all project files
+echo message=Deleting all project files /
+delete dir=${api.home} /
+delete dir=${catalina.home} /
+delete dir=${jasper.home} /
+delete dir=${jtc.home} /
+delete dir=${tomcat.home} /
+ /target
+
target name=checkout
description=Update or checkout required sources from CVS
1.264 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- changelog.xml 25 Mar 2005 00:13:47 - 1.263
+++ changelog.xml 25 Mar 2005 03:17:10 - 1.264
@@ -57,6 +57,9 @@
update
bug34139/bug: Updated Realm-HowTo to specify JMX,
Commons-Logging jars for RealmBase. (yoavs)
/update
+ add
+bug33325/bug: Added top-level clean target to Netbuild build.xml
file. (yoavs)
+ /add
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/03/24 19:51:42
Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
webapps/docs changelog.xml
Log:
Bugzilla 32866.
Revision ChangesPath
1.170 +9 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- StandardContext.java 24 Mar 2005 17:20:20 - 1.169
+++ StandardContext.java 25 Mar 2005 03:51:42 - 1.170
@@ -1198,6 +1198,14 @@
support.firePropertyChange(distributable,
new Boolean(oldDistributable),
new Boolean(this.distributable));
+
+// Bugzilla 32866
+if(log.isDebugEnabled()) {
+log.debug(Propagating distributable= + distributable + to
manager);
+}
+if(getManager() != null) {
+getManager().setDistributable(distributable);
+}
}
1.265 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- changelog.xml 25 Mar 2005 03:17:10 - 1.264
+++ changelog.xml 25 Mar 2005 03:51:42 - 1.265
@@ -125,6 +125,9 @@
fix
bug33961/bug: Don't encode '~' in context paths (remm)
/fix
+ fix
+bug32866/bug: Propagate distributable property from context to
manager (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/03/24 19:56:55 Modified:catalina/src/share/org/apache/catalina/core StandardContext.java webapps/docs changelog.xml Log: Bugzilla 32867. Revision ChangesPath 1.171 +5 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java Index: StandardContext.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- StandardContext.java 25 Mar 2005 03:51:42 - 1.170 +++ StandardContext.java 25 Mar 2005 03:56:55 - 1.171 @@ -4371,6 +4371,10 @@ startupTime = 0; startTime = 0; tldScanTime = 0; + +// Bugzilla 32867 +distributable = false; + if(log.isDebugEnabled()) log.debug(resetContext + oname + + mserver); } 1.266 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- changelog.xml 25 Mar 2005 03:51:42 - 1.265 +++ changelog.xml 25 Mar 2005 03:56:55 - 1.266 @@ -128,6 +128,9 @@ fix bug32866/bug: Propagate distributable property from context to manager (yoavs) /fix + fix +bug32867/bug: Reset distributable attribute in context for clean reload handling (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java
yoavs 2005/03/24 20:02:34
Modified:webapps/docs changelog.xml
jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Bugzilla 32741.
Revision ChangesPath
1.267 +4 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- changelog.xml 25 Mar 2005 03:56:55 - 1.266
+++ changelog.xml 25 Mar 2005 04:02:34 - 1.267
@@ -149,11 +149,14 @@
lot better (remm)
/update
update
-bug33857/bug: Update information on automatic mod_jk
configuration in Apache-HowTo. (yoavs)
+bug33857/bug: Update information on automatic mod_jk
configuration in Apache-HowTo (yoavs)
/update
fix
Fix sync block placement in Mapper.addContext (remm)
/fix
+ fix
+bug32741/bug: Fix spelling of committed [patch from Ben
Souther] (yoavs)
+ /fix
/changelog
/subsection
1.61 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- JkCoyoteHandler.java 24 Mar 2005 15:31:16 - 1.60
+++ JkCoyoteHandler.java 25 Mar 2005 04:02:34 - 1.61
@@ -419,7 +419,7 @@
if( res.isCommitted() ) {
if( log.isInfoEnabled() )
-log.info(Response already commited );
+log.info(Response already committed );
} else {
try {
appendHead( res );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/03/23 07:02:58
Modified:catalina/src/share/org/apache/catalina/startup
ExpandWar.java
webapps/docs changelog.xml
Log:
Bugzilla 33636: set lastModified attribute on files expanded from WARs.
Revision ChangesPath
1.11 +12 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ExpandWar.java
Index: ExpandWar.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ExpandWar.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ExpandWar.java1 Feb 2005 13:12:31 - 1.10
+++ ExpandWar.java23 Mar 2005 15:02:58 - 1.11
@@ -152,7 +152,14 @@
continue;
}
input = jarFile.getInputStream(jarEntry);
-expand(input, docBase, name);
+
+// Bugzilla 33636
+File expandedFile = expand(input, docBase, name);
+long lastModified = jarEntry.getTime();
+if ((lastModified != -1) (lastModified != 0)
(expandedFile != null)) {
+expandedFile.setLastModified(lastModified);
+}
+
input.close();
input = null;
}
@@ -291,10 +298,11 @@
* @param input InputStream to be copied
* @param docBase Document base directory into which we are expanding
* @param name Relative pathname of the file to be created
+ * @return A handle to the expanded File
*
* @exception IOException if an input/output error occurs
*/
-protected static void expand(InputStream input, File docBase, String
name)
+protected static File expand(InputStream input, File docBase, String
name)
throws IOException {
File file = new File(docBase, name);
@@ -319,6 +327,7 @@
}
}
+return file;
}
1.245 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- changelog.xml 15 Mar 2005 13:06:31 - 1.244
+++ changelog.xml 23 Mar 2005 15:02:58 - 1.245
@@ -78,6 +78,9 @@
bug34016/bug: Save and restore docBase when using
antiResourceLocking, for compatibility with
the admin webapp (remm)
/fix
+ update
+bug33636/bug: Set lastModified attribute when expanding WAR
files. (yoavs)
+ /update
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/03/23 07:17:17
Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java
webapps/docs changelog.xml
Log:
Bugzilla 32938.
Revision ChangesPath
1.21 +43 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JNDIRealm.java23 Feb 2005 19:27:56 - 1.20
+++ JNDIRealm.java23 Mar 2005 15:17:17 - 1.21
@@ -16,9 +16,11 @@
package org.apache.catalina.realm;
+import java.io.IOException;
import java.security.Principal;
import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Hashtable;
import java.util.List;
@@ -40,6 +42,8 @@
import javax.naming.directory.SearchResult;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.util.Base64;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.CharChunk;
/**
* pImplementation of strongRealm/strong that works with a directory
@@ -1190,6 +1194,44 @@
new String(Base64.encode(md.digest()));
validated = password.equals(digestedPassword);
}
+} else if (password.startsWith({SSHA})) {
+// Bugzilla 32938
+/* sync since super.digest() does this same thing */
+synchronized (this) {
+password = password.substring(6);
+
+md.reset();
+md.update(credentials.getBytes());
+
+// Decode stored password.
+ByteChunk pwbc = new ByteChunk(password.length());
+try {
+pwbc.append(password.getBytes(), 0,
password.length());
+} catch (IOException e) {
+// Should never happen
+containerLog.error(Could not append password bytes
to chunk: , e);
+}
+
+CharChunk decoded = new CharChunk();
+Base64.decode(pwbc, decoded);
+char[] pwarray = decoded.getBuffer();
+
+// Split decoded password into hash and salt.
+final int saltpos = 20;
+byte[] hash = new byte[saltpos];
+for (int i=0; i hash.length; i++) {
+hash[i] = (byte) pwarray[i];
+}
+
+byte[] salt = new byte[pwarray.length - saltpos];
+for (int i=0; i salt.length; i++)
+salt[i] = (byte)pwarray[i+saltpos];
+
+md.update(salt);
+byte[] dp = md.digest();
+
+validated = Arrays.equals(dp, hash);
+} // End synchronized(this) block
} else {
// Hex hashes should be compared case-insensitive
validated = (digest(credentials).equalsIgnoreCase(password));
1.246 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- changelog.xml 23 Mar 2005 15:02:58 - 1.245
+++ changelog.xml 23 Mar 2005 15:17:17 - 1.246
@@ -81,6 +81,9 @@
update
bug33636/bug: Set lastModified attribute when expanding WAR
files. (yoavs)
/update
+ update
+bug32938/bug: Allow Salted SHA (SSHA) passwords in JNDIRealm.
(yoavs)
+ /update
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs-faq development.xml
yoavs 2005/03/23 07:52:38 Modified:docs/faq development.html docs/faq/printer development.html xdocs-faq development.xml Log: Bugzilla 33767. Revision ChangesPath 1.4 +9 -9 jakarta-tomcat-site/docs/faq/development.html Index: development.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/development.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- development.html 22 Feb 2005 17:27:41 - 1.3 +++ development.html 23 Mar 2005 15:52:38 - 1.4 @@ -89,17 +89,17 @@ div style=padding-left : 20px; p This answer assumes that you have correctly set up a NetBeans IDE project and -that you know how to use its debugger. If not, please go to +that you know how to use the NetBeans IDE debugger. If not, please go to a href=http://www.netbeans.org/kb/using-netbeans/40/debug.html; http://www.netbeans.org/kb/using-netbeans/40/debug.html/a and read up on how to use NetBeans IDE and its debugger. /p p -Make sure that Tomcat is started, that your application is deployed, and that -the sources are all defined as resources in your application. If you have a -servlet or JSP file, set a breakpoint where its sure to hit on the next request. -Go to Run-gt;Attach Debugger. A dialog pops up to let you specify the following -options: +Make sure that Tomcat is started in debug mode as described above, that your +application is deployed, and that the sources are all defined as resources in +your application. If you have a servlet or JSP file, set a breakpoint where you +think a problem might be occurring. Go to Run-gt;Attach Debugger. A dialog pops +up to let you specify the following options: ul li Debugger: JPDA Debugger /li li Connector: SocketAttach /li @@ -114,9 +114,9 @@ /p p Note that NetBeans IDE has a second option -- you can debug JSP files and -servlets locally using a Tomcat server that is bundled with the IDE. The bundled -Tomcat server can be started in debug mode (its default port number is 11555) -and you can open a remote connection to it from NetBeans IDE as described above. +servlets locally using a Tomcat server that is bundled with the IDE. When you +debug a JSP file or servlet in the IDE, the bundled Tomcat server automatically starts +in debug mode, and the debugger connects to it. /p /divbr /p 1.4 +9 -9 jakarta-tomcat-site/docs/faq/printer/development.html Index: development.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/printer/development.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- development.html 22 Feb 2005 17:27:41 - 1.3 +++ development.html 23 Mar 2005 15:52:38 - 1.4 @@ -88,17 +88,17 @@ div style=padding-left : 20px; p This answer assumes that you have correctly set up a NetBeans IDE project and -that you know how to use its debugger. If not, please go to +that you know how to use the NetBeans IDE debugger. If not, please go to a href=http://www.netbeans.org/kb/using-netbeans/40/debug.html; http://www.netbeans.org/kb/using-netbeans/40/debug.html/a and read up on how to use NetBeans IDE and its debugger. /p p -Make sure that Tomcat is started, that your application is deployed, and that -the sources are all defined as resources in your application. If you have a -servlet or JSP file, set a breakpoint where its sure to hit on the next request. -Go to Run-gt;Attach Debugger. A dialog pops up to let you specify the following -options: +Make sure that Tomcat is started in debug mode as described above, that your +application is deployed, and that the sources are all defined as resources in +your application. If you have a servlet or JSP file, set a breakpoint where you +think a problem might be occurring. Go to Run-gt;Attach Debugger. A dialog pops +up to let you specify the following options: ul li Debugger: JPDA Debugger /li li Connector: SocketAttach /li @@ -113,9 +113,9 @@ /p p Note that NetBeans IDE has a second option -- you can debug JSP files and -servlets locally using a Tomcat server that is bundled with the IDE. The bundled -Tomcat server can be started in debug mode (its default port number is 11555) -and you can open a remote connection to it from NetBeans IDE as described above. +servlets locally using a Tomcat server that is bundled with the IDE. When you +debug a JSP file or servlet in the IDE, the bundled Tomcat server automatically starts +in debug mode, and the debugger connects to it. /p /divbr /p 1.4 +9 -9 jakarta-tomcat-site/xdocs-faq/development.xml
cvs commit: jakarta-tomcat-catalina/webapps/docs/appdev installation.xml
yoavs 2005/03/23 08:13:23 Modified:webapps/docs changelog.xml status.xml webapps/docs/appdev installation.xml Log: Bugzilla 33719, status file update. Revision ChangesPath 1.251 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- changelog.xml 23 Mar 2005 16:02:49 - 1.250 +++ changelog.xml 23 Mar 2005 16:13:23 - 1.251 @@ -45,6 +45,9 @@ add bug33739/bug: Add reference to RUNNING.txt in setup.html. (yoavs) /add + fix +bug33719/bug: Update reference to Ant download page. (yoavs) + /fix /changelog /subsection 1.10 +6 -9 jakarta-tomcat-catalina/webapps/docs/status.xml Index: status.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/status.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- status.xml2 Sep 2004 18:56:56 - 1.9 +++ status.xml23 Mar 2005 16:13:23 - 1.10 @@ -30,10 +30,10 @@ section name=Current Status Summary p bTomcat 5.0.27/b was released on June 17th, 2004. At that time, the TOMCAT_5_0 - branch was tagged in CVS, and work on Tomcat 5.5 began. Until the first stable - release of Tomcat 5.5, building from - CVS head may be unstable or broken: use the TOMCAT_5_0 branch tag to build - the Tomcat 5.0 releases. + branch was tagged in CVS, and work on Tomcat 5.5 began. We have now had several + Tomcat 5.5 releases, including a couple of stable ones. Accordingly, Tomcat 5.5 + is now the focus on work. Tomcat 5.0 is in maintenance mode and its releases + will become less and less frequent. /p p bTomcat 5.5/b has several major goals. They are discussed in the tomcat-dev @@ -100,11 +100,8 @@ item priority=Medium owner=fhanik Enhance Cluster functionality for Tomcat 5.5. /item - item priority=Low owner=yoavs, remm, funkman -Update docs, site, and FAQ for Tomcat 5.5 once ready. - /item - item priority=Low owner=everyone -Continue fixing bugs ;) + item priority=Medium owner=everyone +Continue fixing bugs and updating docs. /item /status 1.7 +1 -1 jakarta-tomcat-catalina/webapps/docs/appdev/installation.xml Index: installation.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/appdev/installation.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- installation.xml 24 Nov 2004 18:52:45 - 1.6 +++ installation.xml 23 Mar 2005 16:13:23 - 1.7 @@ -52,7 +52,7 @@ subsection name=Ant pBinary downloads of the strongAnt/strong build tool are available from -a href=http://jakarta.apache.org/downloads/binindex.html;http://jakarta.apache.org/downloads/binindex.html/a. +a href=http://ant.apache.org/bindownload.cgi;http://ant.apache.org/bindownload.cgi/a. This manual assumes you are using Ant 1.4 or later. The instructions should also be compatible with later versions, but this has not been tested./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm DataSourceRealm.java
yoavs 2005/03/23 09:01:06
Modified:catalina/src/share/org/apache/catalina/realm
DataSourceRealm.java
Log:
Separate connection commit and close in close() method, as the former can
cause a SQLException leading to the latter not being calld.
Revision ChangesPath
1.16 +10 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
Index: DataSourceRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DataSourceRealm.java 23 Feb 2005 19:27:56 - 1.15
+++ DataSourceRealm.java 23 Mar 2005 17:01:06 - 1.16
@@ -363,11 +363,17 @@
if (dbConnection == null)
return;
+// Commit if not auto committed
+try {
+if (!dbConnection.getAutoCommit()) {
+dbConnection.commit();
+}
+} catch (SQLException e) {
+containerLog.error(Exception committing connection before
closing:, e);
+}
+
// Close this database connection, and log any errors
try {
- if (!dbConnection.getAutoCommit()) {
- dbConnection.commit();
- }
dbConnection.close();
} catch (SQLException e) {
containerLog.error(sm.getString(dataSourceRealm.close), e); //
Just log it here
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/howto apache.xml
yoavs 2005/03/23 08:27:03 Modified:webapps/docs changelog.xml jk build.xml jk/xdocs/howto apache.xml Log: Bugzilla 33857. Revision ChangesPath 1.252 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- changelog.xml 23 Mar 2005 16:13:23 - 1.251 +++ changelog.xml 23 Mar 2005 16:27:03 - 1.252 @@ -110,6 +110,9 @@ and wait a little if the pool is exhausted; this should make low maxThreads values work a lot better (remm) /update + update +bug33857/bug: Update information on automatic mod_jk configuration in Apache-HowTo. (yoavs) + /update /changelog /subsection 1.80 +1 -1 jakarta-tomcat-connectors/jk/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- build.xml 18 Nov 2004 18:39:00 - 1.79 +++ build.xml 23 Mar 2005 16:27:03 - 1.80 @@ -415,7 +415,7 @@ version=true windowtitle=Jk Connector Documentation doctitle=Jk Connector - bottom=Copyright #169; 2001-2003 Apache Software Foundation. All Rights Reserved. + bottom=Copyright #169; 2001-2005 Apache Software Foundation. All Rights Reserved. / /target 1.4 +15 -3 jakarta-tomcat-connectors/jk/xdocs/howto/apache.xml Index: apache.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/apache.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- apache.xml23 Mar 2005 14:48:30 - 1.3 +++ apache.xml23 Mar 2005 16:27:03 - 1.4 @@ -6,7 +6,7 @@ project; copyright - Copyright 1999-2004 The Apache Software Foundation + Copyright 1999-2005 The Apache Software Foundation Licensed under the Apache License, Version 2.0 (the License); you may not use this file except in compliance with the License. @@ -244,7 +244,19 @@ p This will tell Apache to use directives in the bmod_jk.conf-auto/b file in the Apache configuration. -This file is created by enabling the Apache auto-configuration as described in the Tomcat documentation. +This file is created by enabling the Apache auto-configuration as follows, in your server.xml file: +/p +source + Server ... +Listener className=org.apache.jk.config.ApacheConfig modJk=/path/to/mod_jk.so / + /Server +/source + +p +Then restart Tomcat and mod_jk.conf should be generated. For more information on +this topic, please refer to the API documentation at the +a href=http://jakarta.apache.org/tomcat/tomcat-5.5-doc/catalina/docs/api/org/apache/jk/config/ApacheConfig.html; +Tomcat docs website/a. /p /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/03/23 07:30:57
Modified:catalina/src/share/org/apache/naming/factory
MailSessionFactory.java
webapps/docs changelog.xml
Log:
Bugzilla 31288.
Revision ChangesPath
1.3 +35 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/MailSessionFactory.java
Index: MailSessionFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/MailSessionFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MailSessionFactory.java 27 Feb 2004 14:58:54 - 1.2
+++ MailSessionFactory.java 23 Mar 2005 15:30:56 - 1.3
@@ -21,6 +21,8 @@
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
+import javax.mail.Authenticator;
+import javax.mail.PasswordAuthentication;
import javax.mail.Session;
import javax.naming.Name;
import javax.naming.Context;
@@ -96,7 +98,9 @@
// Create a new Session inside a doPrivileged block, so that JavaMail
// can read its default properties without throwing Security
-// exceptions
+// exceptions.
+//
+// Bugzilla 31288, 33077: add support for authentication.
return AccessController.doPrivileged( new PrivilegedAction() {
public Object run() {
@@ -104,16 +108,43 @@
Properties props = new Properties();
props.put(mail.transport.protocol, smtp);
props.put(mail.smtp.host, localhost);
+
+String password = null;
+
Enumeration attrs = ref.getAll();
while (attrs.hasMoreElements()) {
RefAddr attr = (RefAddr) attrs.nextElement();
-if (factory.equals(attr.getType()))
+if (factory.equals(attr.getType())) {
+continue;
+}
+
+if (password.equals(attr.getType())) {
+password = (String) attr.getContent();
continue;
+}
+
props.put(attr.getType(), (String)
attr.getContent());
}
+Authenticator auth = null;
+if (password != null) {
+String user = props.getProperty(mail.smtp.user);
+if(user == null) {
+user = props.getProperty(mail.user);
+}
+
+if(user != null) {
+final PasswordAuthentication pa = new
PasswordAuthentication(user, password);
+auth = new Authenticator() {
+protected PasswordAuthentication
getPasswordAuthentication() {
+return pa;
+}
+};
+}
+}
+
// Create and return the new Session object
-Session session = Session.getInstance(props, null);
+Session session = Session.getInstance(props, auth);
return (session);
}
1.247 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- changelog.xml 23 Mar 2005 15:17:17 - 1.246
+++ changelog.xml 23 Mar 2005 15:30:56 - 1.247
@@ -84,6 +84,9 @@
update
bug32938/bug: Allow Salted SHA (SSHA) passwords in JNDIRealm.
(yoavs)
/update
+ update
+bug31288/bug: Allow SMTP authentication for JNDI
MailSessionFactory. (yoavs)
+ /update
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml ssl-howto.xml
yoavs 2005/03/23 08:31:41 Modified:webapps/docs changelog.xml ssl-howto.xml Log: Bugzilla 33883. Revision ChangesPath 1.253 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- changelog.xml 23 Mar 2005 16:27:03 - 1.252 +++ changelog.xml 23 Mar 2005 16:31:41 - 1.253 @@ -48,6 +48,9 @@ fix bug33719/bug: Update reference to Ant download page. (yoavs) /fix + fix +bug33883/bug: Bad options in SSL-HowTo. (yoavs) + /fix /changelog /subsection 1.15 +2 -2 jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml Index: ssl-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ssl-howto.xml 1 Feb 2005 21:07:29 - 1.14 +++ ssl-howto.xml 23 Mar 2005 16:31:41 - 1.15 @@ -214,8 +214,8 @@ /p pTo import an existing certificate signed by your own CA into a PKCS12 keystore using OpenSSL you would execute a command like: -sourceopenssl pkcs12 -export -infile mycert.crt -inkey mykey.key \ --outfile mycert.p12 -name tomcat -CAfile myCA.crt \ +sourceopenssl pkcs12 -export -in mycert.crt -inkey mykey.key \ +-out mycert.p12 -name tomcat -CAfile myCA.crt \ -caname root -chain /source For more advanced cases, consult the a href=http://www.openssl.org/;OpenSSL - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet JspServletWrapper.java
yoavs 2005/03/23 08:38:05
Modified:webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper/servlet
JspServletWrapper.java
Log:
Bugzilla 33219.
Revision ChangesPath
1.254 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- changelog.xml 23 Mar 2005 16:31:41 - 1.253
+++ changelog.xml 23 Mar 2005 16:38:05 - 1.254
@@ -278,6 +278,9 @@
fix
bug33539/bug: Better error message when an unknown element is
encountered in the tag file. (yoavs)
/fix
+ fix
+bug33219/bug: Minor JspServletWrapper code cleanup. (yoavs)
+ /fix
/changelog
/subsection
1.40 +3 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java
Index: JspServletWrapper.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- JspServletWrapper.java21 Mar 2005 15:38:12 - 1.39
+++ JspServletWrapper.java23 Mar 2005 16:38:05 - 1.40
@@ -196,9 +196,7 @@
}
if (options.getDevelopment() || firstTime ) {
synchronized (this) {
-if (firstTime) {
-firstTime = false;
-}
+firstTime = false;
ctxt.compile();
}
} else {
@@ -289,9 +287,8 @@
*/
if (options.getDevelopment() || firstTime ) {
synchronized (this) {
-if (firstTime) {
-firstTime = false;
-}
+firstTime = false;
+
// The following sets reload to true, if necessary
ctxt.compile();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
yoavs 2005/03/23 07:41:47
Modified:webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java
Log:
Bugzilla 33538.
Revision ChangesPath
1.248 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- changelog.xml 23 Mar 2005 15:30:56 - 1.247
+++ changelog.xml 23 Mar 2005 15:41:47 - 1.248
@@ -260,6 +260,9 @@
fix
bug33373/bug: Fix handling of context classloader in jspc (remm)
/fix
+ fix
+bug33538/bug: Ignore example and tag-extension elements in
TagLibraryInfoImpl. (yoavs)
+ /fix
/changelog
/subsection
1.58 +4 -0
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- TagLibraryInfoImpl.java 21 Mar 2005 15:38:12 - 1.57
+++ TagLibraryInfoImpl.java 23 Mar 2005 15:41:47 - 1.58
@@ -473,6 +473,10 @@
name = child.getBody();
} else if (path.equals(tname)) {
path = child.getBody();
+} else if (example.equals(tname)) {
+// Ignore example element: Bugzilla 33538
+} else if (tag-extension.equals(tname)) {
+// Ignore tag-extension element: Bugzilla 33538
} else {
if (log.isWarnEnabled()) {
log.warn(Localizer.getMessage(
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties
yoavs 2005/03/23 07:48:37
Modified:webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java
jasper2/src/share/org/apache/jasper/resources
LocalStrings.properties LocalStrings_es.properties
LocalStrings_fr.properties
LocalStrings_ja.properties
Log:
Bugzilla 33539.
Revision ChangesPath
1.249 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- changelog.xml 23 Mar 2005 15:41:47 - 1.248
+++ changelog.xml 23 Mar 2005 15:48:36 - 1.249
@@ -263,6 +263,9 @@
fix
bug33538/bug: Ignore example and tag-extension elements in
TagLibraryInfoImpl. (yoavs)
/fix
+ fix
+bug33539/bug: Better error message when an unknown element is
encountered in the tag file. (yoavs)
+ /fix
/changelog
/subsection
1.59 +1 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- TagLibraryInfoImpl.java 23 Mar 2005 15:41:47 - 1.58
+++ TagLibraryInfoImpl.java 23 Mar 2005 15:48:37 - 1.59
@@ -480,7 +480,7 @@
} else {
if (log.isWarnEnabled()) {
log.warn(Localizer.getMessage(
-jsp.warning.unknown.element.in.attribute,
tname));
+jsp.warning.unknown.element.in.tagfile,
tname));
}
}
}
1.8 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LocalStrings.properties 19 Nov 2004 14:30:22 - 1.7
+++ LocalStrings.properties 23 Mar 2005 15:48:37 - 1.8
@@ -154,6 +154,7 @@
jsp.error.badGetReader=Cannot create a reader when the stream is not buffered
jsp.warning.unknown.element.in.taglib=Unknown element ({0}) in taglib
jsp.warning.unknown.element.in.tag=Unknown element ({0}) in tag
+jsp.warning.unknown.element.in.tagfile=Unknown element ({0}) in tag-file
jsp.warning.unknown.element.in.attribute=Unknown element ({0}) in attribute
jsp.warning.unknown.element.in.variable=Unknown element ({0}) in variable
jsp.warning.unknown.element.in.validator=Unknown element ({0}) in validator
1.5 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties
Index: LocalStrings_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings_es.properties19 Nov 2004 14:30:22 - 1.4
+++ LocalStrings_es.properties23 Mar 2005 15:48:37 - 1.5
@@ -151,6 +151,7 @@
jsp.error.badGetReader=No se puede crear un reader cuando el stream no tiene
buffer
jsp.warning.unknown.element.in.taglib=Elemento desconocido ({0}) en taglib
jsp.warning.unknown.element.in.tag=Elemento desconocido ({0}) en tag
+jsp.warning.unknown.element.in.tagfile=Elemento desconocido ({0}) en tag-file
jsp.warning.unknown.element.in.attribute=Elemento desconocido ({0}) en
attribute
jsp.warning.unknown.element.in.variable=Elemento desconocido ({0}) en
variable
jsp.warning.unknown.element.in.validator=Elemento desconocido ({0}) en
validator
1.5 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties
Index: LocalStrings_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings_fr.properties19 Nov 2004 14:30:22 - 1.4
cvs commit: jakarta-tomcat-connectors/jk/xdocs/howto apache.xml
yoavs 2005/03/23 10:55:04 Modified:jk/xdocs/howto apache.xml Log: Corrections and clarifications pointed out by Bill Barker. Revision ChangesPath 1.5 +8 -4 jakarta-tomcat-connectors/jk/xdocs/howto/apache.xml Index: apache.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/howto/apache.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apache.xml23 Mar 2005 16:27:03 - 1.4 +++ apache.xml23 Mar 2005 18:55:04 - 1.5 @@ -244,12 +244,16 @@ p This will tell Apache to use directives in the bmod_jk.conf-auto/b file in the Apache configuration. -This file is created by enabling the Apache auto-configuration as follows, in your server.xml file: +This file is created by enabling the Apache auto-configuration as follows, in your server.xml file. +bPlease note that this example is specific to Tomcat 5.x, unlike other sections of this document + which also apply to previous Tomcat branches./b /p source - Server ... + ... + Engine ... Listener className=org.apache.jk.config.ApacheConfig modJk=/path/to/mod_jk.so / - /Server + /Engine + ... /source p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs-faq development.xml
yoavs 2005/02/22 09:27:41 Modified:docs/faq development.html docs/faq/printer development.html xdocs-faq development.xml Log: Forgot to link to NEtBeans KB in my last commit. Revision ChangesPath 1.3 +3 -2 jakarta-tomcat-site/docs/faq/development.html Index: development.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/development.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- development.html 22 Feb 2005 17:25:39 - 1.2 +++ development.html 22 Feb 2005 17:27:41 - 1.3 @@ -90,8 +90,9 @@ p This answer assumes that you have correctly set up a NetBeans IDE project and that you know how to use its debugger. If not, please go to -http://www.netbeans.org/kb/using-netbeans/40/debug.html and read up on how to -use NetBeans IDE and its debugger. +a href=http://www.netbeans.org/kb/using-netbeans/40/debug.html; +http://www.netbeans.org/kb/using-netbeans/40/debug.html/a + and read up on how to use NetBeans IDE and its debugger. /p p Make sure that Tomcat is started, that your application is deployed, and that 1.3 +3 -2 jakarta-tomcat-site/docs/faq/printer/development.html Index: development.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/printer/development.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- development.html 22 Feb 2005 17:25:42 - 1.2 +++ development.html 22 Feb 2005 17:27:41 - 1.3 @@ -89,8 +89,9 @@ p This answer assumes that you have correctly set up a NetBeans IDE project and that you know how to use its debugger. If not, please go to -http://www.netbeans.org/kb/using-netbeans/40/debug.html and read up on how to -use NetBeans IDE and its debugger. +a href=http://www.netbeans.org/kb/using-netbeans/40/debug.html; +http://www.netbeans.org/kb/using-netbeans/40/debug.html/a + and read up on how to use NetBeans IDE and its debugger. /p p Make sure that Tomcat is started, that your application is deployed, and that 1.3 +3 -2 jakarta-tomcat-site/xdocs-faq/development.xml Index: development.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/development.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- development.xml 22 Feb 2005 17:25:44 - 1.2 +++ development.xml 22 Feb 2005 17:27:41 - 1.3 @@ -101,8 +101,9 @@ p This answer assumes that you have correctly set up a NetBeans IDE project and that you know how to use its debugger. If not, please go to -http://www.netbeans.org/kb/using-netbeans/40/debug.html and read up on how to -use NetBeans IDE and its debugger. +a href=http://www.netbeans.org/kb/using-netbeans/40/debug.html; +http://www.netbeans.org/kb/using-netbeans/40/debug.html/a + and read up on how to use NetBeans IDE and its debugger. /p p Make sure that Tomcat is started, that your application is deployed, and that - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/02/15 07:32:32 Modified:.tomcat.nsi webapps/docs changelog.xml Log: Bugzilla 33489. Revision ChangesPath 1.69 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- tomcat.nsi2 Feb 2005 12:01:43 - 1.68 +++ tomcat.nsi15 Feb 2005 15:32:32 - 1.69 @@ -631,7 +631,7 @@ ; if $INSTDIR was removed, skip these next ones IfFileExists $INSTDIR 0 Removed MessageBox MB_YESNO|MB_ICONQUESTION \ - Remove all files in your Tomcat 5.5 directory? (If you have anything \ + Remove all files in your Tomcat 5.5 directory? (If you have anything \ you created that you want to keep, click No) IDNO Removed RMDir /r $INSTDIR\webapps\ROOT ; this would be skipped if the user hits no RMDir $INSTDIR\webapps 1.236 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- changelog.xml 15 Feb 2005 09:58:06 - 1.235 +++ changelog.xml 15 Feb 2005 15:32:32 - 1.236 @@ -35,6 +35,9 @@ fix bug33351/bug: Fix silent uninstallation. (remm) /fix + fix +bug33489/bug: Missing space in uninstaller message. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml realm-howto.xml
yoavs 2005/02/01 12:54:12 Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml realm-howto.xml Log: Bugzilla 32210. Revision ChangesPath No revision No revision 1.70.2.91 +10 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.90 retrieving revision 1.70.2.91 diff -u -r1.70.2.90 -r1.70.2.91 --- changelog.xml 9 Dec 2004 13:52:59 - 1.70.2.90 +++ changelog.xml 1 Feb 2005 20:54:12 - 1.70.2.91 @@ -14,6 +14,16 @@ body +section name=Tomcat 5.0.32 (yoavs) + subsection name=General +changelog + fix +bug32210/bug: Fixed Realm HowTo. (yoavs) + /fix +/changelog + /subsection +/section + section name=Tomcat 5.0.31 (yoavs) subsection name=General changelog 1.14.2.6 +1 -1 jakarta-tomcat-catalina/webapps/docs/realm-howto.xml Index: realm-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/realm-howto.xml,v retrieving revision 1.14.2.5 retrieving revision 1.14.2.6 diff -u -r1.14.2.5 -r1.14.2.6 --- realm-howto.xml 17 Nov 2004 17:00:51 - 1.14.2.5 +++ realm-howto.xml 1 Feb 2005 20:54:12 - 1.14.2.6 @@ -1268,7 +1268,7 @@ attribute name=className required=true pThe fully qualified Java class name of this Realm implementation. You strongMUST/strong specify the value -codeorg.apache.catalina.realm.MemoryRealm/code here./p +codeorg.apache.catalina.realm.JAASRealm/code here./p /attribute attribute name=debug required=false - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml ssl-howto.xml
yoavs 2005/02/01 13:04:30 Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml ssl-howto.xml Log: Bugzilla 33204. Revision ChangesPath No revision No revision 1.70.2.92 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.91 retrieving revision 1.70.2.92 diff -u -r1.70.2.91 -r1.70.2.92 --- changelog.xml 1 Feb 2005 20:54:12 - 1.70.2.91 +++ changelog.xml 1 Feb 2005 21:04:30 - 1.70.2.92 @@ -20,6 +20,9 @@ fix bug32210/bug: Fixed Realm HowTo. (yoavs) /fix + fix +bug33204/bug: Fixed SSL HowTo. (yoavs) + /fix /changelog /subsection /section 1.11.2.3 +1 -1 jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml Index: ssl-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -u -r1.11.2.2 -r1.11.2.3 --- ssl-howto.xml 18 Nov 2004 15:01:03 - 1.11.2.2 +++ ssl-howto.xml 1 Feb 2005 21:04:30 - 1.11.2.3 @@ -152,7 +152,7 @@ simply prefixing the address with codehttps:/code instead of codehttp:/code. Any pages which absolutely strongrequire/strong a secure connection should check the protocol type associated with the -page request and take the appropriate action of codehttps/code is not +page request and take the appropriate action if codehttps/code is not specified./p pFinally, using name-based virtual hosts on a secured connection can be - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml ssl-howto.xml
yoavs 2005/02/01 13:07:29 Modified:webapps/docs changelog.xml ssl-howto.xml Log: Bugzilla 33204. Revision ChangesPath 1.230 +8 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- changelog.xml 29 Jan 2005 19:48:25 - 1.229 +++ changelog.xml 1 Feb 2005 21:07:29 - 1.230 @@ -27,6 +27,14 @@ /section section name=Tomcat 5.5.8 (yoavs) + subsection name=General +changelog + fix +bug33204/bug: Fixed SSL HowTo page. (yoavs) + /fix +/changelog + /subsection + subsection name=Catalina changelog fix 1.14 +1 -1 jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml Index: ssl-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ssl-howto.xml 18 Nov 2004 14:51:35 - 1.13 +++ ssl-howto.xml 1 Feb 2005 21:07:29 - 1.14 @@ -152,7 +152,7 @@ simply prefixing the address with codehttps:/code instead of codehttp:/code. Any pages which absolutely strongrequire/strong a secure connection should check the protocol type associated with the -page request and take the appropriate action of codehttps/code is not +page request and take the appropriate action if codehttps/code is not specified./p pFinally, using name-based virtual hosts on a secured connection can be - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs index.xml
yoavs 2005/01/30 09:15:16 Modified:docs index.html docs/faq/printer connectors.html index.html memory.html misc.html tomcatuser.html windows.html xdocsindex.xml Log: Tomcat 5.5.7 has been voted stable. Revision ChangesPath 1.75 +1 -1 jakarta-tomcat-site/docs/index.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/index.html.diff?r1=1.74r2=1.75 1.15 +320 -320 jakarta-tomcat-site/docs/faq/printer/connectors.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/connectors.html.diff?r1=1.14r2=1.15 1.12 +87 -87jakarta-tomcat-site/docs/faq/printer/index.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/index.html.diff?r1=1.11r2=1.12 1.8 +162 -162 jakarta-tomcat-site/docs/faq/printer/memory.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/memory.html.diff?r1=1.7r2=1.8 1.29 +768 -768 jakarta-tomcat-site/docs/faq/printer/misc.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/misc.html.diff?r1=1.28r2=1.29 1.8 +168 -168 jakarta-tomcat-site/docs/faq/printer/tomcatuser.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/tomcatuser.html.diff?r1=1.7r2=1.8 1.7 +130 -130 jakarta-tomcat-site/docs/faq/printer/windows.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/windows.html.diff?r1=1.6r2=1.7 1.61 +1 -1 jakarta-tomcat-site/xdocs/index.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-site/xdocs/index.xml.diff?r1=1.60r2=1.61 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Mail Authentication
Encrypted message is available. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
your website
Your document is attached to this mail. +++ Attachment: No Virus found +++ MC-Afee AntiVirus - www.mcafee.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml
yoavs 2004/12/13 06:25:06 Modified:webapps/docs/config ajp.xml Log: Added request.registerRequests attribute to doc. Revision ChangesPath 1.12 +6 -0 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml Index: ajp.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ajp.xml 28 Oct 2004 20:54:49 - 1.11 +++ ajp.xml 13 Dec 2004 14:25:05 - 1.12 @@ -110,6 +110,12 @@ number specified here./p /attribute +attribute name=request.registerRequests required=false + pThis attribute controls request registration for JMX monitoring + of the Connector. It is enabled by default, but may be turned + it off to save a bit of memory./p +/attribute + attribute name=scheme required=false pSet this attribute to the name of the protocol you wish to have returned by calls to coderequest.getScheme()/code. For - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config host.xml
yoavs 2004/12/09 05:45:25 Modified:webapps/docs changelog.xml webapps/docs/config host.xml Log: Bugzilla 32603. Revision ChangesPath 1.201 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- changelog.xml 8 Dec 2004 19:15:30 - 1.200 +++ changelog.xml 9 Dec 2004 13:45:24 - 1.201 @@ -35,6 +35,9 @@ update bug32382/bug: Index page and packaed WAR for sample webapp. (yoavs) /update + fix +bug32603/bug: Updated host.xml to reflect appBase resolution. (yoavs) + /fix /changelog /subsection 1.14 +1 -1 jakarta-tomcat-catalina/webapps/docs/config/host.xml Index: host.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/host.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- host.xml 27 Sep 2004 16:00:31 - 1.13 +++ host.xml 9 Dec 2004 13:45:25 - 1.14 @@ -66,7 +66,7 @@ This is the pathname of a directory that may contain web applications to be deployed on this virtual host. You may specify an absolute pathname for this directory, or a pathname that is relative -to the code$CATALINA_HOME/code directory. See +to the code$CATALINA_BASE/code directory. See a href=#Automatic Application DeploymentAutomatic Application Deployment/a for more information on automatic recognition and deployment of web applications to be deployed automatically./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config host.xml
yoavs 2004/12/09 05:46:55 Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml webapps/docs/config Tag: TOMCAT_5_0 host.xml Log: Bugzilla 32603. Revision ChangesPath No revision No revision 1.70.2.89 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.88 retrieving revision 1.70.2.89 diff -u -r1.70.2.88 -r1.70.2.89 --- changelog.xml 8 Dec 2004 15:45:24 - 1.70.2.88 +++ changelog.xml 9 Dec 2004 13:46:54 - 1.70.2.89 @@ -29,6 +29,9 @@ update bug32454/bug: Amended JNDI documentation for JavaMail/JavaActivationFramework usage. (yoavs) /update + fix +bug32603/bug: Updated Host doc to reflect appBase resolution. (yoavs) + /fix /changelog /subsection No revision No revision 1.6.2.2 +1 -1 jakarta-tomcat-catalina/webapps/docs/config/host.xml Index: host.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/host.xml,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- host.xml 20 Sep 2004 18:29:05 - 1.6.2.1 +++ host.xml 9 Dec 2004 13:46:54 - 1.6.2.2 @@ -66,7 +66,7 @@ This is the pathname of a directory that may contain web applications to be deployed on this virtual host. You may specify an absolute pathname for this directory, or a pathname that is relative -to the code$CATALINA_HOME/code directory. See +to the code$CATALINA_BASE/code directory. See a href=#Automatic Application DeploymentAutomatic Application Deployment/a for more information on automatic recognition and deployment of web applications to be deployed automatically./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/12/09 05:53:00
Modified:catalina/src/share/org/apache/catalina/realm Tag: TOMCAT_5_0
RealmBase.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Bugzilla 32137.
Revision ChangesPath
No revision
No revision
1.33.2.3 +12 -21
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java
Index: RealmBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java,v
retrieving revision 1.33.2.2
retrieving revision 1.33.2.3
diff -u -r1.33.2.2 -r1.33.2.3
--- RealmBase.java27 Oct 2004 16:26:18 - 1.33.2.2
+++ RealmBase.java9 Dec 2004 13:52:59 - 1.33.2.3
@@ -346,22 +346,6 @@
String nOnce, String nc, String cnonce,
String qop, String realm,
String md5a2) {
-
-/*
- System.out.println(Digest : + clientDigest);
-
- System.out.println( Digest info);
- System.out.println(Username: + username);
- System.out.println(ClientSigest: + clientDigest);
- System.out.println(nOnce: + nOnce);
- System.out.println(nc: + nc);
- System.out.println(cnonce: + cnonce);
- System.out.println(qop: + qop);
- System.out.println(realm: + realm);
- System.out.println(md5a2: + md5a2);
-*/
-
-
String md5a1 = getDigest(username, realm);
if (md5a1 == null)
return null;
@@ -380,8 +364,11 @@
}
}
-String serverDigest =
-md5Encoder.encode(md5Helper.digest(valueBytes));
+String serverDigest = null;
+// Bugzilla 32137
+synchronized(md5Helper) {
+serverDigest = md5Encoder.encode(md5Helper.digest(valueBytes));
+}
if (serverDigest.equals(clientDigest))
return getPrincipal(username);
@@ -1105,8 +1092,12 @@
}
}
-byte[] digest =
-md5Helper.digest(valueBytes);
+byte[] digest = null;
+// Bugzilla 32137
+synchornized(md5Helper) {
+digest = md5Helper.digest(valueBytes);
+}
+
return md5Encoder.encode(digest);
}
No revision
No revision
1.70.2.90 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.89
retrieving revision 1.70.2.90
diff -u -r1.70.2.89 -r1.70.2.90
--- changelog.xml 9 Dec 2004 13:46:54 - 1.70.2.89
+++ changelog.xml 9 Dec 2004 13:52:59 - 1.70.2.90
@@ -40,6 +40,9 @@
fix
bug32502/bug: Memory leak in DigestAuthenticator. (yoavs)
/fix
+ fix
+bug32137/bug: Possible thread-safety issue in RealmBase. (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/12/09 05:56:35
Modified:catalina/src/share/org/apache/catalina/realm RealmBase.java
webapps/docs changelog.xml
Log:
Bugzilla 32137.
Revision ChangesPath
1.44 +11 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java
Index: RealmBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- RealmBase.java27 Oct 2004 16:38:41 - 1.43
+++ RealmBase.java9 Dec 2004 13:56:35 - 1.44
@@ -351,8 +351,11 @@
}
}
-String serverDigest =
-md5Encoder.encode(md5Helper.digest(valueBytes));
+String serverDigest = null;
+// Bugzilla 32137
+synchronized(md5Helper) {
+serverDigest = md5Encoder.encode(md5Helper.digest(valueBytes));
+}
if (log.isDebugEnabled()) {
log.debug(Digest : + clientDigest + Username: + username
@@ -1092,8 +1095,11 @@
}
}
-byte[] digest =
-md5Helper.digest(valueBytes);
+byte[] digest = null;
+// Bugzilla 32137
+synchronized(md5Helper) {
+digest = md5Helper.digest(valueBytes);
+}
return md5Encoder.encode(digest);
}
1.202 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- changelog.xml 9 Dec 2004 13:45:24 - 1.201
+++ changelog.xml 9 Dec 2004 13:56:35 - 1.202
@@ -55,6 +55,9 @@
fix
bug28709/bug:
javax.servlet.http.HttpServletRequest.isRequestedSessionIdValid() returns true
for an invalidated session. (luehe)
/fix
+ fix
+bug32137/bug: Possible thread-safety issue in RealmBase. (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Embedded.java
yoavs 2004/12/08 06:34:56 Modified:catalina/src/share/org/apache/catalina/startup Embedded.java Log: Updatd JavaDoc to reflect the fact there's no longer a complete example in main(). Revision ChangesPath 1.27 +3 -9 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java Index: Embedded.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- Embedded.java 3 Nov 2004 12:02:45 - 1.26 +++ Embedded.java 8 Dec 2004 14:34:56 - 1.27 @@ -92,14 +92,8 @@ * To initiate a normal shutdown, call the codestop()/code method of * this object. * p - * strongIMPLEMENTATION NOTE/strong: The codemain()/code method of - * this class is a simple example that exercizes the features of dynamically - * starting and stopping various components. You can execute this by executing - * the following steps (on a Unix platform): - * pre - * cd $CATALINA_HOME - * ./bin/catalina.sh embedded - * /pre + * @see org.apache.catalina.startup.Catalina#main For a complete example + * of how Tomcat is set up and launched as an Embedded application. * * @author Craig R. McClanahan * @version $Revision$ $Date$ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Embedded.java
yoavs 2004/12/08 06:35:58 Modified:catalina/src/share/org/apache/catalina/startup Tag: TOMCAT_5_0 Embedded.java Log: Updated JavaDoc to reflect the fact there's no longer a complete example in main(). Revision ChangesPath No revision No revision 1.16.2.1 +3 -9 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java Index: Embedded.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -r1.16 -r1.16.2.1 --- Embedded.java 10 Jun 2004 18:59:48 - 1.16 +++ Embedded.java 8 Dec 2004 14:35:58 - 1.16.2.1 @@ -94,14 +94,8 @@ * To initiate a normal shutdown, call the codestop()/code method of * this object. * p - * strongIMPLEMENTATION NOTE/strong: The codemain()/code method of - * this class is a simple example that exercizes the features of dynamically - * starting and stopping various components. You can execute this by executing - * the following steps (on a Unix platform): - * pre - * cd $CATALINA_HOME - * ./bin/catalina.sh embedded - * /pre + * @see org.apache.catalina.startup.Catalina#main for a complete example + * of how Tomcat is set up and launche as an Embedded application. * * @author Craig R. McClanahan * @version $Revision$ $Date$ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/12/08 07:45:24 Modified:catalina/src/share/org/apache/catalina/authenticator Tag: TOMCAT_5_0 DigestAuthenticator.java webapps/docs Tag: TOMCAT_5_0 changelog.xml Log: Bugzilla 32502: memory leak in DigestAuthenticator. Revision ChangesPath No revision No revision 1.6.2.1 +1 -26 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java Index: DigestAuthenticator.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- DigestAuthenticator.java 22 Apr 2004 21:48:32 - 1.6 +++ DigestAuthenticator.java 8 Dec 2004 15:45:24 - 1.6.2.1 @@ -112,28 +112,6 @@ /** - * No once hashtable. - */ -protected Hashtable nOnceTokens = new Hashtable(); - - -/** - * No once expiration (in millisecond). A shorter amount would mean a - * better security level (since the token is generated more often), but at - * the expense of a bigger server overhead. - */ -protected long nOnceTimeout = TIMEOUT_INFINITE; - - -/** - * No once expiration after a specified number of uses. A lower number - * would produce more overhead, since a token would have to be generated - * more often, but would be more secure. - */ -protected int nOnceUses = USE_ONCE; - - -/** * Private key. */ protected String key = Catalina; @@ -404,9 +382,6 @@ byte[] buffer = md5Helper.digest(nOnceValue.getBytes()); nOnceValue = md5Encoder.encode(buffer); - -// Updating the value in the no once hashtable -nOnceTokens.put(nOnceValue, new Long(currentTime + nOnceTimeout)); return nOnceValue; } No revision No revision 1.70.2.88 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.87 retrieving revision 1.70.2.88 diff -u -r1.70.2.87 -r1.70.2.88 --- changelog.xml 3 Dec 2004 17:02:25 - 1.70.2.87 +++ changelog.xml 8 Dec 2004 15:45:24 - 1.70.2.88 @@ -34,6 +34,9 @@ subsection name=Catalina changelog + fix +bug32502/bug: Memory leak in DigestAuthenticator. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/12/08 07:48:28 Modified:catalina/src/share/org/apache/catalina/authenticator DigestAuthenticator.java webapps/docs changelog.xml Log: Bugzilla 32502: memory leak in DigestAuthenticator. Revision ChangesPath 1.13 +1 -45 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java Index: DigestAuthenticator.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- DigestAuthenticator.java 12 Nov 2004 10:21:41 - 1.12 +++ DigestAuthenticator.java 8 Dec 2004 15:48:27 - 1.13 @@ -54,25 +54,6 @@ // -- Constants - -/** - * Indicates that no once tokens are used only once. - */ -protected static final int USE_ONCE = 1; - - -/** - * Indicates that no once tokens are used only once. - */ -protected static final int USE_NEVER_EXPIRES = Integer.MAX_VALUE; - - -/** - * Indicates that no once tokens are used only once. - */ -protected static final int TIMEOUT_INFINITE = Integer.MAX_VALUE; - - /** * The MD5 helper object for this class. */ @@ -111,28 +92,6 @@ /** - * No once hashtable. - */ -protected Hashtable nOnceTokens = new Hashtable(); - - -/** - * No once expiration (in millisecond). A shorter amount would mean a - * better security level (since the token is generated more often), but at - * the expense of a bigger server overhead. - */ -protected long nOnceTimeout = TIMEOUT_INFINITE; - - -/** - * No once expiration after a specified number of uses. A lower number - * would produce more overhead, since a token would have to be generated - * more often, but would be more secure. - */ -protected int nOnceUses = USE_ONCE; - - -/** * Private key. */ protected String key = Catalina; @@ -405,9 +364,6 @@ buffer = md5Helper.digest(nOnceValue.getBytes()); } nOnceValue = md5Encoder.encode(buffer); - -// Updating the value in the no once hashtable -nOnceTokens.put(nOnceValue, new Long(currentTime + nOnceTimeout)); return nOnceValue; } 1.198 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- changelog.xml 7 Dec 2004 17:05:43 - 1.197 +++ changelog.xml 8 Dec 2004 15:48:28 - 1.198 @@ -46,6 +46,9 @@ fix Decouple usage of the scheme and secure attributes from enabling SSL. (remm) /fix + fix +bug32502: memory leak in DigestAuthenticator. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator DigestAuthenticator.java
yoavs 2004/12/08 07:51:34 Modified:catalina/src/share/org/apache/catalina/authenticator Tag: TOMCAT_5_0 DigestAuthenticator.java Log: Minor additional cleanup of this class, unused constants. Revision ChangesPath No revision No revision 1.6.2.2 +1 -20 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java Index: DigestAuthenticator.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- DigestAuthenticator.java 8 Dec 2004 15:45:24 - 1.6.2.1 +++ DigestAuthenticator.java 8 Dec 2004 15:51:34 - 1.6.2.2 @@ -55,25 +55,6 @@ // -- Constants - -/** - * Indicates that no once tokens are used only once. - */ -protected static final int USE_ONCE = 1; - - -/** - * Indicates that no once tokens are used only once. - */ -protected static final int USE_NEVER_EXPIRES = Integer.MAX_VALUE; - - -/** - * Indicates that no once tokens are used only once. - */ -protected static final int TIMEOUT_INFINITE = Integer.MAX_VALUE; - - /** * The MD5 helper object for this class. */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/12/08 08:40:43 Modified:webapps/docs changelog.xml Log: Typo. Revision ChangesPath 1.199 +1 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- changelog.xml 8 Dec 2004 15:48:28 - 1.198 +++ changelog.xml 8 Dec 2004 16:40:43 - 1.199 @@ -47,7 +47,7 @@ Decouple usage of the scheme and secure attributes from enabling SSL. (remm) /fix fix -bug32502: memory leak in DigestAuthenticator. (yoavs) +bug32502/bug: memory leak in DigestAuthenticator. (yoavs) /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml logging.xml
yoavs 2004/12/07 08:38:15
Modified:webapps/docs changelog.xml logging.xml
Log:
Bugzilla 32532.
Revision ChangesPath
1.195 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- changelog.xml 3 Dec 2004 15:17:34 - 1.194
+++ changelog.xml 7 Dec 2004 16:38:14 - 1.195
@@ -29,6 +29,9 @@
section name=Tomcat 5.5.6 (yoavs)
subsection name=General
changelog
+ update
+bug32532/bug: updated logging documentation. (yoavs)
+ /update
/changelog
/subsection
1.5 +20 -8 jakarta-tomcat-catalina/webapps/docs/logging.xml
Index: logging.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/logging.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- logging.xml 19 Nov 2004 15:38:36 - 1.4
+++ logging.xml 7 Dec 2004 16:38:15 - 1.5
@@ -62,14 +62,11 @@
ol
liCreate a file called log4j.properties with the following content
and save it into common/classes. /li
- liUse the appropriate file path convention for your OS. Below is
-a Window example, which on *nix might be
- code/var/jakarta-tomcat-5.5.4/logs/tomcat.log/code./li
li
source
log4j.rootLogger=debug, R br /
log4j.appender.R=org.apache.log4j.RollingFileAppender br /
-log4j.appender.R.File=d:/jakarta-tomcat-5.5.4/logs/tomcat.log
br /
+log4j.appender.R.File=${catalina.home}/logs/tomcat.log br /
log4j.appender.R.MaxFileSize=10MB br /
log4j.appender.R.MaxBackupIndex=10 br /
log4j.appender.R.layout=org.apache.log4j.PatternLayout br /
@@ -80,6 +77,12 @@
lia href=http://logging.apache.org/log4j;Download Log4J/a
(v1.2 or later) and place the log4j jar in
$CATALINA_HOME/common/lib./li
+
+lia
href=http://jakarta.apache.org/site/binindex.cgi#commons-logging;
+Download Commons Logging/a and place the commons-logging.jar
+(not commons-logging-api.jar) in $CATALINA_HOME/common/lib with
+the log4j jar./li
+
liStart Tomcat/li
/ol
/p
@@ -93,24 +96,33 @@
p
You can (and should) be more picky about which packages to include
- in the logging. For example try substituting the
- last line of the above configuration with one of these:
+ in the logging. Tomcat 5.5 uses defines loggers by Engine and Host
names.
+ For example, for a default Catalina localhost log, add this to the
+ end of the log4j.properties above. Note that there are known issues
with
+ using this naming convention (with square brackets) in log4j XML based
+ configuration files, so we recommend you use a properties file as
described
+ until a future version of log4j allows this convention.
ul
lilog4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=DEBUG,
R/li
lilog4j.logger.org.apache.catalina.core=DEBUG, R/li
lilog4j.logger.org.apache.catalina.session=DEBUG, R/li
/ul
+
+ Be warned a level of DEBUG will produce megabytes of logging and slow
startup
+ of Tomcat. This level should be used sparingly when debugging of
internal Tomcat
+ operations is required.
/p
p
Your web applications should certainly use their own log4j
configuration.
- This is valid iwith/i the above. You would place a similar
log4j.properties
+ This is valid iwith/i the above configuration. You would place a
similar log4j.properties
file in your web application's WEB-INF/classes folder, and
log4j1.2.8.jar into
WEB-INF/lib. Then specify your package level logging. This is a basic
setup of log4j
+ which does *not* require Commons-Logging,
and you should consult the
a
href=http://logging.apache.org/log4j/docs/documentation.html;log4j
documentation/a
- for more options: this page is intended only as a bootstrapping guide.
+ for more options. This page is intended only as a bootstrapping guide.
/p
/section
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/appdev/sample/web sample.war
yoavs 2004/12/07 08:46:22 Modified:webapps/docs changelog.xml Added: webapps/docs/appdev/sample index.html webapps/docs/appdev/sample/web sample.war Log: Bugzilla 32382. Revision ChangesPath 1.196 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- changelog.xml 7 Dec 2004 16:38:14 - 1.195 +++ changelog.xml 7 Dec 2004 16:46:22 - 1.196 @@ -32,6 +32,9 @@ update bug32532/bug: updated logging documentation. (yoavs) /update + update +bug32382/bug: Index page and packaed WAR for sample webapp. (yoavs) + /update /changelog /subsection 1.1 jakarta-tomcat-catalina/webapps/docs/appdev/sample/index.html Index: index.html === html head meta name=author content=Ben Souther / titleSample Application/title /head body h2Sample Application/h2 p The example app has been packaged as a war file and can be downloaded a href=sample/sample.warhere/a (Note: make sure your browser doesn't change file extension or append a new one). /p p The easiest way to run this application is simply to move the war file to your bCATALINA_HOME/webapps/b directory. Tomcat will automatically expand and deploy the application for you. You can view it with the following URL (assuming that you're running tomcat on port 8080 as is the default): br / a href=http://localhost:8080/sample;http://localhost:8080/sample/a /p p If you just want to browse the code you can unpack the war file with the bjar/b command. source jar -xvf sample.war /source /p /body /html 1.1 jakarta-tomcat-catalina/webapps/docs/appdev/sample/web/sample.war Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/appdev/sample/web sample.war
yoavs 2004/12/07 08:48:24 Modified:webapps/docs/appdev/sample index.html Added: webapps/docs/appdev/sample sample.war Removed: webapps/docs/appdev/sample/web sample.war Log: Slight shuffling. Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-catalina/webapps/docs/appdev/sample/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/appdev/sample/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html7 Dec 2004 16:46:22 - 1.1 +++ index.html7 Dec 2004 16:48:24 - 1.2 @@ -7,7 +7,7 @@ h2Sample Application/h2 p The example app has been packaged as a war file and can be downloaded -a href=sample/sample.warhere/a (Note: make sure your browser doesn't +a href=sample.warhere/a (Note: make sure your browser doesn't change file extension or append a new one). /p p 1.1 jakarta-tomcat-catalina/webapps/docs/appdev/sample/sample.war Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml jasper-howto.xml
yoavs 2004/12/03 07:17:34 Modified:catalina/src/conf web.xml webapps/docs changelog.xml jasper-howto.xml Log: Updated Jikes section of Jasper-HowTo, and updated conf/web.xml to point people there. Revision ChangesPath 1.54 +2 -5 jakarta-tomcat-catalina/catalina/src/conf/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- web.xml 17 Nov 2004 14:35:30 - 1.53 +++ web.xml 3 Dec 2004 15:17:34 - 1.54 @@ -185,11 +185,8 @@ !-- header is added by generated servlet [false] -- !-- -- !-- If you wish to use Jikes to compile JSP pages: -- - !-- Set the init parameter compiler to jikes. Define -- - !-- the property -Dbuild.compiler.emacs=true when starting Tomcat -- - !-- by adding the above to your CATALINA_OPTS environment variable. -- - !-- If you get an error reporting that jikes can't use UTF8 encoding, -- - !-- try setting the init parameter javaEncoding to ISO-8859-1. -- + !-- Please see the Using Jikes section of the Jasper-HowTo -- + !-- page in the Tomcat documentation. -- servlet servlet-namejsp/servlet-name 1.194 +15 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- changelog.xml 2 Dec 2004 06:03:43 - 1.193 +++ changelog.xml 3 Dec 2004 15:17:34 - 1.194 @@ -26,6 +26,21 @@ /p /section +section name=Tomcat 5.5.6 (yoavs) + subsection name=General +changelog +/changelog + /subsection + + subsection name=Jasper +changelog + update +Updated Jasper-HowTo section on using Jikes, changed conf/web.xml JSPServlet to refer people to Jasper-HowTo so that we don't have these instructions in two places. (yoavs) + /update +/changelog + /subsection +/section + section name=Tomcat 5.5.5 (yoavs) subsection name=General changelog 1.24 +3 -1 jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml Index: jasper-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jasper-howto.xml 22 Oct 2004 17:13:26 - 1.23 +++ jasper-howto.xml 3 Dec 2004 15:17:34 - 1.24 @@ -281,7 +281,9 @@ a href=http://oss.software.ibm.com/developerworks/opensource/jikes/; Jikes/a to compile JSP pages: ul -liDownload and install the Ant JAR in code$CATALINA_BASE/common/lib/code./li +liFrom your a href=ant.apache.orgAnt/a installation, copy ant.jar +and (if it's available: Ant 1.5 and later) ant-launcher.jar to +code$CATALINA_BASE/common/lib/code./li liDownload and install jikes. jikes must support the -encoding option. Execute codejikes -help/code to verify that it was built with support for code-encoding/code./li - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/12/03 09:02:25
Modified:webapps/admin Tag: TOMCAT_5_0 tree-control-test.jsp
webapps/admin/WEB-INF/classes/org/apache/webapp/admin Tag:
TOMCAT_5_0 TreeControlTag.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Bugzilla 32381.
Revision ChangesPath
No revision
No revision
1.2.2.1 +1 -1
jakarta-tomcat-catalina/webapps/admin/tree-control-test.jsp
Index: tree-control-test.jsp
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/tree-control-test.jsp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- tree-control-test.jsp 24 Jul 2002 20:57:25 - 1.2
+++ tree-control-test.jsp 3 Dec 2004 17:02:25 - 1.2.2.1
@@ -20,7 +20,7 @@
td width=200
controls:tree tree=treeControlTest
- action=treeControlTest.do?tree=${name}
+ action=treeControlTest.do?tree={name}
style=tree-control
styleSelected=tree-control-selected
styleUnselected=tree-control-unselected
No revision
No revision
1.3.2.1 +4 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java
Index: TreeControlTag.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- TreeControlTag.java 27 Feb 2004 14:59:01 - 1.3
+++ TreeControlTag.java 3 Dec 2004 17:02:25 - 1.3.2.1
@@ -88,7 +88,7 @@
/**
* The hyperlink to be used for submitting requests to expand and
- * contract tree nodes. The placeholder code${name}/code will
+ * contract tree nodes. The placeholder code{name}/code will
* be replaced by the codename/code property of the current
* tree node.
*/
@@ -350,11 +350,11 @@
// character in parameter values.
String encodedNodeName = URLEncoder.encode(node.getName());
-String action = replace(getAction(), ${name}, encodedNodeName);
+String action = replace(getAction(), {name}, encodedNodeName);
String updateTreeAction =
-replace(getAction(), tree=${name}, select= +
encodedNodeName);
+replace(getAction(), tree={name}, select= + encodedNodeName);
updateTreeAction =
((HttpServletResponse) pageContext.getResponse()).
encodeURL(updateTreeAction);
No revision
No revision
1.70.2.87 +11 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.86
retrieving revision 1.70.2.87
diff -u -r1.70.2.86 -r1.70.2.87
--- changelog.xml 30 Nov 2004 17:26:28 - 1.70.2.86
+++ changelog.xml 3 Dec 2004 17:02:25 - 1.70.2.87
@@ -36,6 +36,17 @@
changelog
/changelog
/subsection
+
+ subsection name=Webapps
+changelog
+ fix
+Fixed struts-config.xml for Admin webapp after move to Struts v1.2.
(amyroh)
+ /fix
+ fix
+bug32381/bug: fix name placeholder token after move to Servlet
2.4 DTD for Admin webapp. (yoavs)
+ /fix
+/changelog
+ /subsection
/section
section name=Tomcat 5.0.30 (yoavs)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml jndi-resources-howto.xml
yoavs 2004/11/30 09:24:47 Modified:webapps/docs changelog.xml jndi-resources-howto.xml Log: Bugzilla 32454 doc patch. Revision ChangesPath 1.189 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- changelog.xml 29 Nov 2004 23:00:30 - 1.188 +++ changelog.xml 30 Nov 2004 17:24:45 - 1.189 @@ -53,6 +53,9 @@ fix bug32373/bug: outdated installation.xml page. (yoavs) /fix + update +bug32454/bug: amended JNDI documentation for JavaMail/JavaActivationFramework usage. (yoavs) + /update /changelog /subsection 1.9 +14 -0 jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml Index: jndi-resources-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jndi-resources-howto.xml 1 Sep 2004 22:04:27 - 1.8 +++ jndi-resources-howto.xml 30 Nov 2004 17:24:46 - 1.9 @@ -384,6 +384,20 @@ Customize the value of the codemail.smtp.host/code parameter to point at the server that provides SMTP service for your network./p +h34. Install the JavaMail libraries/h3 + +pa href=http://java.sun.com/products/javamail/downloads/index.html; target=_blank +Download the JavaMail API/a./p + +pThis download includes 2 vital libraries for the configuration; +activation.jar and mail.jar. Unpackage the JavaMail distribution and place +them into $CATALINA_HOME/common/lib so that they are available to +Tomcat during the initialization of the mail Session Resource. +strongNote:/strong placing these jars in both common/lib and a +web application's lib folder will cause an error, so ensure you have +them in the $CATALINA_HOME/common/lib location only. +/p + h3Example Application/h3 pThe code/examples/code application included with Tomcat contains - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml jndi-resources-howto.xml
yoavs 2004/11/30 09:26:29 Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml jndi-resources-howto.xml Log: Bugzilla 32454 doc patch Revision ChangesPath No revision No revision 1.70.2.86 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.85 retrieving revision 1.70.2.86 diff -u -r1.70.2.85 -r1.70.2.86 --- changelog.xml 24 Nov 2004 19:02:35 - 1.70.2.85 +++ changelog.xml 30 Nov 2004 17:26:28 - 1.70.2.86 @@ -26,6 +26,9 @@ fix bug32377/bug: Update MX4J dependency. (yoavs) /fix + update +bug32454/bug: Amended JNDI documentation for JavaMail/JavaActivationFramework usage. (yoavs) + /update /changelog /subsection 1.5.2.2 +14 -0 jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml Index: jndi-resources-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -r1.5.2.1 -r1.5.2.2 --- jndi-resources-howto.xml 21 Aug 2004 15:50:07 - 1.5.2.1 +++ jndi-resources-howto.xml 30 Nov 2004 17:26:29 - 1.5.2.2 @@ -420,6 +420,20 @@ Customize the value of the codemail.smtp.host/code parameter to point at the server that provides SMTP service for your network./p +h34. Install the JavaMail libraries/h3 + +pa href=http://java.sun.com/products/javamail/downloads/index.html; target=_blank +Download the JavaMail API/a./p + +pThis download includes 2 vital libraries for the configuration; +activation.jar and mail.jar. Unpackage the JavaMail distribution and place +them into $CATALINA_HOME/common/lib so that they are available to +Tomcat during the initialization of the mail Session Resource. +strongNote:/strong placing these jars in both common/lib and a +web application's lib folder will cause an error, so ensure you have +them in the $CATALINA_HOME/common/lib location only. +/p + h3Example Application/h3 pThe code/examples/code application included with Tomcat contains - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs index.xml project.xml
yoavs 2004/11/29 06:38:02 Modified:webapps/docs index.xml project.xml Log: Updated connectors doc links Revision ChangesPath 1.21 +1 -1 jakarta-tomcat-catalina/webapps/docs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/index.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- index.xml 7 Oct 2004 18:16:05 - 1.20 +++ index.xml 29 Nov 2004 14:38:02 - 1.21 @@ -120,7 +120,7 @@ - Reference manual that documents all available elements and attributes that may be placed into a Tomcat 5 codeconf/server.xml/code file. /li -lia href=http://jakarta.apache.org/tomcat/connectors-doc/jk2/index.html;strongJK Documenation/strong/a +lia href=http://jakarta.apache.org/tomcat/connectors-doc/index.html;strongJK Documenation/strong/a - Complete documentation and HOWTOs on the JK native webserver connector, used to interface Tomcat with servers like Apache HTTPd, IIS and others./li 1.26 +1 -0 jakarta-tomcat-catalina/webapps/docs/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/project.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- project.xml 22 Nov 2004 15:26:42 - 1.25 +++ project.xml 29 Nov 2004 14:38:02 - 1.26 @@ -13,6 +13,7 @@ menu name=Links item name=Docs Home href=index.html/ +item name=FAQ href=../faq / /menu menu name=User Guide - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml
yoavs 2004/11/29 06:41:17 Modified:webapps/docs Tag: TOMCAT_5_0 index.xml project.xml webapps/docs/config Tag: TOMCAT_5_0 ajp.xml Log: Updated connectors-docs links. Revision ChangesPath No revision No revision 1.15.2.2 +1 -1 jakarta-tomcat-catalina/webapps/docs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/index.xml,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -u -r1.15.2.1 -r1.15.2.2 --- index.xml 21 Aug 2004 15:50:05 - 1.15.2.1 +++ index.xml 29 Nov 2004 14:41:16 - 1.15.2.2 @@ -113,7 +113,7 @@ - Reference manual that documents all available elements and attributes that may be placed into a Tomcat 5 codeconf/server.xml/code file. /li -lia href=http://jakarta.apache.org/tomcat/connectors-doc/jk2/index.html;strongJK Documenation/strong/a +lia href=http://jakarta.apache.org/tomcat/connectors-doc/index.html;strongJK Documenation/strong/a - Complete documentation and HOWTOs on the JK native webserver connector, used to interface Tomcat with servers like Apache HTTPd, IIS and others./li 1.21.2.3 +1 -1 jakarta-tomcat-catalina/webapps/docs/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/project.xml,v retrieving revision 1.21.2.2 retrieving revision 1.21.2.3 diff -u -r1.21.2.2 -r1.21.2.3 --- project.xml 28 Oct 2004 20:30:52 - 1.21.2.2 +++ project.xml 29 Nov 2004 14:41:16 - 1.21.2.3 @@ -45,7 +45,7 @@ item name=Release Notes href=RELEASE-NOTES.txt/ item name=Tomcat Configuration href=config/index.html/ item name=JK Documentation - href=http://jakarta.apache.org/tomcat/connectors-doc/jk2/index.html/ + href=http://jakarta.apache.org/tomcat/connectors-doc/index.html/ item name=Servlet API Javadocs href=servletapi/index.html/ item name=JSP API Javadocs href=jspapi/index.html/ /menu No revision No revision 1.4.2.3 +1 -1 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml Index: ajp.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- ajp.xml 28 Oct 2004 20:44:35 - 1.4.2.2 +++ ajp.xml 29 Nov 2004 14:41:16 - 1.4.2.3 @@ -172,7 +172,7 @@ section name=Configuration HOWTOs pPlease refer to the -a href=../../connectors-doc/jk2JK documentation/a +a href=../../connectors-docJK documentation/a for HOW-TOs and complete configuration information. /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/appdev introduction.xml
yoavs 2004/11/24 10:37:44 Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml webapps/docs/appdev Tag: TOMCAT_5_0 introduction.xml Log: Bugzilla 32371 Revision ChangesPath No revision No revision 1.70.2.83 +15 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.82 retrieving revision 1.70.2.83 diff -u -r1.70.2.82 -r1.70.2.83 --- changelog.xml 24 Nov 2004 15:38:46 - 1.70.2.82 +++ changelog.xml 24 Nov 2004 18:37:44 - 1.70.2.83 @@ -14,6 +14,21 @@ body +section name=Tomcat 5.0.31 (yoavs) + subsection name=General +changelog +/changelog + /subsection + + subsection name=Catalina +changelog + fix +bug32371/bug: outdated introduction.xml page. (yoavs) + /fix +/changelog + /subsection +/section + section name=Tomcat 5.0.30 (yoavs) subsection name=General changelog No revision No revision 1.2.2.1 +2 -2 jakarta-tomcat-catalina/webapps/docs/appdev/introduction.xml Index: introduction.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/appdev/introduction.xml,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- introduction.xml 15 Jan 2003 03:40:43 - 1.2 +++ introduction.xml 24 Nov 2004 18:37:44 - 1.2.2.1 @@ -47,7 +47,7 @@ web applications with Tomcat./p ul lia href=http://java.sun.com/products/jsp/download.html;http://java.sun.com/products/jsp/download.html/a - -iJavaServer Pages (JSP) Specfication, Version 1.2/i. Describes +iJavaServer Pages (JSP) Specfication, Version 2.0/i. Describes the programming environment provided by standard implementations of the JavaServer Pages (JSP) technology. In conjunction with the Servlet API Specification (see below), this document describes @@ -57,7 +57,7 @@ API Documentation is included in the specification, and with the Tomcat download.br/br//li lia href=http://java.sun.com/products/servlet/download.html;http://java.sun.com/products/servlet/download.html/a - -iServlet API Specification, Version 2.3/i. Describes the +iServlet API Specification, Version 2.4/i. Describes the programming environment that must be provided by all servlet containers conforming to this specification. In particular, you will need this document to understand the web application - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/appdev introduction.xml
yoavs 2004/11/24 10:43:17 Modified:webapps/docs changelog.xml webapps/docs/appdev introduction.xml Log: Bugzilla 32371 Revision ChangesPath 1.183 +6 -3 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- changelog.xml 24 Nov 2004 18:23:58 - 1.182 +++ changelog.xml 24 Nov 2004 18:43:17 - 1.183 @@ -47,9 +47,9 @@ update bug32282/bug: Modify Windows Uninstaller to only remove webapps/ROOT and webapps if user asks to remove everything. (yoavs) /update - update -Add DIGEST authentication support to the JDBC and DataSource realms. Supports both digested and cleartext passwords. (markt) - /update + fix +bug32371/bug: outdated introduction.xml page. (yoavs) + /fix /changelog /subsection @@ -73,6 +73,9 @@ fix Move processExpiresFrequency check to ManagerBase and reflect change to all subclasses (StandardManager, PersientManagerBase, DeltaManager). (pero) /fix + update +Add DIGEST authentication support to the JDBC and DataSource realms. Supports both digested and cleartext passwords. (markt) + /update /changelog /subsection 1.3 +2 -2 jakarta-tomcat-catalina/webapps/docs/appdev/introduction.xml Index: introduction.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/appdev/introduction.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- introduction.xml 15 Jan 2003 03:40:43 - 1.2 +++ introduction.xml 24 Nov 2004 18:43:17 - 1.3 @@ -47,7 +47,7 @@ web applications with Tomcat./p ul lia href=http://java.sun.com/products/jsp/download.html;http://java.sun.com/products/jsp/download.html/a - -iJavaServer Pages (JSP) Specfication, Version 1.2/i. Describes +iJavaServer Pages (JSP) Specfication, Version 2.0/i. Describes the programming environment provided by standard implementations of the JavaServer Pages (JSP) technology. In conjunction with the Servlet API Specification (see below), this document describes @@ -57,7 +57,7 @@ API Documentation is included in the specification, and with the Tomcat download.br/br//li lia href=http://java.sun.com/products/servlet/download.html;http://java.sun.com/products/servlet/download.html/a - -iServlet API Specification, Version 2.3/i. Describes the +iServlet API Specification, Version 2.4/i. Describes the programming environment that must be provided by all servlet containers conforming to this specification. In particular, you will need this document to understand the web application - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/appdev installation.xml
yoavs 2004/11/24 10:52:45 Modified:webapps/docs changelog.xml webapps/docs/appdev installation.xml Log: Bugzilla 32373 Revision ChangesPath 1.184 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- changelog.xml 24 Nov 2004 18:43:17 - 1.183 +++ changelog.xml 24 Nov 2004 18:52:44 - 1.184 @@ -50,6 +50,9 @@ fix bug32371/bug: outdated introduction.xml page. (yoavs) /fix + fix +bug32373/bug: outdated installation.xml page. (yoavs) + /fix /changelog /subsection 1.6 +4 -6 jakarta-tomcat-catalina/webapps/docs/appdev/installation.xml Index: installation.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/appdev/installation.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- installation.xml 12 Apr 2004 12:55:51 - 1.5 +++ installation.xml 24 Nov 2004 18:52:45 - 1.6 @@ -23,12 +23,10 @@ subsection name=JDK -pTomcat will operate under any strongJava Development Kit/strong (JDK) -environment that provides a JDK 1.2 (also known as Java2 Standard Edition, or -J2SE) or later platform. You will need a Java Development Kit, as opposed to a -Java Runtime Environment, so that your servlets, other classes, and JSP pages -can be compiled. Tomcat 5 has been extensively tested with JDK 1.3.1, which -is recommended./p +pTomcat 5.5 was designed to run on J2SE 5.0, but it can run on JDK 1.4 +as well, using the compatability package as detailed in the Tomcat +installation instructions. +/p pCompatible JDKs for many platforms (or links to where they can be found) are available at - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
