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

2010-02-24 Thread jfclere
Author: jfclere
Date: Wed Feb 24 08:26:06 2010
New Revision: 915720

URL: http://svn.apache.org/viewvc?rev=915720view=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=915720r1=915719r2=915720view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Feb 24 08:26:06 2010
@@ -84,7 +84,7 @@
   OP confirms patch fixes issue
   Combined patch file, from revs.904949, 905226, 906465:
   https://issues.apache.org/bugzilla/attachment.cgi?id=24925
-  +1: kkolinko, markt
+  +1: kkolinko, markt, jfclere
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48050



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



Re: Prepping for a 6.0.25 release

2010-02-24 Thread jean-frederic clere
On 02/24/2010 01:27 AM, Mark Thomas wrote:
 As I'm sure you've seen from the slew of commit messages, I've been
 through the 6.0.x status file and applied all the eligible patches.
 
 The only patch I think we need to have for 6.0.25 that doesn't have
 enough votes is the fix for
 https://issues.apache.org/bugzilla/show_bug.cgi?id=48627

I have voted for this one.
I will wait a while and then go for the release.

Cheers

Jean-Frederic

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



DO NOT REPLY [Bug 48627] JasperException with JSF tags and value expressions

2010-02-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48627

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #14 from Mark Thomas ma...@apache.org 2010-02-24 09:17:07 UTC ---
This has been fixed in 6.0.x and will be included in 6.0.25 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: r915729 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/AttributeParser.java java/org/apache/jasper/compiler/Parser.java test/org/apache/jasper/compiler/TestAttribut

2010-02-24 Thread markt
Author: markt
Date: Wed Feb 24 09:17:14 2010
New Revision: 915729

URL: http://svn.apache.org/viewvc?rev=915729view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48627
Regression in re-working of EL parsing
Keep literals as literals
Also handle deferredSyntaxAllowedAsLiteral

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java

tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=915729r1=915728r2=915729view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Feb 24 09:17:14 2010
@@ -76,17 +76,6 @@
if we remove the SCP auto feature, then there should be 
something to replace it with
(http://ant.apache.org/manual/OptionalTasks/scp.html)  
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48627
-  Regression in re-working of EL parsing
-  Keep literals as literals
-  Also handle deferredSyntaxAllowedAsLiteral
-  JUnit test cases and TCK passes with this patch
-  OP confirms patch fixes issue
-  Combined patch file, from revs.904949, 905226, 906465:
-  https://issues.apache.org/bugzilla/attachment.cgi?id=24925
-  +1: kkolinko, markt, jfclere
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48050
   NamingContext.createSubcontext method returns Context with wrong name
   Based on a suggestion by gingyang.xu

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java?rev=915729r1=915728r2=915729view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java 
Wed Feb 24 09:17:14 2010
@@ -24,7 +24,7 @@
  * \${1+1}. After unquoting, both appear as ${1+1} but the first should
  * evaluate to 2 and the second to ${1+1}. Literal \, $ and # need special
  * treatment to ensure there is no ambiguity. The JSP attribute unquoting
- * covers \\, \, \', \$, \#, %\, \%, apos; and quot;
+ * covers \\, \, \', \$, \#, %\gt;, lt;\%, amp;apos; and amp;quot;
  */
 public class AttributeParser {
 
@@ -43,13 +43,16 @@
  *  scripting expressions.
  * @param isELIgnored   Is expression language being ignored on the page
  *  where the JSP attribute is defined.
+ * @param isDeferredSyntaxAllowedAsLiteral
+ *  Are deferred expressions treated as literals?
  * @return  An unquoted JSP attribute that, if it contains
  *  expression language can be safely passed to the EL
  *  processor without fear of ambiguity.
  */
 public static String getUnquoted(String input, char quote,
-boolean isELIgnored) {
+boolean isELIgnored, boolean isDeferredSyntaxAllowedAsLiteral) {
 return (new AttributeParser(input, quote, isELIgnored,
+isDeferredSyntaxAllowedAsLiteral,
 STRICT_QUOTE_ESCAPING)).getUnquoted();
 }
 
@@ -62,15 +65,18 @@
  *  scripting expressions.
  * @param isELIgnored   Is expression language being ignored on the page
  *  where the JSP attribute is defined.
+ * @param isDeferredSyntaxAllowedAsLiteral
+ *  Are deferred expressions treated as literals?
  * @param strictThe value to use for STRICT_QUOTE_ESCAPING.
  * @return  An unquoted JSP attribute that, if it contains
  *  expression language can be safely passed to the EL
  *  processor without fear of ambiguity.
  */
 protected static String getUnquoted(String input, char quote,
-boolean isELIgnored, boolean strict) {
+boolean isELIgnored, boolean isDeferredSyntaxAllowedAsLiteral,
+boolean strict) {
 return (new AttributeParser(input, quote, isELIgnored,
-strict)).getUnquoted();
+isDeferredSyntaxAllowedAsLiteral, strict)).getUnquoted();
 }
 
 /* The quoted input string. */
@@ -83,6 +89,9 @@
  * treated as literals rather than quoted values. */
 private final boolean isELIgnored;
 
