[RESULT] [VOTE] Release build 6.0.29
On 07/19/2010 06:33 PM, jean-frederic clere wrote: > The candidates binaries are available here: > http://people.apache.org/~jfclere/tomcat-6/v6.0.29/ > > According to the release process, the 6.0.29 build corresponding to the > tag TOMCAT_6_0_29 is: > [ ] Broken > [ ] Alpha > [ ] Beta > [X] Stable > We have >=3 +1 Binding Votes, so I will go ahead with the release process... Thx to all! - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966548 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/coyote/http11/ test/org/apache/catalina/core/ webapps/docs/
Author: markt
Date: Thu Jul 22 09:12:18 2010
New Revision: 966548
URL: http://svn.apache.org/viewvc?rev=966548&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49567
Better handling of calls to complete() from a separate thread.
There are still a handful of TODOs around this which will follow shortly but
I'm committing this since it passes the unit tests and the Servlet TCK (with
BIO)
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=966548&r1=966547&r2=966548&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Jul
22 09:12:18 2010
@@ -267,7 +267,7 @@ public class CoyoteAdapter implements Ad
//configure settings for timed out
asyncConImpl.setTimeoutState();
}
-if (status==SocketStatus.ERROR || status==SocketStatus.STOP ||
status==SocketStatus.DISCONNECT) {
+if (status==SocketStatus.ERROR || status==SocketStatus.DISCONNECT)
{
AsyncContextImpl asyncConImpl =
(AsyncContextImpl)request.getAsyncContext();
//TODO SERVLET3 - async
//configure settings for timed out
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=966548&r1=966547&r2=966548&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Jul 22
09:12:18 2010
@@ -1582,7 +1582,6 @@ public class Request
}
return
(asyncContext.getState()==AsyncContextImpl.AsyncState.DISPATCHING ||
-
asyncContext.getState()==AsyncContextImpl.AsyncState.DISPATCHING_RUNNABLE ||
asyncContext.getState()==AsyncContextImpl.AsyncState.TIMING_OUT ||
asyncContext.getState()==AsyncContextImpl.AsyncState.STARTED
||
asyncContext.getState()==AsyncContextImpl.AsyncState.ERROR_DISPATCHING ||
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=966548&r1=966547&r2=966548&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Thu Jul 22
09:12:18 2010
@@ -48,8 +48,8 @@ import org.apache.juli.logging.LogFactor
public class AsyncContextImpl implements AsyncContext {
public static enum AsyncState {
-NOT_STARTED, STARTED, DISPATCHING, DISPATCHING_RUNNABLE, DISPATCHED,
-COMPLETING, COMPLETING_RUNNABLE, TIMING_OUT, ERROR_DISPATCHING
+NOT_STARTED, STARTED, DISPATCHING, DISPATCHED, COMPLETING, TIMING_OUT,
+ERROR_DISPATCHING
}
private static final Log log = LogFactory.getLog(AsyncContextImpl.class);
@@ -87,9 +87,6 @@ public class AsyncContextImpl implements
AtomicBoolean dispatched = new AtomicBoolean(false);
request.getCoyoteRequest().action(ActionCode.ACTION_ASYNC_COMPLETE,dispatched);
if (!dispatched.get()) doInternalComplete(false);
-} else if (state.compareAndSet(AsyncState.DISPATCHING_RUNNABLE,
-AsyncState.COMPLETING_RUNNABLE)) {
-// do nothing
} else {
throw new IllegalStateException("Complete not allowed. Invalid
state:"+state.get());
}
@@ -182,33 +179,16 @@ public class AsyncContextImpl implements
log.debug("AsyncContext Start Called["+state.get()+";
"+request.getRequestURI()+"?"+request.getQueryString()+"]", new
DebugException());
}
-if (state.compareAndSet(AsyncState.STARTED,
AsyncState.DISPATCHING_RUNNABLE) ||
-state.compareAndSet(AsyncState.DISPATCHED,
AsyncState.DISPATCHING_RUNNABLE)) {
-// TODO SERVLET3 - async
-final ServletContext sctx =
getServletRequest().getServletContext();
-Runnable r = new Runnable() {
-public void run() {
-//TODO S
DO NOT REPLY [Bug 49637] New: request for AJP command line client
https://issues.apache.org/bugzilla/show_bug.cgi?id=49637 Summary: request for AJP command line client Product: Tomcat 7 Version: trunk Platform: Sun OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: Integration AssignedTo: dev@tomcat.apache.org ReportedBy: ad...@angosso.net external link fixed. Currently ContextConfig's processServletContainerInitializers(http://www.angosso.net/.) and processResourceJARs(www.angosso.net/.) are hard coded to only accept jar URLs. If they encounter a file URL due to a JarScanner with scanAllDirectories=true, they throw a ClassCastException. The attached patch is what I used to update Tomcat 7 so it would start. I've verified that the modified processServletContainerInitializers(www.angosso.net/i) picks up the "javax.servlet.ServletContainerInitializer" file from a directory. As for processResourceJARs(www.angosso.net/ii), I was lazy and modified it to simply ignore file URLs as BaseDirContext doesn't currently accept non-jar URLs for these "META-INF/resources" locations. ReportedBy: mbi...@angosso.net -- 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 49637] request for AJP command line client
https://issues.apache.org/bugzilla/show_bug.cgi?id=49637 Roger Mbiama Assogo changed: What|Removed |Added Keywords||PatchAvailable Status|NEW |RESOLVED URL||http://angosso.net/logo3494 ||882_md.jpg CC||ad...@angosso.net 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: r966567 - in /tomcat/site/trunk: docs/download-60.html docs/index.html docs/oldnews.html xdocs/download-60.xml xdocs/index.xml xdocs/oldnews.xml
Author: jfclere Date: Thu Jul 22 10:32:38 2010 New Revision: 966567 URL: http://svn.apache.org/viewvc?rev=966567&view=rev Log: Release 6.0.29 Modified: tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/xdocs/download-60.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=966567&r1=966566&r2=966567&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Thu Jul 22 10:32:38 2010 @@ -227,8 +227,8 @@ http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS | -6.0.28 | -Browse | +6.0.29 | +Browse | http://archive.apache.org/dist/tomcat/tomcat-6";>Archives @@ -328,8 +328,8 @@ - -6.0.28 + +6.0.29 @@ -339,8 +339,8 @@ - Please see the - README + Please see the + README file for packaging information. It explains what every distribution contains. @@ -364,48 +364,48 @@ Core: -zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.zip.md5";>md5) +zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29.zip.md5";>md5) -tar.gz -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.tar.gz.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.tar.gz.md5";>md5) +tar.gz +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29.tar.gz.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29.tar.gz.md5";>md5) -32-bit Windows zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-x86.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-x86.zip.md5";>md5) +32-bit Windows zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29-windows-x86.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29-windows-x86.zip.md5";>md5) -64-bit Windows zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-x64.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-x64.zip.md5";>md5) +64-bit Windows zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29-windows-x64.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29-windows-x64.zip.md5";>md5) -64-bit Itanium Windows zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-i64.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-i64.zip.md5";>md5) +64-bit Itanium Windows zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29-windows-i64.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29-windows-i64.zip.md5";>md5) -32-bit/64-bit Windows Service Installer -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.exe.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.exe.md5";>md5) +32-bit/64-bit Windows Service Installer +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29.exe.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29.exe.md5";>md5) Deployer: -zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-deployer.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-deployer.zip.md5";>md5) +zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29-deployer.zip.asc";>pgp,
svn commit: r966570 - /tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
Author: markt
Date: Thu Jul 22 10:43:43 2010
New Revision: 966570
URL: http://svn.apache.org/viewvc?rev=966570&view=rev
Log:
Fix possible NPE
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=966570&r1=966569&r2=966570&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Thu Jul 22
10:43:43 2010
@@ -317,7 +317,9 @@ public class StandardEngine extends Cont
if (defaultAccessLog == null) {
// Try the ROOT context of default host
Context context = (Context) host.findChild("");
-defaultAccessLog = context.getAccessLog();
+if (context != null) {
+defaultAccessLog = context.getAccessLog();
+}
if (defaultAccessLog == null) {
defaultAccessLog = new NoopAccessLog();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966573 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Jul 22 10:56:38 2010 New Revision: 966573 URL: http://svn.apache.org/viewvc?rev=966573&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=966573&r1=966572&r2=966573&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 22 10:56:38 2010 @@ -170,5 +170,5 @@ PATCHES PROPOSED TO BACKPORT: * Return a copy of the URL being used from the webapp class loader, not the original. http://svn.apache.org/viewvc?rev=966292&view=rev - +1: markt, kfujino + +1: markt, kfujino, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966579 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Jul 22 11:15:20 2010 New Revision: 966579 URL: http://svn.apache.org/viewvc?rev=966579&view=rev Log: Propose a backport Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=966579&r1=966578&r2=966579&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jul 22 11:15:20 2010 @@ -81,3 +81,10 @@ PATCHES PROPOSED TO BACKPORT: for channelSocket.maxPort +1: kkolinko -1: + +* Return a copy of the URL being used from the webapp class loader, not the + original. + It is backport of Mark's r966292. + http://people.apache.org/~kkolinko/patches/2010-07-22_tc55_getURLs.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966586 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml
Author: kkolinko Date: Thu Jul 22 11:29:09 2010 New Revision: 966586 URL: http://svn.apache.org/viewvc?rev=966586&view=rev Log: update whichversion.html Modified: tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=966586&r1=966585&r2=966586&view=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Thu Jul 22 11:29:09 2010 @@ -3,19 +3,19 @@ Apache Tomcat - Which Version Do I Want? - - - - + + + + - - + + http://tomcat.apache.org/";> - + @@ -26,28 +26,28 @@ http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; /> +http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> -http://www.google.com/search";> - - - +http://www.google.com/search"; method="get"> + + + - + - + - + Apache Tomcat @@ -179,11 +179,11 @@ - - + + - + @@ -204,100 +204,100 @@ and the respective Apache Tomcat version - - + + Servlet/JSP Spec - - + + Apache Tomcat version - - + + Actual release revision - - + + Minimum Java Version - -3.0/2.2 + +3.0/2.2 - -7.0.x + +7.0.x - -7.0.0 (beta) + +7.0.0 (beta) - -1.6 + +1.6 - -2.5/2.1 + +2.5/2.1 - -6.0.x + +6.0.x - -6.0.28 + +6.0.29 - -1.5 + +1.5 - -2.4/2.0 + +2.4/2.0 - -5.5.x + +5.5.x - -5.5.30 + +5.5.30 - -1.4 + +1.4 - -2.3/1.2 + +2.3/1.2 - -4.1.x (archived) + +4.1.x (archived) - -4.1.40 (archived) + +4.1.40 (archived) - -1.3 + +1.3 - -2.2/1.1 + +2.2/1.1 - -3.3.x (archived) + +3.3.x (archived) - -3.3.2 (archived) + +3.3.2 (archived) - -1.1 + +1.1 @@ -322,14 +322,14 @@ be interested or able to support you. - + - + - + @@ -378,14 +378,14 @@ stably for extended periods of time. - + - + - + @@ -421,14 +421,14 @@ following improvements: - + - + - + @@ -461,14 +461,14 @@ following improvements: - + - + - + @@ -516,14 +516,14 @@ it in production - + - + - + @@ -579,14 +579,14 @@ specifications with no changes. - + - + - + @@ -660,7 +660,7 @@ strongly encouraged to migrate to the cu - + @@ -669,17 +669,17 @@ strongly encouraged to migrate to the cu - + - + Copyright © 1999-2010, The Apache Software Foundation - + "Apache", the Apache feather, and the Apache Tomcat logo are trademarks of the Apache Software Foundation for our open source software. Modified: tomcat/site/trunk/xdocs/whichversion.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=966586&r1=966585&r2=966586&view=diff == --- tomcat/site/trunk/xdocs/whichversion.xml (original) +++ tomcat/site/trunk/xdocs/whichversion.xml Thu Jul 22 11:29:09 2010 @@ -33,7 +33,7 @@ and the respective Apache Tomcat version 2.5/2.1 6.0.x - 6.0.28 + 6.0.29 1.5 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966591 - /tomcat/site/trunk/docs/whichversion.html
Author: jfclere Date: Thu Jul 22 11:36:53 2010 New Revision: 966591 URL: http://svn.apache.org/viewvc?rev=966591&view=rev Log: Release 6.0.29 Modified: tomcat/site/trunk/docs/whichversion.html Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=966591&r1=966590&r2=966591&view=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Thu Jul 22 11:36:53 2010 @@ -248,8 +248,8 @@ and the respective Apache Tomcat version 6.0.x - -6.0.29 + +6.0.29 1.5 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r966586 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml
2010/7/22 : > Author: kkolinko > Date: Thu Jul 22 11:29:09 2010 > New Revision: 966586 > > URL: http://svn.apache.org/viewvc?rev=966586&view=rev > Log: > update whichversion.html > > Modified: > tomcat/site/trunk/docs/whichversion.html > tomcat/site/trunk/xdocs/whichversion.xml > > - 6.0.28 > + 6.0.29 I am not doing "svn up" now, because download page was not svn up'ed yet. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966596 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Thu Jul 22 11:51:00 2010
New Revision: 966596
URL: http://svn.apache.org/viewvc?rev=966596&view=rev
Log:
Poll time and wait are both in milliseconds
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=966596&r1=966595&r2=966596&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Jul 22
11:51:00 2010
@@ -964,7 +964,7 @@ public class AprEndpoint extends Abstrac
// in the poller can cause problems
try {
synchronized (this) {
-this.wait(pollTime / 1000);
+this.wait(pollTime);
}
} catch (InterruptedException e) {
// Ignore
@@ -1223,7 +1223,7 @@ public class AprEndpoint extends Abstrac
// in the poller can cause problems
try {
synchronized (this) {
-this.wait(pollTime / 1000);
+this.wait(pollTime);
}
} catch (InterruptedException e) {
// Ignore
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966597 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: jfclere Date: Thu Jul 22 11:53:23 2010 New Revision: 966597 URL: http://svn.apache.org/viewvc?rev=966597&view=rev Log: Add the release date. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml 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=966597&r1=966596&r2=966597&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jul 22 11:53:23 2010 @@ -49,7 +49,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966607 - /tomcat/tc6.0.x/trunk/NOTICE
Author: kkolinko Date: Thu Jul 22 12:05:52 2010 New Revision: 966607 URL: http://svn.apache.org/viewvc?rev=966607&view=rev Log: correct a typo in NOTICE file CTR Modified: tomcat/tc6.0.x/trunk/NOTICE Modified: tomcat/tc6.0.x/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/NOTICE?rev=966607&r1=966606&r2=966607&view=diff == --- tomcat/tc6.0.x/trunk/NOTICE (original) +++ tomcat/tc6.0.x/trunk/NOTICE Thu Jul 22 12:05:52 2010 @@ -11,6 +11,6 @@ related information is available at http://nsis.sourceforge.net. Java compilation software for JSP pages is provided by Eclipse, -which is open source software. The orginal software and +which is open source software. The original software and related information is available at http://www.eclipse.org. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966613 - in /tomcat/trunk: build.xml test/org/apache/catalina/startup/TestTomcatSSL.java test/org/apache/catalina/startup/TomcatBaseTest.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 22 12:18:59 2010
New Revision: 966613
URL: http://svn.apache.org/viewvc?rev=966613&view=rev
Log:
Run all unit tests will all connectors
Modified:
tomcat/trunk/build.xml
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=966613&r1=966612&r2=966613&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jul 22 12:18:59 2010
@@ -928,39 +928,72 @@
+ depends="test-bio,test-nio,test-apr" >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java?rev=966613&r1=966612&r2=966613&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java Thu Jul 22
12:18:59 2010
@@ -30,7 +30,6 @@ import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
-import org.apache.catalina.connector.Connector;
import org.apache.tomcat.util.buf.ByteChunk;
/**
@@ -56,15 +55,7 @@ public class TestTomcatSSL extends Tomca
}
};
-private void initSsl(Tomcat tomcat, boolean nio) {
-if (nio) {
-Connector connector =
-new Connector("org.apache.coyote.http11.Http11NioProtocol");
-connector.setPort(getPort());
-tomcat.getService().addConnector(connector);
-tomcat.setConnector(connector);
-tomcat.getConnector().setProperty("sslProtocol", "tls");
-}
+private void initSsl(Tomcat tomcat) {
String protocol = tomcat.getConnector().getProtocolHandlerClassName();
if (protocol.indexOf("Apr") == -1) {
tomcat.getConnector().setProperty("sslProtocol", "tls");
@@ -88,14 +79,6 @@ public class TestTomcatSSL extends Tomca
}
public void testSimpleSsl() throws Exception {
-simpleSsl(false);
-}
-
-public void testSimpleSslNio() throws Exception {
-simpleSsl(true);
-}
-
-public void simpleSsl(boolean nio) throws Exception {
// Install the all-trusting trust manager so https:// works
// with unsigned certs.
@@ -113,7 +96,7 @@ public class TestTomcatSSL extends Tomca
File appDir = new File(getBuildDirectory(), "webapps/examples");
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-initSsl(tomcat, nio);
+initSsl(tomcat);
tomcat.start();
ByteChunk res = getUrl("https://localhost:"; + getPort() +
@@ -124,19 +107,16 @@ public class TestTomcatSSL extends Tomca
boolean handshakeDone = false;
public void testRenegotiateFail() throws Exception {
-renegotiateFail(false);
-}
-
-public void renegotiateFail(boolean nio) throws Exception {
Tomcat tomcat = getTomcatInstance();
File appDir = new File(getBuildDirectory(), "webapps/examples");
// app dir is relative to server home
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-initSsl(tomcat, nio);
-// Default - MITM not enabled
+initSsl(tomcat);
+// Default - MITM attack prevented
+
tomcat.start();
SSLContext sslCtx = SSLContext.getInstance("TLS");
sslCtx.init(null, trustAllCerts, new java.security.SecureRandom());
@@ -191,36 +171,22 @@ public class TestTomcatSSL extends Tomca
}
public void testRenegotiateWorks() throws Exception {
-renegotiateWorks(false);
-}
-
-
-// Re-negotiation not implemented in NIO
-//public void testRenegotiateWorksNio() throws Exception {
-//renegotiateWorks(true);
-//}
-
-public void testRenegotiateFailNio() throws Exception {
-renegotiateFail(true);
-}
-
-
-public void renegotiateWorks(boolean nio) throws Exception {
Tomcat tomcat = getTomcatI
Re: svn commit: r966613 - in /tomcat/trunk: build.xml test/org/apache/catalina/startup/TestTomcatSSL.java test/org/apache/catalina/startup/TomcatBaseTest.java webapps/docs/changelog.xml
On 22/07/2010 13:18, ma...@apache.org wrote: > Author: markt > Date: Thu Jul 22 12:18:59 2010 > New Revision: 966613 > > URL: http://svn.apache.org/viewvc?rev=966613&view=rev > Log: > Run all unit tests will all connectors When I enable this for the APR connector it always crashes the JVM on shutdown. Is this a local issue or does this happen for anyone else? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r966613 - in /tomcat/trunk: build.xml test/org/apache/catalina/startup/TestTomcatSSL.java test/org/apache/catalina/startup/TomcatBaseTest.java webapps/docs/changelog.xml
On 07/22/2010 02:22 PM, Mark Thomas wrote: On 22/07/2010 13:18, ma...@apache.org wrote: Author: markt Date: Thu Jul 22 12:18:59 2010 New Revision: 966613 URL: http://svn.apache.org/viewvc?rev=966613&view=rev Log: Run all unit tests will all connectors When I enable this for the APR connector it always crashes the JVM on shutdown. Is this a local issue or does this happen for anyone else? It happens cause the Library.shutdown is called while resources are still in use. What happens if you disable the terminateAPR call? Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49600] Bad exception thrown by ProxyDirContext.lookup
https://issues.apache.org/bugzilla/show_bug.cgi?id=49600 --- Comment #4 from Mark Thomas 2010-07-22 09:42:03 EDT --- No, I didn't write the original code but I trust that Remy had a good reason for this particular optimisation. -- 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: DO NOT REPLY [Bug 49637] request for AJP command line client
This is a SPAM issue. Is there a way to remove it and possibly block the user? A second SPAM issue by the same reporter is https://issues.apache.org/bugzilla/show_bug.cgi?id=49487 No other issues reported by this account. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 49637] request for AJP command line client
On 22/07/2010 14:44, Rainer Jung wrote: > This is a SPAM issue. Is there a way to remove it and possibly block the > user? A second SPAM issue by the same reporter is > > https://issues.apache.org/bugzilla/show_bug.cgi?id=49487 > > No other issues reported by this account. Already blocked. There are five different users, each creating a single issue before I have blocked it. I now have a more general block in place. I'll look into deleting the issues when I do the BZ move to a new machine since I'll be mucking around with the database anyway. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 49637] request for AJP command line client
An AJP command line 'client', could be a somewhat good idea :) > 2010/7/22 Rainer Jung : > This is a SPAM issue. Is there a way to remove it and possibly block the > user? A second SPAM issue by the same reporter is > > https://issues.apache.org/bugzilla/show_bug.cgi?id=49487 > > No other issues reported by this account. > > Regards, > > Rainer > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULT] [VOTE] Release build 6.0.29
On Thu, Jul 22, 2010 at 4:56 AM, jean-frederic clere wrote: > On 07/19/2010 06:33 PM, jean-frederic clere wrote: >> The candidates binaries are available here: >> http://people.apache.org/~jfclere/tomcat-6/v6.0.29/ >> >> According to the release process, the 6.0.29 build corresponding to the >> tag TOMCAT_6_0_29 is: >> [ ] Broken >> [ ] Alpha >> [ ] Beta >> [X] Stable +1 Stable. I've been running a couple of our apps on it at home, looks fine. Yoav - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966684 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java
Author: markt
Date: Thu Jul 22 14:27:20 2010
New Revision: 966684
URL: http://svn.apache.org/viewvc?rev=966684&view=rev
Log:
Remove some TODOs that have been implemented
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=966684&r1=966683&r2=966684&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Jul 22
14:27:20 2010
@@ -1539,7 +1539,6 @@ public class Request
}
public AsyncContext startAsync() {
-// TODO SERVLET3 - async
return startAsync(getRequest(),response.getResponse());
}
@@ -1557,9 +1556,6 @@ public class Request
asyncContext.setStarted(getContext());
asyncContext.init(request,response);
-//TODO SERVLET3 - async - need to retrieve the ServletContext here
-//or just the webapp classloader associated with to do
-//run with start(Runnable)
asyncContext.setHasOriginalRequestAndResponse(request==getRequest() &&
response==getResponse().getResponse());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 49637] request for AJP command line client
On 22.07.2010 15:49, Mark Thomas wrote: On 22/07/2010 14:44, Rainer Jung wrote: This is a SPAM issue. Is there a way to remove it and possibly block the user? A second SPAM issue by the same reporter is https://issues.apache.org/bugzilla/show_bug.cgi?id=49487 No other issues reported by this account. Already blocked. There are five different users, each creating a single issue before I have blocked it. I now have a more general block in place. I'll look into deleting the issues when I do the BZ move to a new machine since I'll be mucking around with the database anyway. Thanks a lot Mark, will change issue subject in the meantime. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 49637] request for AJP command line client
On 22.07.2010 15:49, Henri Gomez wrote: An AJP command line 'client', could be a somewhat good idea :) Sure, this is already tracked via issue https://issues.apache.org/bugzilla/show_bug.cgi?id=47242 The one I referred to had pure Spam content, apart from the title of the issue. Regards, Rainer 2010/7/22 Rainer Jung: This is a SPAM issue. Is there a way to remove it and possibly block the user? A second SPAM issue by the same reporter is https://issues.apache.org/bugzilla/show_bug.cgi?id=49487 No other issues reported by this account. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966692 - in /tomcat/trunk: java/org/apache/catalina/connector/Request.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 22 14:36:15 2010
New Revision: 966692
URL: http://svn.apache.org/viewvc?rev=966692&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49613
Improve performance for multiple calls to Request.getAttributeNames() when
using SSL. Patch provided by Sampo Savolainen.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=966692&r1=966691&r2=966692&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Jul 22
14:36:15 2010
@@ -194,6 +194,13 @@ public class Request
/**
+ * Flag that indicates if SSL attributes have been parsed to improve
+ * performance for applications (usually frameworks) that make multiple
+ * calls to {...@link Request#getAttributeNames()}.
+ */
+protected boolean sslAttributesParsed = false;
+
+/**
* List of read only attributes for this Request.
*/
private HashMap readOnlyAttributes =
@@ -478,6 +485,7 @@ public class Request
localName = null;
attributes.clear();
+sslAttributesParsed = false;
notes.clear();
cookies = null;
@@ -937,6 +945,7 @@ public class Request
attributes.put(Globals.SSL_SESSION_MGR_ATTR, attr);
}
attr = attributes.get(name);
+sslAttributesParsed = true;
}
return attr;
}
@@ -981,7 +990,7 @@ public class Request
* attributes and may also support additional attributes.
*/
public Enumeration getAttributeNames() {
-if (isSecure()) {
+if (isSecure() && !sslAttributesParsed) {
getAttribute(Globals.CERTIFICATES_ATTR);
}
return new Enumerator(attributes.keySet(), true);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=966692&r1=966691&r2=966692&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 22 14:36:15 2010
@@ -184,6 +184,11 @@
by checking the DirContext or the cache. Test case based
on
a patch provided by Marc Guillemot. (markt)
+
+49613: Improve performance when using SSL for applications
+that make multiple class to Request.getAttributeNames().
+Patch provided by Sampo Savolainen. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966693 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Jul 22 14:37:38 2010 New Revision: 966693 URL: http://svn.apache.org/viewvc?rev=966693&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=966693&r1=966692&r2=966693&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 22 14:37:38 2010 @@ -172,3 +172,10 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=966292&view=rev +1: markt, kfujino, kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49613 + Improve performance for multiple calls to Request.getAttributeNames() when + using SSL. Patch provided by Sampo Savolainen. + http://svn.apache.org/viewvc?rev=966692&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49613] Request.getAttributeNames() slows down some applications
https://issues.apache.org/bugzilla/show_bug.cgi?id=49613 --- Comment #7 from Mark Thomas 2010-07-22 10:38:43 EDT --- Thanks for the patch. It has been applied to 7.0.x and will be in 7.0.1 onwards. It has been proposed for 6.0.x. -- 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 49487] Spam
https://issues.apache.org/bugzilla/show_bug.cgi?id=49487 Rainer Jung changed: What|Removed |Added Component|mod_jk |Common Summary|Angosso Siteweb Inc.|Spam OS/Version|Linux |All Severity|major |trivial -- 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 49637] Spam
https://issues.apache.org/bugzilla/show_bug.cgi?id=49637 Rainer Jung changed: What|Removed |Added Component|Integration |Catalina Platform|Sun |All Summary|request for AJP command |Spam |line client | OS/Version|Linux |All Severity|major |trivial -- 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: r966735 - in /tomcat/trunk/java/org/apache/catalina: ./ core/ startup/ util/
Author: markt
Date: Thu Jul 22 16:32:11 2010
New Revision: 966735
URL: http://svn.apache.org/viewvc?rev=966735&view=rev
Log:
Extend Lifecycle state machine so global listeners can start before everything
else without impacting the context and TLD config listeners
Modified:
tomcat/trunk/java/org/apache/catalina/Lifecycle.java
tomcat/trunk/java/org/apache/catalina/LifecycleState.java
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/core/JasperListener.java
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Lifecycle.java?rev=966735&r1=966734&r2=966735&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Lifecycle.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Lifecycle.java Thu Jul 22 16:32:11
2010
@@ -27,10 +27,12 @@ package org.apache.catalina;
*
* The valid state transitions for components that support Lifecycle are:
*
- *
<---
- * |
|
- *init() start() |auto auto stop()
|
- * NEW ->-- INITIALIZED -->-- STARTING_PREP -->- STARTING -->- STARTED -->---
|
+ *init()
+ * NEW ->-- INITIALIZING
+ * ||| |
<---
+ * ||| |auto |
|
+ * ||| | start() |auto auto stop()
|
+ * ||| INITIALIZED -->-- STARTING_PREP -->- STARTING -->- STARTED -->---
|
* ||| ^ | |
|
* |||start() | | |
|
* ||---> | |
|
@@ -99,9 +101,15 @@ public interface Lifecycle {
/**
- * The LifecycleEvent type for the "component init" event.
+ * The LifecycleEvent type for the "component after init" event.
*/
-public static final String INIT_EVENT = "init";
+public static final String BEFORE_INIT_EVENT = "before_init";
+
+
+/**
+ * The LifecycleEvent type for the "component after init" event.
+ */
+public static final String AFTER_INIT_EVENT = "after_init";
/**
Modified: tomcat/trunk/java/org/apache/catalina/LifecycleState.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/LifecycleState.java?rev=966735&r1=966734&r2=966735&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/LifecycleState.java (original)
+++ tomcat/trunk/java/org/apache/catalina/LifecycleState.java Thu Jul 22
16:32:11 2010
@@ -23,7 +23,8 @@ package org.apache.catalina;
*/
public enum LifecycleState {
NEW(false, null),
-INITIALIZED(false, Lifecycle.INIT_EVENT),
+INITIALIZING(false, Lifecycle.BEFORE_INIT_EVENT),
+INITIALIZED(false, Lifecycle.AFTER_INIT_EVENT),
STARTING_PREP(false, Lifecycle.BEFORE_START_EVENT),
STARTING(true, Lifecycle.START_EVENT),
STARTED(true, Lifecycle.AFTER_START_EVENT),
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=966735&r1=966734&r2=966735&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Thu
Jul 22 16:32:11 2010
@@ -97,7 +97,7 @@ public class AprLifecycleListener
*/
public void lifecycleEvent(LifecycleEvent event) {
-if (Lifecycle.INIT_EVENT.equals(event.getType())) {
+if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
synchronized (lock) {
init();
if (aprAvailable) {
Modified: tomcat/trunk/java/org/apache/catalina/core/JasperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JasperListener.java?rev=966735&r1=966734&r2=966735&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/JasperListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/JasperListener.java Thu Jul 22
16:32:11 2010
@@ -57,7 +57,7 @@ public
svn commit: r966744 - /tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Author: markt
Date: Thu Jul 22 16:56:32 2010
New Revision: 966744
URL: http://svn.apache.org/viewvc?rev=966744&view=rev
Log:
Implement some Servlet 3 TODOs
Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=966744&r1=966743&r2=966744&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Thu Jul 22
16:56:32 2010
@@ -17,6 +17,8 @@
package org.apache.catalina.core;
import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -180,15 +182,36 @@ public class AsyncContextImpl implements
}
if (state.get() == AsyncState.STARTED) {
-// TODO SERVLET3 - async - set context class loader when running
the
-// task.
-// final ServletContext sctx =
getServletRequest().getServletContext();
-// TODO - Use a container thread without creating a memory leak
// Execute the runnable using a container thread from the
-// Connector's thread pool
-//
request.getConnector().getProtocolHandler().getExecutor().execute(run);
-Thread t = new Thread(run);
-t.start();
+// Connector's thread pool. Use a wrapper to prevent a memory leak
+Runnable wrapper = new RunnableWrapper(run, context);
+ClassLoader oldCL;
+if (Globals.IS_SECURITY_ENABLED) {
+PrivilegedAction pa = new PrivilegedGetTccl();
+oldCL = AccessController.doPrivileged(pa);
+} else {
+oldCL = Thread.currentThread().getContextClassLoader();
+}
+try {
+if (Globals.IS_SECURITY_ENABLED) {
+PrivilegedAction pa = new PrivilegedSetTccl(
+this.getClass().getClassLoader());
+AccessController.doPrivileged(pa);
+} else {
+Thread.currentThread().setContextClassLoader(
+this.getClass().getClassLoader());
+}
+request.getConnector().getProtocolHandler().getExecutor(
+).execute(wrapper);
+} finally {
+if (Globals.IS_SECURITY_ENABLED) {
+PrivilegedAction pa = new PrivilegedSetTccl(
+oldCL);
+AccessController.doPrivileged(pa);
+} else {
+Thread.currentThread().setContextClassLoader(oldCL);
+}
+}
} else {
throw new IllegalStateException("Dispatch not allowed. Invalid
state:"+state.get());
}
@@ -390,5 +413,73 @@ public class AsyncContextImpl implements
this.servletResponse = response;
event = new AsyncEvent(this, request, response);
}
-public static class DebugException extends Exception {}
+
+private static class DebugException extends Exception {}
+
+private static class RunnableWrapper implements Runnable {
+
+private Runnable wrapped = null;
+private Context context = null;
+
+public RunnableWrapper(Runnable wrapped, Context ctxt) {
+this.wrapped = wrapped;
+this.context = ctxt;
+}
+
+@Override
+public void run() {
+ClassLoader oldCL;
+if (Globals.IS_SECURITY_ENABLED) {
+PrivilegedAction pa = new PrivilegedGetTccl();
+oldCL = AccessController.doPrivileged(pa);
+} else {
+oldCL = Thread.currentThread().getContextClassLoader();
+}
+
+try {
+if (Globals.IS_SECURITY_ENABLED) {
+PrivilegedAction pa = new PrivilegedSetTccl(
+context.getLoader().getClassLoader());
+AccessController.doPrivileged(pa);
+} else {
+Thread.currentThread().setContextClassLoader
+(context.getLoader().getClassLoader());
+}wrapped.run();
+} finally {
+if (Globals.IS_SECURITY_ENABLED) {
+PrivilegedAction pa = new PrivilegedSetTccl(
+oldCL);
+AccessController.doPrivileged(pa);
+} else {
+Thread.currentThread().setContextClassLoader(oldCL);
+}
+}
+}
+
svn commit: r966745 - /tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Author: markt
Date: Thu Jul 22 16:58:26 2010
New Revision: 966745
URL: http://svn.apache.org/viewvc?rev=966745&view=rev
Log:
Fix some Eclipse warnings, remove some implemented TODOs
Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=966745&r1=966744&r2=966745&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Thu Jul 22
16:58:26 2010
@@ -72,7 +72,6 @@ public class AsyncContextImpl implements
if (log.isDebugEnabled()) {
log.debug("AsyncContext
created["+request.getRequestURI()+"?"+request.getQueryString()+"]", new
DebugException());
}
-//TODO SERVLET3 - async
this.request = request;
}
@@ -85,7 +84,6 @@ public class AsyncContextImpl implements
//do nothing
} else if (state.compareAndSet(AsyncState.DISPATCHED,
AsyncState.COMPLETING) ||
state.compareAndSet(AsyncState.STARTED,
AsyncState.COMPLETING)) {
-// TODO SERVLET3 - async
AtomicBoolean dispatched = new AtomicBoolean(false);
request.getCoyoteRequest().action(ActionCode.ACTION_ASYNC_COMPLETE,dispatched);
if (!dispatched.get()) doInternalComplete(false);
@@ -115,7 +113,6 @@ public class AsyncContextImpl implements
log.debug("AsyncContext Dispatch Called["+state.get()+"; "+path+";
"+request.getRequestURI()+"?"+request.getQueryString()+"]", new
DebugException());
}
-// TODO SERVLET3 - async
if (state.compareAndSet(AsyncState.STARTED, AsyncState.DISPATCHING) ||
state.compareAndSet(AsyncState.DISPATCHED,
AsyncState.DISPATCHING)) {
@@ -342,7 +339,7 @@ public class AsyncContextImpl implements
doInternalComplete(true);
if (x.getCause() instanceof ServletException) throw
(ServletException)x.getCause();
if (x.getCause() instanceof IOException) throw
(IOException)x.getCause();
-else throw new ServletException(x);
+throw new ServletException(x);
} finally {
dispatch = null;
}
@@ -414,7 +411,9 @@ public class AsyncContextImpl implements
event = new AsyncEvent(this, request, response);
}
-private static class DebugException extends Exception {}
+private static class DebugException extends Exception {
+private static final long serialVersionUID = 1L;
+}
private static class RunnableWrapper implements Runnable {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966750 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: markt Date: Thu Jul 22 17:02:32 2010 New Revision: 966750 URL: http://svn.apache.org/viewvc?rev=966750&view=rev Log: Return a copy of the URL being used from the webapp class loader, not the original. Modified: tomcat/tc6.0.x/trunk/ (props changed) 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 Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 17:02:32 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,963868,964614,966177-966178 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496
svn commit: r966862 - /tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Author: markt
Date: Thu Jul 22 21:29:42 2010
New Revision: 966862
URL: http://svn.apache.org/viewvc?rev=966862&view=rev
Log:
Fix copy/paste error
Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=966862&r1=966861&r2=966862&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Thu Jul 22
21:29:42 2010
@@ -476,8 +476,7 @@ public class AsyncContextImpl implements
implements PrivilegedAction {
public ClassLoader run() {
-Thread.currentThread().getContextClassLoader();
-return null;
+return Thread.currentThread().getContextClassLoader();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966863 - /tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
Author: markt
Date: Thu Jul 22 21:36:11 2010
New Revision: 966863
URL: http://svn.apache.org/viewvc?rev=966863&view=rev
Log:
Fix regression in previous fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=49555
Use TCCL to load webapp classes
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=966863&r1=966862&r2=966863&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Thu Jul
22 21:36:11 2010
@@ -17,8 +17,12 @@
package org.apache.jasper.compiler;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.*;
import javax.servlet.jsp.tagext.FunctionInfo;
+
+import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
/**
@@ -296,13 +300,30 @@ public class ELFunctionMapper {
*/
private String getCanonicalName(String className) throws
JasperException {
Class clazz;
+
+ClassLoader tccl;
+if (Constants.IS_SECURITY_ENABLED) {
+PrivilegedAction pa = new PrivilegedGetTccl();
+tccl = AccessController.doPrivileged(pa);
+} else {
+tccl = Thread.currentThread().getContextClassLoader();
+}
+
try {
-clazz = Class.forName(className);
+clazz = Class.forName(className, true, tccl);
} catch (ClassNotFoundException e) {
throw new JasperException(e);
}
return clazz.getCanonicalName();
}
}
+
+private static class PrivilegedGetTccl
+implements PrivilegedAction {
+
+public ClassLoader run() {
+return Thread.currentThread().getContextClassLoader();
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966864 - /tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
Author: markt Date: Thu Jul 22 21:36:55 2010 New Revision: 966864 URL: http://svn.apache.org/viewvc?rev=966864&view=rev Log: Use specific imports Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=966864&r1=966863&r2=966864&view=diff == --- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Thu Jul 22 21:36:55 2010 @@ -19,7 +19,9 @@ package org.apache.jasper.compiler; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; + import javax.servlet.jsp.tagext.FunctionInfo; import org.apache.jasper.Constants; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966865 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Jul 22 21:38:09 2010 New Revision: 966865 URL: http://svn.apache.org/viewvc?rev=966865&view=rev Log: Add additional patch to address feedback. Remove jfclere's vote as the patch is now different. Vote. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=966865&r1=966864&r2=966865&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 22 21:38:09 2010 @@ -152,10 +152,9 @@ PATCHES PROPOSED TO BACKPORT: classes http://svn.apache.org/viewvc?rev=961948&view=rev http://svn.apache.org/viewvc?rev=963106&view=rev - +1: markt, jfclere - -1: kkolinko: - Needs to use TCCL instead of plain Class.forName(String) call. - The /examples/jsp/jsp2/el/functions.jsp page breaks with a ClassNotFoundException. + http://svn.apache.org/viewvc?rev=966863&view=rev + +1: markt + -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49521 http://people.apache.org/~kkolinko/patches/2010-07-17_tc6_bug49521.patch @@ -164,7 +163,7 @@ PATCHES PROPOSED TO BACKPORT: and #init() methods. - Add support for "maxPort" attribute on a element as a synonym for channelSocket.maxPort - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49613 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966867 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Jul 22 21:45:31 2010 New Revision: 966867 URL: http://svn.apache.org/viewvc?rev=966867&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=966867&r1=966866&r2=966867&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 22 21:45:31 2010 @@ -68,14 +68,8 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49030 Failure of one connector should not leave some connectors started and some ignored - http://people.apache.org/~markt/patches/2010-06-14-bug49030.patch - +1: markt - -1: kkolinko: it breaks the fix for BZ 48625 -https://issues.apache.org/bugzilla/show_bug.cgi?id=49030#c4 - - Alternative patch: https://issues.apache.org/bugzilla/attachment.cgi?id=25633 - +1: kkolinko + +1: kkolinko, markt -1: * Configure Tomcat to use HttpOnly for session cookies by default @@ -104,7 +98,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49343 When ChannelException is thrown, remove listener from channel. http://svn.apache.org/viewvc?view=revision&revision=948402 - +1: kfujino, kkolinko + +1: kfujino, kkolinko, markt -1: kkolinko: Maybe "this.channel.removeChannelListener(this.rpcChannel);" call @@ -114,7 +108,7 @@ PATCHES PROPOSED TO BACKPORT: "this.channel.removeChannelListener(this.rpcChannel);" call is replaced with "this.rpcChannel.breakdown();". http://svn.apache.org/viewvc?view=revision&revision=950922 - +1: kfujino, kkolinko + +1: kfujino, kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49099 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966868 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Thu Jul 22 21:47:33 2010 New Revision: 966868 URL: http://svn.apache.org/viewvc?rev=966868&view=rev Log: Vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=966868&r1=966867&r2=966868&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jul 22 21:47:33 2010 @@ -56,7 +56,7 @@ PATCHES PROPOSED TO BACKPORT: svn propdel svn:executable container/webapps/docs/default-servlet.xml svn propdel svn:executable container/webapps/docs/balancer-howto.xml svn propdel svn:executable container/webapps/jmxremote/WEB-INF/web.xml - +1: rjung, kkolinko + +1: rjung, kkolinko, markt -1: b) Add to .bat and .sh files where missing (most already have the property set) @@ -68,7 +68,7 @@ PATCHES PROPOSED TO BACKPORT: svn propset svn:executable '*' jasper/src/bin/jspc-using-launcher.sh svn propset svn:executable '*' jasper/src/bin/jasper.sh svn propset svn:executable '*' connectors/http11/src/test/test.bat - +1: rjung, kkolinko + +1: rjung, kkolinko, markt -1: @@ -79,12 +79,12 @@ PATCHES PROPOSED TO BACKPORT: and #init() methods. - Add support for "maxPort" attribute on a element as a synonym for channelSocket.maxPort - +1: kkolinko + +1: kkolinko, markt -1: * Return a copy of the URL being used from the webapp class loader, not the original. It is backport of Mark's r966292. http://people.apache.org/~kkolinko/patches/2010-07-22_tc55_getURLs.patch - +1: kkolinko + +1: kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966882 - in /tomcat/trunk: build.properties.default build.xml checkstyle.xml webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 22 22:31:30 2010
New Revision: 966882
URL: http://svn.apache.org/viewvc?rev=966882&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49268
Add necessary plumbing to enable Checkstyle
The config file is deliberately empty. The check will be uncommented once the
source code has been fixed (~200 files contain tabs).
Added:
tomcat/trunk/checkstyle.xml (with props)
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=966882&r1=966881&r2=966882&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Jul 22 22:31:30 2010
@@ -120,6 +120,12 @@ junit.lib=${junit.home}
junit.jar=${junit.lib}/junit.jar
junit.loc=${base-sf.loc}/junit/junit3.8.2.zip
+# - Checkstyle, version 5.1 or later -
+checkstyle.version=5.1
+checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
+checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle-${checkstyle.version}.zip
+checkstyle.jar=${checkstyle.home}/checkstyle-all-${checkstyle.version}.jar
+
# - JSON Libraries (for bayeux module) -
json-lib.home=${base.path}/json-20080701
json-lib.lib=http://repo1.maven.org/maven2/org/json/json/20080701/json-20080701.jar
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=966882&r1=966881&r2=966882&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jul 22 22:31:30 2010
@@ -410,7 +410,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Added: tomcat/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/checkstyle.xml?rev=966882&view=auto
==
--- tomcat/trunk/checkstyle.xml (added)
+++ tomcat/trunk/checkstyle.xml Thu Jul 22 22:31:30 2010
@@ -0,0 +1,25 @@
+
+
+http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
+
+
+
\ No newline at end of file
Propchange: tomcat/trunk/checkstyle.xml
--
svn:eol-style = native
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=966882&r1=966881&r2=966882&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 22 22:31:30 2010
@@ -294,6 +294,11 @@
Re-factor unit tests to enable them to be run once with each of the
HTTP
connector implementations (BIO, NIO and APR/native). (markt)
+
+49268: Add the necessary plumbing to include CheckStyle in
+the build process. Start with no checks. Additional checks will be
+added as they are agreed. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49268] Use checkstyle to enforce common code style
https://issues.apache.org/bugzilla/show_bug.cgi?id=49268 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2010-07-22 18:32:10 EDT --- Fixed in trunk. Will be included in 7.0.1 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: r966883 - in /tomcat/trunk/java/javax/el: ArrayELResolver.java ListELResolver.java MapELResolver.java PropertyNotFoundException.java ResourceBundleELResolver.java
Author: markt
Date: Thu Jul 22 22:35:32 2010
New Revision: 966883
URL: http://svn.apache.org/viewvc?rev=966883&view=rev
Log:
Tab police: javax.el
Thanks to Checkstyle
Modified:
tomcat/trunk/java/javax/el/ArrayELResolver.java
tomcat/trunk/java/javax/el/ListELResolver.java
tomcat/trunk/java/javax/el/MapELResolver.java
tomcat/trunk/java/javax/el/PropertyNotFoundException.java
tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ArrayELResolver.java?rev=966883&r1=966882&r2=966883&view=diff
==
--- tomcat/trunk/java/javax/el/ArrayELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ArrayELResolver.java Thu Jul 22 22:35:32 2010
@@ -24,149 +24,149 @@ import java.util.Iterator;
public class ArrayELResolver extends ELResolver {
- private final boolean readOnly;
+private final boolean readOnly;
- public ArrayELResolver() {
- this.readOnly = false;
- }
+public ArrayELResolver() {
+this.readOnly = false;
+}
- public ArrayELResolver(boolean readOnly) {
- this.readOnly = readOnly;
- }
+public ArrayELResolver(boolean readOnly) {
+this.readOnly = readOnly;
+}
- @Override
+@Override
public Object getValue(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException,
ELException {
- if (context == null) {
- throw new NullPointerException();
- }
-
- if (base != null && base.getClass().isArray()) {
- context.setPropertyResolved(true);
- int idx = coerce(property);
+throws NullPointerException, PropertyNotFoundException,
ELException {
+if (context == null) {
+throw new NullPointerException();
+}
+
+if (base != null && base.getClass().isArray()) {
+context.setPropertyResolved(true);
+int idx = coerce(property);
if (idx < 0 || idx >= Array.getLength(base)) {
return null;
}
return Array.get(base, idx);
}
- return null;
- }
+return null;
+}
- @Override
+@Override
public Class getType(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException,
ELException {
- if (context == null) {
- throw new NullPointerException();
- }
-
- if (base != null && base.getClass().isArray()) {
- context.setPropertyResolved(true);
- int idx = coerce(property);
- checkBounds(base, idx);
- return base.getClass().getComponentType();
- }
+throws NullPointerException, PropertyNotFoundException,
ELException {
+if (context == null) {
+throw new NullPointerException();
+}
- return null;
- }
+if (base != null && base.getClass().isArray()) {
+context.setPropertyResolved(true);
+int idx = coerce(property);
+checkBounds(base, idx);
+return base.getClass().getComponentType();
+}
+
+return null;
+}
- @Override
+@Override
public void setValue(ELContext context, Object base, Object property,
- Object value) throws NullPointerException,
- PropertyNotFoundException, PropertyNotWritableException,
- ELException {
- if (context == null) {
- throw new NullPointerException();
- }
-
- if (base != null && base.getClass().isArray()) {
- context.setPropertyResolved(true);
-
- if (this.readOnly) {
- throw new
PropertyNotWritableException(message(context,
- "resolverNotWriteable", new
Object[] { base.getClass()
- .getName() }));
- }
-
- int idx = coerce(property);
- checkBounds(base, idx);
- if (value != null &&
-
!base.getClass().getComponentType().isAssignableFrom(
- value.getClass())) {
- throw new ClassCastException(message(context,
- "objectNotAssignable",
- new Object[] {value.getClass().getName(),
-
base
DO NOT REPLY [Bug 49567] when starting a new thread from a startAsync Runnable, an infinite amount of doPosts is generated
https://issues.apache.org/bugzilla/show_bug.cgi?id=49567 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #7 from Mark Thomas 2010-07-22 18:51:36 EDT --- This has been fixed in 7.0.x and will be included in 7.0.1 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: r966908 - in /tomcat/tc5.5.x/trunk: ./ build/ connectors/http11/src/test/ container/catalina/src/share/org/apache/catalina/valves/ container/webapps/docs/ container/webapps/jmxremote/WEB-I
Author: rjung
Date: Thu Jul 22 23:57:08 2010
New Revision: 966908
URL: http://svn.apache.org/viewvc?rev=966908&view=rev
Log:
Add svn:executable property to some script files and
remove it from non-executable files.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/sign.bat (props changed)
tomcat/tc5.5.x/trunk/build/sign.sh (props changed)
tomcat/tc5.5.x/trunk/build/tag.bat (props changed)
tomcat/tc5.5.x/trunk/build/tag.sh (props changed)
tomcat/tc5.5.x/trunk/connectors/http11/src/test/test.bat (props changed)
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
(props changed)
tomcat/tc5.5.x/trunk/container/webapps/docs/balancer-howto.xml (props
changed)
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/default-servlet.xml (props
changed)
tomcat/tc5.5.x/trunk/container/webapps/jmxremote/WEB-INF/web.xml (props
changed)
tomcat/tc5.5.x/trunk/jasper/src/bin/jasper.sh (props changed)
tomcat/tc5.5.x/trunk/jasper/src/bin/jspc-using-launcher.sh (props changed)
tomcat/tc5.5.x/trunk/jasper/src/bin/jspc.sh (props changed)
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser/ParserUtils.java
(props changed)
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=966908&r1=966907&r2=966908&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jul 22 23:57:08 2010
@@ -48,30 +48,6 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?view=revision&revision=749019
-1:
-* Clean up svn:executable property (svn property cleanup didn't pass the C-T-R
discussion)
-
- a) Remove from Java source files and from docs files
- svn propdel svn:executable
container/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
- svn propdel svn:executable
jasper/src/share/org/apache/jasper/xmlparser/ParserUtils.java
- svn propdel svn:executable container/webapps/docs/default-servlet.xml
- svn propdel svn:executable container/webapps/docs/balancer-howto.xml
- svn propdel svn:executable container/webapps/jmxremote/WEB-INF/web.xml
- +1: rjung, kkolinko, markt
- -1:
-
- b) Add to .bat and .sh files where missing (most already have the property
set)
- svn propset svn:executable '*' build/tag.bat
- svn propset svn:executable '*' build/tag.sh
- svn propset svn:executable '*' build/sign.bat
- svn propset svn:executable '*' build/sign.sh
- svn propset svn:executable '*' jasper/src/bin/jspc.sh
- svn propset svn:executable '*' jasper/src/bin/jspc-using-launcher.sh
- svn propset svn:executable '*' jasper/src/bin/jasper.sh
- svn propset svn:executable '*' connectors/http11/src/test/test.bat
- +1: rjung, kkolinko, markt
- -1:
-
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49521
http://people.apache.org/~kkolinko/patches/2010-07-17_tc55_bug49521.patch
- Disable scanning for a free port in Jk AJP/1.3 connector by default.
Propchange: tomcat/tc5.5.x/trunk/build/sign.bat
--
svn:executable = *
Propchange: tomcat/tc5.5.x/trunk/build/sign.sh
--
svn:executable = *
Propchange: tomcat/tc5.5.x/trunk/build/tag.bat
--
svn:executable = *
Propchange: tomcat/tc5.5.x/trunk/build/tag.sh
--
svn:executable = *
Propchange: tomcat/tc5.5.x/trunk/connectors/http11/src/test/test.bat
--
svn:executable = *
Propchange:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
('svn:executable' removed)
Propchange: tomcat/tc5.5.x/trunk/container/webapps/docs/balancer-howto.xml
('svn:executable' removed)
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=966908&r1=966907&r2=966908&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Jul 22
23:57:08 2010
@@ -38,6 +38,16 @@
+
+
+
+
+Add svn:executable property to some script files and
+remove it from non-executable files. (rjung)
+
+
+
+
Propchange: tomcat/tc5.5.x/trunk/container/webapps/docs/default-servlet.xml
('svn:executab
svn commit: r966910 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Fri Jul 23 00:04:21 2010 New Revision: 966910 URL: http://svn.apache.org/viewvc?rev=966910&view=rev Log: Vote, comment. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=966910&r1=966909&r2=966910&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Jul 23 00:04:21 2010 @@ -57,10 +57,12 @@ PATCHES PROPOSED TO BACKPORT: for channelSocket.maxPort +1: kkolinko, markt -1: + -0: rjung + rjung: Should we really change default behaviour for a mature version? * Return a copy of the URL being used from the webapp class loader, not the original. It is backport of Mark's r966292. http://people.apache.org/~kkolinko/patches/2010-07-22_tc55_getURLs.patch - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r966937 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java webapps/docs/changelog.xml
Author: kfujino
Date: Fri Jul 23 02:34:51 2010
New Revision: 966937
URL: http://svn.apache.org/viewvc?rev=966937&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49343
When ChannelException is thrown, remove listener from channel.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.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=966937&r1=966936&r2=966937&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 23 02:34:51 2010
@@ -95,22 +95,6 @@ PATCHES PROPOSED TO BACKPORT:
cause confusion. I'd prefer not to invent a new name, but mention the
one that we already have when documenting virtualClasspath.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49343
- When ChannelException is thrown, remove listener from channel.
- http://svn.apache.org/viewvc?view=revision&revision=948402
- +1: kfujino, kkolinko, markt
- -1:
- kkolinko:
-Maybe "this.channel.removeChannelListener(this.rpcChannel);" call
-has to be replaced with "this.rpcChannel.breakdown();"
-
- Additional patch.
- "this.channel.removeChannelListener(this.rpcChannel);" call is
- replaced with "this.rpcChannel.breakdown();".
- http://svn.apache.org/viewvc?view=revision&revision=950922
- +1: kfujino, kkolinko, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49099
Provide a mechanism for including requests rejected by the CoyoteAdapter in
the standard access log
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=966937&r1=966936&r2=966937&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Fri Jul 23 02:34:51 2010
@@ -227,6 +227,10 @@ public abstract class AbstractReplicated
broadcast(MapMessage.MSG_START, true);
} catch (ChannelException x) {
log.warn("Unable to send map start message.");
+// remove listener from channel
+this.rpcChannel.breakdown();
+this.channel.removeChannelListener(this);
+this.channel.removeMembershipListener(this);
throw new RuntimeException("Unable to start replicated map.",x);
}
}
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=966937&r1=966936&r2=966937&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jul 23 02:34:51 2010
@@ -49,6 +49,14 @@
+
+
+
+49343: When ChannelException is thrown, remove listener
from
+channel. (kfujino)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49343] AbstractReplicatedMap is not removed from channel.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49343 Keiichi Fujino changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Keiichi Fujino 2010-07-22 22:36:18 EDT --- This fix applied to 6.0, will be in 6.0.30 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 49165] Enhancement - Allow %{TIME_FORMAT}t As Configuration for AccessLogValve
https://issues.apache.org/bugzilla/show_bug.cgi?id=49165 --- Comment #6 from Alexander Shirkov 2010-07-22 22:38:38 EDT --- (In reply to comment #5) > 1. It uses a mix of tabs and spaces for indenting. Only spaces should be used. Done. > 2. Log messages should use the StringManager to provide i18n support. Done (only English string was added). BTW there are others Strings in class used in exception. I haven't touched them, because they're not related to this bug. Please let me know if this should be done. > 3. Setting currentDate in the AccessDateStruct serves no purpose Removed initialization in variable declaration. Leaved as is in constructor: otherwise NPE will be thrown on first AccessDateStruct access in startInternal(). > 4. Same for currentDateString Removed > 5. DateAndTimeElementVolumeTest can probably be added to the existing > Benchmarks test. Done. > Out of curiosity, if you remove the code that manages the only creating the > date once a second entirely and use a date format that does not include > millis, > what is the performance like? I'm wondering if we can just remove that code > entirely. Without millis chunks we have small performance drop on same %t pattern: 5 thr x 100 iter. newValve 7772ms 5 thr x 100 iter. newValveNoChunks 8483ms 5 thr x 100 iter. newValveWithMillis 8630ms 5 thr x 200 iter. newValve 14857ms 5 thr x 200 iter. newValveNoChunks 15633ms 5 thr x 200 iter. newValveWithMillis 19687ms 5 thr x 300 iter. newValve 22171ms 5 thr x 300 iter. newValveNoChunks 23433ms 5 thr x 300 iter. newValveWithMillis 26765ms 5 thr x 400 iter. newValve 29615ms 5 thr x 400 iter. newValveNoChunks 31525ms 5 thr x 400 iter. newValveWithMillis 35067ms 5 thr x 500 iter. newValve 36889ms 5 thr x 500 iter. newValveNoChunks 39176ms 5 thr x 500 iter. newValveWithMillis 43527ms Looks like performance graphs are linear for all cases. I think if we remove chunks, this could possible cause slight load increase on GC under heavy load (new Date instances will keep creating). Test was done under MacOS X 10.6. Please let me know your decision: are we going to go with this or leave it as is. BTW there will be error up to 1000 mills in output, because we're creating date once in 1000 millis. Note: volume benchmark is writing output in real file to $CATALINA_HOME/logs and shouldn't be included in automatic test pack (it's slow and it's it's generating REALLY big output file, so CI server will quickly run out of disk space). > If you can update the patch, I'll take another look. With the issues above > fixed it should be ready to apply. Will provide patch file after your decision. -- 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
New joiner's question - mocking for unit tests
Hello all I have quick question: Is there mocking framework in project? Writing dummies for unit tests is quite useless and boring thing. Plus it¹s filling codebase with ³noise². I have some experience with: JMock - http://www.jmock.org/ EasyMock - http://easymock.org/ Mockito (my favourite) - http://mockito.org/ First one hasn¹t updated since Feb 2009, so I think it¹s not a good idea to look there. Two others are great: both have dynamic proxying for interfaces and classes.
