Re: svn commit: r714246 - /tomcat/trunk/KEYS

2008-11-17 Thread Mark Thomas
William A. Rowe, Jr. wrote:
> [EMAIL PROTECTED] wrote:
>> Author: markt
>> Date: Sat Nov 15 04:59:01 2008
>> New Revision: 714246
>>
>> URL: http://svn.apache.org/viewvc?rev=714246&view=rev
>> Log:
>> Update KEYS with changes from 6.0.x (Remy updated his key)
> 
>> -pub   1024D/41E49465 2006-11-08
>> -  Key fingerprint = 80FF 76D8 8A96 9FE4 6108  558A 80B9 53A0 41E4 9465
>> -uid  Remy Maucherat <[EMAIL PROTECTED]>
>> -sig 341E49465 2006-11-08  Remy Maucherat <[EMAIL PROTECTED]>
>> -sub   4096g/D07A28EB 2006-11-08
>> -sig  41E49465 2006-11-08  Remy Maucherat <[EMAIL PROTECTED]>
>> +pub   1024D/288584E7 2008-07-02
>> +uid  Rémy Maucherat <[EMAIL PROTECTED]>
>> +sub   4096g/4B6FAEFB 2008-07-02
> 
> Hmmm... if anything is signed with 41E49465 or its subkeys, that key should
> not be pulled from KEYS.  Adding a new key is sufficient.

For trunk, we haven't done any releases so this isn't an issue.

For 6.0.x, the old key was used to sign releases so it is actually this
commit that needs to be fixed:
http://svn.apache.org/viewvc?diff_format=h&view=rev&revision=674323

I'll get that done shortly.

> If he has revoked key 41E49465, files signed in http://archive.apache.org/
> are now suspect and must be pulled down, and re-signed.  Quite a PITA.

41E49465 has not been revoked.

> Hopefully 41E49465 is not comprimized and could still sign 2288584E7 as
> its descendant (full-trust), which solves the problem of the limited #
> of signatures on a brand new key.

It would, if Remy's old key had more signatures that his new one.
pgp.mit.edu is reporting just the one for both.

Mark


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



svn commit: r718215 - /tomcat/tc6.0.x/trunk/KEYS

2008-11-17 Thread markt
Author: markt
Date: Mon Nov 17 02:34:18 2008
New Revision: 718215

URL: http://svn.apache.org/viewvc?rev=718215&view=rev
Log:
Restore Remy's old key that was used to sign 6.0.x releases

Modified:
tomcat/tc6.0.x/trunk/KEYS

Modified: tomcat/tc6.0.x/trunk/KEYS
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/KEYS?rev=718215&r1=718214&r2=718215&view=diff
==
--- tomcat/tc6.0.x/trunk/KEYS (original)
+++ tomcat/tc6.0.x/trunk/KEYS Mon Nov 17 02:34:18 2008
@@ -253,8 +253,56 @@
 =r1gT
 -END PGP PUBLIC KEY BLOCK-
 
+pub   1024D/41E49465 2006-11-08
+  Key fingerprint = 80FF 76D8 8A96 9FE4 6108  558A 80B9 53A0 41E4 9465
+uid  Remy Maucherat <[EMAIL PROTECTED]>
+sig 341E49465 2006-11-08  Remy Maucherat <[EMAIL PROTECTED]>
+sub   4096g/D07A28EB 2006-11-08
+sig  41E49465 2006-11-08  Remy Maucherat <[EMAIL PROTECTED]>
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1.4.2.2 (FreeBSD)
+
+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
+=lDGt
+-END PGP PUBLIC KEY BLOCK-
+
 pub   1024D/288584E7 2008-07-02
-uid  Rémy Maucherat <[EMAIL PROTECTED]>
+uid  Rémy Maucherat <[EMAIL PROTECTED]>
 sub   4096g/4B6FAEFB 2008-07-02
 
 -BEGIN PGP PUBLIC KEY BLOCK-



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



DO NOT REPLY [Bug 46221] Leak WebappClassLoader with commons-logging and log4j

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





--- Comment #1 from Arnaud de Bossoreille <[EMAIL PROTECTED]>  2008-11-17 
04:20:27 PST ---
Created an attachment (id=22880)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=22880)
Simple test case

Use maven 2 to build it, a compiled war cannot be attached because of its size.


-- 
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 46221] Leak WebappClassLoader with commons-logging and log4j

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





--- Comment #2 from Arnaud de Bossoreille <[EMAIL PROTECTED]>  2008-11-17 
04:21:32 PST ---
Created an attachment (id=22881)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=22881)
Patch which solves the problem


