RE: [g...@vmgump]: Project tomcat-trunk (in module tomcat-trunk) failed

[Mark Thomas]

> -Original Message-
> From: news [mailto:n...@ger.gmane.org] On Behalf Of Bill Barker
> Sent: 14 January 2009 03:18
> To: dev@tomcat.apache.org
> Subject: Re: [g...@vmgump]: Project tomcat-trunk (in module tomcat-
> trunk) failed
> 
> I've downgraded the Gump build for tomcat-trunk to 1.5 for now (just to
> get
> rid of the nags).  It will start nagging again once somebody commits a
> change that breaks compiling with 1.5.

I am afraid I already have. There are a couple of generics things a 1.5
build won't like. I can revert those temporarily. I hope to get DBCP patched
this week. If that works, it should be possible to start the process of
moving gump to a 1.6 JVM.

Mark




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

Re: [g...@vmgump]: Project tomcat-trunk (in module tomcat-trunk) failed

[Stefan Bodewig]

On 2009-01-14, Mark Thomas  wrote:

> I hope to get DBCP patched this week.

+1

I'm glad you are pushing for it.

> If that works, it should be possible to start the process of moving
> gump to a 1.6 JVM.

Yes, commons-dbcp really is the major problem and I'll be glad to move
vmgump to jdk 1.6 as soon as I see it building on gump.zones.ao .

Stefan

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

RE: [g...@vmgump]: Project tomcat-trunk (in module tomcat-trunk) failed

[Mark Thomas]

> From: Stefan Bodewig [mailto:bode...@apache.org]
> 
> On 2009-01-14, Mark Thomas  wrote:
> 
> > I hope to get DBCP patched this week.
> 
> +1
> 
> I'm glad you are pushing for it.
> 
> > If that works, it should be possible to start the process of moving
> > gump to a 1.6 JVM.
> 
> Yes, commons-dbcp really is the major problem and I'll be glad to move
> vmgump to jdk 1.6 as soon as I see it building on gump.zones.ao .

The patch is committing as I type. I'll be watching gump.zones.ao with bated
breath.

Mark



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

Tomcat JDBC Pool - first release tag

[Filip Hanik - Dev Lists]

I am planning on tagging the Tomcat JDBC pool for a first release.
I was wondering if there is any feedback, objections, support before I 
do so?


Tagging is planned tomorrow, and a vote next week.

Filip

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

Re: Tomcat JDBC Pool - first release tag

[jean-frederic clere]

Filip Hanik - Dev Lists wrote:

I am planning on tagging the Tomcat JDBC pool for a first release.


First alpha? B-)

Cheers

Jean-Frederic

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

svn commit: r734454 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ webapps/docs/

[fhanik]

Author: fhanik
Date: Wed Jan 14 09:39:07 2009
New Revision: 734454

URL: http://svn.apache.org/viewvc?rev=734454&view=rev
Log:
NIO Fixes

Added:

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.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=734454&r1=734453&r2=734454&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 09:39:07 2009
@@ -133,26 +133,6 @@
  Just did that for trunk (r711934; but it contains also other changes).
  Caution: at the moment there's no @VERSION@ substitution for 
service.bat.
 
-* I have summarized all the NIO fixes into one patch for those who wish to 
test it
-* It includes patch [1]-[6] below and can be found at:
-* http://people.apache.org/~fhanik/tomcat/uber-patch.txt
-
-* [1] Fix send file bug - correctly notify the poller without having to wait 
for it to wake up
-  http://svn.apache.org/viewvc?rev=719129&view=rev
-  +1: fhanik, pero, markt, jim
-  -1: 
-
-* [2] Prevent async close NPE on already closed sockets
-  http://people.apache.org/~fhanik/tomcat/comet-close-2.patch
-  +1: fhanik, markt (need to fix indenting), funkman
-  -1: 
-
-* [3] Add ability to fix the keyAlias in NIO/SSL
-  http://svn.apache.org/viewvc?rev=720587&view=rev
-  http://svn.apache.org/viewvc?rev=720553&view=rev 
-  +1: fhanik, markt, funkman
-  -1:
-
 * [4] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45154 (add 
sendfile support to NIO/SSL) - performance improvement
   http://svn.apache.org/viewvc?rev=720724&view=rev
   http://svn.apache.org/viewvc?rev=720728&view=rev 
@@ -165,12 +145,6 @@
   +1: fhanik, funkman
   -1: 
 
-* [6] Fix file descriptor leak during send file behavior in NIO connector
-  http://svn.apache.org/viewvc?rev=729191&view=rev 
-  +1: fhanik, markt, jim, funkman
-  -1: 
-  
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42693
   Fix compilation of recursive tags
   http://svn.apache.org/viewvc?rev=720046&view=rev

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=734454&r1=734453&r2=734454&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
Wed Jan 14 09:39:07 2009
@@ -940,7 +940,7 @@
 sendfileData.keepAlive = keepAlive;
 SelectionKey key = 
socket.getIOChannel().keyFor(socket.getPoller().getSelector());
 //do the first write on this thread, might as well
-openSocket = socket.getPoller().processSendfile(key,ka,true);
+openSocket = 
socket.getPoller().processSendfile(key,ka,true,true);
 break;
 }
 
@@ -1227,14 +1227,16 @@
 } else if (actionCode == ActionCode.ACTION_COMET_END) {
 comet = false;
 }  else if (actionCode == ActionCode.ACTION_COMET_CLOSE) {
-NioEndpoint.KeyAttachment attach = 
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
-attach.setCometOps(NioEndpoint.OP_CALLBACK);
+if (socket==null || socket.getAttachment(false)==null) return;
+   NioEndpoint.KeyAttachment attach = 
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
+attach.setCometOps(NioEndpoint.OP_CALLBACK | attach.getCometOps());
 //notify poller if not on a tomcat thread
 RequestInfo rp = request.getRequestProcessor();
 if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) 
