svn commit: r791730 - /tomcat/current/tc5.5.x/STATUS.txt

2009-07-07 Thread rjung
Author: rjung
Date: Tue Jul  7 07:23:42 2009
New Revision: 791730

URL: http://svn.apache.org/viewvc?rev=791730&view=rev
Log:
Remove comment. Konstantin explained it on tomcat-dev.

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791730&r1=791729&r2=791730&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul  7 07:23:42 2009
@@ -103,7 +103,6 @@
   http://people.apache.org/~kkolinko/patches/2009-07-05_tc55_packsources.patch
   +1: kkolinko, markt, rjung
   -1:
-  rjung: Not sure, why you exclude bin instead of *.class
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
   Reverts previous fix for



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [PROPOSAL] Remove SVN keywords from JavaDoc

2009-07-07 Thread Rainer Jung
On 07.07.2009 04:34, William A. Rowe, Jr. wrote:
> Rainer Jung wrote:
>> So I like the idea of using Id, but I am open to arguments for dropping it.
> 
> In httpd, we use;  in the reference
> file, and the tag  which
> is updated in order to determine how far out of sync translations have fallen.
> 
> So there is one argument for at least one embedded svn property.

Konstantin: you might not know that part of httpd development. The
procedure Bill describes is for tracking out of date translated
documentation pages. So it is not directly related to the auto-generated
javadocs. It could be used e.g. for the message resource files to
detect, for which languages they haven't been updated.

I never checked how that procedure is actually implemented. I suspect it
used some ant or xsl facilities and not only svn builtins, so it might
not be easy to apply to the LocalStrings properties files.

Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 45785] ClassCastException if directory ending with .jar exists in WEB-INF/lib

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45785





--- Comment #3 from Rolf Wojtech   2009-07-07 00:35:40 PST ---
Created an attachment (id=23934)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23934)
Add support for directories with name ending on .jar

While the specific case (directory called .jar in WEB-INF/lib) has been fixed,
two other cases remain in ExtensionValidator.

Therefore I reopened this bug:

We're using an exploded deployment mechanism which uses extracted jar files in
folders called jarname.jar. The eclipse projects build directly into those
folders.
However when adding these projects to a jboss launch configuration, which
results in a jarname.jar folder (not file) to be part of the classpath, JBoss
will fail because ExtensionValidator tries to treat the jarname.jar folder as a
file.
ExtensionValidator only checks if a java.io.File endsWith(".jar") but it fails
to check if it is an actual file, not a directory.

I attached a proposed fix (I only added the !item.isDirectory() and
!files[i].isDirectory() )

I ran into other JBoss problems after fixing this which means that this does
not really affect me. It may not be popular to name directories something.jar
but in the cases of exploded deployment this seems normal. In any case my patch
does not affect the normal usage of actual .jar files so I see no reason not to
include it.

-- 
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 45785] ClassCastException if directory ending with .jar exists in WEB-INF/lib

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45785


Rolf Wojtech  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |




--- Comment #4 from Rolf Wojtech   2009-07-07 00:36:28 PST ---
Reopened due to additional problems with directories called somename.jar

-- 
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 45785] ClassCastException if directory ending with .jar exists in WEB-INF/lib

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45785


Rolf Wojtech  changed:

   What|Removed |Added

 CC||r...@wojtech.de




-- 
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: r791735 - /tomcat/current/tc5.5.x/STATUS.txt

2009-07-07 Thread rjung
Author: rjung
Date: Tue Jul  7 07:45:35 2009
New Revision: 791735

URL: http://svn.apache.org/viewvc?rev=791735&view=rev
Log:
Add comment.

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791735&r1=791734&r2=791735&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul  7 07:45:35 2009
@@ -139,3 +139,12 @@
 We switch between JDK and JRE based on env.variables (e.g. introduced
 through setenv.[sh|bat]). Why not to add tools.jar always when JDK is
 used?
+  rjung: It looks to me like "javac" as an argument was possible before the 
patch
+(even already in tc4.1) but wasn't actually changing anything except for
+additional checks. A _RUNJAVAC was set but never used.
+After the patch javac is meant to do something, namely adding tools.jar to
+the classpath. The shift seems to be in
+
http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?r1=791331&r2=791330&pathrev=791331
+I don't like adding tools.jar whenever a JDK is used. The JDK contains 
additional
+tools relative to the JRE, so I always prefer people to install the JDK 
even
+when they only use the JDT compiler for Tomcat.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [PROPOSAL] Remove SVN keywords from JavaDoc

2009-07-07 Thread Mark Thomas
Konstantin Kolinko wrote:
> As was written early in this my thread:
> http://www.nabble.com/Coding-Guidelines%2C-encodings%2C-keywords-td23662661.html
> (http://markmail.org/thread/d6dsgrsfvnuzclt7)
> 
> there are problems with Subversion $Date$ keyword:
> 1. It uses localized names for the month and the day of the week
> 2. It writes those localized strings using UTF-8, while our sources
> are ISO-8859-1
> 3. The time that is printed is in local timezone
> 
> There are two possible solutions (besides ignoring the issue):
> a) Use $Id:$ keyword instead
> b) Remove the keyword
> 
> For the java sources, I propose the simpler one of the above:
> 
> I propose to remove *all* SVN keywords from our *.java sources, where they are
> used in JavaDoc comments.
> That includes the following four keywords: Author Date Id Revision
> 
> As it is a documentation change, I won't propose a patch, but go C-T-R.
> 
> What are your opinions?
> If there are any objections to such a change, please write so.

I'm happy getting rid of all of them. The only times I have used them
there have been equally quick, equally effective ways of finding out the
information I was after (usually Tomcat version).

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r791782 - /tomcat/current/tc5.5.x/STATUS.txt

2009-07-07 Thread kkolinko
Author: kkolinko
Date: Tue Jul  7 10:21:50 2009
New Revision: 791782

URL: http://svn.apache.org/viewvc?rev=791782&view=rev
Log:
comment

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791782&r1=791781&r2=791782&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul  7 10:21:50 2009
@@ -148,3 +148,16 @@
 I don't like adding tools.jar whenever a JDK is used. The JDK contains 
additional
 tools relative to the JRE, so I always prefer people to install the JDK 
even
 when they only use the JDT compiler for Tomcat.
+  kkolinko:
+It isn't there in 4.1
+
http://svn.apache.org/repos/asf/tomcat/archive/tc4.1.x/trunk/container/catalina/src/bin/
+> The shift seems to be in ...
+Yes, that is the shift I am referring to. It is a part of the proposed
+patch. It isn't there in the current 5.5 and 6.0 *.sh files.
+> I don't like adding tools.jar whenever a JDK is used.
+OK, I understand this.
+My position is that to add or not to add tools.jar is a configuration
+choice. Thus it is better to have it controllable via setenv.sh
+(well, even now one can set CLASSPATH there, or add tools.jar to
+common.loader of catalina.properties - haven't tried the latter)
+Though we already have a switch that controlls configuration: "-security".



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 47487] New: "null " as result of expression evaluation

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47487

   Summary: "null " as result of expression evaluation
   Product: Tomcat 6
   Version: 6.0.20
  Platform: PC
OS/Version: Windows Vista
Status: NEW
  Severity: critical
  Priority: P2
 Component: Servlet & JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: alfred.staflin...@infoniqa.com


When i have a JSP page with this tag/expression...



... and "companyHeader" evaluates to null, 

the output in Tomcat 6.0.18 is " " (which is correct),

but the output in Tomcat 6.0.20 is "null " (which is not correct).

-- 
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: r791789 - in /tomcat/trunk/java/org/apache/catalina/ha/session: LocalStrings.properties LocalStrings_es.properties

2009-07-07 Thread kkolinko
Author: kkolinko
Date: Tue Jul  7 10:50:40 2009
New Revision: 791789

URL: http://svn.apache.org/viewvc?rev=791789&view=rev
Log:
Remove standardSession strings not used by DeltaSession

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=791789&r1=791788&r2=791789&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
Tue Jul  7 10:50:40 2009
@@ -89,25 +89,7 @@
 jvmRoute.valve.started=JvmRouteBinderValve started
 jvmRoute.valve.stopped=JvmRouteBinderValve stopped
 jvmRoute.set.orignalsessionid=Set Orginal Session id at request attriute {0} 
value: {1}
-standardSession.getId.ise=getId: Session already invalidated
-standardSession.attributeEvent=Session attribute event listener threw exception
-standardSession.attributeEvent=Session attribute event listener threw exception
-standardSession.bindingEvent=Session binding event listener threw exception
-standardSession.invalidate.ise=invalidate: Session already invalidated
-standardSession.isNew.ise=isNew: Session already invalidated
-standardSession.getAttribute.ise=getAttribute: Session already invalidated
-standardSession.getAttributeNames.ise=getAttributeNames: Session already 
invalidated
-standardSession.getCreationTime.ise=getCreationTime: Session already 
invalidated
-standardSession.getThisAccessedTime.ise=getThisAccessedTime: Session already 
invalidated
-standardSession.getLastAccessedTime.ise=getLastAccessedTime: Session already 
invalidated
-standardSession.getId.ise=getId: Session already invalidated
-standardSession.getMaxInactiveInterval.ise=getMaxInactiveInterval: Session 
already invalidated
-standardSession.getValueNames.ise=getValueNames: Session already invalidated
 standardSession.notSerializable=Cannot serialize session attribute {0} for 
