svn commit: r713953 - in /tomcat/trunk/java/org/apache/catalina/session: LocalStrings.properties StandardSession.java

2008-11-14 Thread mturk
Author: mturk
Date: Fri Nov 14 00:54:58 2008
New Revision: 713953

URL: http://svn.apache.org/viewvc?rev=713953view=rev
Log:
When throwing Non-serializable exception, mark which argument was 
non-serializable to help tracing the cause when developing.
Needs localization to other local properties files.

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

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=713953r1=713952r2=713953view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Fri 
Nov 14 00:54:58 2008
@@ -64,7 +64,7 @@
 standardSession.notSerializable=Cannot serialize session attribute {0} for 
session {1}
 standardSession.removeAttribute.ise=removeAttribute: Session already 
invalidated
 standardSession.sessionEvent=Session event listener threw exception
-standardSession.setAttribute.iae=setAttribute: Non-serializable attribute
+standardSession.setAttribute.iae=setAttribute: Non-serializable attribute {0} 
with value {1}
 standardSession.setAttribute.ise=setAttribute: Session already invalidated
 standardSession.setAttribute.namenull=setAttribute: name parameter cannot be 
null
 standardSession.sessionCreated=Created Session id = {0}

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=713953r1=713952r2=713953view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Fri Nov 
14 00:54:58 2008
@@ -1320,8 +1320,8 @@
 if ((manager != null)  manager.getDistributable() 
   !(value instanceof Serializable))
 throw new IllegalArgumentException
-(sm.getString(standardSession.setAttribute.iae));
-
+(sm.getString(standardSession.setAttribute.iae,
+  name, value));
 // Construct an event with the new value
 HttpSessionBindingEvent event = null;
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 46209] New: Findbugs report on Tomcat-Pool

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46209

   Summary: Findbugs report on Tomcat-Pool
   Product: Tomcat 6
   Version: unspecified
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: [EMAIL PROTECTED]


I ran Findbugs 1.3.6 on Tomcat-Pool; the results are attached.


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 46209] Findbugs report on Tomcat-Pool

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46209





--- Comment #1 from Sebb [EMAIL PROTECTED]  2008-11-14 02:27:37 PST ---
Created an attachment (id=22868)
 -- (https://issues.apache.org/bugzilla/attachment.cgi?id=22868)
Findbugs analysis


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 46209] Findbugs report on Tomcat-Pool

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46209





--- Comment #2 from Sebb [EMAIL PROTECTED]  2008-11-14 02:46:01 PST ---
Created an attachment (id=22869)
 -- (https://issues.apache.org/bugzilla/attachment.cgi?id=22869)
Eclipse warnings report


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 46209] Findbugs report on Tomcat-Pool

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46209





--- Comment #3 from Sebb [EMAIL PROTECTED]  2008-11-14 03:12:51 PST ---
Created an attachment (id=22870)
 -- (https://issues.apache.org/bugzilla/attachment.cgi?id=22870)
Findbugs analysis from Eclipse (easier to read?)


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 46201] jdbc-pool : con.close() should no-op if already closed

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46201


Mark Thomas [EMAIL PROTECTED] changed:

   What|Removed |Added

  Component|Catalina|Modules: jdbc-pool




-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 46209] Findbugs report on Tomcat-Pool

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46209





--- Comment #4 from Sebb [EMAIL PROTECTED]  2008-11-14 04:04:13 PST ---
There are quite a few cases of class variables that are not final, even though
they are set in the constructor and not actually changed thereafter.

For example, 
ConnectionPool:pool
FairBlockingQueue:lock, items, waiters

Wherever possible, variables should be made final to ensure thread-safety.

There are some variables that are protected, even though there is already an
access method for them.

For example, DataSourceProxy:driver
In this case, the variable should definitely be private, as access needs to be
synchronized.

PooledConnection:counter is volatile, presumably instead of synchronising it.
However, volatile does not protect against the read-modify-write involved in
processing the counter++ statement.
Same applies to PoolProperties:poolCounter
Also, both of these are protected. I think they should be final.

It would be useful to use Javadoc to state the class thread-safety or
otherwise, and to add details of how fields are synchronised, e.g. using the
@GuardedBy annotation.

It's confusing to have aliases such as:
final ReentrantLock lock = FairBlockingQueue.this.lock;
when the code works just the same without.

Some source files still have the following copyright:
Copyright: Copyright (c) 2008 Filip Hanik


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [ANNOUNCE] Beta candidate for Tomcat connection pool

2008-11-14 Thread Mark Thomas
Filip Hanik - Dev Lists wrote:
 +1 to both

Done.

These have been added to tc6. If we get a lot of modules, it probably makes
more sense to create a Tomcat-Modules product but I think Tomcat 6 works
for now.

Mark

 
 Tim Funk wrote:
 What Component should be used in bugzilla? It might be nice to add a
 jdbc-pool Component. (And maybe a bayeux)

 -Tim

 Filip Hanik - Dev Lists wrote:
 The Apache Tomcat team announces the immediate availability of
 Apache Tomcat JDBC  Connection Pool

 Apache Tomcat Connectors version 1.0.1-beta is a new module within
 the Tomcat development realm, aimed to provide a high performance,
 concurrent and extensible connection pool to the Tomcat community.
 The pool, can of course also be used independently.

 Assorted set of binaries are available for testing at:
 http://tomcat.apache.org/dev/dist/jdbc-pool/v1.0.1-beta/

 If you find any bugs while using this test release, please fill in the
 Bugzilla Bug Report or send an e-mail to Tomcat Developers List.
 When entering bug use the following link:
 https://issues.apache.org/bugzilla/query.cgi?product=Tomcat%206

 The contribution was started with
 https://issues.apache.org/bugzilla/show_bug.cgi?id=46038


 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]


 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r714002 - in /tomcat/trunk/java/org/apache/catalina/session: LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties StandardSession.java

