RE: svn commit: r810132 - /tomcat/tc6.0.x/trunk/STATUS.txt
> -Original Message-
> From: Rainer Jung [mailto:rainer.j...@kippdata.de]
> Sent: Tuesday, September 01, 2009 3:34 PM
> To: Tomcat Developers List
> Subject: Re: svn commit: r810132 - /tomcat/tc6.0.x/trunk/STATUS.txt
>
> On 01.09.2009 20:48, Larry Isaacs wrote:
> > Hi Filip,
> >
> > I have a vague recollection about tripping over this issue while
> working on the Tomcat support in the Eclipse Web Tools Platform. WTP
> has its own version(s) of VirtualWebappLoader, called WtpWebappLoader,
> to address it. If I'm recalling the issue correctly, pre-pending
> "file:/" worked on Windows, but not on Linux since an absolute path
> ended up as "file://somedir/...". I believe with the change below,
> pre-pending "file://" will work for Linux, but not for Windows, i.e.
> "file://C:/somedir/..." is going to have problems. If it helps, I went
> with the URL form "file:/somedir/..." and used the following code
> snippet to get it working for Windows and Linux in WtpWebappLoader:
>
> Good point.
>
> >
> > String path = file.getAbsolutePath();
> > if (path.startsWith("/")) {
> > path = "file:" + path;
> > } else {
> > path = "file:/" + path;
> > }
> > if (file.isDirectory()) {
> > addRepository(path + "/");
> > } else {
> > addRepository(path);
>
> Why not: file.toURI().toString()
Won't toURI() convert spaces to '%'. I was too lazy to determine exactly what
the downstream code expects or tolerates with respect to this string. Thus, I
was attempting to improve the code in a way that involved the least amount of
assumptions. This is an approach that has gained popularity with me as I've
aged. :) I'm not sure of the impact of converting spaces to '%'.
Cheers,
Larry
>
> It seems this is not cheap, but should handle as much annoyances as
> possible (drive letters, directory trailing slashes, UNC notation).
>
> Regards,
>
> Rainer
>
> >> -Original Message-
> >> From: fha...@apache.org [mailto:fha...@apache.org]
> >> Sent: Tuesday, September 01, 2009 1:22 PM
> >> To: dev@tomcat.apache.org
> >> Subject: svn commit: r810132 - /tomcat/tc6.0.x/trunk/STATUS.txt
> >>
> >> Author: fhanik
> >> Date: Tue Sep 1 17:21:59 2009
> >> New Revision: 810132
> >>
> >> URL: http://svn.apache.org/viewvc?rev=810132&view=rev
> >> Log:
> >> proposal
> >>
> >> Modified:
> >> tomcat/tc6.0.x/trunk/STATUS.txt
> >>
> >> Modified: tomcat/tc6.0.x/trunk/STATUS.txt
> >> URL:
> >>
> http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=810132
> >> &r1=810131&r2=810132&view=diff
> >>
> ===
> >> ===
> >> --- tomcat/tc6.0.x/trunk/STATUS.txt (original)
> >> +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 1 17:21:59 2009
> >> @@ -321,3 +321,25 @@
> >>+1: funkman
> >>-1:
> >>
> >> +
> >> +* Fix VirtualWebappClassLoader file directives
> >> + Index: java/org/apache/catalina/loader/VirtualWebappLoader.java
> >> +===
> >> +--- java/org/apache/catalina/loader/VirtualWebappLoader.java
> >> (revision 810099)
> >> java/org/apache/catalina/loader/VirtualWebappLoader.java
> >> (working copy)
> >> +@@ -92,9 +92,9 @@
> >> + continue;
> >> + }
> >> + if (file.isDirectory()) {
> >> +-addRepository("file:/" + file.getAbsolutePath() +
> >> "/");
> >> ++addRepository("file://" + file.getAbsolutePath() +
> >> "/");
> >> + } else {
> >> +-addRepository("file:/" + file.getAbsolutePath());
> >> ++addRepository("file://" + file.getAbsolutePath());
> >> + }
> >> + }
> >> +
> >> + +1: fhanik
> >> + -1:
> >> +
> >> +
> >>
> >>
> >>
> >>
> -
> >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> >> For additional commands, e-mail: dev-h...@tomcat.apache.org
> >>
> >
> >
>
> --
> kippdata
> informationstechnologie GmbH Tel: 0228 98549 -0
> Bornheimer Str. 33aFax: 0228 98549 -50
> 53111 Bonn www.kippdata.de
>
> HRB 8018 Amtsgericht Bonn / USt.-IdNr. DE 196 457 417
> Geschäftsführer: Dr. Thomas Höfer, Rainer Jung, Sven Maurmann
> ===
> kippdata
> informationstechnologie GmbH Tel: +49 228 98549 -0
> Bornheimer Str. 33aFax: +49 228 98549 -50
> D-53111 Bonn www.kippdata.de
>
> HRB 8018 Amtsgericht Bonn / USt.-IdNr. DE 196 457 417
> Geschäftsführer: Dr. Thomas Höfer, Rainer Jung, Sven Maurmann
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
DO NOT REPLY [Bug 47777] New: Release Notes and Change Log should have verison release date
https://issues.apache.org/bugzilla/show_bug.cgi?id=4 Summary: Release Notes and Change Log should have verison release date Product: Tomcat 6 Version: unspecified Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: business2...@rodneybeede.com --- Comment #0 from Rodney 2009-09-02 07:18:03 PDT --- There should be something like "Version Released DD MMM " in the Change Log and Release Notes pages on tomcat.apache.org as well as the "RELEASE-NOTES" file in the official distro bundles. Also the Apache Tomcat Versions table on http://tomcat.apache.org/ should have a third column "Released" with the appropriate dates. It is useful because when my company is using version 6.0.3, and I want to tell them to upgrade to the latest version I can easily tell them how old that version is. That encourages them to do the upgrade sooner instead of putting it off. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47777] Release Notes and Change Log should have verison release date
https://issues.apache.org/bugzilla/show_bug.cgi?id=4 Mark Thomas changed: What|Removed |Added Severity|normal |enhancement -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r810611 - /tomcat/trunk/bin/catalina.sh
Author: markt Date: Wed Sep 2 17:00:39 2009 New Revision: 810611 URL: http://svn.apache.org/viewvc?rev=810611&view=rev Log: Make the PID improvements Solaris friendly. Add some more error checking to the stop command Modified: tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=810611&r1=810610&r2=810611&view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Wed Sep 2 17:00:39 2009 @@ -287,9 +287,11 @@ elif [ "$1" = "start" ] ; then - if [ ! -z "$CATALINA_PID" -a -e "$CATALINA_PID" ]; then -echo "PID file found. Is Tomcat still running? This start aborted" -exit 1 + if [ ! -z "$CATALINA_PID" ]; then +if [ -f "$CATALINA_PID" ]; then + echo "PID file ($CATALINA_PID) found. Is Tomcat still running? Start aborted." + exit 1 +fi fi shift @@ -327,9 +329,12 @@ shift SLEEP=5 - if [ ! -z "$1" -a $1 -eq $1 &>/dev/null ]; then -SLEEP=$1 -shift + if [ ! -z "$1" ]; then +echo $1 | grep "[^0-9]" > /dev/null 2>&1 +if [ $? -eq 1 ]; then + SLEEP=$1 + shift +fi fi FORCE=0 @@ -338,6 +343,19 @@ FORCE=1 fi + if [ ! -z "$CATALINA_PID" ]; then +if [ -f "$CATALINA_PID" ]; then + kill -0 `cat $CATALINA_PID` >/dev/null 2>&1 + if [ $? -eq 1 ]; then +echo "PID file ($CATALINA_PID) found but no matching process was found. Stop aborted." +exit 1 + fi +else + echo "\$CATALINA_PID was set ($CATALINA_PID) but the specified file does not exist. Is Tomcat running? Stop aborted." + exit 1 +fi + fi + "$_RUNJAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ @@ -345,29 +363,36 @@ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ org.apache.catalina.startup.Bootstrap "$@" stop - if [ ! -z "$CATALINA_PID" -a -e "$CATALINA_PID" ]; then -while [ $SLEEP -ge 0 ] -do - if ! kill -0 `cat $CATALINA_PID` &>/dev/null; then -rm $CATALINA_PID -break - fi - if [ $SLEEP -gt 0 ]; then -sleep 1 - fi - let SLEEP=SLEEP-1 -done + if [ ! -z "$CATALINA_PID" ]; then +if [ -f "$CATALINA_PID" ]; then + while [ $SLEEP -ge 0 ]; do +kill -0 `cat $CATALINA_PID` >/dev/null 2>&1 +if [ $? -eq 1 ]; then + rm $CATALINA_PID + break +fi +if [ $SLEEP -gt 0 ]; then + sleep 1 +fi +if [ $SLEEP -eq 0 ]; then + if [ $FORCE -eq 0 ]; then +echo "Tomcat did not stop in time. PID file was not removed." + fi +fi +SLEEP=`expr $SLEEP - 1 ` + done +fi fi if [ $FORCE -eq 1 ]; then -if [ ! -z "$CATALINA_PID" -a -e "$CATALINA_PID" ]; then - echo "Killing: `cat $CATALINA_PID`" - kill -9 `cat $CATALINA_PID` - rm $CATALINA_PID +if [ -z "$CATALINA_PID" ]; then + echo "Kill failed: \$CATALINA_PID not set" else - if [ -z "$CATALINA_PID" ]; then - echo "Kill failed: \$CATALINA_PID not set" - fi + if [ -f "$CATALINA_PID" ]; then +echo "Killing: `cat $CATALINA_PID`" +kill -9 `cat $CATALINA_PID` +rm $CATALINA_PID + fi fi fi - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47699] CATALINA_PID can be over-written by failed start
https://issues.apache.org/bugzilla/show_bug.cgi?id=47699 --- Comment #2 from Mark Thomas 2009-09-02 18:04:31 BST --- Created an attachment (id=24202) Combined patch The attach patch combines the 3 trunk patches into a single patch. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r810615 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Sep 2 17:06:41 2009 New Revision: 810615 URL: http://svn.apache.org/viewvc?rev=810615&view=rev Log: Add missing patch Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=810615&r1=810614&r2=810615&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 2 17:06:41 2009 @@ -311,15 +311,14 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47699 Better handling of PID files - http://svn.apache.org/viewvc?rev=804963&view=rev - http://svn.apache.org/viewvc?rev=804982&view=rev + https://issues.apache.org/bugzilla/attachment.cgi?id=24202 +1: markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041 Threading issue in classloading. Adds a sync so please check performance + http://svn.apache.org/viewvc?rev=805182&view=rev +1: markt - 0: Where's the patch? -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r810616 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Wed Sep 2 17:07:28 2009 New Revision: 810616 URL: http://svn.apache.org/viewvc?rev=810616&view=rev Log: Add missing patch Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=810616&r1=810615&r2=810616&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Sep 2 17:07:28 2009 @@ -84,5 +84,6 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041 Threading issue in classloading. Adds a sync so please check performance + http://svn.apache.org/viewvc?rev=805182&view=rev +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