session {1}
 standardSession.removeAttribute.ise=removeAttribute: Session already 
invalidated
-standardSession.sessionEvent=Session event listener threw exception
-standardSession.setAttribute.iae=setAttribute: Non-serializable attribute
-standardSession.setAttribute.ise=setAttribute: Session already invalidated
 standardSession.setAttribute.namenull=setAttribute: name parameter cannot be 
null
-standardSession.sessionCreated=Created Session id = {0}
 serializablePrincipal.readPrincipal.cnfe=readPrincipal: Failed to recreate 
user Principal

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties?rev=791789&r1=791788&r2=791789&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties 
Tue Jul  7 10:50:40 2009
@@ -89,25 +89,7 @@
 jvmRoute.valve.started = JvmRouteBinderValve arrancada
 jvmRoute.valve.stopped = JvmRouteBinderValve parada
 jvmRoute.set.orignalsessionid = Puesta id Orginal de Sesi\u00F3n en atributo 
de requerimiento {0} valor\: {1}
-standardSession.getId.ise = getId\: Sesi\u00F3n ya invalidada
-standardSession.attributeEvent = El oyente de evento de atributo de 
sesi\u00F3n lanz\u00F3 excepci\u00F3n
-standardSession.attributeEvent = El oyente de evento de atributo de 
sesi\u00F3n lanz\u00F3 excepci\u00F3n
-standardSession.bindingEvent = El oyente de evento de ligado de sesi\u00F3n 
lanz\u00F3 excepci\u00F3n
-standardSession.invalidate.ise = invalidar\: Sesi\u00F3n ya invalidada
-standardSession.isNew.ise = isNew\: Sesi\u00F3n ya invalidada
-standardSession.getAttribute.ise = getAttribute\: Sesi\u00F3n ya invalidada
-standardSession.getAttributeNames.ise = getAttributeNames\: Sesi\u00F3n ya 
invalidada
-standardSession.getCreationTime.ise = getCreationTime\: Sesi\u00F3n ya 
invalidada
-standardSession.getThisAccessedTime.ise = getThisAccessedTime\: Sesi\u00F3n ya 
invalidada
-standardSession.getLastAccessedTime.ise = getLastAccessedTime\: Sesi\u00F3n ya 
invalidada
-standardSession.getId.ise = getId\: Sesi\u00F3n ya invalidada
-standardSession.getMaxInactiveInterval.ise = getMaxInactiveInterval\: 
Sesi\u00F3n ya invalidada
-standardSession.getValueNames.ise = getValueNames\: Sesi\u00F3n ya invalidada
 standardSession.notSerializable = No puedo serializar atributo de sesi\u00F3n 
{0} para sesi\u00F3n {1}
 standardSession.removeAttribute.ise = removeAttribute\: Sesi\u00F3n ya 
invalidada
-standardSession.sessionEvent = El oyente de evento de sesi\u00F3n

svn commit: r791790 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-07-07 Thread kkolinko
Author: kkolinko
Date: Tue Jul  7 10:55:40 2009
New Revision: 791790

URL: http://svn.apache.org/viewvc?rev=791790&view=rev
Log:
vote and 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=791790&r1=791789&r2=791790&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul  7 10:55:40 2009
@@ -105,14 +105,17 @@
   http://svn.apache.org/viewvc?rev=714002&view=rev
   6.0.x version of the patch:
   http://people.apache.org/~mturk/tomcat/setAttribute1.iae.patch
-  +1: mturk
-  -1: kkolinko: (
-  good in general, but
-  1) please use native2ascii for LocalStrings_fr.properties
-  s/ e / \u00nn /
-  2) o.a.c.session.ha.session.LocalString*.properties files also have this 
string.
-  Should it be removed from there, or updated there also?
+  +1: mturk, kkolinko
+  -1:
+  kkolinko: (
+  o.a.c.session.ha.session.LocalString*.properties files also have this 
string.
+  It should be removed from there, or updated there also.
+  I am proposing the removal patch below (rev.791789).
  )
+
+* Remove standardSession strings not used by DeltaSession
+  http://svn.apache.org/viewvc?rev=791789&view=rev
+  +1: kkolinko
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158
@@ -170,6 +173,8 @@
   http://svn.apache.org/viewvc?rev=791331&view=rev (align platforms / bug 
39194)
   +1: markt, rjung (all 3 patches)
   -1: 
+  kkolinko: +1 for the first and second patches,
+-1 for the third patch. See tc5.5 status file for discussion.
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47478
   https://svn.apache.org/viewcvs.cgi?view=rev&rev=791524



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 46381] Coerce EL expression to java.lang.Object breaks expression concatenation

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46381


Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Comment #5 from Mark Thomas   2009-07-07 03:56:21 PST ---
Comment #4 looks like a separate issue and bug47487 has now been opened for it.

-- 
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 47487] "null " as result of expression evaluation

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47487


Alfred Staflinger  changed:

   What|Removed |Added

 CC||alfred.staflin...@infoniqa.
   ||com




-- 
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 47487] "null " as result of expression evaluation

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47487


ma...@infoniqa.com changed:

   What|Removed |Added

 CC||ma...@infoniqa.com




-- 
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 41538] Unable to run Tomcat as a Windows service under JDK 1.6

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=41538





--- Comment #34 from Konstantin Kolinko   2009-07-07 
04:31:23 PST ---
procrun 2.0.5 has a fix/workaround for this issue
http://markmail.org/thread/nhkrskh6bwyirwru
http://www.nabble.com/Updated-procrun-binaries-td23778191.html

It will be in TC 5.5.28, TC 6.0.21.

-- 
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: r791798 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml

2009-07-07 Thread kkolinko
Author: kkolinko
Date: Tue Jul  7 11:39:22 2009
New Revision: 791798

URL: http://svn.apache.org/viewvc?rev=791798&view=rev
Log:
Add changelog entry for Mladen's update of procrun.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=791798&r1=791797&r2=791798&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jul  7 11:39:22 2009
@@ -54,11 +54,15 @@
   
   
 Update to commons-pool 1.5.1. This includes various fixes to prevent
-deadlocks, reduce syncs and make object allocation occur fairly - ie
+deadlocks, reduce syncs and make object allocation occur fairly - i.e.
 objects are allocated to threads in the order that the threads request
 them. This fixes a number of issues with the version of DBCP embedded
 within Tomcat. (markt)
   
+  
+Update Tomcat Windows service application (procrun) to version 2.0.5.
+It contains a fix for issue 41538 (mturk)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r791799 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

2009-07-07 Thread kkolinko
Author: kkolinko
Date: Tue Jul  7 11:40:06 2009
New Revision: 791799

URL: http://svn.apache.org/viewvc?rev=791799&view=rev
Log:
Add changelog entry for Mladen's update of procrun.

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=791799&r1=791798&r2=791799&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jul  7 11:40:06 2009
@@ -178,6 +178,10 @@
   
   
 
+  
+Update Tomcat Windows service application (procrun) to version 2.0.5.
+It contains a fix for issue 41538 (mturk)
+  
   
 40786: Include 64-bit Windows service wrapper in
 distributions. Update the Windows installer to automatically use the



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r791802 - in /tomcat: build/tc5.5.x/build.xml current/tc5.5.x/STATUS.txt

2009-07-07 Thread kkolinko
Author: kkolinko
Date: Tue Jul  7 11:50:52 2009
New Revision: 791802

URL: http://svn.apache.org/viewvc?rev=791802&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47464
Do not include *.class files produced by IDE into src archives of TC 5.5
Also, I limited the scope of fixcrlf task in package-src-tgz target
to process the sources dir only.

Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/build/tc5.5.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=791802&r1=791801&r2=791802&view=diff
==
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jul  7 11:50:52 2009
@@ -1416,6 +1416,7 @@
 
 
   
+
 
 
 
@@ -1440,6 +1441,7 @@
 
 
   
+
 
 
   
@@ -1448,6 +1450,7 @@
 
 
   
+
 
 
   
@@ -1456,6 +1459,7 @@
 
 
   
+
 
 
 
@@ -1871,7 +1875,7 @@
 
   
   
-
 

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791802&r1=791801&r2=791802&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul  7 11:50:52 2009
@@ -15,7 +15,7 @@
   limitations under the License.
 

 
-$Revision$ $Date$
+$Id$
 
  =
  Apache Tomcat 5.5 Patch Proposals