-- 
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 46221] New: Leak WebappClassLoader with commons-logging and log4j

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

   Summary: Leak WebappClassLoader with commons-logging and log4j
   Product: Tomcat 5
   Version: 5.5.27
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Unknown
AssignedTo: dev@tomcat.apache.org
ReportedBy: [EMAIL PROTECTED]


Tomcat is leaking a few references to the WebappClassLoader instance when the
application is stopped and contains commons-logging and log4j packages.

The attached zip file is a very simple test case. I use Yourkit Java Profiler
to find the remaining references.

The leak is due to loggers not released by the various containers that are
alive until all the webapp is completely unloaded which does happen in my case
(start,stop,start,stop...).

The attached patch applies against tomcat 5.5.27 and solves the problem. I am
not sure about the its righteousness, especially for the Valve stuff, but I
guess it is a good start.


-- 
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 46222] C:\java\jre1.6.0_bin\javaw.exe

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


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




-- 
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 46222] New: C:\java\jre1.6.0_bin\javaw.exe

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

   Summary: C:\java\jre1.6.0_bin\javaw.exe
   Product: Tomcat 5
   Version: 5.5.27
  Platform: Other
OS/Version: Windows Vista
Status: NEW
  Severity: critical
  Priority: P5
 Component: Webapps:Manager
AssignedTo: dev@tomcat.apache.org
ReportedBy: [EMAIL PROTECTED]
CC: [EMAIL PROTECTED]


I installed bellow the software.
1)JDK1.6
2)Eclipse3.2
3)Check out the dev.tomcat
And also other software like as testing,ant,svn

First time my tomcat started as regular BUT when i stop and start or rested ,i
received bellow the errors on consol.

 C:\java\jre1.6.0_bin\javaw.exe


-- 
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 46222] C:\java\jre1.6.0_bin\javaw.exe

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





--- Comment #1 from Suryaprakash <[EMAIL PROTECTED]>  2008-11-17 06:49:45 PST 
---
I got following Error in Tomcat Log file

0:0:0:0:0:0:0:1 - - [10/Nov/2008:10:26:16 -0800] "GET /favicon.ico HTTP/1.1"
404 -


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



Tomcat pool and Findbugs

2008-11-17 Thread sebb
This is a follow-on from Bugzilla 46209 -
https://issues.apache.org/bugzilla/show_bug.cgi?id=46209.

Findbugs reported several instances of protected static fields that
were not final.

For example,

ConnectionPool:

protected static Log log = LogFactory.getLog(ConnectionPool.class);

Firstly, does it ever make sense for a log instance to be updated once created?
If not, it should be made final to avoid accidents.

Secondly, if there is a need to update the log variable, then all
access to the log variable needs to be synchronized - which is not
ideal when using logging.

If a thread creates a new log instance and updates the log variable,
there is no guarantee that another thread will ever see the updated
value, or if it does,  may see a partially created object - unless
synchronisation is used.

To avoid this happening, the field should be made final.

Note that the final qualifier is slightly less important if the field
is private, because the defining class has total control over it.
However, changes to the log can still cause thread-safety issues.

The same applies to all the other such Findbugs reports.

Unless non-private static fields really need to be updated, they
should be made final to avoid any possible thread-safety issues.

And if static fields do need to be updated, then they should be made
private and only accessed via synchronised set/get methods, otherwise
sub-classes can bypass the synchronisation. [Or of course volatile may
be used in some cases, especially for booleans]

S///

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



DO NOT REPLY [Bug 46223] New: FairBlockingQueue throws ArrayIndexOutOfBoundsException

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

   Summary: FairBlockingQueue throws ArrayIndexOutOfBoundsException
   Product: Tomcat 6
   Version: unspecified
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Modules: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: [EMAIL PROTECTED]


If the FairBlockingQueue iterator next() method is called after hasNext()
returns false, then it throws an ArrayIndexOutOfBoundsException.

The normal behaviour for an Iterator is to throw NoSuchElementException.


-- 
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 46224] New: StatementFinalizerTest requires Java 1.6 to compile

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

   Summary: StatementFinalizerTest requires Java 1.6 to compile
   Product: Tomcat 6
   Version: unspecified
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Modules: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: [EMAIL PROTECTED]


StatementFinalizerTest requires Java 1.6 to compile because it uses
Statement.isClosed() which is not available in earlier releases.

If jdbc-pool is targetted at 1.5+ then it needs to be testable on Java 1.5


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

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



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

2008-11-17 Thread markt
Author: markt
Date: Mon Nov 17 12:18:55 2008
New Revision: 718360

