[Tomcat Wiki] Update of "PoweredBy" by BernhardRausch
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by BernhardRausch:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=398&rev2=399
=== NeuroMice ===
{{http://www.neuromice.org/images/banner_neuro_02.gif}}
[[http://www.neuromice.org|NeuroMice]] has their own nice
[[http://www.neuromice.org/poweredBy.sc|PoweredBy]] page.
+ === n0r1sk.com ===
+ {{http://www.n0r1sk.com/_NON_WIKI_CONTENT/n0r1sk_logo.png}}
[[http://www.n0r1sk.com|n0r1sk.com]] - some nice open source projects! (SMS
Gateway / PDF Split / ...)
+
=== OfferMe.com.au ===
{{http://www.offerme.com.au/images/layout/logo_home.gif}}
[[http://www.offerme.com.au|www.offerme.com.au]] - OfferMe.com.au is an all new
B2C trading platform in Australia using the Web2.0 concept.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 40530] Tomcat Service startup fails when installed into localized path
https://issues.apache.org/bugzilla/show_bug.cgi?id=40530 --- Comment #4 from Ankit Shah 2012-02-29 08:28:36 UTC --- (In reply to comment #3) > If the issue is with Commons Daemon, you'll need to raise a bug against that > project. Tomcat picks up new versions of Daemon as they become available. > > It would be very helpful if your report for daemon included specific examples > as that will make it easier to test. Is this bug resolved ? if yes then in which version ? tomcat 5 or 6 or 7 ? -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52544] tcnative-1.dll crash with RapidSSL certificate under 64bit Java
https://issues.apache.org/bugzilla/show_bug.cgi?id=52544 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #2 from Mladen Turk 2012-02-29 10:31:06 UTC --- You will need to covert the certificate to pem. I exported active-1.crt certificates you have send me and then did: openssl base64 -d -A -in *.net.crt -out active-1.der After that its loaded. Note that depending on OpenSSL version you can get core with that certificate. Contemporary OpenSSL's will throw ... (error:0D0680A8:asn1 encoding routines:ASN1_CHECK_TLEN:wrong tag) at org.apache.tomcat.jni.SSLContext.setCertificate(Native Method) Also versions before 1.1.23 can core if you set key without certificate eg you only have SSLCertificateKeyFile=".." but not SSLCertificateFile="..." -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52677] embedded SetCharacterEncodingFilter in org.apache.catalina.filters is not usable as it does not implement javax.servlet.Filter
https://issues.apache.org/bugzilla/show_bug.cgi?id=52677 --- Comment #2 from xiaming 2012-02-29 14:42:52 UTC --- Created attachment 28406 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28406 fix for 52677 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #44 from Johno Crawford 2012-02-29 15:12:41 UTC --- Created attachment 28407 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28407 Introduce status code constants Please find attached proposal of introducing status code constants instead of using magic numbers everywhere, also contains some typo fixes. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Taglibs Parent POM 1
On 29 February 2012 05:11, Konstantin Kolinko wrote: > 2012/2/29 Jeremy Boynes : >> Removed from svn. A dry run of the next release shows they are automatically >> added to the source bundle. >> > > 1. Where it takes those files from? Is their content correct. > > Besides extra blank lines before and after the text in NOTICE file, I'd forgotten about that - that's one reason why we don't use the auto-generated N&L files in Commons. [In a previous Maven release, IIRC the NOTICE file had even more extraneous text] Personally, I think it's a big mistake for the Apache Parent to generate these files automatically. They only apply to projects with no 3rd party dependencies or code. IMO the N&L files are too important to be auto-generated. Also, by using the auto-generated copies, SVN is left without any N&L files at the head of the tree. I would urge taglibs to use local copies of N&L files which can be properly maintained in SVN, and ignore the auto-generated ones. > there is small difference: > NOTICE: > Copyright 2000-2012 The Apache Software Foundation > NOTICE.txt: > Copyright 2009-2012 The Apache Software Foundation > > Is in pom.xml correct (2000) ? > > > 2. Looking at site.xml in source bundle and current site at > http://tomcat.apache.org/taglibs/ > > - I do not see a link to http://www.apache.org/licenses/ > - I do not see a link to http://tomcat.apache.org/security.html > > 3. commons-skin dependency says v.2. I see that there is v.3 at Maven > Central. > > > [x] +1 to go, but I think v2 will be needed before we release any of > the taglibs. > > It is hard to judge without looking at a site generated from this parent pom. > > Best regards, > Konstantin Kolinko > > >> On Feb 28, 2012, at 12:12 PM, Mladen Turk wrote: >> >>> On 02/28/2012 08:57 PM, sebb wrote: On 28 February 2012 16:43, Mladen Turk wrote: > > Although not sure why you have LICENSE and LICENSE.txt as well > as NOTICE and NOTICE.txt with the same content That is probably caused by the Apache POM, which tries to be helpful by adding the N&L for you. >>> >>> Right, that should be the cause. >>> We had to disable that part in Commons, because we don't use the same naming convention (and the AP does not allow for the names to be changed). >>> >>> Whatever... Think that this should be easy to solve. >>> Just rm extra files if maven will add them automatically >>> and the content is satisfactory. >>> > > - > 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: svn commit: r1294943 - in /tomcat/taglibs/taglibs-parent/trunk: LICENSE.txt NOTICE.txt
On 29 February 2012 02:19, wrote: > Author: jboynes > Date: Wed Feb 29 02:19:53 2012 > New Revision: 1294943 > > URL: http://svn.apache.org/viewvc?rev=1294943&view=rev > Log: > remove LICENCE.txt and NOTICE.txt as they are automatically added by Maven > release process -1 I think that's the wrong solutiion; see my comments on the dev list thread. > Removed: > tomcat/taglibs/taglibs-parent/trunk/LICENSE.txt > tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1295193 - in /tomcat/taglibs/taglibs-parent/trunk: LICENSE.txt NOTICE.txt
Author: jboynes Date: Wed Feb 29 18:04:45 2012 New Revision: 1295193 URL: http://svn.apache.org/viewvc?rev=1295193&view=rev Log: reverting r1294943 Added: tomcat/taglibs/taglibs-parent/trunk/LICENSE.txt - copied unchanged from r1294942, tomcat/taglibs/taglibs-parent/trunk/LICENSE.txt tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt - copied unchanged from r1294942, tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Taglibs Parent POM 1
Reverted r1294943. Do you know how this was addressed in Commons? Any patches? :) On Feb 29, 2012, at 9:14 AM, sebb wrote: > On 29 February 2012 05:11, Konstantin Kolinko wrote: >> 2012/2/29 Jeremy Boynes : >>> Removed from svn. A dry run of the next release shows they are >>> automatically added to the source bundle. >>> >> >> 1. Where it takes those files from? Is their content correct. >> >> Besides extra blank lines before and after the text in NOTICE file, > > I'd forgotten about that - that's one reason why we don't use the > auto-generated N&L files in Commons. > [In a previous Maven release, IIRC the NOTICE file had even more > extraneous text] > > Personally, I think it's a big mistake for the Apache Parent to > generate these files automatically. > They only apply to projects with no 3rd party dependencies or code. > IMO the N&L files are too important to be auto-generated. > > Also, by using the auto-generated copies, SVN is left without any N&L > files at the head of the tree. > > I would urge taglibs to use local copies of N&L files which can be > properly maintained in SVN, and ignore the auto-generated ones. > >> there is small difference: >> NOTICE: >> Copyright 2000-2012 The Apache Software Foundation >> NOTICE.txt: >> Copyright 2009-2012 The Apache Software Foundation >> >> Is in pom.xml correct (2000) ? >> >> >> 2. Looking at site.xml in source bundle and current site at >> http://tomcat.apache.org/taglibs/ >> >> - I do not see a link to http://www.apache.org/licenses/ >> - I do not see a link to http://tomcat.apache.org/security.html >> >> 3. commons-skin dependency says v.2. I see that there is v.3 at Maven >> Central. >> >> >> [x] +1 to go, but I think v2 will be needed before we release any of >> the taglibs. >> >> It is hard to judge without looking at a site generated from this parent pom. >> >> Best regards, >> Konstantin Kolinko >> >> >>> On Feb 28, 2012, at 12:12 PM, Mladen Turk wrote: >>> On 02/28/2012 08:57 PM, sebb wrote: > On 28 February 2012 16:43, Mladen Turk wrote: >> >> Although not sure why you have LICENSE and LICENSE.txt as well >> as NOTICE and NOTICE.txt with the same content > > That is probably caused by the Apache POM, which tries to be helpful > by adding the N&L for you. > Right, that should be the cause. > We had to disable that part in Commons, because we don't use the same > naming convention (and the AP does not allow for the names to be > changed). > Whatever... Think that this should be easy to solve. Just rm extra files if maven will add them automatically and the content is satisfactory. >> >> - >> 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 > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Taglibs Parent POM 1
On 29 February 2012 18:07, Jeremy Boynes wrote: > Reverted r1294943. > > Do you know how this was addressed in Commons? Yes, see commons-parent pom http://repo1.maven.org/maven2/org/apache/commons/commons-parent/23/commons-parent-23.pom search for NOTICE > Any patches? :) > > On Feb 29, 2012, at 9:14 AM, sebb wrote: > >> On 29 February 2012 05:11, Konstantin Kolinko wrote: >>> 2012/2/29 Jeremy Boynes : Removed from svn. A dry run of the next release shows they are automatically added to the source bundle. >>> >>> 1. Where it takes those files from? Is their content correct. >>> >>> Besides extra blank lines before and after the text in NOTICE file, >> >> I'd forgotten about that - that's one reason why we don't use the >> auto-generated N&L files in Commons. >> [In a previous Maven release, IIRC the NOTICE file had even more >> extraneous text] >> >> Personally, I think it's a big mistake for the Apache Parent to >> generate these files automatically. >> They only apply to projects with no 3rd party dependencies or code. >> IMO the N&L files are too important to be auto-generated. >> >> Also, by using the auto-generated copies, SVN is left without any N&L >> files at the head of the tree. >> >> I would urge taglibs to use local copies of N&L files which can be >> properly maintained in SVN, and ignore the auto-generated ones. >> >>> there is small difference: >>> NOTICE: >>> Copyright 2000-2012 The Apache Software Foundation >>> NOTICE.txt: >>> Copyright 2009-2012 The Apache Software Foundation >>> >>> Is in pom.xml correct (2000) ? >>> >>> >>> 2. Looking at site.xml in source bundle and current site at >>> http://tomcat.apache.org/taglibs/ >>> >>> - I do not see a link to http://www.apache.org/licenses/ >>> - I do not see a link to http://tomcat.apache.org/security.html >>> >>> 3. commons-skin dependency says v.2. I see that there is v.3 at Maven >>> Central. >>> >>> >>> [x] +1 to go, but I think v2 will be needed before we release any of >>> the taglibs. >>> >>> It is hard to judge without looking at a site generated from this parent >>> pom. >>> >>> Best regards, >>> Konstantin Kolinko >>> >>> On Feb 28, 2012, at 12:12 PM, Mladen Turk wrote: > On 02/28/2012 08:57 PM, sebb wrote: >> On 28 February 2012 16:43, Mladen Turk wrote: >>> >>> Although not sure why you have LICENSE and LICENSE.txt as well >>> as NOTICE and NOTICE.txt with the same content >> >> That is probably caused by the Apache POM, which tries to be helpful >> by adding the N&L for you. >> > > Right, that should be the cause. > >> We had to disable that part in Commons, because we don't use the same >> naming convention (and the AP does not allow for the names to be >> changed). >> > > Whatever... Think that this should be easy to solve. > Just rm extra files if maven will add them automatically > and the content is satisfactory. > >>> >>> - >>> 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 >> > > > - > 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 Taglibs Parent POM 1
Perso, I prefer using something which read pom and generate automatically N&L from metadatas rather than maintaining those files manually (for me manually means you always missed to add/modify :-) ) (but sure it's my POV) BTW Did you create any issues for that ? 2012/2/29 sebb : > On 29 February 2012 05:11, Konstantin Kolinko wrote: >> 2012/2/29 Jeremy Boynes : >>> Removed from svn. A dry run of the next release shows they are >>> automatically added to the source bundle. >>> >> >> 1. Where it takes those files from? Is their content correct. >> >> Besides extra blank lines before and after the text in NOTICE file, > > I'd forgotten about that - that's one reason why we don't use the > auto-generated N&L files in Commons. > [In a previous Maven release, IIRC the NOTICE file had even more > extraneous text] > > Personally, I think it's a big mistake for the Apache Parent to > generate these files automatically. > They only apply to projects with no 3rd party dependencies or code. > IMO the N&L files are too important to be auto-generated. > > Also, by using the auto-generated copies, SVN is left without any N&L > files at the head of the tree. > > I would urge taglibs to use local copies of N&L files which can be > properly maintained in SVN, and ignore the auto-generated ones. > >> there is small difference: >> NOTICE: >> Copyright 2000-2012 The Apache Software Foundation >> NOTICE.txt: >> Copyright 2009-2012 The Apache Software Foundation >> >> Is in pom.xml correct (2000) ? >> >> >> 2. Looking at site.xml in source bundle and current site at >> http://tomcat.apache.org/taglibs/ >> >> - I do not see a link to http://www.apache.org/licenses/ >> - I do not see a link to http://tomcat.apache.org/security.html >> >> 3. commons-skin dependency says v.2. I see that there is v.3 at Maven >> Central. >> >> >> [x] +1 to go, but I think v2 will be needed before we release any of >> the taglibs. >> >> It is hard to judge without looking at a site generated from this parent pom. >> >> Best regards, >> Konstantin Kolinko >> >> >>> On Feb 28, 2012, at 12:12 PM, Mladen Turk wrote: >>> On 02/28/2012 08:57 PM, sebb wrote: > On 28 February 2012 16:43, Mladen Turk wrote: >> >> Although not sure why you have LICENSE and LICENSE.txt as well >> as NOTICE and NOTICE.txt with the same content > > That is probably caused by the Apache POM, which tries to be helpful > by adding the N&L for you. > Right, that should be the cause. > We had to disable that part in Commons, because we don't use the same > naming convention (and the AP does not allow for the names to be > changed). > Whatever... Think that this should be easy to solve. Just rm extra files if maven will add them automatically and the content is satisfactory. >> >> - >> 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 > -- Olivier Lamy Talend: http://coders.talend.com http://twitter.com/olamy | http://linkedin.com/in/olamy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Taglibs Parent POM 1
On 29 February 2012 19:15, Olivier Lamy wrote: > Perso, I prefer using something which read pom and generate > automatically N&L from metadatas rather than maintaining those files > manually (for me manually means you always missed to add/modify :-) ) > (but sure it's my POV) AFAICT that just moves the work from maintaining the N&L to creating and maintaining the metadata. It also means that the N&L files are not present in SVN (unless they are checked in after generation). > BTW Did you create any issues for that ? > > 2012/2/29 sebb : >> On 29 February 2012 05:11, Konstantin Kolinko wrote: >>> 2012/2/29 Jeremy Boynes : Removed from svn. A dry run of the next release shows they are automatically added to the source bundle. >>> >>> 1. Where it takes those files from? Is their content correct. >>> >>> Besides extra blank lines before and after the text in NOTICE file, >> >> I'd forgotten about that - that's one reason why we don't use the >> auto-generated N&L files in Commons. >> [In a previous Maven release, IIRC the NOTICE file had even more >> extraneous text] >> >> Personally, I think it's a big mistake for the Apache Parent to >> generate these files automatically. >> They only apply to projects with no 3rd party dependencies or code. >> IMO the N&L files are too important to be auto-generated. >> >> Also, by using the auto-generated copies, SVN is left without any N&L >> files at the head of the tree. >> >> I would urge taglibs to use local copies of N&L files which can be >> properly maintained in SVN, and ignore the auto-generated ones. >> >>> there is small difference: >>> NOTICE: >>> Copyright 2000-2012 The Apache Software Foundation >>> NOTICE.txt: >>> Copyright 2009-2012 The Apache Software Foundation >>> >>> Is in pom.xml correct (2000) ? >>> >>> >>> 2. Looking at site.xml in source bundle and current site at >>> http://tomcat.apache.org/taglibs/ >>> >>> - I do not see a link to http://www.apache.org/licenses/ >>> - I do not see a link to http://tomcat.apache.org/security.html >>> >>> 3. commons-skin dependency says v.2. I see that there is v.3 at Maven >>> Central. >>> >>> >>> [x] +1 to go, but I think v2 will be needed before we release any of >>> the taglibs. >>> >>> It is hard to judge without looking at a site generated from this parent >>> pom. >>> >>> Best regards, >>> Konstantin Kolinko >>> >>> On Feb 28, 2012, at 12:12 PM, Mladen Turk wrote: > On 02/28/2012 08:57 PM, sebb wrote: >> On 28 February 2012 16:43, Mladen Turk wrote: >>> >>> Although not sure why you have LICENSE and LICENSE.txt as well >>> as NOTICE and NOTICE.txt with the same content >> >> That is probably caused by the Apache POM, which tries to be helpful >> by adding the N&L for you. >> > > Right, that should be the cause. > >> We had to disable that part in Commons, because we don't use the same >> naming convention (and the AP does not allow for the names to be >> changed). >> > > Whatever... Think that this should be easy to solve. > Just rm extra files if maven will add them automatically > and the content is satisfactory. > >>> >>> - >>> 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 >> > > > > -- > Olivier Lamy > Talend: http://coders.talend.com > http://twitter.com/olamy | http://linkedin.com/in/olamy > > - > 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
DO NOT REPLY [Bug 52500] Improve client certificate authentication
https://issues.apache.org/bugzilla/show_bug.cgi?id=52500 --- Comment #32 from Michael 2012-02-29 20:05:29 UTC --- Dear Christopher, Did you see my patch? Do you have any comments? Best regards, Michael -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #45 from Mark Thomas 2012-02-29 20:56:34 UTC --- (In reply to comment #44) > Please find attached proposal of introducing status code constants instead of > using magic numbers everywhere, also contains some typo fixes. Thanks. Patch applied with a few variations for consistency with the rest of the Tomcat code base. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1295279 - in /tomcat/trunk/java/org/apache/catalina/websocket: StreamInbound.java WsOutbound.java
Author: markt
Date: Wed Feb 29 21:22:10 2012
New Revision: 1295279
URL: http://svn.apache.org/viewvc?rev=1295279&view=rev
Log:
Make the outbound buffer sizes configurable
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1295279&r1=1295278&r2=1295279&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java Wed Feb
29 21:22:10 2012
@@ -38,10 +38,51 @@ public abstract class StreamInbound impl
private UpgradeProcessor processor = null;
private WsOutbound outbound;
+private int outboundByteBufferSize = WsOutbound.DEFAULT_BUFFER_SIZE;
+private int outboundCharBufferSize = WsOutbound.DEFAULT_BUFFER_SIZE;
+
+
+
+public int getOutboundByteBufferSize() {
+return outboundByteBufferSize;
+}
+
+
+/**
+ * This only applies to the {@link WsOutbound} instance returned from
+ * {@link #getWsOutbound()} created by a subsequent call to
+ * {@link #setUpgradeOutbound(UpgradeOutbound)}. The current
+ * {@link WsOutbound} instance, if any, is not affected.
+ *
+ * @param outboundByteBufferSize
+ */
+public void setOutboundByteBufferSize(int outboundByteBufferSize) {
+this.outboundByteBufferSize = outboundByteBufferSize;
+}
+
+
+public int getOutboundCharBufferSize() {
+return outboundCharBufferSize;
+}
+
+
+/**
+ * This only applies to the {@link WsOutbound} instance returned from
+ * {@link #getWsOutbound()} created by a subsequent call to
+ * {@link #setUpgradeOutbound(UpgradeOutbound)}. The current
+ * {@link WsOutbound} instance, if any, is not affected.
+ *
+ * @param outboundCharBufferSize
+ */
+public void setOutboundCharBufferSize(int outboundCharBufferSize) {
+this.outboundCharBufferSize = outboundCharBufferSize;
+}
+
@Override
public final void setUpgradeOutbound(UpgradeOutbound upgradeOutbound) {
-outbound = new WsOutbound(upgradeOutbound);
+outbound = new WsOutbound(upgradeOutbound, outboundByteBufferSize,
+outboundCharBufferSize);
}
Modified: tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java?rev=1295279&r1=1295278&r2=1295279&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java (original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java Wed Feb 29
21:22:10 2012
@@ -33,7 +33,7 @@ public class WsOutbound {
private static final StringManager sm =
StringManager.getManager(Constants.Package);
-private static final int DEFAULT_BUFFER_SIZE = 8192;
+public static final int DEFAULT_BUFFER_SIZE = 8192;
private UpgradeOutbound upgradeOutbound;
private ByteBuffer bb;
@@ -44,10 +44,15 @@ public class WsOutbound {
public WsOutbound(UpgradeOutbound upgradeOutbound) {
+this(upgradeOutbound, DEFAULT_BUFFER_SIZE, DEFAULT_BUFFER_SIZE);
+}
+
+
+public WsOutbound(UpgradeOutbound upgradeOutbound, int byteBufferSize,
+int charBufferSize) {
this.upgradeOutbound = upgradeOutbound;
-// TODO: Make buffer size configurable
-this.bb = ByteBuffer.allocate(DEFAULT_BUFFER_SIZE);
-this.cb = CharBuffer.allocate(DEFAULT_BUFFER_SIZE);
+this.bb = ByteBuffer.allocate(byteBufferSize);
+this.cb = CharBuffer.allocate(charBufferSize);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1295281 - /tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java
Author: markt
Date: Wed Feb 29 21:22:56 2012
New Revision: 1295281
URL: http://svn.apache.org/viewvc?rev=1295281&view=rev
Log:
Remove unnecessary check - all paths to this method already perform the
check
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java?rev=1295281&r1=1295280&r2=1295281&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java (original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java Wed Feb 29
21:22:56 2012
@@ -320,10 +320,6 @@ public class WsOutbound {
private void doWriteBytes(ByteBuffer buffer, boolean finalFragment)
throws IOException {
-if (closed) {
-throw new IOException("Closed");
-}
-
// Work out the first byte
int first = 0x00;
if (finalFragment) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1295283 - /tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java
Author: markt
Date: Wed Feb 29 21:23:34 2012
New Revision: 1295283
URL: http://svn.apache.org/viewvc?rev=1295283&view=rev
Log:
Make writing thread safe
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java?rev=1295283&r1=1295282&r2=1295283&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java (original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java Wed Feb 29
21:23:34 2012
@@ -27,7 +27,10 @@ import org.apache.tomcat.util.buf.B2CCon
import org.apache.tomcat.util.res.StringManager;
/**
- * Provides the means to write WebSocket messages to the client.
+ * Provides the means to write WebSocket messages to the client. All methods
+ * that write to the client (or update a buffer that is later written to the
+ * client) are synchronized to prevent multiple threads trying to write to the
+ * client at the same time.
*/
public class WsOutbound {
@@ -68,7 +71,7 @@ public class WsOutbound {
* @throws IOException If a flush is required and an error occurs writing
* the WebSocket frame to the client
*/
-public void writeBinaryData(int b) throws IOException {
+public synchronized void writeBinaryData(int b) throws IOException {
if (closed) {
throw new IOException(sm.getString("outbound.closed"));
}
@@ -98,7 +101,7 @@ public class WsOutbound {
* @throws IOException If a flush is required and an error occurs writing
* the WebSocket frame to the client
*/
-public void writeTextData(char c) throws IOException {
+public synchronized void writeTextData(char c) throws IOException {
if (closed) {
throw new IOException(sm.getString("outbound.closed"));
}
@@ -127,7 +130,9 @@ public class WsOutbound {
*
* @throws IOException If an error occurs writing to the client
*/
-public void writeBinaryMessage(ByteBuffer msgBb) throws IOException {
+public synchronized void writeBinaryMessage(ByteBuffer msgBb)
+throws IOException {
+
if (closed) {
throw new IOException(sm.getString("outbound.closed"));
}
@@ -150,7 +155,9 @@ public class WsOutbound {
*
* @throws IOException If an error occurs writing to the client
*/
-public void writeTextMessage(CharBuffer msgCb) throws IOException {
+public synchronized void writeTextMessage(CharBuffer msgCb)
+throws IOException {
+
if (closed) {
throw new IOException(sm.getString("outbound.closed"));
}
@@ -169,7 +176,7 @@ public class WsOutbound {
*
* @throws IOException If an error occurs writing to the client
*/
-public void flush() throws IOException {
+public synchronized void flush() throws IOException {
if (closed) {
throw new IOException(sm.getString("outbound.closed"));
}
@@ -250,9 +257,9 @@ public class WsOutbound {
*
* @throws IOException If an error occurs writing to the client
*/
-public void close(int status, ByteBuffer data) throws IOException {
-// TODO Think about threading requirements for writing. This is not
-// currently thread safe and writing almost certainly needs to be.
+public synchronized void close(int status, ByteBuffer data)
+throws IOException {
+
if (closed) {
return;
}
@@ -287,9 +294,8 @@ public class WsOutbound {
*
* @throws IOException If an error occurs writing to the client
*/
-public void pong(ByteBuffer data) throws IOException {
-// TODO Think about threading requirements for writing. This is not
-// currently thread safe and writing almost certainly needs to be.
+public synchronized void pong(ByteBuffer data) throws IOException {
+
if (closed) {
throw new IOException(sm.getString("outbound.closed"));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1295284 - in /tomcat/trunk/java/org/apache/catalina/websocket: Constants.java LocalStrings.properties StreamInbound.java WsInputStream.java WsOutbound.java
Author: markt
Date: Wed Feb 29 21:24:19 2012
New Revision: 1295284
URL: http://svn.apache.org/viewvc?rev=1295284&view=rev
Log:
Use constants for close code and fix various typos.
Patch provided by Johno Crawford.
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/Constants.java
tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java
tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/Constants.java?rev=1295284&r1=1295283&r2=1295284&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/Constants.java Wed Feb 29
21:24:19 2012
@@ -29,4 +29,93 @@ public class Constants {
public static final byte OPCODE_CLOSE = 0x08;
public static final byte OPCODE_PING = 0x09;
public static final byte OPCODE_PONG = 0x0A;
+
+// Status Codes
+// Definitions as per RFC 6455 (http://tools.ietf.org/html/rfc6455)
+/**
+ * 1000 indicates a normal closure, meaning whatever purpose the
+ * connection was established for has been fulfilled.
+ */
+public static final int STATUS_CLOSE_NORMAL = 1000;
+
+/**
+ * 1001 indicates that an endpoint is "going away", such as a server
+ * going down, or a browser having navigated away from a page.
+ */
+public static final int STATUS_SHUTDOWN = 1001;
+
+/**
+ * 1002 indicates that an endpoint is terminating the connection due
+ * to a protocol error.
+ */
+public static final int STATUS_PROTOCOL_ERROR = 1002;
+
+/**
+ * 1003 indicates that an endpoint is terminating the connection
+ * because it has received a type of data it cannot accept (e.g. an
+ * endpoint that understands only text data MAY send this if it
+ * receives a binary message).
+ */
+public static final int STATUS_UNEXPECTED_DATA_TYPE = 1003;
+
+// 1004 is reserved. The specific meaning might be defined in the future.
+
+/**
+ * 1005 is a reserved value and MUST NOT be set as a status code in a
+ * Close control frame by an endpoint. It is designated for use in
+ * applications expecting a status code to indicate that no status
+ * code was actually present.
+ */
+public static final int STATUS_CODE_MISSING = 1005;
+
+/**
+ * 1006 is a reserved value and MUST NOT be set as a status code in a
+ * Close control frame by an endpoint. It is designated for use in
+ * applications expecting a status code to indicate that the
+ * connection was closed abnormally, e.g. without sending or
+ * receiving a Close control frame.
+ */
+public static final int STATUS_CLOSED_UNEXPECTEDLY = 1006;
+
+/**
+ * 1007 indicates that an endpoint is terminating the connection
+ * because it has received data within a message that was not
+ * consistent with the type of the message (e.g., non-UTF-8 [RFC3629]
+ * data within a text message).
+ */
+public static final int STATUS_BAD_DATA = 1007;
+
+/**
+ * 1008 indicates that an endpoint is terminating the connection
+ * because it has received a message that violates its policy. This
+ * is a generic status code that can be returned when there is no
+ * other more suitable status code (e.g. 1003 or 1009), or if there
+ * is a need to hide specific details about the policy.
+ */
+public static final int STATUS_POLICY_VIOLATION = 1008;
+
+/**
+ * 1009 indicates that an endpoint is terminating the connection
+ * because it has received a message which is too big for it to
+ * process.
+ */
+public static final int STATUS_MESSAGE_TOO_LARGE = 1009;
+
+/**
+ * 1010 indicates that an endpoint (client) is terminating the
+ * connection because it has expected the server to negotiate one or
+ * more extension, but the server didn't return them in the response
+ * message of the WebSocket handshake. The list of extensions which
+ * are needed SHOULD appear in the /reason/ part of the Close frame.
+ * Note that this status code is not used by the server, because it
+ * can fail the WebSocket handshake instead.
+ */
+public static final int STATUS_REQUIRED_EXTENSION = 1010;
+
+/**
+ * 1011 indicates that a server is terminating the connection because it
+ * encountered an unexpected condition that prevented it from fulfilling
the
+ * request.
+ */
+public static final int STATUS_UNEXPECTED_CONDITION = 1011;
}
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
UR
svn commit: r1295286 - in /tomcat/trunk/java/org/apache/catalina/websocket: LocalStrings.properties WsFrame.java
Author: markt
Date: Wed Feb 29 21:24:59 2012
New Revision: 1295286
URL: http://svn.apache.org/viewvc?rev=1295286&view=rev
Log:
Fix a TODO
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties?rev=1295286&r1=1295285&r2=1295286&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties Wed
Feb 29 21:24:59 2012
@@ -15,6 +15,7 @@
frame.eos=The end of the stream was reached before the expected number of
payload bytes could be read
frame.invalidUtf8=A sequence of bytes was received that did not represent
valid UTF-8
+frame.readFailed=Failed to read the first byte of the next WebSocket frame.
The return value from the read was [{0}]
frame.notMasked=The client frame was not masked but all client frames must be
masked
is.notContinuation=A frame with the OpCode [{0}] was received when a
continuation frame was expected
Modified: tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java?rev=1295286&r1=1295285&r2=1295286&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java (original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java Wed Feb 29
21:24:59 2012
@@ -215,8 +215,8 @@ public class WsFrame {
} else if (read == 0) {
return null;
} else {
-// TODO message
-throw new IOException();
+throw new IOException(
+sm.getString("frame.readFailed", Integer.valueOf(read)));
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1295290 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomca
Author: olamy
Date: Wed Feb 29 21:30:20 2012
New Revision: 1295290
URL: http://svn.apache.org/viewvc?rev=1295290&view=rev
Log:
[MTOMCAT-120] Support "skip" parameter.
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java?rev=1295290&r1=1295289&r2=1295290&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
Wed Feb 29 21:30:20 2012
@@ -315,6 +315,15 @@ public abstract class AbstractRunMojo
*/
private File managerWarPath;
+
+/**
+ * Skip execution
+ *
+ * @parameter expression="${maven.tomcat.skip}" default-value="false"
+ * @since 2.0
+ */
+protected boolean skip;
+
// --
// Fields
// --
@@ -334,6 +343,11 @@ public abstract class AbstractRunMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
+if ( skip )
+{
+getLog().info( "skip execution" );
+return;
+}
// ensure project is a web application
if ( !isWar() )
{
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java?rev=1295290&r1=1295289&r2=1295290&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java
Wed Feb 29 21:30:20 2012
@@ -51,6 +51,14 @@ public class ShutdownMojo
protected boolean skipErrorOnShutdown;
/**
+ * Skip execution
+ *
+ * @parameter expression="${maven.tomcat.skipShutdown}"
default-value="false"
+ * @since 2.0
+ */
+protected boolean skip;
+
+/**
* Shuts down all embedded tomcats which got started up to now.
*
* @throws MojoExecutionException if shutting down one or all servers
failed
@@ -58,6 +66,11 @@ public class ShutdownMojo
public void execute()
throws MojoExecutionException
{
+if ( skip )
+{
+getLog().info( "skip execution" );
+return;
+}
try
{
EmbeddedRegistry.getInstance().shutdownAll( getLog() );
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1295290&r1=1295289&r2=1295290&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Wed Feb 29 21:30:20 2012
@@ -314,6 +314,14 @@ public abstract class AbstractRunMojo
*/
private File tomcatLoggingFile;
+/**
+ * Skip execution
+ *
+ * @parameter expression="${maven.tomcat.skip}" default-value="false"
+ * @since 2.0
+ */
+protected boolean skip;
+
// --
// Fields
@@ -334,6 +342,11 @@ public abstract class AbstractRunMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
+if ( skip )
+{
+getLog().info( "skip execution" );
+return;
+
[jira] [Closed] (MTOMCAT-120) Support "skip" parameter
[
https://issues.apache.org/jira/browse/MTOMCAT-120?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Olivier Lamy closed MTOMCAT-120.
Resolution: Fixed
fixed
> Support "skip" parameter
>
>
> Key: MTOMCAT-120
> URL: https://issues.apache.org/jira/browse/MTOMCAT-120
> Project: Apache Tomcat Maven Plugin
> Issue Type: Improvement
> Components: tomcat7
>Affects Versions: 2.0-beta-1
> Environment: -
>Reporter: Cédric Dutoit
>Assignee: Olivier Lamy
> Labels: maven
> Fix For: 2.0
>
> Original Estimate: 2h
> Remaining Estimate: 2h
>
> Please support a "skip" parameter to tomcat-run, tomcat-shutdown, as does
> jetty project.
> For my project, I use SkipITs variable to ask failsafe plugin to not execute
> IT tests.
> I also want to avoid having Tomcat started, stopped if IT tests won't execute
> (skipITs=true).
> I have the following configuration:
>
>
>
> org.apache.tomcat.maven
>
> tomcat7-maven-plugin
> 2.0-SNAPSHOT
>
>
> TomcatRunner
>
>
>
>
>
> tomcat-run
>
>
> run-war-only
>
>
> pre-integration-test
>
>
>
> tomcat-shutdown
>
>
> shutdown
>
>
> post-integration-test
>
>
>
> I need a skip variable as to use the following execution configuration:
> ${skipITs}
> Maybe a single variable +
> if (skip) {
>log(...)
>return;
> }
> ... in org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo
> (http://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java)
> would be enough.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52800] New: Please do not catch Throwable!
https://issues.apache.org/bugzilla/show_bug.cgi?id=52800 Bug #: 52800 Summary: Please do not catch Throwable! Product: Tomcat 7 Version: 7.0.26 Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: mike...@gulik.co.nz Classification: Unclassified See also bug 48644. I see "catch (Throwable ..." occurring 311 times in the Tomcat source: mikevdg@xxx:~/src/apache-tomcat-7.0.26-src $ grep -r "catch.*(.*Throwable" * | wc -l 311 Please at the very least, change these to "catch (Exception ...". Otherwise you end up catching OutOfMemoryErrors. IMHO, and I haven't grepped the mailing list for any controversy surrounding this, when Tomcat (or anything!!!) receives an OOME, it should exit to the OS to be restarted by whatever script or mechanism is managing it. You cannot recover from an OOME, and I have to resort to SIGKILL to stop the JVM. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52800] Please do not catch Throwable!
https://issues.apache.org/bugzilla/show_bug.cgi?id=52800 Michael van der Gulik changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Michael van der Gulik 2012-03-01 01:36:43 UTC --- Most catch clauses seem to use "ExceptionUtils.handleThrowable(t)", which rethrows the Throwable if it is important. Grumble mumble, nasty way to handle errors, but it does resolve this issue. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48644] Code should never ignore throwable
https://issues.apache.org/bugzilla/show_bug.cgi?id=48644 Konstantin Kolinko changed: What|Removed |Added CC||mike...@gulik.co.nz --- Comment #6 from Konstantin Kolinko 2012-03-01 03:37:12 UTC --- *** Bug 52800 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52800] Please do not catch Throwable!
https://issues.apache.org/bugzilla/show_bug.cgi?id=52800 Konstantin Kolinko changed: What|Removed |Added Resolution|WONTFIX |DUPLICATE --- Comment #2 from Konstantin Kolinko 2012-03-01 03:37:12 UTC --- As you correctly noted, this has been fixed a while ago. I am marking it as duplicate. *** This bug has been marked as a duplicate of bug 48644 *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT] Release Apache Taglibs Parent POM 1
+1 votes from olamy, mturk and kkolinko; no -1's Issues raised during the vote: * duplicate LICENSE and NOTICE files, and how to avoid this * site contents * version of commons-skin used for site to be addressed before we release any of the taglibs Thanks. I'll promote the staging repo later this week. Jeremy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1295286 - in /tomcat/trunk/java/org/apache/catalina/websocket: LocalStrings.properties WsFrame.java
2012/3/1 :
> Author: markt
> Date: Wed Feb 29 21:24:59 2012
> New Revision: 1295286
>
> URL: http://svn.apache.org/viewvc?rev=1295286&view=rev
> Log:
> Fix a TODO
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
> tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties?rev=1295286&r1=1295285&r2=1295286&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
> Wed Feb 29 21:24:59 2012
> @@ -15,6 +15,7 @@
>
> frame.eos=The end of the stream was reached before the expected number of
> payload bytes could be read
> frame.invalidUtf8=A sequence of bytes was received that did not represent
> valid UTF-8
> +frame.readFailed=Failed to read the first byte of the next WebSocket frame.
> The return value from the read was [{0}]
> frame.notMasked=The client frame was not masked but all client frames must
> be masked
>
> is.notContinuation=A frame with the OpCode [{0}] was received when a
> continuation frame was expected
>
> Modified: tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java?rev=1295286&r1=1295285&r2=1295286&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java Wed Feb 29
> 21:24:59 2012
> @@ -215,8 +215,8 @@ public class WsFrame {
> } else if (read == 0) {
> return null;
> } else {
> - // TODO message
> - throw new IOException();
> + throw new IOException(
> + sm.getString("frame.readFailed", Integer.valueOf(read)));
Maybe java.io.EOFException ?
I see that read can be -1 here.
> }
> }
> }
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 4 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 24 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-01032012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-01032012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-01032012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-01032012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-01032012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-tr unk/tomcat-deps/tomcat-dbcp-01032012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-01032012.jar:/srv/gump/public
Re: [RESULT] Release Apache Taglibs Parent POM 1
thanks Jeremy. 2012/3/1 Jeremy Boynes > +1 votes from olamy, mturk and kkolinko; no -1's > > Issues raised during the vote: > * duplicate LICENSE and NOTICE files, and how to avoid this > * site contents > * version of commons-skin used for site > to be addressed before we release any of the taglibs > > Thanks. I'll promote the staging repo later this week. > Jeremy > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Lei Wang (Rex) rwonly AT apache.org
New unit tests for Authenticators and SingleSignOn
I have finished the third in my series of new unit tests, which examines
the SingleSignOn interactions between the Digest and NonLogin
Authenticators. Because each Authenticator class has its own SSO logic,
I feel it is sensible to test that logic explicitly. However, there is
no need to duplicate ALL of the authentication logic already tested by
the "non-SSO" test classes.
The new test class passes CheckStyle and runs successfully against the
trunk (at revision 1295439).
It is not urgent, but would someone please verify the code and commit
the new class for me?
/*
* 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.authenticator;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.junit.Test;
import org.apache.catalina.Context;
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.SecurityCollection;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.catalina.startup.TesterServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.util.MD5Encoder;
import org.apache.tomcat.util.buf.ByteChunk;
/**
* Test DigestAuthenticator and NonLoginAuthenticator when a
* SingleSignOn Valve is active.
*
*
* In the absence of SSO support, a webapp using NonLoginAuthenticator
* simply cannot access protected resources. These tests exercise the
* the way successfully authenticating a different webapp under the
* DigestAuthenticator triggers the additional SSO logic for both webapps.
*
*
* Note: these tests are intended to exercise the SSO logic of the
* Authenticator, but not to comprehensively test all of its logic paths.
* That is the responsibility of the non-SSO test suite.
*/
public class TestSSOnonLoginAndDigestAuthenticator extends TomcatBaseTest {
private static final String USER = "user";
private static final String PWD = "pwd";
private static final String ROLE = "role";
private static final String HTTP_PREFIX = "http://localhost:";;
private static final String CONTEXT_PATH_NOLOGIN = "/nologin";
private static final String CONTEXT_PATH_DIGEST = "/digest";
private static final String URI_PROTECTED = "/protected";
private static final String URI_PUBLIC = "/anyoneCanAccess";
private static final int SHORT_TIMEOUT_SECS = 4;
private static final long SHORT_TIMEOUT_DELAY_MSECS =
((SHORT_TIMEOUT_SECS + 3) * 1000);
private static final int LONG_TIMEOUT_SECS = 10;
private static final long LONG_TIMEOUT_DELAY_MSECS =
((LONG_TIMEOUT_SECS + 2) * 1000);
private static final String CLIENT_AUTH_HEADER = "authorization";
private static final String OPAQUE = "opaque";
private static final String NONCE = "nonce";
private static final String REALM = "realm";
private static final String CNONCE = "cnonce";
private static String NC1 = "0001";
private static String NC2 = "0002";
private static String QOP = "auth";
private static String SERVER_COOKIES = "Set-Cookie";
private static String BROWSER_COOKIES = "Cookie";
private List cookies;
/**
* Try to access an unprotected resource without an
* established SSO session.
* This should be permitted.
*/
@Test
public void testAcceptPublicNonLogin() throws Exception {
doTestNonLogin(CONTEXT_PATH_NOLOGIN + URI_PUBLIC,
true, false, 200);
}
/*
* Try to access a protected resource without an established
* SSO session.
* This should be rejected with SC_FORBIDDEN 403 status.
*/
@Test
public void testRejectProtectedNonLogin() throws Exception {
doTestNonLogin(CONTEXT_PATH_NOLOGIN + URI_PROTECTED,
false, true, 403);
}
/**
* Logon to access a protected resource using DIGEST authentication,
* which will establish an SSO session.
[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-taglibs-standard has an issue affecting its community integration. This issue affects 2 projects, and has been outstanding for 8 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-taglibs-standard : Standard Taglib - tomcat-taglibs-standard-install : JSP Taglibs Full details are available at: http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Optional dependency taglibs-standard-spec failed with reason build failed -INFO- Optional dependency httpunit failed with reason build failed -DEBUG- (Apache Gump generated) Apache Maven Settings in: /srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml -INFO- Failed with reason build failed -DEBUG- Maven POM in: /srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build) Work ended in a state of : Failed Elapsed: 1 sec Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings /srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml install [Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard] M2_HOME: /opt/maven2 - at org.apache.maven.cli.compat.CompatibleMain.main(CompatibleMain.java:60) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315) at org.codehaus.classworlds.Launcher.launch(Launcher.java:255) at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430) at org.codehaus.classworlds.Launcher.main(Launcher.java:375) Caused by: org.apache.maven.project.ProjectBuildingException: Cannot find parent: org.apache.taglibs:taglibs-parent for project: null:taglibs-standard:pom:1.2-SNAPSHOT for project null:taglibs-standard:pom:1.2-SNAPSHOT at org.apache.maven.project.DefaultMavenProjectBuilder.assembleLineage(DefaultMavenProjectBuilder.java:1396) at org.apache.maven.project.DefaultMavenProjectBuilder.buildInternal(DefaultMavenProjectBuilder.java:823) at org.apache.maven.project.DefaultMavenProjectBuilder.buildFromSourceFileInternal(DefaultMavenProjectBuilder.java:508) at org.apache.maven.project.DefaultMavenProjectBuilder.build(DefaultMavenProjectBuilder.java:200) at org.apache.maven.DefaultMaven.getProject(DefaultMaven.java:604) at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:487) at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:391) ... 12 more Caused by: org.apache.maven.project.ProjectBuildingException: POM 'org.apache.taglibs:taglibs-parent' not found in repository: Unable to download the artifact from any repository org.apache.taglibs:taglibs-parent:pom:1-SNAPSHOT from the specified remote repositories: gump-central (http://localhost:8192/maven2) for project org.apache.taglibs:taglibs-parent at org.apache.maven.project.DefaultMavenProjectBuilder.findModelFromRepository(DefaultMavenProjectBuilder.java:605) at org.apache.maven.project.DefaultMavenProjectBuilder.assembleLineage(DefaultMavenProjectBuilder.java:1392) ... 18 more Caused by: org.apache.maven.artifact.resolver.ArtifactNotFoundException: Unable to download the artifact from any repository org.apache.taglibs:taglibs-parent:pom:1-SNAPSHOT from the specified remote repositories: gump-central (http://localhost:8192/maven2) at org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:228) at org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:90) at org.apache.maven.project.DefaultMavenProjectBuilder.findModelFromRepository(DefaultMavenProjectBuilder.java:558) ... 19 more Caused by: org.apache.maven.wagon.ResourceDoesNotExistException: Unable to download the artifact from any repository at org.apache.
svn commit: r1295445 - /tomcat/native/trunk/native/src/network.c
Author: costin
Date: Thu Mar 1 07:37:11 2012
New Revision: 1295445
URL: http://svn.apache.org/viewvc?rev=1295445&view=rev
Log:
Small bug/leak when called with larger buffers.
Modified:
tomcat/native/trunk/native/src/network.c
Modified: tomcat/native/trunk/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=1295445&r1=1295444&r2=1295445&view=diff
==
--- tomcat/native/trunk/native/src/network.c (original)
+++ tomcat/native/trunk/native/src/network.c Thu Mar 1 07:37:11 2012
@@ -737,10 +737,12 @@ TCN_IMPLEMENT_CALL(jint, Socket, recv)(T
}
else {
jbyte *bytes = (*e)->GetByteArrayElements(e, buf, NULL);
-if ((ss = (*s->net->recv)(s->opaque, (char*)(bytes + offset),
- &nbytes)) == APR_SUCCESS)
-(*e)->ReleaseByteArrayElements(e, buf, bytes,
- nbytes ? 0 : JNI_ABORT);
+ss = (*s->net->recv)(s->opaque, (char*)(bytes + offset), &nbytes);
+if ( ss == APR_SUCCESS) {
+(*e)->ReleaseByteArrayElements(e, buf, bytes, nbytes ? 0 :
JNI_ABORT);
+} else {
+(*e)->ReleaseByteArrayElements(e, buf, bytes, JNI_ABORT);
+}
}
#ifdef TCN_DO_STATISTICS
if (ss == APR_SUCCESS) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