@@ -96,14 +96,6 @@
   +1: kkolinko, markt, rjung
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47464
-  Do not include *.class files into src archives of TC 5.5
-  Also, I limited the scope of fixcrlf task in package-src-tgz target
-  to process the sources dir only.
-  http://people.apache.org/~kkolinko/patches/2009-07-05_tc55_packsources.patch
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
   Reverts previous fix for
   https://issues.apache.org/bugzilla/show_bug.cgi?id=37933 and implements an



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 47464] Do not include *.class files created by IDE into src archives of TC 5.5

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47464


Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
Summary|Do not include *.class  |Do not include *.class
   |files into src archives of  |files created by IDE into
   |TC 5.5  |src archives of TC 5.5




--- Comment #2 from Konstantin Kolinko   2009-07-07 
04:52:28 PST ---
Fixed. Will be OK in 5.5.28.

-- 
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: r791805 - in /tomcat: build/tc5.5.x/ connectors/trunk/coyote/ connectors/trunk/http11/ connectors/trunk/jk/ connectors/trunk/jk/jkstatus/ connectors/trunk/jni/ connectors/trunk/juli/ conne

2009-07-07 Thread kkolinko
Author: kkolinko
Date: Tue Jul  7 12:06:56 2009
New Revision: 791805

URL: http://svn.apache.org/viewvc?rev=791805&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47149
Explicitly specify encoding for the source files when compiling

Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/connectors/trunk/coyote/build.xml
tomcat/connectors/trunk/http11/build.xml
tomcat/connectors/trunk/jk/build.xml
tomcat/connectors/trunk/jk/jkstatus/build.xml
tomcat/connectors/trunk/jni/build.xml
tomcat/connectors/trunk/juli/build.xml
tomcat/connectors/trunk/util/build.xml
tomcat/container/tc5.5.x/catalina/build.xml
tomcat/container/tc5.5.x/modules/cluster/build.xml
tomcat/container/tc5.5.x/modules/groupcom/build.xml
tomcat/container/tc5.5.x/modules/groupcom/build/build.xml
tomcat/container/tc5.5.x/modules/ha/build.xml
tomcat/container/tc5.5.x/modules/storeconfig-ha/build.xml
tomcat/container/tc5.5.x/modules/storeconfig/build.xml
tomcat/container/tc5.5.x/tester/build.xml
tomcat/container/tc5.5.x/webapps/admin/build.xml
tomcat/container/tc5.5.x/webapps/balancer/build.xml
tomcat/current/tc5.5.x/STATUS.txt
tomcat/jasper/tc5.5.x/build.xml
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/build.xml
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/build.xml

Modified: tomcat/build/tc5.5.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jul  7 12:06:56 2009
@@ -454,15 +454,17 @@
  uriroot="${ROOT.base}"
  webXmlFragment="${ROOT.base}/WEB-INF/generated_web.xml"
  addWebXmlMappings="true"
- outputDir="${ROOT.base}/WEB-INF/src" />
+ outputDir="${ROOT.base}/WEB-INF/src"
+ javaEncoding="UTF-8" />
 
 
+ outputDir="${jsp-examples.base}/WEB-INF/src"
+ javaEncoding="UTF-8" />
 
 
+ outputDir="${admin.base}/WEB-INF/src/admin"
+ javaEncoding="UTF-8" />
 
 
+   excludes="**/*.smap"
+   encoding="UTF-8">
   
 
 
@@ -508,7 +512,8 @@
source="${compile.source}"
failonerror="false"
srcdir="${jsp-examples.base}/WEB-INF/src"
-   excludes="**/*.smap">
+   excludes="**/*.smap"
+   encoding="UTF-8">
   
 
 
@@ -534,7 +539,8 @@
source="${compile.source}"
failonerror="false"
srcdir="${admin.base}/WEB-INF/src"
-   excludes="**/*.smap">
+   excludes="**/*.smap"
+   encoding="UTF-8">
   
 
 
@@ -744,7 +750,8 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
sourcepath="${tomcat-dbcp.home}/src/java"
-   srcdir="src/java" >
+   srcdir="src/java"
+   encoding="ISO-8859-1">
   
 
 http://svn.apache.org/viewvc/tomcat/connectors/trunk/coyote/build.xml?rev=791805&r1=791804&r2=791805&view=diff
==
--- tomcat/connectors/trunk/coyote/build.xml (original)
+++ tomcat/connectors/trunk/coyote/build.xml Tue Jul  7 12:06:56 2009
@@ -218,7 +218,8 @@
destdir="${build.home}/classes"
  debug="${compile.debug}"
deprecation="${compile.deprecation}"
-  optimize="${compile.optimize}">
+  optimize="${compile.optimize}"
+  encoding="ISO-8859-1">
   
   
   
@@ -237,7 +238,8 @@
destdir="${build.home}/classes"
  debug="${compile.debug}"
deprecation="${compile.deprecation}"
-  optimize="${compile.optimize}">
+  optimize="${compile.optimize}"
+  encoding="ISO-8859-1">
   
   
 
@@ -262,7 +264,8 @@
destdir="${build.home}/classes"
  debug="${compile.debug}"
deprecation="${compile.deprecation}"
-  optimize="${compile.optimize}">
+  optimize="${compile.optimize}"
+  encoding="ISO-8859-1">
   
   
 
@@ -277,7 +280,8 @@
destdir="${build.home}/classes"
  debug="${compile.debug}"
deprecation="${compile.deprecation}"
-  optimize="${compile.optimize}">
+  optimize="${compile.optimize}"
+  encoding="ISO-8859-1">
   
   
 
@@ -332,7 +336,8 @@
destdir="${build.home}/tests"
  debug="${compile.debug}"
deprecation="${compile.deprecation}"
-  optimize="${compile.optimize}">
+  optimize="${compile.optimize}"
+  encoding="ISO-8859-1">
   
 
 

Modified: tomcat/connectors/trunk/http11/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/build.xml?

svn commit: r791806 - in /tomcat: build/tc5.5.x/build.xml container/tc5.5.x/build.xml container/tc5.5.x/catalina/build.xml container/tc5.5.x/tester/build.xml current/tc5.5.x/STATUS.txt jasper/tc5.5.x/

2009-07-07 Thread kkolinko
Author: kkolinko
Date: Tue Jul  7 12:11:57 2009
New Revision: 791806

URL: http://svn.apache.org/viewvc?rev=791806&view=rev
Log:
Patch for fixcrlf tasks:
 * Specify explicit encoding, instead of using the platform default one
 * Don't add blank lines to files
 * Added **/*.rtf to the list of exclusions and sorted it alphabetically.
   (We have a License.rtf file)
Note, that fixlast option for fixcrlf task is since Ant 1.6.1 only.

Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/container/tc5.5.x/build.xml
tomcat/container/tc5.5.x/catalina/build.xml
tomcat/container/tc5.5.x/tester/build.xml
tomcat/current/tc5.5.x/STATUS.txt
tomcat/jasper/tc5.5.x/build.xml

Modified: tomcat/build/tc5.5.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=791806&r1=791805&r2=791806&view=diff
==
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jul  7 12:11:57 2009
@@ -621,8 +621,10 @@
 
 
 
-
-
+
+
 
 
   
@@ -1102,8 +1104,10 @@
 
 
 
-
-
+
+
 
 
 
@@ -1371,8 +1375,10 @@
 
 
 
-
-
+
+
 
 
   
@@ -1674,8 +1680,10 @@
 
   
   
-
-
+
+
 
   
@@ -1736,8 +1744,10 @@
   
   
 
-
+includes="*.txt,LICENSE,NOTICE" eol="lf"
+encoding="ISO-8859-1" fixlast="false" />
+
 
   
@@ -1760,8 +1770,10 @@
   
   
 
-
+includes="*.txt,LICENSE,NOTICE" eol="lf"
+encoding="ISO-8859-1" fixlast="false" />
+
 
 
@@ -1784,7 +1796,8 @@
 
   
   
-
+
 
 
@@ -1807,7 +1820,8 @@
 
   
   
-
+
 
 
@@ -1847,7 +1861,8 @@
 
 
 
-
+
 
 
@@ -1883,8 +1898,9 @@
   
   
 
+
excludes="**/*.bin,**/*.bmp,**/*.dia,**/*.exe,**/*.gif,**/*.ico,**/*.jar,**/*.jpg,**/*.pdf,**/*.rtf,**/*.war"
+eol="lf"
+encoding="ISO-8859-1" fixlast="false" />
 
 

Modified: tomcat/container/tc5.5.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/build.xml?rev=791806&r1=791805&r2=791806&view=diff
==
--- tomcat/container/tc5.5.x/build.xml (original)
+++ tomcat/container/tc5.5.x/build.xml Tue Jul  7 12:11:57 2009
@@ -179,8 +179,10 @@
 
 
 
-
-
+
+
 
 
   