URL: http://svn.apache.org/viewvc?rev=718360&view=rev
Log:
Remove references to admin and balancer webapps and an unused task

Modified:
tomcat/trunk/dist.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=718360&r1=718359&r2=718360&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Mon Nov 17 12:18:55 2008
@@ -90,11 +90,9 @@
   
 
 
-
 
 
 
-
 
 
 
@@ -128,15 +126,6 @@
  addWebXmlMappings="true"
  outputDir="${jsp-examples.base}/WEB-INF/src" />
 
-
-
 
 
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-  
-
-  
-
-  
-
-
-
-
-  
-
-
-
-
-
-  
-
-
-
-
-
-   
-  
-  
-   
-
-
-
-   
-  
-  
-   
-
-
-
-   
-  
-  
-   
-
-
-
-   
-  
-  
-   
-
-
-
-   
-  
-  
-   
-
-
-
-
-
-
-
   
 
   
@@ -352,7 +249,6 @@
 
 
   
-
 
 
   
@@ -531,8 +427,6 @@
 
 
 
-
-
   
 
 
@@ -558,26 +452,6 @@
   
message="${md5sum.binary-prefix}${final.name}-deployer.zip${line.separator}" 
append="true" />
   
 
-  
-  
-
-  
-
-
-
-  
-  
-  
-  
-  
-
-
-
-
-  
-
   
   
 
@@ -600,7 +474,6 @@
   
   
 
-
   
   
 
@@ -629,7 +502,6 @@
 
 
 
-
   
 
 
@@ -664,33 +536,6 @@
   
message="${md5sum.binary-prefix}${final.name}-deployer.tar.gz${line.separator}" 
append="true" />
   
 
-  
-  
-
-
-
-  
-
-
-
-
-  
-  
-
-
-  
-  
-
-  
-
-
-
-
-  
-
   
   
 



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



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

2008-11-17 Thread markt
Author: markt
Date: Mon Nov 17 12:22:30 2008
New Revision: 718362

URL: http://svn.apache.org/viewvc?rev=718362&view=rev
Log:
Propose dist.xml clean-up

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=718362&r1=718361&r2=718362&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 17 12:22:30 2008
@@ -239,3 +239,8 @@
   http://svn.apache.org/viewvc?view=rev&revision=630314
   +1: markt
   -1: 
+
+* Clean up dist.xml
+  http://svn.apache.org/viewvc?rev=718360&view=rev
+  +1: markt
+  -1: 



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



svn commit: r718428 - in /tomcat/trunk/java/org/apache: coyote/http11/Http11NioProtocol.java tomcat/util/net/SocketProperties.java

2008-11-17 Thread fhanik
Author: fhanik
Date: Mon Nov 17 15:00:23 2008
New Revision: 718428