//async handling
 socket.getPoller().cometInterest(socket);
 } else if (actionCode == ActionCode.ACTION_COMET_SETTIMEOUT) {
 if (param==null) return;
+if (socket==null || socket.getAttachment(false)==null) return;
 NioEndpoint.KeyAttachment attach = 
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
 long timeout = ((Long)param).longValue();
 //if we are not piggy backing on a worker thread, set the timeout

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=734454&r1=734453&r2=734454&view=diff
==

DO NOT REPLY [Bug 44517] web-app_2_4.xsd not up-to-date in TC6 servlet-api.jar

[bugzilla]

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


Curt Arnold  changed:

   What|Removed |Added

 CC||thorbjo...@gmail.com




--- Comment #4 from Curt Arnold   2009-01-14 11:24:08 PST 
---
*** Bug 45375 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

svn commit: r734489 - /tomcat/trunk/res/servlet-api.jar.manifest

[markt]

Author: markt
Date: Wed Jan 14 11:30:19 2009
New Revision: 734489

URL: http://svn.apache.org/viewvc?rev=734489&view=rev
Log:
Version updates

Modified:
tomcat/trunk/res/servlet-api.jar.manifest

Modified: tomcat/trunk/res/servlet-api.jar.manifest
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/servlet-api.jar.manifest?rev=734489&r1=734488&r2=734489&view=diff
==
--- tomcat/trunk/res/servlet-api.jar.manifest (original)
+++ tomcat/trunk/res/servlet-api.jar.manifest Wed Jan 14 11:30:19 2009
@@ -2,10 +2,10 @@
 
 Name: javax/servlet/
 Specification-Title: Java API for Servlets
-Specification-Version: 2.5
+Specification-Version: 3.0
 Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: javax.servlet
-Implementation-Version: 2...@implementation.revision@
+Implementation-Version: 3...@implementation.revision@
 Implementation-Vendor: Apache Software Foundation
 X-Compile-Source-JDK: @source.jdk@
 X-Compile-Target-JDK: @target.jdk@



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

DO NOT REPLY [Bug 46532] New: SocketException: Connection reset fills up log

[bugzilla]

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

   Summary: SocketException: Connection reset fills up log
   Product: Tomcat 4
   Version: 4.1.31
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Unknown
AssignedTo: dev@tomcat.apache.org
ReportedBy: brid...@ca.com


customer has a load balancer that has a 5 second hearbeat to tomcat.  Each
heartbeat also causes the following error in tomcat log

Oct 13, 2008 10:59:48 AM (http-443-Processor27) - Remote Host /10.153.83.66
SocketException: Connection reset


These messages are filling up the logs.  We should have the ability to turn
this off.


-- 
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: r734491 - in /tomcat/trunk: BUILDING.txt NOTICE RELEASE-NOTES RUNNING.txt build.properties.default build.xml dist.xml extras.xml

[markt]

Author: markt
Date: Wed Jan 14 11:46:32 2009
New Revision: 734491

URL: http://svn.apache.org/viewvc?rev=734491&view=rev
Log:
Use a snapshot of DBCP source that includes the JDK 1.6 fixes.
Remove the DBCP 1.5 hack
Update Tomcat and Servlet version numbers
Update year to 2009
Force 1.6 compile since Servlet 3.0 requires it

Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/NOTICE
tomcat/trunk/RELEASE-NOTES
tomcat/trunk/RUNNING.txt
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/dist.xml
tomcat/trunk/extras.xml

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=734491&r1=734490&r2=734491&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Wed Jan 14 11:46:32 2009
@@ -22,7 +22,7 @@
 
 
 This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
-implements the Servlet 2.5 and JSP 2.1 specifications from the Java
+implements the Servlet 3.0 and JSP 2.1 specifications from the Java
 Community Process .  In order to build a binary
 distribution version of the container from a source distribution, 
 do the following:
@@ -32,7 +32,7 @@
 
 * If the JDK is already installed, skip to (1).
 
-* Download a Java Development Kit (JDK) release (version 1.5.x or later) from:
+* Download a Java Development Kit (JDK) release (version 1.6.x or later) from:
 
 http://java.sun.com/j2se/
 
@@ -72,7 +72,7 @@
   http://svn.apache.org/repos/asf/tomcat/t...@version_major_minor@.x/
 
 * Download a source package from:
-  http://tomcat.apache.org/download-60.cgi
+  http://tomcat.apache.org/download-70.cgi
 
 * Checkout the source using SVN, selecting the desired version or
   branch (current development source is at 
@@ -113,7 +113,7 @@
 
 (3) Updating sources
 
-It is recommended that you regularly update the downloaded Tomcat 6 sources
+It is recommended that you regularly update the downloaded Tomcat 7 sources
 using your SVN client.
 
 (4) Rebuilds

Modified: tomcat/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=734491&r1=734490&r2=734491&view=diff
==
--- tomcat/trunk/NOTICE (original)
+++ tomcat/trunk/NOTICE Wed Jan 14 11:46:32 2009
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2007 The Apache Software Foundation
+Copyright 1999-2009 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: tomcat/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=734491&r1=734490&r2=734491&view=diff
==
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Wed Jan 14 11:46:32 2009
@@ -41,7 +41,7 @@
 ===
 Dependency Changes:
 ===
-Tomcat @VERSION_MAJOR_MINOR@ is designed to run on JSE 5.0 and later.
+Tomcat @VERSION_MAJOR_MINOR@ is designed to run on JSE 6.0 and later.
 
 In addition, Tomcat @VERSION_MAJOR_MINOR@ uses the Eclipse JDT Java compiler 
for compiling
 JSP pages.  This means you no longer need to have the complete
@@ -88,7 +88,7 @@
 * jasper-el.jar (Jasper 2 EL implementation)
 * jasper-jdt.jar (Eclipse JDT 3.3 Java compiler)
 * jsp-api.jar (JSP 2.1 API)
-* servlet-api.jar (Servlet 2.5 API)
+* servlet-api.jar (Servlet 3.0 API)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)
 * tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP)
 

Modified: tomcat/trunk/RUNNING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/RUNNING.txt?rev=734491&r1=734490&r2=734491&view=diff
==
--- tomcat/trunk/RUNNING.txt (original)
+++ tomcat/trunk/RUNNING.txt Wed Jan 14 11:46:32 2009
@@ -22,27 +22,27 @@
 ===
 
 Apache Tomcat @VERSION_MAJOR_MINOR@ requires the Java 2 Standard Edition 
Runtime
-Environment (JRE) version 5.0 or later.
+Environment (JRE) version 6.0 or later.
 
 =
-Running With JRE 5.0 Or Later
+Running With JRE 6.0 Or Later
 =
 
 (1) Download and Install the J2SE Runtime Environment (JRE)
 
 (1.1) Download the Java 2 Standard Edition Runtime Environment (JRE),
-  release version 5.0 or later, from http://java.sun.com/j2se.
+  release version 6.0 or later, from http://java.sun.com/j2se.
 
 (1.2) Install the JRE according to the instructions included with the
   release.
 (1.3) Set an environment variable named JRE_HOME to the pathname of
   the directory into which you installed the JRE, e.g. c:\jre5.0
-  or /usr/local/

svn commit: r734501 - in /tomcat/trunk/webapps/docs: ./ api/ appdev/ config/

[markt]

Author: markt
Date: Wed Jan 14 12:02:35 2009
New Revision: 734501

URL: http://svn.apache.org/viewvc?rev=734501&view=rev
Log:
Version updates for the docs

Modified:
tomcat/trunk/webapps/docs/api/index.html
tomcat/trunk/webapps/docs/appdev/deployment.xml
tomcat/trunk/webapps/docs/appdev/installation.xml
tomcat/trunk/webapps/docs/appdev/processes.xml
tomcat/trunk/webapps/docs/building.xml
tomcat/trunk/webapps/docs/class-loader-howto.xml
tomcat/trunk/webapps/docs/cluster-howto.xml
tomcat/trunk/webapps/docs/config/cluster-receiver.xml
tomcat/trunk/webapps/docs/config/cluster-sender.xml
tomcat/trunk/webapps/docs/config/http.xml
tomcat/trunk/webapps/docs/config/listeners.xml
tomcat/trunk/webapps/docs/default-servlet.xml
tomcat/trunk/webapps/docs/deployer-howto.xml
tomcat/trunk/webapps/docs/index.xml
tomcat/trunk/webapps/docs/jasper-howto.xml
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/trunk/webapps/docs/logging.xml
tomcat/trunk/webapps/docs/monitoring.xml
tomcat/trunk/webapps/docs/project.xml

Modified: tomcat/trunk/webapps/docs/api/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/api/index.html?rev=734501&r1=734500&r2=734501&view=diff
==
--- tomcat/trunk/webapps/docs/api/index.html (original)
+++ tomcat/trunk/webapps/docs/api/index.html Wed Jan 14 12:02:35 2009
@@ -27,7 +27,7 @@
 the "fulldocs" package to get it.
 
 You can also access the javadoc online in the Tomcat 
-http://tomcat.apache.org/tomcat-6.0-doc/";>documentation bundle.
+http://tomcat.apache.org/tomcat-7.0-doc/";>documentation bundle.
 
 
 

Modified: tomcat/trunk/webapps/docs/appdev/deployment.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/deployment.xml?rev=734501&r1=734500&r2=734501&view=diff
==
--- tomcat/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/deployment.xml Wed Jan 14 12:02:35 2009
@@ -133,7 +133,7 @@
 Out of the box, a standard Tomcat 6 installation includes a variety
 of pre-installed shared library files, including:
 
-The Servlet 2.5 and JSP 2.1 APIs that are fundamental
+The Servlet 3.0 and JSP 2.1 APIs that are fundamental
 to writing servlets and JavaServer Pages.
 An XML Parser compliant with the JAXP (version 1.2) APIs, so
 your application can perform DOM-based or SAX-based processing of

Modified: tomcat/trunk/webapps/docs/appdev/installation.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/installation.xml?rev=734501&r1=734500&r2=734501&view=diff
==
--- tomcat/trunk/webapps/docs/appdev/installation.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/installation.xml Wed Jan 14 12:02:35 2009
@@ -39,7 +39,7 @@
 
 
 