Modified: tomcat/container/tc5.5.x/catalina/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/build.xml?rev=791806&r1=791805&r2=791806&view=diff
==
--- tomcat/container/tc5.5.x/catalina/build.xml (original)
+++ tomcat/container/tc5.5.x/catalina/build.xml Tue Jul  7 12:11:57 2009
@@ -556,8 +556,10 @@
 
   
 
-
-
+
+
 
 
 
@@ -898,8 +900,10 @@
 
   
 
-
-
+
+
 
 
 
@@ -1180,8 +1184,10 @@
 
   
 
-
-
+
+
 
 
 

Modified: tomcat/container/tc5.5.x/tester/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/build.xml?rev=791806&r1=791805&r2=791806&view=diff
==
--- tomcat/container/tc5.5.x/tester/build.xml (original)
+++ tomcat/container/tc5.5.x/tester/build.xml Tue Jul  7 12:11:57 2009
@@ -52,8 +52,10 @@
 
   
 
-
-
+
+
 
 
   
@@ -167,8 +169,10 @@
 
   
 
-
-
+
+
 
 
   
@@ -220,8 +224,10 @@
 
   
 
-
-
+
+
 
 
 

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791806&r1=791805&r2=791806&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul  7 12:11:57 2009
@@ -75,16 +75,6 @@
   +1: markt - min JRE version is 1.4, even with the compat package
   -1:
 
