Re: [VOTE] Release build 6.0.23

[Mark Thomas]

On 15/01/2010 07:42, Rainer Jung wrote:
> On 15.01.2010 08:22, jean-frederic clere wrote:
>> On 01/14/2010 10:45 PM, Filip Hanik - Dev Lists wrote:
>>>
>>> if all we find wrong is line endings, then I would suggest
>>> 1. fix the packaging script
>>> 2. Add the fix to the tag
>>> 3. rerun the script
>>> 4. post the new binaries
>>
>> We have to fix the TCK failures, We shouldn't release some things which
>> is not TCK compliant.
>> Rollback r899138 should fix those TCK issues, no?
> 
> I think Mark's proposal to fix it is r899420. I guess he'll run the TCK
> again with that revision included.

Correct. Sorry, I should have said when I proposed that fix. With
r899420 applied there are 5 remaining TCK failures. These are all
expected since they are caused by the webapps trying to open network
connections to test things.

Rolling back 899138 would achieve the same purpose but since we have to
re-tag lets move forwards and apply r899420 instead.

Mark



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

svn commit: r899569 - in /tomcat/site/trunk: docs/resources.html xdocs/resources.xml

[markt]

Author: markt
Date: Fri Jan 15 09:08:16 2010
New Revision: 899569

URL: http://svn.apache.org/viewvc?rev=899569&view=rev
Log:
"Tomcat: The Definitive Guide" has a second edition

Modified:
tomcat/site/trunk/docs/resources.html
tomcat/site/trunk/xdocs/resources.xml

Modified: tomcat/site/trunk/docs/resources.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/resources.html?rev=899569&r1=899568&r2=899569&view=diff
==
--- tomcat/site/trunk/docs/resources.html (original)
+++ tomcat/site/trunk/docs/resources.html Fri Jan 15 09:08:16 2010
@@ -312,6 +312,13 @@
 
 
   
+http://www.amazon.com/exec/obidos/tg/detail/-/0596003188/qid=1043089531/sr=1-6/ref=sr_1_6/002-9433156-6683214?v=glance&s=books";>Tomcat:
 The Definitive Guide (2nd ed.)
+, by Jason Brittain, Ian F. Darwin
+
+  O'Reilly & Associates (10/2007)
+
+
+  
 http://www.brainysoftware.com/";>How Tomcat Works
 , by Budi Kurniawan
   ? (09/2003)
@@ -324,13 +331,6 @@
 
 
   
-http://www.amazon.com/exec/obidos/tg/detail/-/0596003188/qid=1043089531/sr=1-6/ref=sr_1_6/002-9433156-6683214?v=glance&s=books";>Tomcat:
 The Definitive Guide
-, by Jason Brittain, Ian F. Darwin
-
-  O'Reilly & Associates (03/2003)
-
-
-  
 http://www.amazon.com/exec/obidos/tg/detail/-/1861008309/qid=1043089531/sr=1-8/ref=sr_1_8/002-9433156-6683214?v=glance&s=books";>Apache
 Tomcat Security Handbook
 , by Vivek Chopra, Ben Galbriaths, Gotham Pollysetty, Brian Rickabaugh, 
John Turner
 

Modified: tomcat/site/trunk/xdocs/resources.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/resources.xml?rev=899569&r1=899568&r2=899569&view=diff
==
--- tomcat/site/trunk/xdocs/resources.xml (original)
+++ tomcat/site/trunk/xdocs/resources.xml Fri Jan 15 09:08:16 2010
@@ -77,6 +77,10 @@
   Packt Publishing (12/2009)
 
 
+  http://www.amazon.com/exec/obidos/tg/detail/-/0596003188/qid=1043089531/sr=1-6/ref=sr_1_6/002-9433156-6683214?v=glance&s=books";>Tomcat:
 The Definitive Guide (2nd ed.), by Jason Brittain, Ian F. 
Darwin
+  O'Reilly & Associates (10/2007)
+
+
   http://www.brainysoftware.com/";>How Tomcat Works, by 
Budi Kurniawan
   ? (09/2003)
 
@@ -85,10 +89,6 @@
   Hungry Minds, Inc (06/2003)
 
 
-  http://www.amazon.com/exec/obidos/tg/detail/-/0596003188/qid=1043089531/sr=1-6/ref=sr_1_6/002-9433156-6683214?v=glance&s=books";>Tomcat:
 The Definitive Guide, by Jason Brittain, Ian F. Darwin
-  O'Reilly & Associates (03/2003)
-
-
   http://www.amazon.com/exec/obidos/tg/detail/-/1861008309/qid=1043089531/sr=1-8/ref=sr_1_8/002-9433156-6683214?v=glance&s=books";>Apache
 Tomcat Security Handbook, by Vivek Chopra, Ben Galbriaths, Gotham 
Pollysetty, Brian Rickabaugh, John Turner
   Wrox Press (02/2003)
 



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

Re: JSP 2.2 & EL 2.2 implementation complete

[jean-frederic clere]

On 01/14/2010 11:47 PM, Mark Thomas wrote:
> The subject says it all really. Still no sign of the TCK so there are
> probably some bugs in my understanding/interpretation of the spec.

According to my tests:
EL : 11 failures. (They looks similar I will have a closer look later).
JSP : 1 failures. (the signature tests).

Cheers

Jean-Frederic

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

Re: JSP 2.2 & EL 2.2 implementation complete

[jean-frederic clere]

On 01/15/2010 10:33 AM, jean-frederic clere wrote:
> According to my tests:
> EL : 11 failures. (They looks similar I will have a closer look later).