-Tomcat 6.0 was designed to run on J2SE 5.0.
+Tomcat 7.0 was designed to run on J2SE 6.0.
 
 
 Compatible JDKs for many platforms (or links to where they can be found)

Modified: tomcat/trunk/webapps/docs/appdev/processes.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/processes.xml?rev=734501&r1=734500&r2=734501&view=diff
==
--- tomcat/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/processes.xml Wed Jan 14 12:02:35 2009
@@ -133,8 +133,8 @@
 # Context path to install this application on
 app.path=/hello
 
-# Tomcat 6 installation directory
-catalina.home=/usr/local/apache-tomcat-6.0
+# Tomcat 7 installation directory
+catalina.home=/usr/local/apache-tomcat-7.0
 
 # Manager webapp username and password
 manager.username=myusername

Modified: tomcat/trunk/webapps/docs/building.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=734501&r1=734500&r2=734501&view=diff
==
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Wed Jan 14 12:02:35 2009
@@ -75,11 +75,11 @@
 
 
 
-
+
 
   
   Tomcat SVN repository URL:
-  http://svn.apache.org/repos/asf/tomcat/tc6.0.x/
+  http://svn.apache.org/repos/asf/tomcat/tc7.0.x/
   
   
   
@@ -90,7 +90,7 @@
   
   Checkout the source using SVN, selecting the desired version or
   branch (current development source is at 
-  http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/), or 
+  http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/), or 
   unpack the source package. The location where the source has been
   placed will be referred as ${tomcat.source}.
   
@@ -187,8 +187,7 @@
 Eclipse .project and .classpath files are provided in to root directory of 
tomcat repository
 should allow Eclipse to find all source trees and jars, and
 hopefully compile wit

svn commit: r734506 - in /tomcat/trunk/java/org/apache/catalina/tribes/io: BufferPool.java BufferPool14Impl.java

[markt]

Author: markt
Date: Wed Jan 14 12:45:28 2009
New Revision: 734506

URL: http://svn.apache.org/viewvc?rev=734506&view=rev
Log:
Remove 1.4 impl since we must be using a 1.6 JVM.