-* Patch for fixcrlf tasks:
-   * Specify explicit encoding, instead of using the platform default one
-   * Don't add blank lines to files
-   * Added **/*.rtf to the list of exclusions and sorted it alphabetically.
- (We have a License.rtf file)
-  Note, that fixlast option for fixcrlf task is since Ant 1.6.1 only.
-  http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_fixcrlf.patch
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Specify explicit encoding when performing filtering in copy and replace tasks
   
http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_copy-encodings.patch
   +1: kkolinko, markt, rjung

Modified: tomcat/jasper/tc5.5.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/build.xml?rev=791806&r1=791805&r2=791806&view=diff
===

svn commit: r791810 - in /tomcat: build/tc5.5.x/ connectors/trunk/coyote/ connectors/trunk/http11/ connectors/trunk/jni/ connectors/trunk/juli/ container/tc5.5.x/catalina/ container/tc5.5.x/modules/gr

2009-07-07 Thread kkolinko
Author: kkolinko
Date: Tue Jul  7 12:17:35 2009
New Revision: 791810

URL: http://svn.apache.org/viewvc?rev=791810&view=rev
Log:
Specify explicit encoding when performing filtering in copy and replace tasks

Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/connectors/trunk/coyote/build.xml
tomcat/connectors/trunk/http11/build.xml
tomcat/connectors/trunk/jni/build.xml
tomcat/connectors/trunk/juli/build.xml
tomcat/container/tc5.5.x/catalina/build.xml
tomcat/container/tc5.5.x/modules/groupcom/build/build.xml
tomcat/current/tc5.5.x/STATUS.txt
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/build.xml
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/build.xml

Modified: tomcat/build/tc5.5.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=791810&r1=791809&r2=791810&view=diff
==
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jul  7 12:17:35 2009
@@ -730,14 +730,15 @@
 
 
 
- 
-
+
 
 
@@ -869,14 +870,14 @@
 
 
+filtering="true" encoding="ISO-8859-1" />
 
 
 
 
+filtering="true" encoding="ISO-8859-1" />
 
 
 
@@ -1007,7 +1008,10 @@
  -->
   
 
-
+
 
 
 
@@ -1296,7 +1300,7 @@
 
 
 
-
+
   
 
 
@@ -1520,7 +1524,8 @@


 
-
+
 
   
   
@@ -1544,13 +1549,16 @@
  todir="${tomcat.release}/v${version}"/>
 
+filtering="true"
+encoding="ISO-8859-1" />
 
+filtering="true"
+encoding="ISO-8859-1" />
 
+filtering="true"
+encoding="ISO-8859-1" />
 
   
 

Modified: tomcat/connectors/trunk/coyote/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/coyote/build.xml?rev=791810&r1=791809&r2=791810&view=diff
==
--- tomcat/connectors/trunk/coyote/build.xml (original)
+++ tomcat/connectors/trunk/coyote/build.xml Tue Jul  7 12:17:35 2009
@@ -205,7 +205,7 @@
   
 
-
+
   
 
   
@@ -225,7 +225,7 @@
   
   
 
-
+
   
 
   
@@ -269,7 +269,7 @@
   
   
 
-
+
   
 
   
@@ -285,7 +285,7 @@
   
   
 
-
+
   
 
   
@@ -340,7 +340,7 @@
   encoding="ISO-8859-1">
   
 
-
+
   
 
   

Modified: tomcat/connectors/trunk/http11/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/build.xml?rev=791810&r1=791809&r2=791810&view=diff
==
--- tomcat/connectors/trunk/http11/build.xml (original)
+++ tomcat/connectors/trunk/http11/build.xml Tue Jul  7 12:17:35 2009
@@ -154,7 +154,7 @@
   
 
-
+
   
 
   
@@ -189,7 +189,7 @@
   
   
 
-
+
   
 
 
@@ -220,7 +220,7 @@
   encoding="ISO-8859-1">
   
 
-
+
   
 
   

Modified: tomcat/connectors/trunk/jni/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/build.xml?rev=791810&r1=791809&r2=791810&view=diff
==
--- tomcat/connectors/trunk/jni/build.xml (original)
+++ tomcat/connectors/trunk/jni/build.xml Tue Jul  7 12:17:35 2009
@@ -158,7 +158,7 @@
 
 
 
-
+
 
 
 
@@ -174,7 +174,7 @@
 encoding="ISO-8859-1">
 
 
-
+
 
 
 
@@ -193,7 +193,7 @@
   encoding="ISO-8859-1">
   
 
-
+
   
 
   
@@ -214,7 +214,7 @@
 
 
 
-
+
 
 
 
@@ -230,7 +230,7 @@
 encoding="ISO-8859-1">
 
 
-
+
 
 
 
@@ -267,7 +267,7 @@
 
 
 
-
+
 
 
 
@@ -311,7 +311,7 @@
 
 
 
-
+
 
 
 

Modified: tomcat/connectors/trunk/juli/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/juli/build.xml?rev=791810&r1=791809&r2=791810&view=diff
==
--- tomcat/connectors/trunk/juli/build.xml (original)
+++ tomcat/connectors/trunk/juli/build.xml Tue Jul  7 12:17:35 2009
@@ -129,7 +129,7 @@
   
 
-
+
   
 
   
@@ -163,7 +163,7 @@
   encoding="ISO-8859-1">
   
 
-
+
   
 
 
@@ -190,7 +190,7 @@
   encoding="ISO-8859-1">
   

svn commit: r791819 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml

2009-07-07 Thread kkolinko
Author: kkolinko
Date: Tue Jul  7 12:53:46 2009
New Revision: 791819

URL: http://svn.apache.org/viewvc?rev=791819&view=rev
Log:
Update changelog with recently applied patches.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=791819&r1=791818&r2=791819&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jul  7 12:53:46 2009
@@ -63,6 +63,16 @@
 Update Tomcat Windows service application (procrun) to version 2.0.5.
 It contains a fix for issue 41538 (mturk)
   
+  
+47464: Some class files were accidentally included into the
+source distributions of TC 5.5.27. (kkolinko)
+  
+  
+Build scripts: Explicitly specify encoding when performing filtering
+during copy, fixcrlf or replace operations. Don't add blank lines to
+files when fixing line endings. Explicitly specify encoding when
+compiling (issue 47149). (kkolinko)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r791821 - in /tomcat: build/tc5.5.x/BUILDING.txt container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

2009-07-07 Thread kkolinko
Author: kkolinko
Date: Tue Jul  7 13:12:05 2009
New Revision: 791821

URL: http://svn.apache.org/viewvc?rev=791821&view=rev
Log:
Document minimum required Ant version to be 1.6.2.
Note, that /tomcat-doc/building.html already mentions 1.6.2,
and that e.g. rev.791806 requires Ant 1.6.1 or later

Modified:
tomcat/build/tc5.5.x/BUILDING.txt
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/build/tc5.5.x/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/BUILDING.txt?rev=791821&r1=791820&r2=791821&view=diff
==
--- tomcat/build/tc5.5.x/BUILDING.txt (original)
+++ tomcat/build/tc5.5.x/BUILDING.txt Tue Jul  7 13:12:05 2009
@@ -40,11 +40,11 @@
   into which you installed the JDK release.
 
 
-(1) Install Apache Ant 1.5.x on your computer
+(1) Install Apache Ant 1.6.2 or later on your computer
 
-* If Apache Ant 1.5.x is already installed on your computer, skip to (2).
+* If Apache Ant 1.6.2 or later is already installed on your computer, skip to 
(2).
 
-* Download a binary distribution of Ant 1.5.x from:
+* Download a binary distribution of Ant 1.6.2 or later from:
 
 http://ant.apache.org/bindownload.cgi
 
@@ -62,13 +62,13 @@
   available, which will be used to actually perform the build.
 
 
-(2) Install Subversion 1.3.x on your computer
+(2) Install Subversion 1.3.x or later on your computer
 
-* If Subversion 1.3.x is already installed on your computer, skip to (3).
+* If Subversion 1.3.x or later is already installed on your computer, skip to 
(3).
 
-* Download a binary distribution of Subversion 1.3.x from:
+* Download a binary distribution of Subversion 1.3.x or later from:
 
-http://subversion.tigris.org/project_packages.html
+http://subversion.tigris.org/getting.html
 
 * Unpack the binary distribution into a convenient location so that the
   Subversion release resides in its own directory.
@@ -143,22 +143,22 @@
 
 In addition, "ant build-depends" will build packages that 
 tomcat depends on ( commons-logging for now ), to ease fixes
-and debuging in those packages.
+and debugging in those packages.
 
 (6) Building The "compat" Package
 
 Tomcat 5.5 is designed to run on J2SE 5.0, but will run on
-J2SE versions 1.3 and 1.4 as well as long as the compatability
-package is placed in the server classpath.  See "RUNNING.txt"
-in this directory for running instructions.  To build the
-compat package, do
+J2SE version 1.4 as well as long as the compatibility package
+is placed in the server classpath.  See "RUNNING.txt" in this
+directory for running instructions.  To build the compat
+package, do
 
 cd ${tomcat.source}
 ant build-compat
 
 (7) Building the servlet and jsp API documentation
 
-The documentation can be easly rebuild, do
+The documentation can be easily rebuild, do
 cd ${tomcat.source}/build
 ant dist-javadoc
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=791821&r1=791820&r2=791821&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jul  7 13:12:05 2009
@@ -73,6 +73,9 @@
 files when fixing line endings. Explicitly specify encoding when
 compiling (issue 47149). (kkolinko)
   
+  
+Document that building Tomcat requires Ant 1.6.2 or later. (kkolinko)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791821&r1=791820&r2=791821&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul  7 13:12:05 2009
@@ -65,16 +65,6 @@
   +1: markt
   -1: 
 
-* Document minimum required Ant version to be 1.6.2, instead of 1.5.x
-  Note, that http://tomcat.apache.org/tomcat-5.5-doc/building.html already
-  mentions 1.6.2 since rev.351798, thus for more than 3.5 years.
-  (Though it is a docs patch, I think it is an important change)
-  Patch for BUILDING.txt:
-  http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_antversion.patch
-  +1: kkolinko, rjung
-  +1: markt - min JRE version is 1.4, even with the compat package
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
   Reverts previous fix for
   https://issues.apache.org/bugzilla/show_bug.cgi?id=37933 and implements an



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r791823 - in /tomcat/sandbox/tomcat-oacc/trunk: RELEASE-NOTES RUNNING.txt

2009-07-07 Thread rjung
Author: rjung
Date: Tue Jul  7 13:13:40 2009
New Revision: 791823

URL: http://svn.apache.org/viewvc?rev=791823&view=rev
Log:
Fix class name syntax in OACC docs.

Modified:
tomcat/sandbox/tomcat-oacc/trunk/RELEASE-NOTES
tomcat/sandbox/tomcat-oacc/trunk/RUNNING.txt

Modified: tomcat/sandbox/tomcat-oacc/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/RELEASE-NOTES?rev=791823&r1=791822&r2=791823&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/RELEASE-NOTES (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/RELEASE-NOTES Tue Jul  7 13:13:40 2009
@@ -44,8 +44,8 @@
 All cluster configuration options from Tomcat 5.5 should work without
 any change with OACC. You need to ensure, that you have set the
 "managerClassName" explicitely to either
-"org/apache/catalina/cluster/session/SimpleTcpReplicationManager"
-or "org/apache/catalina/cluster/session/DeltaManager".
+"org.apache.catalina.cluster.session.SimpleTcpReplicationManager"
+or "org.apache.catalina.cluster.session.DeltaManager".
 
 You don't need to uninstall Tomcat 6 default cluster if you like to
 use OACC. We don't support mixed use of OACC and Tomcat 6 default cluster

Modified: tomcat/sandbox/tomcat-oacc/trunk/RUNNING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/RUNNING.txt?rev=791823&r1=791822&r2=791823&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/RUNNING.txt (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/RUNNING.txt Tue Jul  7 13:13:40 2009
@@ -70,8 +70,8 @@
   work without any change with OACC.
 
   You need to ensure, that you have set the "managerClassName" explicitely 
to either
-  "org/apache/catalina/cluster/session/SimpleTcpReplicationManager" or
-  "org/apache/catalina/cluster/session/DeltaManager".
+  "org.apache.catalina.cluster.session.SimpleTcpReplicationManager" or
+  "org.apache.catalina.cluster.session.DeltaManager".
 
   You don't need to uninstall Tomcat 6 default cluster if you like to
   use OACC. We don't support mixed use of OACC and Tomcat 6 default cluster



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Minimum Ant version for Tomcat 5.5 (was Re: svn commit: r791159)

2009-07-07 Thread Konstantin Kolinko
2009/7/4 Konstantin Kolinko :
>> New Revision: 791159
>> URL: http://svn.apache.org/viewvc?rev=791159&view=rev
>> Log:
>> proposal
>>
>> +
>> +* Document minimum required Ant version to be 1.6.2, instead of 1.5.x
>> +  Note, that http://tomcat.apache.org/tomcat-5.5-doc/building.html already
>> +  mentions 1.6.2 since rev.351798, thus for more than 3.5 years.
>> +  (Though it is a docs patch, I think it is an important change)
>> +  Patch for BUILDING.txt:
>> +  
>> http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_antversion.patch
>> +  +1: kkolinko
>> +  -1:
>>
>
> If anybody thinks that we should support Ant 1.5.x for building TC
> 5.5, please say so.
>

Thank you for review and votes.
Applied in rev.791821.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r791829 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml

2009-07-07 Thread markt
Author: markt
Date: Tue Jul  7 13:32:45 2009
New Revision: 791829

URL: http://svn.apache.org/viewvc?rev=791829&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37984
Strip {MD5} as well as {SHA} from digested passwords

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul  7 13:32:45 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
 
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
 
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=791829&r1=791828&r2=791829&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul  7 13:32:45 2009
@@ -124,12 +124,6 @@
   +1: markt
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37984
-  Strip {MD5} as well as {SHA} from digested passwords
-  http://svn.apache.org/viewvc?rev=790405&view=rev
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47149
   Explicitly specify encoding for the source files
   http://people.apache.org/~kkolinko/patches/2009-07-04_tc6_encodings.patch

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=791829&r1=791828&r2=791829&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Jul  
7 13:32:45 2009
@@ -1206,10 +1206,10 @@
 
 boolean validated = false;
 if (hasMessageDigest()) {
-// iPlanet support if the values starts with {SHA1}
+// Some directories prefix the password with the hash type
 // The string is in a format compatible with Base64.encode not
 // the Hex encoding of the parent class.
-if (password.startsWith("{SHA}")) {
+if (password.startsWith("{MD5}") || password.startsWith("{SHA}")) {
 /* sync since super.digest() does this same thing */
 synchronized (this) {
 passw

DO NOT REPLY [Bug 37984] JNDIRealm.java not able to handle MD5 password

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=37984





--- Comment #3 from Mark Thomas   2009-07-07 06:38:16 PST ---
Fixed in 6.0.x and will be included in 6.0.21 omwards

-- 
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: r791835 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/TagLibraryInfoImpl.java java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xm

2009-07-07 Thread markt
Author: markt
Date: Tue Jul  7 13:43:58 2009
New Revision: 791835

URL: http://svn.apache.org/viewvc?rev=791835&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38897
Add uri of broken TLD to error message to help debugging

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul  7 13:43:58 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
 
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
 
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791243

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=791835&r1=791834&r2=791835&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul  7 13:43:58 2009
@@ -155,12 +155,6 @@
   +1: markt, kkolinko
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38897
-  Add uri of broken TLD to error message to help debugging
-  http://svn.apache.org/viewvc?rev=791243&view=rev
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Various script improvements (free free to vote for them individually)
   http://svn.apache.org/viewvc?rev=791326&view=rev (remove JSSE)
   http://svn.apache.org/viewvc?rev=791328&view=rev (display classpath)

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=791835&r1=791834&r2=791835&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 
Tue Jul  7 13:43:58 2009
@@ -278,11 +278,11 @@
 
 if (tlibversion == null) {
 err.jspError("jsp.error.tld.mandatory.element.missing",
-"tlib-version");
+"tlib-version", uri);
 }
 if (jspversion == null) {
 err.jspError("jsp.error.tld.mandatory.element.missing",
-"jsp-version");
+"jsp-version", uri);
 }
 
 this.tags = new Ta

