date:20100309

Author: markt
Date: Tue Mar  9 15:10:04 2010
New Revision: 920916

URL: http://svn.apache.org/viewvc?rev=920916&view=rev
Log:
* Additional fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=48668 
(kkolinko)

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/Compiler.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.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 Mar  9 15:10:04 2010
@@ -1,2 +1 @@
-/tomcat:883362
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,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,713953,714002,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,752323,753039,757335,757774,758249,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,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,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,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918594,918684,918787,918792,918799,918885
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,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,713953,714002,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,752323,753039,757335,757774,758249,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,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,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,7879

DO NOT REPLY [Bug 48668] Template text that looks like a deferred expression can be mishandled even if EL is ignored

https://issues.apache.org/bugzilla/show_bug.cgi?id=48668

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #4 from Mark Thomas  2010-03-09 15:10:23 UTC ---
Additional fixes have been applied to trunk and 6.0.x and will be included in
6.0.26 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: r920918 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

Author: kkolinko
Date: Tue Mar  9 15:17:25 2010
New Revision: 920918

URL: http://svn.apache.org/viewvc?rev=920918&view=rev
Log:
proposal

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=920918&r1=920917&r2=920918&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Mar  9 15:17:25 2010
@@ -119,3 +119,10 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=920880&view=rev
   +1: kkolinko
   -1:
+
+* Address https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
+  Improve exception processing in CustomObjectInputStream#resolveClass(),
+  to help find the cause behind BZ 48007.
+  http://svn.apache.org/viewvc?rev=920912&view=rev
+  +1: kkolinko
+  -1:

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=920918&r1=920917&r2=920918&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 15:17:25 2010
@@ -154,3 +154,10 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=920880&view=rev
   +1: kkolinko
   -1:
+
+* Address https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
+  Improve exception processing in CustomObjectInputStream#resolveClass(),
+  to help find the cause behind BZ 48007.
+  http://svn.apache.org/viewvc?rev=920912&view=rev
+  +1: kkolinko
+  -1:



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

DO NOT REPLY [Bug 48760] Tomcat breaks in serving large files (>=1.8MB) under high load and high threading.

https://issues.apache.org/bugzilla/show_bug.cgi?id=48760

--- Comment #15 from Mark Thomas  2010-03-09 15:18:42 UTC ---
Thanks for that feedback on the patch in bug 45601. That does make it more
likely the issue you are seeing is fixed by the patch in r920858 but you
obviously need to test that yourself to be 100% sure.

-- 
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: r920818 - in /tomcat/trunk/java/org/apache/catalina/realm: JNDIRealm.java LockOutRealm.java

Author: markt
Date: Tue Mar  9 12:02:43 2010
New Revision: 920818

URL: http://svn.apache.org/viewvc?rev=920818&view=rev
Log:
Eclipse warnings

Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=920818&r1=920817&r2=920818&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Mar  9 
12:02:43 2010
@@ -26,7 +26,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;