2008-11-14 Thread mturk
Author: mturk
Date: Fri Nov 14 05:49:14 2008
New Revision: 714002

URL: http://svn.apache.org/viewvc?rev=714002view=rev
Log:

Do not throw attribute value.
Patch provided by Tomaz Cerar cerar at parsek.com

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

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=714002r1=714001r2=714002view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Fri 
Nov 14 05:49:14 2008
@@ -64,7 +64,7 @@
 standardSession.notSerializable=Cannot serialize session attribute {0} for 
session {1}
 standardSession.removeAttribute.ise=removeAttribute: Session already 
invalidated
 standardSession.sessionEvent=Session event listener threw exception
-standardSession.setAttribute.iae=setAttribute: Non-serializable attribute {0} 
with value {1}
+standardSession.setAttribute.iae=setAttribute: Non-serializable attribute {0}
 standardSession.setAttribute.ise=setAttribute: Session already invalidated
 standardSession.setAttribute.namenull=setAttribute: name parameter cannot be 
null
 standardSession.sessionCreated=Created Session id = {0}

Modified: 
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties?rev=714002r1=714001r2=714002view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties 
Fri Nov 14 05:49:14 2008
@@ -63,7 +63,7 @@
 standardSession.notSerializable = No puedo serializar atributo de sesi\u00F3n 
{0} para sesi\u00F3n {1}
 standardSession.removeAttribute.ise = removeAttribute\: La Sesi\u00F3n ya ha 
sido invalidada
 standardSession.sessionEvent = El oyente de evento de Sesi\u00F3n lanz\u00F3 
una execpci\u00F3n
-standardSession.setAttribute.iae = setAttribute\: Atributo no serializable
+standardSession.setAttribute.iae = setAttribute\: Atributo {0} no serializable
 standardSession.setAttribute.ise = setAttribute\: La Sesi\u00F3n ya ha sido 
invalidada
 standardSession.setAttribute.namenull = setAttribute\: el nuevo par\u00E1metro 
no puede ser nulo
 standardSession.sessionCreated = Creada Sesi\u00F3n id \= {0}

Modified: 
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties?rev=714002r1=714001r2=714002view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties 
Fri Nov 14 05:49:14 2008
@@ -62,7 +62,7 @@
 standardSession.notSerializable=Impossible de sérialiser l''attribut de 
session {0} pour la session {1}
 standardSession.removeAttribute.ise=removeAttribute: Session déjà invalidée
 standardSession.sessionEvent=L''écouteur d''évènement de session (session 
event listener) a généré une exception
-standardSession.setAttribute.iae=setAttribute: attribut non sérialisable
+standardSession.setAttribute.iae=setAttribute: Attribut {0} non sérialisable
 standardSession.setAttribute.ise=setAttribute: Session déjà invalidée
 standardSession.setAttribute.namenull=setAttribute: le nom de paramètre ne 
peut être nul
 standardSession.sessionCreated=Création de l''Id de Session = {0}

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=714002r1=714001r2=714002view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Fri Nov 
14 05:49:14 2008
@@ -1320,8 +1320,7 @@
 if ((manager != null)  manager.getDistributable() 
   !(value instanceof Serializable))
 throw new IllegalArgumentException
-(sm.getString(standardSession.setAttribute.iae,
-  name, value));
+(sm.getString(standardSession.setAttribute.iae, name));
 // Construct an event with the new value
 HttpSessionBindingEvent 

svn commit: r714023 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

2008-11-14 Thread fhanik
Author: fhanik
Date: Fri Nov 14 06:59:10 2008
New Revision: 714023

URL: http://svn.apache.org/viewvc?rev=714023view=rev
Log:
initialize root cause of an exception

Modified:

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

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=714023r1=714022r2=714023view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Fri Nov 14 06:59:10 2008
@@ -160,7 +160,9 @@
 //return the connection
 return connection;
 }catch (Exception x) {
-throw new SQLException();
+SQLException s = new SQLException();
+s.initCause(x);
+throw s;
 }
 }
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Tomcat webapp stopped working, please help

2008-11-14 Thread djbowen1

I am running tomcat server on Redhat linux. Tomcat server 5.

2 weeks ago a webapp i have running on port 8010 just stopped working. I am
not a tomcat expert by any means and dont know much about it other than
trying to help out.

The only thing i see that has changed on the server is that up2date ran
october 29th and updated a bunch of stuff.

I have no idea even where to start, port 8010 is waiting and open but no
response
-- 
View this message in context: 
http://www.nabble.com/Tomcat-webapp-stopped-working%2C-please-help-tp20502150p20502150.html
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 46209] Findbugs report on Tomcat-Pool

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46209