java/javax/el/ArrayELResolver.java setValue exceptions are missing (Look
in http://java.sun.com/javaee/6/docs/api/javax/el/ArrayELResolver.html I
don't say how it returns ClassCastException for example).

java/org/apache/el/lang/ELSupport.java coerceTo* returns wrong exceptions

signature test failed too.

Other failures are harder to investigate.

Cheers

Jean-Frederic

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

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

[jfclere]

Author: jfclere
Date: Fri Jan 15 11:01:49 2010
New Revision: 899593

URL: http://svn.apache.org/viewvc?rev=899593&view=rev
Log:
My votes.

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=899593&r1=899592&r2=899593&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 15 11:01:49 2010
@@ -125,14 +125,14 @@
 
 * Add missing file extension to line-ending conversions for src distros
   http://svn.apache.org/viewvc?rev=899284&view=rev
-  +1: markt
+  +1: markt,jfclere
   -1: 
 
 * -windows-???.zip distributions should have windows line endings
   .zip should have unix line endings
   http://svn.apache.org/viewvc?rev=899348&view=rev
   http://svn.apache.org/viewvc?rev=899395&view=rev
-  +1: markt
+  +1: markt, jfclere
   -1: 
 
 * Fix TCK failures with security manager due to fix for 47774



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

svn commit: r899601 - /tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java

[markt]

Author: markt
Date: Fri Jan 15 11:30:21 2010
New Revision: 899601

URL: http://svn.apache.org/viewvc?rev=899601&view=rev
Log:
Add the bug url

Modified:

tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java

Modified: 
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=899601&r1=899600&r2=899601&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java 
Fri Jan 15 11:30:21 2010
@@ -82,7 +82,9 @@
 /**
  * XML parsing can pin a web application class loader in memory. This is
  * particularly nasty as profilers (at least YourKit and Eclipse MAT) don't
- * identify any GC roots related to this. 
+ * identify any GC roots related to this.
+ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6916498";>
+ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6916498
  */
 private boolean xmlParsingProtection = true;
 public boolean isXmlParsingProtection() { return xmlParsingProtection; }



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

Re: JSP 2.2 & EL 2.2 implementation complete

[Mark Thomas]

On 15/01/2010 10:24, jean-frederic clere wrote:
> On 01/15/2010 10:33 AM, jean-frederic clere wrote:
>> According to my tests:
>> EL : 11 failures. (They looks similar I will have a closer look later).
> 
> java/javax/el/ArrayELResolver.java setValue exceptions are missing (Look
> in http://java.sun.com/javaee/6/docs/api/javax/el/ArrayELResolver.html I
> don't say how it returns ClassCastException for example).
> 
> java/org/apache/el/lang/ELSupport.java coerceTo* returns wrong exceptions
> 
> signature test failed too.
> 
> Other failures are harder to investigate.

Thanks. I have the TCKs now so I'll take a closer look.

Mark



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

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

[jfclere]

Author: jfclere
Date: Fri Jan 15 12:17:22 2010
New Revision: 899606

URL: http://svn.apache.org/viewvc?rev=899606&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=899606&r1=899605&r2=899606&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 15 12:17:22 2010
@@ -137,5 +137,5 @@
 
 * Fix TCK failures with security manager due to fix for 47774
   http://svn.apache.org/viewvc?rev=899420&view=rev
-  +1: markt
+  +1: markt, jfclere
   -1: 



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

DO NOT REPLY [Bug 46337] real worker name is wrong

[bugzilla]

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

--- Comment #2 from Ryszard Łach  2010-01-15 04:47:33 UTC ---
Hi.
First, thanks for excellent work. I'm using mod_jk for quite a long time...

I've just spent some time testing behaviour of retries directive of LB worker,
I was very confused finding in log file (format %w(%R)), that after retry the
request was served by the same worker, which's backend whasn't working.

Maybe the %R should be split in two directives, 1st for originally selected
worked and 2nd one for that, which finally served the request?

Best regards,

R.

-- 
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 46337] real worker name is wrong

[bugzilla]

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

--- Comment #3 from Rainer Jung  2010-01-15 05:22:27 
UTC ---
(In reply to comment #2)
Please let us not discuss your idea here. It does not belong into this issue
and should be discussed on the tomcat users list.

One remark: mod_jk is able to log that information and much more as part of the
usual access log. The request logging inside the mod_jk error log might go away
some time, because the data is a much better fit for the access log. The
JkLogFile should only be used for error logging.

For information about how to include the info in the access log, learn about
LogFormat in

http://httpd.apache.org/docs/2.2/mod/mod_log_config.html

and look for "notes" in

http://tomcat.apache.org/connectors-doc/reference/apache.html

-- 
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: r899634 - in /tomcat/trunk: java/javax/el/MethodExpression.java java/org/apache/el/MethodExpressionImpl.java test/org/apache/el/TestMethodExpressionImpl.java

[markt]

Author: markt
Date: Fri Jan 15 14:10:11 2010
New Revision: 899634

URL: http://svn.apache.org/viewvc?rev=899634&view=rev
Log:
The spec has a spelling mistake. Align with the spec until it is fixed.

Modified:
tomcat/trunk/java/javax/el/MethodExpression.java
tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java

Modified: tomcat/trunk/java/javax/el/MethodExpression.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/MethodExpression.java?rev=899634&r1=899633&r2=899634&view=diff
==
--- tomcat/trunk/java/javax/el/MethodExpression.java (original)
+++ tomcat/trunk/java/javax/el/MethodExpression.java Fri Jan 15 14:10:11 2010
@@ -30,8 +30,12 @@
 
 /**
  * @since EL 2.2
+ * 
+ * Note: The spelling mistake is deliberate.
+ * isParmetersProvided()  - Specification definition
+ * isParametersProvided() - Corrected spelling
  */
-public boolean isParametersProvided() {
+public boolean isParmetersProvided() {
 // Expected to be over-ridden by implementation
 return false;
 }

Modified: tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=899634&r1=899633&r2=899634&view=diff
==
--- tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java Fri Jan 15 
14:10:11 2010
@@ -320,9 +320,12 @@
 
 /**
  * @since EL 2.2
+ * Note: The spelling mistake is deliberate.
+ * isParmetersProvided()  - Specification definition
+ * isParametersProvided() - Corrected spelling
  */
 @Override
-public boolean isParametersProvided() {
+public boolean isParmetersProvided() {
 return this.getNode().isParametersProvided();
 }
 

Modified: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=899634&r1=899633&r2=899634&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java Fri Jan 15 
14:10:11 2010
@@ -45,9 +45,9 @@
 new Class[] { String.class });
 
 String result1 = (String) me1.invoke(context, null);
-assertFalse(me1.isParametersProvided());
+assertFalse(me1.isParmetersProvided());
 String result2 = (String) me2.invoke(context, new Object[] { "JUnit2" 
});
-assertTrue(me2.isParametersProvided());
+assertTrue(me2.isParmetersProvided());
 
 assertNotNull(result1);
 assertNotNull(result2);



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

svn commit: r899635 - in /tomcat/trunk/java/javax/servlet/jsp: JspContext.java JspException.java

[markt]

Author: markt
Date: Fri Jan 15 14:17:22 2010
New Revision: 899635

URL: http://svn.apache.org/viewvc?rev=899635&view=rev
Log:
Fix signature test failures in javax.servlet.jsp package
Move deprecation javadoc to end of block

Modified:
tomcat/trunk/java/javax/servlet/jsp/JspContext.java
tomcat/trunk/java/javax/servlet/jsp/JspException.java

Modified: tomcat/trunk/java/javax/servlet/jsp/JspContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspContext.java?rev=899635&r1=899634&r2=899635&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/JspContext.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspContext.java Fri Jan 15 14:17:22 2010
@@ -226,7 +226,7 @@
  * @deprecated As of JSP 2.1, replaced by
  * JspApplicationContext.getExpressionFactory()
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public abstract ExpressionEvaluator getExpressionEvaluator();
 
 
@@ -244,7 +244,7 @@
  * which can be obtained by
  * jspContext.getELContext().getELResolver()
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public abstract VariableResolver getVariableResolver();
 
 /**

Modified: tomcat/trunk/java/javax/servlet/jsp/JspException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspException.java?rev=899635&r1=899634&r2=899635&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/JspException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspException.java Fri Jan 15 14:17:22 
2010
@@ -21,7 +21,6 @@
  * JspExceptions will result in an invocation of the errorpage
  * machinery.
  */
-
 public class JspException extends Exception {
 
 /**
@@ -85,15 +84,14 @@
 
 
 /**
- * @deprecated As of JSP 2.1, replaced by
- * java.lang.Throwable.getCause()
- *  
  * Returns the exception that caused this JSP exception.
  *
  * @return  the Throwable that caused this JSP exception
+ * 
+ * @deprecated As of JSP 2.1, replaced by
+ * java.lang.Throwable.getCause()
  */
-
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public Throwable getRootCause() {
 return getCause();
 }



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

Re: [VOTE] Release build 6.0.23

[Filip Hanik - Dev Lists]

On 01/15/2010 12:22 AM, jean-frederic clere wrote:

We have to fix the TCK failures

+1

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

Re: svn commit: r899395 - /tomcat/trunk/dist.xml

[Rainer Jung]

On 14.01.2010 21:21, ma...@apache.org wrote:

Author: markt
Date: Thu Jan 14 20:21:23 2010
New Revision: 899395

URL: http://svn.apache.org/viewvc?rev=899395&view=rev
Log:
zip is for non-windows platforms


Hmmm, really?

Until recently we didn't have the individual binary release zips for 
Windows, they are new. Previously the zip was for DOS/Windows.


If we encode the package-zip now for Unix, don't we create confusion 
w.r.t. package-src-zip (DOS) and package-deployer-zip (undefined until now)?


I'd prefer keep the package-zip with CRLF (and ensure CRLF in 
package-deployer-zip too).


Regards,

Rainer


Modified:
 tomcat/trunk/dist.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=899395&r1=899394&r2=899395&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Thu Jan 14 20:21:23 2010
@@ -391,8 +391,8 @@



-
-
+
+
  

  


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

Re: svn commit: r899634 - in /tomcat/trunk: java/javax/el/MethodExpression.java java/org/apache/el/MethodExpressionImpl.java test/org/apache/el/TestMethodExpressionImpl.java

[Mark Thomas]

On 15/01/2010 14:10, ma...@apache.org wrote:
> Author: markt
> Date: Fri Jan 15 14:10:11 2010
> New Revision: 899634
> 
> URL: http://svn.apache.org/viewvc?rev=899634&view=rev
> Log:
> The spec has a spelling mistake. Align with the spec until it is fixed.

Raised as https://uel.dev.java.net/issues/show_bug.cgi?id=11

Mark



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

Re: svn commit: r899395 - /tomcat/trunk/dist.xml

[Mark Thomas]

On 15/01/2010 14:41, Rainer Jung wrote:
> On 14.01.2010 21:21, ma...@apache.org wrote:
>> Author: markt
>> Date: Thu Jan 14 20:21:23 2010
>> New Revision: 899395
>>
>> URL: http://svn.apache.org/viewvc?rev=899395&view=rev
>> Log:
>> zip is for non-windows platforms
> 
> Hmmm, really?

I believe so yes. Going back to the original thread [1] it was for
platforms with limited default tar implementations (like Solaris).

> Until recently we didn't have the individual binary release zips for
> Windows, they are new. Previously the zip was for DOS/Windows.
> 
> If we encode the package-zip now for Unix, don't we create confusion
> w.r.t. package-src-zip (DOS) and package-deployer-zip (undefined until
> now)?

I share those concerns but in the end decided to change to LF for .zip.
If windows users do download it, it will still work (.bat & .sh are
always platform specific in the distros) but they won't be able to use
notepad to edit the config files. There are plenty of alternatives. Or
they can download the windows binary.

It was close call and I'm only just in favour of using LF in .zip so if
the consensus is to use CRLF I'm fine with that too.

> I'd prefer keep the package-zip with CRLF (and ensure CRLF in
> package-deployer-zip too).

That probably needs another patch.

Mark



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

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

[markt]

Author: markt
Date: Fri Jan 15 14:56:16 2010
New Revision: 899649

URL: http://svn.apache.org/viewvc?rev=899649&view=rev
Log:
Clarify 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=899649&r1=899648&r2=899649&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 15 14:56:16 2010
@@ -130,9 +130,10 @@
 
 * -windows-???.zip distributions should have windows line endings
   .zip should have unix line endings
-  http://svn.apache.org/viewvc?rev=899348&view=rev
-  http://svn.apache.org/viewvc?rev=899395&view=rev
-  +1: markt, jfclere
+  http://svn.apache.org/viewvc?rev=899348&view=rev (-windows-???.zip)
+  http://svn.apache.org/viewvc?rev=899395&view=rev (.zip)
+  +1: markt (with or without r899395)
+  +1: jfclere
   -1: 
 
 * Fix TCK failures with security manager due to fix for 47774



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

svn commit: r899653 - in /tomcat/trunk/java: javax/servlet/jsp/el/ javax/servlet/jsp/tagext/ org/apache/jasper/el/

[markt]

Author: markt
Date: Fri Jan 15 15:00:50 2010
New Revision: 899653

URL: http://svn.apache.org/viewvc?rev=899653&view=rev
Log:
Fix the remaining TCK signature test failures.

Modified:
tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java
tomcat/trunk/java/javax/servlet/jsp/el/Expression.java
tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java
tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java
tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java

Modified: tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ELException.java?rev=899653&r1=899652&r2=899653&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/el/ELException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ELException.java Fri Jan 15 15:00:50 
2010
@@ -24,7 +24,7 @@
  * @since 2.0
  * @deprecated
  */
-...@deprecated
+...@suppresswarnings("dep-ann") // TCK signature test fails with annotation
 public class ELException extends Exception {
 
 /**

Modified: tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java?rev=899653&r1=899652&r2=899653&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java Fri Jan 15 
15:00:50 2010
@@ -24,8 +24,7 @@
  * @since 2.0
  * @deprecated
  */
-
-...@deprecated
+...@suppresswarnings("dep-ann") // TCK signature test fails with annotation
 public class ELParseException extends ELException {
 
  //-

Modified: tomcat/trunk/java/javax/servlet/jsp/el/Expression.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/Expression.java?rev=899653&r1=899652&r2=899653&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/el/Expression.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/Expression.java Fri Jan 15 15:00:50 
2010
@@ -32,7 +32,7 @@
  * @since 2.0
  * @deprecated
  */
-...@deprecated
+...@suppresswarnings("dep-ann") // TCK signature test fails with annotation
 public abstract class Expression {
 
 /** 

Modified: tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=899653&r1=899652&r2=899653&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java Fri Jan 15 
15:00:50 2010
@@ -53,7 +53,7 @@
  * @since 2.0
  * @deprecated
  */
-...@deprecated
+...@suppresswarnings("dep-ann") // TCK signature test fails with annotation
 public abstract class ExpressionEvaluator {
 
 /**
@@ -77,9 +77,10 @@
  *
  * @exception ELException Thrown if parsing errors were found.
  */ 
-public abstract Expression parseExpression( String expression, 
-  Class expectedType, 
-  FunctionMapper fMapper ) 
+public abstract Expression parseExpression( String expression,
+@SuppressWarnings("unchecked") // TCK signature fails with generics
+Class expectedType,
+   FunctionMapper fMapper) 
   throws ELException; 
 
 
@@ -99,11 +100,12 @@
  * @return The result of the expression evaluation.
  *
  * @exception ELException Thrown if the expression evaluation failed.
- */ 
-public abstract Object evaluate( String expression, 
-   Class expectedType, 
-   VariableResolver vResolver,
-   FunctionMapper fMapper ) 
+ */
+public abstract Object evaluate( String expression,
+@SuppressWarnings("unchecked") // TCK signature fails with generics
+   Class expectedType,
+   VariableResolver vResolver,
+   FunctionMapper fMapper)
   throws ELException; 
 }
 

Modified: tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java?rev=899653&r1=899652&r2=899653&view=diff

Re: svn commit: r899395 - /tomcat/trunk/dist.xml

[Mladen Turk]

On 01/15/2010 03:41 PM, Rainer Jung wrote:

On 14.01.2010 21:21, ma...@apache.org wrote:

Author: markt
Date: Thu Jan 14 20:21:23 2010
New Revision: 899395

URL: http://svn.apache.org/viewvc?rev=899395&view=rev
Log:
zip is for non-windows platforms


Hmmm, really?

Until recently we didn't have the individual binary release zips for
Windows, they are new. Previously the zip was for DOS/Windows.

If we encode the package-zip now for Unix, don't we create confusion
w.r.t. package-src-zip (DOS) and package-deployer-zip (undefined until
now)?

I'd prefer keep the package-zip with CRLF (and ensure CRLF in
package-deployer-zip too).



+1

Although some platforms have broken(limited) default tar.
Dunno if we are using very long paths that would break tar
on Solaris (eg. +100 character path names)

Also the tar produced by ant doesn't look at all
like the one produced by gtar.
Think the problem is that we should add all files
at once during the build since it looks the tar has
multiple header sections or something.


Regards
--
^TM

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

Re: svn commit: r899395 - /tomcat/trunk/dist.xml

[Mladen Turk]

On 01/15/2010 03:41 PM, Rainer Jung wrote:

On 14.01.2010 21:21, ma...@apache.org wrote:

I'd prefer keep the package-zip with CRLF (and ensure CRLF in
package-deployer-zip too).



Just to update.
Since beginning of time httpd has x.x-win32-src.zip
We could have something like that as well instead relaying
on arch extension for CRLF type.


Regards
--
^TM

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

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

[markt]

Author: markt
Date: Fri Jan 15 15:39:04 2010
New Revision: 899667

URL: http://svn.apache.org/viewvc?rev=899667&view=rev
Log:
Consensus is for crlf on .zip files

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=899667&r1=899666&r2=899667&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 15 15:39:04 2010
@@ -128,12 +128,9 @@
   +1: markt,jfclere
   -1: 
 
-* -windows-???.zip distributions should have windows line endings
-  .zip should have unix line endings
-  http://svn.apache.org/viewvc?rev=899348&view=rev (-windows-???.zip)
-  http://svn.apache.org/viewvc?rev=899395&view=rev (.zip)
-  +1: markt (with or without r899395)
-  +1: jfclere
+* distributions should have windows line endings
+  http://svn.apache.org/viewvc?rev=899348&view=rev
+  +1: markt, jfclere
   -1: 
 
 * Fix TCK failures with security manager due to fix for 47774



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

svn commit: r899668 - /tomcat/trunk/dist.xml

[markt]

Author: markt
Date: Fri Jan 15 15:40:35 2010
New Revision: 899668

URL: http://svn.apache.org/viewvc?rev=899668&view=rev
Log:
revert r899395

Modified:
tomcat/trunk/dist.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=899668&r1=899667&r2=899668&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Fri Jan 15 15:40:35 2010
@@ -391,8 +391,8 @@
 
   
   
-
-
+
+
 
   
 



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

Re: svn commit: r899395 - /tomcat/trunk/dist.xml

[Mark Thomas]

On 15/01/2010 15:13, Mladen Turk wrote:
> On 01/15/2010 03:41 PM, Rainer Jung wrote:
>> On 14.01.2010 21:21, ma...@apache.org wrote:
>>
>> I'd prefer keep the package-zip with CRLF (and ensure CRLF in
>> package-deployer-zip too).
>>
> 
> Just to update.
> Since beginning of time httpd has x.x-win32-src.zip
> We could have something like that as well instead relaying
> on arch extension for CRLF type.

Something to think about for Tomcat 7.

Mark



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

Re: svn commit: r899395 - /tomcat/trunk/dist.xml

[Mladen Turk]

On 01/15/2010 04:41 PM, Mark Thomas wrote:

On 15/01/2010 15:13, Mladen Turk wrote:

On 01/15/2010 03:41 PM, Rainer Jung wrote:

On 14.01.2010 21:21, ma...@apache.org wrote:

I'd prefer keep the package-zip with CRLF (and ensure CRLF in
package-deployer-zip too).



Just to update.
Since beginning of time httpd has x.x-win32-src.zip
We could have something like that as well instead relaying
on arch extension for CRLF type.


Something to think about for Tomcat 7.



Sure.

Anyhow, I might just gave +1 prematurely on Rainer's
.zip == CRLF presumption.

I see 6.0.20 has LF line endings in src.zip, so IMO
we should stick with that. Other would mean a sudden surprise
to the end users.


Cheers
--
^TM

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

Re: svn commit: r899395 - /tomcat/trunk/dist.xml

[Filip Hanik - Dev Lists]

On 01/15/2010 08:41 AM, Mark Thomas wrote:

On 15/01/2010 15:13, Mladen Turk wrote:
   

On 01/15/2010 03:41 PM, Rainer Jung wrote:
 

On 14.01.2010 21:21, ma...@apache.org wrote:

I'd prefer keep the package-zip with CRLF (and ensure CRLF in
package-deployer-zip too).

   