Modified: tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java?rev=920818&r1=920817&r2=920818&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java Tue Mar  9 
12:02:43 2010
@@ -91,6 +91,7 @@ public class LockOutRealm extends Combin
 // exceeds the specified size
 failedUsers = new LinkedHashMap(cacheSize, 0.75f,
 true) {
+private static final long serialVersionUID = 1L;
 @Override
 protected boolean removeEldestEntry(
 Map.Entry eldest) {



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

DO NOT REPLY [Bug 48358] JSP-unloading reloaded

https://issues.apache.org/bugzilla/show_bug.cgi?id=48358

--- Comment #8 from Marko Kitzing  2010-03-09 
15:19:44 UTC ---
(In reply to comment #1)

> - Have you tested your JSP unloading with heavy load?
> 
> Peter

We're using the patched version of tomcat for all *.lecker.de and
*.wunderweib.de domains, i.e. http://tinakochen.lecker.de.
We're talking about appr. 20Mio PI/month over all portals. Might not be heavy
load, but it's pretty high load.
The patch made operation of the portals much easier and reduced the number of
forced restarts of tomcat to one scheduled restart every night.
Prior the patch we were heading towards 10-20 restarts of each of the two load
balanced tomcats each day, resulting in temporarily unavailability of the whole
site from time to time, because both tomcats have been automaticaly restarted
in parallel ...

-- 
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: r920820 - in /tomcat/trunk/java/org/apache/catalina/realm: CombinedRealm.java DataSourceRealm.java JAASMemoryLoginModule.java JAASRealm.java JDBCRealm.java MemoryRealm.java UserDatabaseRea

Author: markt
Date: Tue Mar  9 12:08:17 2010
New Revision: 920820

URL: http://svn.apache.org/viewvc?rev=920820&view=rev
Log:
Remove unnecessary duplication

Modified:
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=920820&r1=920819&r2=920820&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Tue Mar  9 
12:08:17 2010
@@ -31,7 +31,6 @@ import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Realm;
 import org.apache.catalina.util.LifecycleBase;
-import org.apache.tomcat.util.res.StringManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
@@ -46,12 +45,6 @@ public class CombinedRealm extends Realm
 private static final Log log = LogFactory.getLog(CombinedRealm.class);
 
 /**
- * The string manager for this package.
- */
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
-
-/**
  * The list of Realms contained by this Realm.
  */
protected List realms = new LinkedList();

Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=920820&r1=920819&r2=920820&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Tue Mar  9 
12:08:17 2010
@@ -33,7 +33,6 @@ import org.apache.naming.ContextBindings
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.core.StandardServer;
 import org.apache.catalina.util.LifecycleBase;
-import org.apache.tomcat.util.res.StringManager;
 
 /**
 *
@@ -99,13 +98,6 @@ public class DataSourceRealm
 
 
 /**
- * The string manager for this package.
- */
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
-
-
-/**
  * The column in the user table that holds the user's credentials
  */
 protected String userCredCol = null;

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=920820&r1=920819&r2=920820&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Tue 
Mar  9 12:08:17 2010
@@ -36,7 +36,6 @@ import javax.security.auth.login.LoginEx
 import javax.security.auth.spi.LoginModule;
 
 import org.apache.catalina.authenticator.Constants;
-import org.apache.tomcat.util.res.StringManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.digester.Digester;
@@ -111,12 +110,6 @@ public class JAASMemoryLoginModule exten
 
 
 /**
- * The string manager for this package.
- */
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
-
-/**
  * The state information that is shared with other configured
  * LoginModule instances.
  */

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=920820&r1=920819&r2=920820&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Tue Mar  9 
12:08:17 2010
@@ -36,7 +36,6 @@ import org.apache.catalina.Container;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.authenticator.Constants;
 import org.apache.catalina.util.LifecycleBase;
-import org.apache.tomcat.util.res.StringManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
@@ -161,13 +160,6 @@ public class JAASRealm
 
 
 /**
- * The string manager for this

DO NOT REPLY [Bug 48007] ClassNotFoundException when deserializing custom object with FileStore

https://issues.apache.org/bugzilla/show_bug.cgi?id=48007

--- Comment #6 from Konstantin Kolinko  2010-03-09 
15:20:55 UTC ---
I changed exception handling in CustomObjectInputStream#resolveClass(..) in
trunk r920912 and proposed for 6.0 and 5.5.
If you will be able to reproduce this issue, please let us know.

-- 
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: svn commit: r920907 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

2010-03-09 Thread Mark Thomas


On 09/03/2010 15:10, Konstantin Kolinko wrote:

2010/3/9:

Author: markt
Date: Tue Mar  9 15:01:05 2010
New Revision: 920907

URL: http://svn.apache.org/viewvc?rev=920907&view=rev
Log:
Review feedback
1. getNameFromAttribute() returns the attribute name, not the variable name and
2. This is a translation time test so the attribute value is not known



See table Table JSP.8-4 in chapter JSP.8.5.3 the JSP 2.1 spec (page "1-183")
It says about name-from-attribute:
"The specified name is the name of an
"attribute whose (translation-time) value at of the start of the
"tag invocation will give the name of the variable."

So the attribute value must be known at translation time.
Cannot verify that without some testing, though.


I have some stand-along test cases for some of this that I'll add to 
trunk as a starting point.


Mark



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

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

Author: markt
Date: Tue Mar  9 12:34:18 2010
New Revision: 920844

URL: http://svn.apache.org/viewvc?rev=920844&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=920844&r1=920843&r2=920844&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 12:34:18 2010
@@ -147,3 +147,11 @@ PATCHES PROPOSED TO BACKPORT:
   Patch provided by 'eric'
   +1: markt, kkolinko
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48737
+  Don't assume paths that start with /META-INF/... are always in JARs. This is
+  not true for some IDEs
+  Patch provided by Fabrizio Giustina
+  http://svn.apache.org/viewvc?rev=920840&view=rev
+  +1: markt
+  -1: 



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

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

Author: markt
Date: Tue Mar  9 12:16:11 2010
New Revision: 920825

URL: http://svn.apache.org/viewvc?rev=920825&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=920825&r1=920824&r2=920825&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 12:16:11 2010
@@ -161,3 +161,9 @@ Index: java/org/apache/catalina/session/
   http://svn.apache.org/viewvc?rev=920532&view=rev
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
+  Return roles defined by both userRoleName and roleName mechanisms
+  Patch provided by 'eric'
+  +1: markt
+  -1: 



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

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

Author: kkolinko
Date: Tue Mar  9 12:33:02 2010
New Revision: 920843

URL: http://svn.apache.org/viewvc?rev=920843&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=920843&r1=920842&r2=920843&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 12:33:02 2010
@@ -145,5 +145,5 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
   Return roles defined by both userRoleName and roleName mechanisms
   Patch provided by 'eric'
-  +1: markt
+  +1: markt, kkolinko
   -1: 



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

svn commit: r920840 - /tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java

Author: markt
Date: Tue Mar  9 12:30:37 2010
New Revision: 920840

URL: http://svn.apache.org/viewvc?rev=920840&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48737
Don't assume paths that start with /META-INF/... are always in JARs. This is 
not true for some IDEs
Patch provided by Fabrizio Giustina

Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java

Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=920840&r1=920839&r2=920840&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Tue Mar  9 
12:30:37 2010
@@ -294,6 +294,9 @@ public class JspCompilationContext {
 }
 if (jarUrl != null) {
 result = new URL(jarUrl.toExternalForm() + res.substring(1));
+} else {
+// May not be in a JAR in some IDE environments
+result = context.getResource(canonicalURI(res));
 }
 } else if (res.startsWith("jar:file:")) {
 // This is a tag file packaged in a jar that is being checked



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

svn commit: r920858 - in /tomcat/trunk/java/org/apache/naming/resources: FileDirContext.java WARDirContext.java

Author: markt
Date: Tue Mar  9 13:15:15 2010
New Revision: 920858

URL: http://svn.apache.org/viewvc?rev=920858&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
Remove potential race condition that can result in multiple threads trying to 
use the same InputStream

Modified:
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java

Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=920858&r1=920857&r2=920858&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Tue Mar  
9 13:15:15 2010
@@ -892,7 +892,7 @@ public class FileDirContext extends Base
 
 
 /**
- * This specialized resource implementation avoids opening the IputStream
+ * This specialized resource implementation avoids opening the InputStream
  * to the file right away (which would put a lock on the file).
  */
 protected class FileResource extends Resource {
@@ -933,7 +933,9 @@ public class FileDirContext extends Base
 public InputStream streamContent()
 throws IOException {
 if (binaryContent == null) {
-inputStream = new FileInputStream(file);
+FileInputStream fis = new FileInputStream(file);
+inputStream = fis;
+return fis;
 }
 return super.streamContent();
 }

Modified: tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=920858&r1=920857&r2=920858&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java Tue Mar  9 
13:15:15 2010
@@ -979,7 +979,9 @@ public class WARDirContext extends BaseD
 throws IOException {
 try {
 if (binaryContent == null) {
-inputStream = base.getInputStream(entry);
+InputStream is = base.getInputStream(entry);
+inputStream = is;
+return is;
 }
 } catch (ZipException e) {
 throw new IOException(e.getMessage());



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

svn commit: r920841 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/session/LocalStrings_fr.properties

Author: kkolinko
Date: Tue Mar  9 12:31:57 2010
New Revision: 920841

URL: http://svn.apache.org/viewvc?rev=920841&view=rev
Log:
Another French translation fix

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=920841&r1=920840&r2=920841&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 12:31:57 2010
@@ -120,26 +120,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt, kkolinko
   -1: 
 
-* Another french translation problem (Submit by Henri Gomez):
-+++
-Index: java/org/apache/catalina/session/LocalStrings_fr.properties
-===
 java/org/apache/catalina/session/LocalStrings_fr.properties
(revision 920226)
-+++ java/org/apache/catalina/session/LocalStrings_fr.properties
(working copy)
-@@ -61,7 +61,8 @@
- standardSession.getValueNames.ise="getValueNames": Session d\u00e9j\u00e0 
invalid\u00e9e
- standardSession.notSerializable=Impossible de s\u00e9rialiser l''attribut de 
session {0} pour la session {1}
- standardSession.removeAttribute.ise="removeAttribute": Session d\u00e9j\u00e0 
invalid\u00e9e
--standardSession.sessionEvent=L''\u00e9couteur d''\u00e9v\u00e8nement de 
session (session event listener) a 
g\u00e9n\u00e9r\u0persistentManager.loading=Chargement de {0} sessions 
persistantes
-+standardSession.sessionEvent=L''\u00e9couteur d''\u00e9v\u00e8nement de 
session (session event listener) a g\u00e9n\u00e9r\u00e9 une exception
-+persistentManager.loading=Chargement de {0} sessions persistantes
- standardSession.setAttribute.iae="setAttribute": Attribut {0} non 
s\u00e9rialisable
- standardSession.setAttribute.ise="setAttribute": Session d\u00e9j\u00e0 
invalid\u00e9e
- standardSession.setAttribute.namenull="setAttribute": le nom de 
param\u00e8tre ne peut \u00eatre nul
-+++
-  +1: jfclere, markt, kkolinko
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
   Allow user names as well as DNs to be used with the nested role search
   Add roleNested to the docs

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties?rev=920841&r1=920840&r2=920841&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
 Tue Mar  9 12:31:57 2010
@@ -61,7 +61,8 @@ standardSession.getMaxInactiveInterval.i
 standardSession.getValueNames.ise="getValueNames": Session d\u00e9j\u00e0 
invalid\u00e9e
 standardSession.notSerializable=Impossible de s\u00e9rialiser l''attribut de 
session {0} pour la session {1}
 standardSession.removeAttribute.ise="removeAttribute": Session d\u00e9j\u00e0 
invalid\u00e9e
-standardSession.sessionEvent=L''\u00e9couteur d''\u00e9v\u00e8nement de 
session (session event listener) a 
g\u00e9n\u00e9r\u0persistentManager.loading=Chargement de {0} sessions 
persistantes
+standardSession.sessionEvent=L''\u00e9couteur d''\u00e9v\u00e8nement de 
session (session event listener) a g\u00e9n\u00e9r\u00e9 une exception
+persistentManager.loading=Chargement de {0} sessions persistantes
 standardSession.setAttribute.iae="setAttribute": Attribut {0} non 
s\u00e9rialisable
 standardSession.setAttribute.ise="setAttribute": Session d\u00e9j\u00e0 
invalid\u00e9e
 standardSession.setAttribute.namenull="setAttribute": le nom de param\u00e8tre 
ne peut \u00eatre nul



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

svn commit: r920824 - /tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java

Author: markt
Date: Tue Mar  9 12:14:23 2010
New Revision: 920824

URL: http://svn.apache.org/viewvc?rev=920824&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
Return roles defined by both userRoleName and roleName mechanisms
Patch provided by 'eric'

Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=920824&r1=920823&r2=920824&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Mar  9 
12:14:23 2010
@@ -1725,7 +1725,8 @@ public class JNDIRealm extends RealmBase
 }
 }
 
-return new ArrayList(groupMap.values());
+list.addAll(groupMap.values());
+return list;
 }
 
 



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

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

Author: kkolinko
Date: Tue Mar  9 12:45:29 2010
New Revision: 920848

URL: http://svn.apache.org/viewvc?rev=920848&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=920848&r1=920847&r2=920848&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 12:45:29 2010
@@ -153,5 +153,5 @@ PATCHES PROPOSED TO BACKPORT:
   not true for some IDEs
   Patch provided by Fabrizio Giustina
   http://svn.apache.org/viewvc?rev=920840&view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1: 



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

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

Author: kkolinko
Date: Tue Mar  9 14:19:16 2010
New Revision: 920886

URL: http://svn.apache.org/viewvc?rev=920886&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=920886&r1=920885&r2=920886&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 14:19:16 2010
@@ -140,7 +140,8 @@ PATCHES PROPOSED TO BACKPORT:
   by  - JSP.5.3
   http://svn.apache.org/viewvc?rev=920532&view=rev
   +1: markt
-  -1: 
+  -1: kkolinko: Processing of getNameFromAttribute() is wrong there. When
+   getNameFromAttribute() is used, the attribute value should give us the name.
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
   Return roles defined by both userRoleName and roleName mechanisms
@@ -159,5 +160,11 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
   Ensure multiple threads do not end up with the same InputStream
   http://svn.apache.org/viewvc?rev=920858&view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
+  Add system property to allow disabling enforcement of JSP.5.3
+  The spec recommends, but does not require this enforcement.
+  +1: kkolinko
+  -1:



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

svn commit: r920888 - /tomcat/tc5.5.x/trunk/STATUS.txt

Author: kkolinko
Date: Tue Mar  9 14:21:43 2010
New Revision: 920888

URL: http://svn.apache.org/viewvc?rev=920888&view=rev
Log:
vote and proposal

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=920888&r1=920887&r2=920888&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Mar  9 14:21:43 2010
@@ -110,5 +110,12 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
   Ensure multiple threads do not end up with the same InputStream
   http://svn.apache.org/viewvc?rev=920858&view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
+  Add system property to allow disabling enforcement of JSP.5.3
+  The spec recommends, but does not require this enforcement.
+  http://svn.apache.org/viewvc?rev=920880&view=rev
+  +1: kkolinko
+  -1:



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

Re: [VOTE] C-T-R for any translation fixes

2010-03-09 Thread Tim Funk


On 3/8/2010 2:00 PM, Konstantin Kolinko wrote:

I propose to relax our RTC policy and use CTR for the types of changes
listed below:

2010/3/8 Konstantin Kolinko:

1. We already have Commit-Then-Review for any documentation, including
JavaDoc and code comments.



Already decided. No need to vote.


+1 (Correct docs/javadocs require no RTC) Still saying +1



2. I think that we can have C-T-R for any svn metadata (svn:
properties), as those are not the code. I am +1.



Allow C-T-R for changes to svn properties:
[X] +1
[ ] 0
[ ] -1



3.

Allow C-T-R for any whitespace changes:
[X] +1
[ ] 0
[ ] -1



4.

Allow C-T-R for trivial fixes to English messages that are in resource files
and those that are inline in the code. This includes typos and rephrasing,
but does not include adding/removing message parameters.
[X] +1
[ ] 0
[ ] -1



5. Any fixes for any translations.

Allow C-T-R for any fixes for non-English resource files.
The files must use 7-bit characters only. Other symbols must be
escaped with \u, as does native2ascii.
[X] +1
[ ] 0
[ ] -1



6.

Require some indication in the commit message for code that usually is
covered by RTC, that this commit was done using C-T-R rule.
[ ] +1
[X] 0
[ ] -1



Other comments
I'm not worrying about this. If someone has the time and energy to fix 
typos, docs  - that is awesome.



-Tim

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

DO NOT REPLY [Bug 48701] jsp:getProperty broken for certain cases

https://issues.apache.org/bugzilla/show_bug.cgi?id=48701

Konstantin Kolinko  changed:

   What|Removed |Added

 CC||g.balacha...@hotmail.com

--- Comment #8 from Konstantin Kolinko  2010-03-09 
14:30:47 UTC ---
*** Bug 47822 has been marked as a duplicate of 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 47822] org.apache.jasper.JasperException: jsp:getProperty for bean with name 'data'. Name was not previously introduced as per JSP.5.3

https://issues.apache.org/bugzilla/show_bug.cgi?id=47822

--- Comment #3 from Konstantin Kolinko  2010-03-09 
14:30:47 UTC ---


*** This bug has been marked as a duplicate of bug 48701 ***

-- 
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: r920860 - in /tomcat: tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml tc6.0.x/trunk/webapps/docs/config/systemprops.xml trunk/webapps/docs/config/systemprops.xml

Author: kkolinko
Date: Tue Mar  9 13:21:30 2010
New Revision: 920860

URL: http://svn.apache.org/viewvc?rev=920860&view=rev
Log:
Correct description for STRICT_QUOTE_ESCAPING system property
C-T-R

Modified:
tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
tomcat/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml?rev=920860&r1=920859&r2=920860&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml 
(original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml Tue Mar  
9 13:21:30 2010
@@ -40,7 +40,7 @@
 

  If false the requirements for escaping quotes in JSP
-  attributes will be relaxed so that a missing required quote will not
+  attributes will be relaxed so that an unescaped quote will not
   cause an error. If not specified, the specification compliant default of
   true will be used.
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml?rev=920860&r1=920859&r2=920860&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml Tue Mar  9 
13:21:30 2010
@@ -82,7 +82,7 @@
 
 
   If false the requirements for escaping quotes in JSP
-  attributes will be relaxed so that a missing required quote will not
+  attributes will be relaxed so that an unescaped quote will not
   cause an error. If not specified, the specification compliant default of
   true will be used.
 

Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=920860&r1=920859&r2=920860&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Tue Mar  9 13:21:30 2010
@@ -93,7 +93,7 @@
 
 
   If false the requirements for escaping quotes in JSP
-  attributes will be relaxed so that a missing required quote will not
+  attributes will be relaxed so that an unescaped quote will not
   cause an error. If not specified, the specification compliant default of
   true will be used.
 



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

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

Author: markt
Date: Tue Mar  9 13:28:11 2010
New Revision: 920863

URL: http://svn.apache.org/viewvc?rev=920863&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=920863&r1=920862&r2=920863&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 13:28:11 2010
@@ -155,3 +155,9 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=920840&view=rev
   +1: markt, kkolinko
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
+  Ensure multiple threads do not end up with the same InputStream
+  http://svn.apache.org/viewvc?rev=920858&view=rev
+  +1: markt
+  -1: 



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

svn commit: r920880 - in /tomcat/trunk: java/org/apache/jasper/compiler/Generator.java webapps/docs/config/systemprops.xml

Author: kkolinko
Date: Tue Mar  9 14:04:58 2010
New Revision: 920880

URL: http://svn.apache.org/viewvc?rev=920880&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
Add a system property to allow disabling enforcement of a requirement of 
JSP.5.3.
The specification recommends, but does not require us to enforce it.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=920880&r1=920879&r2=920880&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Tue Mar  9 
14:04:58 2010
@@ -78,6 +78,15 @@ class Generator {
 private static final String VAR_INSTANCEMANAGER =
 
System.getProperty("org.apache.jasper.compiler.Generator.VAR_INSTANCEMANAGER", 
"_jsp_instancemanager");
 
+/* System property that controls if the requirement to have the object
+ * used in jsp:getProperty action to be previously "introduced"
+ * to the JSP processor (see JSP.5.3) is enforced.
+ */ 
+private static final boolean STRICT_GET_PROPERTY = Boolean.valueOf(
+System.getProperty(
+"org.apache.jasper.compiler.Generator.STRICT_GET_PROPERTY",
+"true")).booleanValue();
+
 private ServletWriter out;
 
 private ArrayList methodsBuffered;
@@ -1058,7 +1067,7 @@ class Generator {
 + ")_jspx_page_context.findAttribute("
 + "\""
 + name + "\"))." + methodName + "(;");
-} else if (varInfoNames.contains(name)) {
+} else if (!STRICT_GET_PROPERTY || varInfoNames.contains(name)) {
 // The object is a custom action with an associated
 // VariableInfo entry for this name.
 // Get the class name and then introspect at runtime.

Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=920880&r1=920879&r2=920880&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Tue Mar  9 14:04:58 2010
@@ -91,6 +91,14 @@
   be used.
 
 
+
+  If true, the requirement to have the object referenced in
+  jsp:getProperty action to be previously "introduced"
+  to the JSP processor, as specified in the chapter JSP.5.3 of JSP 2.0 and
+  later specifications, is enforced. If not specified, the specification
+  compliant default of true will be used.
+
+
 
   If false the requirements for escaping quotes in JSP
   attributes will be relaxed so that an unescaped quote will not



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

DO NOT REPLY [Bug 48879] Duplicate local variable status

https://issues.apache.org/bugzilla/show_bug.cgi?id=48879

--- Comment #1 from Konstantin Kolinko  2010-03-09 
15:33:01 UTC ---
Can you try this with (unreleased) 6.0.25?
There was a fix for 48616, which looks like this issue.

You can find the link in the thread entitled "[VOTE] Release build 6.0.25" in
the archives of the tomcat-dev list.

-- 
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 48879] Duplicate local variable status

https://issues.apache.org/bugzilla/show_bug.cgi?id=48879

André Schäfer  changed:

   What|Removed |Added

 CC||andre.schae...@namics.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

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

Author: markt
Date: Tue Mar  9 14:45:57 2010
New Revision: 920899

URL: http://svn.apache.org/viewvc?rev=920899&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=920899&r1=920898&r2=920899&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 14:45:57 2010
@@ -111,7 +111,7 @@ PATCHES PROPOSED TO BACKPORT:
   2) Fix for jasper.compiler.Validator etc.
   http://people.apache.org/~kkolinko/patches/2010-03-09_tc6_bug48668-2.patch
   (Backport of r919914,920025,920055,920596)
-  +1: kkolinko, jfclere
+  +1: kkolinko, jfclere, markt
   -1:
 
 * Improve log messages when a potential leak is detected by including the name



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

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

Author: kkolinko
Date: Tue Mar  9 14:22:44 2010
New Revision: 920891

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

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=920891&r1=920890&r2=920891&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 14:22:44 2010
@@ -166,5 +166,6 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
   Add system property to allow disabling enforcement of JSP.5.3
   The spec recommends, but does not require this enforcement.
+  http://svn.apache.org/viewvc?rev=920880&view=rev
   +1: kkolinko
   -1:



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

svn commit: r920912 - /tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java

Author: kkolinko
Date: Tue Mar  9 15:04:53 2010
New Revision: 920912

URL: http://svn.apache.org/viewvc?rev=920912&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
Improve exception processing in CustomObjectInputStream#resolveClass(),
to help find the cause behind BZ 48007.

Modified:
tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java

Modified: 
tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java?rev=920912&r1=920911&r2=920912&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java Tue 
Mar  9 15:04:53 2010
@@ -75,8 +75,14 @@ public final class CustomObjectInputStre
 try {
 return Class.forName(classDesc.getName(), false, classLoader);
 } catch (ClassNotFoundException e) {
-// Try also the superclass because of primitive types
-return super.resolveClass(classDesc);
+try {
+// Try also the superclass because of primitive types
+return super.resolveClass(classDesc);
+} catch (ClassNotFoundException e2) {
+// Rethrow original exception, as it can have more information
+// about why the class was not found. BZ 48007
+throw e;
+}
 }
 }
 



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

DO NOT REPLY [Bug 48760] Tomcat breaks in serving large files (>=1.8MB) under high load and high threading.

https://issues.apache.org/bugzilla/show_bug.cgi?id=48760

--- Comment #14 from Stefan Kendall  2010-03-09 15:12:46 
UTC ---
(In reply to comment #13)
> Based in the analysis in comment 11, I can see a couple of places where there
> is a problem. These have been fixed in trunk and the patch proposed for 6.0.x
> and 5.5.x (http://svn.apache.org/viewvc?rev=920858&view=rev)
> 
> Stefan: Are you able to confirm that using this patch rather than the one in
> bug 45601 still fixes the issue for you? I remain concerned that you may be
> seeing a different issue as I can't see a reason, apart from just altering the
> execution timing, why the bug 45601 patch should fix / work around the issue
> described in comment 11.

The fix seemed to slow the issue, but further testing indicated that this
problem was still caused with the patch in 45601. This may have been specific
to the timing of our specific system; changing code willy-nilly would alter the
frequency at which we would see issues. It's good to hear that a *true* fix has
been proposed for 5.5.x/6.0.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

DO NOT REPLY [Bug 48879] New: Duplicate local variable status

https://issues.apache.org/bugzilla/show_bug.cgi?id=48879

   Summary: Duplicate local variable status
   Product: Tomcat 6
   Version: 6.0.24
  Platform: PC
OS/Version: Windows Vista
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: andre.schae...@namics.com


Hello,

since Version 6.0.24 there is a problem with local variables called "status".
Till version 6.0.20 the code below was valid, since the latest update we get
this errors. Since the name of this local variable is defined by a 3rd party
library this is closed source to us and can not be changed.


An error occurred at line: 75 in the jsp file:
/WEB-INF/jsp/include/estate_edit_content_inc.jsp
Duplicate local variable status
72: 
73: 
74: 
75: ${status.value}
76: 
77: 
78: 

-- 
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: r920925 - /tomcat/trunk/test/webapp-3.0/bug45nnn/

Author: markt
Date: Tue Mar  9 15:36:10 2010
New Revision: 920925

URL: http://svn.apache.org/viewvc?rev=920925&view=rev
Log:
Create a directory for all the bug 45nnn JSPs to make things more manageable. 
I'll do the same for other groups of bugs as the numers grow.

Added:
tomcat/trunk/test/webapp-3.0/bug45nnn/


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

svn commit: r920926 - in /tomcat/trunk/test: org/apache/el/ org/apache/jasper/compiler/ webapp-3.0/ webapp-3.0/bug45nnn/

Author: markt
Date: Tue Mar  9 15:44:30 2010
New Revision: 920926

URL: http://svn.apache.org/viewvc?rev=920926&view=rev
Log:
Re-org some JSPs

Added:
tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015a.jsp
  - copied unchanged from r920892, 
tomcat/trunk/test/webapp-3.0/bug45015a.jsp
tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015b.jsp
  - copied unchanged from r920892, 
tomcat/trunk/test/webapp-3.0/bug45015b.jsp
tomcat/trunk/test/webapp-3.0/bug45nnn/bug45427.jsp
  - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45427.jsp
tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451.jspf
  - copied unchanged from r920892, 
tomcat/trunk/test/webapp-3.0/bug45451.jspf
tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451a.jsp
  - copied unchanged from r920892, 
tomcat/trunk/test/webapp-3.0/bug45451a.jsp
tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451b.jsp
  - copied unchanged from r920892, 
tomcat/trunk/test/webapp-3.0/bug45451b.jsp
tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451c.jsp
  - copied unchanged from r920892, 
tomcat/trunk/test/webapp-3.0/bug45451c.jsp
tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451d.jspx
  - copied unchanged from r920892, 
tomcat/trunk/test/webapp-3.0/bug45451d.jspx
tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451e.jsp
  - copied unchanged from r920892, 
tomcat/trunk/test/webapp-3.0/bug45451e.jsp
tomcat/trunk/test/webapp-3.0/bug45nnn/bug45511.jsp
  - copied unchanged from r920892, tomcat/trunk/test/webapp-3.0/bug45511.jsp
Removed:
tomcat/trunk/test/webapp-3.0/bug45015a.jsp
tomcat/trunk/test/webapp-3.0/bug45015b.jsp
tomcat/trunk/test/webapp-3.0/bug45427.jsp
tomcat/trunk/test/webapp-3.0/bug45451.jspf
tomcat/trunk/test/webapp-3.0/bug45451a.jsp
tomcat/trunk/test/webapp-3.0/bug45451b.jsp
tomcat/trunk/test/webapp-3.0/bug45451c.jsp
tomcat/trunk/test/webapp-3.0/bug45451d.jspx
tomcat/trunk/test/webapp-3.0/bug45451e.jsp
tomcat/trunk/test/webapp-3.0/bug45511.jsp
Modified:
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java

Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=920926&r1=920925&r2=920926&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Tue Mar  9 15:44:30 2010
@@ -107,7 +107,7 @@ public class TestELInJsp extends TomcatB
 tomcat.start();
 
 ByteChunk res = getUrl("http://localhost:"; + getPort() +
-"/test/bug45427.jsp");
+"/test/bug45nnn/bug45427.jsp");
 
 String result = res.toString();
 // Warning: JSP attribute escaping != Java String escaping
@@ -142,7 +142,7 @@ public class TestELInJsp extends TomcatB
 tomcat.start();
 
 ByteChunk res = getUrl("http://localhost:"; + getPort() +
-"/test/bug45451a.jsp");
+"/test/bug45nnn/bug45451a.jsp");
 
 String result = res.toString();
 // Warning: JSP attribute escaping != Java String escaping
@@ -151,7 +151,7 @@ public class TestELInJsp extends TomcatB
 assertEcho(result, "02-\\'hello world\\'");
 assertEcho(result, "03-\\'hello world\\'");
 
-res = getUrl("http://localhost:"; + getPort() + "/test/bug45451b.jsp");
+res = getUrl("http://localhost:"; + getPort() + 
"/test/bug45nnn/bug45451b.jsp");
 result = res.toString();
 // Warning: JSP attribute escaping != Java String escaping
 // Warning: Attributes are always unescaped before passing to the EL
@@ -171,7 +171,7 @@ public class TestELInJsp extends TomcatB
 assertEcho(result, "12-\\#{1+1}");
 assertEcho(result, "13-2"); 
 
-res = getUrl("http://localhost:"; + getPort() + "/test/bug45451c.jsp");
+res = getUrl("http://localhost:"; + getPort() + 
"/test/bug45nnn/bug45451c.jsp");
 result = res.toString();
 // Warning: JSP attribute escaping != Java String escaping
 // TODO - Currently we allow a single unescaped \ in attribute values
@@ -191,7 +191,7 @@ public class TestELInJsp extends TomcatB
 assertEcho(result, "12-#{1+1}");
 assertEcho(result, "13-#{1+1}");
 
-res = getUrl("http://localhost:"; + getPort() + "/test/bug45451d.jspx");
+res = getUrl("http://localhost:"; + getPort() + 
"/test/bug45nnn/bug45451d.jspx");
 result = res.toString();
 // Warning: JSP attribute escaping != Java String escaping
 // \\ Is *not* an escape sequence in XML attributes
@@ -210,7 +210,7 @@ public class TestELInJsp extends TomcatB
 assertEcho(result, "12-#{1+1}");
 assertEcho(result, "13-\\#{1+1}");
 
-res = getUrl("

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

Author: kkolinko
Date: Tue Mar  9 15:28:58 2010
New Revision: 920922

URL: http://svn.apache.org/viewvc?rev=920922&view=rev
Log:
Correct a misprint

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=920922&r1=920921&r2=920922&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Mar  9 15:28:58 2010
@@ -230,7 +230,7 @@
 48582: Avoid NPE on background compilation failure. (markt)
   
   
-48616: Don't declare or syncrhonize scripting variables for
+48616: Don't declare or synchronize scripting variables for
 JSP fragments since they are scriptless. This is an alternative fix for
 42390 that avoids both the original problem and the
 regression in the first fix. (kkolinko) 



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

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

Author: markt
Date: Tue Mar  9 15:02:32 2010
New Revision: 920909

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

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=920909&r1=920908&r2=920909&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 15:02:32 2010
@@ -139,9 +139,9 @@ PATCHES PROPOSED TO BACKPORT:
   Allow TagVariableInfo as well as VariableInfo to introduce objects later used
   by  - JSP.5.3
   http://svn.apache.org/viewvc?rev=920532&view=rev
+  http://svn.apache.org/viewvc?rev=920907&view=rev (review comment)
   +1: markt
-  -1: kkolinko: Processing of getNameFromAttribute() is wrong there. When
-   getNameFromAttribute() is used, the attribute value should give us the name.
+  -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
   Return roles defined by both userRoleName and roleName mechanisms



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

svn commit: r920929 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_26/

2010-03-09 Thread jfclere

Author: jfclere
Date: Tue Mar  9 15:46:29 2010
New Revision: 920929

URL: http://svn.apache.org/viewvc?rev=920929&view=rev
Log:
tag for release 6.0.26

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_26/   (props changed)
  - copied from r920926, tomcat/tc6.0.x/trunk/

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_26/
--
--- svn:ignore (added)
+++ svn:ignore Tue Mar  9 15:46:29 2010
@@ -0,0 +1,3 @@
+output
+.settings
+build.properties

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_26/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Mar  9 15:46:29 2010
@@ -0,0 +1 @@
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,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,713953,714002,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,752323,753039,757335,757774,758249,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,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,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,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918594,918684,918787,918792,918799,918885,919851,919914,920025,920055,920596



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

DO NOT REPLY [Bug 48737] JspCompilationContext assumes that tagfile with a path starting with META-INF are in jars without checking

https://issues.apache.org/bugzilla/show_bug.cgi?id=48737

--- Comment #1 from Mark Thomas  2010-03-09 12:34:30 UTC ---
Thanks for the patch.

This has been fixed in trunk and proposed for 6.0.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

Re: [VOTE] C-T-R for any translation fixes

2010-03-09 Thread Mark Thomas


On 08/03/2010 17:34, Konstantin Kolinko wrote:

2. I think that we can have C-T-R for any svn metadata (svn:
properties), as those are not the code. I am +1.


+1 for line endings, +0 for the rest


3. I think that we can have C-T-R for any whitespace changes in the
code. These are generally discouraged, but might be necessary to ease
backporting of patches.


+1. Only if required to ease back-porting.


4. Trivial fixes for any English message strings and message constants
in the code. I mean, inaccuracies and misprints. I am +1 for C-T-R
those.

+1


5. Any fixes for any translations.

+1 providing that native2ascii has been used


6. Should we mark C-T-R commits somehow in the commit message?
E.g. writing "C-T-R" or "trivial" in the message?

Putting CTR at the start works for me.

Mark



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

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

Author: markt
Date: Tue Mar  9 15:49:24 2010
New Revision: 920932

URL: http://svn.apache.org/viewvc?rev=920932&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=920932&r1=920931&r2=920932&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 15:49:24 2010
@@ -152,12 +152,12 @@ PATCHES PROPOSED TO BACKPORT:
   Add system property to allow disabling enforcement of JSP.5.3
   The spec recommends, but does not require this enforcement.
   http://svn.apache.org/viewvc?rev=920880&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Address https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
   Improve exception processing in CustomObjectInputStream#resolveClass(),
   to help find the cause behind BZ 48007.
   http://svn.apache.org/viewvc?rev=920912&view=rev
-  +1: kkolinko
+  +1: kkolinko, 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 48701] jsp:getProperty broken for certain cases

https://issues.apache.org/bugzilla/show_bug.cgi?id=48701

--- Comment #7 from Konstantin Kolinko  2010-03-09 
14:27:48 UTC ---
In r920880 of trunk I added a system property to allow disabling enforcement of
JSP.5.3. This is proposed for 6.0 and 5.5.

-- 
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 48760] Tomcat breaks in serving large files (>=1.8MB) under high load and high threading.