Removed:
tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool14Impl.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java?rev=734506&r1=734505&r2=734506&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java Wed Jan 14 
12:45:28 2009
@@ -61,16 +61,12 @@
BufferPoolAPI pool = null;
Class clazz = null;
try {
+   // TODO Is this approach still required?
clazz = 
Class.forName("org.apache.catalina.tribes.io.BufferPool15Impl");
pool = (BufferPoolAPI)clazz.newInstance();
} catch ( Throwable x ) {
-   try {
-   clazz = 
Class.forName("org.apache.catalina.tribes.io.BufferPool14Impl");
-   pool = (BufferPoolAPI)clazz.newInstance();
-   } catch ( Throwable e ) {
-   log.warn("Unable to initilize BufferPool, not 
pooling XByteBuffer objects:"+x.getMessage());
-   if ( log.isDebugEnabled() ) log.debug("Unable to 
initilize BufferPool, not pooling XByteBuffer objects:",x);
-   }
+   log.warn("Unable to initilize BufferPool, not pooling 
XByteBuffer objects:"+x.getMessage());
+   if ( log.isDebugEnabled() ) log.debug("Unable to 
initilize BufferPool, not pooling XByteBuffer objects:",x);
}
pool.setMaxSize(DEFAULT_POOL_SIZE);
log.info("Created a buffer pool with max 
size:"+DEFAULT_POOL_SIZE+" bytes of 
type:"+(clazz!=null?clazz.getName():"null"));



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

svn commit: r734507 - /tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java

[markt]

Author: markt
Date: Wed Jan 14 12:46:02 2009
New Revision: 734507

URL: http://svn.apache.org/viewvc?rev=734507&view=rev
Log:
Fix possible NPE reported by Eclipse

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java?rev=734507&r1=734506&r2=734507&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java Wed Jan 14 
12:46:02 2009
@@ -68,9 +68,11 @@
log.warn("Unable to initilize BufferPool, not pooling 
XByteBuffer objects:"+x.getMessage());
if ( log.isDebugEnabled() ) log.debug("Unable to 
initilize BufferPool, not pooling XByteBuffer objects:",x);
}
-   pool.setMaxSize(DEFAULT_POOL_SIZE);
-   log.info("Created a buffer pool with max 
size:"+DEFAULT_POOL_SIZE+" bytes of 
type:"+(clazz!=null?clazz.getName():"null"));
-   instance = new BufferPool(pool);
+   if (pool != null) {
+   pool.setMaxSize(DEFAULT_POOL_SIZE);
+   log.info("Created a buffer pool with max 
size:"+DEFAULT_POOL_SIZE+" bytes of 
type:"+(clazz!=null?clazz.getName():"null"));
+   instance = new BufferPool(pool);
+   }
 }//end if
 }//sync
 }//end if



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

svn commit: r734508 - /tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java

[markt]

Author: markt
Date: Wed Jan 14 12:52:26 2009
New Revision: 734508

URL: http://svn.apache.org/viewvc?rev=734508&view=rev
Log:
Fix Eclipse warning

Modified:
tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java

Modified: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java?rev=734508&r1=734507&r2=734508&view=diff
==
--- tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Wed Jan 14 12:52:26 
2009
@@ -152,7 +152,7 @@
 try {
 AsyncFileHandler.recordCounter.sleepUntilPositive();
 } catch (InterruptedException x) {
-this.interrupted();
+Thread.interrupted();
 continue;
 }
 AsyncFileHandler[] handlers = 
AsyncFileHandler.handlers.toArray(new AsyncFileHandler[0]);



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

svn commit: r734523 - /tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java

[markt]

Author: markt
Date: Wed Jan 14 13:52:12 2009
New Revision: 734523

URL: http://svn.apache.org/viewvc?rev=734523&view=rev
Log:
AFAICT only, dummy implementations are required here.

Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=734523&r1=734522&r2=734523&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Wed Jan 
14 13:52:12 2009
@@ -445,55 +445,52 @@
 public void addFilter(String filterName, String description,
 String className, Map initParameters,
 boolean isAsyncSupported) {
-// TODO SERVLET3
+// Do nothing
 }
 
 
 public void addFilterMappingForServletNames(String filterName,
 EnumSet dispatcherTypes, boolean isMatchAfter,
 String... servletNames) {
-// TODO SERVLET3
+// Do nothing
 }
 
 
 public void addFilterMappingForUrlPatterns(String filterName,
 EnumSet dispatcherTypes, boolean isMatchAfter,
 String... urlPatterns) {
-// TODO SERVLET3
+// Do nothing
 }
 
 
 public void addServletMapping(String servletName, String[] urlPatterns) {
-// TODO SERVLET3
+// Do nothing
 }
 
 
 public EnumSet getDefaultSessionTrackingModes() {
-// TODO SERVLET3
-return null;
+return EnumSet.noneOf(SessionTrackingMode.class);
 }
 
 
 public EnumSet getEffectiveSessionTrackingModes() {
-// TODO SERVLET3
-return null;
+return EnumSet.noneOf(SessionTrackingMode.class);
 }
 
 
 public SessionCookieConfig getSessionCookieConfig() {
-// TODO SERVLET3
 return null;
 }
 
 
 public void setSessionCookieConfig(SessionCookieConfig 
sessionCookieConfig) {
-// TODO SERVLET3
+// Do nothing
 }
 
 
 public void setSessionTrackingModes(
 EnumSet sessionTrackingModes) {
-// TODO SERVLET3
+// Do nothing
 }
 
 }



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

svn commit: r734526 - /tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java

[markt]

Author: markt
Date: Wed Jan 14 13:54:39 2009
New Revision: 734526

URL: http://svn.apache.org/viewvc?rev=734526&view=rev
Log:
Implement the simple stuff

Modified:
tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=734526&r1=734525&r2=734526&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java Wed Jan 
14 13:54:39 2009
@@ -956,8 +956,12 @@
 
 
 public ServletContext getServletContext() {
-// TODO SERVLET3
-return null;
+if (request == null) {
+throw new IllegalStateException(
+sm.getString("requestFacade.nullRequest"));
+}
+
+return request.getServletContext();
 }
 
 



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

svn commit: r734527 - in /tomcat/trunk/java/org/apache/catalina: core/ApplicationContext.java core/ApplicationContextFacade.java core/LocalStrings.properties core/StandardContext.java deploy/FilterMap

[markt]

Author: markt
Date: Wed Jan 14 13:55:59 2009
New Revision: 734527

URL: http://svn.apache.org/viewvc?rev=734527&view=rev
Log:
Implement dynamically adding servlets and filters. This compiles but is 
untested.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=734527&r1=734526&r2=734527&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Jan 
14 13:55:59 2009
@@ -49,6 +49,8 @@
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.deploy.ApplicationParameter;
+import org.apache.catalina.deploy.FilterDef;
+import org.apache.catalina.deploy.FilterMap;
 import org.apache.catalina.util.Enumerator;
 import org.apache.catalina.util.ResourceSet;
 import org.apache.catalina.util.ServerInfo;
@@ -836,26 +838,82 @@
 public void addFilter(String filterName, String description,
 String className, Map initParameters,
 boolean isAsyncSupported) {
-// TODO SERVLET3
+
+if (context.initialized) {
+//TODO Spec breaking enhancement to ignore this restriction
+throw new IllegalStateException(
+sm.getString("applicationContext.addFilter.ise",
+getContextPath()));
+}
+FilterDef filterDef = new FilterDef();
+filterDef.setFilterName(filterName);
+filterDef.setDescription(description);
+filterDef.setFilterClass(className);
+filterDef.getParameterMap().putAll(initParameters);
+context.addFilterDef(filterDef);
+// TODO SERVLET3 - ASync support
 }
 
 
 public void addFilterMappingForServletNames(String filterName,
 EnumSet dispatcherTypes, boolean isMatchAfter,
 String... servletNames) {
-// TODO SERVLET3
+if (context.initialized) {
+//TODO Spec breaking enhancement to ignore this restriction
+throw new IllegalStateException(sm.getString(
+"applicationContext.addFilterMapping", getContextPath()));
+}
+FilterMap filterMap = new FilterMap(); 
+for (String servletName : servletNames) {
+filterMap.addServletName(servletName);
+}
+filterMap.setFilterName(filterName);
+for (DispatcherType dispatcherType: dispatcherTypes) {
+filterMap.setDispatcher(dispatcherType.name());
+}
+if (isMatchAfter) {
+context.addFilterMap(filterMap);
+} else {
+context.addFilterMapBefore(filterMap);
+}
 }
 
 
 public void addFilterMappingForUrlPatterns(String filterName,
 EnumSet dispatcherTypes, boolean isMatchAfter,
 String... urlPatterns) {
-// TODO SERVLET3
+
+if (context.initialized) {
+//TODO Spec breaking enhancement to ignore this restriction
+throw new IllegalStateException(sm.getString(
+"applicationContext.addFilterMapping", getContextPath()));
+}
+FilterMap filterMap = new FilterMap(); 
+for (String urlPattern : urlPatterns) {
+filterMap.addURLPattern(urlPattern);
+}
+filterMap.setFilterName(filterName);
+for (DispatcherType dispatcherType: dispatcherTypes) {
+filterMap.setDispatcher(dispatcherType.name());
+}
+if (isMatchAfter) {
+context.addFilterMap(filterMap);
+} else {
+context.addFilterMapBefore(filterMap);
+}
 }
 
 
 public void addServletMapping(String servletName, String[] urlPatterns) {
-// TODO SERVLET3
+if (context.initialized) {
+//TODO Spec breaking enhancement to ignore this restriction
+throw new IllegalStateException(sm.getString(
+"applicationContext.addServletMapping", getContextPath()));
+}
+for (String urlPattern : urlPatterns) {
+boolean jspWildCard = ("*.jsp".equals(urlPattern));
+context.addServletMapping(servletName, urlPattern, jspWildCard);
+}
 }
 
 
@@ -882,10 +940,7 @@
 // Context > Host > Engine > Service
 Connector[] connectors = ((Engine) context.getParent().getParent())
 .getService().findConnectors();
-// Need a

svn commit: r734543 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/service.bat res/tomcat.nsi webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 14 15:00:49 2009
New Revision: 734543

URL: http://svn.apache.org/viewvc?rev=734543&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41861
Use Apache Tomact 6 as service name
Consider wider replacement patch separately

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/service.bat
tomcat/tc6.0.x/trunk/res/tomcat.nsi
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=734543&r1=734542&r2=734543&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 15:00:49 2009
@@ -118,21 +118,6 @@
 really old to me, so where would this come from ?)
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41861
-  Add major version number to Tomcat service name created by Windows installer
-  http://svn.apache.org/viewvc?rev=710066&view=rev
-  +1: markt, rjung, funkman
-  -1: 
-  rjung: tomcat.nsi already uses replacement patterns like @vers...@.
- So it might be more robust, to add another replacement like
- VERSION_MAJOR or VERSION_MAIN to dist.xml resolving
- to ${version.major} or $version.major}.${version.minor}
- and then replace all occurences of "6" with @VERSION_MAJOR@
- or @version_m...@.
-  rjung: Should be added to PR_DESCRIPTION in bin/service.bat as well.
- Just did that for trunk (r711934; but it contains also other changes).
- Caution: at the moment there's no @VERSION@ substitution for 
service.bat.
-
 * [4] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45154 (add 
sendfile support to NIO/SSL) - performance improvement
   http://svn.apache.org/viewvc?rev=720724&view=rev
   http://svn.apache.org/viewvc?rev=720728&view=rev 

Modified: tomcat/tc6.0.x/trunk/bin/service.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/service.bat?rev=734543&r1=734542&r2=734543&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/service.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/service.bat Wed Jan 14 15:00:49 2009
@@ -57,7 +57,7 @@
 
 rem Set default Service name
 set SERVICE_NAME=Tomcat6
-set PR_DISPLAYNAME=Apache Tomcat
+set PR_DISPLAYNAME=Apache Tomcat 6
 
 if "%1" == "" goto displayUsage
 if "%2" == "" goto setServiceName

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=734543&r1=734542&r2=734543&view=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Wed Jan 14 15:00:49 2009
@@ -173,7 +173,7 @@
 
   InstallRetry:
   ClearErrors
-  nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //IS//Tomcat6 --DisplayName 
"Apache Tomcat" --Description "Apache Tomcat @VERSION@ Server - 
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install 
"$INSTDIR\bin\tomcat6.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath 
"$INSTDIR"'
+  nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //IS//Tomcat6 --DisplayName 
"Apache Tomcat 6" --Description "Apache Tomcat @VERSION@ Server - 
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install 
"$INSTDIR\bin\tomcat6.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath 
"$INSTDIR"'
   Pop $0
   StrCmp $0 "0" InstallOk
 MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \

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=734543&r1=734542&r2=734543&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 15:00:49 2009
@@ -407,6 +407,10 @@
   
 
   
+41861: Update service name to Apache Tomcat 6 to prevent
+conflicts with previous major Tomcat versions. (markt/rjung)
+  
+  
 45852: Add special handling for cp932 (aka ms932) when
 creating tomcat-users.xml with Windows installer. (markt)
   



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

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

[markt]

Author: markt
Date: Wed Jan 14 15:08:40 2009
New Revision: 734544

URL: http://svn.apache.org/viewvc?rev=734544&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=734544&r1=734543&r2=734544&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 15:08:40 2009
@@ -122,12 +122,12 @@
   http://svn.apache.org/viewvc?rev=720724&view=rev
   http://svn.apache.org/viewvc?rev=720728&view=rev 
   http://svn.apache.org/viewvc?rev=725417&view=rev
-  +1: fhanik, jim
+  +1: fhanik, jim, markt
   -1: 
   
 * [5] Fix Comet interest registration bug
   http://people.apache.org/~fhanik/tomcat/comet-ops.patch
-  +1: fhanik, funkman
+  +1: fhanik, funkman, markt
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42693



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

svn commit: r734552 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/Compiler.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 14 15:22:25 2009
New Revision: 734552

URL: http://svn.apache.org/viewvc?rev=734552&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42693
Fix compilation of recursive tags

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 15:22:25 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,719602,719626,719628,720069,723404,723738,726052,727303,728032,728947,729057,730250
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,723404,723738,726052,727303,728032,728947,729057,730250,732859

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734552&r1=734551&r2=734552&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 15:22:25 2009
@@ -130,12 +130,6 @@
   +1: fhanik, funkman, markt
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42693
-  Fix compilation of recursive tags
-  http://svn.apache.org/viewvc?rev=720046&view=rev
-  +1: markt, fhanik, funkman
-  -1: 
-
 * Use consistent (and more useful) JPDA defaults in catalina.bat
   http://svn.apache.org/viewvc?rev=721040&view=rev
   +1: markt, fhanik, funkman

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=734552&r1=734551&r2=734552&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java Wed Jan 
14 15:22:25 2009
@@ -334,7 +334,7 @@
 generateClass(smap);
 }
 } finally {
-if (tfp != null) {
+if (tfp != null && ctxt.isPrototypeMode()) {
 tfp.removeProtoTypeFiles(null);
 }
 // Make sure these object which are only used during the

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=734552&r1=734551&r2=734552&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 15:22:25 2009
@@ -299,6 +299,10 @@
 FeatureDescriptors. Patch provided by Mathias Broekelmann. (markt)
   
   
+42693: Fix JSP generation error with recursive tag file
+structure. (markt)
+  
+  
 45427: Correctly handle unmatched quotes in EL expressions.
 (markt)
   



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

DO NOT REPLY [Bug 41861] Tomcat Windows installer behaves unexpectedly

[bugzilla]

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


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #4 from Mark Thomas   2009-01-14 15:22:58 PST ---
This has been fixed in 6.0.x and will be included in 6.0.19 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 42693] JSP-Generation error with recursive tagfile structure

[bugzilla]

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


Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Comment #14 from Mark Thomas   2009-01-14 15:27:06 PST ---
This has been fixed in 6.0.x and will be included in 6.0.19 onwards.


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

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

svn commit: r734553 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt bin/catalina.bat webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 14 15:30:01 2009
New Revision: 734553

URL: http://svn.apache.org/viewvc?rev=734553&view=rev
Log:
Use consistent (and more useful) JPDA defaults in catalina.bat

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/catalina.bat
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 15:30:01 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,723404,723738,726052,727303,728032,728947,729057,730250,732859
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728947,729057,730250,732859

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734553&r1=734552&r2=734553&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 15:30:01 2009
@@ -130,11 +130,6 @@
   +1: fhanik, funkman, markt
   -1: 
 
-* Use consistent (and more useful) JPDA defaults in catalina.bat
-  http://svn.apache.org/viewvc?rev=721040&view=rev
-  +1: markt, fhanik, funkman
-  -1: 
-
 * Changes required to run with a security manager
   http://svn.apache.org/viewvc?rev=721286&view=rev
   http://svn.apache.org/viewvc?rev=721704&view=rev

Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=734553&r1=734552&r2=734553&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.bat Wed Jan 14 15:30:01 2009
@@ -140,10 +140,10 @@
 if not ""%1"" == ""jpda"" goto noJpda
 set JPDA=jpda
 if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
-set JPDA_TRANSPORT=dt_shmem
+set JPDA_TRANSPORT=dt_socket
 :gotJpdaTransport
 if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
-set JPDA_ADDRESS=jdbconn
+set JPDA_ADDRESS=8000
 :gotJpdaAddress
 if not "%JPDA_SUSPEND%" == "" goto gotJpdaSuspend
 set JPDA_SUSPEND=n

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=734553&r1=734552&r2=734553&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 15:30:01 2009
@@ -435,6 +435,9 @@
 46366: Correct information in RUNNING.txt regarding use of
 CATALINA_HOME and CATALINA_BASE. (markt) 
   
+  
+Use more useful JPDA defaults in catalina.bat. (markt)
+  
 
   
 



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

svn commit: r734559 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/ApplicationFilterChain.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 14 15:39:18 2009
New Revision: 734559

URL: http://svn.apache.org/viewvc?rev=734559&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46304
Excludes performance issues
Use Principal when calling doFilterEvent()

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 15:39:18 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728947,729057,730250,732859
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,730250,732859

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734559&r1=734558&r2=734559&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 15:39:18 2009
@@ -141,13 +141,6 @@
   possibly be exploited by a malicious webapp.
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46304
-  Excludes performance issues
-  Use Principal when calling doFilterEvent()
-  http://svn.apache.org/viewvc?rev=728768&view=rev
-  +1: markt, fhanik, funkman
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46357
   Correct test for host's parent must be an engine
   http://svn.apache.org/viewvc?rev=729567&view=rev

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=734559&r1=734558&r2=734559&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java 
Wed Jan 14 15:39:18 2009
@@ -408,8 +408,8 @@
 ev.getHttpServletRequest().getUserPrincipal();
 
 Object[] args = new Object[]{ev, this};
-SecurityUtil.doAsPrivilege
-("doFilterEvent", (Filter) filter, cometClassType, 
args);
+SecurityUtil.doAsPrivilege("doFilterEvent", filter,
+cometClassType, args, principal);
 
 args = null;
 } else {  

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=734559&r1=734558&r2=734559&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 15:39:18 2009
@@ -213,6 +213,11 @@
 standard endorsed mechanism. (markt)
   
   
+46304: Further fixes to make Principal accessible (if set)
+via Subject.getSubject(AccessController.getContext()) when
+processing filters. (markt)
+  
+  
 46403: Provide a workaround for an IE and Safari bug that
 means the Max-Age attribute of a cookie is ignored. (markt)
   



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

DO NOT REPLY [Bug 46304] SecurityUtil -- no method caching for event() or doFilterEvent() ?

[bugzilla]

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


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #3 from Mark Thomas   2009-01-14 15:39:26 PST ---
The patch has been applied to 6.0.x and will be included in 6.0.19 onwards.


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

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

svn commit: r734560 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ha/deploy/FarmWarDeployer.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 14 15:47:39 2009
New Revision: 734560

URL: http://svn.apache.org/viewvc?rev=734560&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46357
Correct test for host's parent must be an engine

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 15:47:39 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,730250,732859
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,730250,732859

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734560&r1=734559&r2=734560&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 15:47:39 2009
@@ -141,12 +141,6 @@
   possibly be exploited by a malicious webapp.
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46357
-  Correct test for host's parent must be an engine
-  http://svn.apache.org/viewvc?rev=729567&view=rev
-  +1: markt, fhanik, funkman
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46381
   Composite expressions used for attribute values must be coerced to Strings
   http://svn.apache.org/viewvc?rev=729569&view=rev

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=734560&r1=734559&r2=734560&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java 
Wed Jan 14 15:47:39 2009
@@ -148,7 +148,7 @@
 
 // Check to correct engine and host setup
 Container econtainer = host.getParent();
-if(econtainer == null && econtainer instanceof Engine) {
+if(!(econtainer instanceof Engine)) {
 log.error("FarmWarDeployer can only work if parent of " + 
host.getName()+ " is an engine!"); 
 return ;
 }

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=734560&r1=734559&r2=734560&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 15:47:39 2009
@@ -370,6 +370,10 @@
   
 Fix small memory leak in FarmWarDeployer. (markt)
   
+  
+46357: Corrected test for host's parent must be an engine.
+(markt)
+  
 
   
   



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

DO NOT REPLY [Bug 46357] FarmWarDeployer has nonsense condition

[bugzilla]

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


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #2 from Mark Thomas   2009-01-14 15:47:44 PST ---
This has been fixed in 6.0.x and will be included in 6.0.19 onwards.


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

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

svn commit: r734563 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 14 15:51:50 2009
New Revision: 734563

URL: http://svn.apache.org/viewvc?rev=734563&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46381
Composite expressions used for attribute values must be coerced to Strings

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 15:51:50 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,730250,732859
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,730250,732859

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734563&r1=734562&r2=734563&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 15:51:50 2009
@@ -141,12 +141,6 @@
   possibly be exploited by a malicious webapp.
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46381
-  Composite expressions used for attribute values must be coerced to Strings
-  http://svn.apache.org/viewvc?rev=729569&view=rev
-  +1: markt, fhanik, funkman
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46351
   Build script re-factoring
   Patch provided by Marc Guillemot

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=734563&r1=734562&r2=734563&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Wed Jan 
14 15:51:50 2009
@@ -834,6 +834,7 @@
 private String attributeValueWithEL(boolean isTag, String tx,
 Class expectedType, String mapName) {
 if (tx==null) return null;
+Class type = expectedType;
 int size = tx.length();
 StringBuffer output = new StringBuffer(size);
 boolean el = false;
@@ -849,6 +850,8 @@
 if (mark < i) {
 if (output.length() > 0) {
 output.append(" + ");
+// Composite expression - must coerce to String
+type = String.class;
 }
 output.append(quote(tx.substring(mark, i)));
 }
@@ -863,10 +866,12 @@
 // End of an EL expression
 if (output.length() > 0) {
 output.append(" + ");
+// Composite expression - must coerce to String
+type = String.class;
 }
 output.append(
 JspUtil.interpreterCall(isTag,
-tx.substring(mark, i+1), expectedType,
+tx.substring(mark, i+1), type,
 mapName, false));
 mark = i + 1;
 el = 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=734563&r1=734562&r2=734563&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 15:51:50 2009
@@ -343,6 +343,10 @@
 Cédric Mailleux. (markt)
   
   
+43681: Composite expressions used for attribute values must
+be coerced to Strings. (markt)
+  
+  
 46397: Don't pool tag instances that implement 
JspIdConsumer.
 (markt)
   



-
To unsu

DO NOT REPLY [Bug 46381] Coerce EL expression to java.lang.Object breaks expression concatenation

[bugzilla]

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


Mark Thomas  changed:

   What|Removed |Added

 CC||ma...@apache.org
 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #3 from Mark Thomas   2009-01-14 15:51:55 PST ---
This has been fixed in 6.0.x and will be include din 6.0.19 onwards.


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

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

svn commit: r734567 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/realm/JDBCRealm.java java/org/apache/catalina/realm/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 14 15:58:44 2009
New Revision: 734567

URL: http://svn.apache.org/viewvc?rev=734567&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46298
Throw and SQLException with a useful message rather than a NPE if the URL for 
the JDBCRealm is invalid.
Based on a patch by Owen Jacobson

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 15:58:44 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,730250,732859
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729809,730250,732859

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734567&r1=734566&r2=734567&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 15:58:44 2009
@@ -150,14 +150,6 @@
0: funkman - ditto
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46298
-  Throw and SQLException with a useful message rather than a NPE if the URL for
-  the JDBCRealm is invalid.
-  Based on a patch by Owen Jacobson
-  http://svn.apache.org/viewvc?rev=729809&view=rev
-  +1: markt, remm, fhanik
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46261
   %2F in a context path should be interpreted literally, not as /. That is what
   # is for.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=734567&r1=734566&r2=734567&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Wed Jan 
14 15:58:44 2009
@@ -700,6 +700,10 @@
 if (connectionPassword != null)
 props.put("password", connectionPassword);
 dbConnection = driver.connect(connectionURL, props);
+if (dbConnection == null) {
+throw new SQLException(sm.getString(
+"jdbcRealm.open.invalidurl",driverName, connectionURL));
+}
 dbConnection.setAutoCommit(false);
 return (dbConnection);
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=734567&r1=734566&r2=734567&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties 
Wed Jan 14 15:58:44 2009
@@ -53,6 +53,7 @@
 jdbcRealm.getPassword.exception=Exception retrieving password for "{0}"
 jdbcRealm.getRoles.exception=Exception retrieving roles for "{0}"
 jdbcRealm.open=Exception opening database connection
+jdbcRealm.open.invalidurl=Driver "{0}" does not support the url "{1}"
 jndiRealm.authenticateFailure=Username {0} NOT successfully authenticated
 jndiRealm.authenticateSuccess=Username {0} successfully authenticated
 jndiRealm.close=Exception closing directory server connection

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=734567&r1=734566&r2=734567&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 15:58:44 2009
@@ -213,6 +213,11 @@
 standard endorsed mechanism. (markt)
   
   
+46298: Throw an SQLException with a useful message r

DO NOT REPLY [Bug 46298] JDBCRealm.open() throws NullPointerException if the specified driver doesn't handle the specified JDBC URL

[bugzilla]

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


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #3 from Mark Thomas   2009-01-14 15:58:50 PST ---
This has been fixed in 6.0.x and will be included in 6.0.19 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 42707] add host alias using jmx doesn't take affect until restart

[bugzilla]

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


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #6 from Mark Thomas   2009-01-14 16:09:20 PST ---
This has been fixed in 6.0.x and will be included in 6.0.19 onwards.


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

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

svn commit: r734570 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/connector/MapperListener.java java/org/apache/tomcat/util/http/mapper/Mapper.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 14 16:09:08 2009
New Revision: 734570

URL: http://svn.apache.org/viewvc?rev=734570&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42707
Make adding a host alias via jmx take effect immediately

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 16:09:08 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729809,730250,732859
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729809,730250,732859

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734570&r1=734569&r2=734570&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 16:09:08 2009
@@ -157,12 +157,6 @@
   +1: markt, fhanik
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42707
-  Make adding a host alias via jmx take effect immediately
-  http://svn.apache.org/viewvc?rev=712467&view=rev 
-  +1: markt, fhanik, funkman
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45261
   Add a new SimpleCoordinator for tribes provided by Robert Newson
   http://svn.apache.org/viewvc?rev=729815&view=rev

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=734570&r1=734569&r2=734570&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java 
Wed Jan 14 16:09:08 2009
@@ -26,6 +26,10 @@
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 
+import org.apache.catalina.ContainerEvent;
+import org.apache.catalina.ContainerListener;
+import org.apache.catalina.Host;
+import org.apache.catalina.ServerFactory;
 import org.apache.catalina.core.StandardContext;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -46,8 +50,10 @@
  * @author Costin Manolache
  */
 public class MapperListener
-implements NotificationListener 
+implements NotificationListener, ContainerListener
  {
+
+
 private static Log log = LogFactory.getLog(MapperListener.class);
 
 
@@ -254,6 +260,19 @@
 }
 
 
+// - Container Listener methods
+
+public void containerEvent(ContainerEvent event) {
+
+if (event.getType() == Host.ADD_ALIAS_EVENT) {
+mapper.addHostAlias(((Host) event.getSource()).getName(),
+event.getData().toString());
+} else if (event.getType() == Host.REMOVE_ALIAS_EVENT) {
+mapper.removeHostAlias(event.getData().toString());
+}
+}
+
+
 // -- Protected Methods
 
 private void registerEngine()
@@ -296,7 +315,7 @@
 if (!isRegisteredWithAlias && log.isWarnEnabled())
 log.warn(sm.getString("mapperListener.unknownDefaultHost", 
defaultHost));
 }
-// This should probablt be called later 
+// This should probably be called later 
 if( defaultHost != null ) {
 mapper.setDefaultHostName(defaultHost);
 }
@@ -309,13 +328,16 @@
 throws Exception {
 String name=objectName.getKeyProperty("host");
 if( name != null ) {
-String[] aliases = (String[])
-mBeanServer.invoke(objectName, "findAliases", null, null);
+
+Host host = (Host) ServerFactory.getServer().findService(
+domain).getContainer().findChild(name);
+

DO NOT REPLY [Bug 44856] add host alias using jmx doesn't take affect until restart

[bugzilla]

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


Bug 44856 depends on bug 42707, which changed state.

Bug 42707 Summary: add host alias using jmx doesn't take affect until restart
https://issues.apache.org/bugzilla/show_bug.cgi?id=42707

   What|Old Value   |New Value

 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 42707] add host alias using jmx doesn't take affect until restart

[bugzilla]

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


Mark Thomas  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
  Component|Catalina|Catalina
Product|Tomcat 6|Tomcat 5
 Resolution|FIXED   |
   Target Milestone|default |---
Version|6.0.11  |5.5.27




-- 
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 44856] add host alias using jmx doesn't take affect until restart

[bugzilla]

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


Bug 44856 depends on bug 42707, which changed state.

Bug 42707 Summary: add host alias using jmx doesn't take affect until restart
https://issues.apache.org/bugzilla/show_bug.cgi?id=42707

   What|Old Value   |New Value

 Status|RESOLVED|REOPENED
 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: r734574 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ webapps/docs/

[fhanik]

Author: fhanik
Date: Wed Jan 14 16:13:39 2009
New Revision: 734574

URL: http://svn.apache.org/viewvc?rev=734574&view=rev
Log:
implement last of NIO fixes

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.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=734574&r1=734573&r2=734574&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 16:13:39 2009
@@ -118,18 +118,6 @@
 really old to me, so where would this come from ?)
   -1: 
 