Just to update.
Since beginning of time httpd has x.x-win32-src.zip
We could have something like that as well instead relaying
on arch extension for CRLF type.
 

that actually makes more sense, I'd be +1 for that.

Something to think about for Tomcat 7.

Mark



-
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

Re: svn commit: r899395 - /tomcat/trunk/dist.xml

[Mark Thomas]

On 15/01/2010 15:56, Mladen Turk wrote:
> On 01/15/2010 04:41 PM, Mark Thomas wrote:
>> On 15/01/2010 15:13, Mladen Turk wrote:
>>> On 01/15/2010 03:41 PM, Rainer Jung wrote:
 On 14.01.2010 21:21, ma...@apache.org wrote:

 I'd prefer keep the package-zip with CRLF (and ensure CRLF in
 package-deployer-zip too).

>>>
>>> Just to update.
>>> Since beginning of time httpd has x.x-win32-src.zip
>>> We could have something like that as well instead relaying
>>> on arch extension for CRLF type.
>>
>> Something to think about for Tomcat 7.
>>
> 
> Sure.
> 
> Anyhow, I might just gave +1 prematurely on Rainer's
> .zip == CRLF presumption.
> 
> I see 6.0.20 has LF line endings in src.zip, so IMO
> we should stick with that. Other would mean a sudden surprise
> to the end users.

