Re: [VOTE] Release Apache Tomcat 8.0.1
2014-01-30 Mark Thomas : > The proposed Apache Tomcat 8.0.1 release is now available for voting. > > This should be the first non-RC release so I am leaving all the > stability options open to get an idea of where folks think we currently > stand. > > The main changes since RC10 are: > - Fix broken sendfile support in NIO > - Add a readOnly option for WebResourceSet > - Fix the regression in handling ternary expressions > - Separate out JARs for EL, JSP and WebSocket for embedded > - Remove svn keywords from source > - Numerous bug fixes and improvements > The fixes since 8.0.0 are: > - Fix regression in async timeout > - Fix WebSocket bug that broke WebSocket support with newer versions of > Chrome > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.1/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1003/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_1/ > > The proposed 8.0.1 release is: > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 8.0.1 (alpha) > [X] Beta - go ahead and release as 8.0.1 (beta) > [ ] Stable - go ahead and release as 8.0.1 (stable) > > Tested on my test app (enable session replication). Works fine. > Cheers, > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- > Keiichi.Fujino
Re: [VOTE] Release Apache Tomcat 8.0.1
Mark, On 1/29/14, 6:43 PM, Mark Thomas wrote: > The proposed Apache Tomcat 8.0.1 release is now available for voting. > > This should be the first non-RC release so I am leaving all the > stability options open to get an idea of where folks think we currently > stand. > > The main changes since RC10 are: > - Fix broken sendfile support in NIO > - Add a readOnly option for WebResourceSet > - Fix the regression in handling ternary expressions > - Separate out JARs for EL, JSP and WebSocket for embedded > - Remove svn keywords from source > - Numerous bug fixes and improvements > The fixes since 8.0.0 are: > - Fix regression in async timeout > - Fix WebSocket bug that broke WebSocket support with newer versions of > Chrome > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.1/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1003/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_1/ > > The proposed 8.0.1 release is: > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 8.0.1 (alpha) > [X] Beta - go ahead and release as 8.0.1 (beta) > [ ] Stable - go ahead and release as 8.0.1 (stable) - MD5 sums, PGP sigs all look good. - binary and source ZIP and tarball contain the same stuff - bundled tcnative builds with a few warnings - checkstyle is happy - Java builds with a warning about deprecated methods and unsafe operations (meh) - BIO, NIO, and APR tests all succeed (except for tribes, which is known to fail in my environment) - Smoke test with one of my own applications shows no immediate problems (had to remove JasperListener from my 8.0.0-RC5 configuration) Looks good! -chris signature.asc Description: OpenPGP digital signature
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #5 from Christopher Schultz --- Not necessary. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #4 from Ognjen Blagojevic --- (In reply to Christopher Schultz from comment #3) > I would, however, prefer to make the configuration option > more clear to the user like "useServerCipherSuitesOrder"... as it stands, > the option doesn't really make it clear that the server is in control. > > Any objections? No objections. Do I need to provide a new patch with the name you proposed? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.1
jim: [X] Beta - go ahead and release as 8.0.1 (beta) All testing looks fine, but don't have a huge test-suite for this rev. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #3 from Christopher Schultz --- APR connector has the "SSLHonorCipherOrder" attribute. Tomcat has a history of using different SSL-configuration attributes for APR versus other connector types. I would, however, prefer to make the configuration option more clear to the user like "useServerCipherSuitesOrder"... as it stands, the option doesn't really make it clear that the server is in control. Any objections? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56093] New: org.apache.catalina.valves.SSLValve is not documented on the "Valves" page
https://issues.apache.org/bugzilla/show_bug.cgi?id=56093 Bug ID: 56093 Summary: org.apache.catalina.valves.SSLValve is not documented on the "Valves" page Product: Tomcat 7 Version: trunk Hardware: PC OS: Mac OS X 10.4 Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net Just need to add documentation to the users' guide, or the configuration/valves page. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.1
On Wed, Jan 29, 2014 at 6:43 PM, Mark Thomas wrote: > > > The proposed 8.0.1 release is: > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 8.0.1 (alpha) > [ ] Beta - go ahead and release as 8.0.1 (beta) > [x] Stable - go ahead and release as 8.0.1 (stable) > Focused on testing WebSocket and Servlet async support with Spring Framework integration tests, sample apps, and SockJS protocol tests against Spring's SockJS server implementation. Rossen
Re: [VOTE] Release Apache Tomcat 8.0.1
On Wed, Jan 29, 2014 at 6:43 PM, Mark Thomas wrote: > The proposed Apache Tomcat 8.0.1 release is now available for voting. > > The proposed 8.0.1 release is: > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 8.0.1 (alpha) > [ X ] Beta - go ahead and release as 8.0.1 (beta) > [ ] Stable - go ahead and release as 8.0.1 (stable) Tested with home-brewed apps, everything seems fine. Calling it Beta just cuz we have a small data set, but it's one of the most stable Betas we've had. I bet 8.0.2 after a couple of weeks of testing in the wild will be stable. Yoav > > Cheers, > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.1
On 1/29/2014, 6:43 PM, Mark Thomas wrote: The proposed 8.0.1 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 8.0.1 (alpha) [ ] Beta - go ahead and release as 8.0.1 (beta) [X] Stable - go ahead and release as 8.0.1 (stable) Tested jsr356 and Servlet AsyncContext, targetting the regressions found in 8.0.0. Everything works perfectly. -- Jeanfrancois - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5459 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1562746 Blamelist: kfujino,markt Build succeeded! sincerely, -The Buildbot
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 Ognjen Blagojevic changed: What|Removed |Added Attachment #31198|0 |1 is obsolete|| --- Comment #2 from Ognjen Blagojevic --- Created attachment 31272 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31272&action=edit Patch to add useCipherSuitesOrder to BIO and NIO connectors Fully functional patch. Here is an example how to use it for BIO (with OpenJDK 1.8.0 B108+ and JCE Unlimited Strength): To test NIO, just replace Http11Protocol with Http11NioProtocol. --- You may test Forward Secrecy using https://www.ssllabs.com/ssltest/ It should report "Forward Secrecy -- Yes (with most browsers)" --- Note: If you try the same with JDK that does not support javax.net.SSLParameters.setUseCipherSuitesOrder(boolean) method, it will log: WARNING [main] org.apache.tomcat.util.net.jsse.JSSESocketFactory.configureUseCipherSuitesOrder Method setUseCipherSuitesOrder is not supported by the SSL engine -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.1
On 30.1.2014 0:43, Mark Thomas wrote: The proposed Apache Tomcat 8.0.1 release is now available for voting. ... The proposed 8.0.1 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 8.0.1 (alpha) [ ] Beta - go ahead and release as 8.0.1 (beta) [X] Stable - go ahead and release as 8.0.1 (stable) Tested .zip distribution on Windows 7 64-bit, and .tar.gz on CentOS 5 64-bit: - Tested SSL/TLS connectivity for BIO, NIO and APR connectors (Windows). - Crawled all links (except /manager, /host-manager and /examples/async*). No broken links found, except links to JavaDocs (Windows). - Smoke tests of BIO, NIO and APR, with and without TLS, all passed (Windows). - Tested with several webapps that are in active development (Linux). -Ognjen - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.1
On Thu, Jan 30, 2014 at 12:32 PM, Rémy Maucherat wrote: > 2014-01-30 Mark Thomas : > > > The proposed 8.0.1 release is: > > [ ] Broken - do not release > > [ ] Alpha - go ahead and release as 8.0.1 (alpha) > > [X] Beta - go ahead and release as 8.0.1 (beta) > > [ ] Stable - go ahead and release as 8.0.1 (stable) > > > > Rémy > +1 (non-binding) [X] Beta - go ahead and release as 8.0.1 (beta) websocket implementation checked with applications that use the new specifications features.
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1733 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1562748 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5458 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1562721 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
Re: [VOTE] Release Apache Tomcat 8.0.1
2014-01-30 Mark Thomas : > The proposed 8.0.1 release is: > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 8.0.1 (alpha) > [X] Beta - go ahead and release as 8.0.1 (beta) > [ ] Stable - go ahead and release as 8.0.1 (stable) > > Rémy
[Bug 56082] ConcurrentModificationException with org.apache.juli.ClassLoaderLogManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=56082 Mark Thomas changed: What|Removed |Added Component|Catalina|Catalina Version|7.0.42 |unspecified Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #2 from Mark Thomas --- This has been fixed in 8.0.x for 8.0.2 onwards and in 7.0.x for 7.0.51 onwards. It has also been proposed for 6.0.x. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1562750 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Jan 30 09:18:51 2014 New Revision: 1562750 URL: http://svn.apache.org/r1562750 Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1562750&r1=1562749&r2=1562750&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 30 09:18:51 2014 @@ -54,6 +54,12 @@ PATCHES PROPOSED TO BACKPORT: archives). The first commit should have said where the file came from. +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56082 + Concurrency issue in JULI's LogManager + http://svn.apache.org/r1562748 + +1: markt + -1: + PATCHES/ISSUES THAT ARE STALLED: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1562748 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/juli/ClassLoaderLogManager.java test/org/apache/juli/TestClassLoaderLogManager.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jan 30 09:17:13 2014
New Revision: 1562748
URL: http://svn.apache.org/r1562748
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56082
Fix thread safety issue in JULI's LogManager implementation
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/tc7.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1562742,1562746
Modified: tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1562748&r1=1562747&r2=1562748&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java Thu
Jan 30 09:17:13 2014
@@ -36,6 +36,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogManager;
@@ -704,7 +705,7 @@ public class ClassLoaderLogManager exten
protected static final class ClassLoaderLogInfo {
final LogNode rootNode;
-final Map loggers = new HashMap();
+final Map loggers = new ConcurrentHashMap();
final Map handlers = new HashMap();
final Properties props = new Properties();
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java?rev=1562748&r1=1562747&r2=1562748&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
Thu Jan 30 09:17:13 2014
@@ -14,11 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.juli;
-import static org.junit.Assert.assertEquals;
+import java.util.Collections;
+import java.util.Random;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -29,33 +32,118 @@ public class TestClassLoaderLogManager {
@Test
public void testReplace() {
ClassLoaderLogManager logManager = new ClassLoaderLogManager();
-assertEquals("", logManager.replace(""));
-assertEquals("${", logManager.replace("${"));
-assertEquals("${undefinedproperty}",
+Assert.assertEquals("", logManager.replace(""));
+Assert.assertEquals("${", logManager.replace("${"));
+Assert.assertEquals("${undefinedproperty}",
logManager.replace("${undefinedproperty}"));
-assertEquals(
+Assert.assertEquals(
System.getProperty("line.separator")
+ System.getProperty("path.separator")
+ System.getProperty("file.separator"),
logManager
.replace("${line.separator}${path.separator}${file.separator}"));
-assertEquals(
+Assert.assertEquals(
"foo" + System.getProperty("file.separator") + "bar"
+ System.getProperty("line.separator")
+ System.getProperty("path.separator") + "baz",
logManager
.replace("foo${file.separator}bar${line.separator}${path.separator}baz"));
// BZ 51249
-assertEquals(
+Assert.assertEquals(
"%{file.separator}" + System.getProperty("file.separator"),
logManager.replace("%{file.separator}${file.separator}"));
-assertEquals(
+Assert.assertEquals(
System.getProperty("file.separator") + "${undefinedproperty}"
+ System.getProperty("file.separator"),
logManager
.replace("${file.separator}${undefinedproperty}${file.separator}"));
-assertEquals("${}" + System.getProperty("path.separator"),
+Assert.assertEquals("${}" + System.getProperty("path.separator"),
logManager.replace("${}${path.separator}"));
}
+@Test
+public void testBug56082() {
+ClassLoaderLogManager logManager = new ClassLoaderLogManager();
+
+LoggerCreateThread[] createThreads = new LoggerCreateThread[10];
+for (int i = 0; i < createThreads.length; i ++)
svn commit: r1562746 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Jan 30 09:12:24 2014 New Revision: 1562746 URL: http://svn.apache.org/r1562746 Log: Add missing entry 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=1562746&r1=1562745&r2=1562746&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 30 09:12:24 2014 @@ -48,6 +48,10 @@ +56082: Fix a concurrency bug in JULI's LogManager +implementation. (markt) + + 56085: ServletContext.getRealPath(String) should return null for invalid input rather than throwing an IllegalArgumentException. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1562744 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Jan 30 09:11:09 2014 New Revision: 1562744 URL: http://svn.apache.org/r1562744 Log: Fix formatting 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=1562744&r1=1562743&r2=1562744&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 30 09:11:09 2014 @@ -47,9 +47,11 @@ - 56085: ServletContext.getRealPath(String) should - return null for invalid input rather than throwing an - IllegalArgumentException. (markt) + +56085: ServletContext.getRealPath(String) should +return null for invalid input rather than throwing an +IllegalArgumentException. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1562742 - in /tomcat/trunk: java/org/apache/juli/ClassLoaderLogManager.java test/org/apache/juli/TestClassLoaderLogManager.java
Author: markt
Date: Thu Jan 30 09:09:34 2014
New Revision: 1562742
URL: http://svn.apache.org/r1562742
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56082
Fix thread safety issue in JULI's LogManager implementation
Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1562742&r1=1562741&r2=1562742&view=diff
==
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Thu Jan 30
09:09:34 2014
@@ -36,6 +36,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogManager;
@@ -706,7 +707,7 @@ public class ClassLoaderLogManager exten
protected static final class ClassLoaderLogInfo {
final LogNode rootNode;
-final Map loggers = new HashMap<>();
+final Map loggers = new ConcurrentHashMap<>();
final Map handlers = new HashMap<>();
final Properties props = new Properties();
Modified: tomcat/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/juli/TestClassLoaderLogManager.java?rev=1562742&r1=1562741&r2=1562742&view=diff
==
--- tomcat/trunk/test/org/apache/juli/TestClassLoaderLogManager.java (original)
+++ tomcat/trunk/test/org/apache/juli/TestClassLoaderLogManager.java Thu Jan 30
09:09:34 2014
@@ -14,11 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.juli;
-import static org.junit.Assert.assertEquals;
+import java.util.Collections;
+import java.util.Random;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -29,33 +32,118 @@ public class TestClassLoaderLogManager {
@Test
public void testReplace() {
ClassLoaderLogManager logManager = new ClassLoaderLogManager();
-assertEquals("", logManager.replace(""));
-assertEquals("${", logManager.replace("${"));
-assertEquals("${undefinedproperty}",
+Assert.assertEquals("", logManager.replace(""));
+Assert.assertEquals("${", logManager.replace("${"));
+Assert.assertEquals("${undefinedproperty}",
logManager.replace("${undefinedproperty}"));
-assertEquals(
+Assert.assertEquals(
System.getProperty("line.separator")
+ System.getProperty("path.separator")
+ System.getProperty("file.separator"),
logManager
.replace("${line.separator}${path.separator}${file.separator}"));
-assertEquals(
+Assert.assertEquals(
"foo" + System.getProperty("file.separator") + "bar"
+ System.getProperty("line.separator")
+ System.getProperty("path.separator") + "baz",
logManager
.replace("foo${file.separator}bar${line.separator}${path.separator}baz"));
// BZ 51249
-assertEquals(
+Assert.assertEquals(
"%{file.separator}" + System.getProperty("file.separator"),
logManager.replace("%{file.separator}${file.separator}"));
-assertEquals(
+Assert.assertEquals(
System.getProperty("file.separator") + "${undefinedproperty}"
+ System.getProperty("file.separator"),
logManager
.replace("${file.separator}${undefinedproperty}${file.separator}"));
-assertEquals("${}" + System.getProperty("path.separator"),
+Assert.assertEquals("${}" + System.getProperty("path.separator"),
logManager.replace("${}${path.separator}"));
}
+@Test
+public void testBug56082() {
+ClassLoaderLogManager logManager = new ClassLoaderLogManager();
+
+LoggerCreateThread[] createThreads = new LoggerCreateThread[10];
+for (int i = 0; i < createThreads.length; i ++) {
+createThreads[i] = new LoggerCreateThread(logManager);
+createThreads[i].setName("LoggerCreate-" + i);
+createThreads[i].start();
+}
+
+LoggerListThread listThread = new LoggerListThread(logManager);
+listThread.setName("LoggerList");
+listThread.start();
svn commit: r1562726 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java webapps/docs/changelog.xml
Author: kfujino
Date: Thu Jan 30 08:50:55 2014
New Revision: 1562726
URL: http://svn.apache.org/r1562726
Log:
Simplify the code of o.a.c.ha.tcp.SimpleTcpCluster.createManager(String).
Remove unnecessary class cast.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1562726&r1=1562725&r2=1562726&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Thu Jan 30 08:50:55 2014
@@ -533,15 +533,15 @@ public class SimpleTcpCluster extends Li
log.debug("Creating ClusterManager for context " + name +
" using class " +
getManagerTemplate().getClass().getName());
}
-Manager manager = null;
+ClusterManager manager = null;
try {
manager = managerTemplate.cloneFromTemplate();
-((ClusterManager)manager).setName(name);
+manager.setName(name);
} catch (Exception x) {
log.error("Unable to clone cluster manager, defaulting to
org.apache.catalina.ha.session.DeltaManager", x);
manager = new org.apache.catalina.ha.session.DeltaManager();
} finally {
-if ( manager != null && (manager instanceof ClusterManager))
((ClusterManager)manager).setCluster(this);
+if ( manager != null) manager.setCluster(this);
}
return manager;
}
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=1562726&r1=1562725&r2=1562726&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 30 08:50:55 2014
@@ -191,6 +191,15 @@
+
+
+
+Simplify the code of
+o.a.c.ha.tcp.SimpleTcpCluster.createManager(String).
+Remove unnecessary class cast. (kfujino)
+
+
+
Do not return an empty string for the Sec-WebSocket-Protocol
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1562724 - in /tomcat/trunk: java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java webapps/docs/changelog.xml
Author: kfujino
Date: Thu Jan 30 08:49:32 2014
New Revision: 1562724
URL: http://svn.apache.org/r1562724
Log:
Simplify the code of o.a.c.ha.tcp.SimpleTcpCluster.createManager(String).
Remove unnecessary class cast.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1562724&r1=1562723&r2=1562724&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Thu Jan
30 08:49:32 2014
@@ -405,15 +405,15 @@ public class SimpleTcpCluster extends Li
log.debug("Creating ClusterManager for context " + name +
" using class " +
getManagerTemplate().getClass().getName());
}
-Manager manager = null;
+ClusterManager manager = null;
try {
manager = managerTemplate.cloneFromTemplate();
-((ClusterManager)manager).setName(name);
+manager.setName(name);
} catch (Exception x) {
log.error("Unable to clone cluster manager, defaulting to
org.apache.catalina.ha.session.DeltaManager", x);
manager = new org.apache.catalina.ha.session.DeltaManager();
} finally {
-if ( manager != null && (manager instanceof ClusterManager))
((ClusterManager)manager).setCluster(this);
+if ( manager != null) manager.setCluster(this);
}
return manager;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1562724&r1=1562723&r2=1562724&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 30 08:49:32 2014
@@ -52,6 +52,15 @@
IllegalArgumentException. (markt)
+
+
+
+Simplify the code of
+o.a.c.ha.tcp.SimpleTcpCluster.createManager(String).
+Remove unnecessary class cast. (kfujino)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 6.0.39
2014-01-28 Mark Thomas : > The proposed Apache Tomcat 6.0.39 release candidate is now available > for voting. > > The main changes since 6.0.37 are: > - Updated to use the Eclipse compiler 4.3.1 > - Back-ported various improvements to the validation of XML > configuration files from Tomcat 7 > - Avoid CVE-2013-1571 when generating Javadoc > > The main changes since 6.0.38 are: > - Fixed regression in XML validation > - Cleaned up various aspects of the source > > along with a number of bug fixes. Full details are in the change log. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.39/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1001/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_39 > > The proposed 6.0.39 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 6.0.39 Stable > > +1. Tested on my simple handmade app.(enable session replication). > Cheers, > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- > Keiichi.Fujino
Re: [VOTE] Release Apache Tomcat 8.0.1
[ X ] Stable - go ahead and release as 8.0.1 (stable) I see no problems with 8.0.1 Martin Grigorov Wicket Training and Consulting On Thu, Jan 30, 2014 at 12:43 AM, Mark Thomas wrote: > The proposed Apache Tomcat 8.0.1 release is now available for voting. > > This should be the first non-RC release so I am leaving all the > stability options open to get an idea of where folks think we currently > stand. > > The main changes since RC10 are: > - Fix broken sendfile support in NIO > - Add a readOnly option for WebResourceSet > - Fix the regression in handling ternary expressions > - Separate out JARs for EL, JSP and WebSocket for embedded > - Remove svn keywords from source > - Numerous bug fixes and improvements > The fixes since 8.0.0 are: > - Fix regression in async timeout > - Fix WebSocket bug that broke WebSocket support with newer versions of > Chrome > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.1/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1003/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_1/ > > The proposed 8.0.1 release is: > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 8.0.1 (alpha) > [ ] Beta - go ahead and release as 8.0.1 (beta) > [ ] Stable - go ahead and release as 8.0.1 (stable) > > Cheers, > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Bug 56085] IllegalArgumentException is thrown when calling getServletContext().getRealPath("\\")
https://issues.apache.org/bugzilla/show_bug.cgi?id=56085 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- This has been fixed in 8.0.x and will be included in 8.0.2 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1562721 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java test/org/apache/catalina/core/TestStandardContext.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jan 30 08:29:10 2014
New Revision: 1562721
URL: http://svn.apache.org/r1562721
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56085
ServletContext.getRealPath(String) should return null for invalid input rather
than throwing an IllegalArgumentException
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1562721&r1=1562720&r2=1562721&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jan 30
08:29:10 2014
@@ -4418,7 +4418,11 @@ public class StandardContext extends Con
path = "/";
}
if (resources != null) {
-return resources.getResource(path).getCanonicalPath();
+try {
+return resources.getResource(path).getCanonicalPath();
+} catch (IllegalArgumentException iae) {
+// ServletContext.getRealPath() does not allow this to be
thrown
+}
}
return null;
}
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1562721&r1=1562720&r2=1562721&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Thu Jan
30 08:29:10 2014
@@ -876,4 +876,20 @@ public class TestStandardContext extends
Assert.assertTrue(log, log.contains("PASS"));
Assert.assertFalse(log, log.contains("FAIL"));
}
+
+@Test
+public void testBug56085() throws Exception {
+// Set up a container
+Tomcat tomcat = getTomcatInstance();
+
+File docBase = new File("test/webapp");
+Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
+
+// Start the context
+tomcat.start();
+
+String realPath = ctx.getRealPath("\\");
+
+Assert.assertNull(realPath);
+}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1562721&r1=1562720&r2=1562721&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 30 08:29:10 2014
@@ -44,6 +44,15 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+
+
+
+ 56085: ServletContext.getRealPath(String) should
+ return null for invalid input rather than throwing an
+ IllegalArgumentException. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56085] IllegalArgumentException is thrown when calling getServletContext().getRealPath("\\")
https://issues.apache.org/bugzilla/show_bug.cgi?id=56085
--- Comment #1 from Mark Thomas ---
The argument for getRealPath() is a virtual path and should therefore always
use "/" as a file separator irrespective of the operating system Tomcat is
running on.
However, throwing an IllegalArgumentException in this case does not appear to
be justified by the Javadoc. getRealPath("\\") should return null.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