https://issues.apache.org/bugzilla/show_bug.cgi?id=48760

--- Comment #13 from Mark Thomas  2010-03-09 13:40:52 UTC ---
Based in the analysis in comment 11, I can see a couple of places where there
is a problem. These have been fixed in trunk and the patch proposed for 6.0.x
and 5.5.x (http://svn.apache.org/viewvc?rev=920858&view=rev)

Stefan: Are you able to confirm that using this patch rather than the one in
bug 45601 still fixes the issue for you? I remain concerned that you may be
seeing a different issue as I can't see a reason, apart from just altering the
execution timing, why the bug 45601 patch should fix / work around the issue
described in comment 11.

-- 
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: r920907 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

Author: markt
Date: Tue Mar  9 15:01:05 2010
New Revision: 920907

URL: http://svn.apache.org/viewvc?rev=920907&view=rev
Log:
Review feedback
1. getNameFromAttribute() returns the attribute name, not the variable name and
2. This is a translation time test so the attribute value is not known

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=920907&r1=920906&r2=920907&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Tue Mar  9 
15:01:05 2010
@@ -1725,11 +1725,10 @@ class Generator {
 for (int i = 0; i < tagInfos.length; i++) {
 TagVariableInfo tagInfo = tagInfos[i];
 if (tagInfo != null) {
-String name = tagInfo.getNameFromAttribute();
-if (name == null) {
-name = tagInfo.getNameGiven();
+String name = tagInfo.getNameGiven();
+if (name != null) {
+pageInfo.getVarInfoNames().add(name);
 }
-pageInfo.getVarInfoNames().add(name);
 }
 }
 }



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

DO NOT REPLY [Bug 48729] JNDIRealm.java not parsing roles correctly

https://issues.apache.org/bugzilla/show_bug.cgi?id=48729

--- Comment #1 from Mark Thomas  2010-03-09 12:16:37 UTC ---
Many thanks for the patch.

This has been fixed in trunk and proposed for 6.0.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

Re: tagging 6.0.26

2010-03-09 Thread Konstantin Kolinko

Do not forget to update both
version.minor
version.suffix


Best regards,
Konstantin Kolinko

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

Re: svn commit: r920907 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

2010-03-09 Thread Konstantin Kolinko

2010/3/9  :
> Author: markt
> Date: Tue Mar  9 15:01:05 2010
> New Revision: 920907
>
> URL: http://svn.apache.org/viewvc?rev=920907&view=rev
> Log:
> Review feedback
> 1. getNameFromAttribute() returns the attribute name, not the variable name 
> and
> 2. This is a translation time test so the attribute value is not known
>

See table Table JSP.8-4 in chapter JSP.8.5.3 the JSP 2.1 spec (page "1-183")
It says about name-from-attribute:
"The specified name is the name of an
"attribute whose (translation-time) value at of the start of the
"tag invocation will give the name of the variable."

So the attribute value must be known at translation time.
Cannot verify that without some testing, though.

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

Author: markt
Date: Tue Mar  9 12:01:45 2010
New Revision: 920817

URL: http://svn.apache.org/viewvc?rev=920817&view=rev
Log:
Withdraw proposal. I think the spec could stand some clarification but the 
current impl is compliant.

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=920817&r1=920816&r2=920817&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 12:01:45 2010
@@ -114,15 +114,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko
   -1:
 
-* Follow up for https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
-  Make handling of isELIgnored and isDeferredSyntaxAllowedAsLiteral consistent
-  This is *NOT* required for spec compliance
-  http://svn.apache.org/viewvc?rev=920110&view=rev
-  +1: markt, jfclere
-  -1: kkolinko: JSP 2.0 spec chapter "Backwards Compatibility with JSP 1.2" 
(page xx (20 of 478))
-  does not mention it. So I think it is against the spec. See r920055 
thread on d...@.
-  I reverted it in trunk in r920608.
-
 * Improve log messages when a potential leak is detected by including the name
   of the offending context
   http://svn.apache.org/viewvc?view=revision&revision=920298



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

svn commit: r920865 - /tomcat/tc5.5.x/trunk/STATUS.txt

Author: markt
Date: Tue Mar  9 13:28:51 2010
New Revision: 920865

URL: http://svn.apache.org/viewvc?rev=920865&view=rev
Log:
Proposal

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=920865&r1=920864&r2=920865&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Mar  9 13:28:51 2010
@@ -106,3 +106,9 @@ PATCHES PROPOSED TO BACKPORT:
   http://people.apache.org/~kkolinko/patches/2010-03-07_tc55_md5.patch
   +1: kkolinko
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
+  Ensure multiple threads do not end up with the same InputStream
+  http://svn.apache.org/viewvc?rev=920858&view=rev
+  +1: markt
+  -1: 



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

Re: tagging 6.0.26

2010-03-09 Thread Konstantin Kolinko

2010/3/9 Konstantin Kolinko :
> Do not forget to update both
> version.minor
> version.suffix

I meant
version.build
version.suffix

Best regards,
Konstantin Kolinko

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

Re: tagging 6.0.26

2010-03-09 Thread Henri Gomez

And to include french translations fixes :)

2010/3/9 Konstantin Kolinko :
> Do not forget to update both
> version.minor
> version.suffix
>
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

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

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

2010-03-09 Thread jfclere

Author: jfclere
Date: Tue Mar  9 12:54:22 2010
New Revision: 920853

URL: http://svn.apache.org/viewvc?rev=920853&view=rev
Log:
My 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=920853&r1=920852&r2=920853&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 12:54:22 2010
@@ -111,7 +111,7 @@ PATCHES PROPOSED TO BACKPORT:
   2) Fix for jasper.compiler.Validator etc.
   http://people.apache.org/~kkolinko/patches/2010-03-09_tc6_bug48668-2.patch
   (Backport of r919914,920025,920055,920596)