That is a bug we should have caught in 6.0.20 but didn't.

Historically .zip has had CRLF line endings and .tar.gz LF. That worked
if you built on Windows but didn't if you built on unix so when Remy
switched from Windows to unix for the build stuff broke but we didn't
catch all of it.

There have been a series of changes recently to fix all of that and I
think (once the current patches are applied) we should be in a position
where you can build on Windows and unix and get the same result.

Mark



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

Re: svn commit: r899395 - /tomcat/trunk/dist.xml

[Rainer Jung]

On 15.01.2010 16:06, Mladen Turk wrote:

Although some platforms have broken(limited) default tar.
Dunno if we are using very long paths that would break tar
on Solaris (eg. +100 character path names)


Yes, src, bin and fulldocs tarballs include longer path names then 100 
chars.


OTOH even the most traditional Solaris admin got used to using gtar 
instead of Solaris tar when unpacking non-Sun downloads. Sun even ships 
it e.g. with Solaris 10 as /usr/sfw/bin/gtar in package SUNWgtar.



Also the tar produced by ant doesn't look at all
like the one produced by gtar.
Think the problem is that we should add all files
at once during the build since it looks the tar has
multiple header sections or something.


I never had problems extracting the Tomcat ant tarballs with gtar ...

Regards,

Rainer

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