-* [4] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45154 (add 
sendfile support to NIO/SSL) - performance improvement
-  http://svn.apache.org/viewvc?rev=720724&view=rev
-  http://svn.apache.org/viewvc?rev=720728&view=rev 
-  http://svn.apache.org/viewvc?rev=725417&view=rev
-  +1: fhanik, jim, markt
-  -1: 
-  
-* [5] Fix Comet interest registration bug
-  http://people.apache.org/~fhanik/tomcat/comet-ops.patch
-  +1: fhanik, funkman, markt
-  -1: 
-
 * Changes required to run with a security manager
   http://svn.apache.org/viewvc?rev=721286&view=rev
   http://svn.apache.org/viewvc?rev=721704&view=rev

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=734574&r1=734573&r2=734574&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java 
Wed Jan 14 16:13:39 2009
@@ -309,7 +309,6 @@
 public void setUseSendfile(boolean useSendfile) {
 ep.setUseSendfile(useSendfile);
 }
-
 
 //  Tcp setup 
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java?rev=734574&r1=734573&r2=734574&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java Wed 
Jan 14 16:13:39 2009
@@ -47,6 +47,8 @@
 protected ApplicationBufferHandler bufHandler;
 
 protected Poller poller;
+
+protected boolean sendFile = false;
 
 public NioChannel(SocketChannel channel, ApplicationBufferHandler 
bufHandler) throws IOException {
 this.sc = channel;
@@ -56,6 +58,7 @@
 public void reset() throws IOException {
 bufHandler.getReadBuffer().clear();
 bufHandler.getWriteBuffer().clear();
+this.sendFile = false;
 }
 
 public int getBufferSize() {
@@ -191,5 +194,27 @@
 public String toString() {
 return super.toString()+":"+this.sc.toString();
 }
+
+public int getOutboundRemaining() {
+return 0;
+}
+
+/**
+ * Return true if the buffer wrote data
+ * @return
+ * @throws IOException
+ */
+public boolean flushOutbound() throws IOException {
+return false;
+}
+
+public boolean isSendFile() {
+return sendFile;
+}
+
+public void setSendFile(boolean s) {
+this.sendFile = s;
+}
+
 
 }

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=734574&r1=734573&r2=734574&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed 
Jan 14 16:13:39 2009
@@ -30,6 +30,7 @@
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
+import java.nio.channels.WritableByteChannel;
 import java.security.KeyStore;
 import java.util.Collection;
 import java.util.Iterator;
@@ -491,7 +492,7 @@
 /**
  * Poller thread count.
  */
-protected int pollerThreadCount = 1;
+protected int pollerThreadCount = 
Runtime.getRuntime().availableProcessors();
 public void setPollerThreadCount(int pollerThreadCount) { 
this.pollerThreadCount = pollerThreadCount; }
 public int getPollerThreadCount() { return

svn commit: r734575 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java webapps/docs/changelog.xml webapps/docs/config/cluster-intercept

[markt]

Author: markt
Date: Wed Jan 14 16:15:56 2009
New Revision: 734575

URL: http://svn.apache.org/viewvc?rev=734575&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45261
Add a new SimpleCoordinator for tribes provided by Robert Newson

Added:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
  - copied, changed from r729815, 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 16:15:56 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729809,730250,732859
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729809,729815,729934,730250,732859

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734575&r1=734574&r2=734575&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 16:15:56 2009
@@ -145,13 +145,6 @@
   +1: markt, fhanik
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45261
-  Add a new SimpleCoordinator for tribes provided by Robert Newson
-  http://svn.apache.org/viewvc?rev=729815&view=rev
-  http://svn.apache.org/viewvc?rev=729934&view=rev
-  +1: markt, fhanik, funkman
-  -1: 
-
 * Print user friendly message when attempting to shutdown and shutdown port is 
disabled
   http://svn.apache.org/viewvc?rev=730178&view=rev
   +1: fhanik, remm, funkman

Copied: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
 (from r729815, 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java)
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java?p2=tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java&p1=tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java&r1=729815&r2=734575&rev=734575&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
 Wed Jan 14 16:15:56 2009
@@ -86,7 +86,8 @@
 }
 
 final Member[] members = getMembers();
-final Member[] view = Arrays.copyOf(members, members.length + 1);
+final Member[] view = new Member[members.length+1];
+System.arraycopy(members, 0, view, 0, members.length);
 view[members.length] = getLocalMember(false);
 Arrays.sort(view, AbsoluteOrder.comp);
 if (Arrays.equals(view, this.view)) {

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=734575&r1=734574&r2=734575&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 16:15:56 2009
@@ -375,6 +375,10 @@
   
 Document the multicast recovery options. (fhanik)
   
+  
+45261: Add a new SimpleCoordinator for tribes provided by
+Robert Newson. (markt)
+  
   
 45618: Make sure NIO selector is closed when no longer used.
 Unlikely to be an issue in normal usage. (markt)

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml?rev=734575&r1=734574&r2=734575&view=diff
==
--- tomcat/tc6.0.

DO NOT REPLY [Bug 45154] Support sendfile with NIO and SSL

[bugzilla]

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





--- Comment #5 from Filip Hanik   2009-01-14 16:21:16 PST ---
This has been fixed in 6.0.x and will be included in 6.0.19 onwards.


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

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

svn commit: r734577 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/servlet/JasperLoader.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 14 16:22:32 2009
New Revision: 734577

URL: http://svn.apache.org/viewvc?rev=734577&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46462
Limit package test to just the o.a.jsp package to allow use of packages such as 
o.a.jspwiki

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JasperLoader.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=734577&r1=734576&r2=734577&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 16:22:32 2009
@@ -158,13 +158,6 @@
markt - TCK passes
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46462
-  Limit package test to just the o.a.jsp package to allow use of packages such
-  as o.a.jspwiki
-  http://svn.apache.org/viewvc?rev=730694&view=rev
-  +1: markt, remm, fhanik
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37458
   Correct sync issue that leads to NPE in rare circumstances
   Patch provided by Konstantin Kolinko

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java?rev=734577&r1=734576&r2=734577&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java Wed 
Jan 14 16:22:32 2009
@@ -122,7 +122,7 @@
 }  
 }
 