-  +1: kkolinko
+  +1: kkolinko, jfclere
   -1:
 
 * Improve log messages when a potential leak is detected by including the name



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

Re: tagging 6.0.26

2010-03-09 Thread jean-frederic clere

On 03/09/2010 04:58 PM, Konstantin Kolinko wrote:
> 2010/3/9 Konstantin Kolinko :
>> Do not forget to update both
>> version.minor
>> version.suffix
> 
> I meant
> version.build
> version.suffix

Yep. I will double check that.

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

Re: tagging 6.0.26

2010-03-09 Thread jean-frederic clere

On 03/09/2010 04:59 PM, Henri Gomez wrote:
> And to include french translations fixes :)

those are r920841

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

New Gump test project

2010-03-09 Thread Bill Barker

I've added a project to Gump to run the unit tests for TC 7.  If I haven't 
gotten the configuration right, it may nag for a bit until I do.  If so, 
apologies for the spam. 




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

Re: [VOTE] C-T-R for any translation fixes

2010-03-09 Thread Bill Barker

"Konstantin Kolinko" wrote in message
news:427155181003081100l7078ac60q2704f09f66040...@mail.gmail.com...

I propose to relax our RTC policy and use CTR for the types of changes
listed below:

2010/3/8 Konstantin Kolinko :