Re: svn commit: r899395 - /tomcat/trunk/dist.xml

[Mladen Turk]

On 01/15/2010 05:21 PM, Rainer Jung wrote:



Also the tar produced by ant doesn't look at all
like the one produced by gtar.
Think the problem is that we should add all files
at once during the build since it looks the tar has
multiple header sections or something.


I never had problems extracting the Tomcat ant tarballs with gtar ...



No that's fine, it works, although some GUI
archive viewers show wired content.
(e.g. double package directory, no .sh files, etc...)
This probably comes from the fact the tar is created
incrementally, and those tools only parse the
initial header.


Cheers
--
^TM

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

svn commit: r899737 - in /tomcat/trunk: java/org/apache/catalina/deploy/ java/org/apache/catalina/startup/ test/org/apache/ test/org/apache/catalina/deploy/ test/org/apache/catalina/startup/

[markt]

Author: markt
Date: Fri Jan 15 18:04:22 2010
New Revision: 899737

URL: http://svn.apache.org/viewvc?rev=899737&view=rev
Log:
Re-factoring. WebXml is a better fit in o.a.c.deploy

Added:
tomcat/trunk/java/org/apache/catalina/deploy/Constants.java   (with props)
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
  - copied, changed from r899666, 
tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
tomcat/trunk/test/org/apache/catalina/deploy/
tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java
  - copied, changed from r899666, 