+/* Are deferred expression treated as literals */
+private final boolean isDeferredSyntaxAllowedAsLiteral;
+
 /* Overrides the STRICT_QUOTE_ESCAPING. Used for Unit tests 

buildbot success in ASF Buildbot on tomcat-6-trunk

2010-02-24 Thread buildbot
The Buildbot has detected a restored build of tomcat-6-trunk on ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-6-trunk/builds/79

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: 
Build Source Stamp: [branch tomcat/tc6.0.x/trunk] 915720
Blamelist: jfclere,markt

Build succeeded!

sincerely,
 -The ASF Buildbot


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



svn commit: r915732 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_25/

2010-02-24 Thread jfclere
Author: jfclere
Date: Wed Feb 24 10:01:23 2010
New Revision: 915732

URL: http://svn.apache.org/viewvc?rev=915732view=rev
Log:
release 6.0.25

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

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_25/
--
--- svn:ignore (added)
+++ svn:ignore Wed Feb 24 10:01:23 2010
@@ -0,0 +1,3 @@
+output
+.settings
+build.properties

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_25/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 24 10:01:23 2010
@@ -0,0 +1,2 @@
+/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,909875,909887,910442,910471,915226



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



svn commit: r915737 - /tomcat/trunk/java/org/apache/jasper/JspC.java

2010-02-24 Thread kkolinko
Author: kkolinko
Date: Wed Feb 24 10:12:58 2010
New Revision: 915737

URL: http://svn.apache.org/viewvc?rev=915737view=rev
Log:
fixes for #getElement():
- avoid infinite looping on unexpected end of file
- fix XML comment reading

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

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=915737r1=915736r2=915737view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Wed Feb 24 10:12:58 2010
@@ -19,6 +19,7 @@
 
 import java.io.BufferedReader;
 import java.io.CharArrayWriter;
+import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -947,15 +948,18 @@
 while (!done) {
 int current = reader.read();
 while (current != '') {
+if (current  0) {
+throw new EOFException();
+}
 result.append((char) current);
 current = reader.read();
 }
 result.append((char) current);
 
 int len = result.length();
-if (len  7  result.substring(0, 4).equals(!--)) {
+if (len  4  result.substring(0, 4).equals(!--)) {
 // This is a comment - make sure we are at the end
-if (result.substring(len - 3, len).equals(--)) {
+if (len = 7  result.substring(len - 3, len).equals(--)) {
 done = true;
 }
 } else {



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



Re: svn commit: r915603 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ java/org/apache/catalina/manager/ webapps/docs/ webapps/manager/WEB-INF/

2010-02-24 Thread Rainer Jung

On 24.02.2010 01:07, ma...@apache.org wrote:

Author: markt
Date: Wed Feb 24 00:07:06 2010
New Revision: 915603

URL: http://svn.apache.org/viewvc?rev=915603view=rev
Log:
Add basic memory leak detection for JMX and manager (kkolinko/markt)



Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?rev=915603r1=915602r2=915603view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Wed 
Feb 24 00:07:06 2010



@@ -529,6 +549,49 @@



+ * Attempt to identify the contexts that have a class loader memory leak.
+ * This is usually triggered on context reload. Note: This method attempts
+ * to force a full garbage collection. This should be used with extreme
+ * caution on a production system.
+ */
+public String[] findReloadedContextMemoryLeaks() {
+
+System.gc();




Modified: tomcat/tc6.0.x/trunk/webapps/docs/html-manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/html-manager-howto.xml?rev=915603r1=915602r2=915603view=diff
==



+section name=Diagnostics
+
+pstrongThe find leaks diagnostic triggers a full garbage collection. It
+should be used with extreme caution on production systems./strong/p
+
+pThe find leaks diagnostic attempts to identify web applications that have
+caused memory leaks when they were reloaded. Results should always be confirmed
+with a profiler. The diagnostic uses additional functionality provided by the
+StandardHost implementation. It will not work if a custom host is used that
+does not extend StandardHost./p
+



Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=915603r1=915602r2=915603view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Wed Feb 24 00:07:06 2010



+pstrongThe find leaks diagnostic triggers a full garbage collection. It
+should be used with extreme caution on production systems./strong/p


Should we add a note, that the feature will not work in case System.gc() 
has been disabled, e.g. by setting -XX:+DisableExplicitGC  on the 
command line (Sun VM)?


I think there's no good way yet to determine whether explicit GCs are 
possible or not. One could check the input arguments provided by the 
runtime platform mbean, but I think it's not worth it.


Cool stuff otherwise!

Regards,

Rainer



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



Re: svn commit: r915603 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ java/org/apache/catalina/manager/ webapps/docs/ webapps/manager/WEB-INF/

2010-02-24 Thread Mark Thomas

On 24/02/2010 10:18, Rainer Jung wrote:

On 24.02.2010 01:07, ma...@apache.org wrote:

Author: markt
Date: Wed Feb 24 00:07:06 2010
New Revision: 915603

URL: http://svn.apache.org/viewvc?rev=915603view=rev
Log:
Add basic memory leak detection for JMX and manager (kkolinko/markt)



Should we add a note, that the feature will not work in case System.gc()
has been disabled, e.g. by setting -XX:+DisableExplicitGC on the command
line (Sun VM)?


More documentation is always good. There is, of course, no guarantee 
that the GC will run anyway.



I think there's no good way yet to determine whether explicit GCs are
possible or not. One could check the input arguments provided by the
runtime platform mbean, but I think it's not worth it.


I don't have the details (vendor, versions etc) to hand but you can get 
counts of GC via JMX. It may be viable - depending on which vendors/jvms 
support it - to check the GC count before and after we try to trigger it.


Mark



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



[VOTE] Release build 6.0.25

2010-02-24 Thread jean-frederic clere
The candidates binaries are available here:
http://people.apache.org/~jfclere/tomcat-6/v6.0.25/

According to the release process, the 6.0.25 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: [VOTE] Release build 6.0.25

2010-02-24 Thread Mladen Turk

On 02/24/2010 11:56 AM, jean-frederic clere wrote:


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



Checked on windows and linux.

You might wish to add the note about known issue
Windows exception thrown on shutdown
SEVERE: Socket accept failed.
This is now displayed thanks to the tcnative 1.1.20
It is caused by AJP connector not being awaken
from the accept loop like we are doing for http
connectors on shutdown.


Regards
--
^TM

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



Re: svn commit: r915603 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ java/org/apache/catalina/manager/ webapps/docs/ webapps/manager/WEB-INF/

2010-02-24 Thread Rainer Jung

On 24.02.2010 11:47, Mark Thomas wrote:

On 24/02/2010 10:18, Rainer Jung wrote:

On 24.02.2010 01:07, ma...@apache.org wrote:

Author: markt
Date: Wed Feb 24 00:07:06 2010
New Revision: 915603

URL: http://svn.apache.org/viewvc?rev=915603view=rev
Log:
Add basic memory leak detection for JMX and manager (kkolinko/markt)



Should we add a note, that the feature will not work in case System.gc()
has been disabled, e.g. by setting -XX:+DisableExplicitGC on the command
line (Sun VM)?


More documentation is always good. There is, of course, no guarantee
that the GC will run anyway.


OK, I'll have a look if noone beats me to it.


I think there's no good way yet to determine whether explicit GCs are
possible or not. One could check the input arguments provided by the
runtime platform mbean, but I think it's not worth it.


I don't have the details (vendor, versions etc) to hand but you can get
counts of GC via JMX. It may be viable - depending on which vendors/jvms
support it - to check the GC count before and after we try to trigger it.


Good point. It's

java.lang.management.GarbageCollectorMXBean.getCollectionCount()

which is in java.lang.management and not only in sun.com.management.

Problem is, that even for Sun VM it's not trivial to find the right one. 
In general, there are at least two of those, one for the young 
generation (minor GC), and the other one for tenured, perm and young 
(major GC). One could use the name of the bean, or the names of the 
memory pools it handles. But as we know there are various possible 
implementations using bean names containing MarkSweepCompact, PS 
MarkSweep, ConcurrentMarkSweep and memory pool names containing 
Tenured Gen, PS Old Gen, CMS Old Gen. Then the there's G1 and I 
didn't have a look how the names are in that case. So all in all I see 
no robust way to find the right GarbageCollectorMXBean.


Regards,

Rainer

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



svn commit: r915757 - in /tomcat/trunk/webapps/docs: html-manager-howto.xml manager-howto.xml

2010-02-24 Thread rjung
Author: rjung
Date: Wed Feb 24 11:35:58 2010
New Revision: 915757

URL: http://svn.apache.org/viewvc?rev=915757view=rev
Log:
Add remark about reliability of System.gc() to
manager diagnostics docs.

Modified:
tomcat/trunk/webapps/docs/html-manager-howto.xml
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/html-manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/html-manager-howto.xml?rev=915757r1=915756r2=915757view=diff
==
--- tomcat/trunk/webapps/docs/html-manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/html-manager-howto.xml Wed Feb 24 11:35:58 2010
@@ -558,6 +558,12 @@
 StandardHost implementation. It will not work if a custom host is used that
 does not extend StandardHost./p
 
+pExplicitely triggering a full garbage collection from Java Code is 
documented
+to be unreliable. Furthermore, depending on the JVM used, there are options to
+disable explicit GC triggering, like code-XX:+DisableExplicitGC/code.
+If you want to make sure, that the diagnostics were successfully running a 
full GC,
+you will need to check using tools like GC logging, JConsole or simlar./p
+
 /section
 
 section name=Server Information

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=915757r1=915756r2=915757view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Wed Feb 24 11:35:58 2010
@@ -908,6 +908,12 @@
 StandardHost implementation. It will not work if a custom host is used that
 does not extend StandardHost./p
 
+pExplicitely triggering a full garbage collection from Java Code is 
documented
+to be unreliable. Furthermore, depending on the JVM used, there are options to
+disable explicit GC triggering, like code-XX:+DisableExplicitGC/code.
+If you want to make sure, that the diagnostics were successfully running a 
full GC,
+you will need to check using tools like GC logging, JConsole or simlar./p
+
 pIf this command succeeds, you will see a response like this:/p
 source
 /leaking-webapp



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



svn commit: r915759 - in /tomcat/tc6.0.x/trunk/webapps/docs: html-manager-howto.xml manager-howto.xml

2010-02-24 Thread rjung
Author: rjung
Date: Wed Feb 24 11:39:05 2010
New Revision: 915759

URL: http://svn.apache.org/viewvc?rev=915759view=rev
Log:
Add remark about reliability of System.gc() to
manager diagnostics docs.

Backport of r915757 from trunk.

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/html-manager-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/html-manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/html-manager-howto.xml?rev=915759r1=915758r2=915759view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/html-manager-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/html-manager-howto.xml Wed Feb 24 
11:39:05 2010
@@ -558,6 +558,12 @@
 StandardHost implementation. It will not work if a custom host is used that
 does not extend StandardHost./p
 
+pExplicitely triggering a full garbage collection from Java Code is 
documented
+to be unreliable. Furthermore, depending on the JVM used, there are options to
+disable explicit GC triggering, like code-XX:+DisableExplicitGC/code.
+If you want to make sure, that the diagnostics were successfully running a 
full GC,
+you will need to check using tools like GC logging, JConsole or simlar./p
+
 /section
 
 section name=Server Information

Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=915759r1=915758r2=915759view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Wed Feb 24 11:39:05 2010
@@ -914,6 +914,12 @@
 StandardHost implementation. It will not work if a custom host is used that
 does not extend StandardHost./p
 
+pExplicitely triggering a full garbage collection from Java Code is 
documented
+to be unreliable. Furthermore, depending on the JVM used, there are options to
+disable explicit GC triggering, like code-XX:+DisableExplicitGC/code.
+If you want to make sure, that the diagnostics were successfully running a 
full GC,
+you will need to check using tools like GC logging, JConsole or simlar./p
+
 pIf this command succeeds, you will see a response like this:/p
 source
 /leaking-webapp



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



svn commit: r915861 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

2010-02-24 Thread mturk
Author: mturk
Date: Wed Feb 24 16:49:19 2010
New Revision: 915861

URL: http://svn.apache.org/viewvc?rev=915861view=rev
Log:
Fix thrown accept error on shutdown

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=915861r1=915860r2=915861view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Feb 24 
16:49:19 2010
@@ -781,7 +781,7 @@
 Socket.destroy(socket);
 }
 } catch (Throwable t) {
-log.error(sm.getString(endpoint.accept.fail), t);
+if (running) 
log.error(sm.getString(endpoint.accept.fail), t);
 }
 
 // The processor will recycle itself when it finishes



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



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

