DO NOT REPLY [Bug 51966] Tomcat does not support ssha hashed passwords in all contexts
https://issues.apache.org/bugzilla/show_bug.cgi?id=51966 --- Comment #8 from Neale Rudd 2012-03-20 07:07:08 UTC --- Could also change Realmbase.main to use SecureRandom. -- 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: r1302791 - /tomcat/jk/trunk/xdocs/news/20120301.xml
Author: mturk Date: Tue Mar 20 08:01:09 2012 New Revision: 1302791 URL: http://svn.apache.org/viewvc?rev=1302791&view=rev Log: Add announced message Modified: tomcat/jk/trunk/xdocs/news/20120301.xml Modified: tomcat/jk/trunk/xdocs/news/20120301.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20120301.xml?rev=1302791&r1=1302790&r2=1302791&view=diff == --- tomcat/jk/trunk/xdocs/news/20120301.xml (original) +++ tomcat/jk/trunk/xdocs/news/20120301.xml Tue Mar 20 08:01:09 2012 @@ -31,6 +31,19 @@ + + + +The Apache Tomcat team wishes to draw your attention to stability issues + that have been identified with the recent mod_jk 1.2.33 release. If you + have not yet upgraded to mod_jk 1.2.33 we recommend that you wait for + the mod_jk 1.2.34 release which is currently in progress. If you have + upgraded and are experienced issues we recommend that you downgrade to + mod_jk 1.2.32 until mod_jk 1.2.34 is available. + +We apologise for any inconvenience. + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302792 - /tomcat/jk/trunk/xdocs/index.xml
Author: mturk Date: Tue Mar 20 08:04:14 2012 New Revision: 1302792 URL: http://svn.apache.org/viewvc?rev=1302792&view=rev Log: Update doc index as well Modified: tomcat/jk/trunk/xdocs/index.xml Modified: tomcat/jk/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1302792&r1=1302791&r2=1302792&view=diff == --- tomcat/jk/trunk/xdocs/index.xml (original) +++ tomcat/jk/trunk/xdocs/index.xml Tue Mar 20 08:04:14 2012 @@ -45,6 +45,16 @@ manual is described in more detail below +13 March 2012 - JK-1.2.33 stability issue +The Apache Tomcat team wishes to draw your attention to stability issues +that have been identified with the recent mod_jk 1.2.33 release. If you +have not yet upgraded to mod_jk 1.2.33 we recommend that you wait for +the mod_jk 1.2.34 release which is currently in progress. If you have +upgraded and are experienced issues we recommend that you downgrade to +mod_jk 1.2.32 until mod_jk 1.2.34 is available. + +We apologise for any inconvenience. + 13 March 2012 - JK-1.2.33 released The Apache Tomcat team is proud to announce the immediate availability - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302793 - /tomcat/jk/trunk/xdocs/index.xml
Author: mturk Date: Tue Mar 20 08:05:19 2012 New Revision: 1302793 URL: http://svn.apache.org/viewvc?rev=1302793&view=rev Log: Use correct date Modified: tomcat/jk/trunk/xdocs/index.xml Modified: tomcat/jk/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1302793&r1=1302792&r2=1302793&view=diff == --- tomcat/jk/trunk/xdocs/index.xml (original) +++ tomcat/jk/trunk/xdocs/index.xml Tue Mar 20 08:05:19 2012 @@ -45,7 +45,7 @@ manual is described in more detail below -13 March 2012 - JK-1.2.33 stability issue +19 March 2012 - JK-1.2.33 stability issue The Apache Tomcat team wishes to draw your attention to stability issues that have been identified with the recent mod_jk 1.2.33 release. If you have not yet upgraded to mod_jk 1.2.33 we recommend that you wait for - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302795 - /tomcat/jk/tags/JK_1_2_34/
Author: mturk Date: Tue Mar 20 08:15:14 2012 New Revision: 1302795 URL: http://svn.apache.org/viewvc?rev=1302795&view=rev Log: Tag 1.2.34 Added: tomcat/jk/tags/JK_1_2_34/ - copied from r1302794, tomcat/jk/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat Connectors 1.2.34
Hi, Apache Tomcat Connectors 1.2.34 release candidate is ready for vote at [1]. This version solves regression(s) found in released version 1.2.33 and one long lasting IIS shared memory synchronization bug. The VOTE will remain open for at least 48 hours. The Apache Tomcat Connectors 1.2.34 is [ ] Stable, go ahead and release [ ] Broken because of ... [1] http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.34/ Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1302649 - /tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 20/03/2012 01:35, Christopher Schultz wrote:
> Mark,
>
> On 3/19/12 4:46 PM, ma...@apache.org wrote:
>> Author: markt Date: Mon Mar 19 20:46:15 2012 New Revision:
>> 1302649
>>
>> URL: http://svn.apache.org/viewvc?rev=1302649&view=rev Log: Make
>> implementation of getParentClassLoader() consistent with the
>> other implementations across the code base.
>>
>> Modified:
>> tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
>>
>> Modified:
>> tomcat/trunk/java/org/apache/catalina/startup/Catalina.java URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1302649&r1=1302648&r2=1302649&view=diff
>>
>>
==
>> --- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
>> (original) +++
>> tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Mon
>> Mar 19 20:46:15 2012 @@ -177,7 +177,10 @@ public class Catalina
>> { }
>>
>> public ClassLoader getParentClassLoader() { -return
>> parentClassLoader; +if (parentClassLoader != null) { +
>> return (parentClassLoader); +} +return
>> ClassLoader.getSystemClassLoader(); }
>
> Not sure if this nit is too find to pick, but ClassLoader Javadoc
> says that if getParent() returns null, then the parent is the
> "bootstrap" ClassLoader. There seems to be a difference between
> "system" and "bootstrap" but it's not evident merely from reading
> the javadoc.
I am well aware of the difference.
> In this case, system ~= bootstrap, but I wanted to make sure that
> was an intentional decision. On the other hand, there's no way to
> directly get the bootstrap ClassLoader via the API anyway, so I'm
> not sure it matters at all.
The patch was intentional. The aim was to make the handling consistent.
There may be a separate issue around bootstrap vs system in osgi
environments but we can cross that bridge when we come to it.
Mark
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQIcBAEBAgAGBQJPaEqSAAoJEBDAHFovYFnnKegQAJwM7fSX/kgLCEU2dpvEJKcp
34p1YXUTqqCS3pYCze/0z3smLf68RKBoMpXy9F361K8FZk62bG7LbC8nTw15yLWc
W75xH+bFJrODQ/+N9b91Q3mwkn1idBgogNphdNwWL5j7G0h4b2IHhUavKlZ4e62O
HnpOqv/WrU192dtgPNFOpC7MJlI6ZLUamhABtE+iMdZZfpiMnoNoVvvCQhPoqNe/
k6X1d30OQxAhy+FKiWkuJKO4af1vbuY5fyuKmkqAb0PxeY3BRLksn0CfZAS8+yhz
lh+VWIyacmgbQZXf3gWEbcIpU+nqyNdl0CbmaYiELbAtWvxgnJCWcC8a5RVS3k5t
eZbay3acX0+njEs3R6FCNVJiAwC0gcfQngu9phLyHWSNr8vUtyV0QFaYyX2No2hV
JV5ZZl2y1oPanXixcAaquYEYeP66z2KfXb7SohaD8JWnCXosy1QmXawGwqMdXDKm
yrh78SyfRTSLHz9rW5NdVWwGPe08Zg06cwf1qT08HUiBMZiZwnc8rjH6PoeUGW06
O21gp1w25Ee/dyEBe7wXbP47bhMc3tYT9agy1b07Roxaqv4g0nc7MFueeZUsC0Dq
55Vs3Wg148pyecXu6b1LrJqENsUfCVbnKEiukF4Yxyq5TMPL63NF7TG/x8yhELyq
wcdjNRHVTs0EQtkuRkBn
=uaUd
-END PGP SIGNATURE-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302837 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: markt
Date: Tue Mar 20 11:07:21 2012
New Revision: 1302837
URL: http://svn.apache.org/viewvc?rev=1302837&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52926
Protect against a NPE if the socket has been closed on another thread
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1302837&r1=1302836&r2=1302837&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Mar 20
11:07:21 2012
@@ -718,6 +718,9 @@ public class NioEndpoint extends Abstrac
public boolean processSocket(NioChannel socket, SocketStatus status,
boolean dispatch) {
try {
KeyAttachment attachment =
(KeyAttachment)socket.getAttachment(false);
+if (attachment == null) {
+return false;
+}
attachment.setCometNotify(false); //will get reset upon next reg
SocketProcessor sc = processorCache.poll();
if ( sc == null ) sc = new SocketProcessor(socket,status);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302839 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml
Author: markt
Date: Tue Mar 20 11:10:46 2012
New Revision: 1302839
URL: http://svn.apache.org/viewvc?rev=1302839&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52926
Protect against a NPE if the socket has been closed on another thread
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1302837
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1302839&r1=1302838&r2=1302839&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue
Mar 20 11:10:46 2012
@@ -718,6 +718,9 @@ public class NioEndpoint extends Abstrac
public boolean processSocket(NioChannel socket, SocketStatus status,
boolean dispatch) {
try {
KeyAttachment attachment =
(KeyAttachment)socket.getAttachment(false);
+if (attachment == null) {
+return false;
+}
attachment.setCometNotify(false); //will get reset upon next reg
SocketProcessor sc = processorCache.poll();
if ( sc == null ) sc = new SocketProcessor(socket,status);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1302839&r1=1302838&r2=1302839&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 20 11:10:46 2012
@@ -137,6 +137,10 @@
client breaks the connection before reading all the requested data.
(markt)
+
+52926: Avoid NPE when an NIO Comet connection times out on
+one thread at the same time as it is closed on another thread. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52926] NPE in processSocket
https://issues.apache.org/bugzilla/show_bug.cgi?id=52926 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2012-03-20 11:11:14 UTC --- Thanks for the report. Fixed in trunk and 7.0.x and will be included in 7.0.27 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
DO NOT REPLY [Bug 52931] When using TLDs for Tag Files and specifying the JSP version, EL is ignored by default and cannot be overriden with isELIgnored
https://issues.apache.org/bugzilla/show_bug.cgi?id=52931 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Mark Thomas 2012-03-20 11:27:14 UTC --- tlib-version has no relationship to specification versions. Tomcat is behaving correctly here. -- 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 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 Matafagafo changed: What|Removed |Added CC||matafag...@yahoo.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49135] SPDY Connector for The Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=49135 Matafagafo changed: What|Removed |Added CC||matafag...@yahoo.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/483 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1302839 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50565] Static variables should be accessed in a static way
https://issues.apache.org/bugzilla/show_bug.cgi?id=50565 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #1 from Filip Hanik 2012-03-20 13:41:00 UTC --- Seems to be already fixed in trunk. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50566] Duplicate assignment to connection variable
https://issues.apache.org/bugzilla/show_bug.cgi?id=50566 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #1 from Filip Hanik 2012-03-20 13:41:53 UTC --- already fixed in trunk -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50565] Static variables should be accessed in a static way
https://issues.apache.org/bugzilla/show_bug.cgi?id=50565 Konstantin Kolinko changed: What|Removed |Added Resolution|WORKSFORME |FIXED -- 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 50566] Duplicate assignment to connection variable
https://issues.apache.org/bugzilla/show_bug.cgi?id=50566 Konstantin Kolinko changed: What|Removed |Added Resolution|WORKSFORME |DUPLICATE --- Comment #2 from Konstantin Kolinko 2012-03-20 13:47:11 UTC --- Was fixed by r1154321 *** This bug has been marked as a duplicate of bug 51615 *** -- 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 51615] Line 267 of "org.apache.tomcat.jdbc.pool.PooledConnection": double assignment typo
https://issues.apache.org/bugzilla/show_bug.cgi?id=51615 Konstantin Kolinko changed: What|Removed |Added CC||s...@apache.org --- Comment #2 from Konstantin Kolinko 2012-03-20 13:47:11 UTC --- *** Bug 50566 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50660] Improve validationQuery error handling
https://issues.apache.org/bugzilla/show_bug.cgi?id=50660
Filip Hanik changed:
What|Removed |Added
Status|NEW |RESOLVED
Resolution||FIXED
--- Comment #5 from Filip Hanik 2012-03-20 13:48:03 UTC ---
(In reply to comment #3)
> What about adding an Interceptor to do the validation? The attached
> interceptor would take the validation query and run it when the pool is
> created. If there is a problem with the query it would report just that one
> time.
>
> Dan
I'll add in logging when the pool starts. Right now, if initializing the pool
fails, it sends a JMX notification but doesn't log anything.
looking in the code it does
if (log.isDebugEnabled())
log.debug("Unable to validate object:",ignore);
So that should already be taken care of
--
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 51198] Trunk Version : Performance enhancement in ConnectionPool regarding busy Queue
https://issues.apache.org/bugzilla/show_bug.cgi?id=51198
Filip Hanik changed:
What|Removed |Added
Status|NEW |RESOLVED
Resolution||WORKSFORME
--- Comment #2 from Filip Hanik 2012-03-20 13:52:41 UTC ---
(In reply to comment #1)
> Hello,
> Is there something wrong in the patch ?
> I have been doing very High load tests during all the week and all seems OK.
>
> Regards
> Philippe
This was fixed in another commit by simply doing
if (pool.size()>0) {
con = pool.poll(1000, TimeUnit.MILLISECONDS);
} else {
break;
}
--
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: r1302901 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Author: fhanik
Date: Tue Mar 20 14:01:45 2012
New Revision: 1302901
URL: http://svn.apache.org/viewvc?rev=1302901&view=rev
Log:
easily readable, dont line break on paranthesis
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1302901&r1=1302900&r2=1302901&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Tue Mar 20 14:01:45 2012
@@ -656,10 +656,8 @@ public class ConnectionPool {
protected PooledConnection createConnection(long now, PooledConnection
notUsed, String username, String password) throws SQLException {
//no connections where available we'll create one
PooledConnection con = create(false);
-if (username!=null) con.getAttributes().put(
-PooledConnection.PROP_USER, username);
-if (password!=null) con.getAttributes().put(
-PooledConnection.PROP_PASSWORD, password);
+if (username!=null)
con.getAttributes().put(PooledConnection.PROP_USER, username);
+if (password!=null)
con.getAttributes().put(PooledConnection.PROP_PASSWORD, password);
boolean error = false;
try {
//connect and validate the connection
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302902 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
Author: fhanik
Date: Tue Mar 20 14:02:18 2012
New Revision: 1302902
URL: http://svn.apache.org/viewvc?rev=1302902&view=rev
Log:
fix bug https://issues.apache.org/bugzilla/show_bug.cgi?id=51237 align
implementation with the documentation
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1302902&r1=1302901&r2=1302902&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
Tue Mar 20 14:02:18 2012
@@ -84,6 +84,9 @@ public class SlowQueryReport extends Abs
long delta = now - start;
QueryStats qs = this.getQueryStats(sql);
qs.failure(delta, now);
+if (log.isWarnEnabled()) {
+log.warn("Failed Query Report SQL="+sql+"; time="+delta+"
ms;");
+}
}
return sql;
}
@@ -94,6 +97,9 @@ public class SlowQueryReport extends Abs
if (this.maxQueries > 0 ) {
QueryStats qs = this.getQueryStats(sql);
qs.add(delta, start);
+if (log.isWarnEnabled()) {
+log.warn("Slow Query Report SQL="+sql+"; time="+delta+" ms;");
+}
}
return sql;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51237] SlowQueryReport interceptor does not log anything
https://issues.apache.org/bugzilla/show_bug.cgi?id=51237 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Filip Hanik 2012-03-20 14:02:32 UTC --- Fixed in r1302902 -- 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 51595] org.apache.tomcat.jdbc.pool.jmx.ConnectionPool should be Serializeable
https://issues.apache.org/bugzilla/show_bug.cgi?id=51595 Filip Hanik changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #1 from Filip Hanik 2012-03-20 14:15:31 UTC --- hi Patric, you can still subscribe to JMX events even without retrieving this object by itself. Am I missing something? If I serialize that object, you wont get much back, as the actual implementation would be marked transient, and you just get an empty shell -- 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 52002] Pool re-opens and re-issues closed connection
https://issues.apache.org/bugzilla/show_bug.cgi?id=52002 --- Comment #3 from Filip Hanik 2012-03-20 14:19:48 UTC --- (In reply to comment #2) > We're seeing behavior in a production application that seems likely to be a > result of this issue. Any chance it might be included in the next release? I'll be adding the patch, but not enabled by default. Performance is at cost if new objects are created each time an object is used from the pool. This goes against the very idea that started this pool. So I will put in a flag to throttle the behavior -- 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 52833] NPE with 7.0.26
https://issues.apache.org/bugzilla/show_bug.cgi?id=52833 --- Comment #11 from Konstantin Kolinko 2012-03-20 14:40:04 UTC --- Maybe (In reply to comment #0) > Upgrading the maven plugin 7.0.26, the goal which runs tomcat with a conf dir > (not the embed version) generate the following NPE > Log: > at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236) 1. Where is "Caused by" and its stacktrace? Line 236 wraps other exception and rethrows it, but you are not saying what it is and where it comes from. 2. This LifecycleBase.stop() is called from LifecycleBase.start() on line 141 which is unusual and happens only if the component is already in the state of FAILED. Thus there must be some preceding messages in the logs. -- 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: r1302919 - /tomcat/maven-plugin/trunk/.gitignore
Author: olamy Date: Tue Mar 20 14:44:58 2012 New Revision: 1302919 URL: http://svn.apache.org/viewvc?rev=1302919&view=rev Log: .gitignore .idea Modified: tomcat/maven-plugin/trunk/.gitignore Modified: tomcat/maven-plugin/trunk/.gitignore URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/.gitignore?rev=1302919&r1=1302918&r2=1302919&view=diff == --- tomcat/maven-plugin/trunk/.gitignore (original) +++ tomcat/maven-plugin/trunk/.gitignore Tue Mar 20 14:44:58 2012 @@ -1,6 +1,7 @@ target # idea *.iml +.idea # eclipse .classpath .project - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 43790] concurrent access issue on TagHandlerPool
https://issues.apache.org/bugzilla/show_bug.cgi?id=43790 --- Comment #8 from Ian Hartney 2012-03-20 14:57:07 UTC --- There does appear to be a concurrency issue with the synchronized block approach when using Java 5. However in Java 6 the synchronized block approach appears faster than the LinkedBlockingQueue approach. I have a little test harness that used 250 threads to concurrently access a queue in the same manner as the TagPoolHandler. Each loop does a get of an object, then a reuse call on the object 1 times. It runs the same test using the synchronized block approach, then another using the LinkedBlockingQueue (LBQ) approach. On Java 5 the test takes around 11000 ms to complete for the synchronized block approach, the LBQ approach takes 700 ms. Conversely on Java 6 the synchronized block approach is much improved, taking around 450 ms whereas the LBQ approach takes 750 ms. So when using Java 5 it does appear that the LBQ approach has some significant performance advantages to the synchronized block approach. The tested versions of java were 1.5.0_22 and 1.6.0_23 -- 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 52833] NPE with 7.0.26
https://issues.apache.org/bugzilla/show_bug.cgi?id=52833 --- Comment #12 from olamy 2012-03-20 14:57:18 UTC --- 20 mars 2012 15:55:11 org.apache.catalina.startup.Catalina load GRAVE: Catalina.start org.apache.catalina.LifecycleException: Failed to initialize component [StandardServer[2008]] at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:106) at org.apache.catalina.startup.Catalina.load(Catalina.java:594) at org.apache.catalina.startup.Catalina.start(Catalina.java:633) at org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.startContainer(AbstractRunMojo.java:684) at org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.execute(AbstractRunMojo.java:372) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.apache.maven.cli.MavenCli.execute(MavenCli.java:544) at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:197) at org.apache.maven.cli.MavenCli.main(MavenCli.java:141) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409) at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352) Caused by: java.lang.NullPointerException at org.apache.catalina.core.StandardServer.initInternal(StandardServer.java:810) at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:102) ... 25 more 20 mars 2012 15:55:11 org.apache.catalina.startup.Catalina load INFO: Initialization processed in 681 ms 20 mars 2012 15:55:11 org.apache.catalina.startup.Catalina start GRAVE: Catalina.start: org.apache.catalina.LifecycleException: Failed to stop component [StandardServer[2008]] at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:141) at org.apache.catalina.startup.Catalina.start(Catalina.java:645) at org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.startContainer(AbstractRunMojo.java:684) at org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.execute(AbstractRunMojo.java:372) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.apache.maven.cli.MavenCli.execute(MavenCli.java:544) at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:197) at org.apache.maven.cli.MavenCli.main(MavenCli.java:141) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230)
DO NOT REPLY [Bug 52952] New: Improve ExtensionValidator handling for embedded scenarios
https://issues.apache.org/bugzilla/show_bug.cgi?id=52952 Bug #: 52952 Summary: Improve ExtensionValidator handling for embedded scenarios Product: Tomcat 7 Version: 7.0.26 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: knst.koli...@gmail.com Classification: Unclassified The following call was added in r1242101 In StandardServer#initInternal(): > + ExtensionValidator.addSystemResource(f); The above is a static method and it does not check for duplicates. It does not scale well. E.g. if there are several Tomcat instances, e.g. run by JUnit. I'd say that implementing ExtensionValidator with static methods is at fault here. The only place where it is called is StandardContext#startInternal() -> calls ExtensionValidator.validateApplication(). I do not see a need for static methods there. It should be possible to get a specific ExtensionValidator instance in StandardContext. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1242101 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardServer.java java/org/apache/catalina/util/ExtensionValidator.java webapps/docs/changelog.xml
2012/2/9 :
> Author: markt
> Date: Wed Feb 8 21:19:36 2012
> New Revision: 1242101
>
> URL: http://svn.apache.org/viewvc?rev=1242101&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52607
> The ExtensionValidator needs to be aware of the classes in the shared
> and common loaders.
>
> Modified:
> tomcat/tc7.0.x/trunk/ (props changed)
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>
> Propchange: tomcat/tc7.0.x/trunk/
> --
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Wed Feb 8 21:19:36 2012
>
> Modified:
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
> URL:
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1242101&r1=1242100&r2=1242101&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
> (original)
> +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
> Wed Feb 8 21:19:36 2012
> @@ -18,11 +18,15 @@ package org.apache.catalina.core;
>
> import java.beans.PropertyChangeListener;
> import java.beans.PropertyChangeSupport;
> +import java.io.File;
> import java.io.IOException;
> import java.io.InputStream;
> import java.net.InetAddress;
> import java.net.ServerSocket;
> import java.net.Socket;
> +import java.net.URISyntaxException;
> +import java.net.URL;
> +import java.net.URLClassLoader;
> import java.security.AccessControlException;
> import java.util.Random;
>
> @@ -37,6 +41,7 @@ import org.apache.catalina.deploy.Naming
> import org.apache.catalina.mbeans.MBeanFactory;
> import org.apache.catalina.mbeans.MBeanUtils;
> import org.apache.catalina.startup.Catalina;
> +import org.apache.catalina.util.ExtensionValidator;
> import org.apache.catalina.util.LifecycleMBeanBase;
> import org.apache.catalina.util.ServerInfo;
> import org.apache.juli.logging.Log;
> @@ -776,6 +781,35 @@ public final class StandardServer extend
> // Register the naming resources
> globalNamingResources.init();
>
> + // Populate the extension validator with JARs from common and shared
> + // class loaders
> + if (getCatalina() != null) {
> + ClassLoader cl =
> + getCatalina().getParentClassLoader();
1). Why isn't is starting with this.getParentClassLoader(); ?
The actual shared classloader is the one used in
WebappLoader#createClassLoader(). I'd say that calling
Server.getParentClassLoader() will be closer to the truth here.
E.g. Tomcat class creates and calls Server instance directly, without
relying on Catalina. So using Server.getParentClassLoader() seems to
be better here.
> + // Walk the class loader hierarchy. Stop at the system class
> loader.
> + // This will add the shared (if present) and common class loaders
> + while (cl != ClassLoader.getSystemClassLoader()) {
2) It should not hurt to move ClassLoader.getSystemClassLoader() out
of the loop. This method involves a SecurityManager check and it is
better to do it once.
> + if (cl instanceof URLClassLoader) {
> + URL[] urls = ((URLClassLoader) cl).getURLs();
> + for (URL url : urls) {
> + if (url.getProtocol().equals("file")) {
> + try {
> + File f = new File (url.toURI());
> + if (f.isFile() &&
> + f.getName().endsWith(".jar")) {
> + ExtensionValidator.addSystemResource(f);
3) The above is a static method and it does not check for duplicates.
It would be a substantial change to ExtensionValidator to fix it, so I
submitted the following issue:
https://issues.apache.org/bugzilla/show_bug.cgi?id=52952
> + }
> + } catch (URISyntaxException e) {
> + // Ignore
> + } catch (IOException e) {
> + // Ignore
> + }
> + }
> + }
> + }
> + cl = cl.getParent();
> + }
> + }
> // Initialize our defined Services
> for (int i = 0; i < services.length; i++) {
> services[i].init();
>
> Modified:
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java
> URL:
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=1242101&r1=1242100&r2=1242101&view=diff
> ==
svn commit: r1302948 - in /tomcat/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/ main/java/org/apache/tomcat/jdbc/pool/jmx/ test/java/org/apache/tomcat/jdbc/test/
Author: fhanik
Date: Tue Mar 20 15:45:19 2012
New Revision: 1302948
URL: http://svn.apache.org/viewvc?rev=1302948&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=52002 add in ability to
configure pool so that connections can not be reused
Added:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1302948&r1=1302947&r2=1302948&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Tue Mar 20 15:45:19 2012
@@ -312,7 +312,12 @@ public class ConnectionPool {
getProxyConstructor(con.getXAConnection() != null);
//create the proxy
//TODO possible optimization, keep track if this connection was
returned properly, and don't generate a new facade
-Connection connection =
(Connection)proxyClassConstructor.newInstance(new Object[] { handler });
+Connection connection = null;
+if (getPoolProperties().getUseDisposableConnectionFacade() ) {
+connection = (Connection)proxyClassConstructor.newInstance(new
Object[] { new DisposableConnectionFacade(handler) });
+} else {
+connection = (Connection)proxyClassConstructor.newInstance(new
Object[] {handler});
+}
//return the connection
return connection;
}catch (Exception x) {
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1302948&r1=1302947&r2=1302948&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Tue Mar 20 15:45:19 2012
@@ -1226,4 +1226,20 @@ public class DataSourceProxy implements
return getPoolProperties().getRollbackOnReturn();
}
+/**
+ * {@inheritDoc}
+ */
+@Override
+public void setUseDisposableConnectionFacade(boolean
useDisposableConnectionFacade) {
+
getPoolProperties().setUseDisposableConnectionFacade(useDisposableConnectionFacade);
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public boolean getUseDisposableConnectionFacade() {
+return getPoolProperties().getUseDisposableConnectionFacade();
+}
+
}
Added:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java?rev=1302948&view=auto
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
(added)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
Tue Mar 20 15:45:19 2012
@@ -0,0 +1,69 @@
+/*
+ * 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
DO NOT REPLY [Bug 52002] Pool re-opens and re-issues closed connection
https://issues.apache.org/bugzilla/show_bug.cgi?id=52002 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Filip Hanik 2012-03-20 15:47:53 UTC --- Fixed in r1302948 -- 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 51879] Improve access to Native Connection Methods
https://issues.apache.org/bugzilla/show_bug.cgi?id=51879 Filip Hanik changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #1 from Filip Hanik 2012-03-20 15:49:26 UTC --- patch and test cases would be helpful -- 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 49953] Missing @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=49953 Filip Hanik changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||WONTFIX --- Comment #12 from Filip Hanik 2012-03-20 15:50:47 UTC --- Override annotations will be applied as we do code cleanup. They are not a bug at the moment -- 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: r1302965 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Author: fhanik
Date: Tue Mar 20 16:14:07 2012
New Revision: 1302965
URL: http://svn.apache.org/viewvc?rev=1302965&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=52327
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1302965&r1=1302964&r2=1302965&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Tue Mar 20 16:14:07 2012
@@ -47,7 +47,7 @@ public class DataSourceProxy implements
protected volatile ConnectionPool pool = null;
-protected PoolConfiguration poolProperties = null;
+protected volatile PoolConfiguration poolProperties = null;
public DataSourceProxy() {
this(new PoolProperties());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52327] DataSourceProxy is not thread-safe
https://issues.apache.org/bugzilla/show_bug.cgi?id=52327 --- Comment #1 from Filip Hanik 2012-03-20 16:14:14 UTC --- r1302965 -- 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 52493] Add java7 support
https://issues.apache.org/bugzilla/show_bug.cgi?id=52493 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED -- 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 52327] DataSourceProxy is not thread-safe
https://issues.apache.org/bugzilla/show_bug.cgi?id=52327 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED -- 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: r1302968 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Author: fhanik
Date: Tue Mar 20 16:16:00 2012
New Revision: 1302968
URL: http://svn.apache.org/viewvc?rev=1302968&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=52327
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1302968&r1=1302967&r2=1302968&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Tue Mar 20 16:16:00 2012
@@ -19,9 +19,11 @@ package org.apache.tomcat.jdbc.pool;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.Iterator;
import java.util.Properties;
import java.util.concurrent.Future;
+import java.util.logging.Logger;
import javax.sql.XAConnection;
@@ -535,6 +537,14 @@ public class DataSourceProxy implements
/**
* no-op
+ * {@link javax.sql.DataSource#getParentLogger}
+ */
+public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+}
+
+/**
+ * no-op
* {@link javax.sql.DataSource#getLogWriter}
*/
public PrintWriter getLogWriter() throws SQLException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52327] DataSourceProxy is not thread-safe
https://issues.apache.org/bugzilla/show_bug.cgi?id=52327 --- Comment #2 from Filip Hanik 2012-03-20 16:16:16 UTC --- Correction, fixed in r1302968 -- 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: r1302969 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Author: fhanik
Date: Tue Mar 20 16:17:49 2012
New Revision: 1302969
URL: http://svn.apache.org/viewvc?rev=1302969&view=rev
Log:
tabs to spaces
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1302969&r1=1302968&r2=1302969&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Tue Mar 20 16:17:49 2012
@@ -540,7 +540,7 @@ public class DataSourceProxy implements
* {@link javax.sql.DataSource#getParentLogger}
*/
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
- throw new SQLFeatureNotSupportedException();
+throw new SQLFeatureNotSupportedException();
}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302974 - /tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
Author: fhanik Date: Tue Mar 20 16:24:13 2012 New Revision: 1302974 URL: http://svn.apache.org/viewvc?rev=1302974&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=52654 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=1302974&r1=1302973&r2=1302974&view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Mar 20 16:24:13 2012 @@ -135,7 +135,8 @@ org.apache.tomcat.jdbc.pool.DataSource object will then register the actual connection pool MBean. If you're running outside of a container, you can register the DataSource yourself under any object name you specify, - and it propagates the registration to the underlying pool. + and it propagates the registration to the underlying pool. To do this you would call mBeanServer.registerMBean(dataSource.getPool().getJmxPool(),objectname). + Prior to this call, ensure that the pool has been created by calling dataSource.createPool(). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52654] Incomplete documentation about DataSource JMX registration outside a container
https://issues.apache.org/bugzilla/show_bug.cgi?id=52654 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Filip Hanik 2012-03-20 16:24:23 UTC --- Fixed in r1302974 -- 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 52066] ConnectionPool.borrowConnection swallows interrupt state.
https://issues.apache.org/bugzilla/show_bug.cgi?id=52066 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #3 from Filip Hanik 2012-03-20 16:32:55 UTC --- (In reply to comment #2) > (In reply to comment #1) > > > Plus, it's not OK for the general user of the library to depend on your > specific wrapper of InterruptedException into the SQLException. A user can > switch to another implementation of connection pool and that particular > library > reporting policy may not be the same as this library's. I am not sure I agree with this. The user has not invoked an "interruptable" action, the user invoked DataSource.getConnection http://docs.oracle.com/javase/6/docs/api/javax/sql/DataSource.html#getConnection() This call says nothing about interruption nor does it declare it. It is a totally different call than poll(...) http://docs.oracle.com/javase/6/docs/api/java/util/concurrent/BlockingQueue.html#poll%28long,%20java.util.concurrent.TimeUnit%29 > > The right thing to do is to preserve the thread interruption status by calling > Thread.currentThread( ).interrupt( ), and let the client code deal with it. The reason an interrupt here would happen is cause we want to interrupt the call to queue.poll, to the user, they need to be notified that their call will fail using a SQLException. > > BTW, setting InterruptedException as a cause of SQLException is a GOOD THING, > I > don't want you to change that. We do specify the root cause for troubleshooting reasons. If we don't clear the flag, the thread can continue to run with a interrupted status, and I'm not sure that is a good thing. Feel free to reopen with a use case that may change the course of this resolution. -- 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: r1302990 - in /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool: ConnectionPool.java PoolExhaustedException.java jmx/ConnectionPool.java
Author: fhanik
Date: Tue Mar 20 16:44:17 2012
New Revision: 1302990
URL: http://svn.apache.org/viewvc?rev=1302990&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=51893 add notification that
the pool has been exhausted
Added:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1302990&r1=1302989&r2=1302990&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Tue Mar 20 16:44:17 2012
@@ -634,13 +634,19 @@ public class ConnectionPool {
waitcount.decrementAndGet();
}
if (maxWait==0 && con == null) { //no wait, return one if we have
one
-throw new SQLException("[" +
Thread.currentThread().getName()+"] " +
+if (jmxPool!=null) {
+
jmxPool.notify(org.apache.tomcat.jdbc.pool.jmx.ConnectionPool.POOL_EMPTY, "Pool
empty - no wait.");
+}
+throw new PoolExhaustedException("[" +
Thread.currentThread().getName()+"] " +
"NoWait: Pool empty. Unable to fetch a connection,
none available["+busy.size()+" in use].");
}
//we didn't get a connection, lets see if we timed out
if (con == null) {
if ((System.currentTimeMillis() - now) >= maxWait) {
-throw new SQLException("[" +
Thread.currentThread().getName()+"] " +
+if (jmxPool!=null) {
+
jmxPool.notify(org.apache.tomcat.jdbc.pool.jmx.ConnectionPool.POOL_EMPTY, "Pool
empty - timeout.");
+}
+throw new PoolExhaustedException("[" +
Thread.currentThread().getName()+"] " +
"Timeout: Pool empty. Unable to fetch a connection in
" + (maxWait / 1000) +
" seconds, none available[size:"+size.get() +";
busy:"+busy.size()+"; idle:"+idle.size()+"; lastwait:"+timetowait+"].");
} else {
Added:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java?rev=1302990&view=auto
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
(added)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
Tue Mar 20 16:44:17 2012
@@ -0,0 +1,54 @@
+/*
+ * 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;
+
+import java.sql.SQLException;
+
+public class PoolExhaustedException extends SQLException {
+
+public PoolExhaustedException() {
+}
+
+public PoolExhaustedException(String reason) {
+super(reason);
+}
+
+public PoolExhaustedException(Throwable cause) {
+super(cause);
+}
+
+public PoolExhaustedException(String reason, String SQLState) {
+super(reason, SQLState);
+}
+
+public PoolExhaustedException(String reason, Throwable cause) {
+super(reason, cause);
+}
+
+public PoolExhaustedException(String reason, String SQLState, int
vendorCode) {
+super(reason, SQLState, vendorCode);
+}
+
+public PoolExhaustedException(String reason, String sqlState, Throwable
cause) {
+super(reason, sqlState, cause);
+}
+
+public PoolExhaustedException(Stri
DO NOT REPLY [Bug 51893] JMX notification/Exception for empty/exhausted connection pool
https://issues.apache.org/bugzilla/show_bug.cgi?id=51893 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Filip Hanik 2012-03-20 16:44:30 UTC --- Fixed in r1302990 -- 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: r1302991 - /tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
Author: fhanik Date: Tue Mar 20 16:48:20 2012 New Revision: 1302991 URL: http://svn.apache.org/viewvc?rev=1302991&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=52518 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=1302991&r1=1302990&r2=1302991&view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Mar 20 16:48:20 2012 @@ -46,13 +46,13 @@ commons-dbcp is complex, over 60 classes. tomcat-jdbc-pool, core is 8 classes, hence modifications for future requirement will require much less changes. This is all you need to run the connection pool itself, the rest is gravy. commons-dbcp uses static interfaces. This means you can't compile it with JDK 1.6, or if you run on JDK 1.6/1.7 you will get - NoSuchMethodException for all the methods not implemented, even if the driver supports it. + NoSuchMethodException for all the methods not implemented, even if the driver supports it. The commons-dbcp has become fairly stagnant. Sparse updates, releases, and new feature support. It's not worth rewriting over 60 classes, when something as a connection pool can be accomplished with as a much simpler implementation. Tomcat jdbc pool implements a fairness option not available in commons-dbcp and still performs faster than commons-dbcp Tomcat jdbc pool implements the ability retrieve a connection asynchronously, without adding additional threads to the library itself Tomcat jdbc pool is a Tomcat module, it depends on Tomcat JULI, a simplified logging framework used in Tomcat. - Retrieve the underlying connection using the javax.sql.PooledConnection interface. + Retrieve the underlying connection using the javax.sql.PooledConnection interface. Starvation proof. If a pool is empty, and threads are waiting for a connection, when a connection is returned, the pool will awake the correct thread waiting. Most pools will simply starve. @@ -61,7 +61,7 @@ Features added over other connection pool implementations Support for highly concurrent environments and multi core/cpu systems. - Dynamic implementation of interface, will support java.sql and javax.sql interfaces for + Dynamic implementation of interface, will support java.sql and javax.sql interfaces for your runtime environment (as long as your JDBC driver does the same), even when compiled with a lower version of the JDK. Validation intervals - we don't have to validate every single time we use the connection, we can do this when we borrow or return the connection, just not more frequent than an interval we can configure. @@ -70,18 +70,19 @@ Ability to configure custom interceptors. This allows you to write custom interceptors to enhance the functionality. You can use interceptors to gather query stats, cache session states, reconnect the connection upon failures, retry queries, cache query results, and so on. - Your options are endless and the interceptors are dynamic, not tied to a JDK version of a java.sql/javax.sql interface. + Your options are endless and the interceptors are dynamic, not tied to a JDK version of a + java.sql/javax.sql interface. High performance - we will show some differences in performance later on Extremely simple, due to the very simplified implementation, the line count and source file count are very low, compare with c3p0 that has over 200 source files(last time we checked), Tomcat jdbc has a core of 8 files, the connection pool itself is about half that. As bugs may occur, they will be faster to track down, and easier to fix. Complexity reduction has been a focus from inception. - Asynchronous connection retrieval - you can queue your request for a connection and receive a Futureback. + Asynchronous connection retrieval - you can queue your request for a connection and receive a Future back. Better idle connection handling. Instead of closing connections directly, it can still pool connections and sizes the idle pool with a smarter algorithm. You can decide at what moment connections are considered abandoned, is it when the pool is full, or directly at a timeout by specifying a pool usage threshold. The abandon connection timer will reset upon a statement/query activity. Allowing a connections that is in use for a long time to not timeout. - This is achieved using the ResetAbandonedTimer + This is achieved using the ResetAbandonedTimer
DO NOT REPLY [Bug 52518] Documentation enhancements
https://issues.apache.org/bugzilla/show_bug.cgi?id=52518 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Filip Hanik 2012-03-20 16:48:33 UTC --- Fixed in r1302991 -- 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 52629] minIdle property behaviour is not the described one
https://issues.apache.org/bugzilla/show_bug.cgi?id=52629 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Filip Hanik 2012-03-20 16:50:47 UTC --- yes, that would be non logical. it would also hurt performance. "in the pool" is inclusive of connections used. -- 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 52833] NPE with 7.0.26
https://issues.apache.org/bugzilla/show_bug.cgi?id=52833 --- Comment #13 from Konstantin Kolinko 2012-03-20 16:53:34 UTC --- (In reply to comment #8) (In reply to comment #9) AbstractRunMojo#startContainer() creates a "new Catalina()". I do not see it ever calling setParentClassLoader() and Catalina#parentClassLoader defaults to its own classloader. Is Catalina.class.getClassLoader() the one that does not have system CL in its parents chain? > What I don't understand is why in the parent classLoader chain having > SystemClassLoader is mandatory! Anyway as far as WebappClassLoader class goes 1) It has to follow its documentation, [1] in 7.0 and in more details in 5.5, where shared class loader was actually used. There is lookup sequence, "Therefore, from the perspective of a web application, class or resource loading looks in the following repositories, in this order: (...)" - see [1] [1] http://tomcat.apache.org/tomcat-7.0-doc/class-loader-howto.html 2) WebappClassLoader has its own explicit call to getSystemClassLoader() and treats the system class loader specially and separately from its parent, to follow its specific delegating pattern of calling A system CL B webapp CL C parent CL. Therefore for the WebappClassLoader class it does not matter where its "parent CL" is rooted. It does not impact its behaviour. So using shared CL that does not have system CL as a parent does not seriously impact Tomcat. I do not mind a (cl != null) check to be added in the loop in r1242101. It seems that the code in r1242101 is the first one that actually looks into the shared classloader and is outside of a webapp. Such work is usually scoped to the web application. The shared CL is actually used in WebappLoader#createClassLoader(). See also my comments in "Re: r1242101" on dev@. http://markmail.org/message/rgd7tzz5zks6l5wn (In reply to comment #12) > > Caused by: org.apache.catalina.LifecycleException: An invalid Lifecycle > transition was attempted ([before_stop]) for component > [org.apache.catalina.deploy.NamingResources@7f1f91ac] in state [INITIALIZED] Interesting... A small issue though. It tries to stop a component that has not been started? -- 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 52024] Custom interceptor to support automatic failover of mirrored database
https://issues.apache.org/bugzilla/show_bug.cgi?id=52024 Filip Hanik changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #1 from Filip Hanik 2012-03-20 17:02:34 UTC --- I like the idea, but it's not fine grained enough. What if I do 1 con = getConnection(); 2 con.close(); 3 con.executeQuery(); on step 3 we reconnect the connection only to fail identically again. -- 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 52318] Version in tomcat-jdbc POM is conflicted with Version in MANIFEST for JULI JAR
https://issues.apache.org/bugzilla/show_bug.cgi?id=52318 Filip Hanik changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #4 from Filip Hanik 2012-03-20 17:10:29 UTC --- this MANIFEST: org.apache.juli.logging;version="[6.0.18, 7.0.0)" would indicate that the component can use juli versions from 6.0.18 and up, as well as 7.0.0 and up. not being that familiar with OSGi, what's the issue here? submit a patch -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51388] SlowQueryReport should respect Statement.getQueryTimeout() value
https://issues.apache.org/bugzilla/show_bug.cgi?id=51388 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Filip Hanik 2012-03-20 17:12:58 UTC --- If you setQueryTimeout(5 seconds) then the query would timeout through a SQLExeption at that time, and the threshold for SlowQueryReport would not be met. The only option would be to not propagate setQueryTimeout, but that would fundamentally change the way an application works, and could leave queries hanging unintentionally. -- 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: r1303031 - in /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool: DataSourceProxy.java PoolConfiguration.java PoolProperties.java PooledConnection.java jmx/Connectio
Author: fhanik
Date: Tue Mar 20 17:32:47 2012
New Revision: 1303031
URL: http://svn.apache.org/viewvc?rev=1303031&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50860 add option to log
validation errors
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1303031&r1=1303030&r2=1303031&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Tue Mar 20 17:32:47 2012
@@ -1252,4 +1252,20 @@ public class DataSourceProxy implements
return getPoolProperties().getUseDisposableConnectionFacade();
}
+/**
+ * {@inheritDoc}
+ */
+@Override
+public void setLogValidationErrors(boolean logValidationErrors) {
+getPoolProperties().setLogValidationErrors(logValidationErrors);
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public boolean getLogValidationErrors() {
+return getPoolProperties().getLogValidationErrors();
+}
+
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java?rev=1303031&r1=1303030&r2=1303031&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
Tue Mar 20 17:32:47 2012
@@ -835,4 +835,16 @@ public interface PoolConfiguration {
*/
public boolean getUseDisposableConnectionFacade();
+/**
+ * Set to true if you wish that errors from validation should be logged as
error messages.
+ * @param logValidationErrors set to true to log validation errors
+ */
+public void setLogValidationErrors(boolean logValidationErrors);
+
+/**
+ * Returns true if errors that happen during validation will be logged
+ * @return true if errors that happen during validation will be logged
+ */
+public boolean getLogValidationErrors();
+
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1303031&r1=1303030&r2=1303031&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Tue Mar 20 17:32:47 2012
@@ -86,7 +86,8 @@ public class PoolProperties implements P
protected boolean alternateUsernameAllowed = false;
protected boolean commitOnReturn = false;
protected boolean rollbackOnReturn = false;
-protected boolean useDisposableConnectionFacade;
+protected boolean useDisposableConnectionFacade = false;
+protected boolean logValidationErrors = false;
/**
@@ -1212,6 +1213,22 @@ public class PoolProperties implements P
return useDisposableConnectionFacade;
}
+/**
+ * {@inheritDoc}
+ */
+@Override
+public void setLogValidationErrors(boolean logValidationErrors) {
+this.logValidationErrors = logValidationErrors;
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public boolean getLogValidationErrors() {
+return this.logValidationErrors;
+}
+
@Override
protected Object clone() throws CloneNotSupportedException {
// TODO Auto-generated method stub
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1303031&r1=1303030&r2=1303031&view=diff
==
-
DO NOT REPLY [Bug 50860] In case of invalid or empty slqQuery connection are always invalidated without usefull information
https://issues.apache.org/bugzilla/show_bug.cgi?id=50860 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Filip Hanik 2012-03-20 17:33:53 UTC --- > I also think that obvious configuration validation (validationQuery is null or > empty, when validation is enabled ) has to happen when the connection is that would be a separate issue, feel free to open bugzilla issue This has been fixed in by adding a configuration option called logValidationErrors="true|false" in r1303031 -- 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 52066] ConnectionPool.borrowConnection swallows interrupt state.
https://issues.apache.org/bugzilla/show_bug.cgi?id=52066 Alexander Pogrebnyak changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WONTFIX | --- Comment #4 from Alexander Pogrebnyak 2012-03-20 17:34:44 UTC --- (In reply to comment #3) > The reason an interrupt here would happen is cause WE want to interrupt the > call to queue.poll, to the user, they need to be notified that their call will > fail using a SQLException. > I capitalized WE in the above quote to highlight the wrong approach to this problem. YOU, the tomcat-jdbc, would never interrupt a thread that is stuck in a `borrowConnection`. This action can only be done by the user of your library. > If we don't clear the > flag, the thread can continue to run with a interrupted status, and I'm not > sure that is a good thing. it IS a good thing, because, once again, your library should never initiate the interruption, and if the user does not handle interruption correctly it will get reminded sooner rather than later that something is wrong. Think of it as a RuntimeException. If you know how to hanlde it you will, if you don't let the framework handle it. Swallowing interrupted status is exactly the same issue that plagued Java samples in the early days, when Exception would be swallowed and nothing reported to the caller. -- 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 52318] Version in tomcat-jdbc POM is conflicted with Version in MANIFEST for JULI JAR
https://issues.apache.org/bugzilla/show_bug.cgi?id=52318 Konstantin Kolinko changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #5 from Konstantin Kolinko 2012-03-20 17:38:03 UTC --- (In reply to comment #4) > this > MANIFEST: > org.apache.juli.logging;version="[6.0.18, 7.0.0)" > > would indicate that the component can use juli versions from 6.0.18 and up, as > well as 7.0.0 and up. not being that familiar with OSGi, what's the issue > here? > submit a patch >From my math knowledge I would read the above range as "not including 7.0.0". That is 6.9.99 is OK, but 7.0.0 is not. As some stackoverflow answer hinted, the version ranges are documented "in section 3.2.6 of the OSGi Core Specification." I think you just mean ">= 6.0.18" here. From section 3.2.6 it reads that such a range is written just as "6.0.18". (In Apache Ivy I would write "[6.0.18,)", but it is not a valid syntax in OSGi). -- 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: r1303046 - in /tomcat/tc7.0.x/trunk: modules/ webapps/docs/changelog.xml
Author: fhanik Date: Tue Mar 20 17:51:47 2012 New Revision: 1303046 URL: http://svn.apache.org/viewvc?rev=1303046&view=rev Log: Bug fixes to jdbc pool Modified: tomcat/tc7.0.x/trunk/modules/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/modules/ -- --- svn:externals (original) +++ svn:externals Tue Mar 20 17:51:47 2012 @@ -1 +1 @@ -^/tomcat/trunk/modules/jdbc-pool@1295768 jdbc-pool +^/tomcat/trunk/modules/jdbc-pool@1303044 jdbc-pool Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1303046&r1=1303045&r2=1303046&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 20 17:51:47 2012 @@ -193,6 +193,11 @@ 52804: Make pool properties serializable and cloneable. (fhanik) + 512371302902 Slow Query Report should log using WARN level when queries are slow and within the threshold of caching it + 520021302948 Add in configuration option to disallow connection reuse + 524931302969 Java 7 DataSource method addition + 518931302990 Throw an error and notification when pool is exhausted + 508601303031 Add in option to configure logging for validation errors - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1303060 - in /tomcat/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
Author: kkolinko Date: Tue Mar 20 17:59:02 2012 New Revision: 1303060 URL: http://svn.apache.org/viewvc?rev=1303060&view=rev Log: svn:eol-style = native Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java (props changed) tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java (props changed) Propchange: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java -- svn:eol-style = native Propchange: tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1303061 - in /tomcat/tc7.0.x/trunk: modules/ webapps/docs/changelog.xml
Author: kkolinko Date: Tue Mar 20 18:06:13 2012 New Revision: 1303061 URL: http://svn.apache.org/viewvc?rev=1303061&view=rev Log: Update external to pick up svn:eol-style fix. Fix changelog.xml formatting: 1. Wrap lines 2. Missing ':' after issue number 3. Credit the author Modified: tomcat/tc7.0.x/trunk/modules/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/modules/ -- --- svn:externals (original) +++ svn:externals Tue Mar 20 18:06:13 2012 @@ -1 +1 @@ -^/tomcat/trunk/modules/jdbc-pool@1303044 jdbc-pool +^/tomcat/trunk/modules/jdbc-pool@1303060 jdbc-pool Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1303061&r1=1303060&r2=1303061&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 20 18:06:13 2012 @@ -193,11 +193,27 @@ 52804: Make pool properties serializable and cloneable. (fhanik) - 512371302902 Slow Query Report should log using WARN level when queries are slow and within the threshold of caching it - 520021302948 Add in configuration option to disallow connection reuse - 524931302969 Java 7 DataSource method addition - 518931302990 Throw an error and notification when pool is exhausted - 508601303031 Add in option to configure logging for validation errors + +51237 (1302902): +Slow Query Report should log using WARN level when queries are slow +and within the threshold of caching it. (fhanik) + + +52002 (1302948): +Add in configuration option to disallow connection reuse. (fhanik) + + +52493 (1302969): +Java 7 DataSource method addition. (fhanik) + + +51893 (1302990): +Throw an error and notification when pool is exhausted. (fhanik) + + +50860 (1303031): +Add in option to configure logging for validation errors. (fhanik) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1303066 - /tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
Author: fhanik Date: Tue Mar 20 18:14:28 2012 New Revision: 1303066 URL: http://svn.apache.org/viewvc?rev=1303066&view=rev Log: update documentation with new attributes 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=1303066&r1=1303065&r2=1303066&view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Mar 20 18:14:28 2012 @@ -446,11 +446,21 @@ - (javax.sql.DataSource) + (javax.sql.DataSource) Inject a data source to the connection pool, and the pool will use the data source to retrieve connections instead of establishing them using the java.sql.Driver interface. + This is useful when you wish to pool XA connections or connections established using a data source instead of a connection string. Default value is null - (String) + (String) The JNDI name for a data source to be looked up in JNDI and then used to establish connections to the database. See the dataSource attribute. Default value is null + + + + (boolean) Set this to true if you wish to put a facade on your connection so that it cannot be reused after it has been closed. This prevents a thread holding on to a + reference of a connection it has already called closed on, to execute queries on it. Default value is false for backwards compatibility. + + + + (boolean) Set this to true to log errors during the validation phase to the log file. If set to true, errors will be logged as SEVERE. Default value is false for backwards compatibility. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1303067 - /tomcat/tc7.0.x/trunk/modules/
Author: fhanik Date: Tue Mar 20 18:15:33 2012 New Revision: 1303067 URL: http://svn.apache.org/viewvc?rev=1303067&view=rev Log: documentation update of jdbc-pool Modified: tomcat/tc7.0.x/trunk/modules/ (props changed) Propchange: tomcat/tc7.0.x/trunk/modules/ -- --- svn:externals (original) +++ svn:externals Tue Mar 20 18:15:33 2012 @@ -1 +1 @@ -^/tomcat/trunk/modules/jdbc-pool@1303060 jdbc-pool +^/tomcat/trunk/modules/jdbc-pool@1303066 jdbc-pool - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1302948 - in /tomcat/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/ main/java/org/apache/tomcat/jdbc/pool/jmx/ test/java/org/apache/tomcat/jdbc/test/
2012/3/20 :
> Author: fhanik
> Date: Tue Mar 20 15:45:19 2012
> New Revision: 1302948
>
> URL: http://svn.apache.org/viewvc?rev=1302948&view=rev
> Log:
> https://issues.apache.org/bugzilla/show_bug.cgi?id=52002 add in ability to
> configure pool so that connections can not be reused
>
> Added:
>
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
>
> tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
> Modified:
>
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
>
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
>
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
>
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
>
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
>
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
>
(...)
> ---
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
> (original)
> +++
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
> Tue Mar 20 15:45:19 2012
> @@ -86,6 +86,7 @@ public class PoolProperties implements P
> protected boolean alternateUsernameAllowed = false;
> protected boolean commitOnReturn = false;
> protected boolean rollbackOnReturn = false;
> + protected boolean useDisposableConnectionFacade;
>
>
> /**
> @@ -1194,4 +1195,29 @@ public class PoolProperties implements P
> public boolean getRollbackOnReturn() {
> return this.rollbackOnReturn;
> }
> +
> + /**
> + * {@inheritDoc}
> + */
> + @Override
> + public void setUseDisposableConnectionFacade(boolean
> useDisposableConnectionFacade) {
> + this.useDisposableConnectionFacade = useDisposableConnectionFacade;
> + }
> +
> + /**
> + * {@inheritDoc}
> + */
> + @Override
> + public boolean getUseDisposableConnectionFacade() {
> + return useDisposableConnectionFacade;
> + }
> +
> + @Override
> + protected Object clone() throws CloneNotSupportedException {
> + // TODO Auto-generated method stub
> + return super.clone();
> + }
There is no need in the above clone() method.
It has the same access level (protected) as super one.
I see that PoolProperties is written as "implements Cloneable". In
such case the clone method is usually redeclared as public one.
> +
> +
> +
> }
>
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/484 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1303046 Blamelist: fhanik Build succeeded! sincerely, -The Buildbot
svn commit: r1303082 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
Author: kkolinko
Date: Tue Mar 20 18:39:28 2012
New Revision: 1303082
URL: http://svn.apache.org/viewvc?rev=1303082&view=rev
Log:
svn:eol-style = native
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
(contents, props changed)
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java?rev=1303082&r1=1303081&r2=1303082&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
Tue Mar 20 18:39:28 2012
@@ -1,54 +1,54 @@
-/*
- * 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;
-
-import java.sql.SQLException;
-
-public class PoolExhaustedException extends SQLException {
-
-public PoolExhaustedException() {
-}
-
-public PoolExhaustedException(String reason) {
-super(reason);
-}
-
-public PoolExhaustedException(Throwable cause) {
-super(cause);
-}
-
-public PoolExhaustedException(String reason, String SQLState) {
-super(reason, SQLState);
-}
-
-public PoolExhaustedException(String reason, Throwable cause) {
-super(reason, cause);
-}
-
-public PoolExhaustedException(String reason, String SQLState, int
vendorCode) {
-super(reason, SQLState, vendorCode);
-}
-
-public PoolExhaustedException(String reason, String sqlState, Throwable
cause) {
-super(reason, sqlState, cause);
-}
-
-public PoolExhaustedException(String reason, String sqlState, int
vendorCode, Throwable cause) {
-super(reason, sqlState, vendorCode, cause);
-}
-
-}
+/*
+ * 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;
+
+import java.sql.SQLException;
+
+public class PoolExhaustedException extends SQLException {
+
+public PoolExhaustedException() {
+}
+
+public PoolExhaustedException(String reason) {
+super(reason);
+}
+
+public PoolExhaustedException(Throwable cause) {
+super(cause);
+}
+
+public PoolExhaustedException(String reason, String SQLState) {
+super(reason, SQLState);
+}
+
+public PoolExhaustedException(String reason, Throwable cause) {
+super(reason, cause);
+}
+
+public PoolExhaustedException(String reason, String SQLState, int
vendorCode) {
+super(reason, SQLState, vendorCode);
+}
+
+public PoolExhaustedException(String reason, String sqlState, Throwable
cause) {
+super(reason, sqlState, cause);
+}
+
+public PoolExhaustedException(String reason, String sqlState, int
vendorCode, Throwable cause) {
+super(reason, sqlState, vendorCode, cause);
+}
+
+}
Propchange:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-
svn propchange: r1302968 - svn:log
Author: kkolinko Revision: 1302968 Modified property: svn:log Modified: svn:log at Tue Mar 20 18:49:33 2012 -- --- svn:log (original) +++ svn:log Tue Mar 20 18:49:33 2012 @@ -1 +1,2 @@ -https://issues.apache.org/bugzilla/show_bug.cgi?id=52327 +https://issues.apache.org/bugzilla/show_bug.cgi?id=52493 +Add java7 support - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1303096 - in /tomcat/trunk/modules/jdbc-pool: doc/jdbc-pool.xml src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
Author: kkolinko
Date: Tue Mar 20 18:55:40 2012
New Revision: 1303096
URL: http://svn.apache.org/viewvc?rev=1303096&view=rev
Log:
Fix checkstyle issues with trailing spaces and imports formatting.
Modified:
tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
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=1303096&r1=1303095&r2=1303096&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Mar 20 18:55:40 2012
@@ -70,7 +70,7 @@
Ability to configure custom interceptors.
This allows you to write custom interceptors to enhance the
functionality. You can use interceptors to gather query stats,
cache session states, reconnect the connection upon failures, retry
queries, cache query results, and so on.
- Your options are endless and the interceptors are dynamic, not tied
to a JDK version of a
+ Your options are endless and the interceptors are dynamic, not tied
to a JDK version of a
java.sql/javax.sql interface.
High performance - we will show some differences in performance
later on
Extremely simple, due to the very simplified implementation, the
line count and source file count are very low, compare with c3p0
@@ -455,7 +455,7 @@
- (boolean) Set this to true if you wish to put a facade on your
connection so that it cannot be reused after it has been closed. This prevents
a thread holding on to a
+ (boolean) Set this to true if you wish to put a facade on your
connection so that it cannot be reused after it has been closed. This prevents
a thread holding on to a
reference of a connection it has already called closed on,
to execute queries on it. Default value is false for backwards
compatibility.
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java?rev=1303096&r1=1303095&r2=1303096&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
Tue Mar 20 18:55:40 2012
@@ -18,6 +18,7 @@
package org.apache.tomcat.jdbc.test;
import java.sql.Connection;
+
import org.apache.tomcat.jdbc.test.driver.Driver;
public class MultipleCloseTest extends DefaultTestCase {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1303097 - /tomcat/tc7.0.x/trunk/modules/
Author: kkolinko Date: Tue Mar 20 18:57:18 2012 New Revision: 1303097 URL: http://svn.apache.org/viewvc?rev=1303097&view=rev Log: Update external to pick eol-style and checkstyle fixes in jdbc-pool. Modified: tomcat/tc7.0.x/trunk/modules/ (props changed) Propchange: tomcat/tc7.0.x/trunk/modules/ -- --- svn:externals (original) +++ svn:externals Tue Mar 20 18:57:18 2012 @@ -1 +1 @@ -^/tomcat/trunk/modules/jdbc-pool@1303066 jdbc-pool +^/tomcat/trunk/modules/jdbc-pool@1303096 jdbc-pool - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/485 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1303067 Blamelist: fhanik,kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot
RE: svn commit: r1302948 - in /tomcat/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/ main/java/org/apache/tomcat/jdbc/pool/jmx/ test/java/org/apache/tomcat/jdbc/test/
> -Original Message- > > There is no need in the above clone() method. > It has the same access level (protected) as super one. > > I see that PoolProperties is written as "implements Cloneable". In > such case the clone method is usually redeclared as public one. [Filip Hanik] No, implements Cloneable , just means that the JVM wont throw an exception if you try to call the method and it is not implemented. It lets the JVM do the cloning for you The IDE added in the method, and I don't see how it hurts - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: svn commit: r1303082 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.java
I need to investigate this, and why my config file is not being picked up by
subversion
Best
Filip
> -Original Message-
> From: kkoli...@apache.org [mailto:kkoli...@apache.org]
> Sent: Tuesday, March 20, 2012 12:39 PM
> To: dev@tomcat.apache.org
> Subject: svn commit: r1303082 - /tomcat/trunk/modules/jdbc-
> pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.
> java
>
> Author: kkolinko
> Date: Tue Mar 20 18:39:28 2012
> New Revision: 1303082
>
> URL: http://svn.apache.org/viewvc?rev=1303082&view=rev
> Log:
> svn:eol-style = native
>
> Modified:
> tomcat/trunk/modules/jdbc-
> pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.
> java (contents, props changed)
>
> Modified: tomcat/trunk/modules/jdbc-
> pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.
> java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-
> pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.
> java?rev=1303082&r1=1303081&r2=1303082&view=diff
> ==
>
> --- tomcat/trunk/modules/jdbc-
> pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.
> java (original)
> +++ tomcat/trunk/modules/jdbc-
> pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolExhaustedException.
> java Tue Mar 20 18:39:28 2012
> @@ -1,54 +1,54 @@
> -/*
> - * 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;
> -
> -import java.sql.SQLException;
> -
> -public class PoolExhaustedException extends SQLException {
> -
> -public PoolExhaustedException() {
> -}
> -
> -public PoolExhaustedException(String reason) {
> -super(reason);
> -}
> -
> -public PoolExhaustedException(Throwable cause) {
> -super(cause);
> -}
> -
> -public PoolExhaustedException(String reason, String SQLState) {
> -super(reason, SQLState);
> -}
> -
> -public PoolExhaustedException(String reason, Throwable cause) {
> -super(reason, cause);
> -}
> -
> -public PoolExhaustedException(String reason, String SQLState, int
> vendorCode) {
> -super(reason, SQLState, vendorCode);
> -}
> -
> -public PoolExhaustedException(String reason, String sqlState, Throwable
> cause) {
> -super(reason, sqlState, cause);
> -}
> -
> -public PoolExhaustedException(String reason, String sqlState, int
> vendorCode, Throwable cause) {
> -super(reason, sqlState, vendorCode, cause);
> -}
> -
> -}
> +/*
> + * 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;
> +
> +import java.sql.SQLException;
> +
> +public class PoolExhaustedException extends SQLException {
> +
> +public PoolExhaustedException() {
> +}
> +
> +public PoolExhaustedException(String reason) {
> +super(reason);
> +}
> +
> +public PoolExhaustedException(Throwable cause) {
> +super(cause);
> +}
> +
> +public PoolExhaustedException(String reason, String SQLState) {
> +super(reason, SQLState);
> +}
> +
> +public PoolExhaustedException(String reason, Throwable cause) {
> +super(reason, cause);
> +}
> +
> +public PoolExhaustedException(String reason, String SQLState, int
> vendorCode) {
> +super(reason, SQLState, vendorCode);
> +}
> +
> +public Poo
RE: svn commit: r1303096 - in /tomcat/trunk/modules/jdbc-pool: doc/jdbc-pool.xml src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
Have we published a check style configuration file?
> -Original Message-
> From: kkoli...@apache.org [mailto:kkoli...@apache.org]
> Sent: Tuesday, March 20, 2012 12:56 PM
> To: dev@tomcat.apache.org
> Subject: svn commit: r1303096 - in /tomcat/trunk/modules/jdbc-pool:
> doc/jdbc-pool.xml
> src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
>
> Author: kkolinko
> Date: Tue Mar 20 18:55:40 2012
> New Revision: 1303096
>
> URL: http://svn.apache.org/viewvc?rev=1303096&view=rev
> Log:
> Fix checkstyle issues with trailing spaces and imports formatting.
>
> Modified:
> tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
> tomcat/trunk/modules/jdbc-
> pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
>
> 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=1303096&r1=1303095&r2=1303096&view=diff
> ==
>
> --- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
> +++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Mar 20
> 18:55:40 2012
> @@ -70,7 +70,7 @@
>Ability to configure custom interceptors.
>This allows you to write custom interceptors to enhance the
> functionality. You can use interceptors to gather query stats,
>cache session states, reconnect the connection upon failures, retry
> queries, cache query results, and so on.
> - Your options are endless and the interceptors are dynamic, not
> tied to
> a JDK version of a
> + Your options are endless and the interceptors are dynamic, not
> tied to
> a JDK version of a
>java.sql/javax.sql interface.
>High performance - we will show some differences in performance
> later on
>Extremely simple, due to the very simplified implementation, the
> line
> count and source file count are very low, compare with c3p0
> @@ -455,7 +455,7 @@
>
>
>
> - (boolean) Set this to true if you wish to put a facade on your
> connection so that it cannot be reused after it has been closed. This prevents
> a thread holding on to a
> + (boolean) Set this to true if you wish to put a facade on your
> connection so that it cannot be reused after it has been closed. This prevents
> a thread holding on to a
> reference of a connection it has already called closed
> on, to
> execute queries on it. Default value is false for backwards
> compatibility.
>
>
>
> Modified: tomcat/trunk/modules/jdbc-
> pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-
> pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java?rev
> =1303096&r1=1303095&r2=1303096&view=diff
> ==
>
> --- tomcat/trunk/modules/jdbc-
> pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
> (original)
> +++ tomcat/trunk/modules/jdbc-
> pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java Tue
> Mar 20 18:55:40 2012
> @@ -18,6 +18,7 @@
> package org.apache.tomcat.jdbc.test;
>
> import java.sql.Connection;
> +
> import org.apache.tomcat.jdbc.test.driver.Driver;
>
> public class MultipleCloseTest extends DefaultTestCase {
>
>
>
> -
> 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
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2873 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1303096 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot
Re: svn commit: r1303096 - in /tomcat/trunk/modules/jdbc-pool: doc/jdbc-pool.xml src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java
2012/3/20 Filip Hanik (mailing lists) : > Have we published a check style configuration file? Building Tomcat 8 or 7 with execute.validate=true performs the check over modules/jdbc-pool as well. There was an issue in jdbc-pool that several files did not have license headers. After fixing it I added the checkstyle check so that we notice early if it occurs again. http://svn.apache.org/viewvc?view=revision&revision=1232869 > >> -Original Message- >> From: kkoli...@apache.org [mailto:kkoli...@apache.org] >> Sent: Tuesday, March 20, 2012 12:56 PM >> To: dev@tomcat.apache.org >> Subject: svn commit: r1303096 - in /tomcat/trunk/modules/jdbc-pool: >> doc/jdbc-pool.xml >> src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java >> >> Author: kkolinko >> Date: Tue Mar 20 18:55:40 2012 >> New Revision: 1303096 >> >> URL: http://svn.apache.org/viewvc?rev=1303096&view=rev >> Log: >> Fix checkstyle issues with trailing spaces and imports formatting. >> >> Modified: >> tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml >> tomcat/trunk/modules/jdbc- >> pool/src/test/java/org/apache/tomcat/jdbc/test/MultipleCloseTest.java >> Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 Gurkan Erdogdu changed: What|Removed |Added Version|7.0.21 |trunk -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1242101 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardServer.java java/org/apache/catalina/util/ExtensionValidator.java webapps/docs/changelog.xml
On 20/03/2012 15:41, Konstantin Kolinko wrote:
> 1). Why isn't is starting with this.getParentClassLoader(); ?
>
> The actual shared classloader is the one used in
> WebappLoader#createClassLoader(). I'd say that calling
> Server.getParentClassLoader() will be closer to the truth here.
>
> E.g. Tomcat class creates and calls Server instance directly, without
> relying on Catalina. So using Server.getParentClassLoader() seems to
> be better here.
+1 to that change.
>> +// Walk the class loader hierarchy. Stop at the system class
>> loader.
>> +// This will add the shared (if present) and common class
>> loaders
>> +while (cl != ClassLoader.getSystemClassLoader()) {
>
> 2) It should not hurt to move ClassLoader.getSystemClassLoader() out
> of the loop. This method involves a SecurityManager check and it is
> better to do it once.
+1.
>> +if (cl instanceof URLClassLoader) {
>> +URL[] urls = ((URLClassLoader) cl).getURLs();
>> +for (URL url : urls) {
>> +if (url.getProtocol().equals("file")) {
>> +try {
>> +File f = new File (url.toURI());
>> +if (f.isFile() &&
>> +f.getName().endsWith(".jar")) {
>> +ExtensionValidator.addSystemResource(f);
>
> 3) The above is a static method and it does not check for duplicates.
>
> It would be a substantial change to ExtensionValidator to fix it, so I
> submitted the following issue:
> https://issues.apache.org/bugzilla/show_bug.cgi?id=52952
Comments on bug.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52952] Improve ExtensionValidator handling for embedded scenarios
https://issues.apache.org/bugzilla/show_bug.cgi?id=52952 --- Comment #1 from Mark Thomas 2012-03-20 20:17:06 UTC --- Adding a duplicate check should be trivial. There should be one validator per instance rather than one per context so adding it to the Server is likely the best solution. -- 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 52952] Improve ExtensionValidator handling for embedded scenarios
https://issues.apache.org/bugzilla/show_bug.cgi?id=52952 Mark Thomas changed: What|Removed |Added Severity|normal |enhancement -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1303138 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextImpl.java ELResolverImpl.java ExpressionEvaluatorImpl.java
Author: markt
Date: Tue Mar 20 20:48:52 2012
New Revision: 1303138
URL: http://svn.apache.org/viewvc?rev=1303138&view=rev
Log:
Deprecate ELResolverImpl since it supports the deprecated EL implementation
Move the default EL resolver to the ELContextImpl so the deprecated code
depends on undeprecated code rather than the other way around.
Fixes a handful of deprecation warnings
Modified:
tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java
tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java?rev=1303138&r1=1303137&r2=1303138&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java Tue Mar 20
20:48:52 2012
@@ -20,12 +20,20 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
+import javax.el.ArrayELResolver;
+import javax.el.BeanELResolver;
+import javax.el.CompositeELResolver;
import javax.el.ELContext;
import javax.el.ELResolver;
import javax.el.FunctionMapper;
+import javax.el.ListELResolver;
+import javax.el.MapELResolver;
+import javax.el.ResourceBundleELResolver;
import javax.el.ValueExpression;
import javax.el.VariableMapper;
+import org.apache.jasper.Constants;
+
/**
* Implementation of ELContext
*
@@ -62,6 +70,21 @@ public final class ELContextImpl extends
}
+private static final ELResolver DefaultResolver;
+
+static {
+if (Constants.IS_SECURITY_ENABLED) {
+DefaultResolver = null;
+} else {
+DefaultResolver = new CompositeELResolver();
+((CompositeELResolver) DefaultResolver).add(new MapELResolver());
+((CompositeELResolver) DefaultResolver).add(new
ResourceBundleELResolver());
+((CompositeELResolver) DefaultResolver).add(new ListELResolver());
+((CompositeELResolver) DefaultResolver).add(new ArrayELResolver());
+((CompositeELResolver) DefaultResolver).add(new BeanELResolver());
+}
+}
+
private final ELResolver resolver;
private FunctionMapper functionMapper = NullFunctionMapper;
@@ -69,7 +92,7 @@ public final class ELContextImpl extends
private VariableMapper variableMapper;
public ELContextImpl() {
-this(ELResolverImpl.getDefaultResolver());
+this(getDefaultResolver());
}
public ELContextImpl(ELResolver resolver) {
@@ -102,4 +125,17 @@ public final class ELContextImpl extends
this.variableMapper = variableMapper;
}
+public static ELResolver getDefaultResolver() {
+if (Constants.IS_SECURITY_ENABLED) {
+CompositeELResolver defaultResolver = new CompositeELResolver();
+defaultResolver.add(new MapELResolver());
+defaultResolver.add(new ResourceBundleELResolver());
+defaultResolver.add(new ListELResolver());
+defaultResolver.add(new ArrayELResolver());
+defaultResolver.add(new BeanELResolver());
+return defaultResolver;
+} else {
+return DefaultResolver;
+}
+}
}
Modified: tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java?rev=1303138&r1=1303137&r2=1303138&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java Tue Mar 20
20:48:52 2012
@@ -19,43 +19,22 @@ package org.apache.jasper.el;
import java.util.Iterator;
-import javax.el.ArrayELResolver;
-import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.ELResolver;
-import javax.el.ListELResolver;
-import javax.el.MapELResolver;
import javax.el.PropertyNotFoundException;
import javax.el.PropertyNotWritableException;
-import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.el.VariableResolver;
-import org.apache.jasper.Constants;
-
+@Deprecated
public final class ELResolverImpl extends ELResolver {
-private static final ELResolver DefaultResolver;
-
-static {
-if (Constants.IS_SECURITY_ENABLED) {
-DefaultResolver = null;
-} else {
-DefaultResolver = new CompositeELResolver();
-((CompositeELResolver) DefaultResolver).add(new MapELResolver());
-((CompositeELResolver) DefaultResolver).add(new
ResourceBundleELResolver());
-((CompositeELResolver) DefaultResolver).add(new ListELResolver());
-((CompositeELReso
svn commit: r1303139 - /tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
Author: markt
Date: Tue Mar 20 20:49:13 2012
New Revision: 1303139
URL: http://svn.apache.org/viewvc?rev=1303139&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java?rev=1303139&r1=1303138&r2=1303139&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java Tue Mar 20
20:49:13 2012
@@ -135,13 +135,4 @@ public final class ELResolverImpl extend
}
return elResolver.getCommonPropertyType(context, base);
}
-
-/**
- * @deprecated Use {@link ELContextImpl#getDefaultResolver()} instead.
This
- * method will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-public static ELResolver getDefaultResolver() {
-return ELContextImpl.getDefaultResolver();
-}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1303142 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/el/ELContextImpl.java java/org/apache/jasper/el/ELResolverImpl.java java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
Author: markt
Date: Tue Mar 20 20:50:36 2012
New Revision: 1303142
URL: http://svn.apache.org/viewvc?rev=1303142&view=rev
Log:
Deprecate ELResolverImpl since it supports the deprecated EL implementation
Move the default EL resolver to the ELContextImpl so the deprecated code
depends on undeprecated code rather than the other way around.
Fixes a handful of deprecation warnings
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/ELContextImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/ELResolverImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1303138
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/ELContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/ELContextImpl.java?rev=1303142&r1=1303141&r2=1303142&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/ELContextImpl.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/ELContextImpl.java Tue Mar
20 20:50:36 2012
@@ -20,12 +20,20 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
+import javax.el.ArrayELResolver;
+import javax.el.BeanELResolver;
+import javax.el.CompositeELResolver;
import javax.el.ELContext;
import javax.el.ELResolver;
import javax.el.FunctionMapper;
+import javax.el.ListELResolver;
+import javax.el.MapELResolver;
+import javax.el.ResourceBundleELResolver;
import javax.el.ValueExpression;
import javax.el.VariableMapper;
+import org.apache.jasper.Constants;
+
/**
* Implementation of ELContext
*
@@ -62,6 +70,21 @@ public final class ELContextImpl extends
}
+private static final ELResolver DefaultResolver;
+
+static {
+if (Constants.IS_SECURITY_ENABLED) {
+DefaultResolver = null;
+} else {
+DefaultResolver = new CompositeELResolver();
+((CompositeELResolver) DefaultResolver).add(new MapELResolver());
+((CompositeELResolver) DefaultResolver).add(new
ResourceBundleELResolver());
+((CompositeELResolver) DefaultResolver).add(new ListELResolver());
+((CompositeELResolver) DefaultResolver).add(new ArrayELResolver());
+((CompositeELResolver) DefaultResolver).add(new BeanELResolver());
+}
+}
+
private final ELResolver resolver;
private FunctionMapper functionMapper = NullFunctionMapper;
@@ -69,7 +92,7 @@ public final class ELContextImpl extends
private VariableMapper variableMapper;
public ELContextImpl() {
-this(ELResolverImpl.getDefaultResolver());
+this(getDefaultResolver());
}
public ELContextImpl(ELResolver resolver) {
@@ -102,4 +125,17 @@ public final class ELContextImpl extends
this.variableMapper = variableMapper;
}
+public static ELResolver getDefaultResolver() {
+if (Constants.IS_SECURITY_ENABLED) {
+CompositeELResolver defaultResolver = new CompositeELResolver();
+defaultResolver.add(new MapELResolver());
+defaultResolver.add(new ResourceBundleELResolver());
+defaultResolver.add(new ListELResolver());
+defaultResolver.add(new ArrayELResolver());
+defaultResolver.add(new BeanELResolver());
+return defaultResolver;
+} else {
+return DefaultResolver;
+}
+}
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/ELResolverImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/ELResolverImpl.java?rev=1303142&r1=1303141&r2=1303142&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/ELResolverImpl.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/ELResolverImpl.java Tue Mar
20 20:50:36 2012
@@ -19,43 +19,22 @@ package org.apache.jasper.el;
import java.util.Iterator;
-import javax.el.ArrayELResolver;
-import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.ELResolver;
-import javax.el.ListELResolver;
-import javax.el.MapELResolver;
import javax.el.PropertyNotFoundException;
import javax.el.PropertyNotWritableException;
-import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.el.VariableResolver;
-import org.apache.jasper.Constants;
-
+@Deprecated
public final class ELResolverImpl extends ELResolver {
-private static final ELResolver DefaultResolver;
-
-static {
-if (Constants.IS_SECURITY_ENABLED) {
-DefaultResolver = null;
-} else {
-DefaultResolver = new CompositeELResolver();
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2874 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1303139 Blamelist: markt Build succeeded! sincerely, -The Buildbot
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/487 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1303142 Blamelist: markt Build succeeded! sincerely, -The Buildbot
svn commit: r1303163 - /tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
Author: markt
Date: Tue Mar 20 21:34:06 2012
New Revision: 1303163
URL: http://svn.apache.org/viewvc?rev=1303163&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52839
New unit test for DigestAuthenticator and SingleSignOn
Patch provided by Brian Burch
Added:
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
(with props)
Added:
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java?rev=1303163&view=auto
==
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
(added)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
Tue Mar 20 21:34:06 2012
@@ -0,0 +1,499 @@
+/*
+ * 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.authenticator;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.deploy.LoginConfig;
+import org.apache.catalina.deploy.SecurityCollection;
+import org.apache.catalina.deploy.SecurityConstraint;
+import org.apache.catalina.startup.TesterServlet;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.util.MD5Encoder;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+/**
+ * Test DigestAuthenticator and NonLoginAuthenticator when a
+ * SingleSignOn Valve is active.
+ *
+ *
+ * In the absence of SSO support, a webapp using NonLoginAuthenticator
+ * simply cannot access protected resources. These tests exercise the
+ * the way successfully authenticating a different webapp under the
+ * DigestAuthenticator triggers the additional SSO logic for both webapps.
+ *
+ *
+ * Note: these tests are intended to exercise the SSO logic of the
+ * Authenticator, but not to comprehensively test all of its logic paths.
+ * That is the responsibility of the non-SSO test suite.
+ */
+public class TestSSOnonLoginAndDigestAuthenticator extends TomcatBaseTest {
+
+private static final String USER = "user";
+private static final String PWD = "pwd";
+private static final String ROLE = "role";
+
+private static final String HTTP_PREFIX = "http://localhost:";;
+private static final String CONTEXT_PATH_NOLOGIN = "/nologin";
+private static final String CONTEXT_PATH_DIGEST = "/digest";
+private static final String URI_PROTECTED = "/protected";
+private static final String URI_PUBLIC = "/anyoneCanAccess";
+
+private static final int SHORT_TIMEOUT_SECS = 4;
+private static final long SHORT_TIMEOUT_DELAY_MSECS =
+((SHORT_TIMEOUT_SECS + 3) * 1000);
+private static final int LONG_TIMEOUT_SECS = 10;
+private static final long LONG_TIMEOUT_DELAY_MSECS =
+((LONG_TIMEOUT_SECS + 2) * 1000);
+
+private static final String CLIENT_AUTH_HEADER = "authorization";
+private static final String OPAQUE = "opaque";
+private static final String NONCE = "nonce";
+private static final String REALM = "realm";
+private static final String CNONCE = "cnonce";
+
+private static String NC1 = "0001";
+private static String NC2 = "0002";
+private static String QOP = "auth";
+
+private static String SERVER_COOKIES = "Set-Cookie";
+private static String BROWSER_COOKIES = "Cookie";
+
+private List cookies;
+
+/**
+ * Try to access an unprotected resource without an
+ * established SSO session.
+ * This should be permitted.
+ */
+@Test
+public void testAcceptPublicNonLogin() throws Exception {
+doTestNonLogin(CONTEXT_PATH_NOLOGIN + URI_PUBLIC,
+
svn commit: r1303166 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java webapps/docs/changelog.xml
Author: markt Date: Tue Mar 20 21:35:44 2012 New Revision: 1303166 URL: http://svn.apache.org/viewvc?rev=1303166&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52839 New unit test for DigestAuthenticator and SingleSignOn Patch provided by Brian Burch Added: tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java - copied unchanged from r1303163, tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1303163 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1303166&r1=1303165&r2=1303166&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 20 21:35:44 2012 @@ -90,6 +90,10 @@ javax.naming.Name to identify the resource rather than a java.lang.String. (markt) + +52839: Add a unit test for DigestAuthenticator and +SingleSignOn. Patch provide by Brian Burch. (markt) + 52846: Make sure NonLoginAuthenticator registers not MemoryUser but GenericPrincipal into a session when UserDatabaseRealm - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52839] New unit test for DigestAuthenticator and SingleSignOn
https://issues.apache.org/bugzilla/show_bug.cgi?id=52839 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2012-03-20 21:35:58 UTC --- Added to trunk and 7.0.x and will be included in 7.0.27 onwards. Many thanks. -- 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: r1303167 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Mar 20 21:36:36 2012 New Revision: 1303167 URL: http://svn.apache.org/viewvc?rev=1303167&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1303167&r1=1303166&r2=1303167&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 20 21:36:36 2012 @@ -168,7 +168,7 @@ PATCHES PROPOSED TO BACKPORT: * Update to Eclipse JDT Compiler 3.7.2. https://issues.apache.org/bugzilla/show_bug.cgi?id=52805 Patch: https://issues.apache.org/bugzilla/attachment.cgi?id=28478 - +1: kkolinko + +1: kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1303168 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Mar 20 21:46:06 2012 New Revision: 1303168 URL: http://svn.apache.org/viewvc?rev=1303168&view=rev Log: 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=1303168&r1=1303167&r2=1303168&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 20 21:46:06 2012 @@ -92,7 +92,7 @@ PATCHES PROPOSED TO BACKPORT: 2) Patch http://people.apache.org/~kkolinko/patches/2012-01-18_tc6_LicenseRtf.patch - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52579 @@ -101,6 +101,7 @@ PATCHES PROPOSED TO BACKPORT: This fix avoids http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6196991. https://issues.apache.org/bugzilla/attachment.cgi?id=28274 +1: kfujino, fhanik + -0: markt - https://issues.apache.org/bugzilla/show_bug.cgi?id=52579#c8 -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52606 @@ -115,7 +116,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1145209&view=rev TC 6 patch: http://people.apache.org/~rjung/patches/tc6-apr-all-sslprotocol-r1145209.patch - +1: rjung, mturk, fhanik + +1: rjung, mturk, fhanik, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52719 @@ -126,13 +127,14 @@ PATCHES PROPOSED TO BACKPORT: * Replicate Principal in ClusterSingleSignOn. http://svn.apache.org/viewvc?view=revision&revision=1298299 - +1: kfujino, fhanik + +1: kfujino, fhanik, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52500 Add configurable mechanism to retrieve user names from X509 client certificates. trunk patch: http://svn.apache.org/viewvc?view=revision&revision=r1298476 - +1: schultz. fhanik + +1: schultz, fhanik + +1: markt if clean-up is also applied -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52723 @@ -158,7 +160,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix bug https://issues.apache.org/bugzilla/show_bug.cgi?id=52858 http://svn.apache.org/viewvc?rev=1300948&view=rev - +1: fhanik + +1: fhanik, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52918 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1303171 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/ajp/AjpAprProcessor.java java/org/apache/coyote/ajp/AjpProcessor.java webapps/docs/changelog.xml
Author: markt Date: Tue Mar 20 21:52:07 2012 New Revision: 1303171 URL: http://svn.apache.org/viewvc?rev=1303171&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52606 Ensure replayed POST bodies are available when using AJP Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.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=1303171&r1=1303170&r2=1303171&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 20 21:52:07 2012 @@ -104,12 +104,6 @@ PATCHES PROPOSED TO BACKPORT: -0: markt - https://issues.apache.org/bugzilla/show_bug.cgi?id=52579#c8 -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52606 - Ensure replayed POST bodies are available when using AJP - http://svn.apache.org/viewvc?rev=1241985&view=rev - +1: markt, kfujino, fhanik - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 Support all SSL/TLS protocol combinations in APR connector. trunk/TC7 (applies clean except for docs): Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1303171&r1=1303170&r2=1303171&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Tue Mar 20 21:52:07 2012 @@ -631,7 +631,7 @@ public class AjpAprProcessor implements first = false; empty = false; replay = true; - +endOfStream = false; } Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1303171&r1=1303170&r2=1303171&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Mar 20 21:52:07 2012 @@ -636,7 +636,7 @@ public class AjpProcessor implements Act first = false; empty = false; replay = true; - +endOfStream = false; } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1303171&r1=1303170&r2=1303171&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Mar 20 21:52:07 2012 @@ -109,6 +109,14 @@ + + + +52606: Ensure replayed POST bodies are available when using +AJP. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52606] FORM authentication POST replay broken for AJP
https://issues.apache.org/bugzilla/show_bug.cgi?id=52606 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2012-03-20 21:52:31 UTC --- Fixed in 6.0.x and will be included in 6.0.36 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
DO NOT REPLY [Bug 52751] Optimized configuration of the system info displayed in the default error page
https://issues.apache.org/bugzilla/show_bug.cgi?id=52751 Mark Thomas changed: What|Removed |Added Attachment #28372|1 |0 is patch|| Attachment #28372|text/plain |application/octet-stream mime type|| --- Comment #1 from Mark Thomas 2012-03-20 21:54:42 UTC --- Comment on attachment 28372 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28372 Patch in ErrorReportValve.java and docu page + 2 screenshots Correct patch MIME type so BZ doesn't try to display it. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[debug] ( javajni.c:195 ) Invalid RuntimeLib should be a warning or error?
So, I’ll file a bug about this, but I wanted to get a general feel from the list first. This happens in both Tomcat 6 and 7 (haven’t looked at 5.5), but I’ve only included the Tomcat 7 log info here for succinctness. When running Tomcat as a service under Windows, if you mess up the Java Virtual Machine path in the service configurator, it defaults to the JAVA_HOME JRE, which I suppose is okay (but can wreak havoc when you have multiple Java versions installed), except that it doesn’t warn you about it. It tells you about it through a DEBUG message, instead, so you have to actually increase the logging detail and wade through more messages to find it: [2012-03-20 16:32:41] [debug] ( prunsrv.c:1644) Commons Daemon procrun log initialized [2012-03-20 16:32:41] [info] ( prunsrv.c:1648) Commons Daemon procrun (1.0.9.0 64-bit) started [2012-03-20 16:32:41] [info] ( prunsrv.c:1561) Running 'gr01in01tc70' Service... [2012-03-20 16:32:41] [debug] ( prunsrv.c:1345) Inside ServiceMain... [2012-03-20 16:32:41] [info] ( prunsrv.c:1089) Starting service... [2012-03-20 16:32:41] [debug] ( javajni.c:195 ) Invalid RuntimeLib 'D:\Java\jdk6\jre\bin\server\jvm.dll' [2012-03-20 16:32:41] [debug] ( javajni.c:197 ) Using Jre JavaHome 'C:\Program Files\Java\jre7' [2012-03-20 16:32:41] [debug] ( javajni.c:206 ) loading jvm 'C:\Program Files\Java\jre7\bin\server\jvm.dll' After correcting the JVM path: [2012-03-20 16:46:13] [debug] ( prunsrv.c:1644) Commons Daemon procrun log initialized [2012-03-20 16:46:13] [info] ( prunsrv.c:1648) Commons Daemon procrun (1.0.9.0 64-bit) started [2012-03-20 16:46:13] [info] ( prunsrv.c:1561) Running 'gr01in01tc70' Service... [2012-03-20 16:46:13] [debug] ( prunsrv.c:1345) Inside ServiceMain... [2012-03-20 16:46:13] [info] ( prunsrv.c:1089) Starting service... [2012-03-20 16:46:13] [debug] ( javajni.c:206 ) loading jvm 'C:\Program Files\Java\jre6\bin\server\jvm.dll' IMO, this message should be a warning or even an error (preferable) so that server admins know right off the bat that they’ve done something wrong. Thoughts?
Re: [debug] ( javajni.c:195 ) Invalid RuntimeLib should be a warning or error?
On 20/03/2012 21:54, Nick Williams wrote: > Thoughts? That is a general Commons Daemon issue rather than a Tomcat specific issue and would be best discussed over on the Commons lists. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: [debug] ( javajni.c:195 ) Invalid RuntimeLib should be a warning or error?
-Original Message- From: Mark Thomas [mailto:ma...@apache.org] Sent: Tuesday, March 20, 2012 4:59 PM To: Tomcat Developers List Subject: Re: [debug] ( javajni.c:195 ) Invalid RuntimeLib should be a warning or error? On 20/03/2012 21:54, Nick Williams wrote: > Thoughts? That is a general Commons Daemon issue rather than a Tomcat specific issue and would be best discussed over on the Commons lists. Mark - Ahhh! Yes. Of course. Silly me. Thanks! - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [debug] ( javajni.c:195 ) Invalid RuntimeLib should be a warning or error?
2012/3/21 Nick Williams : > So, I’ll file a bug about this, but I wanted to get a general feel from the > list first. This happens in both Tomcat 6 and 7 (haven’t looked at 5.5), > but I’ve only included the Tomcat 7 log info here for succinctness. > > > > When running Tomcat as a service under Windows, if you mess up the Java > Virtual Machine path in the service configurator, it defaults to the > JAVA_HOME JRE, which I suppose is okay (but can wreak havoc when you have > multiple Java versions installed), except that it doesn’t warn you about > it. It tells you about it through a DEBUG message, instead, so you have to > actually increase the logging detail and wade through more messages to find > it: > > > > [2012-03-20 16:32:41] [debug] ( prunsrv.c:1644) Commons Daemon procrun log > initialized > > [2012-03-20 16:32:41] [info] ( prunsrv.c:1648) Commons Daemon procrun > (1.0.9.0 64-bit) started > > [2012-03-20 16:32:41] [info] ( prunsrv.c:1561) Running 'gr01in01tc70' > Service... > > [2012-03-20 16:32:41] [debug] ( prunsrv.c:1345) Inside ServiceMain... > > [2012-03-20 16:32:41] [info] ( prunsrv.c:1089) Starting service... > > [2012-03-20 16:32:41] [debug] ( javajni.c:195 ) Invalid RuntimeLib > 'D:\Java\jdk6\jre\bin\server\jvm.dll' > > [2012-03-20 16:32:41] [debug] ( javajni.c:197 ) Using Jre JavaHome > 'C:\Program Files\Java\jre7' > > [2012-03-20 16:32:41] [debug] ( javajni.c:206 ) loading jvm 'C:\Program > Files\Java\jre7\bin\server\jvm.dll' > > > > After correcting the JVM path: > > > > [2012-03-20 16:46:13] [debug] ( prunsrv.c:1644) Commons Daemon procrun log > initialized > > [2012-03-20 16:46:13] [info] ( prunsrv.c:1648) Commons Daemon procrun > (1.0.9.0 64-bit) started > > [2012-03-20 16:46:13] [info] ( prunsrv.c:1561) Running 'gr01in01tc70' > Service... > > [2012-03-20 16:46:13] [debug] ( prunsrv.c:1345) Inside ServiceMain... > > [2012-03-20 16:46:13] [info] ( prunsrv.c:1089) Starting service... > > [2012-03-20 16:46:13] [debug] ( javajni.c:206 ) loading jvm 'C:\Program > Files\Java\jre6\bin\server\jvm.dll' > > > > IMO, this message should be a warning or even an error (preferable) so that > server admins know right off the bat that they’ve done something wrong. > The service wrapper is not part of Tomcat project. It is "procrun" from Apache Commons Daemon. If you want to file an issue, you should do it there. http://commons.apache.org/daemon/ Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52777] Automatically shut down old versions in parallel deployment
https://issues.apache.org/bugzilla/show_bug.cgi?id=52777 --- Comment #1 from Mark Thomas 2012-03-20 22:02:02 UTC --- A variation of the last approach would be to get the auto deployment code to check the current session count for old context versions and undeploy them once the count is zero. -- 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 52751] Optimized configuration of the system info displayed in the default error page
https://issues.apache.org/bugzilla/show_bug.cgi?id=52751 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #2 from Mark Thomas 2012-03-20 22:11:07 UTC --- It is very rare for an attacker to identify the specific Tomcat version and then target a known vulnerability. It is much more common to see every known vulnerability probed (for a range of servers) rather than the more targeted attack described in the patch. I therefore see little point in hiding the version number. I'd go further than that and say I would prefer to see the exact Tomcat version in the server header since it provides more assistance to debugging/monitoring efforts than it does harm. Even if the version number is hidden there are plenty of other clues to the exact version number, particularly the line numbers in any stack trace. Rather than address this specific issue, I'd prefer to see a general solution to bug 41007 that allowed custom error pages to be specified without having to write a custom valve. -- 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 52791] [PATCH] read windows installer default values from config file
https://issues.apache.org/bugzilla/show_bug.cgi?id=52791 Mark Thomas changed: What|Removed |Added Attachment #28399|0 |1 is patch|| Attachment #28399|application/octet-stream|text/plain mime type|| -- 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