Filip Hanik [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX




--- Comment #5 from Filip Hanik [EMAIL PROTECTED]  2008-11-14 07:12:23 PST ---
H C IL: There is an apparent infinite recursive loop in 
org.apache.tomcat.jdbc.pool.DataSourceProxy.setMinIdle(int)
Fixed before the report was filed.

H V MS: org.apache.tomcat.jdbc.pool.ConnectionPool.log isn't final but should 
be
Not an issue

H V MS: org.apache.tomcat.jdbc.pool.DataSourceFactory.log isn't final but 
should be
Not an issue

H V MS: 
org.apache.tomcat.jdbc.pool.DataSourceFactory$DataSourceHandler.methods isn't 
final but should be
Not an issue

H V MS: org.apache.tomcat.jdbc.pool.DataSourceProxy.log isn't final but should 
be
Not an issue

H V MS: org.apache.tomcat.jdbc.pool.Driver.pooltable isn't final but should be
Not an issue

H V MS: org.apache.tomcat.jdbc.pool.PooledConnection.log isn't final but 
should be
Not an issue

M B ES: Comparison of String objects using == or != in 
org.apache.tomcat.jdbc.pool.interceptor.ConnectionState.invoke(Object, Method, 
Object[]) 
Classes, methods, and fields, whether referenced from Java Virtual Machine
instructions or from other constant pool entries, are named using the constant
pool.Relies on the method name being stored in the constant pool, it'd be
interesting to see if that actually wasn't the case.
The spec says Classes, methods, and fields, whether referenced from Java
Virtual Machine instructions or from other constant pool entries, are named
using the constant pool.


M B ES: Comparison of String objects using == or != in 
org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.process(String[], 
Method, boolean) 
Classes, methods, and fields, whether referenced from Java Virtual Machine
instructions or from other constant pool entries, are named using the constant
pool.Relies on the method name being stored in the constant pool, it'd be
interesting to see if that actually wasn't the case.
The spec says Classes, methods, and fields, whether referenced from Java
Virtual Machine instructions or from other constant pool entries, are named
using the constant pool.

M B It: org.apache.tomcat.jdbc.pool.FairBlockingQueue$FairIterator.next() 
can't throw NoSuchElementException
Not an issue, although I dont even understand the bug reprot

M B Nm: The class name org.apache.tomcat.jdbc.pool.DataSource shadows the 
simple name of implemented interface javax.sql.DataSource
Not an issue

M B Nm: The class name org.apache.tomcat.jdbc.pool.Driver shadows the simple 
name of implemented interface java.sql.Driver
Not an issue

M D DLS: Dead store to exec in 
org.apache.tomcat.jdbc.pool.PooledConnection.validate(int, String)
Not an issue

M D Dm: Call to unsupported method 
org.apache.tomcat.jdbc.pool.FairBlockingQueue.drainTo(Collection, int) in 
org.apache.tomcat.jdbc.pool.FairBlockingQueue.drainTo(Collection)
Not an issue

M D NP: Load of known null value in 
org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection()
Not an issue

M D REC: Exception is caught when Exception is not thrown in 
org.apache.tomcat.jdbc.pool.ConnectionPool.getConnection()
One would hope so :) not an issue

M M UL: org.apache.tomcat.jdbc.pool.FairBlockingQueue.poll(long, TimeUnit) 
does not release lock on all exception paths
M M UL: org.apache.tomcat.jdbc.pool.FairBlockingQueue.poll(long, TimeUnit) 
does not release lock on all exception paths
I'd have to challenge that

M P SIC: Should org.apache.tomcat.jdbc.pool.ConnectionPool$PoolCleaner be a 
_static_ inner class?
Not an issue

M V EI2: new 
org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport$StatementProxy(SlowQueryReport,
 Object, Object[]) may expose internal representation by storing an externally 
mutable object into SlowQueryReport$StatementProxy.args
not an issue

M V MS: org.apache.tomcat.jdbc.pool.DataSourceFactory.ALL_PROPERTIES should be 
package protected
Not an issue

M X OBL: Method org.apache.tomcat.jdbc.pool.PooledConnection.validate(int, 
String) may fail to clean up stream or resource of type java.sql.Statement
Not an issue

There are quite a few cases of class variables that are not final, even though
they are set in the constructor and not actually changed thereafter.
Not an issue

Wherever possible, variables should be made final to ensure thread-safety.
If there is a real bug, we would fix it.

There are some variables that are protected, even though there is already an
access method for them.
Not an issue

For example, DataSourceProxy:driver
In this case, the variable should definitely be private, as access needs to be
synchronized.
Dont see an issue here either, however, I would switch 

PooledConnection:counter is volatile, presumably instead of synchronising it.

svn commit: r714027 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: PoolProperties.java PooledConnection.java

2008-11-14 Thread fhanik
Author: fhanik
Date: Fri Nov 14 07:18:19 2008
New Revision: 714027

URL: http://svn.apache.org/viewvc?rev=714027view=rev
Log:
use atomic counters