2010-02-24 Thread mturk
Author: mturk
Date: Wed Feb 24 16:58:25 2010
New Revision: 915870

URL: http://svn.apache.org/viewvc?rev=915870view=rev
Log:
Propose a backport for shutdown exception patch

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=915870r1=915869r2=915870view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Feb 24 16:58:25 2010
@@ -135,3 +135,11 @@
   -1: 
kkolinko: mark User constructor as protected, replace ArrayList argument
 with a List, and maybe address sebb's comments to r910485 on dev@
+
+* Do not throw exception on shutdown
+  Based on the https://svn.apache.org/viewvc?view=revisionrevision=915861
+  6.0.x patch is at
+  http://people.apache.org/~mturk/tomcat/patches/915861.patch
+  +1: mturk
+  -1: 
+



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



DO NOT REPLY [Bug 48810] New: error handler chain doesn't show errors on tag files compilation

2010-02-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48810

   Summary: error handler chain doesn't show errors on tag files
compilation
   Product: Tomcat 6
   Version: 6.0.24
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: manuel.molas...@gmail.com


Created an attachment (id=25052)
 -- (https://issues.apache.org/bugzilla/attachment.cgi?id=25052)
patch on JspDocumentParser and ErrorDispatcher to print the stacktrace of
underlying tag-files compilation errors

When i have errors in my .tag files (in classpath), the log just gives me a
generic: 
/pages/.jsp Could not add one or more tag libraries

This error does not help discovering the underlying problem.

I've patched (see the attachment) JspDocumentParser and ErrorDispatcher to
print the stacktrace of underlying compilation errors.

-- 
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 48392] jdbc-pool is not returning the proxied connection in resultSet and statement