DO NOT REPLY [Bug 38897] Invalid TLDs receive cryptic error

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=38897





--- Comment #8 from Mark Thomas   2009-07-07 06:44:13 PST ---
Fixed in trunk and will be in 6.0.21 onwards.

-- 
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: r791836 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-07-07 Thread markt
Author: markt
Date: Tue Jul  7 13:51:10 2009
New Revision: 791836

URL: http://svn.apache.org/viewvc?rev=791836&view=rev
Log:
Vote

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=791836&r1=791835&r2=791836&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul  7 13:51:10 2009
@@ -105,7 +105,7 @@
   http://svn.apache.org/viewvc?rev=714002&view=rev
   6.0.x version of the patch:
   http://people.apache.org/~mturk/tomcat/setAttribute1.iae.patch
-  +1: mturk, kkolinko
+  +1: mturk, kkolinko, markt
   -1:
   kkolinko: (
   o.a.c.session.ha.session.LocalString*.properties files also have this 
string.
@@ -115,7 +115,7 @@
 
 * Remove standardSession strings not used by DeltaSession
   http://svn.apache.org/viewvc?rev=791789&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158
@@ -166,6 +166,6 @@
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47478
   https://svn.apache.org/viewcvs.cgi?view=rev&rev=791524
-  +1: fhanik, rjung
+  +1: fhanik, rjung, markt
   -1: 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 38897] Invalid TLDs receive cryptic error

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=38897


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #9 from Mark Thomas   2009-07-07 07:04:25 PST ---
This has been fixed in trunk and will be included in 5.5.28 onwards.

-- 
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: r791844 - /tomcat/current/tc5.5.x/STATUS.txt

2009-07-07 Thread markt
Author: markt
Date: Tue Jul  7 14:11:07 2009
New Revision: 791844

URL: http://svn.apache.org/viewvc?rev=791844&view=rev
Log:
Remove applied patches

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791844&r1=791843&r2=791844&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul  7 14:11:07 2009
@@ -52,12 +52,6 @@
   +1: markt, kkolinko
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37984
-  Strip {MD5} as well as {SHA} from digested passwords
-  http://svn.apache.org/viewvc?rev=790405&view=rev
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38743
   Warn if the user tries to set an invalid property.
   Port of http://svn.apache.org/viewvc?view=rev&revision=565464
@@ -74,12 +68,6 @@
   +1: kkolinko (of course w/o generics, and using StringBuffer for JDK 1.4 
comp-ty)
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38897
-  Add uri of broken TLD to error message to help debugging
-  http://svn.apache.org/viewvc?rev=791243&view=rev
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Various script improvements (free free to vote for them individually)
   http://svn.apache.org/viewvc?rev=791326&view=rev (remove JSSE)
   http://svn.apache.org/viewvc?rev=791328&view=rev (display classpath)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 37984] JNDIRealm.java not able to handle MD5 password

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=37984


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #4 from Mark Thomas   2009-07-07 06:59:55 PST ---
This has been fixed in 5.5.x and will be included in 5.5.28 onwards.

-- 
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: r791839 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml

2009-07-07 Thread markt
Author: markt
Date: Tue Jul  7 13:59:39 2009
New Revision: 791839

URL: http://svn.apache.org/viewvc?rev=791839&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37984
Strip {MD5} as well as {SHA} from digested passwords

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java?rev=791839&r1=791838&r2=791839&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
 Tue Jul  7 13:59:39 2009
@@ -1179,10 +1179,10 @@
 
 boolean validated = false;
 if (hasMessageDigest()) {
-// iPlanet support if the values starts with {SHA1}
+// Some directories prefix the password with the hash type
 // The string is in a format compatible with Base64.encode not
 // the Hex encoding of the parent class.
-if (password.startsWith("{SHA}")) {
+if (password.startsWith("{MD5}") || password.startsWith("{SHA}")) {
 /* sync since super.digest() does this same thing */
 synchronized (this) {
 password = password.substring(5);

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=791839&r1=791838&r2=791839&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jul  7 13:59:39 2009
@@ -93,6 +93,10 @@
 encoding. (markt)
   
   
+37984: Strip {MD5} as well as {SHA} if present in digest
+passwords in LDAP directories. (markt)
+  
+  
 38553: A lack of certificates is normal if a user doesn't
 have a certificate. Return a 401 rather than a 400 in this case. 
(markt)
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r791840 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java jasper/tc5.5.x/src/share/org/apache/jasper/re

2009-07-07 Thread markt
Author: markt
Date: Tue Jul  7 14:04:09 2009
New Revision: 791840

URL: http://svn.apache.org/viewvc?rev=791840&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38897
Add uri of broken TLD to error message to help debugging

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java

tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=791840&r1=791839&r2=791840&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jul  7 14:04:09 2009
@@ -231,6 +231,10 @@
 security manager as required by the specification. (markt) 
   
   
+38897: Add uri of broken TLD to error message to aid
+debugging. (markt)
+  
+  
 41606: Fix double initialisation of JSPs. Patch provided by
 Chris Halstead. (markt)
   

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=791840&r1=791839&r2=791840&view=diff
==
--- 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
 (original)
+++ 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
 Tue Jul  7 14:04:09 2009
@@ -278,11 +278,11 @@
 
 if (tlibversion == null) {
 err.jspError("jsp.error.tld.mandatory.element.missing", 
- "tlib-version");
+ "tlib-version", uri);
 }
 if (jspversion == null) {
 err.jspError("jsp.error.tld.mandatory.element.missing",
- "jsp-version");
+ "jsp-version", uri);
 }
 
 this.tags = new TagInfo[tagVector.size()];

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties?rev=791840&r1=791839&r2=791840&view=diff
==
--- 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties
 (original)
+++ 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties
 Tue Jul  7 14:04:09 2009
@@ -327,7 +327,7 @@
 jsp.error.tld.fn.duplicate.name=Duplicate function name {0} in tag library {1}
 jsp.error.tld.fn.invalid.signature.commaexpected=Invalid syntax for function 
signature in TLD.  Comma ',' expected.  Tag Library: {0}, Function: {1}.
 jsp.error.tld.fn.invalid.signature.parenexpected=Invalid syntax for function 
signature in TLD.  Parenthesis '(' expected.  Tag Library: {0}, Function: {1}.
-jsp.error.tld.mandatory.element.missing=Mandatory TLD element missing or 
empty: {0}
+jsp.error.tld.mandatory.element.missing=Mandatory TLD element {0} missing or 
empty in TLD {1} 
 jsp.error.dynamic.attributes.not.implemented=The {0} tag declares that it 
accepts dynamic attributes but does not implement the required interface
 jsp.error.nomatching.fragment=Cannot find an attribute directive (with 
name={0} and fragment=true) prior to the fragment directive.
 jsp.error.attribute.noequal=equal symbol expected



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Immediately persist sessions to database

2009-07-07 Thread Mitch Claborn
I'm experimenting with writing some code to persist a session to the
database, similar to org.apache.catalina.session.PersistentManager and
org.apache.catalina.session.JDBCStore, but to store it immediately after
the end of a user request, when the session goes out of "scope".  Any
pointers on where to start?

I've played a bit with extending or replacing the above classes, but it
looks like the backgroundProcess(), which is the starting point of the
logic that persists sessions is only called every 10 seconds from the
Container.

Is there a way for a Manger to get control when a session goes out of scope?


Mitch


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r791900 - in /tomcat/trunk/java/org/apache/catalina: realm/GenericPrincipal.java realm/JAASRealm.java session/LocalStrings.properties session/StandardSession.java

2009-07-07 Thread markt
Author: markt
Date: Tue Jul  7 16:33:02 2009
New Revision: 791900

URL: http://svn.apache.org/viewvc?rev=791900&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231
The JAAS contract for LoginModule says we have to call logout(). This won't 
always work (eg if there is no session) but is a reasonable effort.

Modified:
tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=791900&r1=791899&r2=791900&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java Tue Jul  
7 16:33:02 2009
@@ -22,6 +22,9 @@
 import java.security.Principal;
 import java.util.Arrays;
 import java.util.List;
+
+import javax.security.auth.login.LoginContext;
+
 import org.apache.catalina.Realm;
 
 
@@ -83,7 +86,26 @@
  */
 public GenericPrincipal(Realm realm, String name, String password,
 List roles, Principal userPrincipal) {
-
+this(realm, name, password, roles, userPrincipal, null);
+}
+
+/**
+ * Construct a new Principal, associated with the specified Realm, for the
+ * specified username and password, with the specified role names
+ * (as Strings).
+ *
+ * @param realm The Realm that owns this principal
+ * @param name The username of the user represented by this Principal
+ * @param password Credentials used to authenticate this user
+ * @param roles List of roles (must be Strings) possessed by this user
+ * @param userPrincipal - the principal to be returned from the request 
+ *getUserPrincipal call if not null; if null, this will be returned
+ * @param loginContext  - If provided, this will be used to log out the 
user
+ *at the appropriate time
+ */
+public GenericPrincipal(Realm realm, String name, String password,
+List roles, Principal userPrincipal,
+LoginContext loginContext) {
 super();
 this.realm = realm;
 this.name = name;
@@ -95,6 +117,7 @@
 if (this.roles.length > 0)
 Arrays.sort(this.roles);
 }
+this.loginContext = loginContext;
 }
 
 
@@ -159,6 +182,17 @@
 }
 }
 