Modified:

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

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

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=714027r1=714026r2=714027view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 Fri Nov 14 07:18:19 2008
@@ -19,12 +19,13 @@
 
 import java.lang.reflect.Method;
 import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
 /**
  * @author Filip Hanik
  *
  */
 public class PoolProperties {
-protected static volatile int poolCounter = 1;
+protected static AtomicInteger poolCounter = new AtomicInteger(0);
 protected Properties dbProperties = new Properties();
 protected String url = null;
 protected String driverClassName = null;
@@ -50,7 +51,7 @@
 protected int removeAbandonedTimeout = 60;
 protected boolean logAbandoned = false;
 protected int loginTimeout = 1;
-protected String name = Tomcat Connection Pool[+(poolCounter++)+];
+protected String name = Tomcat Connection 
Pool[+(poolCounter.addAndGet(1))+];
 protected String password;
 protected String username;
 protected long validationInterval = 3;

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=714027r1=714026r2=714027view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 Fri Nov 14 07:18:19 2008
@@ -38,7 +38,7 @@
 public static final int VALIDATE_INIT = 4;
 
 protected static Log log = LogFactory.getLog(PooledConnection.class);
-protected static volatile int counter = 1;
+protected static AtomicInteger counter = new AtomicInteger(01);
 
 protected PoolProperties poolProperties;
 protected java.sql.Connection connection;
@@ -53,7 +53,7 @@
 protected WeakReferenceJdbcInterceptor handler = null;
 
 public PooledConnection(PoolProperties prop, ConnectionPool parent) throws 
SQLException {
-instanceCount = counter++;
+instanceCount = counter.addAndGet(1);
 poolProperties = prop;
 this.parent = parent;
 }



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r714028 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java

2008-11-14 Thread fhanik
Author: fhanik
Date: Fri Nov 14 07:19:25 2008
New Revision: 714028

URL: http://svn.apache.org/viewvc?rev=714028view=rev
Log:
forgot to save file before checkin

Modified:

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

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=714028r1=714027r2=714028view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 Fri Nov 14 07:19:25 2008
@@ -370,7 +370,7 @@
 }
 
 public static int getPoolCounter() {
-return poolCounter;
+return poolCounter.get();
 }
 
 public boolean isJmxEnabled() {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: Tomcat webapp stopped working, please help

2008-11-14 Thread Mark Thomas
djbowen1 wrote:
 I am running tomcat server on Redhat linux. Tomcat server 5.
 
 2 weeks ago a webapp i have running on port 8010 just stopped working. I am
 not a tomcat expert by any means and dont know much about it other than
 trying to help out.
 
 The only thing i see that has changed on the server is that up2date ran
 october 29th and updated a bunch of stuff.
 
 I have no idea even where to start, port 8010 is waiting and open but no
 response

You posted to the wrong list. This is a question for the users list.

Mark


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r714036 - in /tomcat/trunk/modules/jdbc-pool: build.xml java/org/apache/tomcat/jdbc/pool/PooledConnection.java sign.sh

2008-11-14 Thread fhanik
Author: fhanik
Date: Fri Nov 14 07:33:39 2008
New Revision: 714036

URL: http://svn.apache.org/viewvc?rev=714036view=rev
Log:
A disconnect should not throw an error

Modified:
tomcat/trunk/modules/jdbc-pool/build.xml

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/trunk/modules/jdbc-pool/sign.sh

Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=714036r1=714035r2=714036view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Fri Nov 14 07:33:39 2008
@@ -25,7 +25,7 @@
   property name=version.minor value=0 /
   property name=version.build value=3 /
   property name=version.patch value=-beta /
-  property name=version   
value=${version.major}.${version.minor}.${version.build}${version.patch} /
+  property name=version   
value=${version.major}.${version.minor}.${version.build} ${version.patch} /
   !-- property values you must customize for successful building!!!--
   property file=${user.home}/build.properties/
   property file=${basedir}/modules/jdbc-pool/build.properties/
@@ -182,7 +182,8 @@
 /tar
 gzip src=${destdir}/apache-tomcat-jdbc-${version}.tar
  destfile=${destdir}/apache-tomcat-jdbc-${version}.tar.gz/
-   delete file=${destdir}/apache-tomcat-jdbc-${version}.tar/
+delete file=${destdir}/apache-tomcat-jdbc-${version}.tar/
+echo message=Options +Indexes file=${destdir}/.htaccess/
   /target

   !-- Download and dependency building --

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=714036r1=714035r2=714036view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 Fri Nov 14 07:33:39 2008
@@ -94,13 +94,19 @@
 this.connect();
 } //reconnect
 
