[jira] [Commented] (MTOMCAT-206) Runtime dependencies within multi module projects are not loaded.
[ https://issues.apache.org/jira/browse/MTOMCAT-206?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13579024#comment-13579024 ] Ludwig Magnusson commented on MTOMCAT-206: -- Is this a problem? Running mvn clean verify generates a build success for me... > Runtime dependencies within multi module projects are not loaded. > - > > Key: MTOMCAT-206 > URL: https://issues.apache.org/jira/browse/MTOMCAT-206 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: commons-lib >Affects Versions: 2.0 >Reporter: Ludwig Magnusson >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.1 > > > I am not sure if this counts as a duplicate of MTOMCAT-46, there are some > differences... > Consider a multi module project in maven structured like this: > - parent > - api > - implementation > - webapp > The webapp has a compile scope dependency on the API and a runtime scope > dependency on the implementation. The implementation classes are loaded with > some dependency injection framework. > If I run tomcat(7):run in the root project it will fail because the tomcat > plugin does not add the implementation classes (i.e. the runtime dependency) > to the classpath. If I change the dependency scope of the implementation > dependency to compile, it works. > The solution for this was pretty simple. Just change one method call in > DefaultClassLoaderEntriesCalculator, viewable in the applied patch. All tests > and IT-tests still pass. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators 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
Re: [VOTE] Release Apache Tomcat 7.0.37
On 12/02/2013 23:22, Mark Thomas wrote: The proposed Apache Tomcat 7.0.37 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.37/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-227/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_37/ The proposed 7.0.37 release is: [ ] Broken - do not release [X] Stable - go ahead and release as 7.0.37 Stable Unit tests pass on 64-bit Windows and 64-bit Linux EL TCK passes JSP TCK passes with HTTP (direct) BIO, NIO & APR/native (1.1.27) Servlet TCK passes with - HTTP (direct) BIO, NIO & APR/native (1.1.27) - HTTP (mod_proxy_http) BIO, NIO & APR/native (1.1.27) - AJP (mod_jk) BIO, NIO & APR/native (1.1.27) - AJP (mod_proxy_ajp) BIO, NIO & APR/native (1.1.27) All TCK tests run on 64-bit Linux with a security manager Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.37
2013/2/13 Mark Thomas : > The proposed Apache Tomcat 7.0.37 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.37/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-227/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_37/ > > The proposed 7.0.37 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.37 Stable > Tested Tomcat in OSGi environment - successful Basic performance tests - successful Regards Violeta - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1446547 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Author: kkolinko Date: Fri Feb 15 12:05:17 2013 New Revision: 1446547 URL: http://svn.apache.org/r1446547 Log: Correct changelog section name Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1446547&r1=1446546&r2=1446547&view=diff == --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Fri Feb 15 12:05:17 2013 @@ -36,7 +36,7 @@ new documentation project for Tomcat Native was started. - + Minimum supported APR version is now again 1.2.0. Version 1.3.0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "Raghavendra Chary B" by Raghavendra Chary B
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "Raghavendra Chary B" page has been changed by Raghavendra Chary B: http://wiki.apache.org/tomcat/Raghavendra%20Chary%20B New page: ##language:en == Your Name == Email: <> ... CategoryHomepage - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Trivial Update of "Raghavendra Chary B" by Raghavendra Chary B
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "Raghavendra Chary B" page has been changed by Raghavendra Chary B: http://wiki.apache.org/tomcat/Raghavendra%20Chary%20B?action=diff&rev1=1&rev2=2 ##language:en - == Your Name == + == Raghavendra Chary B == - Email: <> + Email: <> ... - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1446547 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Sorry and thanks. Wrong time of day. On 15.02.2013 13:05, kkoli...@apache.org wrote: > Author: kkolinko > Date: Fri Feb 15 12:05:17 2013 > New Revision: 1446547 > > URL: http://svn.apache.org/r1446547 > Log: > Correct changelog section name > > Modified: > tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml > > Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml > URL: > http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1446547&r1=1446546&r2=1446547&view=diff > == > --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) > +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Fri Feb 15 > 12:05:17 2013 > @@ -36,7 +36,7 @@ >new documentation project for Tomcat Native was started. > > > - > + > > >Minimum supported APR version is now again 1.2.0. Version 1.3.0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54565] New: Tomcat 7 changelog link fails
https://issues.apache.org/bugzilla/show_bug.cgi?id=54565 Bug ID: 54565 Summary: Tomcat 7 changelog link fails Product: Tomcat 7 Version: unspecified Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: stephen.ow...@state.ma.us Classification: Unclassified I was trying to check the change log for Tomcat 7 I tried to display the url http://tomcat.apache.org/tomcat-7.0-doc/changelog.html I got this message: http://tomcat.apache.org/tomcat-7.0-doc/changelog.html This webpage is not available The webpage at http://tomcat.apache.org/tomcat-7.0-doc/changelog.html might be temporarily down or it may have moved permanently to a new web address. Error 330 (net::ERR_CONTENT_DECODING_FAILED): Unknown error. -- 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 54565] Tomcat 7 changelog link fails
https://issues.apache.org/bugzilla/show_bug.cgi?id=54565 Violeta Georgieva changed: What|Removed |Added OS||All --- Comment #1 from Violeta Georgieva --- Hi, I can open it without problems. Regards Violeta -- 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 54565] Tomcat 7 changelog link fails
https://issues.apache.org/bugzilla/show_bug.cgi?id=54565 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #2 from Mark Thomas --- That is a user agent issue, not a server issue. Try googling the error message. -- 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
[jira] [Commented] (MTOMCAT-206) Runtime dependencies within multi module projects are not loaded.
[ https://issues.apache.org/jira/browse/MTOMCAT-206?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13579183#comment-13579183 ] Olivier Lamy (*$^¨%`£) commented on MTOMCAT-206: no worries. It works fine locally too. Looks to be some overload on the asf jenkins. > Runtime dependencies within multi module projects are not loaded. > - > > Key: MTOMCAT-206 > URL: https://issues.apache.org/jira/browse/MTOMCAT-206 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: commons-lib >Affects Versions: 2.0 >Reporter: Ludwig Magnusson >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.1 > > > I am not sure if this counts as a duplicate of MTOMCAT-46, there are some > differences... > Consider a multi module project in maven structured like this: > - parent > - api > - implementation > - webapp > The webapp has a compile scope dependency on the API and a runtime scope > dependency on the implementation. The implementation classes are loaded with > some dependency injection framework. > If I run tomcat(7):run in the root project it will fail because the tomcat > plugin does not add the implementation classes (i.e. the runtime dependency) > to the classpath. If I change the dependency scope of the implementation > dependency to compile, it works. > The solution for this was pretty simple. Just change one method call in > DefaultClassLoaderEntriesCalculator, viewable in the applied patch. All tests > and IT-tests still pass. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators 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
[Bug 54565] Tomcat 7 changelog link fails
https://issues.apache.org/bugzilla/show_bug.cgi?id=54565 --- Comment #3 from Stephen Owens --- I viewed both http://tomcat.apache.org/ and http://tomcat.apache.org/tomcat-7.0-doc/changelog.html in the W3C Markup Validation Service http://validator.w3.org/ which gave the results below. I would suspect that the lack of a DOCTYPE in the page source contributes to the Error 330 (net::ERR_CONTENT_DECODING_FAILED) that I got with Google Chrome Version 24.0.1312.57 W3C Markup Validation Service Output: Notes and Potential Issues The following notes and warnings highlight missing or conflicting information which caused the validator to perform some guesswork prior to validation, or other things affecting the output below. If the guess or fallback is incorrect, it could make validation results entirely incoherent. It is highly recommended to check these potential issues, and, if necessary, fix them and re-validate the document. Unable to Determine Parse Mode! The validator can process documents either as XML (for document types such as XHTML, SVG, etc.) or SGML (for HTML 4.01 and prior versions). For this document, the information available was not sufficient to determine the parsing mode unambiguously, because: the MIME Media Type (text/html) can be used for XML or SGML document types No known Document Type could be detected No XML declaration (e.g ) could be found at the beginning of the document. No XML namespace (e.g http://www.w3.org/1999/xhtml"; xml:lang="en">) could be found at the root of the document. As a default, the validator is falling back to SGML mode. No DOCTYPE found! Checking with default HTML 4.01 Transitional Document Type. No DOCTYPE Declaration could be found or recognized in this document. This generally means that the document is not declaring its Document Type at the top. It can also mean that the DOCTYPE declaration contains a spelling error, or that it is not using the correct syntax. The document was checked using a default "fallback" Document Type Definition that closely resembles “HTML 4.01 Transitional”. Learn how to add a doctype to your document from our FAQ. -- 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 54565] Tomcat 7 changelog link fails
https://issues.apache.org/bugzilla/show_bug.cgi?id=54565 --- Comment #4 from Violeta Georgieva --- I'm using the same Google Chrome version and there are no problems with that 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
svn commit: r1446612 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl
Author: rjung
Date: Fri Feb 15 14:51:06 2013
New Revision: 1446612
URL: http://svn.apache.org/r1446612
Log:
Escape slash consistently.
Modified:
tomcat/trunk/webapps/docs/tomcat-docs.xsl
Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=1446612&r1=1446611&r2=1446612&view=diff
==
--- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Fri Feb 15 14:51:06 2013
@@ -212,7 +212,7 @@
(d.getElementsByTagName('head')[0] ||
d.getElementsByTagName('body')[0]).appendChild(s);
}
else {
- d.write('Comments are
disabled for this page at the moment.<\/div>');
+ d.write('Comments are
disabled for this page at the moment.<\/strong><\/div>');
}
})(window, document);
//-->>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1446613 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/tomcat-docs.xsl
Author: rjung
Date: Fri Feb 15 14:52:07 2013
New Revision: 1446613
URL: http://svn.apache.org/r1446613
Log:
Escape slash consistently.
Backport of r1446612 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1446612
Modified: tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1446613&r1=1446612&r2=1446613&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Fri Feb 15 14:52:07 2013
@@ -212,7 +212,7 @@
(d.getElementsByTagName('head')[0] ||
d.getElementsByTagName('body')[0]).appendChild(s);
}
else {
- d.write('Comments are
disabled for this page at the moment.<\/div>');
+ d.write('Comments are
disabled for this page at the moment.<\/strong><\/div>');
}
})(window, document);
//-->>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1446640 - /tomcat/trunk/webapps/docs/ssl-howto.xml
Author: kkolinko
Date: Fri Feb 15 15:45:55 2013
New Revision: 1446640
URL: http://svn.apache.org/r1446640
Log:
Remove stray '-->' in a configuration sample
Modified:
tomcat/trunk/webapps/docs/ssl-howto.xml
Modified: tomcat/trunk/webapps/docs/ssl-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/ssl-howto.xml?rev=1446640&r1=1446639&r2=1446640&view=diff
==
--- tomcat/trunk/webapps/docs/ssl-howto.xml (original)
+++ tomcat/trunk/webapps/docs/ssl-howto.xml Fri Feb 15 15:45:55 2013
@@ -354,7 +354,6 @@ this:
scheme="https" secure="true" SSLEnabled="true"
keystoreFile="${user.home}/.keystore" keystorePass="changeit"
clientAuth="false" sslProtocol="TLS"/>
--->
The example above will throw an error if you have the APR and the Tomcat
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1446641 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/ssl-howto.xml
Author: kkolinko
Date: Fri Feb 15 15:49:45 2013
New Revision: 1446641
URL: http://svn.apache.org/r1446641
Log:
Merged revision 1446640 from tomcat/trunk:
Remove stray '-->' in a configuration sample
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1446640
Modified: tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml?rev=1446641&r1=1446640&r2=1446641&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml Fri Feb 15 15:49:45 2013
@@ -354,7 +354,6 @@ this:
scheme="https" secure="true" SSLEnabled="true"
keystoreFile="${user.home}/.keystore" keystorePass="changeit"
clientAuth="false" sslProtocol="TLS"/>
--->
The example above will throw an error if you have the APR and the Tomcat
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1446650 - /tomcat/trunk/webapps/docs/ssl-howto.xml
Author: kkolinko Date: Fri Feb 15 15:57:01 2013 New Revision: 1446650 URL: http://svn.apache.org/r1446650 Log: Correct typos in configuration samples: XML comments start with '
svn commit: r1446660 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/ssl-howto.xml
Author: kkolinko Date: Fri Feb 15 16:06:15 2013 New Revision: 1446660 URL: http://svn.apache.org/r1446660 Log: Merged revision 1446650 from tomcat/trunk: Correct typos in configuration samples: XML comments start with '
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/3939 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1446640 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
svn commit: r1446681 - in /tomcat/trunk/java: javax/websocket/RemoteEndpoint.java org/apache/tomcat/websocket/LocalStrings.properties org/apache/tomcat/websocket/WsRemoteEndpointBase.java
Author: markt
Date: Fri Feb 15 16:45:29 2013
New Revision: 1446681
URL: http://svn.apache.org/r1446681
Log:
setBatchingAllowed() will throw IOE in next spec iteration
Modified:
tomcat/trunk/java/javax/websocket/RemoteEndpoint.java
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
Modified: tomcat/trunk/java/javax/websocket/RemoteEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/RemoteEndpoint.java?rev=1446681&r1=1446680&r2=1446681&view=diff
==
--- tomcat/trunk/java/javax/websocket/RemoteEndpoint.java (original)
+++ tomcat/trunk/java/javax/websocket/RemoteEndpoint.java Fri Feb 15 16:45:29
2013
@@ -31,8 +31,11 @@ public interface RemoteEndpoint {
* block until any currently batched messages have been written.
*
* @param batchingAllowed New setting
+ * @throws IOException If changing the value resulted in a call to
+ * {@link #flushBatch()} and that call threw an
+ * {@link IOException}.
*/
-void setBatchingAllowed(boolean batchingAllowed);
+void setBatchingAllowed(boolean batchingAllowed) throws IOException;
/**
* Obtains the current batching status of the endpoint.
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1446681&r1=1446680&r2=1446681&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Fri
Feb 15 16:45:29 2013
@@ -34,6 +34,7 @@ wsFrame.wrongRsv=The client frame set th
wsRemoteEndpoint.closed=Message will not be sent because the WebSocket session
has been closed
wsRemoteEndpoint.changeType=When sending a fragmented message, all fragments
bust be of the same type
wsRemoteEndpoint.concurrentMessageSend=Messages may not be sent concurrently
even when using the asynchronous send messages. The client must wait for the
previous message to complete before sending the next.
+wsRemoteEndpoint.flushOnCloseFailed=Flushing batched messages before closing
the session failed
wsRemoteEndpoint.inProgress=Message will not be sent because the WebSocket
session is currently sending another message
# Note the following message is used as a close reason in a WebSocket control
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java?rev=1446681&r1=1446680&r2=1446681&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java Fri
Feb 15 16:45:29 2013
@@ -45,6 +45,10 @@ public abstract class WsRemoteEndpointBa
private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
+private static org.apache.juli.logging.Log log =
+org.apache.juli.logging.LogFactory.getLog(
+WsRemoteEndpointBase.class);
+
private boolean messagePartInProgress = false;
private Queue messagePartQueue = new ArrayDeque<>();
private final Object messagePartLock = new Object();
@@ -80,16 +84,11 @@ public abstract class WsRemoteEndpointBa
@Override
-public void setBatchingAllowed(boolean batchingAllowed) {
+public void setBatchingAllowed(boolean batchingAllowed) throws IOException
{
boolean oldValue = this.batchingAllowed.getAndSet(batchingAllowed);
if (oldValue && !batchingAllowed) {
-// Just disabled batched. Must flush.
-try {
-flushBatch();
-} catch (IOException e) {
-// TODO Log this? Runtime exception? Something else?
-}
+flushBatch();
}
}
@@ -234,7 +233,12 @@ public abstract class WsRemoteEndpointBa
synchronized (messagePartLock) {
if (Constants.OPCODE_CLOSE == mp.getOpCode()) {
-setBatchingAllowed(false);
+try {
+setBatchingAllowed(false);
+} catch (IOException e) {
+log.warn(sm.getString(
+"wsRemoteEndpoint.flushOnCloseFailed"), e);
+}
}
if (messagePartInProgress) {
if (!Util.isControl(opCode)) {
@@ -419,33 +423,6 @@ public abstract class WsRemoteEndpointBa
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
svn commit: r1446683 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
Author: markt
Date: Fri Feb 15 16:50:30 2013
New Revision: 1446683
URL: http://svn.apache.org/r1446683
Log:
TODO: IOE on sending close message
Solution: Rethrow
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1446683&r1=1446682&r2=1446683&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri Feb 15
16:50:30 2013
@@ -287,22 +287,19 @@ public class WsSession implements Sessio
try {
wsRemoteEndpoint.startMessageBlock(
Constants.OPCODE_CLOSE, msg, true);
-} catch (IOException ioe) {
-// Unable to send close message.
-// TODO - Ignore?
-}
-
-webSocketContainer.unregisterSession(
-localEndpoint.getClass(), this);
-
-// Fire the onClose event
-Thread t = Thread.currentThread();
-ClassLoader cl = t.getContextClassLoader();
-t.setContextClassLoader(applicationClassLoader);
-try {
-localEndpoint.onClose(this, closeReason);
} finally {
-t.setContextClassLoader(cl);
+webSocketContainer.unregisterSession(
+localEndpoint.getClass(), this);
+
+// Fire the onClose event
+Thread t = Thread.currentThread();
+ClassLoader cl = t.getContextClassLoader();
+t.setContextClassLoader(applicationClassLoader);
+try {
+localEndpoint.onClose(this, closeReason);
+} finally {
+t.setContextClassLoader(cl);
+}
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1446694 - in /tomcat/trunk/java/org/apache/tomcat/websocket: Constants.java LocalStrings.properties WsSession.java WsWebSocketContainer.java server/WsProtocolHandler.java server/WsServlet
Author: markt
Date: Fri Feb 15 17:10:48 2013
New Revision: 1446694
URL: http://svn.apache.org/r1446694
Log:
Expose negotiated subProtocol to the Session
Add some plumbing for exposing path parameters
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1446694&r1=1446693&r2=1446694&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Fri Feb 15
17:10:48 2013
@@ -48,6 +48,8 @@ public class Constants {
public static final String WS_VERSION_HEADER_NAME =
"Sec-WebSocket-Version";
public static final String WS_VERSION_HEADER_VALUE = "13";
public static final String WS_KEY_HEADER_NAME = "Sec-WebSocket-Key";
+public static final String WS_PROTOCOL_HEADER_NAME =
+"Sec-WebSocket-Protocol";
private Constants() {
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1446694&r1=1446693&r2=1446694&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Fri
Feb 15 17:10:48 2013
@@ -49,7 +49,9 @@ wsSession.invalidHandlerTypePong=A pong
wsSession.removeHandlerFailed=Unable to remove the handler [{0}] as it was not
registered with this session
wsSession.unknownHandler=Unable to add the message handler [{0}] as it was for
the unrecognised type [{1}]
+wsWebSocketContainer.httpRequestFailed=The HTTP request to initiate the
WebSocket conenction failed
wsWebSocketContainer.invalidStatus=The HTTP response from the server [{0}] did
not permit the HTTP upgrade to WebSocket
+wsWebSocketContainer.invalidSubProtocol=The WebSocket server returned multiple
values for the Sec-WebSocket-Protocol header
wsWebSocketContainer.maxBuffer=This implementation limits the maximum size of
a buffer to Integer.MAX_VALUE
wsWebSocketContainer.pathNoHost=No host was specified in URI
wsWebSocketContainer.pathWrongScheme=The scheme [{0}] is not supported
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1446694&r1=1446693&r2=1446694&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri Feb 15
17:10:48 2013
@@ -54,6 +54,8 @@ public class WsSession implements Sessio
private final ClassLoader applicationClassLoader;
private final WsWebSocketContainer webSocketContainer;
private final WsRequest request;
+private final String subProtocol;
+private final Map pathParameters;
private MessageHandler textMessageHandler = null;
private MessageHandler binaryMessageHandler = null;
@@ -81,7 +83,8 @@ public class WsSession implements Sessio
public WsSession(Endpoint localEndpoint,
WsRemoteEndpointBase wsRemoteEndpoint,
WsWebSocketContainer wsWebSocketContainer,
-WsRequest request) {
+WsRequest request, String subProtocol,
+Map pathParameters) {
this.localEndpoint = localEndpoint;
this.wsRemoteEndpoint = wsRemoteEndpoint;
this.wsRemoteEndpoint.setSession(this);
@@ -96,6 +99,8 @@ public class WsSession implements Sessio
this.sessionIdleTimeout =
webSocketContainer.getMaxSessionIdleTimeout();
this.request = request;
+this.subProtocol = subProtocol;
+this.pathParameters = pathParameters;
}
@@ -185,8 +190,7 @@ public class WsSession implements Sessio
@Override
public String getNegotiatedSubprotocol() {
-// TODO Auto-generated method stub
-return null;
+return subProtocol;
}
@@ -343,8 +347,7 @@ public class WsSession implements Sessio
@Override
public Map getPathParameters() {
-// TODO Auto-generated method stub
-return null;
+return pathParameters;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/
svn commit: r1446699 - in /tomcat/trunk: java/org/apache/tomcat/websocket/pojo/ test/org/apache/tomcat/websocket/pojo/
Author: markt
Date: Fri Feb 15 17:25:48 2013
New Revision: 1446699
URL: http://svn.apache.org/r1446699
Log:
Rename. All endpoints, not just Pojos will need this.
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java
- copied, changed from r1446080,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java
- copied, changed from r1446080,
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java
Removed:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1446699&r1=1446698&r2=1446699&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Fri Feb 15 17:25:48 2013
@@ -50,7 +50,7 @@ public class PojoMethodMapping {
private final PojoPathParam[] onErrorParams;
private final Set onMessage = new HashSet<>();
private final String wsPath;
-private final PojoUriTemplate template;
+private final UriTemplate template;
public PojoMethodMapping(Class clazzPojo, String wsPath,
@@ -60,7 +60,7 @@ public class PojoMethodMapping {
Method close = null;
Method error = null;
if (wsPath.length() > servletPath.length()) {
-template = new
PojoUriTemplate(wsPath.substring(servletPath.length() - 2));
+template = new UriTemplate(wsPath.substring(servletPath.length() -
2));
} else {
template = null;
}
@@ -173,7 +173,7 @@ public class PojoMethodMapping {
private static Object[] buildArgs(PojoPathParam[] pathParams,
-PojoUriTemplate template, String pathInfo, Session session,
+UriTemplate template, String pathInfo, Session session,
Throwable throwable) {
Object[] result = new Object[pathParams.length];
Map pathValues;
@@ -231,7 +231,7 @@ public class PojoMethodMapping {
private static class MessageMethod {
private final Method m;
-private final PojoUriTemplate template;
+private final UriTemplate template;
private int indexString = -1;
private int indexByteArray = -1;
private int indexByteBuffer = -1;
@@ -242,7 +242,7 @@ public class PojoMethodMapping {
private int indexPayload = -1;
-public MessageMethod(Method m, PojoUriTemplate template) {
+public MessageMethod(Method m, UriTemplate template) {
this.m = m;
this.template = template;
Copied: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java
(from r1446080,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java&r1=1446080&r2=1446699&rev=1446699&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java Fri Feb
15 17:25:48 2013
@@ -29,7 +29,7 @@ import org.apache.tomcat.util.res.String
* Extracts path parameters from URIs used to create web socket connections
* using the URI template defined for the associated Endpoint.
*/
-public class PojoUriTemplate {
+public class UriTemplate {
private static StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
private final String template;
@@ -37,7 +37,7 @@ public class PojoUriTemplate {
private final List names = new ArrayList<>();
-public PojoUriTemplate(String template) {
+public UriTemplate(String template) {
this.template = template;
// +10 is just a guess at this point
StringBuilder pattern = new StringBuilder(template.length() + 10);
Copied: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java
(from r1446080,
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java?p2=tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java&p1=tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java&r1=1446080&r
[Bug 54568] New: 2013 news page still displays "2012 News and Status"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54568 Bug ID: 54568 Summary: 2013 news page still displays "2012 News and Status" Product: Tomcat Native Version: unspecified Hardware: All OS: All Status: NEW Severity: trivial Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: marco.ra...@t-online.de Classification: Unclassified The headline from the 2013 news at http://tomcat.apache.org/native-doc/news/2013.html is still named "2012 News and Status". -- 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: r1446712 - /tomcat/native/branches/1.1.x/xdocs/news/2013.xml
Author: rjung Date: Fri Feb 15 18:07:17 2013 New Revision: 1446712 URL: http://svn.apache.org/r1446712 Log: Fix title in 2013 new page. PR 54568. Modified: tomcat/native/branches/1.1.x/xdocs/news/2013.xml Modified: tomcat/native/branches/1.1.x/xdocs/news/2013.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2013.xml?rev=1446712&r1=1446711&r2=1446712&view=diff == --- tomcat/native/branches/1.1.x/xdocs/news/2013.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/news/2013.xml Fri Feb 15 18:07:17 2013 @@ -24,7 +24,7 @@ Apache Tomcat Native Project -2012 News and Status +2013 News and Status - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54568] 2013 news page still displays "2012 News and Status"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54568 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Rainer Jung --- Thanks. Fixed in r1446712, will be part of 1.1.28. -- 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: r1446738 - in /tomcat/trunk: java/org/apache/tomcat/websocket/pojo/ java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/pojo/
Author: markt
Date: Fri Feb 15 19:33:54 2013
New Revision: 1446738
URL: http://svn.apache.org/r1446738
Log:
Complete the plumbing for pathParameters
Reduce repeated parsing of the parameters by calculating them early and passing
the parameters around rather than the UriTemplate
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java?rev=1446738&r1=1446737&r2=1446738&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java Fri
Feb 15 19:33:54 2013
@@ -17,6 +17,7 @@
package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
import javax.websocket.CloseReason;
import javax.websocket.Endpoint;
@@ -32,7 +33,7 @@ import javax.websocket.Session;
public class PojoEndpoint extends Endpoint {
private Object pojo;
-private String pathInfo;
+private Map pathParameters;
private PojoMethodMapping methodMapping;
@@ -43,13 +44,13 @@ public class PojoEndpoint extends Endpoi
(PojoEndpointConfiguration) endpointConfiguration;
pojo = pec.createPojo();
-pathInfo = pec.getPathInfo();
+pathParameters = pec.getPathParameters();
methodMapping = pec.getMethodMapping();
if (methodMapping.getOnOpen() != null) {
try {
methodMapping.getOnOpen().invoke(pojo,
-methodMapping.getOnOpenArgs(pathInfo, session));
+methodMapping.getOnOpenArgs(pathParameters, session));
} catch (IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
// TODO Auto-generated catch block
@@ -57,7 +58,7 @@ public class PojoEndpoint extends Endpoi
}
}
for (MessageHandler mh : methodMapping.getMessageHandlers(pojo,
-pathInfo, session)) {
+pathParameters, session)) {
session.addMessageHandler(mh);
}
}
@@ -68,7 +69,7 @@ public class PojoEndpoint extends Endpoi
if (methodMapping.getOnClose() != null) {
try {
methodMapping.getOnClose().invoke(pojo,
-methodMapping.getOnCloseArgs(pathInfo, session));
+methodMapping.getOnCloseArgs(pathParameters, session));
} catch (IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
// TODO Auto-generated catch block
@@ -84,7 +85,7 @@ public class PojoEndpoint extends Endpoi
try {
methodMapping.getOnError().invoke(
pojo,
-methodMapping.getOnErrorArgs(pathInfo, session,
+methodMapping.getOnErrorArgs(pathParameters, session,
throwable));
} catch (IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java?rev=1446738&r1=1446737&r2=1446738&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java
Fri Feb 15 19:33:54 2013
@@ -16,6 +16,8 @@
*/
package org.apache.tomcat.websocket.pojo;
+import java.util.Map;
+
import javax.websocket.server.DefaultServerConfiguration;
/**
@@ -28,15 +30,15 @@ public class PojoEndpointConfiguration e
private final Class pojoClass;
private final PojoMethodMapping methodMapping;
-private final String pathInfo;
+private final Map pathParameters;
public PojoEndpointConfiguration(Class pojoClass,
-PojoMethodMapping methodMapping, String pathInfo) {
+PojoMe
svn commit: r1446743 - in /tomcat/trunk: java/org/apache/tomcat/websocket/pojo/ java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/pojo/ test/org/apache/tomcat/websocket/server/
Author: markt
Date: Fri Feb 15 19:42:52 2013
New Revision: 1446743
URL: http://svn.apache.org/r1446743
Log:
Move UriTemplate to server package since that is where it is used.
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java
- copied, changed from r1446738,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestUriTemplate.java
- copied, changed from r1446738,
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java
Removed:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java?rev=1446743&r1=1446742&r2=1446743&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
Fri Feb 15 19:42:52 2013
@@ -36,7 +36,6 @@ import org.apache.tomcat.websocket.WsSes
import org.apache.tomcat.websocket.WsWebSocketContainer;
import org.apache.tomcat.websocket.pojo.PojoEndpointConfiguration;
import org.apache.tomcat.websocket.pojo.PojoMethodMapping;
-import org.apache.tomcat.websocket.pojo.UriTemplate;
/**
* Provides a per class loader (i.e. per web application) instance of a
Copied: tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java
(from r1446738,
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java&r1=1446738&r2=1446743&rev=1446743&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java Fri
Feb 15 19:42:52 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket.pojo;
+package org.apache.tomcat.websocket.server;
import java.util.ArrayList;
import java.util.Collections;
@@ -32,7 +32,9 @@ import org.apache.tomcat.util.res.String
*/
public class UriTemplate {
-private static StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
+private static StringManager sm =
+StringManager.getManager(Constants.PACKAGE_NAME);
+
private final String template;
private final Pattern pattern;
private final List names = new ArrayList<>();
Copied:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestUriTemplate.java (from
r1446738,
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestUriTemplate.java?p2=tomcat/trunk/test/org/apache/tomcat/websocket/server/TestUriTemplate.java&p1=tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java&r1=1446738&r2=1446743&rev=1446743&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestUriTemplate.java
Fri Feb 15 19:42:52 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket.pojo;
+package org.apache.tomcat.websocket.server;
import java.util.Map;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1446758 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java webapps/docs/changelog.xml
Author: markt
Date: Fri Feb 15 20:26:34 2013
New Revision: 1446758
URL: http://svn.apache.org/r1446758
Log:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54045.
Make sure getMembers() returns available member when TcpFailureDetector works
in static cluster.
Patch by kfujino
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/tc7.0.x/trunk:r1402110
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1446758&r1=1446757&r2=1446758&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Feb 15 20:26:34 2013
@@ -61,13 +61,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54045.
- Make sure getMembers() returns available member when TcpFailureDetector works
- in static cluster.
- http://svn.apache.org/viewvc?view=revision&revision=1402110
- +1: kfujino, kkolinko, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54044
Correct bug in timestamp cache used by org.apache.juli.OneLineFormatter
that meant entries could be made with an earlier timestamp than the true
timestamp.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1446758&r1=1446757&r2=1446758&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Fri Feb 15 20:26:34 2013
@@ -35,6 +35,7 @@ import org.apache.catalina.tribes.io.Cha
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.membership.MemberImpl;
import org.apache.catalina.tribes.membership.Membership;
+import org.apache.catalina.tribes.membership.StaticMember;
/**
* Title: A perfect failure detector
@@ -152,6 +153,9 @@ public class TcpFailureDetector extends
//not correct, we need to maintain the map
membership.removeMember( (MemberImpl) member);
removeSuspects.remove(member);
+if (member instanceof StaticMember) {
+addSuspects.put(member,
Long.valueOf(System.currentTimeMillis()));
+}
notify = true;
} else {
//add the member as suspect
@@ -218,7 +222,11 @@ public class TcpFailureDetector extends
if (membership.getMember(members[i])!=null) {
membership.removeMember((MemberImpl)members[i]);
removeSuspects.remove(members[i]);
-super.memberDisappeared((MemberImpl)members[i]);
+if (members[i] instanceof StaticMember) {
+addSuspects.put(members[i],
+Long.valueOf(System.currentTimeMillis()));
+}
+super.memberDisappeared(members[i]);
}
} //end if
} //for
@@ -229,6 +237,10 @@ public class TcpFailureDetector extends
//update all alive times
Member[] members = super.getMembers();
for (int i = 0; members != null && i < members.length; i++) {
+if (addSuspects.containsKey(members[i]) &&
membership.getMember(members[i]) == null) {
+// avoid temporary adding member.
+continue;
+}
if (membership.memberAlive( (MemberImpl) members[i])) {
//we don't have this one in our membership, check to see if
he/she is alive
if (memberAlive(members[i])) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1446758&r1=1446757&r2=1446758&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Feb 15 20:26:34 2013
@@ -88,6 +88,14 @@
+
+
+
+54045: Make sure getMembers() returns available member when
+TcpFailureDetector works in static cluster. (kfujino)
+
+
+
[Bug 54045] ReplicatedMap don't like TcpFailureDetector in static configuration
https://issues.apache.org/bugzilla/show_bug.cgi?id=54045 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Fixed in 6.0.x and will be included in 6.0.37 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: r1446759 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Feb 15 20:30:06 2013 New Revision: 1446759 URL: http://svn.apache.org/r1446759 Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1446759&r1=1446758&r2=1446759&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Feb 15 20:30:06 2013 @@ -88,7 +88,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revision&revision=1434887 http://svn.apache.org/viewvc?view=revision&revision=1435769 - Javadoc fix (r1434882 r1435767 in trunk) - +1: schultz + +1: schultz, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54456 @@ -96,7 +96,7 @@ PATCHES PROPOSED TO BACKPORT: application reading the request body. http://svn.apache.org/viewvc?rev=1443430&view=rev (r1443427 in trunk) - +1: kkolinko + +1: kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1446766 - in /tomcat/trunk/java/org/apache/jasper/compiler: ParserController.java ScriptingVariabler.java ServletWriter.java SmapGenerator.java SmapStratum.java
Author: markt
Date: Fri Feb 15 21:03:34 2013
New Revision: 1446766
URL: http://svn.apache.org/r1446766
Log:
UCDetector
- use of final
- reduce visibility
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=1446766&r1=1446765&r2=1446766&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Fri Feb
15 21:03:34 2013
@@ -44,9 +44,9 @@ class ParserController implements TagCon
private static final String CHARSET = "charset=";
-private JspCompilationContext ctxt;
-private Compiler compiler;
-private ErrorDispatcher err;
+private final JspCompilationContext ctxt;
+private final Compiler compiler;
+private final ErrorDispatcher err;
/*
* Indicates the syntax (XML or standard) of the file being processed
@@ -57,7 +57,7 @@ class ParserController implements TagCon
* A stack to keep track of the 'current base directory'
* for include directives that refer to relative paths.
*/
-private Stack baseDirStack = new Stack<>();
+private final Stack baseDirStack = new Stack<>();
private boolean isEncodingSpecifiedInProlog;
private boolean isBomPresent;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java?rev=1446766&r1=1446765&r2=1446766&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java Fri
Feb 15 21:03:34 2013
@@ -42,7 +42,7 @@ class ScriptingVariabler {
* to help identify, for every custom tag, the scripting variables that it
* needs to declare.
*/
-static class CustomTagCounter extends Node.Visitor {
+private static class CustomTagCounter extends Node.Visitor {
private int count;
private Node.CustomTag parent;
@@ -62,10 +62,10 @@ class ScriptingVariabler {
* For every custom tag, determines the scripting variables it needs to
* declare.
*/
-static class ScriptingVariableVisitor extends Node.Visitor {
+private static class ScriptingVariableVisitor extends Node.Visitor {
-private ErrorDispatcher err;
-private Map scriptVars;
+private final ErrorDispatcher err;
+private final Map scriptVars;
public ScriptingVariableVisitor(ErrorDispatcher err) {
this.err = err;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java?rev=1446766&r1=1446765&r2=1446766&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java Fri Feb 15
21:03:34 2013
@@ -25,15 +25,15 @@ import java.io.PrintWriter;
* @author Kin-man Chung
*/
public class ServletWriter {
-public static final int TAB_WIDTH = 2;
-public static final String SPACES = " ";
+private static final int TAB_WIDTH = 2;
+private static final String SPACES = " ";
// Current indent level:
private int indent = 0;
private int virtual_indent = 0;
// The sink writer:
-PrintWriter writer;
+private final PrintWriter writer;
// servlet line numbers start from 1
private int javaLine = 1;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java?rev=1446766&r1=1446765&r2=1446766&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Fri Feb 15
21:03:34 2013
@@ -47,8 +47,8 @@ public class SmapGenerator {
private String outputFileName;
private String defaultStratum = "Java";
-private List strata = new ArrayList<>();
-private List embedded = new ArrayList<>();
+private final Lis
svn commit: r1446770 - in /tomcat/site/trunk/docs/native-doc/news: 2013.html printer/2013.html
Author: kkolinko Date: Fri Feb 15 21:11:00 2013 New Revision: 1446770 URL: http://svn.apache.org/r1446770 Log: Fix title in 2013 news page of published Tomcat-Native docs. (BZ 54568, r1446712 ) Modified: tomcat/site/trunk/docs/native-doc/news/2013.html tomcat/site/trunk/docs/native-doc/news/printer/2013.html Modified: tomcat/site/trunk/docs/native-doc/news/2013.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2013.html?rev=1446770&r1=1446769&r2=1446770&view=diff == --- tomcat/site/trunk/docs/native-doc/news/2013.html (original) +++ tomcat/site/trunk/docs/native-doc/news/2013.html Fri Feb 15 21:11:00 2013 @@ -1,4 +1,4 @@ -The Apache Tomcat Native - News - 2012 News and Statushttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0">LinksDocs HomeMiscellaneous DocumentationChangelogNews201320122011201020092008The Apache Tomcat Native - News2012 News and Statusprint-friendlyversion +The Apache Tomcat Native - News - 2013 News and Statushttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0">LinksDocs HomeMiscellaneous DocumentationChangelogNews201320122011201020092008The Apache Tomcat Native - News2013 News and Statusprint-friendlyversion 2013 News & Status Modified: tomcat/site/trunk/docs/native-doc/news/printer/2013.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/printer/2013.html?rev=1446770&r1=1446769&r2=1446770&view=diff == --- tomcat/site/trunk/docs/native-doc/news/printer/2013.html (original) +++ tomcat/site/trunk/docs/native-doc/news/printer/2013.html Fri Feb 15 21:11:00 2013 @@ -1,4 +1,4 @@ -The Apache Tomcat Native - News - 2012 News and Statushttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0">The Apache Tomcat Native - News2012 News and Status2013 News & Status +The Apache Tomcat Native - News - 2013 News and Statushttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0">The Apache Tomcat Native - News2013 News and Status2013 News & Status 12 February - TC-Native-1.1.27 released - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1446795 - in /tomcat/trunk/java/org/apache/jasper/compiler: SmapUtil.java TagLibraryInfoImpl.java TagPluginManager.java TextOptimizer.java TldLocation.java TldLocationsCache.java Validato
Author: markt
Date: Fri Feb 15 22:42:33 2013
New Revision: 1446795
URL: http://svn.apache.org/r1446795
Log:
UCDetector
- use of final
- reduce visibility
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocation.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1446795&r1=1446794&r2=1446795&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Fri Feb 15
22:42:33 2013
@@ -48,7 +48,7 @@ public class SmapUtil {
//*
// Constants
-public static final String SMAP_ENCODING = "UTF-8";
+private static final String SMAP_ENCODING = "UTF-8";
//*
// Public entry points
@@ -458,11 +458,11 @@ public class SmapUtil {
}
}
-static class SmapGenVisitor extends Node.Visitor {
+private static class SmapGenVisitor extends Node.Visitor {
private SmapStratum smap;
-private boolean breakAtLF;
-private HashMap innerClassMap;
+private final boolean breakAtLF;
+private final HashMap innerClassMap;
SmapGenVisitor(SmapStratum s, boolean breakAtLF, HashMap map) {
this.smap = s;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1446795&r1=1446794&r2=1446795&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Fri
Feb 15 22:42:33 2013
@@ -65,13 +65,13 @@ class TagLibraryInfoImpl extends TagLibr
// Logger
private final Log log = LogFactory.getLog(TagLibraryInfoImpl.class);
-private JspCompilationContext ctxt;
+private final JspCompilationContext ctxt;
-private PageInfo pi;
+private final PageInfo pi;
-private ErrorDispatcher err;
+private final ErrorDispatcher err;
-private ParserController parserController;
+private final ParserController parserController;
private final void print(String name, String value, PrintWriter w) {
if (value != null) {
@@ -761,5 +761,5 @@ class TagLibraryInfoImpl extends TagLibr
return tlv.validate(getPrefixString(), uri, thePage);
}
-protected TagLibraryValidator tagLibraryValidator;
+private TagLibraryValidator tagLibraryValidator;
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java?rev=1446795&r1=1446794&r2=1446795&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java Fri Feb
15 22:42:33 2013
@@ -44,7 +44,7 @@ public class TagPluginManager {
private boolean initialized = false;
private HashMap tagPlugins = null;
-private ServletContext ctxt;
+private final ServletContext ctxt;
private PageInfo pageInfo;
public TagPluginManager(ServletContext ctxt) {
@@ -172,11 +172,11 @@ public class TagPluginManager {
tagPlugin.doTag(tagPluginContext);
}
-static class TagPluginContextImpl implements TagPluginContext {
-private Node.CustomTag node;
+private static class TagPluginContextImpl implements TagPluginContext {
+private final Node.CustomTag node;
private Node.Nodes curNodes;
-private PageInfo pageInfo;
-private HashMap pluginAttributes;
+private final PageInfo pageInfo;
+private final HashMap pluginAttributes;
TagPluginContextImpl(Node.CustomTag n, PageInfo pageInfo) {
this.node = n;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java?rev=1446795&r1=1446794&r2=1446795&view=diff
==
--- tomcat/tru
[Bug 54568] 2013 news page still displays "2012 News and Status"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54568 --- Comment #2 from Mladen Turk --- I don't think we need to wait for the 1.1.28 This is online web page so you can just fix it and use svnpubs for publishing. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1446712 - /tomcat/native/branches/1.1.x/xdocs/news/2013.xml
On 02/15/2013 07:07 PM, rj...@apache.org wrote: Author: rjung Apache Tomcat Native Project -2012 News and Status +2013 News and Status Thanks :) BTW, like said on BZ issue, you can just publish that page since its a trivial change and its on our web site so does not fall strictly into release tasks. It was modified after the release so that dates are correct anyhow. No need to wait for next release. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