2010-02-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392

Filip Hanik fha...@apache.org changed:

   What|Removed |Added

 CC||fha...@apache.org

--- Comment #4 from Filip Hanik fha...@apache.org 2010-02-24 17:44:08 UTC ---
The patch contains a package name we can't use, and it doesn't have any license
header in it.

Can you adjust the package name to 
org.apache.tomcat.jdbc.pool.interceptor

and add the license header (just look at an existing source file)

-- 
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: r915902 [2/2] - in /tomcat/trunk/modules/tomcat-lite: ./ java/org/apache/tomcat/integration/jmx/ java/org/apache/tomcat/lite/http/ java/org/apache/tomcat/lite/io/ java/org/apache/tomcat/li

2010-02-24 Thread costin
Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/WebappFilterMapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/WebappFilterMapper.java?rev=915902r1=915901r2=915902view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/WebappFilterMapper.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/WebappFilterMapper.java
 Wed Feb 24 18:03:00 2010
@@ -32,6 +32,7 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.tomcat.lite.util.URLEncoder;
 import org.apache.tomcat.servlets.util.RequestUtil;
 
 /**
@@ -430,7 +431,7 @@
 }
 
 public void setURLPattern(String urlPattern) {
-this.urlPattern = RequestUtil.URLDecode(urlPattern);
+this.urlPattern = URLEncoder.URLDecode(urlPattern);
 }
 
 /**

Copied: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java 
(from r907366, 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/Base64.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.javap1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/Base64.javar1=907366r2=915902rev=915902view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/Base64.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java 
Wed Feb 24 18:03:00 2010
@@ -16,7 +16,7 @@
  */
 
 
-package org.apache.tomcat.servlets.util;
+package org.apache.tomcat.lite.util;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -165,7 +165,10 @@
 return encodedData;
 }
 
-
+public byte[] decode(String enc) {
+return decode(enc.getBytes());
+}
+
 /**
  * Decodes Base64 data into octects
  *

Copied: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/FastHttpDateFormat.java
 (from r907366, 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/FastHttpDateFormat.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/FastHttpDateFormat.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/FastHttpDateFormat.javap1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/FastHttpDateFormat.javar1=907366r2=915902rev=915902view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/FastHttpDateFormat.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/FastHttpDateFormat.java
 Wed Feb 24 18:03:00 2010
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.tomcat.servlets.util;
+package org.apache.tomcat.lite.util;
 
 import java.text.DateFormat;
 import java.text.ParseException;

Copied: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/LocaleParser.java
 (from r907366, 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/LocaleParser.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/LocaleParser.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/LocaleParser.javap1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/LocaleParser.javar1=907366r2=915902rev=915902view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/LocaleParser.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/LocaleParser.java
 Wed Feb 24 18:03:00 2010
@@ -16,7 +16,7 @@
  */
 
 