+
+/**
+ * The JAAS LoginContext, if any, used to authenticate this Principal.
+ * Kept so we can call logout().
+ */
+protected LoginContext loginContext = null;
+
+public LoginContext getLoginContext() {
+return loginContext;
+}
+
 
 // - Public Methods
 

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=791900&r1=791899&r2=791900&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Tue Jul  7 
16:33:02 2009
@@ -427,7 +427,7 @@
 log.debug(sm.getString("jaasRealm.loginContextCreated", username));
 
 // Return the appropriate Principal for this authenticated Subject
-Principal principal = createPrincipal(username, subject);
+Principal principal = createPrincipal(username, subject, loginContext);
 if (principal == null) {
 log.debug(sm.getString("jaasRealm.authenticateFailure", username));
 return (null);
@@ -488,8 +488,11 @@
  * roles, but only if their respective classes match one of the "role 
class" classes. 
  * If a user Principal cannot be constructed, return null.
  * @param subject The Subject representing the logged-in user
+ * @param loginContext Associated with th Princpal so
+ * {...@link LoginContext#logout()} can be called later
  */
-protected Principal createPrincipal(String username, Subject subject) {
+protected Principal createPrincipal(String username, Subject subject,
+LoginContext loginContext) {
 // Prepare to scan the Principals for this Subject
 
 List roles = new ArrayList();
@@ -536,7 +539,8 @@
 }
 
 // Return the resulting Principal for our authenticated user
-return new GenericPrincipal(this, username, null, roles, 
userPrincipal);
+return new GenericPrincipal(this, username, null, roles, userPrincipal,

Re: Immediately persist sessions to database

2009-07-07 Thread Rainer Jung
On 07.07.2009 18:21, Mitch Claborn wrote:
> I'm experimenting with writing some code to persist a session to the
> database, similar to org.apache.catalina.session.PersistentManager and
> org.apache.catalina.session.JDBCStore, but to store it immediately after
> the end of a user request, when the session goes out of "scope".  Any
> pointers on where to start?
> 
> I've played a bit with extending or replacing the above classes, but it
> looks like the backgroundProcess(), which is the starting point of the
> logic that persists sessions is only called every 10 seconds from the
> Container.
> 
> Is there a way for a Manger to get control when a session goes out of scope?

You could look at the ReplicationValve which is part of the cluster and
triggers replication at the end of request handling. A valve can
interfere with request processing very early and very late in the
request lifecycle and can use internal Tomcat classes (the main
difference between a valve and a filter).

Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r791911 - /tomcat/trunk/java/org/apache/juli/OneLineFormatter.java

2009-07-07 Thread fhanik
Author: fhanik
Date: Tue Jul  7 17:08:05 2009
New Revision: 791911

URL: http://svn.apache.org/viewvc?rev=791911&view=rev
Log:
Add milliseconds, seconds is not granular enough for log entries

Modified:
tomcat/trunk/java/org/apache/juli/OneLineFormatter.java

Modified: tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/OneLineFormatter.java?rev=791911&r1=791910&r2=791911&view=diff
==
--- tomcat/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/trunk/java/org/apache/juli/OneLineFormatter.java Tue Jul  7 17:08:05 
2009
@@ -47,7 +47,7 @@
 private final SimpleDateFormat monthFormatter = new SimpleDateFormat("MM");
 private final SimpleDateFormat yearFormatter = new 
SimpleDateFormat("");
 private final SimpleDateFormat timeFormatter =
-new SimpleDateFormat("HH:mm:ss");
+new SimpleDateFormat("HH:mm:ss.S");
 
 private Date currentDate;
 private String currentDateString;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r791912 - /tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java

2009-07-07 Thread fhanik
Author: fhanik
Date: Tue Jul  7 17:08:31 2009
New Revision: 791912

URL: http://svn.apache.org/viewvc?rev=791912&view=rev
Log:
When shutting down, to so immediately

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java?rev=791912&r1=791911&r2=791912&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java Tue 
Jul  7 17:08:31 2009
@@ -98,7 +98,7 @@
 public void stop() throws LifecycleException{
 lifecycle.fireLifecycleEvent(BEFORE_STOP_EVENT, null);
 lifecycle.fireLifecycleEvent(STOP_EVENT, null);
-if ( executor != null ) executor.shutdown();
+if ( executor != null ) executor.shutdownNow();
 executor = null;
 lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 39231] The JAAS contract for LoginModule is broken

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=39231





--- Comment #6 from Mark Thomas   2009-07-07 09:42:24 PST ---
I have fixed trunk and proposed the patch for 6.0.x and 5.5.x

-- 
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: r791903 - in /tomcat: current/tc5.5.x/STATUS.txt tc6.0.x/trunk/STATUS.txt

2009-07-07 Thread markt
Author: markt
Date: Tue Jul  7 16:42:05 2009
New Revision: 791903

URL: http://svn.apache.org/viewvc?rev=791903&view=rev
Log:
Propose patch for 39231

Modified:
tomcat/current/tc5.5.x/STATUS.txt
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791903&r1=791902&r2=791903&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul  7 16:42:05 2009
@@ -110,3 +110,10 @@
 (well, even now one can set CLASSPATH there, or add tools.jar to
 common.loader of catalina.properties - haven't tried the latter)
 Though we already have a switch that controlls configuration: "-security".
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231
+  http://svn.apache.org/viewvc?rev=791900&view=rev
+  JAAS LoginContext expects a call to logout()
+  +1: markt
+  -1: 
+

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=791903&r1=791902&r2=791903&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul  7 16:42:05 2009
@@ -169,3 +169,9 @@
   +1: fhanik, rjung, markt
   -1: 
   
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231
+  http://svn.apache.org/viewvc?rev=791900&view=rev
+  JAAS LoginContext expects a call to logout()
+  +1: markt
+  -1: 
+ 
\ No newline at end of file



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r791914 - in /tomcat/trunk: java/org/apache/tomcat/util/net/NioEndpoint.java java/org/apache/tomcat/util/net/SocketProperties.java webapps/docs/config/http.xml

2009-07-07 Thread fhanik
Author: fhanik
Date: Tue Jul  7 17:21:15 2009
New Revision: 791914

URL: http://svn.apache.org/viewvc?rev=791914&view=rev
Log:
Improve shutdown time for NIO connectors, to block in a minimal fashion, yet 
leave the pollers time to close out their connections

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=791914&r1=791913&r2=791914&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Jul  7 
17:21:15 2009
@@ -23,6 +23,8 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.FileChannel;
@@ -171,7 +173,10 @@
  */
 protected AtomicInteger activeSocketProcessors = new AtomicInteger(0);
 
-
+/**
+ * 
+ */
+protected volatile CountDownLatch stopLatch = null;
 
 /**
  * Cache for SocketProcessor objects
@@ -791,6 +796,7 @@
 InetSocketAddress addr = (address!=null?new 
InetSocketAddress(address,port):new InetSocketAddress(port));
 serverSock.socket().bind(addr,backlog); 
 serverSock.configureBlocking(true); //mimic APR behavior
+serverSock.socket().setSoTimeout(getSocketProperties().getSoTimeout());
 
 // Initialize thread count defaults for acceptor, poller
 if (acceptorThreadCount == 0) {
@@ -801,6 +807,7 @@
 //minimum one poller thread
 pollerThreadCount = 1;
 }
+stopLatch = new CountDownLatch(pollerThreadCount);
 
 // Initialize SSL if needed
 if (isSSLEnabled()) {
@@ -933,6 +940,7 @@
 pollers[i].destroy();
 pollers[i] = null;
 }
+try { stopLatch.await(selectorTimeout+100,TimeUnit.MILLISECONDS); 
} catch (InterruptedException ignore ) {}
 }
 eventCache.clear();
 keyCache.clear();
@@ -942,7 +950,7 @@
 if ( executor instanceof ThreadPoolExecutor ) {
 //this is our internal one, so we need to shut it down
 ThreadPoolExecutor tpe = (ThreadPoolExecutor) executor;
-tpe.shutdown();
+tpe.shutdownNow();
 TaskQueue queue = (TaskQueue) tpe.getQueue();
 queue.setParent(null);
 }
@@ -956,6 +964,9 @@
  * Deallocate NIO memory pools, and close server socket.
  */
 public void destroy() throws Exception {
+if (log.isDebugEnabled()) {
+log.debug("Destroy initiated for "+new 
InetSocketAddress(address,port));
+}
 if (running) {
 stop();
 }
@@ -967,6 +978,9 @@
 initialized = false;
 releaseCaches();
 selectorPool.close();
+if (log.isDebugEnabled()) {
+log.debug("Destroy completed for "+new 
InetSocketAddress(address,port));
+}
 }
 
 
@@ -1007,17 +1021,23 @@
  */
 protected void unlockAccept() {
 java.net.Socket s = null;
+InetSocketAddress saddr = null;
 try {
 // Need to create a connection to unlock the accept();
 if (address == null) {
-s = new java.net.Socket("127.0.0.1", port);
-s.setSoTimeout(2000);
+saddr = new InetSocketAddress("127.0.0.1", port);
 } else {
-s = new java.net.Socket(address, port);
-s.setSoTimeout(2000);
-// setting soLinger to a small value will help shutdown the
-// connection quicker
-s.setSoLinger(true, 0);
+saddr = new InetSocketAddress(address,port);
+}
+s = new java.net.Socket();
+s.setSoTimeout(getSocketProperties().getSoTimeout());
+
s.setSoLinger(getSocketProperties().getSoLingerOn(),getSocketProperties().getSoLingerTime());
+if (log.isDebugEnabled()) {
+log.debug("About to unlock socket for:"+saddr);
+}
+s.connect(saddr,getSocketProperties().getUnlockTimeout());
+if (log.isDebugEnabled()) {
+log.debug("Socket unlock completed for:"+saddr);
 }
 } catch(Exception e) {
 if (log.isDebugEnabled()) {
@@ -1177,6 +1197,8 @@
 }
 } 
 }
+}catch (SocketTimeoutException sx) {
+  

DO NOT REPLY [Bug 46085] Session are incorrectly expired due to thread unsafe code

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46085





--- Comment #5 from Daniel   2009-07-07 10:26:26 
PST ---
Hi Mark.  Thanks for the link!  I set ACTIVITY_CHECK to true and still got
random session timeouts with the IBM JVM.  Setting STRICT_SERVLET_COMPLIANCE to
true didn't change this either.  I have not seen these random session timeouts
with the Sun JVM.  My company uses the IBM JVM and the only way I got it to
work reliably was adding the synchronized keyword to StandardSession.isValid
and StandardSession.access.  Here is the JVM version info:

java version "1.5.0"
Java(TM) 2 Runtime Environment, Standard Edition (build pwi32devifx-20071025
(SR6b))
IBM J9 VM (build 2.3, J2RE 1.5.0 IBM J9 2.3 Windows XP x86-32
j9vmwi3223-20071007 (JIT enabled)
J9VM - 20071004_14218_lHdSMR
JIT  - 20070820_1846ifx1_r8
GC   - 200708_10)
JCL  - 20071025

-- 
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: r791918 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-07-07 Thread fhanik
Author: fhanik
Date: Tue Jul  7 17:45:20 2009
New Revision: 791918

URL: http://svn.apache.org/viewvc?rev=791918&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=791918&r1=791917&r2=791918&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul  7 17:45:20 2009
@@ -174,4 +174,9 @@
   JAAS LoginContext expects a call to logout()
   +1: markt
   -1: 
- 
\ No newline at end of file
+ 
+* Improve NIO connector shutdown time by doing shutdowns in parallel
+  and with a timeout
+  http://svn.apache.org/viewvc?view=rev&revision=791914
+  +1: fhanik
+  -1: 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 46085] Session are incorrectly expired due to thread unsafe code

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46085





--- Comment #6 from Mark Thomas   2009-07-07 11:12:44 PST ---
Then that looks like a bug in the IBM implementation of atomics. Maybe try
testing with a newer IBM JDK? As an aside, this looks like it belongs on the
users list rather than bugzilla.

-- 
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 39326] RMI doesn't work when unpackWars="true"

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=39326


Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||WORKSFORME




--- Comment #9 from Mark Thomas   2009-07-07 11:56:20 PST ---
I can't repeat this with the latest trunk (with a 1.6 JVM) or with the latest
5.5.x (with a 1.5 JVM).

-- 
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



Re: Immediately persist sessions to database

2009-07-07 Thread Mitch Claborn
That worked great.  Thanks.


Mitch Claborn




Rainer Jung wrote:
> On 07.07.2009 18:21, Mitch Claborn wrote:
>   
>> I'm experimenting with writing some code to persist a session to the
>> database, similar to org.apache.catalina.session.PersistentManager and
>> org.apache.catalina.session.JDBCStore, but to store it immediately after
>> the end of a user request, when the session goes out of "scope".  Any
>> pointers on where to start?
>>
>> I've played a bit with extending or replacing the above classes, but it
>> looks like the backgroundProcess(), which is the starting point of the
>> logic that persists sessions is only called every 10 seconds from the
>> Container.
>>
>> Is there a way for a Manger to get control when a session goes out of scope?
>> 
>
> You could look at the ReplicationValve which is part of the cluster and
> triggers replication at the end of request handling. A valve can
> interfere with request processing very early and very late in the
> request lifecycle and can use internal Tomcat classes (the main
> difference between a valve and a filter).
>
> Regards,
>
> Rainer
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
>   


JDBCStore save single threaded

2009-07-07 Thread Mitch Claborn
The save(Session) method in org.apache.catalina.session.JDBCStore is
single threaded, I assume because it uses a single database Connection
for the instance.  Is there any reason that I couldn't (or shouldn't)
subclass JDBStore and use a connection pool, allowing it to be
multi-threaded?


Mitch


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 39557] Include of JSP documents with custom tag libs

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=39557


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME




--- Comment #6 from Mark Thomas   2009-07-07 13:55:29 PST ---
This works for me with the latest 5.5.x code as well as trunk.

-- 
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



[Tomcat Wiki] Update of "TomcatVersions" by markt

2009-07-07 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The following page has been changed by markt:
http://wiki.apache.org/tomcat/TomcatVersions

The comment on the change is:
4.1.x has (probably) seen its last release. Process for archived code is CTR

--
  
  The way Apache is structured and governed it is impossible to say that there 
will be no further enhancements, bug fixes or releases for a given version. 
Therefore, rather than use "No" in the tables below "Highly unlikely" has been 
used. That said, highly unlikely means exactly that and users of versions that 
are highly unlikely to see another release, even for security fixes, should 
consider moving to a later version.
  
- It is anticipated that releases will be provided for a maximum of 3 major 
versions at any one time. It is currently planned that the last Tomcat 4.1.x 
release will occur no later than June 2009. However, there are currently no 
firm plans for Tomcat 7 therefore, depending on demand, Tomcat 4.1.x releases 
may continue beyond June 2009.
+ It is anticipated that releases will be provided for a maximum of 3 major 
versions at any one time.
   
  = Tomcat 3.3.x =
  ||Spec versions:||Servlet 2.2, JSP 1.1||
@@ -15, +15 @@

  ||Security Fixes:||Highly unlikely||
  ||Releases:||Highly unlikely||
  ||Release Manager:||Bill Barker (billbarker)||
- ||Process:||RTC||
+ ||Process:||CTR||
  ||Listed on download pages:||No||
  
  = Tomcat 4.1.x =
  ||Spec versions:||Servlet 2.3, JSP 1.2||
  ||Stable:||Yes||
- ||Enhancements:||Unlikely||
+ ||Enhancements:||Highly unlikely||
- ||Bug Fixes:||Unlikely||
+ ||Bug Fixes:||Highly unlikely||
- ||Security Fixes:||Yes||
- ||Releases:||As required until at least June 2009. Driven by security fixes||
+ ||Security Fixes:||Highly unlikely||
+ ||Releases:||Highly unlikely||
  ||Release Manager:||Mark Thomas (markt)||
- ||Process:||RTC||
+ ||Process:||CTR||
  ||Listed on download pages:||Yes||
  
  

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 45975] JAAS Login Module fails to load on Windows in directories with spaces in the path

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45975


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME




--- Comment #3 from Mark Thomas   2009-07-07 14:13:50 PST ---
JAAS works for me if I have a space in the install path.

It looks like a problem in how you are obtaining the path to the file. If this
is still an issue, please follow up on the users list to ensure your code is
valid. If a review there shows there is a bug, feel free to re-open this
report.

-- 
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 47053] org.apache.catalina.loader.WebAppClassLoader.getResources returns two resource URLs for identical resource when spaces exists in classpath

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47053





--- Comment #2 from Justin K   2009-07-07 21:42:33 PST 
---
Sorry, I don't have time to reproduce it at the moment. There were 3 members of
my team with exactly the same problem so it wasn't just one machine. I thought
it would be worth the bug report, but if you cannot reproduce and no one else
has the problem then I guess you can close this bug.

-- 
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 47053] org.apache.catalina.loader.WebAppClassLoader.getResources returns two resource URLs for identical resource when spaces exists in classpath

2009-07-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47053


Justin K  changed:

   What|Removed |Added

 Resolution|WORKSFORME  |WONTFIX




-- 
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