DO NOT REPLY [Bug 47453] New: JasperException for deferred-method with return type void
https://issues.apache.org/bugzilla/show_bug.cgi?id=47453 Summary: JasperException for deferred-method with return type void Product: Tomcat 6 Version: 6.0.20 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Jasper AssignedTo: dev@tomcat.apache.org ReportedBy: w.ruppr...@fsp-gmbh.com Created an attachment (id=23908) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23908) Zipped Eclipse 3.4 projects I tried to get the JSF sample application bookstore6 from the SUN Java EE 5 Tutorial running. Environment: Tomcat Version : 6.0.20 Eclipse Version: 3.4 Java JDK Version: jdk1.5.0_17 See: http://java.sun.com/javaee/5/docs/tutorial/doc/bnara.html I added jsf-api.jar, jsf-impl.jar and jstl-1.1.2.jar to Tomcat's lib directory, then created the project (bookstoreJSF and utility project bookstore)and populated it with the sample source files from the Java EE 5 tutorial. I created a Tomcat Server in the Eclipse workspace and added the project to the Tomcat Server. The server and the web application started fine. When I directed my browser (Firefox 3) at the starting page of the project (http://localhost:8080/bookstoreJSF), I got a Jasper Exception: org.apache.jasper.JasperException: /chooselocale.jsp(45,12) Unknown attribute type (void) for attribute actionListener. at org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:40) at org.apache.jasper.compiler.ErrorDispatcher.dispatch(ErrorDispatcher.java:407) at org.apache.jasper.compiler.ErrorDispatcher.jspError(ErrorDispatcher.java:236) at org.apache.jasper.compiler.Validator$ValidateVisitor.checkXmlAttributes(Validator.java:1099) at org.apache.jasper.compiler.Validator$ValidateVisitor.visit(Validator.java:821) at org.apache.jasper.compiler.Node$CustomTag.accept(Node.java:1530) at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2361) at org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:2411) at org.apache.jasper.compiler.Validator$ValidateVisitor.visit(Validator.java:840) at org.apache.jasper.compiler.Node$CustomTag.accept(Node.java:1530) at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2361) at org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:2411) at org.apache.jasper.compiler.Validator$ValidateVisitor.visit(Validator.java:840) at org.apache.jasper.compiler.Node$CustomTag.accept(Node.java:1530) at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2361) at org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:2411) at org.apache.jasper.compiler.Validator$ValidateVisitor.visit(Validator.java:840) at org.apache.jasper.compiler.Node$CustomTag.accept(Node.java:1530) at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2361) at org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:2411) at org.apache.jasper.compiler.Node$Visitor.visit(Node.java:2417) at org.apache.jasper.compiler.Node$Root.accept(Node.java:495) at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2361) at org.apache.jasper.compiler.Validator.validateExDirectives(Validator.java:1736) at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:183) at org.apache.jasper.compiler.Compiler.compile(Compiler.java:332) at org.apache.jasper.compiler.Compiler.compile(Compiler.java:312) at org.apache.jasper.compiler.Compiler.compile(Compiler.java:299) at org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:586) at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:317) at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:342) at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:267) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646) at org.apache.catalina.core.ApplicationDispatcher.processRequest(ApplicationDispatcher.java:436) at org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDispatcher.java:374) at org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispatcher.java:302) at com.sun.faces.context.ExternalContextImpl.dispatch(ExternalContextImpl.java:410) at com.sun.faces.application.ViewHandlerImpl.executePageToBuildView(ViewHandlerImpl.java:468) at com.sun.faces.application.ViewHandlerImpl.renderView(ViewHandlerImpl.java:140) at com.sun.faces.lifecycle.RenderResponsePhase.execute(RenderResponsePhase.java:110) at com.sun.faces.lifecycle.Phase.doPhase(Phase.java:100) a
Re: svn commit: r789392 - in /tomcat/trunk/modules/jdbc-pool: ./ test/org/apache/tomcat/jdbc/test/
On 29/06/2009, sebb wrote: > On 29/06/2009, fha...@apache.org wrote: > > Author: fhanik > > Date: Mon Jun 29 17:38:21 2009 > > New Revision: 789392 > > > > URL: http://svn.apache.org/viewvc?rev=789392&view=rev > > Log: > > Remove all usage of GPL or LGPL downloads. > > > +1, thanks. > > > > Use H2 for test database (EPL1.0) as it can be downloaded and easily > embedded. > > > Why not just leave it to the tester to decide which database to use? > > All they need to do is to provide the JDBC jar, and pass the details > to the build.xml file. > > That way, the build file can be generic, allowing the code to be > tested easily against many different databases if required. > > > > Derby didn't work, too slow to populate test data with. > > > Did you try embedded Derby? Just curious. > > > > Add Javadoc per Sebb's suggestion. > > > The source files need updating too, as the Javadoc there is rather sparse. > > > > Add EPL and CPL to LICENSE since we use it in the unit test cases. > > > Just realised: since H2 is not included with the release artifacts - nor stored in SVN - the EPL should not be included in LICENSE. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47437] better exception message for shutdown
https://issues.apache.org/bugzilla/show_bug.cgi?id=47437 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #1 from Mark Thomas 2009-06-30 05:28:26 PST --- I don't know what you were testing with but it wasn't Tomcat 6.0.20 as that already provides a user friendly error message rather than the exception: D:\apache-tomcat-6.0.20\bin>catalina.bat stop Using CATALINA_BASE: D:\apache-tomcat-6.0.20 Using CATALINA_HOME: D:\apache-tomcat-6.0.20 Using CATALINA_TMPDIR: D:\apache-tomcat-6.0.20\temp Using JRE_HOME:C:\java\jdk1.6.0_14_x64 30-Jun-2009 13:26:59 org.apache.catalina.startup.Catalina stopServer SEVERE: No shutdown port configured in server.xml. Please shut down server through OS signal. Server not shut down by external JVM. -- 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 47458] New: Allow test database settings to be specified in build.properties
https://issues.apache.org/bugzilla/show_bug.cgi?id=47458 Summary: Allow test database settings to be specified in build.properties Product: Tomcat 6 Version: unspecified Platform: PC OS/Version: Windows XP Status: NEW Severity: enhancement Priority: P2 Component: Modules: jdbc-pool AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org Created an attachment (id=23912) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23912) Allow test database settings to be specified in build.properties It would be useful to be able to specifiy the test database settings in build.properties, rather than having to use the Ant command-line (which would get rather long). The attached patch adds properties (testdb.url etc.) to build.properties.default, and then uses these in the JUnit tests. -- 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: r789714 - in /tomcat: container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/ST
Author: rjung
Date: Tue Jun 30 13:26:10 2009
New Revision: 789714
URL: http://svn.apache.org/viewvc?rev=789714&view=rev
Log:
Separate statistics counter lock in FastAsyncSocketSender
from inherited DataSender lock to reduce blocking during
failed node detection.
Backport of http://svn.apache.org/viewvc?rev=759694&view=rev
from OACC to tc5.5.x.
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java?rev=789714&r1=789713&r2=789714&view=diff
==
---
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
Tue Jun 30 13:26:10 2009
@@ -91,6 +91,13 @@
private int threadPriority = Thread.NORM_PRIORITY;;
+/**
+ * Separate mutex for our local state.
+ * We keep the synchronization independent of the synchronization
+ * in the super class DataSender.
+ */
+private Object mutex = new Object();
+
// -
Constructor
/**
@@ -353,7 +360,7 @@
public void sendMessage(ClusterData data)
throws java.io.IOException {
queue.add(data.getUniqueId(), data);
-synchronized (this) {
+synchronized (mutex) {
inQueueCounter++;
if(queueThread != null)
queueThread.incQueuedNrOfBytes(data.getMessage().length);
@@ -455,15 +462,15 @@
return queuedNrOfBytes;
}
-protected synchronized void setQueuedNrOfBytes(long queuedNrOfBytes) {
+protected void setQueuedNrOfBytes(long queuedNrOfBytes) {
this.queuedNrOfBytes = queuedNrOfBytes;
}
-protected synchronized void incQueuedNrOfBytes(long size) {
+protected void incQueuedNrOfBytes(long size) {
queuedNrOfBytes += size;
}
-protected synchronized void decQueuedNrOfBytes(long size) {
+protected void decQueuedNrOfBytes(long size) {
queuedNrOfBytes -= size;
}
@@ -561,8 +568,10 @@
.getKey()), x);
}
} finally {
-outQueueCounter++;
-decQueuedNrOfBytes(messagesize);
+synchronized (sender.mutex) {
+outQueueCounter++;
+decQueuedNrOfBytes(messagesize);
+}
}
entry = entry.next();
} while (keepRunning && entry != null);
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=789714&r1=789713&r2=789714&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jun 30 13:26:10 2009
@@ -195,6 +195,10 @@
+ Separate statistics counter lock in FastAsyncSocketSender from inherited
+ DataSender lock to reduce blocking during failed node detection. (rjung)
+
+
Handle situation session ID rewriting on fail-over with parallel
requests
from the same client. (pero)
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789714&r1=789713&r2=789714&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 13:26:10 2009
@@ -33,17 +33,6 @@
-1: markt (see https://issues.apache.org/bugzilla/show_bug.cgi?id=47308)
kkolinko: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4686717
-* Fix locking in cluster/tcp/FastAsyncSocketSender:
- Locking in DataSender and the sub class FastAsyncSocketSender
- uses the same lock, although the reasons for locking are totally
- independent. This leads to a problem between a node crash
- and the final disappear detection of membership.
- For details see the log messages of r759694.
- Port of http://svn.apache.org/viewvc?rev=759694&view=rev
- from OACC to tc5.5.x.
- +1: rjung, pero, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46384
Use sync when adding and removing members
Note: Untested
svn commit: r789719 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Tue Jun 30 13:29:10 2009 New Revision: 789719 URL: http://svn.apache.org/viewvc?rev=789719&view=rev Log: Revoke proposal. Unfortunately there is no good way to fix this with a general setting. Either each node gets its own traffic, or loose the ability to have multiple nodes per server. So keep as is and live with each node getting its own messages. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789719&r1=789718&r2=789719&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 13:29:10 2009 @@ -25,14 +25,6 @@ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -* Fix use of setLoopbackMode() for tribes multicast. - in container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java - and container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java - Backport of http://svn.apache.org/viewvc?rev=755302&view=rev - +1: rjung, kkolinko - -1: markt (see https://issues.apache.org/bugzilla/show_bug.cgi?id=47308) - kkolinko: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4686717 - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46384 Use sync when adding and removing members Note: Untested - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r789714 - in /tomcat: container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5
On 30/06/2009, rj...@apache.org wrote:
> Author: rjung
> Date: Tue Jun 30 13:26:10 2009
> New Revision: 789714
>
> URL: http://svn.apache.org/viewvc?rev=789714&view=rev
> Log:
> Separate statistics counter lock in FastAsyncSocketSender
> from inherited DataSender lock to reduce blocking during
> failed node detection.
>
> Backport of http://svn.apache.org/viewvc?rev=759694&view=rev
> from OACC to tc5.5.x.
>
> Modified:
>
> tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
> tomcat/container/tc5.5.x/webapps/docs/changelog.xml
> tomcat/current/tc5.5.x/STATUS.txt
>
> Modified:
> tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
> URL:
> http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java?rev=789714&r1=789713&r2=789714&view=diff
>
> ==
> ---
> tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
> (original)
> +++
> tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
> Tue Jun 30 13:26:10 2009
> @@ -91,6 +91,13 @@
>
> private int threadPriority = Thread.NORM_PRIORITY;;
>
> +/**
> + * Separate mutex for our local state.
> + * We keep the synchronization independent of the synchronization
> + * in the super class DataSender.
> + */
> +private Object mutex = new Object();
Should be final as well to indicate that it must never be changed and
to ensure safe publication across threads.
> // -
> Constructor
>
> /**
> @@ -353,7 +360,7 @@
> public void sendMessage(ClusterData data)
> throws java.io.IOException {
> queue.add(data.getUniqueId(), data);
> -synchronized (this) {
> +synchronized (mutex) {
> inQueueCounter++;
> if(queueThread != null)
> queueThread.incQueuedNrOfBytes(data.getMessage().length);
> @@ -455,15 +462,15 @@
> return queuedNrOfBytes;
> }
>
> -protected synchronized void setQueuedNrOfBytes(long
> queuedNrOfBytes) {
> +protected void setQueuedNrOfBytes(long queuedNrOfBytes) {
> this.queuedNrOfBytes = queuedNrOfBytes;
> }
>
> -protected synchronized void incQueuedNrOfBytes(long size) {
> +protected void incQueuedNrOfBytes(long size) {
> queuedNrOfBytes += size;
> }
>
> -protected synchronized void decQueuedNrOfBytes(long size) {
> +protected void decQueuedNrOfBytes(long size) {
> queuedNrOfBytes -= size;
> }
>
> @@ -561,8 +568,10 @@
> .getKey()), x);
> }
> } finally {
> -outQueueCounter++;
> -decQueuedNrOfBytes(messagesize);
> +synchronized (sender.mutex) {
> +outQueueCounter++;
> +decQueuedNrOfBytes(messagesize);
> +}
> }
> entry = entry.next();
> } while (keepRunning && entry != null);
>
> Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=789714&r1=789713&r2=789714&view=diff
>
> ==
> --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
> +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jun 30 13:26:10
> 2009
> @@ -195,6 +195,10 @@
>
>
>
> + Separate statistics counter lock in FastAsyncSocketSender from
> inherited
> + DataSender lock to reduce blocking during failed node detection.
> (rjung)
> +
> +
> Handle situation session ID rewriting on fail-over with parallel
> requests
> from the same client. (pero)
>
>
> Modified: tomcat/current/tc5.5.x/STATUS.txt
> URL:
> http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789714&r1=789713&r2=789714&view=diff
>
> ==
> --- tomcat/current/tc5.5.x/STATUS.txt (original)
> +++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 13:26:10 2009
> @@ -33,17 +33,6 @@
>-1: markt (see https://issues.apache.org/bugzilla/show_bug.cgi?id=47308)
>kkolinko: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4686717
>
> -* Fix locking in cluster/tcp/FastAsyncSocketSender:
> - Locking in DataSender and the sub class FastAsyncSocketSender
> - uses the same lock, although the reasons for l
DO NOT REPLY [Bug 47437] better exception message for shutdown
https://issues.apache.org/bugzilla/show_bug.cgi?id=47437 --- Comment #2 from Michael Isvy 2009-06-30 07:56:22 PST --- Sorry, I used the wrong tomcat instance when doing my testing. This indeed was a 6.0.17. I have just tried on 6.0.20 and it works like a charm as you said. -- 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: r789792 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung
Date: Tue Jun 30 15:21:26 2009
New Revision: 789792
URL: http://svn.apache.org/viewvc?rev=789792&view=rev
Log:
Vote, comment, update proposal.
Modified:
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789792&r1=789791&r2=789792&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 15:21:26 2009
@@ -39,18 +39,18 @@
http://svn.apache.org/viewvc?rev=656751&view=rev (case A fix)
http://svn.apache.org/viewvc?rev=778523&view=rev (prerequisite)
http://svn.apache.org/viewvc?rev=778524&view=rev (case B fix)
- +1: markt, fhanik
+ +1: markt, fhanik, rjung
+1: kkolinko (with additional patches that are proposed below)
-1:
* Additional patches:
http://svn.apache.org/viewvc?rev=784453&view=rev
http://svn.apache.org/viewvc?rev=784602&view=rev
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Make 64-bit binaries/installer available for 5.5.x as well as 6.0.x
http://svn.apache.org/viewvc?rev=777624&view=rev
- +1: markt, fhanik
+ +1: markt, fhanik, rjung
+1: kkolinko (good,
but it won't work without rev=783934 patch that I am proposing below,
because some files were deleted in
@@ -62,7 +62,7 @@
Discussion: http://markmail.org/message/nhkrskh6bwyirwru
It is amendment to the rev=777624 patch proposed above.
http://svn.apache.org/viewvc?rev=783934&view=rev
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37084
@@ -78,11 +78,19 @@
http://svn.apache.org/viewvc?rev=786487&view=rev
+1: markt
-1:
+ rjung: +1 in principle, but a few questions/suggestions:
+ - Do we need to dechunk the read request body? I didn't see were this
happens.
+ - Do chunked requests actually set a content-length? If not, we have len
== -1
+and will not enter the try/catch block. Maybe only a question of
correct backport
+from trunk.
+ - I think instead of: len == actualLen => non-chunked, else check
transfer-encoding
+it should be the other waqy round. If transfer-encoding is chunked,
handle as chunked,
+else traditional.
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38352
JSPs should have read/write access to the context's temp dir
http://svn.apache.org/viewvc?rev=786490&view=rev
- +1: markt
+ +1: markt, rjung
-1:
* Update to Apache Commons Pool 1.5.1
@@ -90,7 +98,7 @@
occur fair - ie objects are allocated to threads in the order that the
threads
request them. Fixes a number of issues in DBCP.
http://svn.apache.org/viewvc?rev=786496&view=rev
- +1: markt, kkolinko
+ +1: markt, kkolinko, rjung
-1:
kkolinko: (
Note: The 'Fix download task check' patch (rev.787999) that I propose
below
@@ -101,33 +109,28 @@
* Fix Java 5 dependency Boolean.parseBoolean() (regression)
Introduced in fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=45996
http://svn.apache.org/viewvc?rev=781546&view=rev
- Patch:
http://people.apache.org/~rjung/patches/2009-06-24-bug45996-regression.patch
- +1: rjung, markt
- +1: kkolinko (
-good, can go on with it
-though it is inconsistent with the code for other boolean options in
the same class.
-I think that
- Boolean.valueOf(str).booleanValue()
-should work in 1.4.
- )
+ Patch:
http://people.apache.org/~rjung/patches/2009-06-30-bug45996-regression.patch
+ updated from a previous proposal based on the comments of Konstantin.
+ mark and konstatin: please vote again.
+ +1: rjung
-1:
* Fix build paths for embed target in build/build.xml
http://people.apache.org/~kkolinko/patches/2009-06-24_tc55_build-paths-embed.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Fix download task check for commons-pool and commons-dbcp.
Backport of http://svn.apache.org/viewvc?rev=787999&view=rev
TC 5.5 specific patch is:
http://people.apache.org/~kkolinko/patches/2009-06-24_tc55_rev787999backport.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Use different (not the same) values for ${tomcat-dbcp.home} and
${jasper-compiler-jdt.home}.
In TC 6.0 they are already different, but were not in 5.5.
http://people.apache.org/~kkolinko/patches/2009-06-24_tc55_deps-home.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Make access log valves thread safe
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789794 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
Author: rjung
Date: Tue Jun 30 15:24:01 2009
New Revision: 789794
URL: http://svn.apache.org/viewvc?rev=789794&view=rev
Log:
Remove trailing whitespace - no functional change.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java?rev=789794&r1=789793&r2=789794&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
Tue Jun 30 15:24:01 2009
@@ -74,7 +74,7 @@
* recover timeout ( default 5 secs)
*/
private long recoverTimeout = 5000;
-
+
/**
* number of recover tries
*/
@@ -113,7 +113,7 @@
super(domain,host, port);
checkThread();
}
-
+
// - Properties
/**
@@ -126,14 +126,14 @@
return (info);
}
-
+
/**
* get current add wait timeout
* @return current wait timeout
*/
public long getQueueAddWaitTimeout() {
-
+
return queue.getAddWaitTimeout();
}
@@ -197,7 +197,7 @@
public void setQueueTimeWait(boolean timeWait) {
queue.setTimeWait(timeWait);
}
-
+
/**
* @return Returns the inQueueCounter.
*/
@@ -252,7 +252,7 @@
* @return current push message recover timeout
*/
public long getRecoverTimeout() {
-
+
return recoverTimeout;
}
@@ -269,7 +269,7 @@
* @return current push message recover counter
*/
public int getRecoverCounter() {
-
+
return recoverCounter;
}
@@ -422,7 +422,7 @@
private class FastQueueThread extends Thread {
-
+
/**
* Sender queue
*/
@@ -443,7 +443,7 @@
*/
private long queuedNrOfBytes = 0;
-
+
/**
* Only use inside FastAsyncSocketSender
@@ -455,14 +455,14 @@
this.queue = queue;
this.sender = sender;
}
-
+
/**
* @return Returns the queuedNrOfBytes.
*/
public long getQueuedNrOfBytes() {
return queuedNrOfBytes;
}
-
+
protected void setQueuedNrOfBytes(long queuedNrOfBytes) {
this.queuedNrOfBytes = queuedNrOfBytes;
}
@@ -470,7 +470,7 @@
protected void incQueuedNrOfBytes(long size) {
queuedNrOfBytes += size;
}
-
+
protected void decQueuedNrOfBytes(long size) {
queuedNrOfBytes -= size;
}
@@ -482,8 +482,8 @@
public void stopRunning() {
keepRunning = false;
}
-
-
+
+
/**
* Get the objects from queue and send all mesages to the sender.
* @see java.lang.Runnable#run()
@@ -557,7 +557,7 @@
counter++;
}
} while (keepRunning && !success && counter <=
rCounter);
-
+
if(!success) {
log.warn(sm.getString(
"AsyncSocketSender.send.error", entry
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789798 - in /tomcat/sandbox/tomcat-oacc/trunk: build.properties.default docs/changelog.xml
Author: rjung Date: Tue Jun 30 15:32:03 2009 New Revision: 789798 URL: http://svn.apache.org/viewvc?rev=789798&view=rev Log: Choose a better version for OACC. Modified: tomcat/sandbox/tomcat-oacc/trunk/build.properties.default tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Modified: tomcat/sandbox/tomcat-oacc/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.properties.default?rev=789798&r1=789797&r2=789798&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/build.properties.default (original) +++ tomcat/sandbox/tomcat-oacc/trunk/build.properties.default Tue Jun 30 15:32:03 2009 @@ -48,7 +48,7 @@ compile.target=1.5 compile.debug=true -version=6.0.19-dev +version=0.1-dev oacc.output=output oacc.build=output/build Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=789798&r1=789797&r2=789798&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Jun 30 15:32:03 2009 @@ -29,7 +29,7 @@ - + @@ -59,8 +59,8 @@ Backport from Tomcat 6.0. (rjung) - New Membership service (org.apache.catalina.cluster.membership.McastService) - to better control tomcat cluster node start and stop (pero) +New Membership service (org.apache.catalina.cluster.membership.McastService) +to better control tomcat cluster node start and stop (pero) Porting the junit testcases (pero) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789800 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster: mcast/McastServiceImpl.java membership/McastServiceImpl.java
Author: rjung
Date: Tue Jun 30 15:36:21 2009
New Revision: 789800
URL: http://svn.apache.org/viewvc?rev=789800&view=rev
Log:
Tab and trailing whitespace police - no functional change.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java?rev=789800&r1=789799&r2=789800&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
Tue Jun 30 15:36:21 2009
@@ -102,7 +102,7 @@
* When was the service started
*/
protected long serviceStartTime = System.currentTimeMillis();
-
+
protected int mcastTTL = -1;
protected int mcastSoTimeout = -1;
protected InetAddress mcastBindAddress = null;
@@ -111,17 +111,17 @@
* nr of times the system has to fail before a recovery is initiated
*/
protected int recoveryCounter = 10;
-
+
/**
* The time the recovery thread sleeps between recovery attempts
*/
protected long recoverySleepTime = 5000;
-
+
/**
* Add the ability to turn on/off recovery
*/
protected boolean recoveryEnabled = true;
-
+
/**
* Create a new mcast service impl
* @param member - the local member
@@ -166,11 +166,11 @@
receivePacket.setPort(port);
if(membership == null) membership = new
McastMembership(member.getName());
}
-
+
protected void setupSocket() throws IOException {
if (mcastBindAddress != null) {
try {
- if(log.isInfoEnabled())
+if(log.isInfoEnabled())
log.info("Attempting to bind the multicast socket to
"+address+":"+port);
socket = new MulticastSocket(new
InetSocketAddress(address,port));
} catch (BindException e) {
@@ -187,7 +187,7 @@
}
socket.setLoopbackMode(false); //hint that we don't need loop back
messages
if (mcastBindAddress != null) {
- if(log.isInfoEnabled())
+if(log.isInfoEnabled())
log.info("Setting multihome multicast interface to:" +
mcastBindAddress);
socket.setInterface(mcastBindAddress);
@@ -198,7 +198,7 @@
log.info("Setting cluster mcast soTimeout to "+mcastSoTimeout);
socket.setSoTimeout(mcastSoTimeout);
if ( mcastTTL >= 0 ) {
- if(log.isInfoEnabled())
+if(log.isInfoEnabled())
log.info("Setting cluster mcast TTL to " + mcastTTL);
socket.setTimeToLive(mcastTTL);
}
@@ -224,7 +224,7 @@
sender = new SenderThread(sendFrequency);
sender.setDaemon(true);
sender.start();
-
+
}
}
@@ -332,14 +332,14 @@
public void setRecoverySleepTime(long recoverySleepTime) {
this.recoverySleepTime = recoverySleepTime;
}
-
+
public class ReceiverThread extends Thread {
-
+
public ReceiverThread() {
super();
setName("Cluster-MembershipReceiver");
}
-
+
public void run() {
int errorCounter = 0 ;
while ( doRun ) {
@@ -347,7 +347,7 @@
receive();
errorCounter = 0;
} catch ( Exception x ) {
-if (errorCounter==0) {
+if (errorCounter==0) {
if(! (x instanceof SocketTimeoutException))
log.warn("Error receiving mcast package
(errorCounter=" +errorCounter+ "). Sleeping " +sendFrequency + " ms",x);
} else {
@@ -364,22 +364,22 @@
}
}
log.warn("Receiver Thread ends with errorCounter=" +errorCounter+
".");
-
+
}
}
public class SenderThread extends Thread {
-
+
long time;
-
+
McastServiceImpl service ;
-
+
public SenderThread(long time) {
this.time = time;
setName("Cluster-MembershipSender");
}
-
+
public void run() {
int errorCounter = 0 ;
while ( doRun ) {
@@ -402,20 +402,20 @@
try { Thread.sleep(time); } catch ( Exception ignore ) {}
}
log.warn("Sender Thread ends with errorCounter=
svn commit: r789802 - /tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
Author: rjung Date: Tue Jun 30 15:42:41 2009 New Revision: 789802 URL: http://svn.apache.org/viewvc?rev=789802&view=rev Log: Update changelog: - Remove Loopback mode fix for multicast - Add locking improvement for FastAsyncSocketSender Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=789802&r1=789801&r2=789802&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Jun 30 15:42:41 2009 @@ -33,7 +33,8 @@ -Fix not wanting to receive node local heartbeat on multicast socket. (rjung) +Separate statistics counter lock in FastAsyncSocketSender from inherited +DataSender lock to reduce blocking during failed node detection. (rjung) 43641: Fix setting multicast bind address on multihomed computers. (rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789803 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
Author: rjung Date: Tue Jun 30 15:43:36 2009 New Revision: 789803 URL: http://svn.apache.org/viewvc?rev=789803&view=rev Log: Make new internal mutex lock object final. Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java?rev=789803&r1=789802&r2=789803&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java Tue Jun 30 15:43:36 2009 @@ -97,7 +97,7 @@ * We keep the synchronization independent of the synchronization * in the super class DataSender. */ -private Object mutex = new Object(); +private final Object mutex = new Object(); // - Constructor - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789805 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Tue Jun 30 15:49:44 2009 New Revision: 789805 URL: http://svn.apache.org/viewvc?rev=789805&view=rev Log: Add proposal. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789805&r1=789804&r2=789805&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 15:49:44 2009 @@ -144,3 +144,11 @@ http://people.apache.org/~kkolinko/patches/2009-06-30_tc55_EALV.patch +1: kkolinko -1: + +* Make new mutex lock in cluster/tcp/FastAsyncSocketSender final as + suggested by sebb. + Improvement of http://svn.apache.org/viewvc?rev=789714&view=rev + Port of http://svn.apache.org/viewvc?rev=789803&view=rev from OACC to tc5.5.x. + +1: rjung + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: 5.5 release time frame
On 24.06.2009 18:28, Filip Hanik - Dev Lists wrote: > what do you guys wanna do? Get through STATUS as it is today, then issue > a release? I went through STATUS and voted. There are now a couple of proposals having the needed +1s. I plan to also vote on the two access log patches, but need to check them more carefully. I updated one of my own proposals due to a comment of Konstantin. The proposal was already voted +1 by Mark and Konstantin, they might want to review the updated one. Finally I also added a very simple proposal making a new mutex final as suggested by Sebastian. If we get the votes for the access log valves, we are down to only a handful of open proposals that do not have enough votes. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r789714 - in /tomcat: container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5
On 30.06.2009 15:29, sebb wrote: > On 30/06/2009, rj...@apache.org wrote: >> Author: rjung >> Date: Tue Jun 30 13:26:10 2009 >> New Revision: 789714 >> >> URL: http://svn.apache.org/viewvc?rev=789714&view=rev >> Log: >> Separate statistics counter lock in FastAsyncSocketSender >> from inherited DataSender lock to reduce blocking during >> failed node detection. >> >> Backport of http://svn.apache.org/viewvc?rev=759694&view=rev >> from OACC to tc5.5.x. >> +private Object mutex = new Object(); > > Should be final as well to indicate that it must never be changed and > to ensure safe publication across threads. Thanks, +1. Proposed in STATUS file. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789815 - in /tomcat/tc6.0.x/trunk: ./ java/javax/el/ java/javax/persistence/ java/javax/servlet/ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/h
Author: rjung Date: Tue Jun 30 16:10:09 2009 New Revision: 789815 URL: http://svn.apache.org/viewvc?rev=789815&view=rev Log: Add missing svn properties - no functional change. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings_es.properties (props changed) tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContextType.java (props changed) tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceProperty.java (props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/LocalStrings_es.properties (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextHandler.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/LocalStrings_es.properties (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java (contents, props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/JspHelper.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/util/SessionUtils.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/LocalStrings_es.properties (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java (contents, props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/WebdavFixValve.java (contents, props changed) tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties (props changed) tomcat/tc6.0.x/trunk/java/org/apache/el/Messages_es.properties (props changed) tomcat/tc6.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/naming/HandlerRef.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/naming/ServiceRef.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java (contents, props changed) tomcat/tc6.0.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SocketProperties.java (props changed) tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java (props changed) tomcat/tc6.0.x/trunk/res/META-INF/LICENSE (contents, props changed) tomcat/tc6.0.x/trunk/res/META-INF/NOTICE (contents, props changed) tomcat/tc6.0.x/trunk/res/jsp-api.jar.manifest (props changed) tomcat/tc6.0.x/trunk/res/servlet-api.jar.manifest (props changed) tomcat/tc6.0.x/trunk/test/org/apache/catalina/ha/session/TestPrincipal.java (props changed) tomcat/tc6.0.x/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java (props changed) tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/TestCookies.java (props changed) tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java (props changed) tomcat/tc6.0.x/trunk/webapps/manager/401.jsp (props changed) to
svn commit: r789821 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaManager.java
Author: rjung
Date: Tue Jun 30 16:38:07 2009
New Revision: 789821
URL: http://svn.apache.org/viewvc?rev=789821&view=rev
Log:
Fix BZ47389: DeltaManager doesn't do session replication if
notifySessionListenersOnReplication=false.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=789821&r1=789820&r2=789821&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Jun 30 16:38:07 2009
@@ -33,6 +33,10 @@
+47389: DeltaManager doesn't do session replication if
+notifySessionListenersOnReplication=false. (fhanik, rjung)
+
+
Separate statistics counter lock in FastAsyncSocketSender from
inherited
DataSender lock to reduce blocking during failed node detection.
(rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=789821&r1=789820&r2=789821&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Tue Jun 30 16:38:07 2009
@@ -1665,10 +1665,12 @@
session.setMaxInactiveInterval(getMaxInactiveInterval());
session.setExpireTolerance(this.expireTolerance);
session.access();
-if(notifySessionListenersOnReplication)
+if(notifySessionListenersOnReplication) {
session.setId(msg.getSessionID());
-else
+} else {
session.setIdInternal(msg.getSessionID());
+add(session);
+}
session.resetDeltaRequest();
session.endAccess();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789822 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Tue Jun 30 16:42:30 2009 New Revision: 789822 URL: http://svn.apache.org/viewvc?rev=789822&view=rev Log: Add some 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=789822&r1=789821&r2=789822&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 30 16:42:30 2009 @@ -100,17 +100,17 @@ ) Discussion: http://markmail.org/message/nhkrskh6bwyirwru http://svn.apache.org/viewvc?rev=783934&view=rev - +1: kkolinko, markt, fhanik + +1: kkolinko, markt, fhanik, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47369. http://svn.apache.org/viewvc?rev=784879&view=rev - +1: fhanik, markt, mturk + +1: fhanik, markt, mturk, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47389 http://svn.apache.org/viewvc?rev=786124&view=rev - +1: fhanik, markt, mturk + +1: fhanik, markt, mturk, rjung -1: * Update release process to include new windows package zip files @@ -118,7 +118,7 @@ and fixes nsi installer script. Patch for 6.0.x is available at: http://people.apache.org/~mturk/tomcat/tomcat6-package-winzip-2.patch - +1: mturk, kkolinko + +1: mturk, kkolinko, rjung -1: * When throwing Non-serializable exception, mark which argument was @@ -141,12 +141,12 @@ to align with the values used by Jasper at runtime (EmbeddedServletOptions). Tomcat 6 requires an 1.5 or later JRE to run. http://people.apache.org/~kkolinko/patches/2009-06-24_JspC_targetVM.patch - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Trivial: Do not evaluate the same string twice http://svn.apache.org/viewvc?rev=787985&view=rev - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789823 - /tomcat/current/tc5.5.x/STATUS.txt
Author: kkolinko Date: Tue Jun 30 16:44:35 2009 New Revision: 789823 URL: http://svn.apache.org/viewvc?rev=789823&view=rev Log: votes Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789823&r1=789822&r2=789823&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 16:44:35 2009 @@ -70,7 +70,6 @@ Port of fix for 46471 that also fixes this JspC compilation issue +1: markt, kkolinko -1: - kkolinko: attachment.cgi?id=23860 had a bug, 23861 should be used instead. * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37794 Handle chunked POSTs. If maxPostSize is exceeded, a 500 results @@ -112,7 +111,7 @@ Patch: http://people.apache.org/~rjung/patches/2009-06-30-bug45996-regression.patch updated from a previous proposal based on the comments of Konstantin. mark and konstatin: please vote again. - +1: rjung + +1: rjung, kkolinko -1: * Fix build paths for embed target in build/build.xml @@ -149,6 +148,6 @@ suggested by sebb. Improvement of http://svn.apache.org/viewvc?rev=789714&view=rev Port of http://svn.apache.org/viewvc?rev=789803&view=rev from OACC to tc5.5.x. - +1: rjung + +1: rjung, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789826 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/mcast/McastMembership.java src/share/org/apache/catalina/cluster/membership/McastMe
Author: rjung
Date: Tue Jun 30 16:52:32 2009
New Revision: 789826
URL: http://svn.apache.org/viewvc?rev=789826&view=rev
Log:
BZ 46990: Improve locking in membership.
Backport of r771009 from TC 6.0.x.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMembership.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=789826&r1=789825&r2=789826&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Jun 30 16:52:32 2009
@@ -33,6 +33,10 @@
+46990: Improve locking in membership.
+Backport from Tomcat 6.0. (rjung)
+
+
47389: DeltaManager doesn't do session replication if
notifySessionListenersOnReplication=false. (fhanik, rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMembership.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMembership.java?rev=789826&r1=789825&r2=789826&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMembership.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMembership.java
Tue Jun 30 16:52:32 2009
@@ -38,6 +38,8 @@
{
protected static final McastMember[] EMPTY_MEMBERS = new McastMember[0];
+private final Object membersLock = new Object();
+
/**
* The name of this membership, has to be the same as the name for the
local
* member
@@ -113,7 +115,7 @@
* @param member The member to add
*/
protected void addMcastMember(McastMember member) {
- synchronized (members) {
+ synchronized (membersLock) {
McastMember results[] =
new McastMember[members.length + 1];
for (int i = 0; i < members.length; i++)
@@ -130,7 +132,7 @@
* @param member The member to remove
*/
protected void removeMcastMember(McastMember member) {
-synchronized (members) {
+synchronized (membersLock) {
int n = -1;
for (int i = 0; i < members.length; i++) {
if (members[i] == member) {
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java?rev=789826&r1=789825&r2=789826&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java
Tue Jun 30 16:52:32 2009
@@ -38,6 +38,8 @@
{
protected static final McastMember[] EMPTY_MEMBERS = new McastMember[0];
+private final Object membersLock = new Object();
+
/**
* The name of this membership, has to be the same as the name for the
local
* member
@@ -113,7 +115,7 @@
* @param member The member to add
*/
protected void addMcastMember(McastMember member) {
- synchronized (members) {
+ synchronized (membersLock) {
McastMember results[] =
new McastMember[members.length + 1];
for (int i = 0; i < members.length; i++)
@@ -130,7 +132,7 @@
* @param member The member to remove
*/
protected void removeMcastMember(McastMember member) {
-synchronized (members) {
+synchronized (membersLock) {
int n = -1;
for (int i = 0; i < members.length; i++) {
if (members[i] == member) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789832 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ src/share/org/apache/catalina/cluster/ src/share/org/apache/catalina/cluster/mcast/ src/share/org/apache/catalina/cluster/membership/
Author: rjung
Date: Tue Jun 30 17:12:12 2009
New Revision: 789832
URL: http://svn.apache.org/viewvc?rev=789832&view=rev
Log:
BZ 45447: Add spanish message translations.
Backport of r698924 form TC 6.0.x.
Added:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_es.properties
(with props)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/LocalStrings_es.properties
(with props)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/LocalStrings_es.properties
(with props)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings_es.properties
(with props)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/LocalStrings_es.properties
(with props)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=789832&r1=789831&r2=789832&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Jun 30 17:12:12 2009
@@ -32,6 +32,10 @@
+
+45447: Add spanish message translations.
+Backport from Tomcat 6.0. (rjung)
+
46990: Improve locking in membership.
Backport from Tomcat 6.0. (rjung)
Added:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_es.properties?rev=789832&view=auto
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_es.properties
(added)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_es.properties
Tue Jun 30 17:12:12 2009
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cluster.mbean.register.already = \u00A1El MBean {0} ya est\u00E1 registrado\!
Propchange:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_es.properties
--
svn:eol-style = native
Propchange:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_es.properties
--
svn:keywords = Author Date Id Revision
Added:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/LocalStrings_es.properties?rev=789832&view=auto
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/LocalStrings_es.properties
(added)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/LocalStrings_es.properties
Tue Jun 30 17:12:12 2009
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cluster.mbean.register.already = \u00A1El MBean {0} ya est\u00E1 registrado\!
Propchange:
svn commit: r789836 - in /tomcat: build/tc5.5.x/build.xml container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Author: kkolinko
Date: Tue Jun 30 17:23:54 2009
New Revision: 789836
URL: http://svn.apache.org/viewvc?rev=789836&view=rev
Log:
Use different (not the same) values for ${tomcat-dbcp.home} and
${jasper-compiler-jdt.home}.
In TC 6.0 they are already different, but were not in 5.5.
Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=789836&r1=789835&r2=789836&view=diff
==
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jun 30 17:23:54 2009
@@ -76,10 +76,10 @@
-
+
-
+
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=789836&r1=789835&r2=789836&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jun 30 17:23:54 2009
@@ -42,6 +42,10 @@
Update to NSIS 2.44 (kkolinko)
+
+Build scripts: use different values for ${tomcat-dbcp.home} and
+${jasper-compiler-jdt.home} in tomcat-deps. (kkolinko)
+
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789836&r1=789835&r2=789836&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 17:23:54 2009
@@ -126,12 +126,6 @@
+1: kkolinko, markt, rjung
-1:
-* Use different (not the same) values for ${tomcat-dbcp.home} and
${jasper-compiler-jdt.home}.
- In TC 6.0 they are already different, but were not in 5.5.
- http://people.apache.org/~kkolinko/patches/2009-06-24_tc55_deps-home.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Make access log valves thread safe
http://people.apache.org/~markt/patches/2009-06-25-AccessLogValve-tc5.patch
+1: markt
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789837 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java src/share/org/apache/catalina/cluster/membership/McastS
Author: rjung
Date: Tue Jun 30 17:27:01 2009
New Revision: 789837
URL: http://svn.apache.org/viewvc?rev=789837&view=rev
Log:
BZ 45279: Fix socket when closing multicast.
Backport of r672888 from Tomcat 6.0.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=789837&r1=789836&r2=789837&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Jun 30 17:27:01 2009
@@ -32,6 +32,10 @@
+
+45279: Fix socket when closing multicast.
+Backport from Tomcat 6.0. (rjung)
+
45447: Add spanish message translations.
Backport from Tomcat 6.0. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java?rev=789837&r1=789836&r2=789837&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
Tue Jun 30 17:27:01 2009
@@ -243,6 +243,7 @@
if(receiver!= null) receiver.interrupt() ;
receiver = null;
serviceStartTime = Long.MAX_VALUE;
+socket.close();
}
}
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java?rev=789837&r1=789836&r2=789837&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
Tue Jun 30 17:27:01 2009
@@ -280,6 +280,7 @@
}
//leave mcast group
try {socket.leaveGroup(address);}catch ( Exception ignore){}
+ try {socket.close();}catch ( Exception ignore){}
serviceStartTime = Long.MAX_VALUE;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789842 - in /tomcat: build/tc5.5.x/build.xml container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Author: kkolinko
Date: Tue Jun 30 17:38:59 2009
New Revision: 789842
URL: http://svn.apache.org/viewvc?rev=789842&view=rev
Log:
Fix download task check for commons-pool and commons-dbcp.
Without this patch the 'ant download' call does not download
the updated commons-pool or commons-dbcp version,
like the recent update of commons-pool 1.4 -> 1.5.1,
unless you run 'ant clean-depend' or delete existing ${tomcat-dbcp.jar} file
before that.
It is backport of rev.787999
Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=789842&r1=789841&r2=789842&view=diff
==
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jun 30 17:38:59 2009
@@ -679,11 +679,11 @@
-->
-
+
-
+
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=789842&r1=789841&r2=789842&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jun 30 17:38:59 2009
@@ -43,8 +43,9 @@
Update to NSIS 2.44 (kkolinko)
-Build scripts: use different values for ${tomcat-dbcp.home} and
-${jasper-compiler-jdt.home} in tomcat-deps. (kkolinko)
+Build scripts: Use different values for ${tomcat-dbcp.home} and
+${jasper-compiler-jdt.home} in tomcat-deps. Fix download task
+checks for commons-pool and commons-dbcp. (kkolinko)
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789842&r1=789841&r2=789842&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 17:38:59 2009
@@ -99,11 +99,6 @@
http://svn.apache.org/viewvc?rev=786496&view=rev
+1: markt, kkolinko, rjung
-1:
- kkolinko: (
- Note: The 'Fix download task check' patch (rev.787999) that I propose
below
- is needed for 'ant download' to download updated library, unless
- you run 'ant clean-depend' before building.
- )
* Fix Java 5 dependency Boolean.parseBoolean() (regression)
Introduced in fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=45996
@@ -119,13 +114,6 @@
+1: kkolinko, markt, rjung
-1:
-* Fix download task check for commons-pool and commons-dbcp.
- Backport of http://svn.apache.org/viewvc?rev=787999&view=rev
- TC 5.5 specific patch is:
-
http://people.apache.org/~kkolinko/patches/2009-06-24_tc55_rev787999backport.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Make access log valves thread safe
http://people.apache.org/~markt/patches/2009-06-25-AccessLogValve-tc5.patch
+1: markt
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789849 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/TagFileProcessor.java
Author: kkolinko
Date: Tue Jun 30 17:49:21 2009
New Revision: 789849
URL: http://svn.apache.org/viewvc?rev=789849&view=rev
Log:
Do not evaluate the same string twice
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/TagFileProcessor.java
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 17:49:21 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,753039,757335,757774,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,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,753039,757335,757774,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,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=789849&r1=789848&r2=789849&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 30 17:49:21 2009
@@ -144,11 +144,6 @@
+1: kkolinko, markt, rjung
-1:
-* Trivial: Do not evaluate the same string twice
- http://svn.apache.org/viewvc?rev=787985&view=rev
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158
Update AccessLogValve with all the recent threading improvements
http://people.apache.org/~markt/patches/2009-06-24-AccessLogValve-tc6.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=789849&r1=789848&r2=789849&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
Tue Jun 30 17:49:21 2009
@@ -583,14 +583,15 @@
JspCompilationContext ctxt = compiler.getCompilationContext();
JspRuntimeContext rctxt = ctxt.getRuntimeContext();
-JspServletWrapper wrapper = rctxt.getWrapper(tagFileJarPath +
tagFilePath);
+String wrapperUri = tagFileJarPath + tagFilePath;
+JspServletWrapper wrapper = rctxt.getWrapper(wrapperUri);
synchronized (rctxt) {
if (wrapper == null) {
wrapper = new JspServletWrapper(ctxt.getServletContext(), ctxt
.getOptions(), tagFilePath, tagInfo, ctxt
.getRuntimeContext(), tagFileJarUrl);
-rctxt.addWrapper(tagFileJarPath + tagFilePath, wrapper);
+rctxt.addWrapper(wrapperUri, wrapper);
svn commit: r789854 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Jun 30 18:02:50 2009 New Revision: 789854 URL: http://svn.apache.org/viewvc?rev=789854&view=rev Log: comment 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=789854&r1=789853&r2=789854&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 30 18:02:50 2009 @@ -102,6 +102,9 @@ http://svn.apache.org/viewvc?rev=783934&view=rev +1: kkolinko, markt, fhanik, rjung -1: + kkolinko: We have +1 votes here, but I am not applying it, because + mturk's one (tomcat6-package-winzip-2.patch) also fixes this issue + and provides more value. * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47369. http://svn.apache.org/viewvc?rev=784879&view=rev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789845 - in /tomcat: build/tc5.5.x/build.xml current/tc5.5.x/STATUS.txt
Author: kkolinko Date: Tue Jun 30 17:42:09 2009 New Revision: 789845 URL: http://svn.apache.org/viewvc?rev=789845&view=rev Log: Fix build paths for embed target in build/build.xml Modified: tomcat/build/tc5.5.x/build.xml tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/build/tc5.5.x/build.xml URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=789845&r1=789844&r2=789845&view=diff == --- tomcat/build/tc5.5.x/build.xml (original) +++ tomcat/build/tc5.5.x/build.xml Tue Jun 30 17:42:09 2009 @@ -925,12 +925,12 @@ - - + + - - + + @@ -939,13 +939,13 @@ - - + + - + @@ -953,16 +953,16 @@ - - + + @@ -971,24 +971,24 @@ - - + + - + - - - - + + + + @@ -997,14 +997,14 @@ --> - + - - - + + + - - + + Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789845&r1=789844&r2=789845&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 17:42:09 2009 @@ -109,11 +109,6 @@ +1: rjung, kkolinko -1: -* Fix build paths for embed target in build/build.xml - http://people.apache.org/~kkolinko/patches/2009-06-24_tc55_build-paths-embed.patch - +1: kkolinko, markt, rjung - -1: - * Make access log valves thread safe http://people.apache.org/~markt/patches/2009-06-25-AccessLogValve-tc5.patch +1: markt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789865 - /tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Author: markt
Date: Tue Jun 30 18:30:45 2009
New Revision: 789865
URL: http://svn.apache.org/viewvc?rev=789865&view=rev
Log:
Use statics to reduce number of instances to one per thread rather than one per
thread per access log.
Also make thread local final as per discussion on dev list.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=789865&r1=789864&r2=789865&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Tue Jun 30
18:30:45 2009
@@ -248,7 +248,7 @@
* is true.
*/
protected File currentLogFile = null;
-private class AccessDateStruct {
+private static class AccessDateStruct {
private Date currentDate = new Date();
private String currentDateString = null;
private SimpleDateFormat dayFormatter = new SimpleDateFormat("dd");
@@ -256,10 +256,11 @@
private SimpleDateFormat yearFormatter = new SimpleDateFormat("");
private SimpleDateFormat timeFormatter = new
SimpleDateFormat("HH:mm:ss");
public AccessDateStruct() {
-dayFormatter.setTimeZone(timezone);
-monthFormatter.setTimeZone(timezone);
-yearFormatter.setTimeZone(timezone);
-timeFormatter.setTimeZone(timezone);
+TimeZone tz = TimeZone.getDefault();
+dayFormatter.setTimeZone(tz);
+monthFormatter.setTimeZone(tz);
+yearFormatter.setTimeZone(tz);
+timeFormatter.setTimeZone(tz);
}
}
@@ -267,7 +268,8 @@
* The system time when we last updated the Date that this valve
* uses for log lines.
*/
-private ThreadLocal currentDateStruct = new
ThreadLocal() {
+private static final ThreadLocal currentDateStruct =
+new ThreadLocal() {
protected AccessDateStruct initialValue() {
return new AccessDateStruct();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789867 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ src/share/org/apache/catalina/cluster/session/ src/share/org/apache/catalina/cluster/tcp/
Author: rjung
Date: Tue Jun 30 18:31:20 2009
New Revision: 789867
URL: http://svn.apache.org/viewvc?rev=789867&view=rev
Log:
Fix BZ 42662: Classloader issue for replicated sessions and dynamic proxies.
Backport of r656701 from Tomcat 6.0.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicationStream.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=789867&r1=789866&r2=789867&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Jun 30 18:31:20 2009
@@ -33,6 +33,10 @@
+42662: Classloader issue for replicated sessions and
dynamic proxies.
+Backport from Tomcat 6.0. (rjung)
+
+
45279: Fix socket when closing multicast.
Backport from Tomcat 6.0. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=789867&r1=789866&r2=789867&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Tue Jun 30 18:31:20 2009
@@ -723,7 +723,7 @@
ReplicationStream ois = null;
Loader loader = null;
fis = new ByteArrayInputStream(data);
-ois = new ReplicationStream(fis, getClassLoaders(this.container)[0]);
+ois = new ReplicationStream(fis, getClassLoaders(this.container));
session.getDeltaRequest().readExternal(ois);
ois.close();
return session.getDeltaRequest();
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicationStream.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicationStream.java?rev=789867&r1=789866&r2=789867&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicationStream.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicationStream.java
Tue Jun 30 18:31:20 2009
@@ -22,6 +22,8 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
/**
* Custom subclass of ObjectInputStream that loads from the
@@ -39,7 +41,7 @@
/**
* The class loader we will use to resolve classes.
*/
-private ClassLoader classLoader = null;
+private ClassLoader[] classLoaders = null;
/**
* Construct a new instance of CustomObjectInputStream
@@ -50,11 +52,11 @@
* @exception IOException if an input/output error occurs
*/
public ReplicationStream(InputStream stream,
- ClassLoader classLoader)
+ ClassLoader[] classLoaders)
throws IOException {
super(stream);
-this.classLoader = classLoader;
+this.classLoaders = classLoaders;
}
/**
@@ -69,31 +71,92 @@
public Class resolveClass(ObjectStreamClass classDesc)
throws ClassNotFoundException, IOException {
String name = classDesc.getName();
-boolean tryRepFirst = name.startsWith("org.apache.catalina.cluster");
try {
-try
-{
-if ( tryRepFirst ) return findReplicationClass(name);
-else return findWebappClass(name);
-}
-catch ( Exception x )
-{
-if ( tryRepFirst ) return findWebappClass(name);
-else return findReplicationClass(name);
-}
+return resolveClass(name);
} catch (ClassNotFoundException e) {
return super.resolveClass(classDesc);
}
}
-public Class findReplicationClass(String name)
+public Class resolveClass(String name)
throws ClassNotFoundException, IOException {
-return Class.forName(name, false, getClass().getClas
svn commit: r789869 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership: Constants.java LocalStrings.properties McastMember.java McastMembership.java McastService.j
Author: rjung
Date: Tue Jun 30 18:40:05 2009
New Revision: 789869
URL: http://svn.apache.org/viewvc?rev=789869&view=rev
Log:
Fix missing svn properties (keywords).
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/Constants.java
(contents, props changed)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/LocalStrings.properties
(props changed)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java
(contents, props changed)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java
(contents, props changed)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java
(contents, props changed)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
(contents, props changed)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/mbeans-descriptors.xml
(props changed)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/Constants.java?rev=789869&r1=789868&r2=789869&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/Constants.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/Constants.java
Tue Jun 30 18:40:05 2009
@@ -23,7 +23,7 @@
* package.
*
* @author Peter Rossbach
- * @version $Revision: 466608 $ $Date: 2006-10-22 01:10:15 +0200 (Sun, 22 Oct
2006) $
+ * @version $Revision$ $Date$
*/
public class Constants {
Propchange:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/Constants.java
--
svn:keywords = Author Date Id Revision
Propchange:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/LocalStrings.properties
--
svn:keywords = Author Date Id Revision
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java?rev=789869&r1=789868&r2=789869&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java
Tue Jun 30 18:40:05 2009
@@ -27,7 +27,7 @@
*
* @author Filip Hanik
* @author Peter Rossbach
- * @version $Revision: 466608 $, $Date: 2006-10-22 01:10:15 +0200 (Sun, 22 Oct
2006) $
+ * @version $Revision$, $Date$
*/
public class McastMember implements Member, java.io.Serializable {
Propchange:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java
--
svn:keywords = Author Date Id Revision
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java?rev=789869&r1=789868&r2=789869&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java
Tue Jun 30 18:40:05 2009
@@ -32,7 +32,7 @@
*
* @author Filip Hanik
* @author Peter Rossbach
- * @version $Revision: 466608 $, $Date: 2006-10-22 01:10:15 +0200 (Sun, 22 Oct
2006) $
+ * @version $Revision$, $Date$
*/
public class McastMembership
{
Propchange:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMembership.java
--
svn:keywords = Author Date Id Revision
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java?rev=789869&r1=789868&r2=789869&view=diff
==
---
tomcat/sandbox
svn commit: r789883 - in /tomcat/trunk/modules/jdbc-pool: build.properties.default build.xml
Author: fhanik
Date: Tue Jun 30 19:15:28 2009
New Revision: 789883
URL: http://svn.apache.org/viewvc?rev=789883&view=rev
Log:
Apply patch by sebb from
https://issues.apache.org/bugzilla/show_bug.cgi?id=47458
Store db properties in build.properties using a prefix of testdb
Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/build.xml
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=789883&r1=789882&r2=789883&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Tue Jun 30 19:15:28
2009
@@ -41,6 +41,27 @@
compile.target=1.5
compile.debug=true
+# - Settings for Junit test database.
+
+# Common settings
+testdb.username=root
+testdb.password=password
+
+# H2
+testdb.url=jdbc:h2x:~/.h2/test;QUERY_TIMEOUT=0;DB_CLOSE_ON_EXIT=FALSE
+testdb.driverClassName=org.h2.Driver
+testdb.validationQuery=SELECT 1
+
+# MySQL
+#testdb.url=jdbc:mysql://localhost:3306/mysql?autoReconnect=true
+#testdb.driverClassName=com.mysql.jdbc.Driver
+#testdb.validationQuery=SELECT 1
+
+# Derby
+#testdb.url=jdbc:derby:derbyDB;create=true
+#testdb.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
+#testdb.validationQuery=VALUES 1
+
# - JUnit Unit Test Suite, version 3.7 or later -
junit.home=${base.path}/junit3.8.2
junit.lib=${junit.home}
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=789883&r1=789882&r2=789883&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Tue Jun 30 19:15:28 2009
@@ -367,10 +367,17 @@
+
+
+
+
+
+
Creating test table for test purposes.
+
@@ -383,6 +390,7 @@
Performance and fairness tests.
+
@@ -398,6 +406,7 @@
Functional tests.
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47458] Allow test database settings to be specified in build.properties
https://issues.apache.org/bugzilla/show_bug.cgi?id=47458 Filip Hanik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r789883 - in /tomcat/trunk/modules/jdbc-pool: build.properties.default build.xml
On 30/06/2009, fha...@apache.org wrote:
> Author: fhanik
> Date: Tue Jun 30 19:15:28 2009
> New Revision: 789883
>
> URL: http://svn.apache.org/viewvc?rev=789883&view=rev
> Log:
> Apply patch by sebb from
> https://issues.apache.org/bugzilla/show_bug.cgi?id=47458
> Store db properties in build.properties using a prefix of testdb
>
> Modified:
> tomcat/trunk/modules/jdbc-pool/build.properties.default
> tomcat/trunk/modules/jdbc-pool/build.xml
>
> Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=789883&r1=789882&r2=789883&view=diff
>
> ==
> --- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
> +++ tomcat/trunk/modules/jdbc-pool/build.properties.default Tue Jun 30
> 19:15:28 2009
> @@ -41,6 +41,27 @@
> compile.target=1.5
> compile.debug=true
>
> +# - Settings for Junit test database.
> +
> +# Common settings
> +testdb.username=root
> +testdb.password=password
> +
> +# H2
> +testdb.url=jdbc:h2x:~/.h2/test;QUERY_TIMEOUT=0;DB_CLOSE_ON_EXIT=FALSE
Oops, sorry, I was testing the code to ensure that the properties were
picked up OK, and accidentally left in an error:
":h2x:" should be ":h2:"
otherwise tests will fail.
> +testdb.driverClassName=org.h2.Driver
> +testdb.validationQuery=SELECT 1
> +
> +# MySQL
> +#testdb.url=jdbc:mysql://localhost:3306/mysql?autoReconnect=true
> +#testdb.driverClassName=com.mysql.jdbc.Driver
> +#testdb.validationQuery=SELECT 1
> +
> +# Derby
> +#testdb.url=jdbc:derby:derbyDB;create=true
> +#testdb.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
> +#testdb.validationQuery=VALUES 1
> +
> # - JUnit Unit Test Suite, version 3.7 or later -
> junit.home=${base.path}/junit3.8.2
> junit.lib=${junit.home}
>
> Modified: tomcat/trunk/modules/jdbc-pool/build.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=789883&r1=789882&r2=789883&view=diff
>
> ==
> --- tomcat/trunk/modules/jdbc-pool/build.xml (original)
> +++ tomcat/trunk/modules/jdbc-pool/build.xml Tue Jun 30 19:15:28 2009
> @@ -367,10 +367,17 @@
>
>
>
> +
> +
> +
> +
> +
> +
>
>
> Creating test table for test purposes.
>
> +
>
>
>
> @@ -383,6 +390,7 @@
>
> Performance and fairness tests.
>
> +
>
>
>
> @@ -398,6 +406,7 @@
>
> Functional tests.
>
> +
>
>
>
>
>
>
> -
> 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
svn commit: r789923 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl
Author: markt Date: Tue Jun 30 20:16:32 2009 New Revision: 789923 URL: http://svn.apache.org/viewvc?rev=789923&view=rev Log: Revert r784853 - it broke most of the links in the left hand navigation menu for the docs Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=789923&r1=789922&r2=789923&view=diff == --- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Tue Jun 30 20:16:32 2009 @@ -178,7 +178,7 @@ - / + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: FOSSIL (KMM1445707I5853L0KM)
Did we just get spammed? On Tue, Jun 30, 2009 at 4:16 PM, webguy wrote: > Thanks for your recent email to FOSSIL. > > While you're waiting, take a look at fossil.com for answers to commonly > asked questions, watch instructions, and warranty and repair > information. > Fossil offers a wide spectrum of unique, high quality products! To shop > our newest styles for Summer, click here. > And, don?t forget that we are offering FREE STANDARD SHIPPING on all > watch orders! Click here to learn more. > If you have a situation that requires immediate attention, please call > us at 800.449.3056 (8:00am - 6:00pm CST, M-F) so that we can work > through it with you. > > Thanks, > > Webguy > web...@fossil.com > http://www.fossil.com.
svn commit: r789930 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
Author: rjung Date: Tue Jun 30 20:23:13 2009 New Revision: 789930 URL: http://svn.apache.org/viewvc?rev=789930&view=rev Log: Fix misprints in comments and javadoc. Port of r784613 from Tomcat 5.5. Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=789930&r1=789929&r2=789930&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Jun 30 20:23:13 2009 @@ -33,6 +33,10 @@ +Fix misprints in comments and javadoc. +Port from Tomcat 5.5. (rjung) + + 42662: Classloader issue for replicated sessions and dynamic proxies. Backport from Tomcat 6.0. (rjung) Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java?rev=789930&r1=789929&r2=789930&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java Tue Jun 30 20:23:13 2009 @@ -505,8 +505,8 @@ } /** - * Register Recevier MBean - * :type=ClusterReceiver,host= + * Register Receiver MBean + *:type=ClusterReceiver,host= */ protected void registerReceiverMBean() { if (cluster != null && cluster instanceof SimpleTcpCluster) { @@ -538,7 +538,7 @@ /** * UnRegister Recevier MBean - * :type=ClusterReceiver,host= + * :type=ClusterReceiver,host= */ protected void unregisterRecevierMBean() { if (cluster != null && getObjectName() != null - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT] [PROPOSAL] Use CTR for anything in the tomcat/archive in svn
Mark Thomas wrote: > It is unclear to me whether the archive is CTR or RTC since it does > contain some old release branches. I would like to propose making the > whole archive CTR. On the rare occasions where someone wishes to make a > change to code in the archive, this will make it easier. The vote has passed with 5 +1's and no other votes. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789935 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaSession.java
Author: rjung Date: Tue Jun 30 20:28:30 2009 New Revision: 789935 URL: http://svn.apache.org/viewvc?rev=789935&view=rev Log: Fix BZ 46717: Hard to reproduce thread safety issue with session expiration. Port of r781735 from Tomcat 5.5. Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=789935&r1=789934&r2=789935&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Jun 30 20:28:30 2009 @@ -33,6 +33,11 @@ +46717: Hard to reproduce thread safety issue with +session expiration. +Port from Tomcat 5.5. (rjung) + + Fix misprints in comments and javadoc. Port from Tomcat 5.5. (rjung) Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=789935&r1=789934&r2=789935&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java Tue Jun 30 20:28:30 2009 @@ -164,7 +164,7 @@ /** * The last accessed time for this Session. */ -private long lastAccessedTime = creationTime; +private volatile long lastAccessedTime = creationTime; /** * The session event listeners for this Session. @@ -234,7 +234,7 @@ /** * The current accessed time for this session. */ -private long thisAccessedTime = creationTime; +private volatile long thisAccessedTime = creationTime; /** * only the primary session will expire, or be able to expire due to - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789940 - /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java
Author: markt Date: Tue Jun 30 20:35:09 2009 New Revision: 789940 URL: http://svn.apache.org/viewvc?rev=789940&view=rev Log: (Hopefully) last part of port for bug 46982 Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java?rev=789940&r1=789939&r2=789940&view=diff == --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java Tue Jun 30 20:35:09 2009 @@ -25,7 +25,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.TimeZone; @@ -794,8 +793,7 @@ // Initialize the timeZone, Date formatters, and currentDate timezone = TimeZone.getDefault(); timeZoneNoDST = calculateTimeZoneOffset(timezone.getRawOffset()); -Calendar calendar = Calendar.getInstance(timezone); -int offset = calendar.get(Calendar.DST_OFFSET); +int offset = timezone.getDSTSavings(); timeZoneDST = calculateTimeZoneOffset(timezone.getRawOffset()+offset); if (fileDateFormat==null || fileDateFormat.length()==0) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r788214 - /tomcat/current/tc5.5.x/STATUS.txt
Konstantin Kolinko wrote: > Regarding FastCommonAccessLogValve and ExtendedAccessLogValve: > > FastCommonAccessLogValve: > >>> There is a bug, that sneaked in rev.781753 >>> http://svn.apache.org/viewvc?rev=781753&view=rev >>> That is: >>> the timeZoneNoDST field is never assigned and remains null >>> It was ok in 5.5.27. >> That is an error in my backport. That line should never have been deleted. >> I'll >> fix that now. > > That backport should be applied to FastCommonAccessLogValve as well. > The bug #46982 is not fixed there yet. Thanks. Fixed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789941 - /tomcat/trunk/modules/jdbc-pool/build.properties.default
Author: fhanik Date: Tue Jun 30 20:42:17 2009 New Revision: 789941 URL: http://svn.apache.org/viewvc?rev=789941&view=rev Log: Correct url Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=789941&r1=789940&r2=789941&view=diff == --- tomcat/trunk/modules/jdbc-pool/build.properties.default (original) +++ tomcat/trunk/modules/jdbc-pool/build.properties.default Tue Jun 30 20:42:17 2009 @@ -48,7 +48,7 @@ testdb.password=password # H2 -testdb.url=jdbc:h2x:~/.h2/test;QUERY_TIMEOUT=0;DB_CLOSE_ON_EXIT=FALSE +testdb.url=jdbc:h2:~/.h2/test;QUERY_TIMEOUT=0;DB_CLOSE_ON_EXIT=FALSE testdb.driverClassName=org.h2.Driver testdb.validationQuery=SELECT 1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789944 - in /tomcat/trunk/java/org/apache/catalina: ha/tcp/LocalStrings.properties ha/tcp/LocalStrings_es.properties tribes/transport/LocalStrings.properties tribes/transport/LocalStrings
Author: rjung
Date: Tue Jun 30 20:48:05 2009
New Revision: 789944
URL: http://svn.apache.org/viewvc?rev=789944&view=rev
Log:
Remove some obsolete (and partially broken)
message strings.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties?rev=789944&r1=789943&r2=789944&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties Tue
Jun 30 20:48:05 2009
@@ -77,11 +77,3 @@
SimpleTcpCluster.log.receive=RECEIVE {0,date}:{0,time} {1,number}
{2}:{3,number,integer} {4} {5}
SimpleTcpCluster.log.send=SEND {0,date}:{0,time} {1,number}
{2}:{3,number,integer} {4}
SimpleTcpCluster.log.send.all=SEND {0,date}:{0,time} {1,number} - {2}
-SocketReplictionListener.allreadyExists=ServerSocket [{0}:{1}] allready
started!
-SocketReplictionListener.accept.failure=ServerSocket [{0}:{1}] - Exception to
start thread or accept server socket
-SocketReplictionListener.open=Open Socket at [{0}:{1}]
-SocketReplictionListener.openclose.failure=ServerSocket [{0}:{1}] - Exception
to open or close server socket
-SocketReplictionListener.portbusy=Port busy at [{0}:{i}] - reason [{2}]
-SocketReplictionListener.serverSocket.notExists=Fatal error: Receiver socket
not bound address={0} port={1} maxport={2}
-SocketReplictionListener.timeout=Receiver ServerSocket no started [{0}:{1}] -
reason: timeout={2} or listen={3}
-SocketReplictionListener.unlockSocket.failure=UnLocksocket failure at
ServerSocket [{0:{1}]
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties?rev=789944&r1=789943&r2=789944&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties Tue
Jun 30 20:48:05 2009
@@ -77,11 +77,3 @@
SimpleTcpCluster.log.receive = RECEIVE {0,date}\:{0,time} {1,number}
{2}\:{3,number,integer} {4} {5}
SimpleTcpCluster.log.send = SEND {0,date}\:{0,time} {1,number}
{2}\:{3,number,integer} {4}
SimpleTcpCluster.log.send.all = SEND {0,date}\:{0,time} {1,number} - {2}
-SocketReplictionListener.allreadyExists = ServerSocket [{0}\:{1}] allready
started\!
-SocketReplictionListener.accept.failure = ServerSocket [{0}\:{1}] - Exception
to start thread or accept server socket
-SocketReplictionListener.open = Open Socket at [{0}\:{1}]
-SocketReplictionListener.openclose.failure = ServerSocket [{0}\:{1}] -
Exception to open or close server socket
-SocketReplictionListener.portbusy = Port busy at [{0}\:{i}] - reason [{2}]
-SocketReplictionListener.serverSocket.notExists = Fatal error\: Receiver
socket not bound address\={0} port\={1} maxport\={2}
-SocketReplictionListener.timeout = Receiver ServerSocket no started [{0}\:{1}]
- reason\: timeout\={2} or listen\={3}
-SocketReplictionListener.unlockSocket.failure = UnLocksocket failure at
ServerSocket [{0\:{1}]
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties?rev=789944&r1=789943&r2=789944&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
Tue Jun 30 20:48:05 2009
@@ -74,11 +74,3 @@
SimpleTcpCluster.log.receive=RECEIVE {0,date}:{0,time} {1,number}
{2}:{3,number,integer} {4} {5}
SimpleTcpCluster.log.send=SEND {0,date}:{0,time} {1,number}
{2}:{3,number,integer} {4}
SimpleTcpCluster.log.send.all=SEND {0,date}:{0,time} {1,number} - {2}
-SocketReplictionListener.allreadyExists=ServerSocket [{0}:{1}] allready
started!
-SocketReplictionListener.accept.failure=ServerSocket [{0}:{1}] - Exception to
start thread or accept server socket
-SocketReplictionListener.open=Open Socket at [{0}:{1}]
-SocketReplictionListener.openclose.failure=ServerSocket [{0}:{1}] - Exception
to open or close server socket
-SocketReplictionListener.portbusy=Port busy at [{0}:{i}] - reason [{2}]
-SocketReplictionListener.serverSocket.notExists=Fatal error: Receiver socket
not bound address={0} p
svn commit: r789949 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Tue Jun 30 20:53:24 2009 New Revision: 789949 URL: http://svn.apache.org/viewvc?rev=789949&view=rev Log: Add 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=789949&r1=789948&r2=789949&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 30 20:53:24 2009 @@ -152,3 +152,8 @@ http://people.apache.org/~markt/patches/2009-06-24-AccessLogValve-tc6.patch +1: markt -1: + +* Remove some obsolete (and partially broken) message strings. + http://svn.apache.org/viewvc?rev=789944&view=rev + +1: rjung + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789961 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Tue Jun 30 21:19:38 2009 New Revision: 789961 URL: http://svn.apache.org/viewvc?rev=789961&view=rev Log: Add a couple of small cluster backport proposals. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789961&r1=789960&r2=789961&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 21:19:38 2009 @@ -128,3 +128,31 @@ +1: rjung, kkolinko -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47389 + DeltaManager doesn't do session replication if notifySessionListenersOnReplication=false. + Backport of http://svn.apache.org/viewvc?view=rev&revision=786124 from tc6 + resp. http://svn.apache.org/viewvc?view=rev&revision=789821 from OACC. + +1: rjung + -1: + +* Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=46990 + Improve locking in cluster membership. + Backport of http://svn.apache.org/viewvc?view=rev&revision=771009 from tc6 + resp. http://svn.apache.org/viewvc?view=rev&revision=789826 from OACC. + +1: rjung + -1: + +* Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45447 + Add spanish message translations. + Backport of http://svn.apache.org/viewvc?view=rev&revision=698924 from tc6 + resp. http://svn.apache.org/viewvc?view=rev&revision=789832 from OACC. + +1: rjung + -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45279 + Close socket when closing multicast. + Backport of http://svn.apache.org/viewvc?view=rev&revision=672888 from tc6 + resp. http://svn.apache.org/viewvc?view=rev&revision=789837 from OACC. + +1: rjung + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789970 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Jun 30 21:40:17 2009 New Revision: 789970 URL: http://svn.apache.org/viewvc?rev=789970&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=789970&r1=789969&r2=789970&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 30 21:40:17 2009 @@ -155,5 +155,5 @@ * Remove some obsolete (and partially broken) message strings. http://svn.apache.org/viewvc?rev=789944&view=rev - +1: rjung + +1: rjung, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r789994 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Tue Jun 30 22:37:02 2009 New Revision: 789994 URL: http://svn.apache.org/viewvc?rev=789994&view=rev Log: Split access log valve patch into separate patches New patch for FastCommonAccessValve Add kkolinko's vote for the AccessLogVavle from the dev list Vote Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789994&r1=789993&r2=789994&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 22:37:02 2009 @@ -109,18 +109,23 @@ +1: rjung, kkolinko -1: -* Make access log valves thread safe - http://people.apache.org/~markt/patches/2009-06-25-AccessLogValve-tc5.patch - +1: markt +* Make AccessLogValve thread safe + http://people.apache.org/~markt/patches/2009-06-30-AccessLogValve-tc5.patch + +1: markt, kkolinko -1: * Make access log valves thread safe https://issues.apache.org/bugzilla/show_bug.cgi?id=38483 Patch for ExtendedAccessLogValve: http://people.apache.org/~kkolinko/patches/2009-06-30_tc55_EALV.patch - +1: kkolinko + +1: kkolinko, markt -1: +* Make FastCommonAccessLogValve thread safe + http://people.apache.org/~markt/patches/2009-06-30-FastCommonAccessLogValve-tc5.patch + +1: markt + -1: + * Make new mutex lock in cluster/tcp/FastAsyncSocketSender final as suggested by sebb. Improvement of http://svn.apache.org/viewvc?rev=789714&view=rev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r789792 - /tomcat/current/tc5.5.x/STATUS.txt
rj...@apache.org wrote:
> * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37084
> @@ -78,11 +78,19 @@
>http://svn.apache.org/viewvc?rev=786487&view=rev
>+1: markt
>-1:
> + rjung: +1 in principle, but a few questions/suggestions:
> + - Do we need to dechunk the read request body? I didn't see were this
> happens.
No. Like 6.0.x and trunk, it is handled in the Http11Processor by the
addition of a filter
> + - Do chunked requests actually set a content-length?
No.
> If not, we have len == -1
> +and will not enter the try/catch block. Maybe only a question of
> correct backport
> +from trunk.
The patch applies a little further down than that. You end up with:
if (len > 0) {
...
} else if ("chunked".equalsIgnoreCase(
coyoteRequest.getHeader("transfer-encoding"))) {
...
}
> + - I think instead of: len == actualLen => non-chunked, else check
> transfer-encoding
Can't do that. You don't know actual length until you read the body
> +it should be the other waqy round. If transfer-encoding is chunked,
> handle as chunked,
> +else traditional.
I don't that it makes any difference. The two are mutually exclusive so
the order we check them in doesn't matter.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