-package org.apache.tomcat.servlets.util;
+package org.apache.tomcat.lite.util;
 
 import java.util.ArrayList;
 import java.util.Locale;

Copied: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/MimeMap.java 
(from r907366, 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/MimeMap.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/MimeMap.java?p2=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/MimeMap.javap1=tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/MimeMap.javar1=907366r2=915902rev=915902view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/MimeMap.java
 (original)
+++ 

DO NOT REPLY [Bug 48392] jdbc-pool is not returning the proxied connection in resultSet and statement

2010-02-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392

gfernandes gsfernan...@gmail.com changed:

   What|Removed |Added

  Attachment #24713|0   |1
is obsolete||

--- Comment #5 from gfernandes gsfernan...@gmail.com 2010-02-24 18:06:13 UTC 
---
Created an attachment (id=25054)
 -- (https://issues.apache.org/bugzilla/attachment.cgi?id=25054)
Corrected package and added license header

Corrected the package and added the license header as suggested by Filip.

-- 
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 48392] jdbc-pool is not returning the proxied connection in resultSet and statement

2010-02-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392

gfernandes gsfernan...@gmail.com changed:

   What|Removed |Added

  Attachment #25054|Corrected package and added |Statement decorator
description|license header  |interceptor that proxies
   ||the resultSet and
   ||statement.

-- 
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 48813] New: Allow the parameter org.apache.el.parser.COERCE_TO_ZERO to be set on runtime

2010-02-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48813

   Summary: Allow the parameter
org.apache.el.parser.COERCE_TO_ZERO to be set on
runtime
   Product: Tomcat 6
   Version: 6.0.24
  Platform: PC
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: rpm_mail...@yahoo.com.br


Created an attachment (id=25055)
 -- (https://issues.apache.org/bugzilla/attachment.cgi?id=25055)
Adds 2 new classes (ELParameters and CoerceToZeroConfigurer) in a new package
(org.apache.el.parser.parameters) while modifying the AstValue class, composing
a solution proposal to this issue.

The parameter org.apache.el.parser.COERCE_TO_ZERO can only be used while
starting up Tomcat or any other application that uses the Jasper Expression
Language implementation. I think that one should be able to set such parameter
on runtime, specially while an application is being loaded.

The attached patch implements the requested feature.

-- 
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 48813] Allow the parameter org.apache.el.parser.COERCE_TO_ZERO to be set on runtime

2010-02-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48813

--- Comment #1 from Ramiro Pereira de Magalhaes rpm_mail...@yahoo.com.br 
2010-02-24 19:18:22 UTC ---
Please, notice that the patch was made against the trunk, revision 915902.

-- 
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 48813] Allow the parameter org.apache.el.parser.COERCE_TO_ZERO to be set on runtime

2010-02-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48813

Ramiro Pereira de Magalhaes rpm_mail...@yahoo.com.br changed:

   What|Removed |Added

 CC||rpm_mail...@yahoo.com.br

-- 
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: r915940 - in /tomcat/trunk/modules/jdbc-pool: doc/jdbc-pool.xml java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java

2010-02-24 Thread fhanik
Author: fhanik
Date: Wed Feb 24 19:27:09 2010
New Revision: 915940

URL: http://svn.apache.org/viewvc?rev=915940view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392
Add an interceptor to be able to wrap existing statements and result sets to 
prevent code from accessing the connection
Patch submitted by gsfernan...@gmail.com


Added:

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
   (with props)
Modified:
tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml

Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=915940r1=915939r2=915940view=diff
==
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Wed Feb 24 19:27:09 2010
@@ -472,6 +472,13 @@
 attributes
 /attributes  
   /subsection
+  subsection 
name=org.apache.tomcat.jdbc.pool.interceptor.StatementDecoratorInterceptor
+pSee bug48392/bug. Interceptor to wrap statements and result sets in 
order to prevent access to the actual connection
+   using the methods codeResultSet.getStatement().getConnection()/code 
and codeStatement.getConnection()/code
+/p   
+attributes
+/attributes  
+  /subsection
   subsection name=org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport
 pKeeps track of query performance and issues log entries when queries 
exceed a time threshold of fail.
The log level used is codeWARN/code

Added: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java?rev=915940view=auto
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
 (added)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
 Wed Feb 24 19:27:09 2010