1. We already have Commit-Then-Review for any documentation, including
JavaDoc and code comments.

Already decided. No need to vote.

2. I think that we can have C-T-R for any svn metadata (svn:
properties), as those are not the code. I am +1.

Allow C-T-R for changes to svn properties:
[ ] +1
[ ] 0
[X] -1

Same concerns as Mladen

3. I think that we can have C-T-R for any whitespace changes in the
code. These are generally discouraged, but might be necessary to ease
backporting of patches.

Note, that whitespace-only changes
a) can be verified in viewvc when viewing the committed patch in
"Colored Diff" mode. E.g.,
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?r1=896544&r2=896543&pathrev=896544&diff_format=h
b) can be verified by svn diff command:

svn diff -x -w

will generate a patch ignoring all whitespace changes.
Whitespace changes can hinder applying other patches, generated before
them. As for line numbers, e.g. when deciphering stack traces, we can
always look at the SVN tags that we have from the releases.

I am +1 for C-T-R these.

Allow C-T-R for any whitespace changes:
[ ] +1
[X] 0
[ ] -1
Don't really see a use case for this, but can't come up with a reason to
oppose it either

4. Trivial fixes for any English message strings and message constants
in the code. I mean, inaccuracies and misprints. I am +1 for C-T-R
those.

Adding/removing parameters, and changing code that displays these
messages is not a trivial change.

Things to beware here are single quotes and '{}' brackets. If message
string does not have arguments, it is used as is, and those symbols
have no special meaning. If it does have arguments, those symbols
have special meaning. E.g., there will be an exception if there is
'{}' that does not contain a number and is not inside single quotes.

Allow C-T-R for trivial fixes to English messages that are in resource
files

and those that are inline in the code. This includes typos and rephrasing,
but does not include adding/removing message parameters.
Technical issues to beware are mentioned above.
[ ] +1
[X] -0
[ ] -1

Really don't like this one, since it requires more review of commits. But
again, can't find a good reason to vote -1

5. Any fixes for any translations.

I cannot review the textual part of the changes, only the technical
part, and that can be as well done looking at the commit email.

The risks here are not very high, as tomcat-i18n-*.jar files do not
contain any code in them and can be fixed without recompiling.

The technical requirement here is that
all *.properties files should contain only 7-bit characters. All
others should be \u escaped. The program to perform such
conversion is native2ascii.

For consistency, there should be end-of-line character on the last
line of the file (as native2ascii always adds it).

The specification (JavaDoc for java.util.Properties) says that the
files are technically in ISO-8859-1, but, as was discussed around a
year ago, we should not allow 8-bit characters from the upper part of
ISO-8859-1 charset. The reasons that I remember are:

1). Some IDEs (or IDE plugins) have configuration where by default
they are reading *.properties files not in ISO-8859-1, but in the
system default encoding. Thus, if the file has character from the
upper part of ISO-8859-1, they can be read incorrectly. My own story
of observing this was with the PropertiesEditor Plugin for EclipseIDE

I suppose that using system encoding by default have some meaning.
E.g. when running native2ascii before opening the file in the IDE this
setting will allow to open them correctly.

2). We had some files in ISO-8859-1, some in Windows-1252, some in
UTF-8. There should have been some reason why that happened.

That said, I am +1 for C-T-R for any translation fixes.

Allow C-T-R for any fixes for non-English resource files.
The files must use 7-bit characters only. Other symbols must be
escaped with \u, as does native2ascii.
[X] +1
[ ] 0
[ ] -1

AFAIK, we don't have any committers that speak non-European languages, and
the Japanese users will just laugh at us on the users list if we get it
wrong ;).

6. Should we mark C-T-R commits somehow in the commit message?
E.g. writing "C-T-R" or "trivial" in the message?

This is not mandatory, but I would prefer some indication in the
commit message, that it was done using CTR rule. I propose to write
"C-T-R", but I wouldn't mind if others will write just "trivial" or
something like that.

Require some indication in the commit message for code that usually is
covered by RTC, that this commit was done using C-T-R rule.
[X] +1
[ ] 0
[ ] -1

With the volume of commits getting almost up to the 4.0 development days,
I'd like a flag that says that I should review someth

[VOTE] Release build 6.0.26

2010-03-09 Thread jean-frederic clere

The candidates binaries are available here:
http://people.apache.org/~jfclere/tomcat-6/v6.0.26/

According to the release process, the 6.0.26 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[ ] Stable

Cheers

Jean-Frederic

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

Re: New Gump test project

2010-03-09 Thread Mark Thomas

On 09/03/2010 06:05, Bill Barker wrote:
> I've added a project to Gump to run the unit tests for TC 7.  If I
> haven't gotten the configuration right, it may nag for a bit until I
> do.  If so, apologies for the spam.

Cool. Many thanks.

Mark



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

Re: svn commit: r920093 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/reference/iis.xml

2010-03-09 Thread Tim Whittington

I've managed to track down a VS6 install (so old the CD was a bit marginal)
and am building now.
It confused me for a moment until I realised you'd already patched the
broken functions :)

One thing I noticed is that VS6 can't read the .dsp and .dsw files currently
in SVN, so I'm currently only doing cmdline builds.

cheers
tim

On Mon, Mar 8, 2010 at 9:37 PM, Mladen Turk  wrote:

> On 03/08/2010 08:57 AM, Tim Whittington wrote:
>
>> Thanks
>>
>> I'm trying to track down a VC6 install so I can test the .dsp build before
>> I
>> commit.
>> Maybe a move to VC2003 as a minimum might be in order some day.
>>
>>
> We just need MSVCRT, and the functions you've added are
> Microsoft vision of POSIX functionality.
>
> We'll switch when httpd switches version.
>
>
>
> Regards
> --
> ^TM
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: svn commit: r920093 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/reference/iis.xml

2010-03-09 Thread Mladen Turk


On 03/09/2010 08:58 PM, Tim Whittington wrote:

I've managed to track down a VS6 install (so old the CD was a bit marginal)
and am building now.


You will need Platform SDK as well.
Windows 2003R2 SDK is the one that has needed compilers for
amd64 and ia64 and depend only on MSVCRT.

When building x86 binaries, make sure PSDK dirs are included before MSVC6.




One thing I noticed is that VS6 can't read the .dsp and .dsw files currently
in SVN, so I'm currently only doing cmdline builds.



Check line endings. They must be CRLF

Cheers
--
^TM

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

svn commit: r921110 - in /tomcat/trunk: java/org/apache/naming/resources/ test/org/apache/naming/ test/org/apache/naming/resources/

Author: markt
Date: Tue Mar  9 20:33:27 2010
New Revision: 921110

URL: http://svn.apache.org/viewvc?rev=921110&view=rev
Log:
Make StandardContext aliases work with ServletContext.getResourcePaths()

Added:
tomcat/trunk/test/org/apache/naming/
tomcat/trunk/test/org/apache/naming/resources/
tomcat/trunk/test/org/apache/naming/resources/TestBaseDirContext.java   
(with props)
Modified:
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java

Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=921110&r1=921109&r2=921110&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Tue Mar  
9 20:33:27 2010
@@ -366,7 +366,7 @@ public abstract class BaseDirContext imp
  * @return the object bound to name
  * @exception NamingException if a naming exception is encountered
  */
-public Object lookup(Name name)
+public final Object lookup(Name name)
 throws NamingException {
 return lookup(name.toString());
 }
@@ -566,7 +566,7 @@ public abstract class BaseDirContext imp
  * Each element of the enumeration is of type Binding.
  * @exception NamingException if a naming exception is encountered
  */
-public NamingEnumeration listBindings(Name name)
+public final NamingEnumeration listBindings(Name name)
 throws NamingException {
 return listBindings(name.toString());
 }
@@ -581,8 +581,16 @@ public abstract class BaseDirContext imp
  * Each element of the enumeration is of type Binding.
  * @exception NamingException if a naming exception is encountered
  */
-public abstract NamingEnumeration listBindings(String name)
-throws NamingException;
+public final NamingEnumeration listBindings(String name)
+throws NamingException {
+if (!aliases.isEmpty()) {
+AliasResult result = findAlias(name);
+if (result.dirContext != null) {
+return result.dirContext.listBindings(result.aliasName);
+}
+}
+return doListBindings(name);
+}
 
 
 /**
@@ -1365,6 +1373,9 @@ public abstract class BaseDirContext imp
 
 protected abstract Object doLookup(String name) throws NamingException;
 
+protected abstract NamingEnumeration doListBindings(String name)
+throws NamingException;
+
 protected abstract String doGetRealPath(String name);
 
 //  Private Methods

Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=921110&r1=921109&r2=921110&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Tue Mar  
9 20:33:27 2010
@@ -320,7 +320,7 @@ public class FileDirContext extends Base
  * @exception NamingException if a naming exception is encountered
  */
 @Override