-   if( !name.startsWith(Constants.JSP_PACKAGE_NAME) ) {
+if( !name.startsWith(Constants.JSP_PACKAGE_NAME + '.') ) {
 // Class is not in org.apache.jsp, therefore, have our
 // parent load it
 clazz = parent.loadClass(name);
@@ -169,4 +169,4 @@
 public final PermissionCollection getPermissions(CodeSource codeSource) {
 return permissionCollection;
 }
-}
+}
\ No newline at end of file

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=734577&r1=734576&r2=734577&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 16:22:32 2009
@@ -355,13 +355,17 @@
 Cédric Mailleux. (markt)
   
   
-43681: Composite expressions used for attribute values must
+46381: Composite expressions used for attribute values must
 be coerced to Strings. (markt)
   
   
 46397: Don't pool tag instances that implement 
JspIdConsumer.
 (markt)
   
+  
+46462: Limit package test to just the o.a.jsp package to
+allow use of packages such as o.a.jspwiki. (markt)
+  
 
   
   



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

DO NOT REPLY [Bug 46462] JSPWiki JSP compilation prevented by org.apache.jasper.Constants.JSP_PACKAGE_NAME

[bugzilla]

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


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #3 from Mark Thomas   2009-01-14 16:22:56 PST ---
This has been fixed in 6.0.x and will be included in 6.0.19 onwards.


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

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

