svn commit: r1496421 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/mbeans/MBeanUtils.java webapps/docs/changelog.xml
Author: pero
Date: Tue Jun 25 11:26:48 2013
New Revision: 1496421
URL: http://svn.apache.org/r1496421
Log:
Avoid Warning message at shutdown, if GlobalResourceLifecacleListener isn't
configured
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1496421r1=1496420r2=1496421view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Tue
Jun 25 11:26:48 2013
@@ -1618,7 +1618,9 @@ public class MBeanUtils {
// The database itself
ObjectName db = new ObjectName(
Users:type=UserDatabase,database= + userDatabase);
-mserver.unregisterMBean(db);
+if(mserver.isRegistered(db)) {
+mserver.unregisterMBean(db);
+}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1496421r1=1496420r2=1496421view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jun 25 11:26:48 2013
@@ -98,6 +98,10 @@
codejava.beans.Introspector.flushCaches()/code and
codesun.awt.AppContext.getAppContext()/code in Java 7. (markt)
/fix
+ fix
+Avoid WARNING log message of
codeUsers:type=UserDatabase,database=UserDatabase/code
+at tomcat shutdown. (pero)
+ /fix
/changelog
/subsection
subsection name=Cluster
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1496428 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
Author: pero
Date: Tue Jun 25 11:40:27 2013
New Revision: 1496428
URL: http://svn.apache.org/r1496428
Log:
Avoid Warning message at shutdown, if GlobalResourceLifecacleListener isn't
configured
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1496428r1=1496427r2=1496428view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Tue Jun 25
11:40:27 2013
@@ -787,6 +787,8 @@ public class MBeanUtils {
// The database itself
ObjectName db = new ObjectName(
Users:type=UserDatabase,database= + userDatabase);
-mserver.unregisterMBean(db);
+if( mserver.isRegistered(db) ) {
+mserver.unregisterMBean(db);
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1310693 - in /tomcat/tc7.0.x/trunk: res/maven/tomcat-jasper.pom webapps/docs/changelog.xml
Author: pero Date: Sat Apr 7 08:20:45 2012 New Revision: 1310693 URL: http://svn.apache.org/viewvc?rev=1310693view=rev Log: update to ecj 3.7.2 Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom?rev=1310693r1=1310692r2=1310693view=diff == --- tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom Sat Apr 7 08:20:45 2012 @@ -49,7 +49,7 @@ dependency groupIdorg.eclipse.jdt.core.compiler/groupId artifactIdecj/artifactId - version3.7/version + version3.7.2/version /dependency dependency groupIdorg.apache.tomcat/groupId Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1310693r1=1310692r2=1310693view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Apr 7 08:20:45 2012 @@ -64,6 +64,13 @@ /add /changelog /subsection + subsection name=Other +changelog + update +Update to Eclipse JDT Compiler 3.7.2 at maven tomcat-japser.pom. (pero) + /update +/changelog + /subsection /section section name=Tomcat 7.0.27 (markt) rtext=released 2012-04-05 subsection name=Catalina - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1310694 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Author: pero
Date: Sat Apr 7 08:21:34 2012
New Revision: 1310694
URL: http://svn.apache.org/viewvc?rev=1310694view=rev
Log:
Send header with uppercase header
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1310694r1=1310693r2=1310694view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Sat Apr 7 08:21:34 2012
@@ -111,8 +111,8 @@ public abstract class WebSocketServlet e
// data present when the frame is fragmented.
// If we got this far, all is good. Accept the connection.
-resp.setHeader(upgrade, websocket);
-resp.setHeader(connection, upgrade);
+resp.setHeader(Upgrade, websocket);
+resp.setHeader(Connection, upgrade);
resp.setHeader(Sec-WebSocket-Accept, getWebSocketAccept(key));
if (subProtocol != null) {
resp.setHeader(Sec-WebSocket-Protocol, subProtocol);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1310707 - /tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Author: pero
Date: Sat Apr 7 08:51:44 2012
New Revision: 1310707
URL: http://svn.apache.org/viewvc?rev=1310707view=rev
Log:
Send header with uppercase names
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1310707r1=1310706r2=1310707view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Sat
Apr 7 08:51:44 2012
@@ -102,8 +102,8 @@ public abstract class WebSocketServlet e
// data present when the frame is fragmented.
// If we got this far, all is good. Accept the connection.
-resp.setHeader(upgrade, websocket);
-resp.setHeader(connection, upgrade);
+resp.setHeader(Upgrade, websocket);
+resp.setHeader(Connection, upgrade);
resp.setHeader(Sec-WebSocket-Accept, getWebSocketAccept(key));
if (subProtocol != null) {
resp.setHeader(Sec-WebSocket-Protocol, subProtocol);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1310392 - in /tomcat/trunk: java/org/apache/catalina/websocket/WebSocketServlet.java test/org/apache/catalina/websocket/TestWebSocket.java webapps/docs/changelog.xml
Author: pero
Date: Fri Apr 6 15:14:55 2012
New Revision: 1310392
URL: http://svn.apache.org/viewvc?rev=1310392view=rev
Log:
Correct websocket protocol detection
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1310392r1=1310391r2=1310392view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Fri
Apr 6 15:14:55 2012
@@ -143,7 +143,7 @@ public abstract class WebSocketServlet e
}
}
}
-return true;
+return false;
}
Modified: tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java?rev=1310392r1=1310391r2=1310392view=diff
==
--- tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java Fri Apr
6 15:14:55 2012
@@ -16,6 +16,10 @@
*/
package org.apache.catalina.websocket;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -28,21 +32,25 @@ import java.io.Writer;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.util.Base64;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.C2BConverter;
import org.apache.tomcat.util.buf.CharChunk;
+import org.junit.Test;
public class TestWebSocket extends TomcatBaseTest {
private static final String CRLF = \r\n;
+private static final byte[] WS_ACCEPT =
+258EAFA5-E914-47DA-95CA-C5AB0DC85B11.getBytes(
+B2CConverter.ISO_8859_1);
private OutputStream os;
private InputStream is;
@@ -56,36 +64,27 @@ public class TestWebSocket extends Tomca
tomcat.start();
-// Open the socket
-final String encoding = ISO-8859-1;
-SocketAddress addr = new InetSocketAddress(localhost, getPort());
-Socket socket = new Socket();
-socket.setSoTimeout(1);
-socket.connect(addr, 1);
-os = socket.getOutputStream();
-Writer writer = new OutputStreamWriter(os, encoding);
-is = socket.getInputStream();
-Reader r = new InputStreamReader(is, encoding);
-BufferedReader reader = new BufferedReader(r);
+WebSocketCLient client= new WebSocketCLient();
+
// Send the WebSocket handshake
-writer.write(GET /examples/websocket/echoStream HTTP/1.1 + CRLF);
-writer.write(Host: foo + CRLF);
-writer.write(Upgrade: websocket + CRLF);
-writer.write(Connection: upgrade + CRLF);
-writer.write(Sec-WebSocket-Version: 13 + CRLF);
-writer.write(Sec-WebSocket-Key: TODO + CRLF);
-writer.write(CRLF);
-writer.flush();
+client.writer.write(GET /examples/websocket/echoStream HTTP/1.1 +
CRLF);
+client.writer.write(Host: foo + CRLF);
+client.writer.write(Upgrade: websocket + CRLF);
+client.writer.write(Connection: keep-alive, upgrade + CRLF);
+client.writer.write(Sec-WebSocket-Version: 13 + CRLF);
+client.writer.write(Sec-WebSocket-Key: TODO + CRLF);
+client.writer.write(CRLF);
+client.writer.flush();
// Make sure we got an upgrade response
-String responseLine = reader.readLine();
+String responseLine = client.reader.readLine();
assertTrue(responseLine.startsWith(HTTP/1.1 101));
// Swallow the headers
-String responseHeaderLine = reader.readLine();
+String responseHeaderLine = client.reader.readLine();
while (!responseHeaderLine.equals()) {
-responseHeaderLine = reader.readLine();
+responseHeaderLine = client.reader.readLine();
}
// Now we can do WebSocket
@@ -95,11 +94,153 @@ public class TestWebSocket extends Tomca
assertEquals
svn commit: r1310506 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/websocket/WebSocketServlet.java test/org/apache/catalina/websocket/TestWebSocket.java webapps/docs/changelog.xml
Author: pero
Date: Fri Apr 6 17:51:25 2012
New Revision: 1310506
URL: http://svn.apache.org/viewvc?rev=1310506view=rev
Log:
Correct websocket protocol version detection
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1310506r1=1310505r2=1310506view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Fri Apr 6 17:51:25 2012
@@ -143,7 +143,7 @@ public abstract class WebSocketServlet e
}
}
}
-return true;
+return false;
}
@@ -166,7 +166,7 @@ public abstract class WebSocketServlet e
return result;
}
-
+// ToDo: Use ThreadLocal pool sha1Helper
private String getWebSocketAccept(String key) {
synchronized (sha1Helper) {
sha1Helper.reset();
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java?rev=1310506r1=1310505r2=1310506view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
Fri Apr 6 17:51:25 2012
@@ -16,6 +16,10 @@
*/
package org.apache.catalina.websocket;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -28,21 +32,25 @@ import java.io.Writer;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.util.Base64;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.C2BConverter;
import org.apache.tomcat.util.buf.CharChunk;
+import org.junit.Test;
public class TestWebSocket extends TomcatBaseTest {
private static final String CRLF = \r\n;
+private static final byte[] WS_ACCEPT =
+258EAFA5-E914-47DA-95CA-C5AB0DC85B11.getBytes(
+B2CConverter.ISO_8859_1);
private OutputStream os;
private InputStream is;
@@ -56,36 +64,27 @@ public class TestWebSocket extends Tomca
tomcat.start();
-// Open the socket
-final String encoding = ISO-8859-1;
-SocketAddress addr = new InetSocketAddress(localhost, getPort());
-Socket socket = new Socket();
-socket.setSoTimeout(1);
-socket.connect(addr, 1);
-os = socket.getOutputStream();
-Writer writer = new OutputStreamWriter(os, encoding);
-is = socket.getInputStream();
-Reader r = new InputStreamReader(is, encoding);
-BufferedReader reader = new BufferedReader(r);
+WebSocketCLient client= new WebSocketCLient();
+
// Send the WebSocket handshake
-writer.write(GET /examples/websocket/echoStream HTTP/1.1 + CRLF);
-writer.write(Host: foo + CRLF);
-writer.write(Upgrade: websocket + CRLF);
-writer.write(Connection: upgrade + CRLF);
-writer.write(Sec-WebSocket-Version: 13 + CRLF);
-writer.write(Sec-WebSocket-Key: TODO + CRLF);
-writer.write(CRLF);
-writer.flush();
+client.writer.write(GET /examples/websocket/echoStream HTTP/1.1 +
CRLF);
+client.writer.write(Host: foo + CRLF);
+client.writer.write(Upgrade: websocket + CRLF);
+client.writer.write(Connection: keep-alive, upgrade + CRLF);
+client.writer.write(Sec-WebSocket-Version: 13 + CRLF);
+client.writer.write(Sec-WebSocket-Key: TODO + CRLF);
+client.writer.write(CRLF);
+client.writer.flush();
// Make sure we got an upgrade response
-String responseLine = reader.readLine();
+String responseLine = client.reader.readLine();
assertTrue(responseLine.startsWith(HTTP/1.1 101));
// Swallow the headers
-String responseHeaderLine
svn commit: r1067289 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: pero
Date: Fri Feb 4 21:17:44 2011
New Revision: 1067289
URL: http://svn.apache.org/viewvc?rev=1067289view=rev
Log:
add my vote
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1067289r1=1067288r2=1067289view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Feb 4 21:17:44 2011
@@ -37,7 +37,7 @@ PATCHES PROPOSED TO BACKPORT:
svn delete
connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
2)
http://people.apache.org/~kkolinko/patches/2010-03-06_tc55_remove_JSSE13Factory_v2.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, pero
-O: jim
-1:
@@ -45,7 +45,7 @@ PATCHES PROPOSED TO BACKPORT:
Use JVM provided solutions to CVE-2009-3555 if available (i.e. RFC 5746
support)
http://svn.apache.org/viewvc?rev=1065859view=rev
- +1: markt, kkolinko
+ +1: markt, kkolinko, pero
-1:
kkolinko:
1) s/for (String cipher : ciphers){/for (int i=0;
iciphers.length;i++){String cipher=ciphers[i];/
@@ -58,5 +58,5 @@ PATCHES PROPOSED TO BACKPORT:
to allow more fine-grained control over which functionality is accessible,
like it was done in Tomcat 6.
http://people.apache.org/~kkolinko/patches/2011-02-03_tc55_roles.patch
- +1: kkolinko
+ +1: kkolinko, pero
-1:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1031643 - in /tomcat/trunk: java/org/apache/catalina/valves/mbeans-descriptors.xml webapps/docs/changelog.xml
Author: pero Date: Fri Nov 5 15:50:51 2010 New Revision: 1031643 URL: http://svn.apache.org/viewvc?rev=1031643view=rev Log: Make attribute enabled changeable via JMX at AccessLogValve Modified: tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml?rev=1031643r1=1031642r2=1031643view=diff == --- tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml Fri Nov 5 15:50:51 2010 @@ -53,6 +53,7 @@ attribute name=enabled description=Enable Access Logging + is=false type=boolean/ attribute name=fileDateFormat @@ -164,7 +165,7 @@ attribute name=enabled description=Enable Access Logging - is=true + is=false type=boolean/ attribute name=fileDateFormat Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1031643r1=1031642r2=1031643view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 5 15:50:51 2010 @@ -91,7 +91,7 @@ Improve debug logging for MapperListener registration. (markt) /add add -Expose names of LifecycleListeners and ContainerListers for +Expose names of LifecycleListeners and ContainerListeners for StandardContext via JMX. (markt) /add add @@ -105,6 +105,9 @@ Make Tomcat more tolerant of codenull/code when generating JMX names for Valves. (markt) /fix + fix +Make AccessLogValve attribute codeenabled/code changeable to JMX. (pero) + /fix /changelog /subsection subsection name=Jasper - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r960317 - /tomcat/trunk/webapps/docs/changelog.xml
Author: pero Date: Sun Jul 4 10:47:12 2010 New Revision: 960317 URL: http://svn.apache.org/viewvc?rev=960317view=rev Log: Fix indentation... Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=960317r1=960316r2=960317view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Sun Jul 4 10:47:12 2010 @@ -38,8 +38,8 @@ subsection name=Catalina changelog fix -bug49528/bug: HttpServletRequest.isAsyncStarted() now returns true when a Runnable is started! -Reported by Pieter Libin (pero) +bug49528/bug: HttpServletRequest.isAsyncStarted() now returns true when a Runnable is started. +Bug reported by Pieter Libin. (pero) /fix fix GSOC 2010. Continue work to align MBean descriptors with reality. Patch - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r960318 - /tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Author: pero
Date: Sun Jul 4 10:50:53 2010
New Revision: 960318
URL: http://svn.apache.org/viewvc?rev=960318view=rev
Log:
no functional change.
reformating and fix some checkstyle warnings
Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=960318r1=960317r2=960318view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Sun Jul 4
10:50:53 2010
@@ -1,13 +1,13 @@
-/*
+/**
* 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.
@@ -40,19 +40,21 @@ import org.apache.catalina.connector.Req
import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+
/**
- *
+ *
* @author fhanik
*
*/
public class AsyncContextImpl implements AsyncContext {
-
+
public static enum AsyncState {
-NOT_STARTED, STARTED, DISPATCHING, DISPATCHED, COMPLETING, TIMING_OUT,
ERROR_DISPATCHING
+NOT_STARTED, STARTED, DISPATCHING,
+DISPATCHED, COMPLETING, TIMING_OUT, ERROR_DISPATCHING
}
-
+
private static final Log log = LogFactory.getLog(AsyncContextImpl.class);
-
+
private ServletRequest servletRequest = null;
private ServletResponse servletResponse = null;
private ListAsyncListenerWrapper listeners = new
ArrayListAsyncListenerWrapper();
@@ -62,12 +64,15 @@ public class AsyncContextImpl implements
private AtomicReferenceAsyncState state = new
AtomicReferenceAsyncState(AsyncState.NOT_STARTED);
private long timeout = -1;
private AsyncEvent event = null;
-
+
private Request request;
-
+
public AsyncContextImpl(Request request) {
if (log.isDebugEnabled()) {
-log.debug(AsyncContext
created[+request.getRequestURI()+?+request.getQueryString()+], new
DebugException());
+log.debug(AsyncContext created[
++ request.getRequestURI()
++ ? + request.getQueryString() + ],
+new DebugException());
}
//TODO SERVLET3 - async
this.request = request;
@@ -76,81 +81,102 @@ public class AsyncContextImpl implements
@Override
public void complete() {
if (log.isDebugEnabled()) {
-log.debug(AsyncContext Complete Called[+state.get()+;
+request.getRequestURI()+?+request.getQueryString()+], new
DebugException());
+log.debug(AsyncContext Complete Called[
++ state.get() + ;
++ request.getRequestURI()
++ ? + request.getQueryString() + ],
+new DebugException());
}
-if (state.get()==AsyncState.COMPLETING) {
+if (state.get() == AsyncState.COMPLETING) {
//do nothing
-} else if (state.compareAndSet(AsyncState.DISPATCHED,
AsyncState.COMPLETING) ||
- state.compareAndSet(AsyncState.STARTED,
AsyncState.COMPLETING)) {
+} else if (state.compareAndSet(AsyncState.DISPATCHED,
AsyncState.COMPLETING)
+ || state.compareAndSet(AsyncState.STARTED,
AsyncState.COMPLETING)) {
// TODO SERVLET3 - async
AtomicBoolean dispatched = new AtomicBoolean(false);
-
request.getCoyoteRequest().action(ActionCode.ACTION_ASYNC_COMPLETE,dispatched);
-if (!dispatched.get()) doInternalComplete(false);
+request.getCoyoteRequest().action(
+ActionCode.ACTION_ASYNC_COMPLETE, dispatched);
+if (!dispatched.get()) {
+doInternalComplete(false);
+}
} else {
-throw new IllegalStateException(Complete not allowed. Invalid
state:+state.get());
+throw new IllegalStateException(
+Complete not allowed. Invalid state: + state.get());
}
-
+
}
@Override
public void dispatch() {
-HttpServletRequest sr = (HttpServletRequest)getServletRequest();
+HttpServletRequest sr = (HttpServletRequest) getServletRequest
svn commit: r960430 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Mon Jul 5 03:34:53 2010 New Revision: 960430 URL: http://svn.apache.org/viewvc?rev=960430view=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=960430r1=960429r2=960430view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jul 5 03:34:53 2010 @@ -100,7 +100,7 @@ PATCHES PROPOSED TO BACKPORT: Respect configurable search order in getURLs(). http://svn.apache.org/viewvc?view=revisionrevision=936892 http://people.apache.org/~rjung/patches/2010-05-14-loader-backport-r936892.patch - +1: rjung, kkolinko + +1: rjung, kkolinko, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49343 @@ -140,7 +140,7 @@ PATCHES PROPOSED TO BACKPORT: but using the new roles (manager-gui, admin-gui etc.) will not bypass the CSRF protection. http://people.apache.org/~markt/patches/2010-06-26-crsf-prevention-filter-tc6.patch - +1: markt + +1: markt, pero -1: * Add support for *.jar pattern in VirtualWebappLoader @@ -148,7 +148,7 @@ PATCHES PROPOSED TO BACKPORT: I propose the following patch, but without removing the not for production warning from JavaDoc: http://svn.apache.org/viewvc?rev=958615view=rev - +1: kkolinko, rjung, kfujino + +1: kkolinko, rjung, kfujino, pero -1: * Remove *.rtf from fixcrlf patternset. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r960283 - in /tomcat/trunk: java/org/apache/catalina/core/AsyncContextImpl.java test/org/apache/catalina/core/TestAsyncContextImpl.java webapps/docs/changelog.xml
Author: pero
Date: Sat Jul 3 22:48:16 2010
New Revision: 960283
URL: http://svn.apache.org/viewvc?rev=960283view=rev
Log:
Fix Bug 49528 - HttpServletRequest.isAsyncStarted() returns false when a
Runnable is started
Add isDebugEnabled statements.
Todo: Why we doesn't start directly a container thread with
asyncContext.start()?
Currently we start user runnable as an internal forward.
Added:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=960283r1=960282r2=960283view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Sat Jul 3
22:48:16 2010
@@ -253,7 +253,7 @@ public class AsyncContextImpl implements
}
public boolean isStarted() {
-return (state.get() == AsyncState.STARTED || state.get() ==
AsyncState.DISPATCHING);
+return (state.get() == AsyncState.STARTED || state.get() ==
AsyncState.DISPATCHING || state.get() == AsyncState.DISPATCHED);
}
public void setStarted(Context context) {
@@ -292,7 +292,8 @@ public class AsyncContextImpl implements
public void doInternalDispatch() throws ServletException, IOException {
if (this.state.compareAndSet(AsyncState.TIMING_OUT,
AsyncState.COMPLETING)) {
-log.debug(TIMING OUT!);
+ if( log.isDebugEnabled())
+ log.debug(TIMING OUT!);
boolean listenerInvoked = false;
for (AsyncListenerWrapper listener : listeners) {
listener.fireOnTimeout(event);
@@ -303,15 +304,18 @@ public class AsyncContextImpl implements
}
doInternalComplete(true);
} else if (this.state.compareAndSet(AsyncState.ERROR_DISPATCHING,
AsyncState.COMPLETING)) {
-log.debug(ON ERROR!);
+if( log.isDebugEnabled())
+log.debug(ON ERROR!);
boolean listenerInvoked = false;
for (AsyncListenerWrapper listener : listeners) {
try {
listener.fireOnError(event);
}catch (IllegalStateException x) {
-log.debug(Listener invoked invalid state.,x);
+if( log.isDebugEnabled())
+log.debug(Listener invoked invalid state.,x);
}catch (Exception x) {
-log.debug(Exception during onError.,x);
+if(log.isDebugEnabled())
+log.debug(Exception during onError.,x);
}
listenerInvoked = true;
}
Added: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=960283view=auto
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java (added)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Sat
Jul 3 22:48:16 2010
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+package org.apache.catalina.core;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+
+/**
+ * Simulate Bug 49528.
+ *
+ * @author Peter Rossbach
+ * @version $Revision$
+ */
+public class TestAsyncContextImpl extends TomcatBaseTest {
+
+public void testIsAsyncStarted() throws Exception {
+// Setup Tomcat
svn commit: r960284 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappLoader.java test/org/apache/catalina/loader/TestVirtualWebappLoader.java
Author: pero
Date: Sat Jul 3 23:02:46 2010
New Revision: 960284
URL: http://svn.apache.org/viewvc?rev=960284view=rev
Log:
Fix NPE and add small test case to check VirtualWebappLoader.
Added:
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=960284r1=960283r2=960284view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Sat Jul 3
23:02:46 2010
@@ -483,9 +483,7 @@ public class WebappLoader extends Lifecy
* such that the loaded classes should be reloaded?
*/
public boolean modified() {
-
-return (classLoader.modified());
-
+return classLoader != null ? classLoader.modified() : false ;
}
@@ -493,7 +491,7 @@ public class WebappLoader extends Lifecy
* Used to periodically signal to the classloader to release JAR resources.
*/
public void closeJARs(boolean force) {
-if (classLoader !=null){
+if (classLoader !=null) {
classLoader.closeJARs(force);
}
}
Added: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java?rev=960284view=auto
==
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
Sat Jul 3 23:02:46 2010
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+package org.apache.catalina.loader;
+
+import java.io.File;
+
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.naming.resources.FileDirContext;
+
+public class TestVirtualWebappLoader extends TomcatBaseTest {
+
+public void testModified() throws Exception {
+WebappLoader loader = new WebappLoader();
+assertNull(loader.getClassLoader());
+assertFalse(loader.modified());
+}
+
+public void testStartInternal() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+File appDir = new File(test/webapp-3.0);
+// Must have a real docBase - just use temp
+StandardContext ctx =
+(StandardContext)tomcat.addContext(/, appDir.getAbsolutePath());
+
+VirtualWebappLoader loader = new VirtualWebappLoader();
+
+loader.setContainer(ctx);
+ctx.setLoader(loader);
+ctx.setResources(new FileDirContext());
+ctx.resourcesStart();
+File dir = new File(test/webapp-3.0-fragments/WEB-INF/lib);
+loader.setVirtualClasspath(dir.getAbsolutePath() + /*.jar);
+loader.startInternal();
+String[] repos = loader.getRepositories();
+assertEquals(2,repos.length);
+loader.stopInternal();
+// ToDo: Why doesn't remove repositories?
+repos = loader.getRepositories();
+assertEquals(2, repos.length);
+
+// no leak
+loader.startInternal();
+repos = loader.getRepositories();
+assertEquals(2,repos.length);
+
+// clear loader
+ctx.setLoader(null);
+// see tearDown()!
+tomcat.start();
+}
+}
Propchange:
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
--
svn:keywords = Author Date Id Revision
svn commit: r960083 - /tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java
Author: pero
Date: Fri Jul 2 18:30:34 2010
New Revision: 960083
URL: http://svn.apache.org/viewvc?rev=960083view=rev
Log:
Test NIO AsyncListener timeout.
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java?rev=960083r1=960082r2=960083view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java Fri Jul
2 18:30:34 2010
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.catalina.Context;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -44,8 +45,38 @@ public class TestAsyncListener extends T
public void testTimeout() throws Exception {
// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+
+TimeoutServlet timeout = createTimeoutTestApp(tomcat);
+tomcat.start();
+checkTimeoutRequest(timeout);
+}
+
+public void testNIOTimeout() throws Exception {
+// Setup Tomcat instance with NIO Connector
Tomcat tomcat = getTomcatInstance();
+Connector nioConnector = new
Connector(org.apache.coyote.http11.Http11NioProtocol);
+nioConnector.setPort(getNextPort());
+tomcat.getService().addConnector(nioConnector);
+TimeoutServlet timeout = createTimeoutTestApp(tomcat);
+
+tomcat.start();
+checkTimeoutRequest(timeout);
+}
+
+private void checkTimeoutRequest(TimeoutServlet timeout)
+throws IOException, InterruptedException {
+ByteChunk res = getUrl(http://localhost:; + getPort() + /async);
+Thread.sleep(4000);
+assertEquals(1,timeout.getAsyncTimeout());
+//assertEquals(1,timeout.getAsyncStart());
+assertEquals(1,timeout.getAsyncComplete());
+//assertEquals(hello start: + timeout.getStart() + \n,
res.toString());
+assertNull(res.toString());
+}
+
+private TimeoutServlet createTimeoutTestApp(Tomcat tomcat) {
// Must have a real docBase - just use temp
File docBase = new File(System.getProperty(java.io.tmpdir));
@@ -62,15 +93,7 @@ public class TestAsyncListener extends T
Wrapper wrapper = Tomcat.addServlet(ctx, time, timeout);
wrapper.setAsyncSupported(true);
ctx.addServletMapping(/async, time);
-
-tomcat.start();
-ByteChunk res = getUrl(http://localhost:; + getPort() + /async);
-Thread.sleep(4000);
-assertEquals(1,timeout.getAsyncTimeout());
-//assertEquals(1,timeout.getAsyncStart());
-assertEquals(1,timeout.getAsyncComplete());
-//assertEquals(hello start: + timeout.getStart() + \n,
res.toString());
-assertNull(res.toString());
+return timeout;
}
private static class TimeoutServlet extends HttpServlet {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958362 - in /tomcat/trunk: java/org/apache/tomcat/util/net/JIoEndpoint.java test/org/apache/catalina/core/TestAsyncListener.java webapps/docs/changelog.xml
Author: pero
Date: Sun Jun 27 11:02:10 2010
New Revision: 958362
URL: http://svn.apache.org/viewvc?rev=958362view=rev
Log:
Start JioEndpoint timeout thread, to handle timeout a AsyncListener.
Added:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java (with
props)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=958362r1=958361r2=958362view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Sun Jun 27
11:02:10 2010
@@ -399,6 +399,10 @@ public class JIoEndpoint extends Abstrac
acceptorThread.setDaemon(getDaemon());
acceptorThread.start();
}
+
+// Start async timeout thread
+Thread timeoutThread = new Thread(new AsyncTimeout(), getName() +
-AsyncTimeout);
+timeoutThread.start();
}
}
Added: tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java?rev=958362view=auto
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java (added)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java Sun Jun
27 11:02:10 2010
@@ -0,0 +1,179 @@
+/*
+ * 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.
+ */
+package org.apache.catalina.core;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.AsyncListener;
+import javax.servlet.AsyncEvent;
+import javax.servlet.ServletException;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+/**
+ * Check Servlet 3.0 AsyncListener.
+ *
+ * @author Peter Rossbach
+ * @version $Revision$
+ */
+public class TestAsyncListener extends TomcatBaseTest {
+
+public void testTimeout() throws Exception {
+// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+
+// Must have a real docBase - just use temp
+File docBase = new File(System.getProperty(java.io.tmpdir));
+
+// Create the folder that will trigger the redirect
+File foo = new File(docBase, async);
+if (!foo.exists() !foo.mkdirs()) {
+fail(Unable to create async directory in docBase);
+}
+
+Context ctx = tomcat.addContext(/, docBase.getAbsolutePath());
+
+TimeoutServlet timeout = new TimeoutServlet();
+
+Wrapper wrapper = Tomcat.addServlet(ctx, time, timeout);
+wrapper.setAsyncSupported(true);
+ctx.addServletMapping(/async, time);
+
+tomcat.start();
+ByteChunk res = getUrl(http://localhost:; + getPort() + /async);
+Thread.sleep(4000);
+assertEquals(1,timeout.getAsyncTimeout());
+//assertEquals(1,timeout.getAsyncStart());
+assertEquals(1,timeout.getAsyncComplete());
+//assertEquals(hello start: + timeout.getStart() + \n,
res.toString());
+assertNull(res.toString());
+}
+
+private static class TimeoutServlet extends HttpServlet {
+private static final long serialVersionUID = 1L;
+
+private volatile int asyncStart = 0;
+private volatile int asyncComplete = 0;
+private volatile int asyncTimeout = 0;
+private volatile int asyncError = 0;
+
+private volatile long start;
+
+private int getAsyncTimeout() {
+return asyncTimeout
svn commit: r958406 - /tomcat/trunk/webapps/docs/changelog.xml
Author: pero Date: Sun Jun 27 18:41:48 2010 New Revision: 958406 URL: http://svn.apache.org/viewvc?rev=958406view=rev Log: remove second fix entry. Sorry! Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=958406r1=958405r2=958406view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Sun Jun 27 18:41:48 2010 @@ -38,10 +38,6 @@ subsection name=Catalina changelog fix -Start JioEndpoint timeout thread, to inform AsyncListner as async timeout is set -and application thread doesn't finished. (pero) - /fix - fix GSOC 2010. Continue work to align MBean descriptors with reality. Patch provided by Chamith Buddhika. (markt) /fix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r944217 - in /tomcat/trunk: java/org/apache/catalina/deploy/LocalStrings.properties java/org/apache/catalina/deploy/WebXml.java test/org/apache/catalina/deploy/TestWebXmlOrdering.java
Author: pero
Date: Fri May 14 12:07:00 2010
New Revision: 944217
URL: http://svn.apache.org/viewvc?rev=944217view=rev
Log:
Warn to be used wrong fragment name at web.xml!
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?rev=944217r1=944216r2=944217view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties Fri
May 14 12:07:00 2010
@@ -41,3 +41,4 @@ webXml.mergeConflictString=The [{0}] wit
webXml.multipleOther=Multiple others entries in ordering
webxml.unrecognisedPublicId=The public ID [{0}] did not match any of the known
public ID's for web.xml files so the version could not be identified
webXml.version.nfe=Unable to parse [{0}] from the version string [{1}]. This
component of the version string will be ignored.
+webXml.wrongFragmentName=Used a wrong fragment name {0} at web.xml
absolute-ordering tag!
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=944217r1=944216r2=944217view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Fri May 14
12:07:00 2010
@@ -2101,6 +2101,8 @@ public class WebXml {
WebXml fragment = fragments.get(requestedName);
if (fragment != null) {
orderedFragments.add(fragment);
+} else {
+
log.warn(sm.getString(webXml.wrongFragmentName,requestedName));
}
}
}
Modified: tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java?rev=944217r1=944216r2=944217view=diff
==
--- tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java Fri
May 14 12:07:00 2010
@@ -144,6 +144,14 @@ public class TestWebXmlOrdering extends
assertFalse(iter.hasNext());
}
+public void testWebFragmentsAbsoluteWrongFragmentName() {
+app.addAbsoluteOrdering(a);
+app.addAbsoluteOrdering(z);
+SetWebXml ordered = WebXml.orderWebFragments(app, fragments);
+assertEquals(1,ordered.size());
+assertEquals(fragments.get(a),ordered.toArray()[0]);
+}
+
public void testOrderWebFragmentsAbsoluteOthersEnd() {
app.addAbsoluteOrdering(b);
app.addAbsoluteOrdering(d);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r944304 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java java/org/apache/naming/resources/BaseDirContext.java test/org/apache/catalina/core/TestStandardContextResour
Author: pero
Date: Fri May 14 15:00:06 2010
New Revision: 944304
URL: http://svn.apache.org/viewvc?rev=944304view=rev
Log:
Fix change fragment absolute-ordering at web.xml with manager redeploy!
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=944304r1=944303r2=944304view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri May 14
15:00:06 2010
@@ -1171,7 +1171,7 @@ public class ContextConfig
* web.xml file.
*/
protected void webConfig() {
-WebXml webXml = new WebXml();
+WebXml webXml = createWebXml();
// Parse global web.xml if present
InputSource globalWebXml = getGlobalWebXmlSource();
@@ -1281,7 +1281,10 @@ public class ContextConfig
}
}
-
+protected WebXml createWebXml() {
+return new WebXml();
+}
+
/**
* Scan JARs for ServletContainerInitializer implementations.
* Implementations will be added in web-fragment.xml priority order.
Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=944304r1=944303r2=944304view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Fri May
14 15:00:06 2010
@@ -375,7 +375,16 @@ public abstract class BaseDirContext imp
* Release any resources allocated for this directory context.
*/
public void release() {
-// No action taken by the default implementation
+for(BaseDirContext bcontext: this.aliases.values()) {
+bcontext.release();
+}
+this.aliases.clear();
+for(DirContext dcontext: this.altDirContexts) {
+if(dcontext instanceof BaseDirContext) {
+((BaseDirContext)dcontext).release();
+}
+}
+this.altDirContexts.clear();
}
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=944304r1=944303r2=944304view=diff
==
---
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Fri May 14 15:00:06 2010
@@ -29,8 +29,12 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.deploy.WebXml;
+import org.apache.catalina.startup.ContextConfig;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.startup.Tomcat.DefaultWebXmlListener;
import org.apache.tomcat.util.buf.ByteChunk;
public class TestStandardContextResources extends TomcatBaseTest {
@@ -70,14 +74,69 @@ public class TestStandardContextResource
presourceE.jsp in the web application/p);
}
-public void testResources2() throws Exception {
+public void testResourcesAbsoluteOrdering() throws Exception {
Tomcat tomcat = getTomcatInstance();
File appDir = new File(test/webapp-3.0-fragments);
// app dir is relative to server home
StandardContext ctx = (StandardContext) tomcat.addWebapp(null, /test,
appDir.getAbsolutePath());
+LifecycleListener[] listener = ctx.findLifecycleListeners();
+assertEquals(3,listener.length);
+assertTrue(listener[1] instanceof ContextConfig);
+ContextConfig config = new ContextConfig() {
+protected WebXml createWebXml() {
+WebXml wxml = new WebXml();
+wxml.addAbsoluteOrdering(resources);
+wxml.addAbsoluteOrdering(resources2);
+return wxml;
+}
+};
+// prevent it from looking ( if it finds one - it'll have dup error )
+config.setDefaultWebXml(org/apache/catalin/startup/NO_DEFAULT_XML);
+listener[1] = config;
+Tomcat.addServlet(ctx, getresource, new GetResourceServlet());
+ctx.addServletMapping(/getresource
svn commit: r944305 - in /tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib: resources.jar resources2.jar
Author: pero Date: Fri May 14 15:03:35 2010 New Revision: 944305 URL: http://svn.apache.org/viewvc?rev=944305view=rev Log: Fix change fragment absolute-ordering at web.xml with manager redeploy! (Add test fragment samples) Modified: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources.jar tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar Modified: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources.jar URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources.jar?rev=944305r1=944304r2=944305view=diff == Binary files - no diff available. Modified: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar?rev=944305r1=944304r2=944305view=diff == Binary files - no diff available. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940405 - in /tomcat/trunk: java/org/apache/naming/resources/BaseDirContext.java test/org/apache/catalina/core/TestStandardContextResources.java test/webapp-3.0-fragments/WEB-INF/lib/resou
Author: pero
Date: Mon May 3 09:44:39 2010
New Revision: 940405
URL: http://svn.apache.org/viewvc?rev=940405view=rev
Log:
Search to more jars and fix testcase!
Modified:
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar
Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=940405r1=940404r2=940405view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Mon May
3 09:44:39 2010
@@ -456,9 +456,13 @@ public abstract class BaseDirContext imp
// Check the alternate locations
for (DirContext altDirContext : altDirContexts) {
-obj = altDirContext.lookup(META-INF/resources/ + name);
-if (obj != null)
-return obj;
+try {
+obj = altDirContext.lookup(META-INF/resources/ + name);
+if (obj != null)
+return obj;
+} catch ( NamingException ex) {
+// ignore
+}
}
// Really not found
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=940405r1=940404r2=940405view=diff
==
---
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Mon May 3 09:44:39 2010
@@ -84,7 +84,7 @@ public class TestStandardContextResource
tomcat.start();
assertPageContains(/test/getresource?path=/resourceF.jsp,
-presourceF.jsp in the web application/p);
+presourceF.jsp in resources2.jar/p);
assertPageContains(/test/getresource?path=/resourceA.jsp,
presourceA.jsp in the web application/p);
assertPageContains(/test/getresource?path=/resourceB.jsp,
Modified: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar?rev=940405r1=940404r2=940405view=diff
==
Binary files - no diff available.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940183 - /tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java
Author: pero Date: Sun May 2 09:40:46 2010 New Revision: 940183 URL: http://svn.apache.org/viewvc?rev=940183view=rev Log: Add License Header Modified: tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java Modified: tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java?rev=940183r1=940182r2=940183view=diff == --- tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java Sun May 2 09:40:46 2010 @@ -1,3 +1,19 @@ +/* + * 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. + */ package org.apache.catalina.startup; import java.io.IOException; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940184 - /tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java
Author: pero Date: Sun May 2 09:44:01 2010 New Revision: 940184 URL: http://svn.apache.org/viewvc?rev=940184view=rev Log: Revert... Editor seams display problem... Sorry! Modified: tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java Modified: tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java?rev=940184r1=940183r2=940184view=diff == --- tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java Sun May 2 09:44:01 2010 @@ -26,22 +26,7 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; /* - * 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. - */ +import javax.servlet.annotation.WebFilter; import javax.servlet.annotation.WebInitParam; /** - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r939638 - in /tomcat/trunk: java/org/apache/catalina/startup/ test/org/apache/catalina/startup/
Author: pero
Date: Fri Apr 30 11:23:41 2010
New Revision: 939638
URL: http://svn.apache.org/viewvc?rev=939638view=rev
Log:
web.xml or fragment must merge with annotations s. Servlet Spec 3.0 8.2.3
Added:
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java
(with props)
tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java (with
props)
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=939638r1=939637r2=939638view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Apr 30
11:23:41 2010
@@ -1970,8 +1970,6 @@ public class ContextConfig
.getValue());
}
}
-} else {
-// Ignore
}
}
if (!isWebXMLservletDef urlPatterns != null) {
@@ -1987,20 +1985,43 @@ public class ContextConfig
}
+/**
+ * process filter annotation and merge with existing one!
+ * FIXME: refactoring method to long and has redundant subroutines with
processAnnotationWebServlet!
+ * @param className
+ * @param ae
+ * @param fragment
+ */
protected void processAnnotationWebFilter(String className,
AnnotationEntry ae, WebXml fragment) {
-if (fragment.getFilters().containsKey(className)) {
-// Skip this annotation. Entry in web.xml takes priority
-return;
+String filterName = null;
+// must search for name s. Spec Servlet API 3.0 - 8.2.3.3.n.ii page 81
+ElementValuePair[] evps = ae.getElementValuePairs();
+for (ElementValuePair evp : evps) {
+String name = evp.getNameString();
+if (filterName.equals(name)) {
+filterName = evp.getValue().stringifyValue();
+break;
+}
}
-boolean urlPatternsSet = false;
-FilterDef filterDef = new FilterDef();
+if (filterName == null) {
+// classname is default filterName as annotation has no name!
+filterName = className;
+}
+FilterDef filterDef = fragment.getFilters().get(filterName);
FilterMap filterMap = new FilterMap();
-filterDef.setFilterName(className);
-filterDef.setFilterClass(className);
+
+boolean isWebXMLfilterDef = filterDef != null;
+if (!isWebXMLfilterDef) {
+filterDef = new FilterDef();
+filterDef.setFilterName(filterName);
+filterDef.setFilterClass(className);
+}
+
+boolean urlPatternsSet = false;
+boolean dispatchTypesSet = false;
String[] urlPatterns = null;
-ElementValuePair[] evps = ae.getElementValuePairs();
for (ElementValuePair evp : evps) {
String name = evp.getNameString();
if (value.equals(name) || urlPatterns.equals(name)) {
@@ -2008,49 +2029,101 @@ public class ContextConfig
throw new IllegalArgumentException(sm.getString(
contextConfig.urlPatternValue, className));
}
-urlPatternsSet = true;
urlPatterns = processAnnotationsStringArray(evp.getValue());
+urlPatternsSet = urlPatterns != null urlPatterns.length 0;
for (String urlPattern : urlPatterns) {
filterMap.addURLPattern(urlPattern);
}
-} else if (filterName.equals(name)) {
-filterDef.setFilterName(evp.getValue().stringifyValue());
} else if (servletNames.equals(name)) {
-String[] servletNames =
-processAnnotationsStringArray(evp.getValue());
+String[] servletNames = processAnnotationsStringArray(evp
+.getValue());
for (String servletName : servletNames) {
filterMap.addServletName(servletName);
}
} else if (dispatcherTypes.equals(name)) {
-String[] dispatcherTypes =
-processAnnotationsStringArray(evp.getValue());
+String[] dispatcherTypes = processAnnotationsStringArray(evp
+.getValue());
+dispatchTypesSet = dispatcherTypes != null
+ dispatcherTypes.length 0;
for (String dispatcherType : dispatcherTypes
svn commit: r939639 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java
Author: pero
Date: Fri Apr 30 11:25:10 2010
New Revision: 939639
URL: http://svn.apache.org/viewvc?rev=939639view=rev
Log:
Fix NPE if no encoding parameter exists at request!
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=939639r1=939638r2=939639view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Apr 30
11:25:10 2010
@@ -2513,9 +2513,13 @@ public class Request
parts.add(part);
if (part.getFilename() == null) {
try {
-parameters.addParameterValues(part.getName(),
+String encoding = parameters.getEncoding();
+if(encoding == null) {
+ encoding = Parameters.DEFAULT_ENCODING;
+}
+
parameters.addParameterValues(part.getName(),
new String[] {part.getString(
-parameters.getEncoding())});
+encoding)});
} catch (UnsupportedEncodingException uee) {
try {
parameters.addParameterValues(part.getName(),
@@ -2533,7 +2537,7 @@ public class Request
} catch (FileUploadBase.SizeException e) {
partsParseException = new IllegalStateException(e);
} catch (FileUploadException e) {
-partsParseException = new IOException();
+partsParseException = new IOException(e);
}
return;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r939650 - in /tomcat/trunk/test: org/apache/catalina/core/TestStandardContextResources.java webapp-3.0-fragments/WEB-INF/lib/resources2.jar
Author: pero Date: Fri Apr 30 12:10:08 2010 New Revision: 939650 URL: http://svn.apache.org/viewvc?rev=939650view=rev Log: Add second resource jar and testcase failed again :-( You can switch assert resourceF and see that also resourceB test failed.. Added: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar (with props) Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=939650r1=939649r2=939650view=diff == --- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java Fri Apr 30 12:10:08 2010 @@ -83,6 +83,8 @@ public class TestStandardContextResource tomcat.start(); +assertPageContains(/test/getresource?path=/resourceF.jsp, +presourceF.jsp in the web application/p); assertPageContains(/test/getresource?path=/resourceA.jsp, presourceA.jsp in the web application/p); assertPageContains(/test/getresource?path=/resourceB.jsp, Added: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar?rev=939650view=auto == Binary file - no diff available. Propchange: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar -- svn:mime-type = application/octet-stream - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r939774 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java
Author: pero
Date: Fri Apr 30 18:49:52 2010
New Revision: 939774
URL: http://svn.apache.org/viewvc?rev=939774view=rev
Log:
Space to tab
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=939774r1=939773r2=939774view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Apr 30
18:49:52 2010
@@ -2514,12 +2514,11 @@ public class Request
if (part.getFilename() == null) {
try {
String encoding = parameters.getEncoding();
-if(encoding == null) {
- encoding = Parameters.DEFAULT_ENCODING;
+if (encoding == null) {
+encoding = Parameters.DEFAULT_ENCODING;
}
-
parameters.addParameterValues(part.getName(),
-new String[] {part.getString(
-encoding)});
+parameters.addParameterValues(part.getName(),
+new String[] { part.getString(encoding) });
} catch (UnsupportedEncodingException uee) {
try {
parameters.addParameterValues(part.getName(),
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r939212 - in /tomcat/trunk: java/org/apache/catalina/startup/ test/org/apache/catalina/startup/
Author: pero
Date: Thu Apr 29 06:37:20 2010
New Revision: 939212
URL: http://svn.apache.org/viewvc?rev=939212view=rev
Log:
Fix my IDE and use spaces. - No functional change
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java
tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=939212r1=939211r2=939212view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Apr 29
06:37:20 2010
@@ -1900,13 +1900,13 @@ public class ContextConfig
break;
}
}
-if(servletName == null) {
- // classname is default servletName as annotation has no name!
+if (servletName == null) {
+// classname is default servletName as annotation has no name!
servletName = className;
}
ServletDef servletDef = fragment.getServlets().get(servletName);
boolean isWebXMLservletDef = servletDef != null;
-if(!isWebXMLservletDef) {
+if (!isWebXMLservletDef) {
servletDef = new ServletDef();
servletDef.setServletName(servletName);
servletDef.setServletClass(className);
@@ -1914,7 +1914,7 @@ public class ContextConfig
boolean urlPatternsSet = false;
String[] urlPatterns = null;
-//ElementValuePair[] evps = ae.getElementValuePairs();
+// ElementValuePair[] evps = ae.getElementValuePairs();
for (ElementValuePair evp : evps) {
String name = evp.getNameString();
if (value.equals(name) || urlPatterns.equals(name)) {
@@ -1925,62 +1925,65 @@ public class ContextConfig
urlPatternsSet = true;
urlPatterns = processAnnotationsStringArray(evp.getValue());
} else if (description.equals(name)) {
- if(servletDef.getDescription() == null) {
-
servletDef.setDescription(evp.getValue().stringifyValue());
- }
+if (servletDef.getDescription() == null) {
+servletDef.setDescription(evp.getValue().stringifyValue());
+}
} else if (displayName.equals(name)) {
- if(servletDef.getDisplayName() == null) {
-
servletDef.setDisplayName(evp.getValue().stringifyValue());
- }
+if (servletDef.getDisplayName() == null) {
+servletDef.setDisplayName(evp.getValue().stringifyValue());
+}
} else if (largeIcon.equals(name)) {
- if(servletDef.getLargeIcon() == null) {
-
servletDef.setLargeIcon(evp.getValue().stringifyValue());
- }
+if (servletDef.getLargeIcon() == null) {
+servletDef.setLargeIcon(evp.getValue().stringifyValue());
+}
} else if (smallIcon.equals(name)) {
- if(servletDef.getSmallIcon() == null) {
-
servletDef.setSmallIcon(evp.getValue().stringifyValue());
- }
+if (servletDef.getSmallIcon() == null) {
+servletDef.setSmallIcon(evp.getValue().stringifyValue());
+}
} else if (asyncSupported.equals(name)) {
- if(servletDef.getAsyncSupported() == null) {
-
servletDef.setAsyncSupported(evp.getValue().stringifyValue());
- }
- } else if (loadOnStartup.equals(name)) {
- if(servletDef.getLoadOnStartup() == null) {
-
servletDef.setLoadOnStartup(evp.getValue().stringifyValue());
- }
+if (servletDef.getAsyncSupported() == null) {
+servletDef.setAsyncSupported(evp.getValue()
+.stringifyValue());
+}
+} else if (loadOnStartup.equals(name)) {
+if (servletDef.getLoadOnStartup() == null) {
+servletDef
+.setLoadOnStartup(evp.getValue().stringifyValue());
+}
} else if (initParams.equals(name)) {
-MapString,String initParams =
-processAnnotationWebInitParams(evp.getValue());
-if(isWebXMLservletDef) {
- MapString,String webXMLInitParams
svn commit: r939342 - /tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
Author: pero Date: Thu Apr 29 15:21:54 2010 New Revision: 939342 URL: http://svn.apache.org/viewvc?rev=939342view=rev Log: Fix to correct JarScanner (StandardJarScanner) default! Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=939342r1=939341r2=939342view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Thu Apr 29 15:21:54 2010 @@ -205,7 +205,7 @@ public class ContextRuleSet extends Rule addWrapperListener, 0); digester.addObjectCreate(prefix + Context/JarScanner, - org.apache.catalina.startup.DefaultJarScanner, + org.apache.tomcat.util.scan.StandardJarScanner, className); digester.addSetProperties(prefix + Context/JarScanner); digester.addSetNext(prefix + Context/JarScanner, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r939114 - in /tomcat/trunk: java/org/apache/catalina/startup/ test/org/apache/catalina/startup/
Author: pero
Date: Wed Apr 28 22:16:49 2010
New Revision: 939114
URL: http://svn.apache.org/viewvc?rev=939114view=rev
Log:
web.xml and fragments overwrite annotation parameters (s. Servlet API Sepc Nov
2009 Section 8.2.3.3 pages 80-84)
not yet complete -- filter support is missing!
Added:
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
(with props)
tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java
(with props)
tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java (with
props)
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=939114r1=939113r2=939114view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Apr 28
22:16:49 2010
@@ -1890,17 +1890,31 @@ public class ContextConfig
protected void processAnnotationWebServlet(String className,
AnnotationEntry ae, WebXml fragment) {
-if (fragment.getServlets().containsKey(className)) {
-// Skip this annotation. Entry in web.xml takes priority
-return;
+String servletName = null;
+// must search for name s. Spec Servlet API 3.0 - 8.2.3.3.n.ii page 81
+ElementValuePair[] evps = ae.getElementValuePairs();
+for (ElementValuePair evp : evps) {
+String name = evp.getNameString();
+if (name.equals(name)) {
+servletName = evp.getValue().stringifyValue();
+break;
+}
+}
+if(servletName == null) {
+ // classname is default servletName as annotation has no name!
+servletName = className;
+}
+ServletDef servletDef = fragment.getServlets().get(servletName);
+boolean isWebXMLservletDef = servletDef != null;
+if(!isWebXMLservletDef) {
+servletDef = new ServletDef();
+servletDef.setServletName(servletName);
+servletDef.setServletClass(className);
}
boolean urlPatternsSet = false;
-ServletDef servletDef = new ServletDef();
-servletDef.setServletName(className);
-servletDef.setServletClass(className);
String[] urlPatterns = null;
-ElementValuePair[] evps = ae.getElementValuePairs();
+//ElementValuePair[] evps = ae.getElementValuePairs();
for (ElementValuePair evp : evps) {
String name = evp.getNameString();
if (value.equals(name) || urlPatterns.equals(name)) {
@@ -1910,38 +1924,64 @@ public class ContextConfig
}
urlPatternsSet = true;
urlPatterns = processAnnotationsStringArray(evp.getValue());
-} else if (name.equals(name)) {
-servletDef.setServletName(evp.getValue().stringifyValue());
} else if (description.equals(name)) {
-servletDef.setDescription(evp.getValue().stringifyValue());
+ if(servletDef.getDescription() == null) {
+
servletDef.setDescription(evp.getValue().stringifyValue());
+ }
} else if (displayName.equals(name)) {
-servletDef.setDisplayName(evp.getValue().stringifyValue());
+ if(servletDef.getDisplayName() == null) {
+
servletDef.setDisplayName(evp.getValue().stringifyValue());
+ }
} else if (largeIcon.equals(name)) {
-servletDef.setLargeIcon(evp.getValue().stringifyValue());
+ if(servletDef.getLargeIcon() == null) {
+
servletDef.setLargeIcon(evp.getValue().stringifyValue());
+ }
} else if (smallIcon.equals(name)) {
-servletDef.setSmallIcon(evp.getValue().stringifyValue());
+ if(servletDef.getSmallIcon() == null) {
+
servletDef.setSmallIcon(evp.getValue().stringifyValue());
+ }
} else if (asyncSupported.equals(name)) {
-servletDef.setAsyncSupported(evp.getValue().stringifyValue());
-} else if (loadOnStartup.equals(name)) {
-servletDef.setLoadOnStartup(evp.getValue().stringifyValue());
+ if(servletDef.getAsyncSupported() == null) {
+
servletDef.setAsyncSupported(evp.getValue().stringifyValue());
+ }
+ } else if (loadOnStartup.equals(name)) {
+ if(servletDef.getLoadOnStartup() == null
svn commit: r939115 - /tomcat/trunk/webapps/docs/changelog.xml
Author: pero Date: Wed Apr 28 22:18:24 2010 New Revision: 939115 URL: http://svn.apache.org/viewvc?rev=939115view=rev Log: web.xml and fragments overwrite annotation parameters (s. Servlet API Sepc Nov 2009 Section 8.2.3.3 pages 80-84) not yet complete -- filter support is missing! Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=939115r1=939114r2=939115view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Apr 28 22:18:24 2010 @@ -28,6 +28,7 @@ author email=fha...@apache.orgFilip Hanik/author author email=rj...@apache.orgRainer Jung/author author email=kkoli...@apache.orgKonstantin Kolinko/author +author email=p...@apache.orgPeter Rossbach/author titleChangelog/title /properties @@ -35,6 +36,13 @@ section name=Tomcat 7.0.0 (markt) subsection name=Catalina changelog + fix +rev939114/rev: Provide web.xml and fragments overwrite annotation parameters +(s. Servlet API 3.0 Spec at Nov 2009 Section 8.2.3.3 pages 80-84). +Check source at codeContextConfig.processAnnotationsFile(File,WebXml)/code +and testcase codeTestContextConfigAnnotation/code. +--not yet complete-- (pero) + /fix update Improve and document VirtualWebappLoader. (rjung) /update - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r937993 - /tomcat/trunk/build.xml
Author: pero
Date: Mon Apr 26 10:46:01 2010
New Revision: 937993
URL: http://svn.apache.org/viewvc?rev=937993view=rev
Log:
Include .project and .classpath files to src distribution.
s. http://ant.apache.org/manual/dirtasks.html#defaultexcludes to not include
scm files!
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=937993r1=937992r2=937993view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Apr 26 10:46:01 2010
@@ -1338,8 +1338,8 @@ Apache Tomcat ${version} native binaries
!-- Tomcat source --
copy todir=${tomcat.dist}/src
- fileset dir=${basedir}
-exclude name=.*/**/
+ fileset dir=${basedir} defaultexcludes=true
+exclude name=.settings/**/
exclude name=modules/**/
exclude name=output/**/
exclude name=build.properties/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r900477 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Mon Jan 18 17:46:12 2010 New Revision: 900477 URL: http://svn.apache.org/viewvc?rev=900477view=rev Log: Cast my 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=900477r1=900476r2=900477view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 18 17:46:12 2010 @@ -92,7 +92,7 @@ * Force disconnect upon transmission failure http://svn.apache.org/viewvc?rev=898906view=rev - +1: fhanik, jim + +1: fhanik, jim, pero -1: * Remove @Deprecated annotations from javax.servlet.jsp.JspContext - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r888904 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Wed Dec 9 18:15:08 2009 New Revision: 888904 URL: http://svn.apache.org/viewvc?rev=888904view=rev Log: cast my 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=888904r1=888903r2=888904view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 9 18:15:08 2009 @@ -459,7 +459,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47342 Fix NPE on replicated context start Patch provided by Keiichi Fujino - +1: markt + +1: markt, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47453 @@ -473,7 +473,7 @@ Don't try and replicate attributes we know to be non-serializable Patch by Tim Funk http://svn.apache.org/viewvc?rev=886019view=rev - +1: markt + +1: markt, pero -1: * Prevent lost log messages on shutdown - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r834790 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/session/DeltaSession.java webapps/docs/changelog.xml
Author: pero
Date: Wed Nov 11 07:38:48 2009
New Revision: 834790
URL: http://svn.apache.org/viewvc?rev=834790view=rev
Log:
Fix CrossContext replication support
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=834790r1=834789r2=834790view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 11 07:38:48 2009
@@ -190,11 +190,6 @@
+1: fhanik, kkolinko, rjung
-1:
-* Fix ReplicationValve CrossContext support
- http://svn.apache.org/viewvc?rev=831718view=rev
- +1: pero, rjung, funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
Alternative patch that adds a new PrivilegedAction. The test case provided
passes with this patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=834790r1=834789r2=834790view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Wed Nov 11 07:38:48 2009
@@ -370,6 +370,17 @@
return (this.isValid);
}
+/**
+ * End the access and register to ReplicationValve (crossContext support)
+ */
+public void endAccess() {
+ super.endAccess() ;
+ if(manager instanceof DeltaManager) {
+((DeltaManager)manager).registerSessionAtReplicationValve(this);
+ }
+}
+
+
// - Session Public Methods
/**
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=834790r1=834789r2=834790view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Nov 11 07:38:48 2009
@@ -367,6 +367,9 @@
subsection name=Cluster
changelog
fix
+DeltaSession needs endAccess that CrossContext replication work. (pero)
+ /fix
+ fix
DeltaManager needs to replicate changed attributes even if session
gets invalidated. Otherwise session listeners will not see the right
data on the secondary nodes. (rjung)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r831718 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Author: pero
Date: Sun Nov 1 18:29:14 2009
New Revision: 831718
URL: http://svn.apache.org/viewvc?rev=831718view=rev
Log:
Fix ReplicationValve crossContext support
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=831718r1=831717r2=831718view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Sun Nov
1 18:29:14 2009
@@ -361,6 +361,16 @@
return (this.isValid);
}
+/**
+ * End the access and register to ReplicationValve (crossContext support)
+ */
+public void endAccess() {
+ super.endAccess() ;
+ if(manager instanceof DeltaManager) {
+((DeltaManager)manager).registerSessionAtReplicationValve(this);
+ }
+}
+
// - Session Public Methods
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r831720 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Sun Nov 1 18:34:04 2009 New Revision: 831720 URL: http://svn.apache.org/viewvc?rev=831720view=rev Log: Add ReplicationValve CrossContext support patch 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=831720r1=831719r2=831720view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 1 18:34:04 2009 @@ -383,3 +383,9 @@ http://svn.apache.org/viewvc?rev=831106view=rev +1: fhanik, kkolinko -1: + +* Fix ReplicationValve CrossContext support + http://svn.apache.org/viewvc?rev=831718view=rev + +1: pero + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r819471 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Mon Sep 28 08:15:10 2009 New Revision: 819471 URL: http://svn.apache.org/viewvc?rev=819471view=rev Log: Cast my 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=819471r1=819470r2=819471view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 28 08:15:10 2009 @@ -341,14 +341,14 @@ That's a problem in case a session listener needs the changed attribute. Has already been fixed in trunk, OACC and tc5.5.x. http://svn.apache.org/viewvc?rev=818062view=rev (trunk) - +1: rjung + +1: rjung, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47320 Don't rely on the platform default encoding being suitable to parse the session ID http://svn.apache.org/viewvc?rev=819339view=rev - +1: markt + +1: markt, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47324 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812819 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
Author: pero Date: Wed Sep 9 08:29:33 2009 New Revision: 812819 URL: http://svn.apache.org/viewvc?rev=812819view=rev Log: Fix getter access of boolean attributes Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml?rev=812819r1=812818r2=812819view=diff == --- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml (original) +++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml Wed Sep 9 08:29:33 2009 @@ -54,6 +54,7 @@ attributename=poolSweeperEnabled description=Returns true if the pool has a background thread running type=java.lang.Boolean +is=true writeable=false/ attributename=url @@ -69,11 +70,13 @@ attributename=defaultAutoCommit description=The JDBC auto commit setting for new connections type=java.lang.Boolean +is=true writeable=false/ attributename=defaultReadOnly description=The JDBC read only setting for new connections type=java.lang.Boolean +is=true writeable=false/ attributename=defaultTransactionIsolation @@ -124,16 +127,19 @@ attributename=testOnBorrow description=True if validation happens when a connection is requested type=java.lang.Boolean +is=true writeable=false/ attributename=testOnReturn description=True if validation happens when a connection is returned type=java.lang.Boolean +is=true writeable=false/ attributename=testWhileIdle description=True if validation happens when a connection is not in use (idle) type=java.lang.Boolean +is=true writeable=false/ attributename=timeBetweenEvictionRunsMillis @@ -154,11 +160,13 @@ attributename=accessToUnderlyingConnectionAllowed description=Returns true if one can retrieve the actual JDBC connection type=java.lang.Boolean +is=true writeable=false/ attributename=removeAbandoned description=Returns true if connection in use can be timed out type=java.lang.Boolean +is=true writeable=false/ attributename=removeAbandonedTimeout @@ -169,6 +177,7 @@ attributename=logAbandoned description=If true, stack trace will be recorded and printed out for timed out connection type=java.lang.Boolean +is=true writeable=false/ attributename=loginTimeout @@ -202,9 +211,10 @@ type=java.lang.String writeable=false/ -attributename=isTestOnConnect +attributename=testOnConnect description=Validate connection after connection has been established type=java.lang.Boolean +is=true writeable=false/ attributename=jdbcInterceptors - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812361 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: pero Date: Tue Sep 8 07:36:32 2009 New Revision: 812361 URL: http://svn.apache.org/viewvc?rev=812361view=rev Log: Good catch Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=812361r1=812360r2=812361view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Sep 8 07:36:32 2009 @@ -99,6 +99,6 @@ not get replicated before the expiration replication message. That's a problem in case a session listener needs the changed attribute. Patch: http://people.apache.org/~rjung/patches/TC5.5-cluster-replicate-before-expire.patch - +1: rjung + +1: rjung, pero -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r775080 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster: mcast/McastServiceImpl.java membership/McastServiceImpl.java
Author: pero
Date: Fri May 15 10:28:29 2009
New Revision: 775080
URL: http://svn.apache.org/viewvc?rev=775080view=rev
Log:
reset loopback=true that cluster member from same machine can communicate
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=775080r1=775079r2=775080view=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
Fri May 15 10:28:29 2009
@@ -170,7 +170,8 @@
protected void setupSocket() throws IOException {
if (mcastBindAddress != null) {
try {
-log.info(Attempting to bind the multicast socket to
+address+:+port);
+ if(log.isInfoEnabled())
+log.info(Attempting to bind the multicast socket to
+address+:+port);
socket = new MulticastSocket(new
InetSocketAddress(address,port));
} catch (BindException e) {
/*
@@ -178,13 +179,13 @@
* to the multicast address. In this case only bind to the
* port.
*/
-log.info(Binding to multicast address, failed. Binding to
port only.);
+log.warn(Binding to multicast address, failed. Binding to
port only.);
socket = new MulticastSocket(port);
}
} else {
socket = new MulticastSocket(port);
}
-socket.setLoopbackMode(true); //hint that we don't need loop back
messages
+socket.setLoopbackMode(false); //hint that we don't need loop back
messages
if (mcastBindAddress != null) {
if(log.isInfoEnabled())
log.info(Setting multihome multicast interface to: +
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=775080r1=775079r2=775080view=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
Fri May 15 10:28:29 2009
@@ -182,7 +182,8 @@
protected void setupSocket() throws IOException {
if (mcastBindAddress != null) {
try {
-log.info(Attempting to bind the multicast socket to
+address+:+port);
+if(log.isInfoEnabled())
+log.info(Attempting to bind the multicast socket to
+address+:+port);
socket = new MulticastSocket(new
InetSocketAddress(address,port));
} catch (BindException e) {
/*
@@ -190,13 +191,13 @@
* to the multicast address. In this case only bind to the
* port.
*/
-log.info(Binding to multicast address, failed. Binding to
port only.);
+log.warn(Binding to multicast address, failed. Binding to
port only.);
socket = new MulticastSocket(port);
}
} else {
socket = new MulticastSocket(port);
}
-socket.setLoopbackMode(true); //hint that we don't need loop back
messages
+socket.setLoopbackMode(false); //hint that we don't need loop back
messages
if (mcastBindAddress != null) {
if(log.isInfoEnabled())
log.info(Setting multihome multicast interface to: +
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r772872 - in /tomcat/trunk/java/org/apache/catalina/loader: LocalStrings.properties WebappClassLoader.java
Author: pero
Date: Fri May 8 07:40:59 2009
New Revision: 772872
URL: http://svn.apache.org/viewvc?rev=772872view=rev
Log:
close stream after error
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=772872r1=772871r2=772872view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Fri
May 8 07:40:59 2009
@@ -29,6 +29,7 @@
standardLoader.starting=Starting this Loader
standardLoader.stopping=Stopping this Loader
webappClassLoader.stopped=Illegal access: this web application instance has
been stopped already. Could not load {0}. The eventual following stack trace
is caused by an error thrown for debugging purposes as well as to attempt to
terminate the thread which caused the illegal access, and has no functional
impact.
+webappClassLoader.readError=Resource read error: Could not load {0}.
webappClassLoader.wrongVersion=(unable to load class {0})
webappLoader.addRepository=Adding repository {0}
webappLoader.deploy=Deploying class repositories to work directory {0}
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=772872r1=772871r2=772872view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri May
8 07:40:59 2009
@@ -2097,15 +2097,14 @@
break;
pos += n;
}
-binaryStream.close();
} catch (IOException e) {
-e.printStackTrace();
-return null;
-} catch (Exception e) {
-e.printStackTrace();
+log.error(sm.getString(webappClassLoader.readError,
name), e);
return null;
+} finally {
+try {
+binaryStream.close();
+} catch (IOException e) {}
}
-
if (fileNeedConvert) {
String str = new String(binaryContent,0,pos);
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r772875 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Fri May 8 07:48:28 2009 New Revision: 772875 URL: http://svn.apache.org/viewvc?rev=772875view=rev Log: add backport fix Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=772875r1=772874r2=772875view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri May 8 07:48:28 2009 @@ -144,4 +144,10 @@ Update Windows installer to work automatically on 64-bit machines http://svn.apache.org/viewvc?view=revrevision=770876 +1: markt, pero - -1: + -1: + +* Fix Close Stream at WebappClassLoader after read error + http://svn.apache.org/viewvc?rev=772872view=rev + +1: pero + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r770975 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Sat May 2 18:38:00 2009 New Revision: 770975 URL: http://svn.apache.org/viewvc?rev=770975view=rev Log: Cast my 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=770975r1=770974r2=770975view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat May 2 18:38:00 2009 @@ -179,12 +179,12 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47080 Prevent NPE when mapper makes no matches http://svn.apache.org/viewvc?rev=770809view=rev - +1: markt + +1: markt, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47086 Include 64-bit windows binaries in distributions Update Windows installer to work automatically on 64-bit machines http://svn.apache.org/viewvc?view=revrevision=770876 - +1: markt + +1: markt, pero -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r770147 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Thu Apr 30 10:23:15 2009 New Revision: 770147 URL: http://svn.apache.org/viewvc?rev=770147view=rev Log: Cast my 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=770147r1=770146r2=770147view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 30 10:23:15 2009 @@ -60,7 +60,7 @@ http://svn.apache.org/viewvc?rev=751289view=rev http://svn.apache.org/viewvc?rev=753039view=rev Make MemoryUserDatabase read-only by default - +1: markt, rjung + +1: markt, rjung, pero -1: * Backport cleanup of semantics of thisAccessedTime and @@ -115,14 +115,14 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46985 Clean up timeout handling http://svn.apache.org/viewvc?rev=763262view=rev - +1: markt + +1: markt, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46990 Correct various sync issues reported by FindBugs Patch provided by s...@a.o http://svn.apache.org/viewvc?rev=763298view=rev - +1: markt, rjung + +1: markt, rjung, pero 0: remm (zzz) -1: @@ -130,20 +130,20 @@ Use correct link on error page in JSP security example Patch provided by Michael Moody http://svn.apache.org/viewvc?rev=763325view=rev - +1: markt, rjung + +1: markt, rjung, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46909 Only include ';' in type attribute if there is a parameter http://svn.apache.org/viewvc?rev=763611view=rev - +1: markt, rjung + +1: markt, rjung, pero 0: remm (zzz) -1: * https://issues.apache.org/bugzilla/show_bug.cgi?id=46984 Invalid characters in HTTP request method should result in a 400 http://svn.apache.org/viewvc?rev=763654view=rev - +1: markt, rjung + +1: markt, rjung, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390 @@ -158,7 +158,7 @@ Use system property rather than hard code default http://svn.apache.org/viewvc?rev=764985view=rev http://svn.apache.org/viewvc?rev=764997view=rev - +1: markt, rjung + +1: markt, rjung, pero -0: remm: Why should this be backported ? -1: @@ -173,5 +173,5 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47046 Deregister all MBeans when the server is stopped http://svn.apache.org/viewvc?rev=769979view=rev - +1: markt + +1: markt, pero -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r769850 - /tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Author: pero Date: Wed Apr 29 17:49:56 2009 New Revision: 769850 URL: http://svn.apache.org/viewvc?rev=769850view=rev Log: fix wrong package Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?rev=769850r1=769849r2=769850view=diff == --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java Wed Apr 29 17:49:56 2009 @@ -35,7 +35,7 @@ import org.apache.catalina.cluster.ClusterManager; import org.apache.catalina.cluster.ClusterMessage; import org.apache.catalina.cluster.ClusterValve; -import org.apache.catalina.ha.session.DeltaSession; +import org.apache.catalina.cluster.session.DeltaSession; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.session.ManagerBase; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r761682 - /tomcat/current/tc5.5.x/STATUS.txt
Author: pero Date: Fri Apr 3 13:59:57 2009 New Revision: 761682 URL: http://svn.apache.org/viewvc?rev=761682view=rev Log: Cast my 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=761682r1=761681r2=761682view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Apr 3 13:59:57 2009 @@ -172,7 +172,7 @@ the remote port. Backport of http://svn.apache.org/viewvc?rev=756926view=rev and http://svn.apache.org/viewvc?rev=757223view=rev - +1: rjung, markt + +1: rjung, markt, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026 @@ -180,7 +180,7 @@ Part 2 of the backport proposed and approved above (r697183), now also for the other AJP connectors. http://svn.apache.org/viewvc?rev=757721view=rev - +1: rjung, markt + +1: rjung, markt, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41606 @@ -203,7 +203,7 @@ For details see the log messages of r759694. Port of http://svn.apache.org/viewvc?rev=759694view=rev from OACC to tc5.5.x. - +1: rjung + +1: rjung, pero -1: * Fix some litmus test suite failures with WebDAV - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r757208 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Sun Mar 22 16:29:10 2009 New Revision: 757208 URL: http://svn.apache.org/viewvc?rev=757208view=rev Log: Comment my 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=757208r1=757207r2=757208view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Mar 22 16:29:10 2009 @@ -123,4 +123,6 @@ mturk: Perhaps we should consider prefixing all those private variables with AJP_ so that is clear this is AJP protocol extension environment variable. + pero: But REMOTE_PORT is a existing apache httpd env var! +1 for prefixing. +What we can do at mod_jk/IIS? -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r757005 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Sat Mar 21 20:23:58 2009 New Revision: 757005 URL: http://svn.apache.org/viewvc?rev=757005view=rev Log: Cast my 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=757005r1=757004r2=757005view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Mar 21 20:23:58 2009 @@ -119,5 +119,5 @@ attributes, we use generic attributes mechanism to forward the remote port. Backport of http://svn.apache.org/viewvc?rev=756926view=rev - +1: rjung + +1: rjung, pero -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r757007 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Sat Mar 21 20:28:36 2009 New Revision: 757007 URL: http://svn.apache.org/viewvc?rev=757007view=rev Log: Cast my 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=757007r1=757006r2=757007view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Mar 21 20:28:36 2009 @@ -77,7 +77,7 @@ Build script re-factoring Patch provided by Marc Guillemot http://svn.apache.org/viewvc?rev=729681view=rev - +1: markt, jim + +1: markt, jim, pero 0: fhanik - not sure its needed in 6.0 branch if all is working with the old script 0: funkman - ditto -1: @@ -110,7 +110,7 @@ * Fix use of setLoopbackMode() for tribes multicast. Backport of http://svn.apache.org/viewvc?rev=755302view=rev - +1: rjung, fhanik + +1: rjung, fhanik, pero -1: * Allow AJP connectors to provide correct getRemotePort(). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r753168 - /tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
Author: pero
Date: Fri Mar 13 08:46:29 2009
New Revision: 753168
URL: http://svn.apache.org/viewvc?rev=753168view=rev
Log:
Make digester final ...
Modified:
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
Modified:
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java?rev=753168r1=753167r2=753168view=diff
==
---
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
(original)
+++
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
Fri Mar 13 08:46:29 2009
@@ -158,7 +158,7 @@
/**
* The codeDigester/code instance used to parse registry descriptors.
*/
-public static Digester digester = createDigester();
+public static final Digester digester = createDigester();
public static Digester getDigester() {
return digester;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r721111 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Wed Nov 26 23:46:51 2008 New Revision: 72 URL: http://svn.apache.org/viewvc?rev=72view=rev Log: Cast my 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=72r1=721110r2=72view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 26 23:46:51 2008 @@ -154,7 +154,7 @@ page handling consistent http://svn.apache.org/viewvc?rev=710063view=rev http://svn.apache.org/viewvc?rev=710125view=rev (to address Remy's comment) - +1: markt, fhanik + +1: markt, fhanik, pero 0: remm (I think it should now be ok) -1: @@ -177,7 +177,7 @@ Include jar in path for dependencies if they are in a JAR Patch provided by C�dric Mailleux http://svn.apache.org/viewvc?rev=710205view=rev - +1: markt, remm, fhanik + +1: markt, remm, fhanik, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46011 @@ -196,7 +196,7 @@ Correctly handle includes with multi-level contexts Patch provided by Peter Jodeleit http://svn.apache.org/viewvc?rev=712461view=rev - +1: markt, fhanik, remm + +1: markt, fhanik, remm, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42747 @@ -211,12 +211,12 @@ * Add Costin's DBCP check so you can build Tomcat 6 on a 1.6 JDK http://svn.apache.org/viewvc?view=revrevision=652744 http://svn.apache.org/viewvc?view=revrevision=653247 - +1: markt, fhanik, remm + +1: markt, fhanik, remm, pero -1: * Remove unnecessary commons-logging reference from manifest http://svn.apache.org/viewvc?view=revrevision=612607 - +1: markt, remm, fhanik + +1: markt, remm, fhanik, pero -1: * Fix broken URL mapping in examples @@ -226,7 +226,7 @@ * Clean up dist.xml http://svn.apache.org/viewvc?rev=718360view=rev - +1: markt, remm, fhanik + +1: markt, remm, fhanik, pero -1: * Make sure DIR deployment with context.xml works when configBase does no exist. @@ -238,12 +238,12 @@ * Fix possible NPE in NioEndpoint http://svn.apache.org/viewvc?rev=719096view=rev - +1: fhanik, markt + +1: fhanik, markt, pero -1: * Fix send file bug http://svn.apache.org/viewvc?rev=719129view=rev - +1: fhanik + +1: fhanik, pero -1: * Make thread pool limits dynamically configurable - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r712276 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Fri Nov 7 13:32:08 2008 New Revision: 712276 URL: http://svn.apache.org/viewvc?rev=712276view=rev Log: Add ReplicationValve NPE fix. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=712276r1=712275r2=712276view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 7 13:32:08 2008 @@ -255,3 +255,9 @@ Based on a patch provided by tsveg1 +1: markt -1: + +* Fix http://svn.apache.org/viewvc?rev=712274view=rev + ReplicationValve can throw NPE as context doesn't exists! (Config as Engine level) + +1: pero + -1: + \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r712274 - /tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
Author: pero
Date: Fri Nov 7 13:29:21 2008
New Revision: 712274
URL: http://svn.apache.org/viewvc?rev=712274view=rev
Log:
FIX possible NPE as Engine level configuration, as context dosen't exists!
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=712274r1=712273r2=712274view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Fri Nov
7 13:29:21 2008
@@ -345,24 +345,26 @@
crossContextSessions.set(new ArrayList());
}
getNext().invoke(request, response);
-Manager manager = request.getContext().getManager();
-if (manager != null manager instanceof ClusterManager) {
-ClusterManager clusterManager = (ClusterManager) manager;
-CatalinaCluster containerCluster = (CatalinaCluster)
getContainer().getCluster();
-if (containerCluster == null) {
-if (log.isWarnEnabled())
-log.warn(sm.getString(ReplicationValve.nocluster));
-return;
+if(context != null) {
+Manager manager = context.getManager();
+if (manager != null manager instanceof ClusterManager) {
+ClusterManager clusterManager = (ClusterManager) manager;
+CatalinaCluster containerCluster = (CatalinaCluster)
getContainer().getCluster();
+if (containerCluster == null) {
+if (log.isWarnEnabled())
+
log.warn(sm.getString(ReplicationValve.nocluster));
+return;
+}
+// valve cluster can access manager - other cluster handle
replication
+// at host level - hopefully!
+if(containerCluster.getManager(clusterManager.getName())
== null)
+return ;
+if(containerCluster.hasMembers()) {
+sendReplicationMessage(request, totalstart,
isCrossContext, clusterManager, containerCluster);
+} else {
+resetReplicationRequest(request,isCrossContext);
+}
}
-// valve cluster can access manager - other cluster handle
replication
-// at host level - hopefully!
-if(containerCluster.getManager(clusterManager.getName()) ==
null)
-return ;
-if(containerCluster.hasMembers()) {
-sendReplicationMessage(request, totalstart,
isCrossContext, clusterManager, containerCluster);
-} else {
-resetReplicationRequest(request,isCrossContext);
-}
}
} finally {
// Array must be remove: Current master request send endAccess at
recycle.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r712281 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Fri Nov 7 13:47:04 2008 New Revision: 712281 URL: http://svn.apache.org/viewvc?rev=712281view=rev Log: cast my 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=712281r1=712280r2=712281view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 7 13:47:04 2008 @@ -45,7 +45,7 @@ * Fix comet behavior Invoke READ when there is a body and make sure END is called if CometEvent.close is called during an invokation http://svn.apache.org/viewvc?rev=677473view=rev - +1: fhanik, funkman + +1: fhanik, funkman, pero 0: remm: no idea if it's better or worse (the fact that it's been closed is visible) -1: @@ -103,8 +103,8 @@ * Allow asynchronous close() and setTimeout() on CometEvents http://svn.apache.org/viewvc?view=revrevision=645175 - +1: fhanik - 0: remm (maybe, don't know ...), pero ( Is close and timeout also working with APR? remm: APR does not do per connection timeout) + +1: fhanik, pero + 0: remm (maybe, don't know ...) -1: * More EL fixes. Add lookaheads to prevent parsing ambiguity @@ -130,7 +130,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45851 Fix NPE and out of order message processing issues http://svn.apache.org/viewvc?rev=699427view=rev - +1: markt, fhanik + +1: markt, fhanik, pero 0: -1: @@ -142,7 +142,7 @@ * Fix small memory leak found by Find Bugs http://svn.apache.org/viewvc?rev=699634view=rev - +1: markt,fhanik + +1: markt,fhanik, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45933 @@ -189,7 +189,7 @@ * Start poller before acceptor in NIO, bug 43701 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?view=diffr1=618058r2=618059 - +1: fhanik + +1: fhanik, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46105 @@ -208,7 +208,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46115 Path is required when using deploy http://svn.apache.org/viewvc?rev=709816view=rev - +1: markt, rjung + +1: markt, rjung, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42409 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r712278 - in /tomcat/trunk/java/org/apache/tomcat/util/net: NioEndpoint.java SocketProperties.java
Author: pero
Date: Fri Nov 7 13:40:37 2008
New Revision: 712278
URL: http://svn.apache.org/viewvc?rev=712278view=rev
Log:
Fix NPE to use Http11NioProtocol handler with default parameters!
# example:
Executor name=tomcatThreadPool namePrefix=catalina-exec-
maxThreads=150 minSpareThreads=4/
Connector executor=tomcatThreadPool
port=8080
protocol=org.apache.coyote.http11.Http11NioProtocol
connectionTimeout=2
redirectPort=8443 /
Used at MAC OS X with -Djava.net.preferIPv4Stack=true
I am not sure that default returns are correct!
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=712278r1=712277r2=712278view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Nov 7
13:40:37 2008
@@ -735,7 +735,12 @@
return;
serverSock = ServerSocketChannel.open();
-
serverSock.socket().setPerformancePreferences(socketProperties.getPerformanceConnectionTime(),
+int performanceConnectionTime =
socketProperties.getPerformanceConnectionTime();
+int performanceLatency= socketProperties.getPerformanceLatency();
+int performanceBandwidth = socketProperties.getPerformanceBandwidth();
+if (performanceConnectionTime != -1 performanceLatency != -1
+performanceBandwidth != -1)
+
serverSock.socket().setPerformancePreferences(socketProperties.getPerformanceConnectionTime(),
socketProperties.getPerformanceLatency(),
socketProperties.getPerformanceBandwidth());
InetSocketAddress addr = (address!=null?new
InetSocketAddress(address,port):new InetSocketAddress(port));
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java?rev=712278r1=712277r2=712278view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java Fri Nov
7 13:40:37 2008
@@ -210,55 +210,82 @@
}
public boolean getOoBInline() {
-return ooBInline.booleanValue();
+if(ooBInline != null)
+return ooBInline.booleanValue();
+return false;
}
public int getPerformanceBandwidth() {
-return performanceBandwidth.intValue();
+if(performanceBandwidth != null)
+return performanceBandwidth.intValue();
+return -1;
}
public int getPerformanceConnectionTime() {
-return performanceConnectionTime.intValue();
+if(performanceConnectionTime!= null)
+return performanceConnectionTime.intValue();
+return -1;
+
}
public int getPerformanceLatency() {
-return performanceLatency.intValue();
+if(performanceLatency != null)
+return performanceLatency.intValue();
+return -1 ;
}
public int getRxBufSize() {
-return rxBufSize.intValue();
+if(rxBufSize != null)
+return rxBufSize.intValue();
+return -1;
}
public boolean getSoKeepAlive() {
-return soKeepAlive.booleanValue();
+if(soKeepAlive != null)
+return soKeepAlive.booleanValue();
+return false;
}
public boolean getSoLingerOn() {
-return soLingerOn.booleanValue();
+if(soLingerOn != null)
+return soLingerOn.booleanValue();
+return false;
}
public int getSoLingerTime() {
-return soLingerTime.intValue();
+if(soLingerTime != null)
+return soLingerTime.intValue();
+return -1;
}
public boolean getSoReuseAddress() {
-return soReuseAddress.booleanValue();
+if(soReuseAddress != null)
+return soReuseAddress.booleanValue();
+return false;
}
public int getSoTimeout() {
-return soTimeout.intValue();
+if(soTimeout != null)
+return soTimeout.intValue();
+return -1;
}
public int getSoTrafficClass() {
-return soTrafficClass.intValue();
+if(soTrafficClass != null)
+return soTrafficClass.intValue();
+return -1;
}
public boolean getTcpNoDelay() {
-return tcpNoDelay.booleanValue();
+if(tcpNoDelay != null
svn commit: r712285 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Fri Nov 7 13:53:36 2008 New Revision: 712285 URL: http://svn.apache.org/viewvc?rev=712285view=rev Log: Cast my 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=712285r1=712284r2=712285view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 7 13:53:36 2008 @@ -253,7 +253,7 @@ Make Principal accessible (if set) via Subject.getSubject(AccessController.getContext()) when processing filters. Based on a patch provided by tsveg1 - +1: markt + +1: markt, pero -1: * Fix http://svn.apache.org/viewvc?rev=712274view=rev - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708178 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Mon Oct 27 06:54:04 2008 New Revision: 708178 URL: http://svn.apache.org/viewvc?rev=708178view=rev Log: cast my 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=708178r1=708177r2=708178view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 06:54:04 2008 @@ -184,12 +184,12 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45951 Support changing of JSESSIONID cookie name and jsessionid path parameter name http://svn.apache.org/viewvc?rev=702219view=rev - +1: markt, fhanik + +1: markt, fhanik, pero -1: * Derefence socket when the request is complete http://svn.apache.org/viewvc?rev=702676view=rev - +1: fhanik, remm, markt + +1: fhanik, remm, markt, pero -1: * Backport NCDFE fix from trunk (TCK failures without it) @@ -201,15 +201,15 @@ * Fix classcast exception upon shutdown(edgecase) http://svn.apache.org/viewvc?rev=706433view=rev - +1: fhanik, markt + +1: fhanik, markt, pero -1: * maxThreads to be 200 by default http://svn.apache.org/viewvc?rev=707264view=rev - +1: fhanik, markt + +1: fhanik, markt, pero -1: * Fix read/write timeout during async comet access http://svn.apache.org/viewvc?rev=707670view=rev - +1: fhanik + +1: fhanik, pero -1: \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r700014 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Mon Sep 29 00:40:07 2008 New Revision: 700014 URL: http://svn.apache.org/viewvc?rev=700014view=rev Log: Cast my Vote, Please, add comment at changelog that it works only with current mod_jk 1.2.27 trunk! 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=700014r1=700013r2=700014view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 29 00:40:07 2008 @@ -164,7 +164,7 @@ carried forward to trunk and tc6.0.x. http://svn.apache.org/viewvc?rev=697192view=rev Original change: http://svn.apache.org/viewvc?rev=486217view=rev - +1: rjung, mturk, markt + +1: rjung, mturk, markt, pero 0: remm (also partially applies to the two other AJP connectors) * Add CombinedRealm and LockOutRealm with docs - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r693378 - in /tomcat/trunk: java/org/apache/catalina/ha/session/JvmRouteBinderValve.java webapps/docs/changelog.xml
Author: pero
Date: Mon Sep 8 23:18:32 2008
New Revision: 693378
URL: http://svn.apache.org/viewvc?rev=693378view=rev
Log:
Handle session suffix rewrite with parallel requests from same client
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=693378r1=693377r2=693378view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Mon Sep 8 23:18:32 2008
@@ -35,6 +35,7 @@
import org.apache.catalina.ha.ClusterManager;
import org.apache.catalina.ha.ClusterMessage;
import org.apache.catalina.ha.ClusterValve;
+import org.apache.catalina.ha.session.DeltaSession;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.session.ManagerBase;
@@ -217,8 +218,8 @@
* @param response current response
*/
protected void handlePossibleTurnover(Request request, Response response) {
-Session session = request.getSessionInternal(false);
-if (session != null) {
+String sessionID = request.getRequestedSessionId() ;
+if (sessionID != null) {
long t1 = System.currentTimeMillis();
String jvmRoute = getLocalJvmRoute(request);
if (jvmRoute == null) {
@@ -226,7 +227,7 @@
log.debug(sm.getString(jvmRoute.missingJvmRouteAttribute));
return;
}
-handleJvmRoute( request, response,session.getIdInternal(),
jvmRoute);
+handleJvmRoute( request, response, sessionID, jvmRoute);
if (log.isDebugEnabled()) {
long t2 = System.currentTimeMillis();
long time = t2 - t1;
@@ -306,23 +307,32 @@
log.debug(sm.getString(jvmRoute.failover, requestJvmRoute,
localJvmRoute, sessionId));
}
-// OK - turnover the session ?
-String newSessionID = sessionId.substring(0, index) + .
-+ localJvmRoute;
Session catalinaSession = null;
try {
catalinaSession = getManager(request).findSession(sessionId);
} catch (IOException e) {
// Hups!
}
+String id = sessionId.substring(0, index);
+String newSessionID = id + . + localJvmRoute;
+// OK - turnover the session and inform other cluster nodes
if (catalinaSession != null) {
changeSessionID(request, response, sessionId, newSessionID,
catalinaSession);
numberOfSessions++;
} else {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString(jvmRoute.cannotFindSession,
-sessionId));
+try {
+catalinaSession =
getManager(request).findSession(newSessionID);
+} catch (IOException e) {
+// Hups!
+}
+if (catalinaSession != null) {
+// session is rewrite at other request, rewrite this also
+changeRequestSessionID(request, response, sessionId,
newSessionID);
+} else {
+if (log.isDebugEnabled()) {
+
log.debug(sm.getString(jvmRoute.cannotFindSession,sessionId));
+}
}
}
}
@@ -344,11 +354,36 @@
Response response, String sessionId, String newSessionID, Session
catalinaSession) {
lifecycle.fireLifecycleEvent(Before session migration,
catalinaSession);
-request.setRequestedSessionId(newSessionID);
+// FIXME: setId trigger session Listener, but only chance to
registiert manager with correct id!
catalinaSession.setId(newSessionID);
+// FIXME: Why we remove change data from other running request?
+// setId also trigger resetDeltaRequest!!
if (catalinaSession instanceof DeltaSession)
((DeltaSession) catalinaSession).resetDeltaRequest();
-if(request.isRequestedSessionIdFromCookie())
setNewSessionCookie(request, response,newSessionID);
+changeRequestSessionID(request, response, sessionId, newSessionID);
+// now sending the change to all other clusternode!
+ClusterManager manager = (ClusterManager)catalinaSession.getManager();
+sendSessionIDClusterBackup(manager,request,sessionId, newSessionID);
+lifecycle.fireLifecycleEvent(After session
svn commit: r693379 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Mon Sep 8 23:22:13 2008 New Revision: 693379 URL: http://svn.apache.org/viewvc?rev=693379view=rev Log: add new fix at JvmRouteBinderValve 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=693379r1=693378r2=693379view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 8 23:22:13 2008 @@ -131,3 +131,9 @@ * ETag improvement: https://issues.apache.org/bugzilla/show_bug.cgi?id=45735 +1: remm, markt -1: + +* Handle session suffix rewrite at JvmRouteBinderValve with parallel requests from same client + http://svn.apache.org/viewvc?rev=693378view=rev + +1: pero + -1: + \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r693380 - /tomcat/current/tc5.5.x/STATUS.txt
Author: pero Date: Mon Sep 8 23:38:31 2008 New Revision: 693380 URL: http://svn.apache.org/viewvc?rev=693380view=rev Log: Add JvmRouteBinderValve fix 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=693380r1=693379r2=693380view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Mon Sep 8 23:38:31 2008 @@ -78,5 +78,9 @@ This does not happen for tc6.0.x and should be seen as a different issue. +1: rjung, markt - -1:· + -1: +* Backport: Handle session suffix rewrite at JvmRouteBinderValve with parallel requests from same client + http://svn.apache.org/viewvc?rev=693378view=rev + +1: pero + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r662184 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Sun Jun 1 02:08:30 2008 New Revision: 662184 URL: http://svn.apache.org/viewvc?rev=662184view=rev Log: Cast my 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=662184r1=662183r2=662184view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 1 02:08:30 2008 @@ -85,7 +85,7 @@ Reloaded context has new classloader so the context classloader needs to be reset http://svn.apache.org/viewvc?rev=661074view=rev - +1: markt, remm + +1: markt, remm, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45101 @@ -100,5 +100,5 @@ fired before sessionDidActivate(). The spec isn't 100% clear on the required order but this seems more logical than the current behaviour. http://svn.apache.org/viewvc?rev=654932view=rev - +1: markt, remm + +1: markt, remm, pero -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r656535 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Thu May 15 01:01:48 2008 New Revision: 656535 URL: http://svn.apache.org/viewvc?rev=656535view=rev Log: Cast my 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=656535r1=656534r2=656535view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 15 01:01:48 2008 @@ -58,23 +58,23 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42662 http://svn.apache.org/viewvc?view=revrevision=645184 - +1: fhanik, markt + +1: fhanik, markt, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44595 http://svn.apache.org/viewvc?view=revrevision=645428 - +1: jfclere, rjung, fhanik, remm + +1: jfclere, rjung, fhanik, remm, pero -1: * Correctly override methods Fixes: https://issues.apache.org/bugzilla/show_bug.cgi?id=44833 http://svn.apache.org/viewvc?view=revrevision=649238 - +1: fhanik, markt + +1: fhanik, markt, pero -1: * Expose always send flag for configuration http://svn.apache.org/viewvc?view=revrevision=649252 - +1: fhanik, markt + +1: fhanik, markt, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43343 @@ -82,19 +82,19 @@ persisting http://svn.apache.org/viewvc?rev=652662view=rev Based on a suggestion by Wade Chandler - +1: markt, remm + +1: markt, remm, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=4 Correct sendfile docs http://svn.apache.org/viewvc?rev=652666view=rev - +1: markt, remm + +1: markt, remm, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43150 Start if the installation path contains # http://svn.apache.org/viewvc?rev=652669view=rev - +1: markt, remm + +1: markt, remm, pero -1: * Possible NPE in EL (one liner regression fix in org.apache.el.lang.ELSupport) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r648257 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Tue Apr 15 07:00:05 2008 New Revision: 648257 URL: http://svn.apache.org/viewvc?rev=648257view=rev Log: Cast my 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=648257r1=648256r2=648257view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 15 07:00:05 2008 @@ -63,19 +63,19 @@ * Prevent the connector entering an infinite loop https://issues.apache.org/bugzilla/show_bug.cgi?id=44620 http://svn.apache.org/viewvc?rev=640572view=rev - +1: markt, fhanik + +1: markt, fhanik, pero -1: * Document missing secret attributes https://issues.apache.org/bugzilla/show_bug.cgi?id=44715 http://svn.apache.org/viewvc?rev=643497view=rev - +1: mark, fhanik + +1: mark, fhanik, pero -1: * Fix NIO/Sendfile problem http://svn.apache.org/viewvc?rev=644858view=rev http://svn.apache.org/viewvc?rev=644860view=rev - +1: fhanik, markt + +1: fhanik, markt, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44759 @@ -96,23 +96,23 @@ * Better handling of lack of permission for context specific logging http://svn.apache.org/viewvc?rev=646543view=rev - +1: markt, remm + +1: markt, remm, pero -1: * Additional permission required to read JDK logging config http://svn.apache.org/viewvc?rev=646550view=rev - +1: markt, remm + +1: markt, remm, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44785 Correct default maxThreads for AJP connector http://svn.apache.org/viewvc?rev=646559view=rev - +1: markt, remm + +1: markt, remm, pero -1: * Clean up type checking code. Patch provided by Konstantin Kolinko. http://svn.apache.org/viewvc?rev=646571view=rev - +1: markt, remm + +1: markt, remm, pero -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44428 @@ -168,15 +168,15 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44380 Don't scan non-file URLs for TLDs http://svn.apache.org/viewvc?rev=647345view=rev - +1: markt, remm + +1: markt, remm, pero -1: * Fix some links in ROOT app is renamed. Minor clean-up. http://svn.apache.org/viewvc?rev=648017view=rev - +1: markt, remm + +1: markt, remm, pero -1: * Align different Realm docs http://svn.apache.org/viewvc?rev=648161view=rev - +1: markt, remm + +1: markt, remm, pero -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r642534 - /tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/DataSenderTest.java
Author: pero
Date: Sat Mar 29 06:38:26 2008
New Revision: 642534
URL: http://svn.apache.org/viewvc?rev=642534view=rev
Log:
remove debug println
Modified:
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/DataSenderTest.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/DataSenderTest.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/DataSenderTest.java?rev=642534r1=642533r2=642534view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/DataSenderTest.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/DataSenderTest.java
Sat Mar 29 06:38:26 2008
@@ -410,7 +410,6 @@
* @see java.net.Socket#getOutputStream()
*/
public OutputStream getOutputStream() throws IOException {
- System.out.println(getOutputString + isWriteIOException());
if(isWriteIOException()) {
throw new IOException(MockSocket);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r642408 - /tomcat/sandbox/tomcat-oacc/trunk/docs/oacc-howto.xml
Author: pero Date: Fri Mar 28 15:29:42 2008 New Revision: 642408 URL: http://svn.apache.org/viewvc?rev=642408view=rev Log: update docs Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/oacc-howto.xml Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/oacc-howto.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/oacc-howto.xml?rev=642408r1=642407r2=642408view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/oacc-howto.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/oacc-howto.xml Fri Mar 28 15:29:42 2008 @@ -248,13 +248,18 @@ | \ | -- DeltaManager | - - - | | | \ - ReceiverSender Membership \ - \ -- Valve - -- SocketReplicationListener| \ - -- ReplicationListener | -- ReplicationValve - | -- JvmRouteBinderValve + --- + | | | \ + ReceiverSender Membership \ + | \ | + | -- mcast.McastService| + | -- membership.McastService | + \-- Valve + -- SocketReplicationListener| \ + -- ReplicationListener | -- ReplicationValve + | -- JvmRouteBinderValve + | + - | -- LifecycleListener | @@ -541,6 +546,122 @@ lt;/Servergt; /source /p +/section +section name=Cluster Configuration for Membership +p +List of Attributesbr/ +table border=1 cellpadding=5 + + tr +th align=center bgcolor=aquaAttribute/th +th align=center bgcolor=aquaDescription/th +th align=center bgcolor=aquaDefault value/th + /tr + + tr +tdmcastAddr/td +tdMulticast IP address +/td +tdcode228.0.0.4/code/td + /tr + tr +tdmcastBindAddress/td +tdMulticast IP interface address +/td +tdcodeauto/code/td + /tr + tr +tdmcastPort/td +tdMulticast UDP port +/td +tdcode8012/code/td + /tr + tr +tdmcastClusterDomain/td +tdCluster domain of this member +/td +tdcodecatalina/code/td + /tr + tr +tdmcastFrequency/td +tdPing member send check frequency at msec +/td +tdcode1000 msec/code/td + /tr + tr +tdmcastDropTime/td +tdTimeout from frequency ping after member disapper notify +/td +tdcode3 msec/code/td + /tr + tr +tdmcastSoTimeout/td +tdMulticast socket timeout (-1 unlimited) +/td +tdcode-1 msec/code/td + /tr + tr +tdmcastTTL/td +td +/td +tdcode-1/code/td + /tr + tr +tdrecoveryCounter/td +tdCounter after membership failure socket restarted +/td +tdcode10/code/td + /tr + tr +tdrecoveryEnabled/td +tdMembership socket recovery enabled +/td +tdcodetrue/code/td + /tr + tr +tdrecoverySleepTime/td +tdSleep time between next socket recovery +/td +tdcode5000/code msec/td + /tr +/table +/p +p +Default Membership Service:br/ +source +lt;Membership + className=org.apache.catalina.cluster.mcast.McastService + mcastAddr=228.0.0.4 + mcastPort=45564 + mcastFrequency=1000 + mcastDropTime=3 + recoveryCounter=10 + recoveryEnabled=true + recoverySleepTime=5000/gt; +/source +/p +p +New Start/Stop Membership Service:br/ +source +lt;Membership + className=org.apache.catalina.cluster.membership.McastService + mcastAddr=228.0.0.4 + mcastPort=45564 + mcastClusterDomain=d10 + mcastFrequency=1000 + mcastDropTime=3 + recoveryCounter=10 + recoveryEnabled=true + recoverySleepTime=5000/gt; +/source +This service drop member after receiver a Membership SHUTDOWN message +pre +xxx org.apache.catalina.cluster.tcp.SimpleTcpCluster memberDisappeared +INFO: Received member disappeared:org.apache.catalina.cluster.membership.McastMember[tcp://x.x.x.x:8004,d10,x.x.x.x,8004, alive=48974, command=SHUTDOWN]br/ +xxx org.apache.catalina.cluster.util.FastQueue remove +INFO: FastQueue.remove: Remove aborted although queue enabledbr/ +/pre +/p /section section name=Cluster Configuration for ReplicationTransmitter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r642409 - /tomcat/sandbox/tomcat-oacc/trunk/build.xml
Author: pero
Date: Fri Mar 28 15:30:18 2008
New Revision: 642409
URL: http://svn.apache.org/viewvc?rev=642409view=rev
Log:
fix membership ressource
Modified:
tomcat/sandbox/tomcat-oacc/trunk/build.xml
Modified: tomcat/sandbox/tomcat-oacc/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.xml?rev=642409r1=642408r2=642409view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.xml Fri Mar 28 15:30:18 2008
@@ -131,6 +131,10 @@
tofile=${oacc.build}/classes/org/apache/catalina/cluster/mcast/LocalStrings.properties/
copy
file=${basedir}/src/share/org/apache/catalina/cluster/mcast/mbeans-descriptors.xml
tofile=${oacc.build}/classes/org/apache/catalina/cluster/mcast/mbeans-descriptors.xml/
+copy
file=${basedir}/src/share/org/apache/catalina/cluster/membership/LocalStrings.properties
+
tofile=${oacc.build}/classes/org/apache/catalina/cluster/membership/LocalStrings.properties/
+copy
file=${basedir}/src/share/org/apache/catalina/cluster/membership/mbeans-descriptors.xml
+
tofile=${oacc.build}/classes/org/apache/catalina/cluster/membership/mbeans-descriptors.xml/
copy
file=${basedir}/src/share/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml
tofile=${oacc.build}/classes/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml/
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r642411 - /tomcat/sandbox/tomcat-oacc/trunk/etc/cluster-server.xml
Author: pero Date: Fri Mar 28 15:30:51 2008 New Revision: 642411 URL: http://svn.apache.org/viewvc?rev=642411view=rev Log: update tomcat 6 example Modified: tomcat/sandbox/tomcat-oacc/trunk/etc/cluster-server.xml Modified: tomcat/sandbox/tomcat-oacc/trunk/etc/cluster-server.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/etc/cluster-server.xml?rev=642411r1=642410r2=642411view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/etc/cluster-server.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/etc/cluster-server.xml Fri Mar 28 15:30:51 2008 @@ -1,4 +1,4 @@ -?xml version=1.0 encoding=UTF-8? +?xml version='1.0' encoding='utf-8'? !-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,371 +15,53 @@ See the License for the specific language governing permissions and limitations under the License. -- -!-- Example Server Configuration File - Search for Cluster-- -!-- Note that component elements are nested corresponding to their - parent-child relationships with each other -- +Server port=8005 shutdown=SHUTDOWN -!-- A Server is a singleton element that represents the entire JVM, - which may contain one or more Service instances. The Server - listens for a shutdown command on the indicated port. + Listener className=org.apache.catalina.core.JasperListener / - Note: A Server is not itself a Container, so you may not - define subcomponents such as Valves or Loggers at this level. - -- - -Server port=8005 shutdown=SHUTDOWN debug=0 - - - !-- Comment these entries out to disable JMX MBeans support -- - !-- You may also configure custom components (e.g. Valves/Realms) by - including your own mbean-descriptor file(s), and setting the - descriptors attribute to point to a ';' seperated list of paths - (in the ClassLoader sense) of files to add to the default list. - e.g. descriptors=/com/myfirm/mypackage/mbean-descriptor.xml - -- - Listener className=org.apache.catalina.mbeans.ServerLifecycleListener -debug=0/ - Listener className=org.apache.catalina.mbeans.GlobalResourcesLifecycleListener -debug=0/ - - !-- Global JNDI resources -- GlobalNamingResources - -!-- Test entry for demonstration purposes -- -Environment name=simpleValue type=java.lang.Integer value=30/ - -!-- Editable user database that can also be used by - UserDatabaseRealm to authenticate users -- Resource name=UserDatabase auth=Container type=org.apache.catalina.UserDatabase - description=User database that can be updated and saved -/Resource -ResourceParams name=UserDatabase - parameter -namefactory/name -valueorg.apache.catalina.users.MemoryUserDatabaseFactory/value - /parameter - parameter -namepathname/name -valueconf/tomcat-users.xml/value - /parameter -/ResourceParams - + description=User database that can be updated and saved + factory=org.apache.catalina.users.MemoryUserDatabaseFactory + pathname=conf/tomcat-users.xml + readonly=true / /GlobalNamingResources - !-- A Service is a collection of one or more Connectors that share - a single Container (and therefore the web applications visible - within that Container). Normally, that Container is an Engine, - but this is not required. - - Note: A Service is not itself a Container, so you may not - define subcomponents such as Valves or Loggers at this level. - -- - - !-- Define the Tomcat Stand-Alone Service -- - Service name=Tomcat-Standalone - -!-- A Connector represents an endpoint by which requests are received - and responses are returned. Each Connector passes requests on to the - associated Container (normally an Engine) for processing. - - By default, a non-SSL HTTP/1.1 Connector is established on port 8080. - You can also enable an SSL HTTP/1.1 Connector on port 8443 by - following the instructions below and uncommenting the second Connector - entry. SSL support requires the following steps (see the SSL Config - HOWTO in the Tomcat 5 documentation bundle for more detailed - instructions): - * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or - later, and put the JAR files into $JAVA_HOME/jre/lib/ext. - * Execute: - %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows) - $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA (Unix) - with a password value of changeit for both the certificate and - the keystore itself. - - By default, DNS lookups are enabled when a web application calls - request.getRemoteHost
svn commit: r642412 - /tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
Author: pero Date: Fri Mar 28 15:31:20 2008 New Revision: 642412 URL: http://svn.apache.org/viewvc?rev=642412view=rev Log: add my last changes 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=642412r1=642411r2=642412view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Fri Mar 28 15:31:20 2008 @@ -24,6 +24,7 @@ properties author email=[EMAIL PROTECTED]Rainer Jung/author +author email=[EMAIL PROTECTED]Peter Rossbach/author titleChangelog/title /properties @@ -32,6 +33,16 @@ subsection name=Cluster changelog add + New Membership service (org.apache.catalina.cluster.membership.McastService) + to better control tomcat cluster node start and stop (pero) + /add + fix +Porting the junit testcases (pero) + /fix + fix +ReplicationValve NPE as requested context is not available (pero) + /fix + add Initial port of org.apache.catalina.cluster from Tomcat 5.5 to Tomcat 6.0 (rjung) /add @@ -39,6 +50,15 @@ /subsection subsection name=Docs changelog + update +build.xml javadoc generation (pero) + /update + update +Update cluster etc/cluster-server.xml example (pero) + /update + add +Add cluster membership element docs to OACC (pero) + /add add Initial port of Tomcat 5.5 cluster docs to OACC (rjung) /add - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r641973 - in /tomcat/sandbox/tomcat-oacc/trunk/test: ./ src/share/org/apache/catalina/cluster/session/ src/share/org/apache/catalina/cluster/tcp/
Author: pero
Date: Thu Mar 27 13:38:44 2008
New Revision: 641973
URL: http://svn.apache.org/viewvc?rev=641973view=rev
Log:
reactivate test cases
Modified:
tomcat/sandbox/tomcat-oacc/trunk/test/build.xml
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/DataSenderTest.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/test/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/build.xml?rev=641973r1=641972r2=641973view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/test/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/test/build.xml Thu Mar 27 13:38:44 2008
@@ -17,36 +17,31 @@
--
!-- @author Peter Rossbach --
project name=Tomcat: Cluster Testcases basedir=. default=test
- property file=../../../../build/build.properties /
- property file=../../../../build/build.properties.default /
+ property file=../build.properties /
+ property file=../build.properties.default /
property name=test.report.logs value=logs/reports /
property name=test.results value=logs/test-results /
property name=compile.optimize value=true /
property name=compile.debug value=true /
- property name=compile.source value=1.4 /
+ property name=compile.source value=1.5 /
property name=compile.deprecation value=true /
property name=compile.nowarn value=off /
- property name=compile.encoding value=ISO-8859-1 /
+ property name=compile.encoding value=UTF-8 /
property name=build.dir value=build/test /
property name=src.dir value=src/share /
- property name=catalina.home value=../../../../build/build /
+ property name=oacc.dist value=../dist /
!-- Build the classpath --
- path id=project.classpath
- pathelement location=${jmx.jar} /
- pathelement location=${commons-logging.jar} /
- pathelement location=${log4j.jar} /
- fileset dir=${catalina.home}/common/endorsed
- include name=*.jar /
- /fileset
- fileset dir=${catalina.home}/common/lib
- include name=*.jar /
- /fileset
- fileset dir=${catalina.home}/server/lib
- include name=*.jar /
- /fileset
- /path
+path id=oacc.classpath
+ pathelement location=${catalina.home}/lib/catalina.jar/
+ pathelement location=${catalina.home}/lib/tomcat-coyote.jar/
+ pathelement location=${catalina.extras}/tomcat-juli.jar/
+ pathelement location=${catalina.home}/lib/servlet-api.jar/
+ pathelement location=${oacc.dist}/lib/catalina-oacc.jar/
+ pathelement location=${oacc.dist}/lib/catalina-sso.jar/
+/path
+
target name=build-prepare
mkdir dir=${build.dir} /
@@ -75,7 +70,7 @@
!-- Compiles all sources --
javac destdir=${build.dir}/classes srcdir=${src.dir}
includes=**/*.java excludes=**/CVS/** deprecation=${compile.deprecation}
debug=${compile.debug} source=${compile.source}
optimize=${compile.optimize} nowarn=${compile.nowarn}
encoding=${compile.encoding}
classpath
- path refid=project.classpath /
+ path refid=oacc.classpath /
/classpath
/javac
/target
@@ -83,13 +78,16 @@
target name=test depends=compile description=Run unit tests
delete dir=${test.results} /
mkdir dir=${test.results} /
+ echo Some tests logging Warnings or Errors, but this is
OK!
+---
+ /echo
junit fork=yes failureProperty=test.failure
jvmarg value=-Dcatalina.base=${basedir} /
jvmarg value=-Dcatalina.home=${catalina.home} /
- jvmarg
value=-Dlog4j.configuration=file:conf/log4j.xml /
+ jvmarg
value=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager /
classpath
pathelement location=${build.dir}/classes /
- path refid=project.classpath /
+ path refid=oacc.classpath /
/classpath
formatter type=plain usefile=false /
formatter type=xml /
Modified:
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java
URL:
http
svn commit: r641974 - /tomcat/sandbox/tomcat-oacc/trunk/build.xml
Author: pero
Date: Thu Mar 27 13:40:22 2008
New Revision: 641974
URL: http://svn.apache.org/viewvc?rev=641974view=rev
Log:
fix javadoc target
Modified:
tomcat/sandbox/tomcat-oacc/trunk/build.xml
Modified: tomcat/sandbox/tomcat-oacc/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.xml?rev=641974r1=641973r2=641974view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.xml Thu Mar 27 13:40:22 2008
@@ -134,13 +134,13 @@
delete dir=${oacc.build}/javadoc/
mkdir dir=${oacc.build}/javadoc/
javadoc packagenames=org.apache.catalina.*
- classpathref=catalina.classpath
+ classpathref=oacc.classpath
sourcepathref=javadoc.sourcepath
destdir=${oacc.build}/javadoc
author=true
version=true
- windowtitle=Catalina Internal API Documentation
- doctitle=Catalina API
+ windowtitle=Catalina Cluster Internal API Documentation
+ doctitle=Catalina Cluster API
bottom=Copyright #169; 2000-2008 Apache Software Foundation. All
Rights Reserved.
/
/target
@@ -151,12 +151,6 @@
delete dir=${oacc.build}/
/target
-
- !-- BUILD: Rebuild Everything = --
-
-
-
-
!-- === DIST: Create Directories === --
target name=dist-prepare
mkdir dir=${oacc.dist}/
@@ -172,19 +166,17 @@
basedir=${oacc.build}/classes
include name=org/apache/catalina/cluster/** /
exclude name=**/package.html /
- exclude name=**/LocalStrings_* /
/jar
jar destfile=${oacc.dist}/lib/catalina-sso.jar
basedir=${oacc.build}/classes
include name=org/apache/catalina/authenticator/** /
exclude name=**/package.html /
- exclude name=**/LocalStrings_* /
/jar
ant target=dist dir=docs/
/target
target name=copy depends=dist
- copy file=${oacc.dist}/lib/catalina-oacc.jar
todir=${catalina.build}/lib /
+ copy file=${oacc.dist}/lib/catalina-oacc.jar
todir=${catalina.home}/lib /
/target
!-- === DIST: Clean Directory == --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r641445 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
Author: pero
Date: Wed Mar 26 11:01:48 2008
New Revision: 641445
URL: http://svn.apache.org/viewvc?rev=641445view=rev
Log:
Fix possible NPE
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java?rev=641445r1=641444r2=641445view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
Wed Mar 26 11:01:48 2008
@@ -331,10 +331,10 @@
if(isDoProcessingStats()) {
totalstart = System.currentTimeMillis();
}
-if (primaryIndicator) {
+Context context = request.getContext();
+if (primaryIndicator context != null) {
createPrimaryIndicator(request) ;
}
-Context context = request.getContext();
boolean isCrossContext = context != null
context instanceof StandardContext
((StandardContext) context).getCrossContext();
@@ -346,24 +346,26 @@
crossContextSessions.set(new ArrayList());
}
getNext().invoke(request, response);
-Manager manager = request.getContext().getManager();
-if (manager != null manager instanceof ClusterManager) {
-ClusterManager clusterManager = (ClusterManager) manager;
-CatalinaCluster containerCluster = (CatalinaCluster)
getContainer().getCluster();
-if (containerCluster == null) {
-if (log.isWarnEnabled())
-log.warn(sm.getString(ReplicationValve.nocluster));
-return;
-}
-// valve cluster can access manager - other cluster handle
replication
-// at host level - hopefully!
-if(containerCluster.getManager(clusterManager.getName()) ==
null)
-return ;
-if(containerCluster.hasMembers()) {
-sendReplicationMessage(request, totalstart,
isCrossContext, clusterManager, containerCluster);
-} else {
-resetReplicationRequest(request,isCrossContext);
-}
+if(context != null) {
+ Manager manager = context.getManager();
+ if (manager != null manager instanceof ClusterManager) {
+ ClusterManager clusterManager = (ClusterManager)
manager;
+ CatalinaCluster containerCluster = (CatalinaCluster)
getContainer().getCluster();
+ if (containerCluster == null) {
+ if (log.isWarnEnabled())
+
log.warn(sm.getString(ReplicationValve.nocluster));
+ return;
+ }
+ // valve cluster can access manager - other cluster
handle replication
+ // at host level - hopefully!
+
if(containerCluster.getManager(clusterManager.getName()) == null)
+ return ;
+ if(containerCluster.hasMembers()) {
+ sendReplicationMessage(request, totalstart,
isCrossContext, clusterManager, containerCluster);
+ } else {
+ resetReplicationRequest(request,isCrossContext);
+ }
+ }
}
} finally {
// Array must be remove: Current master request send endAccess at
recycle.
@@ -632,29 +634,32 @@
protected void createPrimaryIndicator(Request request) throws IOException {
String id = request.getRequestedSessionId();
if ((id != null) (id.length() 0)) {
-Manager manager = request.getContext().getManager();
-Session session = manager.findSession(id);
-if (session instanceof ClusterSession) {
-ClusterSession cses = (ClusterSession) session;
-if (cses != null) {
-Boolean isPrimary = new Boolean(cses.isPrimarySession());
-if (log.isDebugEnabled())
-log.debug(sm.getString(
-ReplicationValve.session.indicator,
request.getContext().getName(),id,
-primaryIndicatorName, isPrimary));
-request.setAttribute(primaryIndicatorName, isPrimary);
-}
-} else {
-if (log.isDebugEnabled
svn commit: r627110 - /tomcat/current/tc5.5.x/STATUS.txt
Author: pero Date: Tue Feb 12 13:07:41 2008 New Revision: 627110 URL: http://svn.apache.org/viewvc?rev=627110view=rev Log: Backport duplicate listener additions 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=627110r1=627109r2=627110view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Feb 12 13:07:41 2008 @@ -29,4 +29,10 @@ Do call to getClassLoader() in a privileged block. http://svn.apache.org/viewvc?rev=616953view=rev (less the generics stuff) +1: markt - -1: \ No newline at end of file + -1: + +* Remove duplicate listner additions (backport from 6.0 trunk) + http://svn.apache.org/viewvc?rev=620844view=rev + +1: pero + -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r620853 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Tue Feb 12 08:34:06 2008 New Revision: 620853 URL: http://svn.apache.org/viewvc?rev=620853view=rev Log: Cast my 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=620853r1=620852r2=620853view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 12 08:34:06 2008 @@ -93,6 +93,6 @@ * Remove duplicate listner additions http://svn.apache.org/viewvc?rev=620844view=rev - +1: funkman + +1: funkman, pero -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r620800 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Tue Feb 12 05:49:45 2008 New Revision: 620800 URL: http://svn.apache.org/viewvc?rev=620800view=rev Log: Cast my 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=620800r1=620799r2=620800view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 12 05:49:45 2008 @@ -73,7 +73,7 @@ * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44337 Dir listing crashes if no readme-file present http://svn.apache.org/viewvc?rev=618150view=rev - +1: funkman, markt, fhanik + +1: funkman, markt, fhanik, pero -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43741 @@ -84,12 +84,12 @@ * Handle case of NIO/SSL when transferring bytes to a disconnected socket http://svn.apache.org/viewvc?rev=618420view=rev - +1: fhanik, markt + +1: fhanik, markt, pero -1: * Use a single lock for synchronized session manipulation http://svn.apache.org/viewvc?rev=618823view=rev - +1: fhanik, markt + +1: fhanik, markt, pero -1: * ExtendedAccessLogValve cs-uri not print empty querystring - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r620781 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Tue Feb 12 04:42:03 2008 New Revision: 620781 URL: http://svn.apache.org/viewvc?rev=620781view=rev Log: Add small fix at ExtendedAccessLogValve 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=620781r1=620780r2=620781view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 12 04:42:03 2008 @@ -91,3 +91,8 @@ http://svn.apache.org/viewvc?rev=618823view=rev +1: fhanik, markt -1: + +* ExtendedAccessLogValve cs-uri not print empty querystring + http://svn.apache.org/viewvc?rev=620778view=rev + +1: pero + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r620778 - in /tomcat/trunk: java/org/apache/catalina/valves/ExtendedAccessLogValve.java webapps/docs/changelog.xml
Author: pero
Date: Tue Feb 12 04:36:00 2008
New Revision: 620778
URL: http://svn.apache.org/viewvc?rev=620778view=rev
Log:
ExtendedAccessLogValve cs-uri not print empty querystring
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=620778r1=620777r2=620778view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
Tue Feb 12 04:36:00 2008
@@ -663,7 +663,7 @@
public void addElement(StringBuffer buf, Date date,
Request request, Response response, long time)
{
String query = request.getQueryString();
-if (query != null) {
+if (query == null) {
buf.append(request.getRequestURI());
} else {
buf.append(request.getRequestURI());
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=620778r1=620777r2=620778view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Feb 12 04:36:00 2008
@@ -32,6 +32,14 @@
/properties
body
+section name=Tomcat 6.0.17 (remm)
+ subsection name=Catalina
+ changelog
+ fixExtendedAccessLogValve cs-uri not print empty querystring (pero)
+ /fix
+ /changelog
+ /subsection
+/section
section name=Tomcat 6.0.15 (remm)
subsection name=General
changelog
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r615750 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: pero Date: Mon Jan 28 00:01:40 2008 New Revision: 615750 URL: http://svn.apache.org/viewvc?rev=615750view=rev Log: Fix typo! Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=615750r1=615749r2=615750view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 28 00:01:40 2008 @@ -101,7 +101,7 @@ subsection name=Catalina changelog fix -Fix ManagerServlet.exipreSession throws Exceptions as iterate longer +Fix ManagerServlet.exipreSessions throws Exceptions as iterate longer session lists at production servers. (pero) /fix fixbug38131/bug: WatchedResource doesn't work if app is outside host appbase webapps. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r615749 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Mon Jan 28 00:00:21 2008 New Revision: 615749 URL: http://svn.apache.org/viewvc?rev=615749view=rev Log: Cast my 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=615749r1=615748r2=615749view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 28 00:00:21 2008 @@ -61,5 +61,5 @@ * Correct svn properties. http://people.apache.org/~rjung/patches/fix-svn-props.txt Backport of r615583 - +1: rjung + +1: rjung, pero -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r615762 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: pero Date: Mon Jan 28 00:43:03 2008 New Revision: 615762 URL: http://svn.apache.org/viewvc?rev=615762view=rev Log: Fix next typo ;-( Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=615762r1=615761r2=615762view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 28 00:43:03 2008 @@ -101,7 +101,7 @@ subsection name=Catalina changelog fix -Fix ManagerServlet.exipreSessions throws Exceptions as iterate longer +Fix ManagerServlet.expireSessions throws Exceptions as iterate longer session lists at production servers. (pero) /fix fixbug38131/bug: WatchedResource doesn't work if app is outside host appbase webapps. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r615478 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/manager/LocalStrings.properties java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml
Author: pero
Date: Sat Jan 26 11:52:28 2008
New Revision: 615478
URL: http://svn.apache.org/viewvc?rev=615478view=rev
Log:
Fix ManagerServlet.exipreSession throws Exceptions as iterate longer
session lists at production servers.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=615478r1=615477r2=615478view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jan 26 11:52:28 2008
@@ -38,17 +38,6 @@
-1: remm: I believe it would need specific support for certain managers.
Interested users
could use their own extended manager instead.
-* Fix ManagerServlet.expireSessions throws Exceptions as iterate longer
session lists
- at production servers.
- http://svn.apache.org/viewvc?rev=612988view=rev
- +1: pero, rjung, remm
- -1:
- rjung: as pero wrote: the patch contains
- - r612944 fixed in HTMLManager but not in Manager
- - a fix aiaginst an exception when listing session idle time
-histogram and at least one session timed out since last
-run of invalidation background task
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44223
Add support for remaining truststore system property
Not essential for 6.0.16.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=615478r1=615477r2=615478view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
Sat Jan 26 11:52:28 2008
@@ -73,6 +73,7 @@
managerServlet.noDirectory=FAIL - Non-directory document base for path {0}
managerServlet.noDocBase=FAIL - Cannot undeploy document base for path {0}
managerServlet.noGlobal=FAIL - No global JNDI resources are available
+managerServlet.noManager=FAIL - No manager exists for path {0}
managerServlet.noReload=FAIL - Reload not supported on WAR deployed at path {0}
managerServlet.noRename=FAIL - Cannot deploy uploaded WAR for path {0}
managerServlet.noRole=FAIL - User does not possess role {0}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=615478r1=615477r2=615478view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Sat Jan 26 11:52:28 2008
@@ -47,6 +47,7 @@
import org.apache.catalina.Globals;
import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
+import org.apache.catalina.Manager;
import org.apache.catalina.Role;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
@@ -1115,8 +1116,14 @@
RequestUtil.filter(displayPath)));
return;
}
+Manager manager = context.getManager() ;
+if(manager == null) {
+ writer.println(sm.getString(managerServlet.noManager,
+ RequestUtil.filter(displayPath)));
+ return;
+}
int maxCount = 60;
-int maxInactiveInterval =
context.getManager().getMaxInactiveInterval()/60;
+int maxInactiveInterval = manager.getMaxInactiveInterval()/60;
int histoInterval = maxInactiveInterval / maxCount;
if ( histoInterval * maxCount maxInactiveInterval )
histoInterval++;
@@ -1127,13 +1134,13 @@
writer.println(sm.getString(managerServlet.sessions,
displayPath));
writer.println(sm.getString(managerServlet.sessiondefaultmax,
+ maxInactiveInterval));
-Session [] sessions = context.getManager().findSessions();
+Session [] sessions = manager.findSessions();
int [] timeout = new int[maxCount];
int notimeout = 0;
int expired = 0;
long now = System.currentTimeMillis();
for (int i = 0; i sessions.length; i++) {
-int time = (int)((now-sessions[i].getLastAccessedTime())/1000);
+int time =
(int)((now-sessions[i
svn commit: r614839 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Thu Jan 24 02:58:53 2008 New Revision: 614839 URL: http://svn.apache.org/viewvc?rev=614839view=rev Log: Cast my 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=614839r1=614838r2=614839view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 24 02:58:53 2008 @@ -72,5 +72,5 @@ * Fix regression to removal of connection specific comet timeout http://people.apache.org/~fhanik/patches/comet-timeout.patch Would like for 6.0.16, trivial fix - +1: fhanik, jim (by inspection) + +1: fhanik, jim (by inspection), pero -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r614189 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Tue Jan 22 04:22:33 2008 New Revision: 614189 URL: http://svn.apache.org/viewvc?rev=614189view=rev Log: Cast my 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=614189r1=614188r2=614189view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 22 04:22:33 2008 @@ -66,5 +66,5 @@ Log a warning when a duplicate listener is ignored. http://svn.apache.org/viewvc?rev=614012view=rev Not essential for 6.0.16 - +1: markt, remm + +1: markt, remm, pero -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613792 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: pero
Date: Mon Jan 21 00:27:41 2008
New Revision: 613792
URL: http://svn.apache.org/viewvc?rev=613792view=rev
Log:
WatchedResource doesn't work if app is outside host appbase webapps
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java?rev=613792r1=613791r2=613792view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Mon Jan 21 00:27:41 2008
@@ -636,11 +636,16 @@
name = path;
}
}
-File expandedDocBase = new File(name);
-File warDocBase = new File(name + .war);
-if (!expandedDocBase.isAbsolute()) {
-expandedDocBase = new File(appBase(), name);
-warDocBase = new File(appBase(), name + .war);
+
+// default to appBase dir + name
+File expandedDocBase = new File(appBase(), name);
+if (context.getDocBase() != null) {
+// first assume docBase is absolute
+expandedDocBase = new File(context.getDocBase());
+if (!expandedDocBase.isAbsolute()) {
+// if docBase specified and relative, it must be relative
to appBase
+expandedDocBase = new File(appBase(),
context.getDocBase());
+}
}
// Add the eventual unpacked WAR and all the resources which will
be
// watched inside it
@@ -652,6 +657,7 @@
addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(), context);
} else {
// Find an existing matching war and expanded folder
+File warDocBase = new File(expandedDocBase.getAbsolutePath() +
.war);
if (warDocBase.exists()) {
deployedApp.redeployResources.put(warDocBase.getAbsolutePath(),
new Long(warDocBase.lastModified()));
@@ -966,9 +972,14 @@
if (docBase != null) {
resource = new File(docBaseFile, watchedResources[i]);
} else {
+if(log.isDebugEnabled())
+log.debug(Ignoring non-existent WatchedResource '
++ resource.getAbsolutePath() + ');
continue;
}
}
+if(log.isDebugEnabled())
+log.debug(Watching WatchedResource ' +
resource.getAbsolutePath() + ');
app.reloadResources.put(resource.getAbsolutePath(),
new Long(resource.lastModified()));
}
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=613792r1=613791r2=613792view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Jan 21 00:27:41 2008
@@ -96,6 +96,9 @@
/subsection
subsection name=Catalina
changelog
+ fixbug38131/bug: WatchedResource doesn't work if app is outside
host appbase webapps.
+Patch provided by Gernot Pfingstl (pero)
+ /fix
fix
Set correct sessionCounter at StandardManager after reload sessions.
(pero)
/fix
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613788 - in /tomcat/container/tc5.5.x: modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java webapps/docs/changelog.xml
Author: pero
Date: Mon Jan 21 00:14:51 2008
New Revision: 613788
URL: http://svn.apache.org/viewvc?rev=613788view=rev
Log:
Fix FarmWarDeployer can be only configured at host subelement
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java?rev=613788r1=613787r2=613788view=diff
==
---
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
Mon Jan 21 00:14:51 2008
@@ -25,6 +25,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
@@ -137,23 +138,36 @@
public void start() throws Exception {
if (started)
return;
-getCluster().addClusterListener(this);
-if (watchEnabled) {
-watcher = new WarWatcher(this, new File(getWatchDir()));
-if (log.isInfoEnabled())
-log.info(Cluster deployment is watching + getWatchDir()
-+ for changes.);
+Container hcontainer = getCluster().getContainer();
+if(!(hcontainer instanceof Host)) {
+log.error(FarmWarDeployer can only work as host cluster
subelement!);
+return ;
}
-
// Check to correct engine and host setup
-host = (Host) getCluster().getContainer();
-Engine engine = (Engine) host.getParent();
+host = (Host) hcontainer;
+Container econtainer = host.getParent();
+if(econtainer == null econtainer instanceof Engine) {
+log.error(FarmWarDeployer can only work if parent of +
host.getName()+ is an engine!);
+return ;
+}
+Engine engine = (Engine) econtainer;
try {
oname = new ObjectName(engine.getName() + :type=Deployer,host=
+ host.getName());
} catch (Exception e) {
log.error(Can't construct MBean object name + e);
+return ;
}
+
+if (watchEnabled) {
+watcher = new WarWatcher(this, new File(getWatchDir()));
+if (log.isInfoEnabled())
+log.info(Cluster deployment is watching + getWatchDir()
++ for changes.);
+}
+
+getCluster().addClusterListener(this);
+
configBase = new File(System.getProperty(catalina.base), conf);
if (engine != null) {
configBase = new File(configBase, engine.getName());
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=613788r1=613787r2=613788view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Jan 21 00:14:51 2008
@@ -197,6 +197,9 @@
subsection name=Cluster
changelog
fix
+Fix FarmWarDeployer can be only configured at host subelement (pero)
+ /fix
+ fix
Fix wrong amp;amp; at ReplicationValve (pero)
/fix
fix
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613785 - /tomcat/current/tc5.5.x/STATUS.txt
Author: pero Date: Mon Jan 21 00:02:49 2008 New Revision: 613785 URL: http://svn.apache.org/viewvc?rev=613785view=rev Log: Cast my 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=613785r1=613784r2=613785view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Mon Jan 21 00:02:49 2008 @@ -43,5 +43,5 @@ * Fix build broken by library update patch http://people.apache.org/~markt/patches/2008-01-20-tc5-fix-build.patch - +1: markt, rjung + +1: markt, rjung, pero -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613793 - /tomcat/current/tc5.5.x/STATUS.txt
Author: pero Date: Mon Jan 21 00:29:15 2008 New Revision: 613793 URL: http://svn.apache.org/viewvc?rev=613793view=rev Log: Remove Fixes 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=613793r1=613792r2=613793view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Mon Jan 21 00:29:15 2008 @@ -25,21 +25,6 @@ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -* Fix FarmWarDeployer can be only config at Host Element (Also needed at tomcat 6) - http://people.apache.org/~pero/patches/tc55/2007-11-16-1-FarmWarDeployer-tc55.patch - +1: pero, markt, rjung - -1: - 0: fhanik, this needs to be reworked completely, so I'm neutral - markt - change FarmWarDeployer can only work as parent from to - FarmWarDeployer can only work if parent of - rjung - is an engine! - is an engine! (space added) - work at Host - work as Host - -* Fix WatchedResource does not work if app is outside webapps - http://issues.apache.org/bugzilla/show_bug.cgi?id=38131 - http://svn.apache.org/viewvc?rev=613558view=rev - +1: pero, markt, rjung - -1: * Fix build broken by library update patch http://people.apache.org/~markt/patches/2008-01-20-tc5-fix-build.patch - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613796 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: pero
Date: Mon Jan 21 00:41:31 2008
New Revision: 613796
URL: http://svn.apache.org/viewvc?rev=613796view=rev
Log:
WatchedResource doesn't work if app is outside host appbase webapps
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=613796r1=613795r2=613796view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 21 00:41:31 2008
@@ -68,12 +68,6 @@
FarmWarDeployer can only work if parent of
rjung - is an engine! - is an engine! (space added)
work at Host - work as Host
-
-* Fix WatchedResource does not work if app is outside webapps
- http://issues.apache.org/bugzilla/show_bug.cgi?id=38131
- http://svn.apache.org/viewvc?rev=613558view=rev
- +1: pero, markt, rjung
- -1:
* Update JNDI docs to use server.xml less and Context more
http://svn.apache.org/viewvc?rev=613689view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=613796r1=613795r2=613796view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Mon
Jan 21 00:41:31 2008
@@ -636,11 +636,14 @@
name = path;
}
}
-File expandedDocBase = new File(name);
-File warDocBase = new File(name + .war);
-if (!expandedDocBase.isAbsolute()) {
-expandedDocBase = new File(appBase(), name);
-warDocBase = new File(appBase(), name + .war);
+File expandedDocBase = new File(appBase(), name);
+if (context.getDocBase() != null) {
+// first assume docBase is absolute
+expandedDocBase = new File(context.getDocBase());
+if (!expandedDocBase.isAbsolute()) {
+// if docBase specified and relative, it must be relative
to appBase
+expandedDocBase = new File(appBase(),
context.getDocBase());
+}
}
// Add the eventual unpacked WAR and all the resources which will
be
// watched inside it
@@ -652,7 +655,8 @@
addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(), context);
} else {
// Find an existing matching war and expanded folder
-if (warDocBase.exists()) {
+ File warDocBase = new File(expandedDocBase.getAbsolutePath() +
.war);
+ if (warDocBase.exists()) {
deployedApp.redeployResources.put(warDocBase.getAbsolutePath(),
new Long(warDocBase.lastModified()));
}
@@ -966,9 +970,14 @@
if (docBase != null) {
resource = new File(docBaseFile, watchedResources[i]);
} else {
-continue;
+if(log.isDebugEnabled())
+log.debug(Ignoring non-existent WatchedResource '
++ resource.getAbsolutePath() + ');
+ continue;
}
}
+if(log.isDebugEnabled())
+log.debug(Watching WatchedResource ' +
resource.getAbsolutePath() + ');
app.reloadResources.put(resource.getAbsolutePath(),
new Long(resource.lastModified()));
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=613796r1=613795r2=613796view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 21 00:41:31 2008
@@ -100,6 +100,9 @@
/subsection
subsection name=Catalina
changelog
+ fixbug38131/bug: WatchedResource doesn't work if app is outside
host appbase webapps.
+Patch provided by Gernot Pfingstl (pero)
+ /fix
updateAdd -Dorg.apache.catalina.tribes.dns_lookups=false as default.
The ability to turn off reverse DNS lookups for membership.(fhanik)/update
fix
Set correct StandardManager.sessionCounter after reload/restart.
(pero)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613805 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/tcp/ReplicationValve.java webapps/docs/changelog.xml
Author: pero
Date: Mon Jan 21 01:19:02 2008
New Revision: 613805
URL: http://svn.apache.org/viewvc?rev=613805view=rev
Log:
Fix wrong at ReplicationValve
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=613805r1=613804r2=613805view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 21 01:19:02 2008
@@ -54,11 +54,6 @@
http://svn.apache.org/viewvc?rev=613266view=rev
+1: markt
-1:
-
-* Fix wrong
-
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-ReplicationValve-tc55.patch
- +1: pero, markt, rjung
- -1:
* Fix FarmWarDeployer can be only config at Host Element (small changes s.
tomcat 55 STATUS.txt)
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-FarmWarDeployer-tc55.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=613805r1=613804r2=613805view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
Mon Jan 21 01:19:02 2008
@@ -467,7 +467,7 @@
*/
protected void resetReplicationRequest(Request request, boolean
isCrossContext) {
Session contextSession = request.getSessionInternal(false);
-if(contextSession != null contextSession instanceof DeltaSession){
+if(contextSession != null contextSession instanceof DeltaSession){
resetDeltaRequest(contextSession);
((DeltaSession)contextSession).setPrimarySession(true);
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=613805r1=613804r2=613805view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 21 01:19:02 2008
@@ -261,6 +261,9 @@
/subsection
subsection name=Cluster
changelog
+ fix
+ Fix wrong amp;amp; at ReplicationValve (pero)
+ /fix
update
Add get/set methods for properties in the Tcp Failure detector.
(fhanik/jim)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613809 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/deploy/FarmWarDeployer.java webapps/docs/changelog.xml
Author: pero
Date: Mon Jan 21 01:26:55 2008
New Revision: 613809
URL: http://svn.apache.org/viewvc?rev=613809view=rev
Log:
Fix FarmWarDeployer can be only configured as host subelement
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=613809r1=613808r2=613809view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 21 01:26:55 2008
@@ -54,15 +54,6 @@
http://svn.apache.org/viewvc?rev=613266view=rev
+1: markt
-1:
-
-* Fix FarmWarDeployer can be only config at Host Element (small changes s.
tomcat 55 STATUS.txt)
-
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-FarmWarDeployer-tc55.patch
- +1: pero, markt, rjung
- -1:
- markt - change FarmWarDeployer can only work as parent from to
- FarmWarDeployer can only work if parent of
- rjung - is an engine! - is an engine! (space added)
- work at Host - work as Host
* Update JNDI docs to use server.xml less and Context more
http://svn.apache.org/viewvc?rev=613689view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=613809r1=613808r2=613809view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
Mon Jan 21 01:26:55 2008
@@ -24,6 +24,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
@@ -138,37 +139,43 @@
public void start() throws Exception {
if (started)
return;
-getCluster().addClusterListener(this);
-if (watchEnabled) {
-watcher = new WarWatcher(this, new File(getWatchDir()));
-if (log.isInfoEnabled())
-log.info(Cluster deployment is watching + getWatchDir()
- + for changes.);
+Container hcontainer = getCluster().getContainer();
+if(!(hcontainer instanceof Host)) {
+log.error(FarmWarDeployer can only work as host cluster
subelement!);
+return ;
}
+host = (Host) hcontainer;
// Check to correct engine and host setup
-Object parent = getCluster().getContainer();
-Engine engine = null;
-String hostname = null;
-if ( parent instanceof Host ) {
-host = (Host) parent;
-engine = (Engine) host.getParent();
-hostname = host.getName();
-}else {
-engine = (Engine)parent;
-hostname = engine.getDefaultHost();
+Container econtainer = host.getParent();
+if(econtainer == null econtainer instanceof Engine) {
+log.error(FarmWarDeployer can only work if parent of +
host.getName()+ is an engine!);
+return ;
}
+Engine engine = (Engine) econtainer;
+String hostname = null;
+hostname = host.getName();
try {
oname = new ObjectName(engine.getName() + :type=Deployer,host=
+ hostname);
} catch (Exception e) {
log.error(Can't construct MBean object name + e);
+return;
}
+if (watchEnabled) {
+watcher = new WarWatcher(this, new File(getWatchDir()));
+if (log.isInfoEnabled()) {
+log.info(Cluster deployment is watching + getWatchDir()
+ + for changes.);
+}
+}
+
configBase = new File(System.getProperty(catalina.base), conf);
if (engine != null) {
configBase = new File(configBase, engine.getName());
-} else if (host != null) {
-configBase = new File(configBase, host.getName());
+}
+if (host != null) {
+configBase = new File(configBase, hostname);
}
// Retrieve the MBean server
@@ -176,6 +183,9 @@
started = true;
count = 0;
+
+getCluster().addClusterListener(this);
+
if (log.isInfoEnabled())
log.info(Cluster FarmWarDeployer started.);
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=613809r1=613808r2=613809view=diff
svn commit: r613811 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Mon Jan 21 01:30:02 2008 New Revision: 613811 URL: http://svn.apache.org/viewvc?rev=613811view=rev Log: Cast my 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=613811r1=613810r2=613811view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 21 01:30:02 2008 @@ -52,11 +52,11 @@ Add support for remaining truststore system property Not essential for 6.0.16. http://svn.apache.org/viewvc?rev=613266view=rev - +1: markt + +1: markt, pero -1: * Update JNDI docs to use server.xml less and Context more http://svn.apache.org/viewvc?rev=613689view=rev Not essential for 6.0.16. - +1: markt + +1: markt, pero -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613847 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Author: pero Date: Mon Jan 21 03:34:23 2008 New Revision: 613847 URL: http://svn.apache.org/viewvc?rev=613847view=rev Log: Set correct author of the patch, Sorry! Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml 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=613847r1=613846r2=613847view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Jan 21 03:34:23 2008 @@ -97,7 +97,7 @@ subsection name=Catalina changelog fixbug38131/bug: WatchedResource doesn't work if app is outside host appbase webapps. -Patch provided by Gernot Pfingstl (pero) +Patch provided by Peter Lynch (pero) /fix fix Set correct sessionCounter at StandardManager after reload sessions. (pero) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613850 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: pero Date: Mon Jan 21 03:35:21 2008 New Revision: 613850 URL: http://svn.apache.org/viewvc?rev=613850view=rev Log: Set correct author of the patch, Sorry! Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=613850r1=613849r2=613850view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 21 03:35:21 2008 @@ -101,7 +101,7 @@ subsection name=Catalina changelog fixbug38131/bug: WatchedResource doesn't work if app is outside host appbase webapps. -Patch provided by Gernot Pfingstl (pero) +Patch provided by Peter Lynch (pero) /fix updateAdd -Dorg.apache.catalina.tribes.dns_lookups=false as default. The ability to turn off reverse DNS lookups for membership.(fhanik)/update fix - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613851 - /tomcat/trunk/webapps/docs/changelog.xml
Author: pero Date: Mon Jan 21 03:36:19 2008 New Revision: 613851 URL: http://svn.apache.org/viewvc?rev=613851view=rev Log: Set correct author of the patch, Sorry! Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=613851r1=613850r2=613851view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 21 03:36:19 2008 @@ -47,7 +47,7 @@ subsection name=Catalina changelog fixbug38131/bug: WatchedResource does not work if app is outside host appbase webapps. -Patch provided by Gernot Pfingstl (pero) +Patch provided by Peter Lynch (pero) /fix fixbug44261/bug: Fix Restricted listeners property file not found message fix. Patch provided by David Jencks. (pero) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613521 - /tomcat/current/tc5.5.x/STATUS.txt
Author: pero Date: Sun Jan 20 00:57:47 2008 New Revision: 613521 URL: http://svn.apache.org/viewvc?rev=613521view=rev Log: Cast my 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=613521r1=613520r2=613521view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 20 00:57:47 2008 @@ -51,5 +51,5 @@ * Update commons-pool to 1.4 http://svn.apache.org/viewvc?rev=612950view=rev (Note ppatch duplciates some of lib-updates patch) - +1: markt, fhanik + +1: markt, fhanik, pero -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613522 - /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
Author: pero
Date: Sun Jan 20 01:45:45 2008
New Revision: 613522
URL: http://svn.apache.org/viewvc?rev=613522view=rev
Log:
Fix NPE situation
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java?rev=613522r1=613521r2=613522view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
Sun Jan 20 01:45:45 2008
@@ -853,8 +853,7 @@
sb.append(space);
sb.append(request.getProtocol());
} else {
-sb.append(- - );
-sb.append(request.getProtocol());
+sb.append(- - -);
}
value = sb.toString();
} else if (pattern == 'S') {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613523 - /tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
Author: pero
Date: Sun Jan 20 01:47:26 2008
New Revision: 613523
URL: http://svn.apache.org/viewvc?rev=613523view=rev
Log:
Fix wrong
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java?rev=613523r1=613522r2=613523view=diff
==
---
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
Sun Jan 20 01:47:26 2008
@@ -469,7 +469,7 @@
*/
protected void resetReplicationRequest(Request request, boolean
isCrossContext) {
Session contextSession = request.getSessionInternal(false);
-if(contextSession != null contextSession instanceof DeltaSession){
+if(contextSession != null contextSession instanceof DeltaSession){
resetDeltaRequest(contextSession);
((DeltaSession)contextSession).setPrimarySession(true);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613524 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Sun Jan 20 01:50:08 2008 New Revision: 613524 URL: http://svn.apache.org/viewvc?rev=613524view=rev Log: Backport a tc55 fix Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=613524r1=613523r2=613524view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan 20 01:50:08 2008 @@ -49,3 +49,8 @@ http://svn.apache.org/viewvc?rev=613266view=rev +1: markt -1: + +* Fix wrong + http://people.apache.org/~pero/patches/tc55/2007-11-16-1-ReplicationValve-tc55.patch + +1: pero + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r613525 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Author: pero Date: Sun Jan 20 01:54:45 2008 New Revision: 613525 URL: http://svn.apache.org/viewvc?rev=613525view=rev Log: Update Changelog! Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml 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=613525r1=613524r2=613525view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 20 01:54:45 2008 @@ -94,6 +94,9 @@ subsection name=Catalina changelog fix + Fix NPE situation at AccessLogValve (pero) + /fix + fix bug30949/bug: Improve previous fix. Ensure requests are recycled on cross-context includes and forwards when an exception occurs in the target page. (markt) @@ -187,6 +190,9 @@ /subsection subsection name=Cluster changelog + fix + Fix wrong at ReplicationValve (pero) + /fix fix DeltaManager sessionCounter must be also increment at relicated sessions. (pero) /fix - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