@@ -0,0 +1,221 @@
+/*
+ * 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.tomcat.jdbc.pool.interceptor;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.jdbc.pool.JdbcInterceptor;
+import 
org.apache.tomcat.jdbc.pool.interceptor.AbstractCreateStatementInterceptor;
+
+/**
+ * Implementation of bJdbcInterceptor/b that proxies resultSets and 
statements.
+ * @author Guillermo Fernandes
+ */
+public class StatementDecoratorInterceptor extends 
AbstractCreateStatementInterceptor {
+
+private static final Log logger = 
LogFactory.getLog(StatementDecoratorInterceptor.class);
+
+private static final String[] EXECUTE_QUERY_TYPES = { executeQuery };
+
+/**
+ * the constructors that are used to create statement proxies
+ */
+protected static final Constructor?[] constructors = new 
Constructor[AbstractCreateStatementInterceptor.STATEMENT_TYPE_COUNT];
+
+/**
+ * the constructor to create the resultSet proxies
+ */
+protected static Constructor? resultSetConstructor = null;
+
+@Override
+public void closeInvoked() {
+// nothing to do
+}
+
+/**
+ * Creates a constructor for a proxy class, if one doesn't already exist
+ * 
+ * @param idx
+ *- the index of the constructor
+ * @param clazz
+ *- the interface that the proxy will implement
+ * @return - returns a constructor used to create new instances
+ * @throws NoSuchMethodException
+ */
+protected Constructor? 

DO NOT REPLY [Bug 48392] jdbc-pool is not returning the proxied connection in resultSet and statement

2010-02-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392

Filip Hanik fha...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #6 from Filip Hanik fha...@apache.org 2010-02-24 19:28:36 UTC ---
Thank you for the patch. It's been committed with a change to
org.apache.juli.Log instead of Log4j

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

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



[Tomcat Wiki] Update of angosso/S2PLUGINS by roger Mb iama

2010-02-24 Thread Apache Wiki
Dear Wiki user,

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

The angosso/S2PLUGINS page has been changed by roger Mbiama.
The comment on this change is: [[angosso.jpg|siteweb]].
http://wiki.apache.org/tomcat/angosso/S2PLUGINS

--

New page:
Rédiger « angosso/S2PLUGINS » Angosso Plugin
Publisherangosso.com
License  Open Source (ASL2) [HDIV (HTTP Data Integrity Validator)].

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



svn commit: r916097 - /tomcat/trunk/java/org/apache/jasper/JspC.java

2010-02-24 Thread kkolinko
Author: kkolinko
Date: Thu Feb 25 02:58:25 2010
New Revision: 916097

URL: http://svn.apache.org/viewvc?rev=916097view=rev
Log:
fix for #mergeIntoWebXml()
Note that the inserted flag was never set to true in the old code.

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

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=916097r1=916096r2=916097view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Feb 25 02:58:25 2010
@@ -882,9 +882,9 @@
 boolean inserted = false;
 int current = reader.read();
 while (current  -1) {
-if (!inserted  current == '') {
+if (current == '') {
 String element = getElement(reader);
-if (insertBefore.contains(element)) {
+if (!inserted  insertBefore.contains(element)) {
 // Insert generated content here
 writer.println(insertStartMarker);
 while (true) {
@@ -898,11 +898,26 @@
 writer.println(insertEndMarker);
 writer.println();
 writer.write(element);
-} else if (element.contains(insertStartMarker)) {
+inserted = true;
+} else if (element.equals(insertStartMarker)) {
 // Skip the previous auto-generated content
-while (!element.contains(insertEndMarker)) {
-element = getElement(reader);
+while (true) {
+current = reader.read();
+if (current  0) {
+throw new EOFException();
+}
+if (current == '') {
+element = getElement(reader);
+if (element.equals(insertEndMarker)) {
+break;
+}
+}
 }
+current = reader.read();
+while (current == '\n' || current == '\r') {
+current = reader.read();
+}
+continue;
 } else {
 writer.write(element);
 }



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



DO NOT REPLY [Bug 47242] request for AJP command line client

2010-02-24 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47242

--- Comment #9 from chamith buddhika chamibuddh...@gmail.com 2010-02-25 
03:23:26 UTC ---
Created an attachment (id=25056)
 -- (https://issues.apache.org/bugzilla/attachment.cgi?id=25056)
AJP command line client

Hi all,

I am attaching the initial version of the client that I have been working on.
It is capable of fetching URLs specified on the command line and also is
capable of reading a configuration file to get the URL details. But it's not
very comprehensive and may have bugs. I would appreciate your suggestions on
this.

-- 
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: r916141 - in /tomcat/trunk/java/org/apache/jasper: JspC.java Options.java

2010-02-24 Thread kkolinko
Author: kkolinko
Date: Thu Feb 25 06:05:55 2010
New Revision: 916141

URL: http://svn.apache.org/viewvc?rev=916141view=rev
Log:
updated the JavaDoc

Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/Options.java

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=916141r1=916140r2=916141view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Feb 25 06:05:55 2010
@@ -70,20 +70,17 @@
  *
  * It can be used as an Ant task using:
  * pre
- *   lt;taskdef classname=org.apache.jasper.JspC name=jasper2 gt;
+ *   lt;taskdef classname=org.apache.jasper.JspC name=jasper gt;
  *  lt;classpathgt;
  *  lt;pathelement location=${java.home}/../lib/tools.jar/gt;
- *  lt;fileset dir=${ENV.CATALINA_HOME}/server/libgt;
- *  lt;include name=*.jar/gt;
- *  lt;/filesetgt;
- *  lt;fileset dir=${ENV.CATALINA_HOME}/common/libgt;
+ *  lt;fileset dir=${ENV.CATALINA_HOME}/libgt;
  *  lt;include name=*.jar/gt;
  *  lt;/filesetgt;
  *  lt;path refid=myjars/gt;
  *   lt;/classpathgt;
  *  lt;/taskdefgt;
  *
- *  lt;jasper2 verbose=0
+ *  lt;jasper verbose=0
  *   package=my.package
  *   uriroot=${webapps.dir}/${webapp.name}
  *   webXmlFragment=${build.dir}/generated_web.xml
@@ -269,6 +266,12 @@
 }
 }
 
+/**
+ * Apply command-line arguments.
+ * 
+ * @param arg
+ *The arguments
+ */
 public void setArgs(String[] arg) throws JasperException {
 args = arg;
 String tok;
@@ -375,43 +378,76 @@
 }
 }
 
+/**
+ * In JspC this always returns codetrue/code.
+ * {...@inheritdoc}
+ */
 public boolean getKeepGenerated() {
 // isn't this why we are running jspc?
 return true;
 }
 
+/**
+ * {...@inheritdoc}
+ */
 public boolean getTrimSpaces() {
 return trimSpaces;
 }
 
+/**
+ * Sets the option to trim white spaces between directives or actions.
+ */
 public void setTrimSpaces(boolean ts) {
 this.trimSpaces = ts;
 }
 
+/**
+ * {...@inheritdoc}
+ */
 public boolean isPoolingEnabled() {
 return poolingEnabled;
 }
 
+/**
+ * Sets the option to enable the tag handler pooling.
+ */
 public void setPoolingEnabled(boolean poolingEnabled) {
 this.poolingEnabled = poolingEnabled;
 }
 
+/**
+ * {...@inheritdoc}
+ */
 public boolean isXpoweredBy() {
 return xpoweredBy;
 }
 
+/**
+ * Sets the option to enable generation of X-Powered-By response header.
+ */
 public void setXpoweredBy(boolean xpoweredBy) {
 this.xpoweredBy = xpoweredBy;
 }
 
+/**
+ * In JspC this always returns codetrue/code.
+ * {...@inheritdoc}
+ */
 public boolean getDisplaySourceFragment() {
 return true;
 }
-
+
+/**
+ * {...@inheritdoc}
+ */
 public boolean getErrorOnUseBeanInvalidClassAttribute() {
 return errorOnUseBeanInvalidClassAttribute;
 }
 
+/**
+ * Sets the option to issue a compilation error if the class attribute
+ * specified in useBean action is invalid.
+ */
 public void setErrorOnUseBeanInvalidClassAttribute(boolean b) {
 errorOnUseBeanInvalidClassAttribute = b;
 }
@@ -421,7 +457,7 @@
 }
 
 /**
- * Are we supporting HTML mapped servlets?
+ * {...@inheritdoc}
  */
 public boolean getMappedFile() {
 return mappedFile;
@@ -432,23 +468,31 @@
 return null;
 }
 
+/**
+ * Sets the option to include debug information in compiled class.
+ */
 public void setClassDebugInfo( boolean b ) {
 classDebugInfo=b;
 }
 
+/**
+ * {...@inheritdoc}
+ */
 public boolean getClassDebugInfo() {
 // compile with debug info
 return classDebugInfo;
 }
 
- /**
-  * @see Options#isCaching()
+/**
+ * {...@inheritdoc}
  */
 public boolean isCaching() {
 return caching;
 }
 
 /**
+ * Sets the option to enable caching.
+ * 
  * @see Options#isCaching()
  */
 public void setCaching(boolean caching) {
@@ -456,57 +500,61 @@
 }
 
 /**
- * @see Options#getCache()
+ * {...@inheritdoc}
  */
 public MapString, TagLibraryInfo getCache() {
 return cache;
 }
 
 /**
- * Background compilation check intervals in seconds
+ * In JspC this always returns code0/code.
+ * {...@inheritdoc}
  */
 public int getCheckInterval() {
 return 0;
 }
 
 /**
- * Modification test interval.
+ * In JspC this always returns 

svn commit: r916143 - /tomcat/trunk/java/org/apache/jasper/JspC.java

2010-02-24 Thread kkolinko
Author: kkolinko
Date: Thu Feb 25 06:08:58 2010
New Revision: 916143

URL: http://svn.apache.org/viewvc?rev=916143view=rev
Log:
Remove unused public methods

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

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=916143r1=916142r2=916143view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Feb 25 06:08:58 2010
@@ -452,10 +452,6 @@
 errorOnUseBeanInvalidClassAttribute = b;
 }
 
-public int getTagPoolSize() {
-return Constants.MAX_POOL_SIZE;
-}
-
 /**
  * {...@inheritdoc}
  */
@@ -463,11 +459,6 @@
 return mappedFile;
 }
 
-// Off-line compiler, no need for security manager
-public Object getProtectionDomain() {
-return null;
-}
-
 /**
  * Sets the option to include debug information in compiled class.
  */
@@ -604,16 +595,6 @@
 return scratchDir;
 }
 
-public Class? getJspCompilerPlugin() {
-   // we don't compile, so this is meaningless
-return null;
-}
-
-public String getJspCompilerPath() {
-   // we don't compile, so this is meaningless
-return null;
-}
-
 /**
  * {...@inheritdoc}
  */



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



svn commit: r916157 - in /tomcat/trunk/java/org/apache/jasper: JspC.java resources/LocalStrings.properties

2010-02-24 Thread kkolinko
Author: kkolinko
Date: Thu Feb 25 07:03:14 2010
New Revision: 916157

URL: http://svn.apache.org/viewvc?rev=916157view=rev
Log:
Improvements for JspC:
- allow the encoding used for web.xml files to be specified explicitly,
- allow the addWebXmlMappings option to be specified on the command line

Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=916157r1=916156r2=916157view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Feb 25 07:03:14 2010
@@ -24,9 +24,9 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.Writer;
@@ -115,6 +115,8 @@
 protected static final String SWITCH_FILE_WEBAPP = -webapp;
 protected static final String SWITCH_WEBAPP_INC = -webinc;
 protected static final String SWITCH_WEBAPP_XML = -webxml;
+protected static final String SWITCH_WEBAPP_XML_ENCODING = 
-webxmlencoding;
+protected static final String SWITCH_ADD_WEBAPP_XML_MAPPINGS = 
-addwebxmlmappings;
 protected static final String SWITCH_MAPPED = -mapped;
 protected static final String SWITCH_XPOWERED_BY = -xpoweredBy;
 protected static final String SWITCH_TRIM_SPACES = -trimSpaces;
@@ -213,6 +215,7 @@
 // Generation of web.xml fragments
 protected String webxmlFile;
 protected int webxmlLevel;
+protected String webxmlEncoding;
 protected boolean addWebXmlMappings = false;
 
 protected Writer mapout;
@@ -313,6 +316,10 @@
 if (webxmlFile != null) {
 webxmlLevel = ALL_WEBXML;
 }
+} else if (tok.equals(SWITCH_WEBAPP_XML_ENCODING)) {
+setWebXmlEncoding(nextArg());
+} else if (tok.equals(SWITCH_ADD_WEBAPP_XML_MAPPINGS)) {
+setAddWebXmlMappings(true);
 } else if (tok.equals(SWITCH_MAPPED)) {
 mappedFile = true;
 } else if (tok.equals(SWITCH_XPOWERED_BY)) {
@@ -855,6 +862,20 @@
 }
 
 /**
+ * Sets the encoding to be used to read and write web.xml files.
+ * 
+ * p
+ * If not specified, defaults to the platform default encoding.
+ * /p
+ * 
+ * @param encoding
+ *Encoding, e.g. UTF-8.
+ */
+public void setWebXmlEncoding(String encoding) {
+webxmlEncoding = encoding;
+}
+
+/**
  * Sets the option to merge generated web.xml fragment into the
  * WEB-INF/web.xml file of the web application that we were processing.
  * 
@@ -955,10 +976,10 @@
 String insertEndMarker =
 Localizer.getMessage(jspc.webinc.insertEnd);
 
-BufferedReader reader = new BufferedReader(new FileReader(webXml));
-BufferedReader fragmentReader =
-new BufferedReader(new FileReader(webxmlFile));
-PrintWriter writer = new PrintWriter(new FileWriter(webXml2));
+BufferedReader reader = new BufferedReader(openWebxmlReader(webXml));
+BufferedReader fragmentReader = new BufferedReader(
+openWebxmlReader(new File(webxmlFile)));
+PrintWriter writer = new PrintWriter(openWebxmlWriter(webXml2));
 
 // Insert the servlet and servlet-mapping declarations
 boolean inserted = false;
@@ -1321,8 +1342,7 @@
 protected void initWebXml() {
 try {
 if (webxmlLevel = INC_WEBXML) {
-File fmapings = new File(webxmlFile);
-mapout = new FileWriter(fmapings);
+mapout = openWebxmlWriter(new File(webxmlFile));
 servletout = new CharArrayWriter();
 mappingout = new CharArrayWriter();
 } else {
@@ -1535,4 +1555,26 @@
  return 
FileUtils.getFileUtils().resolveFile(getProject().getBaseDir(), s);
  }
  }
+
+private Reader openWebxmlReader(File file) throws IOException {
+FileInputStream fis = new FileInputStream(file);
+try {
+return webxmlEncoding != null ? new InputStreamReader(fis,
+webxmlEncoding) : new InputStreamReader(fis);
+} catch (IOException ex) {
+fis.close();
+throw ex;
+}
+}
+
+private Writer openWebxmlWriter(File file) throws IOException {
+FileOutputStream fos = new FileOutputStream(file);
+try {
+return webxmlEncoding != null ? new OutputStreamWriter(fos,
+webxmlEncoding) 

svn commit: r916160 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/jasper/JspC.java java/org/apache/jasper/Options.java

2010-02-24 Thread kkolinko
Author: kkolinko
Date: Thu Feb 25 07:13:03 2010
New Revision: 916160

URL: http://svn.apache.org/viewvc?rev=916160view=rev
Log:
updated the JavaDoc
(merged r916141)

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/Options.java

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 07:13:03 2010
@@ -1,2 +1,2 @@
 /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,909875,909887,910442,910471,915226
+/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
 

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

2010-02-24 Thread kkolinko
Author: kkolinko
Date: Thu Feb 25 07:46:42 2010
New Revision: 916165

URL: http://svn.apache.org/viewvc?rev=916165view=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=916165r1=916164r2=916165view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 25 07:46:42 2010
@@ -111,7 +111,18 @@
   Take account of comments when working out where to insert generated web.xml 
   http://people.apache.org/~markt/patches/2010-02-13-bug48371.patch
   +1: markt, fhanik
-  -1: 
+  -1: kkolinko: suffers from issues fixed by r915737, 916097
+
+  Updated patch file:
+  - Fix BZ 48371: Take account of comments when working out where to insert
+  generated web.xml (backport of r909869 by markt, 915737, 916097)
+  - Deprecate methods, removed in TC7 (r916143)
+  - Allow the encoding used for web.xml files to be configured,
+and allow the addWebXmlMappings option to be specified on the command line 
(r916157)
+  http://people.apache.org/~kkolinko/patches/2010-02-25_tc6_bug48371.patch
+  +1: kkolinko
+  -1:
+
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48545
   Truststores don't have to have passwords



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