svn commit: r734579 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 14 16:26:00 2009
New Revision: 734579

URL: http://svn.apache.org/viewvc?rev=734579&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37458
Correct sync issue that leads to NPE in rare circumstances
Patch provided by Konstantin Kolinko

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.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=734579&r1=734578&r2=734579&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 16:26:00 2009
@@ -158,13 +158,6 @@
markt - TCK passes
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37458
-  Correct sync issue that leads to NPE in rare circumstances
-  Patch provided by Konstantin Kolinko
-  http://svn.apache.org/viewvc?rev=730735&view=rev
-  +1: markt, fhanik, funkman
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46471
   Use jar url and tag file path to uniquely ID a tag file to prevent naming
   clashes

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=734579&r1=734578&r2=734579&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
Wed Jan 14 16:26:00 2009
@@ -1793,7 +1793,11 @@
 return clazz;
 
 synchronized (this) {
-if (entry.binaryContent == null && entry.loadedClass == null)
+clazz = entry.loadedClass;
+if (clazz != null)
+return clazz;
+
+if (entry.binaryContent == null)
 throw new ClassNotFoundException(name);
 
 // Looking up the package
@@ -1842,26 +1846,22 @@
 
 }
 
-if (entry.loadedClass == null) {
-try {
-clazz = defineClass(name, entry.binaryContent, 0,
-entry.binaryContent.length, 
-new CodeSource(entry.codeBase, 
entry.certificates));
-} catch (UnsupportedClassVersionError ucve) {
-throw new UnsupportedClassVersionError(
-ucve.getLocalizedMessage() + " " +
-sm.getString("webappClassLoader.wrongVersion",
-name));
-}
-entry.loadedClass = clazz;
-entry.binaryContent = null;
-entry.source = null;
-entry.codeBase = null;
-entry.manifest = null;
-entry.certificates = null;
-} else {
-clazz = entry.loadedClass;
-}
+try {
+clazz = defineClass(name, entry.binaryContent, 0,
+entry.binaryContent.length, 
+new CodeSource(entry.codeBase, entry.certificates));
+} catch (UnsupportedClassVersionError ucve) {
+throw new UnsupportedClassVersionError(
+ucve.getLocalizedMessage() + " " +
+sm.getString("webappClassLoader.wrongVersion",
+name));
+}
+entry.loadedClass = clazz;
+entry.binaryContent = null;
+entry.source = null;
+entry.codeBase = null;
+entry.manifest = null;
+entry.certificates = null;
 }
 
 return clazz;

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=734579&r1=734578&r2=734579&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 16:26:00 2009
@@ -36,6 +36,10 @@
   
 
   