-public NamingEnumeration listBindings(String name)
+protected NamingEnumeration doListBindings(String name)
 throws NamingException {
 
 File file = file(name);

Modified: tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=921110&r1=921109&r2=921110&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java Tue Mar  9 
20:33:27 2010
@@ -187,30 +187,16 @@ public class WARDirContext extends BaseD
 /**
  * Retrieves the named object.
  * 
- * @param name the name of the object to look up
+ * @param strName the name of the object to look up
  * @return the object bound to name
  * @exception NamingException if a naming exception is encountered
  */
 @Override
-protected Object doLookup(String name)
+protected Object doLookup(String strName)
 throws NamingException {
-return lookup(new CompositeName(name));
-}
 
+Name name = new CompositeName(strName);
 
-/**
- * Retrieves the named object. If name is empty, returns a new instance 
- * of this context (which represents the same naming context as this 
- * context, but its environment ma

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

Author: markt
Date: Tue Mar  9 20:45:40 2010
New Revision: 921114

URL: http://svn.apache.org/viewvc?rev=921114&view=rev
Log:
This needs further work and some test cases

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=921114&r1=921113&r2=921114&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 20:45:40 2010
@@ -120,14 +120,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt, kkolinko
   -1: 
 
-* Revisit https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
-  Allow TagVariableInfo as well as VariableInfo to introduce objects later used
-  by  - JSP.5.3
-  http://svn.apache.org/viewvc?rev=920532&view=rev
-  http://svn.apache.org/viewvc?rev=920907&view=rev (review comment)
-  +1: markt
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
   Return roles defined by both userRoleName and roleName mechanisms
   Patch provided by 'eric'



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

svn commit: r921118 - /tomcat/jk/trunk/native/common/jk_global.h

2010-03-09 Thread timw

Author: timw
Date: Tue Mar  9 20:50:37 2010
New Revision: 921118

URL: http://svn.apache.org/viewvc?rev=921118&view=rev
Log:
Fixing build on Visual Studio 2008 - ordering of mstcpip.h and ws2tcpip.h 
includes is important.

Modified:
tomcat/jk/trunk/native/common/jk_global.h

Modified: tomcat/jk/trunk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=921118&r1=921117&r2=921118&view=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Tue Mar  9 20:50:37 2010
@@ -116,8 +116,8 @@ extern char *strdup(const char *str);
  */
 #include 
 #include 
-#include 
 #include 
+#include 
 #endif /* _WINDOWS_ */
 #ifdef _WINDOWS_
 #ifndef SIO_RCVALL



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

svn commit: r921121 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

2010-03-09 Thread timw

Author: timw
Date: Tue Mar  9 20:52:27 2010
New Revision: 921121

URL: http://svn.apache.org/viewvc?rev=921121&view=rev
Log:
Reverting http://svn.apache.org/viewvc?rev=920281&view=rev to avoid infinite 
recursion on log rotation.

Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=921121&r1=921120&r2=921121&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Mar  9 20:52:27 2010
@@ -2445,7 +2445,9 @@ static int init_logger(int rotate, jk_lo
 
 /* Close the current log file if required, and the effective log file name 
has changed */
 if (log_open && strncmp(log_file_name, log_file_effective, 
strlen(log_file_name)) != 0) {
-jk_log(logger, JK_LOG_INFO, "Log rotated to %s", log_file_name);
+FILE* lf = ((jk_file_logger_t* )logger->logger_private)->logfile;
+fprintf(lf, "Log rotated to %s\r\n", log_file_name);
+fflush(lf);
 rc = jk_close_file_logger(&logger);
 log_open = JK_FALSE;
 }



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

svn commit: r921144 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

Author: markt
Date: Tue Mar  9 21:51:18 2010
New Revision: 921144

URL: http://svn.apache.org/viewvc?rev=921144&view=rev
Log:
Complete fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48701

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=921144&r1=921143&r2=921144&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Tue Mar  9 
21:51:18 2010
@@ -1726,9 +1726,12 @@ class Generator {
 TagVariableInfo tagInfo = tagInfos[i];
 if (tagInfo != null) {
 String name = tagInfo.getNameGiven();
-if (name != null) {
-pageInfo.getVarInfoNames().add(name);
+if (name == null) {
+String nameFromAttribute =
+tagInfo.getNameFromAttribute();
+name = n.getAttributeValue(nameFromAttribute);
 }
+pageInfo.getVarInfoNames().add(name);
 }
 }
 }



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

svn commit: r921145 - in /tomcat/trunk/test: org/apache/jasper/compiler/ webapp-3.0/ webapp-3.0/WEB-INF/

Author: markt
Date: Tue Mar  9 21:51:46 2010
New Revision: 921145

URL: http://svn.apache.org/viewvc?rev=921145&view=rev
Log:
Bug 48701 test cases

Added:
tomcat/trunk/test/webapp-3.0/bug48701-TVI-NFA.jsp   (with props)
tomcat/trunk/test/webapp-3.0/bug48701-TVI-NG.jsp   (with props)
tomcat/trunk/test/webapp-3.0/bug48701-UseBean.jsp   (with props)
tomcat/trunk/test/webapp-3.0/bug48701-VI.jsp   (with props)
tomcat/trunk/test/webapp-3.0/bug48701-fail.jsp   (with props)
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java?rev=921145&r1=921144&r2=921145&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java Tue Mar  9 
21:51:46 2010
@@ -19,7 +19,15 @@ package org.apache.jasper.compiler;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Date;
 
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagData;
+import javax.servlet.jsp.tagext.TagExtraInfo;
+import javax.servlet.jsp.tagext.TagSupport;
+import javax.servlet.jsp.tagext.VariableInfo;
+
+import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
@@ -75,6 +83,114 @@ public class TestGenerator extends Tomca
 assertNotNull(e);
 }
 
+public void testBug48701Fail() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = 
+new File("test/webapp-3.0");
+// app dir is relative to server home
+StandardContext ctxt = (StandardContext) tomcat.addWebapp(null,
+"/test", appDir.getAbsolutePath());
+
+// This test needs the JSTL libraries
+File lib = new File("webapps/examples/WEB-INF/lib");
+ctxt.setAliases("/WEB-INF/lib=" + lib.getCanonicalPath());
+
+tomcat.start();
+
+Exception e = null;
+try {
+getUrl("http://localhost:"; + getPort() + 
"/test/bug48701-fail.jsp");
+} catch (IOException ioe) {
+e = ioe;
+}
+
+// Failure is expected
+assertNotNull(e);
+}
+
+public void testBug48701UseBean() throws Exception {
+testBug48701("bug48701-UseBean.jsp");
+}
+
+public void testBug48701VariableInfo() throws Exception {
+testBug48701("bug48701-VI.jsp");
+}
+
+public void testBug48701TagVariableInfoNameGiven() throws Exception {
+testBug48701("bug48701-TVI-NG.jsp");
+}
+
+public void testBug48701TagVariableInfoNameFromAttribute() throws 
Exception {
+testBug48701("bug48701-TVI-NFA.jsp");
+}
+
+private void testBug48701(String jsp) throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = 
+new File("test/webapp-3.0");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/" + jsp);
+
+String result = res.toString();
+assertEcho(result, "00-PASS");
+}
+
+public static class Bug48701 extends TagSupport {
+
+private static final long serialVersionUID = 1L;
+
+private String beanName = null;
+
+public void setBeanName(String beanName) {
+this.beanName = beanName;
+}
+
+public String getBeanName() {
+return beanName;
+}
+
+@Override
+public int doStartTag() throws JspException {
+Bean bean = new Bean();
+bean.setTime((new Date()).toString());
+pageContext.setAttribute("now", bean);
+return super.doStartTag();
+}
+
+
+}
+
+public static class Bug48701TEI extends TagExtraInfo {
+
+@Override
+public VariableInfo[] getVariableInfo(TagData data) {
+return new VariableInfo[] {
+new VariableInfo("now", Bean.class.getCanonicalName(),
+true, VariableInfo.AT_END)
+};
+}
+
+}
+
+public static class Bean {
+private String time;
+
+public void setTime(String time) {
+this.time = time;
+}
+
+public String getTime() {
+return time;
+}
+}
+
 /** Assertion for text printed by tags:echo */
 private static void assertEcho(String result, String expected) {
 assertTrue(result.inde

svn commit: r921147 - /tomcat/trunk/test/webapp-3.0/bug48nnn/

Author: markt
Date: Tue Mar  9 21:52:26 2010
New Revision: 921147

URL: http://svn.apache.org/viewvc?rev=921147&view=rev
Log:
Too many 48nnn bugs in context root

Added:
tomcat/trunk/test/webapp-3.0/bug48nnn/


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

svn commit: r921150 - in /tomcat/trunk/test: org/apache/el/ org/apache/jasper/compiler/ webapp-3.0/ webapp-3.0/bug48nnn/

Author: markt
Date: Tue Mar  9 21:56:36 2010
New Revision: 921150

URL: http://svn.apache.org/viewvc?rev=921150&view=rev
Log:
Move the 48nnn bugs

Added:
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48112.jsp
  - copied unchanged from r921108, tomcat/trunk/test/webapp-3.0/bug48112.jsp
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48616.jsp
  - copied unchanged from r921108, tomcat/trunk/test/webapp-3.0/bug48616.jsp
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48616b.jsp
  - copied unchanged from r921108, 
tomcat/trunk/test/webapp-3.0/bug48616b.jsp
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48627.jsp
  - copied unchanged from r921108, tomcat/trunk/test/webapp-3.0/bug48627.jsp
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48668a.jsp
  - copied unchanged from r921108, 
tomcat/trunk/test/webapp-3.0/bug48668a.jsp
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48668b.jsp
  - copied unchanged from r921108, 
tomcat/trunk/test/webapp-3.0/bug48668b.jsp
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48701-TVI-NFA.jsp
  - copied unchanged from r921145, 
tomcat/trunk/test/webapp-3.0/bug48701-TVI-NFA.jsp
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48701-TVI-NG.jsp
  - copied unchanged from r921145, 
tomcat/trunk/test/webapp-3.0/bug48701-TVI-NG.jsp
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48701-UseBean.jsp
  - copied unchanged from r921145, 
tomcat/trunk/test/webapp-3.0/bug48701-UseBean.jsp
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48701-VI.jsp
  - copied unchanged from r921145, 
tomcat/trunk/test/webapp-3.0/bug48701-VI.jsp
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48701-fail.jsp
  - copied unchanged from r921145, 
tomcat/trunk/test/webapp-3.0/bug48701-fail.jsp
tomcat/trunk/test/webapp-3.0/bug48nnn/bug48827.jspx
  - copied unchanged from r921108, 
tomcat/trunk/test/webapp-3.0/bug48827.jspx
Removed:
tomcat/trunk/test/webapp-3.0/bug48112.jsp
tomcat/trunk/test/webapp-3.0/bug48616.jsp
tomcat/trunk/test/webapp-3.0/bug48616b.jsp
tomcat/trunk/test/webapp-3.0/bug48627.jsp
tomcat/trunk/test/webapp-3.0/bug48668a.jsp
tomcat/trunk/test/webapp-3.0/bug48668b.jsp
tomcat/trunk/test/webapp-3.0/bug48701-TVI-NFA.jsp
tomcat/trunk/test/webapp-3.0/bug48701-TVI-NG.jsp
tomcat/trunk/test/webapp-3.0/bug48701-UseBean.jsp
tomcat/trunk/test/webapp-3.0/bug48701-VI.jsp
tomcat/trunk/test/webapp-3.0/bug48701-fail.jsp
tomcat/trunk/test/webapp-3.0/bug48827.jspx
Modified:
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java

Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=921150&r1=921149&r2=921150&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Tue Mar  9 21:56:36 2010
@@ -304,7 +304,7 @@ public class TestELInJsp extends TomcatB
 tomcat.start();
 
 ByteChunk res = getUrl("http://localhost:"; + getPort() +
-"/test/bug48112.jsp");
+"/test/bug48nnn/bug48112.jsp");
 String result = res.toString();
 assertEcho(result, "{OK}");
 }

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java?rev=921150&r1=921149&r2=921150&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java Tue Mar  9 
21:56:36 2010
@@ -100,7 +100,7 @@ public class TestGenerator extends Tomca
 
 Exception e = null;
 try {
-getUrl("http://localhost:"; + getPort() + 
"/test/bug48701-fail.jsp");
+getUrl("http://localhost:"; + getPort() + 
"/test/bug48nnn/bug48701-fail.jsp");
 } catch (IOException ioe) {
 e = ioe;
 }
@@ -110,19 +110,19 @@ public class TestGenerator extends Tomca
 }
 
 public void testBug48701UseBean() throws Exception {
-testBug48701("bug48701-UseBean.jsp");
+testBug48701("bug48nnn/bug48701-UseBean.jsp");
 }
 
 public void testBug48701VariableInfo() throws Exception {
-testBug48701("bug48701-VI.jsp");
+testBug48701("bug48nnn/bug48701-VI.jsp");
 }
 
 public void testBug48701TagVariableInfoNameGiven() throws Exception {
-testBug48701("bug48701-TVI-NG.jsp");
+testBug48701("bug48nnn/bug48701-TVI-NG.jsp");
 }
 
 public void testBug48701

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

Author: markt
Date: Tue Mar  9 22:00:02 2010
New Revision: 921154

URL: http://svn.apache.org/viewvc?rev=921154&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=921154&r1=921153&r2=921154&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 22:00:02 2010
@@ -153,3 +153,9 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=920912&view=rev
   +1: kkolinko, markt
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
+  Tag account of TagVariableInfo when implementing the rules of JSP.5.3
+  http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch
+  +1: markt
+  -1: 



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