URL: http://svn.apache.org/viewvc?rev=718428&view=rev
Log:
socket properties NPE fixes

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=718428&r1=718427&r2=718428&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Mon Nov 
17 15:00:23 2008
@@ -761,8 +761,8 @@
 
 public Http11NioProcessor createProcessor() {
 Http11NioProcessor processor = new Http11NioProcessor(
-  proto.ep.getSocketProperties().getRxBufSize(),
-  proto.ep.getSocketProperties().getTxBufSize(), 
+  0,
+  0, 
   proto.maxHttpHeaderSize,
   proto.ep);
 processor.setAdapter(proto.adapter);

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java?rev=718428&r1=718427&r2=718428&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java Mon Nov 
17 15:00:23 2008
@@ -134,9 +134,9 @@
 protected Integer soLingerTime = null;
 
 /**
- * SO_TIMEOUT option. JVM default used if not set.
+ * SO_TIMEOUT option. default is 2.
  */
-protected Integer soTimeout = null;
+protected Integer soTimeout = new Integer(2);
 
 /**
  * Traffic class option, value between 0 and 255



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



svn commit: r718436 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

2008-11-17 Thread markt
Author: markt
Date: Mon Nov 17 15:30:32 2008
New Revision: 718436

URL: http://svn.apache.org/viewvc?rev=718436&view=rev
Log:
Need to make sure configBase exists. WAR deployment has this check. DIR 
deployment needs it too.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=718436&r1=718435&r2=718436&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Mon Nov 17 
15:30:32 2008
@@ -950,6 +950,7 @@
 digester.reset();
 }
 }
+configBase.mkdirs();
 File xmlCopy = new File(configBase, file + ".xml");
 InputStream is = null;
 OutputStream os = null;



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



Re: [VOTE] Releasing Apache Tomcat Native 1.1.16

2008-11-17 Thread Filip Hanik - Dev Lists

I know its late


[X] Stable - no major issues, no regressions

just got around to it, and 1.1.15 causes problems on Linux x86_64
Filip
Mladen Turk wrote:

Hello to the Tomcat team,

Native 1.1.16 has been available for testing for almost a week,
so I would like to proceed with the release vote.

If you want to take a look, the final source distribution can be
downloaded from:
http://tomcat.apache.org/dev/dist/tomcat-connectors/native/source/

Some binaries (windows only) are available at:
http://tomcat.apache.org/dev/dist/tomcat-connectors/native/binaries/

So here's the vote.
It will be closed on Wednesday November 5th, 2:00 p.m. GMT.

Apache Tomcat Native 1.1.16 is:

[ ] Stable - no major issues, no regressions
[ ] Beta   - at least one significant issue -- tell us what it is
[ ] Alpha  - multiple significant issues -- tell us what they are


Thank you,



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



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

2008-11-17 Thread markt
Author: markt
Date: Mon Nov 17 15:32:21 2008
New Revision: 718438

URL: http://svn.apache.org/viewvc?rev=718438&view=rev
Log:
Propose fix

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=718438&r1=718437&r2=718438&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 17 15:32:21 2008
@@ -244,3 +244,9 @@
   http://svn.apache.org/viewvc?rev=718360&view=rev
   +1: markt
   -1: 
+
+* Make sure DIR deployment with context.xml works when configBase does no 
exist.
+  This is required as a result of my previous changes to HostConfig
+  http://svn.apache.org/viewvc?rev=718436&view=rev
+  +1: markt
+  -1: 



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



svn commit: r718452 - in /tomcat/trunk/java/org/apache: catalina/core/ tomcat/util/modeler/ tomcat/util/modeler/modules/

2008-11-17 Thread markt
Author: markt
Date: Mon Nov 17 16:47:36 2008
New Revision: 718452

URL: http://svn.apache.org/viewvc?rev=718452&view=rev
Log:
Generics changes for o.a.t.util.modeler
These changes identified a bunch of issues, the most serious of which was the 
loadDescriptors() method that sometimes returned List and sometimes 
List. Some callers expected this, some didn't.
There are comments in the code identifying this as an issue. The fix I applied 
aligns with some commented out code that may have been part of an intended fix. 
There are still some deprecated methods that need to be cleaned up.
With these changes Tomcat starts without error and JConsole shows all the 
mbeans I expect to see.
There is plenty of further clean-up required here but I'll do that separately 
after the generics.

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/RegistryMBean.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=718452&r1=718451&r2=718452&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Mon Nov 17 
16:47:36 2008
@@ -115,7 +115,7 @@
 
 /** Mbeans loaded by the engine.  
  */ 
-private List mbeans;
+private List mbeans;
 
 
 /**
@@ -382,7 +382,7 @@
 try {
 for( int i=0; ihttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java?rev=718452&r1=718451&r2=718452&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java 
Mon Nov 17 16:47:36 2008
@@ -65,7 +65,7 @@
  * The set of attribute names that are accepted by this filter.  If this
  * list is empty, all attribute names are accepted.
  */
-private HashSet names = new HashSet();
+private HashSet names = new HashSet();
 
 
 // - Public Methods
@@ -106,7 +106,7 @@
 public String[] getNames() {
 
 synchronized (names) {
-return ((String[]) names.toArray(new String[names.size()]));
+return names.toArray(new String[names.size()]);
 }
 
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=718452&r1=718451&r2=718452&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Mon 
Nov 17 16:47:36 2008
@@ -143,8 +143,8 @@
 
 // --- DynamicMBean Methods
 // TODO: move to ManagedBean
-static final Object[] NO_ARGS_PARAM=new Object[0];
-static final Class[] NO_ARGS_PARAM_SIG=new Class[0];
+static final Object[] NO_ARGS_PARAM = new Object[0];
+static final Class[] NO_ARGS_PARAM_SIG = new Class[0];
 
 protected String resourceType = null;
 
@@ -180,7 +180,7 @@
 Method m=managedBean.getGetter(name, this, resource);
 Object result = null;
 try {
-Class declaring=m.getDeclaringClass();
+Class declaring = m.getDeclaringClass();
 // workaround for catalina weird mbeans - the declaring class is 
BaseModelMBean.
 // but this is the catalina class.

svn commit: r718474 - in /tomcat/trunk/java/org/apache/tomcat/util/net: NioEndpoint.java SecureNioChannel.java

2008-11-17 Thread fhanik
Author: fhanik
Date: Mon Nov 17 19:18:30 2008
New Revision: 718474

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

Clean up debug a bit while troubleshooting

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.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=718474&r1=718473&r2=718474&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Nov 17 
19:18:30 2008
@@ -1690,7 +1690,7 @@
 cancelledKey(key, SocketStatus.ERROR,false);
 }
 }//for
-if ( log.isDebugEnabled() ) log.debug("timeout completed: keys 
processed="+keycount+"; now="+now+"; nextExpiration="+prevExp+"; "+
+if ( log.isTraceEnabled() ) log.trace("timeout completed: keys 
processed="+keycount+"; now="+now+"; nextExpiration="+prevExp+"; "+
   "keyCount="+keyCount+"; 
hasEvents="+hasEvents +"; eval="+( (now < prevExp) && (keyCount>0 || hasEvents) 
&& (!close) ));
 
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=718474&r1=718473&r2=718474&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Nov 
17 19:18:30 2008
@@ -471,5 +471,25 @@
 public SocketChannel getIOChannel() {
 return sc;
 }
+
+public String toString() {
+StringBuffer buf = new StringBuffer("[");
+buf.append(super.toString());
+buf.append("] ");
+buf.append("Netout buffer: pos="+this.netOutBuffer.position());
+buf.append(" limit="+this.netOutBuffer.limit());
+buf.append(" Remaining:"+this.netOutBuffer.remaining());
+buf.append("; Netin buffer: pos="+this.netInBuffer.position());
+buf.append(" limit="+this.netInBuffer.limit());
+buf.append(" Remaining:"+this.netInBuffer.remaining());
+buf.append("; Appin buffer: 
pos="+this.bufHandler.getReadBuffer().position());
+buf.append(" limit="+this.bufHandler.getReadBuffer().limit());
+buf.append(" Remaining:"+this.bufHandler.getReadBuffer().remaining());
+buf.append("; Appout buffer: 
pos="+this.bufHandler.getWriteBuffer().position());
+buf.append(" limit="+this.bufHandler.getWriteBuffer().limit());
+buf.append(" Remaining:"+this.bufHandler.getWriteBuffer().remaining());
+return buf.toString();
+}
+
 
 }
\ No newline at end of file



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



Re: [RESULT] [VOTE] Releasing Apache Tomcat Native 1.1.16

2008-11-17 Thread Mladen Turk

Mladen Turk wrote:

Mladen Turk wrote:
 > Hello to the Tomcat team,
 >
 > Native 1.1.16 has been available for testing for almost a week,
 > so I would like to proceed with the release vote.
 >

So far only one binding vote has been recorded
(Thanks Henri), and mine by presumption.

So, Native 1.1.16 won't be released due to lack of
developers interest :(



OK, So it seems we've collected enough votes.
Should I just propagate the files to the dist
and make an announce or do we need another version
tag/release.
I mean nothing changed, so like Peter said,
it was the wrong time (cause of conferencing)
to call for an vote.

I'd just like to go with 1.1.16, and I suppose
nothing stops us from that.


Regards
--
^(TM)

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



Re: [RESULT] [VOTE] Releasing Apache Tomcat Native 1.1.16

2008-11-17 Thread William A. Rowe, Jr.
Mladen Turk wrote:
> Mladen Turk wrote:
>> Mladen Turk wrote:
>>  > Hello to the Tomcat team,
>>  >
>>  > Native 1.1.16 has been available for testing for almost a week,
>>  > so I would like to proceed with the release vote.
>>  >
>>
>> So far only one binding vote has been recorded
>> (Thanks Henri), and mine by presumption.
>>
>> So, Native 1.1.16 won't be released due to lack of
>> developers interest :(
>>
> 
> OK, So it seems we've collected enough votes.
> Should I just propagate the files to the dist
> and make an announce or do we need another version
> tag/release.
> I mean nothing changed, so like Peter said,
> it was the wrong time (cause of conferencing)
> to call for an vote.
> 
> I'd just like to go with 1.1.16, and I suppose
> nothing stops us from that.

You are the chair... and further you had called the vote.  Feel free
to reverse yourself :)

Bill

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



Re: [RESULT] [VOTE] Releasing Apache Tomcat Native 1.1.16

2008-11-17 Thread Mladen Turk

William A. Rowe, Jr. wrote:

Mladen Turk wrote:

You are the chair... and further you had called the vote.  Feel free
to reverse yourself :)



Wow, and I thought the chair is the slave that
collects and writes board reports ;)

Cheers
--
^(TM)

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