+37458: Correct sync issue that leads to NPE in rare
+circumstances. Patch provided by Konstantin Kolinko. (markt)
+  
+  
 42747: Ensure context.xml takes effect on first deployment
 for WAR and DIR deployments. context.xml is now copied to
 CATALINA_BASE// for DIR as well as



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

DO NOT REPLY [Bug 37458] Datarace on org.apache.catalina.loader.WebappClassLoader

[bugzilla]

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





--- Comment #15 from Mark Thomas   2009-01-14 16:26:29 PST ---
This has been fixed in 6.0.x and will be included in 6.0.19 onwards.


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

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

svn commit: r734582 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/JDTCompiler.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jan 14 16:30:43 2009
New Revision: 734582

URL: http://svn.apache.org/viewvc?rev=734582&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37515
Add options for 1.6 and 1.7 source and target to JDT compiler

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.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=734582&r1=734581&r2=734582&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 16:30:43 2009
@@ -169,12 +169,6 @@
 markt - Second commit removes e.printStackTrace. URLs not used to
 locate files. TCK passes.
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37515
-  Add options for 1.6 and 1.7 source and target to JDT compiler
-  http://svn.apache.org/viewvc?rev=731773&view=rev
-  +1: markt, remm, fhanik
-  -1: 
-
 * Provide deployment feedback - ie when deployment succeeds but startup fails, 
it should return FAIL
   http://svn.apache.org/viewvc?rev=731644&view=rev
   +1: fhanik, funkman

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=734582&r1=734581&r2=734582&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Wed 
Jan 14 16:30:43 2009
@@ -300,6 +300,12 @@
 } else if(opt.equals("1.5")) {
 settings.put(CompilerOptions.OPTION_Source,
  CompilerOptions.VERSION_1_5);
+} else if(opt.equals("1.6")) {
+settings.put(CompilerOptions.OPTION_Source,
+ CompilerOptions.VERSION_1_6);
+} else if(opt.equals("1.7")) {
+settings.put(CompilerOptions.OPTION_Source,
+ CompilerOptions.VERSION_1_7);
 } else {
 log.warn("Unknown source VM " + opt + " ignored.");
 settings.put(CompilerOptions.OPTION_Source,
@@ -331,6 +337,16 @@
  CompilerOptions.VERSION_1_5);
 settings.put(CompilerOptions.OPTION_Compliance,
 CompilerOptions.VERSION_1_5);
+} else if(opt.equals("1.6")) {
+settings.put(CompilerOptions.OPTION_TargetPlatform,
+ CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Compliance,
+CompilerOptions.VERSION_1_6);
+} else if(opt.equals("1.7")) {
+settings.put(CompilerOptions.OPTION_TargetPlatform,
+ CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Compliance,
+CompilerOptions.VERSION_1_7);
 } else {
 log.warn("Unknown target VM " + opt + " ignored.");
 settings.put(CompilerOptions.OPTION_TargetPlatform,

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=734582&r1=734581&r2=734582&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 16:30:43 2009
@@ -303,6 +303,10 @@
   
 
   
+37515: Support 1.6 and 1.7 as source and target for
+compilation. (markt)
+  
+  
 ClassCastException in EL ExpressionBuilder. (rjung)
   
   



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

DO NOT REPLY [Bug 37515] smap not generated by JspC when used from Ant for precompilation

[bugzilla]

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





--- Comment #16 from Mark Thomas   2009-01-14 16:31:05 PST ---
This has been applied to 6.0.x and will be in 6.0.19 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 45851] FarmWarDeployer fails to properly unpack copied war on target node

[bugzilla]

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


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #5 from Mark Thomas   2009-01-14 16:33:28 PST ---
This has been fixed in 6.0.x and will be in 6.0.19 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 46115] Cannot deploy without specifying "Context Path"

[bugzilla]

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


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #2 from Mark Thomas   2009-01-14 16:34:33 PST ---
This has been fixed in 6.0.x and will be included in 6.0.19 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

Re: [g...@vmgump]: Project tomcat-trunk (in module tomcat-trunk) failed

[Bill Barker]

"Mark Thomas"  wrote in message 
news:001b01c97648$96a9e7d0$c3fdb7...@org...
>> From: Stefan Bodewig [mailto:bode...@apache.org]
>>
>> On 2009-01-14, Mark Thomas  wrote:
>>
>> > I hope to get DBCP patched this week.
>>
>> +1
>>
>> I'm glad you are pushing for it.
>>
>> > If that works, it should be possible to start the process of moving
>> > gump to a 1.6 JVM.
>>
>> Yes, commons-dbcp really is the major problem and I'll be glad to move
>> vmgump to jdk 1.6 as soon as I see it building on gump.zones.ao .
>
> The patch is committing as I type. I'll be watching gump.zones.ao with 
> bated
> breath.
>

Well, tomcat-trunk has built on gump.zones.a.o :).  I've fixed the metadata 
for the 5.5 run so that it can use Generics in the build.  I can hack the 
6.0 metadata so that it builds on Java 6 (but not currently nagging).  The 
patch to the trunk version of build.xml that removed the Java 6 check can't 
be cleanly back-ported to 6.0, so it would need a new patch for a proposal 
if 6.0 is going to use the new version of DBCP.  Which is basically my 
question:  What version of DBCP should we use for 6.0?

> Mark 




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