svn commit: r921166 - in /tomcat/trunk/java/org/apache/catalina: ha/session/DeltaManager.java session/ManagerBase.java

Author: markt
Date: Tue Mar  9 22:19:44 2010
New Revision: 921166

URL: http://svn.apache.org/viewvc?rev=921166&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48790
Make maxActive thread safe. Technically a bug but seems like overkill.

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=921166&r1=921165&r2=921166&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue Mar  
9 22:19:44 2010
@@ -1160,7 +1160,7 @@ public class DeltaManager extends Cluste
 rejectedSessions = 0 ;
 sessionReplaceCounter = 0 ;
 counterNoStateTransfered = 0 ;
-maxActive = getActiveSessions() ;
+setMaxActive(getActiveSessions());
 sessionCounter = getActiveSessions() ;
 counterReceive_EVT_ALL_SESSION_DATA = 0;
 counterReceive_EVT_GET_ALL_SESSIONS = 0;

Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=921166&r1=921165&r2=921166&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Tue Mar  9 
22:19:44 2010
@@ -37,6 +37,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import javax.management.MBeanRegistration;
 import javax.management.MBeanServer;
@@ -184,6 +186,7 @@ public abstract class ManagerBase extend
 protected int sessionCounter=0;
 
 protected int maxActive=0;
+private final ReadWriteLock maxActiveLock = new ReentrantReadWriteLock();
 
 // number of duplicated session ids - anything >0 means we have problems
 protected int duplicates=0;
@@ -764,8 +767,17 @@ public abstract class ManagerBase extend
 
 sessions.put(session.getIdInternal(), session);
 int size = sessions.size();
-if( size > maxActive ) {
-maxActive = size;
+
+maxActiveLock.readLock().lock();
+if (size > maxActive) {
+maxActiveLock.readLock().unlock();
+maxActiveLock.writeLock().lock();
+if (size > maxActive) {
+maxActive = size;
+}
+maxActiveLock.writeLock().unlock();
+} else {
+maxActiveLock.readLock().unlock();
 }
 }
 
@@ -1076,12 +1088,17 @@ public abstract class ManagerBase extend
  * @return The highest number of concurrent active sessions
  */
 public int getMaxActive() {
-return maxActive;
+maxActiveLock.readLock().lock();
+int result = maxActive;
+maxActiveLock.readLock().unlock();
+return result;
 }
 
 
 public void setMaxActive(int maxActive) {
+maxActiveLock.writeLock().lock();
 this.maxActive = maxActive;
+maxActiveLock.writeLock().unlock();
 }
 
 



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

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

Author: markt
Date: Tue Mar  9 22:21:46 2010
New Revision: 921167

URL: http://svn.apache.org/viewvc?rev=921167&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=921167&r1=921166&r2=921167&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar  9 22:21:46 2010
@@ -159,3 +159,10 @@ PATCHES PROPOSED TO BACKPORT:
   http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48790
+  Make maxActive thread safe. I almost marked this as WONTFIX. Only the fact
+  that it is, technically, a bug stopped me.
+  http://svn.apache.org/viewvc?rev=921166&view=rev
+  +1: 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 48790] Race condition in org.apache.catalina.session.ManagerBase:maxActive

https://issues.apache.org/bugzilla/show_bug.cgi?id=48790

--- Comment #1 from Mark Thomas  2010-03-09 22:23:07 UTC ---
Fixed in trunk and proposed for 6.0.x.

I came very close to marking this as WONTFIX because I don't think the thread
safety issues are going to cause any harm.

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

Author: markt
Date: Tue Mar  9 22:32:42 2010
New Revision: 921175

URL: http://svn.apache.org/viewvc?rev=921175&view=rev
Log:
Votes and proposal

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=921175&r1=921174&r2=921175&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Mar  9 22:32:42 2010
@@ -104,7 +104,7 @@ PATCHES PROPOSED TO BACKPORT:
   (Remove linewrap between checksum and filename that occurs there with
   ANT 1.7+)
   http://people.apache.org/~kkolinko/patches/2010-03-07_tc55_md5.patch
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
@@ -117,12 +117,18 @@ PATCHES PROPOSED TO BACKPORT:
   Add system property to allow disabling enforcement of JSP.5.3
   The spec recommends, but does not require this enforcement.
   http://svn.apache.org/viewvc?rev=920880&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Address https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
   Improve exception processing in CustomObjectInputStream#resolveClass(),
   to help find the cause behind BZ 48007.
   http://svn.apache.org/viewvc?rev=920912&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
+  Tag account of TagVariableInfo when implementing the rules of JSP.5.3
+  http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch
+  +1: markt
+  -1: 



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

svn commit: r921178 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/core/NamingContextListener.java container/webapps/docs/changelog.xml

Author: markt
Date: Tue Mar  9 22:37:01 2010
New Revision: 921178

URL: http://svn.apache.org/viewvc?rev=921178&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997
Process changes for all naming contexts, not just the global one

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

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=921178&r1=921177&r2=921178&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Mar  9 22:37:01 2010
@@ -66,12 +66,6 @@ PATCHES PROPOSED TO BACKPORT:
  kkolinko - Just a note: This issue won't affect configurations where 
Jasper
  runs with development=false.
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997
-  Process changes for all naming contexts, not just the global one
-  http://svn.apache.org/viewvc?rev=883134&view=rev
-  +1: markt, rjung, kkolinko
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48179
   Improve processing of TLD cache file
   https://issues.apache.org/bugzilla/attachment.cgi?id=24918

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/NamingContextListener.java?rev=921178&r1=921177&r2=921178&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
 Tue Mar  9 22:37:01 2010
@@ -223,6 +223,8 @@ public class NamingContextListener
 (sm.getString("naming.namingContextCreationFailed", e));
 }
 
+namingResources.addPropertyChangeListener(this);
+
 // Binding the naming context to the class loader
 if (container instanceof Context) {
 // Setting the context in read only mode
@@ -237,7 +239,6 @@ public class NamingContextListener
 }
 
 if (container instanceof Server) {
-namingResources.addPropertyChangeListener(this);
 org.apache.naming.factory.ResourceLinkFactory.setGlobalContext
 (namingContext);
 try {
@@ -416,9 +417,7 @@ public class NamingContextListener
 
 
 /**
- * Process property change events.  Currently, only listens to such events
- * on the NamingResources instance for the global naming
- * resources.
+ * Process property change events.
  *
  * @param event The property change event that has occurred
  */
@@ -449,7 +448,7 @@ public class NamingContextListener
 
 
 /**
- * Process a property change on the global naming resources, by making the
+ * Process a property change on the naming resources, by making the
  * corresponding addition or removal to the associated JNDI context.
  *
  * @param name Property name of the change to be processed
@@ -460,9 +459,6 @@ public class NamingContextListener
   Object oldValue,
   Object newValue) {
 
-// NOTE - It seems that the Context for global JNDI resources
-// is left in read-write mode, so we do not have to change it here
-
 if (name.equals("ejb")) {
 if (oldValue != null) {
 ContextEjb ejb = (ContextEjb) oldValue;

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=921178&r1=921177&r2=921178&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Mar  9 
22:37:01 2010
@@ -130,6 +130,11 @@
 with RFC2616. (markt/kkolinko)
   
   
+47997: Enable the NamingResourcesMBean to work with
+non-Server (i.e. Context) containers. Patch provided by Michael Allman.
+(markt)
+  
+  
 48004: Allow applications to set the Server header. (markt)
   
   



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

DO NOT REPLY [Bug 47997] NamingContextListener fails to add itself as a PropertyChangeListener to all namingResources

https://issues.apache.org/bugzilla/show_bug.cgi?id=47997

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #5 from Mark Thomas  2010-03-09 22:37:31 UTC ---
The patch has been applied to 5.5.x and will be included in 5.5.29 onwards.
Again, thanks for the patch.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r921191 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

Author: kkolinko
Date: Wed Mar 10 00:21:47 2010
New Revision: 921191

URL: http://svn.apache.org/viewvc?rev=921191&view=rev
Log:
vote

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=921191&r1=921190&r2=921191&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 10 00:21:47 2010
@@ -124,5 +124,5 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
   Tag account of TagVariableInfo when implementing the rules of JSP.5.3
   http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch
-  +1: markt
+  +1: markt, kkolinko
   -1: 

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=921191&r1=921190&r2=921191&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar 10 00:21:47 2010
@@ -157,7 +157,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
   Tag account of TagVariableInfo when implementing the rules of JSP.5.3
   http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch
-  +1: markt
+  +1: markt, kkolinko
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48790



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

Re: svn commit: r920093 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/reference/iis.xml

2010-03-09 Thread Tim Whittington

>
> When building x86 binaries, make sure PSDK dirs are included before MSVC6.
>
>
Why does this make a difference?


>
>

>
>> One thing I noticed is that VS6 can't read the .dsp and .dsw files
>> currently
>> in SVN, so I'm currently only doing cmdline builds.
>>
>>
> Check line endings. They must be CRLF
>
>
Bingo. Thanks (the files were accessed from an OS X host from an XP VM :)

DO NOT REPLY [Bug 48790] Race condition in org.apache.catalina.session.ManagerBase:maxActive

https://issues.apache.org/bugzilla/show_bug.cgi?id=48790

--- Comment #2 from Yao Qi  2010-03-10 01:22:50 UTC ---
(In reply to comment #1)
> Fixed in trunk and proposed for 6.0.x.
> 

I'll go to trunk and have a look.

> I came very close to marking this as WONTFIX because I don't think the thread
> safety issues are going to cause any harm.
Right, the boundary of harmful race and benign race is not very clear.

-- 
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 48882] New: win32 binary for mod_jk 1.2.30 and Apache 2.0.x