tomcat/trunk/test/org/apache/catalina/startup/TestWebXml.java
Removed:
tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
tomcat/trunk/test/org/apache/catalina/startup/TestWebXml.java
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/test/org/apache/TestAll.java

Added: tomcat/trunk/java/org/apache/catalina/deploy/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/Constants.java?rev=899737&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/deploy/Constants.java (added)
+++ tomcat/trunk/java/org/apache/catalina/deploy/Constants.java Fri Jan 15 
18:04:22 2010
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.catalina.deploy;
+
+
+public class Constants {
+
+public static final String Package = "org.apache.catalina.deploy";
+
+}

Propchange: tomcat/trunk/java/org/apache/catalina/deploy/Constants.java
--
svn:eol-style = native

Propchange: tomcat/trunk/java/org/apache/catalina/deploy/Constants.java
--
svn:keywords = Date Author Id Revision

Added: tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?rev=899737&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties (added)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties Fri 
Jan 15 18:04:22 2010
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+webXml.duplicateEnvEntry=Duplicate env-entry name [{0}]
+webXml.duplicateFilter=Duplicate filter name [{0}]
+webXml.duplicateMessageDestination=Duplicate message-destination name [{0}]
+webXml.duplicateMessageDestinationRef=Duplicate message-destination-ref name 
[{0}]
+webXml.duplicateResourceEnvRef=Duplicate resource-env-ref name [{0}]
+webXml.duplicateResourceRef=Duplicate resource-ref name [{0}]
+webXml.duplicateTaglibUri=Duplicate tag library URI [{0}]
+webXml.reservedName=A web.xml file was detected using a reserved name [{0}]. 
The name element will be ignored for this fragment.
+webXml.mergeConflictDisplayName=The display name was defined in multiple 
fragments with different values including fragment with name [{0}] located at 
[{1}]
+webXml.mergeConflictErrorPage=The Error Page for [{

Re: JSP 2.2 & EL 2.2 implementation complete

[Mark Thomas]

On 15/01/2010 11:32, Mark Thomas wrote:
> On 15/01/2010 10:24, jean-frederic clere wrote:
>> On 01/15/2010 10:33 AM, jean-frederic clere wrote:
>>> According to my tests:
>>> EL : 11 failures. (They looks similar I will have a closer look later).
>>
>> java/javax/el/ArrayELResolver.java setValue exceptions are missing (Look
>> in http://java.sun.com/javaee/6/docs/api/javax/el/ArrayELResolver.html I
>> don't say how it returns ClassCastException for example).
>>
>> java/org/apache/el/lang/ELSupport.java coerceTo* returns wrong exceptions
>>
>> signature test failed too.
>>
>> Other failures are harder to investigate.
> 
> Thanks. I have the TCKs now so I'll take a closer look.

JSP 2.2 TCK now passes with and without a security manager.

Looking at the EL issues now...

Mark



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

Re: JSP 2.2 & EL 2.2 implementation complete

[Jason Brittain]

Congratulations and thanks for all your great work on this!  It's a big next
step for Tomcat.

--
Jason Brittain
MuleSoft 


On Thu, Jan 14, 2010 at 2:47 PM, Mark Thomas  wrote:

> The subject says it all really. Still no sign of the TCK so there are
> probably some bugs in my understanding/interpretation of the spec.
>
> Mark
>

svn commit: r899769 - /tomcat/trunk/java/javax/el/ArrayELResolver.java

[markt]

Author: markt
Date: Fri Jan 15 19:22:12 2010
New Revision: 899769

URL: http://svn.apache.org/viewvc?rev=899769&view=rev
Log:
Fix TCK failure. Trying to assign an object of the wrong type to an array 
should throw a ClassCaseException.

Modified:
tomcat/trunk/java/javax/el/ArrayELResolver.java

Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ArrayELResolver.java?rev=899769&r1=899768&r2=899769&view=diff
==
--- tomcat/trunk/java/javax/el/ArrayELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ArrayELResolver.java Fri Jan 15 19:22:12 2010
@@ -90,6 +90,14 @@
 
int idx = coerce(property);
checkBounds(base, idx);
+   if (value != null &&
+   
!base.getClass().getComponentType().isAssignableFrom(
+   value.getClass())) {
+   throw new ClassCastException(message(context,
+   "objectNotAssignable",
+   new Object[] {value.getClass().getName(),
+   
base.getClass().getComponentType().getName()}));
+   }
Array.set(base, idx, value);
}
}



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

svn commit: r899770 - /tomcat/trunk/java/javax/el/LocalStrings.properties

[markt]

Author: markt
Date: Fri Jan 15 19:22:42 2010
New Revision: 899770

URL: http://svn.apache.org/viewvc?rev=899770&view=rev
Log:
Fix TCK failure. Trying to assign an object of the wrong type to an array 
should throw a ClassCaseException.

Modified:
tomcat/trunk/java/javax/el/LocalStrings.properties

Modified: tomcat/trunk/java/javax/el/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings.properties?rev=899770&r1=899769&r2=899770&view=diff
==
--- tomcat/trunk/java/javax/el/LocalStrings.properties (original)
+++ tomcat/trunk/java/javax/el/LocalStrings.properties Fri Jan 15 19:22:42 2010
@@ -22,3 +22,4 @@
 propertyReadError=Error reading ''{1}'' on type {0}
 propertyWriteError=Error writing ''{1}'' on type {0}
 resolverNotWritable=ELResolver not writable for type {0}
+objectNotAssignable=Unable to add an object of type [{0}] to an array of 
objects of type [{1}]



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

svn commit: r899783 - /tomcat/trunk/java/org/apache/el/lang/ELSupport.java

[markt]

Author: markt
Date: Fri Jan 15 19:37:46 2010
New Revision: 899783

URL: http://svn.apache.org/viewvc?rev=899783&view=rev
Log:
TCK failure. Make sure an ELException is throw if the conversion fails.

Modified:
tomcat/trunk/java/org/apache/el/lang/ELSupport.java

Modified: tomcat/trunk/java/org/apache/el/lang/ELSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELSupport.java?rev=899783&r1=899782&r2=899783&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELSupport.java Fri Jan 15 19:37:46 2010
@@ -193,10 +193,10 @@
  * Null and empty string are false.
  * @param obj the object to convert
  * @return the Boolean value of the object
- * @throws IllegalArgumentException if object is not Boolean or String
+ * @throws ELException if object is not Boolean or String
  */
 public final static Boolean coerceToBoolean(final Object obj)
-throws IllegalArgumentException {
+throws ELException {
 if (obj == null || "".equals(obj)) {
 return Boolean.FALSE;
 }
@@ -207,12 +207,12 @@
 return Boolean.valueOf((String) obj);
 }
 
-throw new IllegalArgumentException(MessageFactory.get("error.convert",
+throw new ELException(MessageFactory.get("error.convert",
 obj, obj.getClass(), Boolean.class));
 }
 
 public final static Character coerceToCharacter(final Object obj)
-throws IllegalArgumentException {
+throws ELException {
 if (obj == null || "".equals(obj)) {
 return new Character((char) 0);
 }
@@ -227,7 +227,7 @@
 return (Character) obj;
 }
 
-throw new IllegalArgumentException(MessageFactory.get("error.convert",
+throw new ELException(MessageFactory.get("error.convert",
 obj, objType, Character.class));
 }
 
@@ -247,7 +247,7 @@
 }
 
 protected final static Number coerceToNumber(final Number number,
-final Class type) throws IllegalArgumentException {
+final Class type) throws ELException {
 if (Long.TYPE == type || Long.class.equals(type)) {
 return new Long(number.longValue());
 }
@@ -288,12 +288,12 @@
 return number;
 }
 
-throw new IllegalArgumentException(MessageFactory.get("error.convert",
+throw new ELException(MessageFactory.get("error.convert",
 number, number.getClass(), type));
 }
 
 public final static Number coerceToNumber(final Object obj,
-final Class type) throws IllegalArgumentException {
+final Class type) throws ELException {
 if (obj == null || "".equals(obj)) {
 return coerceToNumber(ZERO, type);
 }
@@ -309,38 +309,78 @@
 .charValue()), type);
 }
 
-throw new IllegalArgumentException(MessageFactory.get("error.convert",
+throw new ELException(MessageFactory.get("error.convert",
 obj, obj.getClass(), type));
 }
 
 protected final static Number coerceToNumber(final String val,
-final Class type) throws IllegalArgumentException {
+final Class type) throws ELException {
 if (Long.TYPE == type || Long.class.equals(type)) {
-return Long.valueOf(val);
+try {
+return Long.valueOf(val);
+} catch (NumberFormatException nfe) {
+throw new ELException(MessageFactory.get("error.convert",
+val, String.class, type));
+}
 }
 if (Integer.TYPE == type || Integer.class.equals(type)) {
-return Integer.valueOf(val);
+try {
+return Integer.valueOf(val);
+} catch (NumberFormatException nfe) {
+throw new ELException(MessageFactory.get("error.convert",
+val, String.class, type));
+}
 }
 if (Double.TYPE == type || Double.class.equals(type)) {
-return Double.valueOf(val);
+try {
+return Double.valueOf(val);
+} catch (NumberFormatException nfe) {
+throw new ELException(MessageFactory.get("error.convert",
+val, String.class, type));
+}
 }
 if (BigInteger.class.equals(type)) {
-return new BigInteger(val);
+try {
+return new BigInteger(val);
+} catch (NumberFormatException nfe) {
+throw new ELException(MessageFactory.get("error.convert",
+val, String.class, type));
+}
 }
 if (BigDecimal.class.equals(type)) {
-return new BigDecimal(val);
+try {
+   

svn commit: r899788 - /tomcat/trunk/java/javax/el/ListELResolver.java

[markt]

Author: markt
Date: Fri Jan 15 19:44:14 2010
New Revision: 899788

URL: http://svn.apache.org/viewvc?rev=899788&view=rev
Log:
TCK failure. Invalid index should throw PNFE.

Modified:
tomcat/trunk/java/javax/el/ListELResolver.java

Modified: tomcat/trunk/java/javax/el/ListELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ListELResolver.java?rev=899788&r1=899787&r2=899788&view=diff
==
--- tomcat/trunk/java/javax/el/ListELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ListELResolver.java Fri Jan 15 19:44:14 2010
@@ -71,7 +71,8 @@
List list = (List) base;
int idx = coerce(property);
if (idx < 0 || idx >= list.size()) {
-   return null;
+throw new PropertyNotFoundException(
+new ArrayIndexOutOfBoundsException(idx).getMessage());
}
Object obj = list.get(idx);
return (obj != null) ? obj.getClass() : null;



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

svn commit: r899792 - /tomcat/trunk/java/org/apache/el/parser/AstValue.java

[markt]

Author: markt
Date: Fri Jan 15 19:55:31 2010
New Revision: 899792

URL: http://svn.apache.org/viewvc?rev=899792&view=rev
Log:
TCK failure. Make sure we throw an ELException, not an IAE.

Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java

Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=899792&r1=899791&r2=899792&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Fri Jan 15 19:55:31 
2010
@@ -204,6 +204,8 @@
 result = m.invoke(t.base, paramValues);
 } catch (IllegalAccessException iae) {
 throw new ELException(iae);
+} catch (IllegalArgumentException iae) {
+throw new ELException(iae);
 } catch (InvocationTargetException ite) {
 throw new ELException(ite.getCause());
 }



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

DO NOT REPLY [Bug 48551] StringCache: Use entrySet() rather than keySet() + get()

[bugzilla]

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

--- Comment #1 from Sebb  2010-01-15 11:57:02 UTC ---
Created an attachment (id=24849)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24849)
Replace keySet() + get(key) with entrySet()

-- 
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: r899796 - in /tomcat/trunk/modules/jdbc-pool: build.properties.default java/org/apache/tomcat/jdbc/pool/DataSource.java java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java java/org/apa

[fhanik]

Author: fhanik
Date: Fri Jan 15 20:02:36 2010
New Revision: 899796

URL: http://svn.apache.org/viewvc?rev=899796&view=rev
Log:
Make a distinction based on type=javax.sql.DataSource or 
type=javax.sql.XADataSource, some components, like JIRA actually do an 
instanceof on the object to determine what it is instead of relying on the 
configuration.
Make static methods non static for easier extendability


Added:

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/XADataSource.java
   (with props)
Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java

Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=899796&r1=899795&r2=899796&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Fri Jan 15 20:02:36 
2010
@@ -28,7 +28,7 @@
 version.major=1
 version.minor=0
 version.build=8
-version.patch=4
+version.patch=5
 version.suffix=
 
 # - Default Base Path for Dependent Packages -

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java?rev=899796&r1=899795&r2=899796&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java 
(original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java 
Fri Jan 15 20:02:36 2010
@@ -37,7 +37,7 @@
  * @author Filip Hanik
  * @version 1.0
  */
-public class DataSource extends DataSourceProxy implements 
MBeanRegistration,javax.sql.DataSource,XADataSource, 
org.apache.tomcat.jdbc.pool.jmx.ConnectionPoolMBean {
+public class DataSource extends DataSourceProxy implements 
javax.sql.DataSource,MBeanRegistration, 
org.apache.tomcat.jdbc.pool.jmx.ConnectionPoolMBean {
 private static final Log log = LogFactory.getLog(DataSource.class);
 
 /**

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=899796&r1=899795&r2=899796&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
 Fri Jan 15 20:02:36 2010
@@ -184,11 +184,15 @@
 return null;
 }
 Reference ref = (Reference) obj;
-
+boolean XA = false;
 boolean ok = false;
 if ("javax.sql.DataSource".equals(ref.getClassName())) {
 ok = true;
 }
+if ("javax.sql.XADataSource".equals(ref.getClassName())) {
+ok = true;
+XA = true;
+}
 if 
(org.apache.tomcat.jdbc.pool.DataSource.class.getName().equals(ref.getClassName()))
 {
 ok = true;
 }
@@ -209,7 +213,7 @@
 }
 }
 
-return createDataSource(properties,nameCtx);
+return createDataSource(properties,nameCtx,XA);
 }
 
 public static PoolConfiguration parsePoolProperties(Properties properties) 
throws IOException{
@@ -458,40 +462,46 @@
  * @param properties the datasource configuration properties
  * @throws Exception if an error occurs creating the data source
  */
-public static DataSource createDataSource(Properties properties) throws 
Exception {
-return createDataSource(properties,null);
+public DataSource createDataSource(Properties properties) throws Exception 
{
+return createDataSource(properties,null,false);
 }
-public static DataSource createDataSource(Properties properties,Context 
context) throws Exception {
+public DataSource createDataSource(Properties properties,Context context, 
boolean XA) throws Exception {
 PoolConfiguration poolProperties = 
DataSourceFactory.parsePoolProperties(properties);
 if (poolProperties.getDataSourceJNDI()!=null && 
poolProperties.getDataSource()==null) {
-Object jndiDS = null;
-try {
-if (context!=null) {
-jndiDS = 
context.lookup(poolProperties.getDataSourceJNDI());
-} else {
-log.warn("dataSourceJNDI property is configued, but local 
JNDI context is null.");
-}
-} catch (NamingException e) {
-