-protected synchronized void disconnect(boolean finalize) throws 
SQLException {
+protected synchronized void disconnect(boolean finalize) {
 if (isDiscarded()) {
 return;
 }
 setDiscarded(true);
 if (connection != null) {
-connection.close();
+try {
+connection.close();
+}catch (Exception ignore) {
+if (log.isDebugEnabled()) {
+log.debug(Unable to close underlying SQL 
connection,ignore);
+}
+}
 }
 connection = null;
 if (finalize) parent.finalize(this);
@@ -122,7 +128,7 @@
 public boolean abandon() {
 try {
 disconnect(true);
-} catch (SQLException x) {
+} catch (Exception x) {
 log.error(, x);
 } //catch
 return false;
@@ -207,10 +213,6 @@
 public void release() {
 try {
 disconnect(true);
-} catch (SQLException x) {
-if (log.isDebugEnabled()) {
-log.debug(Unable to close SQL connection,x);
-}
 } catch (Exception x) {
 if (log.isDebugEnabled()) {
 log.debug(Unable to close SQL connection,x);

Modified: tomcat/trunk/modules/jdbc-pool/sign.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=714036r1=714035r2=714036view=diff
==
--- tomcat/trunk/modules/jdbc-pool/sign.sh (original)
+++ tomcat/trunk/modules/jdbc-pool/sign.sh Fri Nov 14 07:33:39 2008
@@ -1,4 +1,4 @@
-VERSION=v1.0.2-beta
+VERSION=v1.0.3-beta
 for i in $(find output/release/$VERSION -name *.zip -o -name *.tar.gz); do
   echo Signing $i
   echo $1|gpg --passphrase-fd 0 -a -b $i



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r714040 - /tomcat/trunk/modules/jdbc-pool/build.xml

2008-11-14 Thread fhanik
Author: fhanik
Date: Fri Nov 14 07:42:47 2008
New Revision: 714040

URL: http://svn.apache.org/viewvc?rev=714040view=rev
Log:
fix spacing issues

Modified:
tomcat/trunk/modules/jdbc-pool/build.xml

Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=714040r1=714039r2=714040view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Fri Nov 14 07:42:47 2008
@@ -25,7 +25,7 @@
   property name=version.minor value=0 /
   property name=version.build value=3 /
   property name=version.patch value=-beta /
-  property name=version   
value=${version.major}.${version.minor}.${version.build} ${version.patch} /
+  property name=version   
value=${version.major}.${version.minor}.${version.build}${version.patch} /
   !-- property values you must customize for successful building!!!--
   property file=${user.home}/build.properties/
   property file=${basedir}/modules/jdbc-pool/build.properties/



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



NTLMAuthenticator for Apache Tomcat 6.0.18 (Intranet within a Microsoft domain) (GOOD links to source files)

2008-11-14 Thread Christophe Dupriez
Hi again Tomcat Developpers!

(Message re-re-re-sent because attached files did not went through the MailList 
management program and then Outlook resent an old version of my message): SORRY!

The patch file is accessible:
http://www.destin.be/tomcat/NtlmAuthentication.patch

The new authenticator class is accessible:
http://www.destin.be/tomcat/NtlmAuthenticator.java

I wanted to:
* centralize the parameterization of user authentication at the container level;
* have a simple NTLM authentication for intranet users;
* be able to run Tomcat in a Microsoft Active Directory network where the 
server is secured (absolutely no login allowed to regular users)

There is a Microsoft specification (bug?) by which all LDAP binds are 
evaluated on the Domain Server (like if the user was attempting to login on the 
Domain Server).
It would be better to have binds evaluated as if they were originating from the 
LDAP client machine (the Tomcat Server).

To circumvent this, I have been obliged to remove the binding (the password 
checking) but to ensure that it is NTLM (and nothing else) which provides the 
username.
The users are therefore automatically logged with the username used to log on 
their PC.

The attached patch is for current Apache Tomcat sources (6.0.18).

It adds:
An NTLM Authenticator: nothing to configure except in the web.xml of each 
application:
   login-config
   auth-methodNTLM/auth-method
   realm-nameThisIsApassword/realm-name
   /login-config
The realm-name is the password which ensures that authentication is done by 
NTLM and no other method.
A very long password is strongly recommended.
A modified JNDI Realm with new parameters:
preAuthenticatedPassword=ThisIsApassword
This to suppress password checking if preAuthenticatedPassword is provided.
userIdentification=userPrincipalName provides a standardized username, 
whatever the retrieved user name (case of complex userSearch patterns)
userNamePrefix and userNameSuffix
This to suppress a prefix and/or a suffix from username before returning it to 
the application: good to suppress domain identification, etc.
When you user complex userSearch pattern, this can be very useful. Example:
userSearch=(|(sAMAccountName={0})([EMAIL PROTECTED])(userPrincipalName={0}))
userIdentification=userPrincipalName userNamePrefix=domain\ 
userNameSuffix=@domain.com

Hopes this can be useful to the community!

Please do not hesitate to ask me what I should do to make this contribution 
perennial.

Wishing you a very nice weekend,

Christophe Dupriez
Centre Antipoisons - Antigifcentrum
C/o Hôpital Central de la Base Reine Astrid
   Rue Bruyn - 1120 Bruxelles - Belgique
tel 32-(0)2.264.96.36 fax 32-(0)2.264.96.46

Re: NTLMAuthenticator for Apache Tomcat 6.0.18 (Intranet within a Microsoft domain) (GOOD links to source files)

2008-11-14 Thread Henri Gomez
Great.

Thanks for these.

I'd like to see it included in the next TC release

2008/11/14 Christophe Dupriez [EMAIL PROTECTED]:
 Hi again Tomcat Developpers!

 (Message re-re-re-sent because attached files did not went through the 
 MailList management program and then Outlook resent an old version of my 
 message): SORRY!

 The patch file is accessible:
 http://www.destin.be/tomcat/NtlmAuthentication.patch

 The new authenticator class is accessible:
 http://www.destin.be/tomcat/NtlmAuthenticator.java

 I wanted to:
 * centralize the parameterization of user authentication at the container 
 level;
 * have a simple NTLM authentication for intranet users;
 * be able to run Tomcat in a Microsoft Active Directory network where the 
 server is secured (absolutely no login allowed to regular users)

 There is a Microsoft specification (bug?) by which all LDAP binds are 
 evaluated on the Domain Server (like if the user was attempting to login on 
 the Domain Server).
 It would be better to have binds evaluated as if they were originating from 
 the LDAP client machine (the Tomcat Server).

 To circumvent this, I have been obliged to remove the binding (the password 
 checking) but to ensure that it is NTLM (and nothing else) which provides the 
 username.
 The users are therefore automatically logged with the username used to log on 
 their PC.

 The attached patch is for current Apache Tomcat sources (6.0.18).

 It adds:
 An NTLM Authenticator: nothing to configure except in the web.xml of each 
 application:
   login-config
   auth-methodNTLM/auth-method
   realm-nameThisIsApassword/realm-name
   /login-config
 The realm-name is the password which ensures that authentication is done by 
 NTLM and no other method.
 A very long password is strongly recommended.
 A modified JNDI Realm with new parameters:
 preAuthenticatedPassword=ThisIsApassword
 This to suppress password checking if preAuthenticatedPassword is provided.
 userIdentification=userPrincipalName provides a standardized username, 
 whatever the retrieved user name (case of complex userSearch patterns)
 userNamePrefix and userNameSuffix
 This to suppress a prefix and/or a suffix from username before returning it 
 to the application: good to suppress domain identification, etc.
 When you user complex userSearch pattern, this can be very useful. Example:
 userSearch=(|(sAMAccountName={0})([EMAIL PROTECTED])(userPrincipalName={0}))
 userIdentification=userPrincipalName userNamePrefix=domain\ 
 userNameSuffix=@domain.com

 Hopes this can be useful to the community!

 Please do not hesitate to ask me what I should do to make this contribution 
 perennial.

 Wishing you a very nice weekend,

 Christophe Dupriez
 Centre Antipoisons - Antigifcentrum
 C/o Hôpital Central de la Base Reine Astrid
   Rue Bruyn - 1120 Bruxelles - Belgique
 tel 32-(0)2.264.96.36 fax 32-(0)2.264.96.46

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r714058 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

2008-11-14 Thread rjung
Author: rjung
Date: Fri Nov 14 08:22:55 2008
New Revision: 714058

URL: http://svn.apache.org/viewvc?rev=714058view=rev
Log:
Fix typo in changelog.

Modified:
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=714058r1=714057r2=714058view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Fri Nov 14 
08:22:55 2008
@@ -193,7 +193,7 @@
 Build: Fix Cygwin build. (rjung)
   /fix
   update
-Documenation: Add info to docs, that variables sent via JkEnvVar
+Documentation: Add info to docs, that variables sent via JkEnvVar
 are not listed in request.getAttributeNames(). (rjung)
   /update
   add
@@ -205,7 +205,7 @@
 Change log level of some messages from error to info. (mturk)
   /update
   fix
-Documenation: Fix docs for worker attribute secret. (rjung)
+Documentation: Fix docs for worker attribute secret. (rjung)
   /fix
   update
 Detect correct plugin name for various web servers via additional



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 46200] jdbc-pool needs to close opened assets too

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46200


Konstantin Kolinko [EMAIL PROTECTED] changed:

   What|Removed |Added

  Component|Catalina|Modules: jdbc-pool




-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 46209] Findbugs report on Tomcat-Pool

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46209


Sebb [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WONTFIX |




--- Comment #6 from Sebb [EMAIL PROTECTED]  2008-11-14 09:03:45 PST ---
(In reply to comment #5)
 H C IL: There is an apparent infinite recursive loop in 
 org.apache.tomcat.jdbc.pool.DataSourceProxy.setMinIdle(int)
 Fixed before the report was filed.

OK.

 H V MS: org.apache.tomcat.jdbc.pool.ConnectionPool.log isn't final but 
 should be
 Not an issue

But why not fix it to avoid possible later problems?
If the variable is ever changed from a different thread then there will be
potentially two versions active.

All variables should be locked down as far as possible, i.e. private and final.
This considerably reduces the chances of accidental modifications, and makes
the code much easier to test, because there are fewer states for the code to
occupy.

It's very difficult to reduce the visibility of items once code has been
released. However should it prove necessary, visibility can be increased later
- if it really proves necessary.

 H V MS: org.apache.tomcat.jdbc.pool.DataSourceFactory.log isn't final but 
 should be
 Not an issue
 
 H V MS: 
 org.apache.tomcat.jdbc.pool.DataSourceFactory$DataSourceHandler.methods 
 isn't final but should be
 Not an issue
 
 H V MS: org.apache.tomcat.jdbc.pool.DataSourceProxy.log isn't final but 
 should be
 Not an issue
 
 H V MS: org.apache.tomcat.jdbc.pool.Driver.pooltable isn't final but should 
 be
 Not an issue
 
 H V MS: org.apache.tomcat.jdbc.pool.PooledConnection.log isn't final but 
 should be
 Not an issue
 
 M B ES: Comparison of String objects using == or != in 
 org.apache.tomcat.jdbc.pool.interceptor.ConnectionState.invoke(Object, 
 Method, Object[]) 
 Classes, methods, and fields, whether referenced from Java Virtual Machine
 instructions or from other constant pool entries, are named using the constant
 pool.Relies on the method name being stored in the constant pool, it'd be
 interesting to see if that actually wasn't the case.
 The spec says Classes, methods, and fields, whether referenced from Java
 Virtual Machine instructions or from other constant pool entries, are named
 using the constant pool.

Nevertheless, why not do it safely?

 
 M B ES: Comparison of String objects using == or != in 
 org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.process(String[], 
 Method, boolean) 
 Classes, methods, and fields, whether referenced from Java Virtual Machine
 instructions or from other constant pool entries, are named using the constant
 pool.Relies on the method name being stored in the constant pool, it'd be
 interesting to see if that actually wasn't the case.
 The spec says Classes, methods, and fields, whether referenced from Java
 Virtual Machine instructions or from other constant pool entries, are named
 using the constant pool.
 

Ditto.

 M B It: org.apache.tomcat.jdbc.pool.FairBlockingQueue$FairIterator.next() 
 can't throw NoSuchElementException
 Not an issue, although I dont even understand the bug reprot

It's probably because next() implements Iterator.next() which throws this.

However, it can throw ArrayOutOfBounds which should probably be converted to
NoSuchElement.

 M B Nm: The class name org.apache.tomcat.jdbc.pool.DataSource shadows the 
 simple name of implemented interface javax.sql.DataSource
 Not an issue

It's not a coding bug but it is a maintenance bug waiting to happen.
Now is the time to fix this - before the first release.

 M B Nm: The class name org.apache.tomcat.jdbc.pool.Driver shadows the simple 
 name of implemented interface java.sql.Driver
 Not an issue

Ditto.

 M D DLS: Dead store to exec in 
 org.apache.tomcat.jdbc.pool.PooledConnection.validate(int, String)
 Not an issue

Not a bug, but why store the response if you are not using it?

 M D Dm: Call to unsupported method 
 org.apache.tomcat.jdbc.pool.FairBlockingQueue.drainTo(Collection, int) in 
 org.apache.tomcat.jdbc.pool.FairBlockingQueue.drainTo(Collection)
 Not an issue

Agreed.

 M D NP: Load of known null value in 
 org.apache.tomcat.jdbc.pool.ConnectionPool.borrowConnection()
 Not an issue

True, but why pass con to createConnection() when that does not use it?
Would it not be clearer to drop the con parameter?

 M D REC: Exception is caught when Exception is not thrown in 
 org.apache.tomcat.jdbc.pool.ConnectionPool.getConnection()
 One would hope so :) not an issue

Agreed, but surely the original exception should be passed to the SQLException?

 M M UL: org.apache.tomcat.jdbc.pool.FairBlockingQueue.poll(long, TimeUnit) 
 does not release lock on all exception paths
 M M UL: org.apache.tomcat.jdbc.pool.FairBlockingQueue.poll(long, TimeUnit) 
 does not release lock on all exception paths
 I'd have to challenge that

svn commit: r714101 - in /tomcat/connectors/trunk: jk/support/jk_java.m4 jni/jnirelease.sh jni/native/build/tcnative.m4 jni/native/os/win32/libtcnative.rc

2008-11-14 Thread rjung
Author: rjung
Date: Fri Nov 14 10:53:19 2008
New Revision: 714101

URL: http://svn.apache.org/viewvc?rev=714101view=rev
Log:
Fix typos.
No functional change/problem.

Modified:
tomcat/connectors/trunk/jk/support/jk_java.m4
tomcat/connectors/trunk/jni/jnirelease.sh
tomcat/connectors/trunk/jni/native/build/tcnative.m4
tomcat/connectors/trunk/jni/native/os/win32/libtcnative.rc

Modified: tomcat/connectors/trunk/jk/support/jk_java.m4
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/support/jk_java.m4?rev=714101r1=714100r2=714101view=diff
==
--- tomcat/connectors/trunk/jk/support/jk_java.m4 (original)
+++ tomcat/connectors/trunk/jk/support/jk_java.m4 Fri Nov 14 10:53:19 2008
@@ -151,7 +151,7 @@
   fi
 
   AC_ARG_WITH(java-platform,
-   [  --with-java-platform[=2] Force the Java platorm
+   [  --with-java-platform[=2] Force the Java platform
(value is 1 for 1.1.x or 2 for 1.2.x or 
greater)],
[
   case ${withval} in

Modified: tomcat/connectors/trunk/jni/jnirelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/jnirelease.sh?rev=714101r1=714100r2=714101view=diff
==
--- tomcat/connectors/trunk/jni/jnirelease.sh (original)
+++ tomcat/connectors/trunk/jni/jnirelease.sh Fri Nov 14 10:53:19 2008
@@ -52,7 +52,7 @@
 # and JKJNIVER by the version like 1.1.0
 # DON't forget to update native/include/tcn_version.h
 # and native/os/win32/libtcnative.rc
-# #define TCN_VERISON 1.1.14
+# #define TCN_VERSION 1.1.14
 # FILEVERSION 1,1,14,0
 # PRODUCTVERSION 1,1,14,0
 JKJNIEXT=tags/other/TOMCAT_NATIVE_1_1_15

Modified: tomcat/connectors/trunk/jni/native/build/tcnative.m4
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/build/tcnative.m4?rev=714101r1=714100r2=714101view=diff
==
--- tomcat/connectors/trunk/jni/native/build/tcnative.m4 (original)
+++ tomcat/connectors/trunk/jni/native/build/tcnative.m4 Fri Nov 14 10:53:19 
2008
@@ -164,7 +164,7 @@
 fi
 
 AC_ARG_WITH(java-platform,
- [  --with-java-platform[=2] Force the Java platorm
+ [  --with-java-platform[=2] Force the Java platform
  (value is 1 for 1.1.x or 2 for 1.2.x or 
greater)],
  [
 case ${withval} in

Modified: tomcat/connectors/trunk/jni/native/os/win32/libtcnative.rc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/os/win32/libtcnative.rc?rev=714101r1=714100r2=714101view=diff
==
--- tomcat/connectors/trunk/jni/native/os/win32/libtcnative.rc (original)
+++ tomcat/connectors/trunk/jni/native/os/win32/libtcnative.rc Fri Nov 14 
10:53:19 2008
@@ -20,7 +20,7 @@
  See the License for the specific language governing  \
  permissions and limitations under the License.
 
-#define TCN_VERISON 1.1.16
+#define TCN_VERSION 1.1.16
 1000 ICON apache.ico
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -55,12 +55,12 @@
 VALUE Comments,  TCN_LICENSE \0
 VALUE CompanyName, Apache Software Foundation\0
 VALUE FileDescription, Tomcat Native Java Library\0
-VALUE FileVersion, TCN_VERISON \0
+VALUE FileVersion, TCN_VERSION \0
 VALUE InternalName, libtcnative-1\0
 VALUE LegalCopyright, TCN_COPYRIGHT \0
 VALUE OriginalFilename, libtcnative-1.dll\0
 VALUE ProductName, Tomcat Native Java Library\0
-VALUE ProductVersion, TCN_VERISON \0
+VALUE ProductVersion, TCN_VERSION \0
 END
 END
 BLOCK VarFileInfo



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r714108 - in /tomcat/connectors/trunk/jni: build.properties.default build.properties.sample build.xml

2008-11-14 Thread rjung
Author: rjung
Date: Fri Nov 14 11:17:39 2008
New Revision: 714108

URL: http://svn.apache.org/viewvc?rev=714108view=rev
Log:
User build.properties.default for tcnative like
we do for tomcat.
Remove unused version.number.
Add version details to build.properties.default
and remove from build.xml.

Added:
tomcat/connectors/trunk/jni/build.properties.default   (contents, props 
changed)
  - copied, changed from r714098, 
tomcat/connectors/trunk/jni/build.properties.sample
Removed:
tomcat/connectors/trunk/jni/build.properties.sample
Modified:
tomcat/connectors/trunk/jni/build.xml

Copied: tomcat/connectors/trunk/jni/build.properties.default (from r714098, 
tomcat/connectors/trunk/jni/build.properties.sample)
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/build.properties.default?p2=tomcat/connectors/trunk/jni/build.properties.defaultp1=tomcat/connectors/trunk/jni/build.properties.sampler1=714098r2=714108rev=714108view=diff
==
--- tomcat/connectors/trunk/jni/build.properties.sample (original)
+++ tomcat/connectors/trunk/jni/build.properties.default Fri Nov 14 11:17:39 
2008
@@ -1,3 +1,10 @@
+# - Vesion Control Flags -
+version.major=1
+version.minor=1
+version.build=17
+version.patch=0
+version.suffix=-dev
+
 # The directory containing your binary distribution of JUnit,
 # version 3.8 or later
 junit.home = /usr/local/java/junit3.8.1

Propchange: tomcat/connectors/trunk/jni/build.properties.default
--
svn:eol-style = native

Propchange: tomcat/connectors/trunk/jni/build.properties.default
--
svn:keywords = Author Date Id Revision

Propchange: tomcat/connectors/trunk/jni/build.properties.default
--
svn:mergeinfo = 

Modified: tomcat/connectors/trunk/jni/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/build.xml?rev=714108r1=714107r2=714108view=diff
==
--- tomcat/connectors/trunk/jni/build.xml (original)
+++ tomcat/connectors/trunk/jni/build.xml Fri Nov 14 11:17:39 2008
@@ -22,20 +22,35 @@
 --
 property file=${user.home}/.ant.properties /
 property file=${user.home}/build.properties /
-property file=build.properties /
 property file=.ant.properties /
+property file=build.properties /
+property file=build.properties.default/
 
 !-- Initialization properties --
-property name=name value=Tomcat Native/
-property name=title value=Tomcat Native Library/
-property name=version value=1.0.0/
-property name=version.number value=100/
-property name=project value=tomcat-native/
+property name=project   value=tomcat-native /
+property name=name  value=Tomcat Native /
+property name=title value=Tomcat Native Library/
+property name=year  value=2008 /
+property name=version.major value=1 /
+property name=version.minor value=1 /
+property name=version.build value=0 /
+property name=version.patch value=0 /
+property name=version.suffixvalue=-dev /
+
+property name=junit.homevalue=/usr/local/junit3.8/
+property name=junit.jar value=${junit.home}/junit.jar/
+property name=test.runner   value=junit.textui.TestRunner/
+
+property name=version   
value=${version.major}.${version.minor}.${version.build}${version.suffix} /
+property name=version.number
value=${version.major}.${version.minor}.${version.build}.${version.patch} /
+property name=version.major.minor   
value=${version.major}.${version.minor} /
+
+property name=final.namevalue=${project}-${version} /
+
 property name=build.dir value=./dist/
 property name=build.src value=${build.dir}/src/
 property name=build.dest value=${build.dir}/classes/
 property name=src.dir value=./
-property name=final.name value=${project}-${version}/
 property name=dist.root value=./dist/
 property name=ant.home value=./
 
@@ -46,15 +61,13 @@
 property name=docs.src value=./xdocs/
 property name=docs.dest value=${dist.root}/doc/
 property name=docs.dest.print value=${dist.root}/doc/printable/
-property name=test.runner value=junit.textui.TestRunner/
 property name=test.dir value=${build.dest}/test/
 property name=examples.dir value=${build.dest}/examples/
-property name=junit.home value=/usr/local/junit3.8/
-property name=junit.jar value=${junit.home}/junit.jar/
+
 property name=tc.library.path value=${basedir}/native/.libs/
 
-  !-- The base directory for component sources --
-  property name=source.home  

DO NOT REPLY [Bug 46200] jdbc-pool needs to close opened assets too

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46200


Filip Hanik [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |ASSIGNED




--- Comment #1 from Filip Hanik [EMAIL PROTECTED]  2008-11-14 11:33:06 PST ---
Actually a pool doesn't have to do this, since it would be bad coding practise
to not do it yourself.
However, I agree with the functionality of having it, and this is the exact
reason why the pool has the interceptor framework, since one can plug in
functionality like this

I will add it to the pool


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 46209] Findbugs report on Tomcat-Pool

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46209


Filip Hanik [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WONTFIX




--- Comment #7 from Filip Hanik [EMAIL PROTECTED]  2008-11-14 12:49:44 PST ---
There is nothing concrete here, just theory and style preferences. not actual
bugs. If you wish to engage in coding style discussions, bugzilla is not the
right forum, it would be more proper to take that discussion to the dev list


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 46209] Findbugs report on Tomcat-Pool

2008-11-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46209


Sebb [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WONTFIX |




--- Comment #8 from Sebb [EMAIL PROTECTED]  2008-11-14 13:54:20 PST ---
(In reply to comment #7)
 There is nothing concrete here, just theory and style preferences. not actual
 bugs. If you wish to engage in coding style discussions, bugzilla is not the
 right forum, it would be more proper to take that discussion to the dev list
 

There *are* still some concrete items which remain to be fixed.

* M X OBL: Method org.apache.tomcat.jdbc.pool.PooledConnection.validate(int,
String) may fail to clean up stream or resource of type java.sql.Statement

==

* M B It: org.apache.tomcat.jdbc.pool.FairBlockingQueue$FairIterator.next()
can't throw NoSuchElementException

However it can throw ArrayOutOfBounds, which should be detected - and probably
converted to NoSuchElement.

==

* M D REC: Exception is caught when Exception is not thrown in
org.apache.tomcat.jdbc.pool.ConnectionPool.getConnection()

Not strictly a bug, but it makes debugging almost impossible if all Exceptions
are converted into SQLException.

==

The issues of thread-safety are not a matter of theory, they are a real
consequence of the Java Memory Model. However explaining that is probably best
left to the list.

==

I will take the other matters to the list.


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: svn commit: r714108 - in /tomcat/connectors/trunk/jni: build.properties.default build.properties.sample build.xml

2008-11-14 Thread Mladen Turk

[EMAIL PROTECTED] wrote:


URL: http://svn.apache.org/viewvc?rev=714108view=rev
Log:
User build.properties.default for tcnative like
we do for tomcat.
Remove unused version.number.
Add version details to build.properties.default
and remove from build.xml.

Added:
tomcat/connectors/trunk/jni/build.properties.default   (contents, props 
changed)
  - copied, changed from r714098, 
tomcat/connectors/trunk/jni/build.properties.sample
Removed:
tomcat/connectors/trunk/jni/build.properties.sample
Modified:
tomcat/connectors/trunk/jni/build.xml

+# - Vesion Control Flags -
+version.major=1
+version.minor=1
+version.build=17
+version.patch=0
+version.suffix=-dev
+


We have now two branches 1.1 and trunk
So in trunk the version is 1.2.x

The second branch is:
https://svn.apache.org/repos/asf/tomcat/connectors/branches/native/1.1.x

So I suppose those changes has to go in there as well.
It would be probably easier if this was done before branching, but
now it is like it is.

Regards
--
^(TM)

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]