Re: Tagging 7.0.46
2013/10/15 Mark Thomas > > On 15/10/2013 16:10, Konstantin Preißer wrote: > > Mark, > > > >> -Original Message- > >> From: Mark Thomas [mailto:ma...@apache.org] > >> Sent: Tuesday, October 15, 2013 4:59 PM > >> To: Tomcat Developers List > >> Subject: Re: Tagging 7.0.46 > > > Yes, I can reproduce > 1) "java.io.IOException: Unexpected error [20,014] reading data from the > APR/native" when drawing very fast on the drawboard with Firefox, > 2) "java.lang.IllegalArgumentException at > java.nio.Buffer.position(Buffer.java:236)" after drawing and pressing F5 > >> so > that a PNG image is sent to the browser, and > 3) Crash in msvcrt.dll+0x122a at the same conditions of 2) > > > > > >> I've just committed a fix that doesn't deal with the Exceptions but > >> appears to have addressed the crash. Could you check? It might just be > >> that I haven't managed to trigger the crash yet. > > > > Thank you. > > Yes, I cannot reproduce 2) and 3) anymore, i.e. no crash occurs. > > The only one which I still get is 1). > > Great. Just need to figure out of that is an error message that needs to > be swallowed or if it is indicative of a wider problem. I'll wait for this one and hopefully after that I can start with the tagging:) Vily
svn commit: r1532628 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/websocket/drawboard.xhtml
Author: kpreisser
Date: Wed Oct 16 02:19:53 2013
New Revision: 1532628
URL: http://svn.apache.org/r1532628
Log:
Merged revision(s) 1532627 from tomcat/trunk:
Prevent default mouse event on Canvas element to prevent browsers from marking
text (and Chrome from displaying the "text" cursor).
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1532627
Modified: tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml?rev=1532628&r1=1532627&r2=1532628&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml Wed Oct 16
02:19:53 2013
@@ -169,6 +169,11 @@
var canvasServerImage = document.createElement("canvas");
var canvasArray = [canvasDisplay, canvasBackground,
canvasServerImage];
+canvasDisplay.addEventListener("mousedown", function(e) {
+// Prevent default mouse event to prevent browsers from
marking text
+// (and Chrome from displaying the "text" cursor).
+e.preventDefault();
+}, false);
var labelPlayerCount = document.createTextNode("0");
var optionContainer = document.createElement("div");
@@ -177,6 +182,8 @@
var canvasDisplayCtx = canvasDisplay.getContext("2d");
var canvasBackgroundCtx = canvasBackground.getContext("2d");
var canvasServerImageCtx = canvasServerImage.getContext("2d");
+var canvasMouseMoveHandler;
+var canvasMouseDownHandler;
var mouseInWindow = false;
var mouseDown = false;
@@ -525,14 +532,14 @@
drawContainer.appendChild(canvasDisplay);
drawContainer.appendChild(optionContainer);
-
-canvasDisplay.onmousedown = function(e) {
+
+canvasMouseDownHandler = function(e) {
if (e.button == 0) {
currentMouseX = e.pageX - canvasDisplay.offsetLeft;
currentMouseY = e.pageY - canvasDisplay.offsetTop;
mouseDown = true;
-canvasMouseMove(e);
+canvasMouseMoveHandler(e);
} else if (mouseDown) {
// Cancel drawing.
@@ -544,9 +551,10 @@
refreshDisplayCanvas();
}
-}
+};
+canvasDisplay.addEventListener("mousedown",
canvasMouseDownHandler, false);
-var canvasMouseMove = canvasDisplay.onmousemove =
function(e) {
+canvasMouseMoveHandler = function(e) {
mouseInWindow = true;
var mouseX = e.pageX - canvasDisplay.offsetLeft;
var mouseY = e.pageY - canvasDisplay.offsetTop;
@@ -588,8 +596,9 @@
refreshDisplayCanvas();
};
+canvasDisplay.addEventListener("mousemove",
canvasMouseMoveHandler, false);
-canvasDisplay.onmouseup = function(e) {
+canvasDisplay.addEventListener("mouseup", function(e) {
if (e.button == 0) {
if (mouseDown) {
mouseDown = false;
@@ -616,12 +625,12 @@
refreshDisplayCanvas();
}
}
-};
+}, false);
-canvasDisplay.onmouseout = function() {
+canvasDisplay.addEventListener("mouseout", function(e) {
mouseInWindow = false;
refreshDisplayCanvas();
-};
+}, false);
// Create color and thickness controls.
@@ -645,11 +654,11 @@
"margin: 3px; width: 18px; height: 18px; "
+ "float: left; background-color: " +
rgb(color));
colorContainer.style.border = '2px solid #000';
-colorContainer.onmousedown = (function(ix) {
+colorContainer.addEventListener("mousedown",
(function(ix) {
return function() {
setColor(ix);
svn commit: r1532627 - /tomcat/trunk/webapps/examples/websocket/drawboard.xhtml
Author: kpreisser
Date: Wed Oct 16 02:18:40 2013
New Revision: 1532627
URL: http://svn.apache.org/r1532627
Log:
Prevent default mouse event on Canvas element to prevent browsers from marking
text (and Chrome from displaying the "text" cursor).
Modified:
tomcat/trunk/webapps/examples/websocket/drawboard.xhtml
Modified: tomcat/trunk/webapps/examples/websocket/drawboard.xhtml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/drawboard.xhtml?rev=1532627&r1=1532626&r2=1532627&view=diff
==
--- tomcat/trunk/webapps/examples/websocket/drawboard.xhtml (original)
+++ tomcat/trunk/webapps/examples/websocket/drawboard.xhtml Wed Oct 16 02:18:40
2013
@@ -169,6 +169,11 @@
var canvasServerImage = document.createElement("canvas");
var canvasArray = [canvasDisplay, canvasBackground,
canvasServerImage];
+canvasDisplay.addEventListener("mousedown", function(e) {
+// Prevent default mouse event to prevent browsers from
marking text
+// (and Chrome from displaying the "text" cursor).
+e.preventDefault();
+}, false);
var labelPlayerCount = document.createTextNode("0");
var optionContainer = document.createElement("div");
@@ -177,6 +182,8 @@
var canvasDisplayCtx = canvasDisplay.getContext("2d");
var canvasBackgroundCtx = canvasBackground.getContext("2d");
var canvasServerImageCtx = canvasServerImage.getContext("2d");
+var canvasMouseMoveHandler;
+var canvasMouseDownHandler;
var mouseInWindow = false;
var mouseDown = false;
@@ -525,14 +532,14 @@
drawContainer.appendChild(canvasDisplay);
drawContainer.appendChild(optionContainer);
-
-canvasDisplay.onmousedown = function(e) {
+
+canvasMouseDownHandler = function(e) {
if (e.button == 0) {
currentMouseX = e.pageX - canvasDisplay.offsetLeft;
currentMouseY = e.pageY - canvasDisplay.offsetTop;
mouseDown = true;
-canvasMouseMove(e);
+canvasMouseMoveHandler(e);
} else if (mouseDown) {
// Cancel drawing.
@@ -544,9 +551,10 @@
refreshDisplayCanvas();
}
-}
+};
+canvasDisplay.addEventListener("mousedown",
canvasMouseDownHandler, false);
-var canvasMouseMove = canvasDisplay.onmousemove =
function(e) {
+canvasMouseMoveHandler = function(e) {
mouseInWindow = true;
var mouseX = e.pageX - canvasDisplay.offsetLeft;
var mouseY = e.pageY - canvasDisplay.offsetTop;
@@ -588,8 +596,9 @@
refreshDisplayCanvas();
};
+canvasDisplay.addEventListener("mousemove",
canvasMouseMoveHandler, false);
-canvasDisplay.onmouseup = function(e) {
+canvasDisplay.addEventListener("mouseup", function(e) {
if (e.button == 0) {
if (mouseDown) {
mouseDown = false;
@@ -616,12 +625,12 @@
refreshDisplayCanvas();
}
}
-};
+}, false);
-canvasDisplay.onmouseout = function() {
+canvasDisplay.addEventListener("mouseout", function(e) {
mouseInWindow = false;
refreshDisplayCanvas();
-};
+}, false);
// Create color and thickness controls.
@@ -645,11 +654,11 @@
"margin: 3px; width: 18px; height: 18px; "
+ "float: left; background-color: " +
rgb(color));
colorContainer.style.border = '2px solid #000';
-colorContainer.onmousedown = (function(ix) {
+colorContainer.addEventListener("mousedown",
(function(ix) {
return function() {
setColor(ix);
};
-})(i);
+})(i), false);
colorContainersBox.appendChild(colorContainer);
}
@@ -674,11 +683,11 @@
drawTypeContainer.style.bor
svn commit: r1532625 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/websocket/drawboard.xhtml
Author: kpreisser
Date: Wed Oct 16 01:55:28 2013
New Revision: 1532625
URL: http://svn.apache.org/r1532625
Log:
Merged revision(s) 1532622 from tomcat/trunk:
Show crosshair cursor on the canvas. This still needs a workaround for Chrome.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1532622
Modified: tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml?rev=1532625&r1=1532624&r2=1532625&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/websocket/drawboard.xhtml Wed Oct 16
01:55:28 2013
@@ -56,6 +56,7 @@
display: block;
-ms-touch-action: none;
touch-action: none; /* Disable touch behaviors, like pan and zoom
*/
+cursor: crosshair;
}
#labelContainer {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532622 - /tomcat/trunk/webapps/examples/websocket/drawboard.xhtml
Author: kpreisser
Date: Wed Oct 16 01:53:06 2013
New Revision: 1532622
URL: http://svn.apache.org/r1532622
Log:
Show crosshair cursor on the canvas. This still needs a workaround for Chrome.
Modified:
tomcat/trunk/webapps/examples/websocket/drawboard.xhtml
Modified: tomcat/trunk/webapps/examples/websocket/drawboard.xhtml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/drawboard.xhtml?rev=1532622&r1=1532621&r2=1532622&view=diff
==
--- tomcat/trunk/webapps/examples/websocket/drawboard.xhtml (original)
+++ tomcat/trunk/webapps/examples/websocket/drawboard.xhtml Wed Oct 16 01:53:06
2013
@@ -56,6 +56,7 @@
display: block;
-ms-touch-action: none;
touch-action: none; /* Disable touch behaviors, like pan and zoom
*/
+cursor: crosshair;
}
#labelContainer {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532602 - /tomcat/native/trunk/xdocs/style.xsl
Author: kpreisser Date: Wed Oct 16 00:00:09 2013 New Revision: 1532602 URL: http://svn.apache.org/r1532602 Log: Use correct text/... media type. Modified: tomcat/native/trunk/xdocs/style.xsl (props changed) Propchange: tomcat/native/trunk/xdocs/style.xsl -- --- svn:mime-type (original) +++ svn:mime-type Wed Oct 16 00:00:09 2013 @@ -1 +1 @@ -text/xslt+xml +text/xsl - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532601 - in /tomcat/native/trunk/xdocs: miscellaneous/changelog-1.1.x.xml miscellaneous/changelog.xml style.xsl
Author: kpreisser Date: Tue Oct 15 23:50:32 2013 New Revision: 1532601 URL: http://svn.apache.org/r1532601 Log: Try to make the changelog.xml served by SVN-HTTP viewable in a browser. As Konstantin Kolinko mentioned in http://markmail.org/message/6dnqc57hqld7ohzm, this probably will not work when viewing the file locally. Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog-1.1.x.xml (contents, props changed) tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (contents, props changed) tomcat/native/trunk/xdocs/style.xsl (props changed) Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog-1.1.x.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog-1.1.x.xml?rev=1532601&r1=1532600&r2=1532601&view=diff == --- tomcat/native/trunk/xdocs/miscellaneous/changelog-1.1.x.xml (original) +++ tomcat/native/trunk/xdocs/miscellaneous/changelog-1.1.x.xml Tue Oct 15 23:50:32 2013 @@ -18,6 +18,7 @@ ]> + &project; Propchange: tomcat/native/trunk/xdocs/miscellaneous/changelog-1.1.x.xml -- svn:mime-type = text/xml Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1532601&r1=1532600&r2=1532601&view=diff == --- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Tue Oct 15 23:50:32 2013 @@ -18,6 +18,7 @@ ]> + &project; Propchange: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml -- svn:mime-type = text/xml Propchange: tomcat/native/trunk/xdocs/style.xsl -- svn:mime-type = text/xslt+xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55383] Improve markup and design of Tomcat's HTML pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383 --- Comment #48 from Konstantin Preißer --- Improvements of design and markup have been applied to the Tomcat Native documentation (to match Tomcat 8 documentation) and will be included in TC-Native 1.1.30 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: r1532591 - in /tomcat/native/branches/1.1.x: ./ xdocs/build.xml
Author: kpreisser Date: Tue Oct 15 23:28:41 2013 New Revision: 1532591 URL: http://svn.apache.org/r1532591 Log: Merged revision(s) 1532590 from tomcat/native/trunk: Remove "printer" HTML pages. Modified: tomcat/native/branches/1.1.x/ (props changed) tomcat/native/branches/1.1.x/xdocs/build.xml Propchange: tomcat/native/branches/1.1.x/ -- Merged /tomcat/native/trunk:r1532590 Modified: tomcat/native/branches/1.1.x/xdocs/build.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/build.xml?rev=1532591&r1=1532590&r2=1532591&view=diff == --- tomcat/native/branches/1.1.x/xdocs/build.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/build.xml Tue Oct 15 23:28:41 2013 @@ -59,17 +59,6 @@ - - - - - - - - - - - - - - - - - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532590 - /tomcat/native/trunk/xdocs/build.xml
Author: kpreisser Date: Tue Oct 15 23:26:51 2013 New Revision: 1532590 URL: http://svn.apache.org/r1532590 Log: Remove "printer" HTML pages. Modified: tomcat/native/trunk/xdocs/build.xml Modified: tomcat/native/trunk/xdocs/build.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/build.xml?rev=1532590&r1=1532589&r2=1532590&view=diff == --- tomcat/native/trunk/xdocs/build.xml (original) +++ tomcat/native/trunk/xdocs/build.xml Tue Oct 15 23:26:51 2013 @@ -59,17 +59,6 @@ - - - - - - - - - - - - - - - - - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532586 - in /tomcat/native/branches/1.1.x: ./ xdocs/ xdocs/images/ xdocs/miscellaneous/ xdocs/news/
Author: kpreisser Date: Tue Oct 15 23:20:23 2013 New Revision: 1532586 URL: http://svn.apache.org/r1532586 Log: Merged revision(s) 1532577 from tomcat/native/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55383 Improve markup and design of Tomcat Native documentation. Added: tomcat/native/branches/1.1.x/xdocs/images/asf-feather.png - copied unchanged from r1532577, tomcat/native/trunk/xdocs/images/asf-feather.png tomcat/native/branches/1.1.x/xdocs/images/docs-stylesheet.css - copied unchanged from r1532577, tomcat/native/trunk/xdocs/images/docs-stylesheet.css tomcat/native/branches/1.1.x/xdocs/images/style.css - copied unchanged from r1532577, tomcat/native/trunk/xdocs/images/style.css tomcat/native/branches/1.1.x/xdocs/images/tomcat.png - copied unchanged from r1532577, tomcat/native/trunk/xdocs/images/tomcat.png Removed: tomcat/native/branches/1.1.x/xdocs/style.css Modified: tomcat/native/branches/1.1.x/ (props changed) tomcat/native/branches/1.1.x/xdocs/index.xml tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml tomcat/native/branches/1.1.x/xdocs/news/2008.xml tomcat/native/branches/1.1.x/xdocs/news/2009.xml tomcat/native/branches/1.1.x/xdocs/news/2010.xml tomcat/native/branches/1.1.x/xdocs/news/2011.xml tomcat/native/branches/1.1.x/xdocs/news/2012.xml tomcat/native/branches/1.1.x/xdocs/news/2013.xml tomcat/native/branches/1.1.x/xdocs/news/project.xml tomcat/native/branches/1.1.x/xdocs/project.xml tomcat/native/branches/1.1.x/xdocs/style.xsl Propchange: tomcat/native/branches/1.1.x/ -- Merged /tomcat/native/trunk:r1532577 Modified: tomcat/native/branches/1.1.x/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/index.xml?rev=1532586&r1=1532585&r2=1532586&view=diff == --- tomcat/native/branches/1.1.x/xdocs/index.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/index.xml Tue Oct 15 23:20:23 2013 @@ -1,4 +1,4 @@ - + http://www.w3.org/1999/XSL/Transform"; - version="1.0"> + version="3.0"> + html-version="5.0" + encoding="UTF-8" + indent="no" + doctype-system="about:legacy-compat"/> http://tomcat.apache.org/'"/> - - + + + - - - http://issues.apache.org/bugzilla/show_bug.cgi?id='"/> - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - PAGE HEADER - - -TOMCAT LOGO - - - - - - - - - - - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + - - - - - - - + - - APACHE LOGO - http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; - align="right" alt="Apache Logo" border="0"/> - - + + + - - - HEADER SEPARATOR - - - - - - - + + + + + + http://www.apache.org/"; target="_blank"> + + + + + + + - - - LEFT SIDE NAVIGATION - + + + + + + - - - -RIGHT SIDE MAIN BODY - - - - - - - - - - - - - - - - - - - - print-friendlyversion - - - - - - - - - - - - - - + + + + + + + + - - FOOTER SEPARATOR - - - - - + + + + - PAGE FOOTER - - -Copyright © 2008-2013, Apache Software Foundation - - + + +Copyright © 2008-2013, The Apache Software Foundation + + + + - - -
svn commit: r1532585 - /tomcat/native/trunk/xdocs/index.xml
Author: kpreisser Date: Tue Oct 15 23:19:26 2013 New Revision: 1532585 URL: http://svn.apache.org/r1532585 Log: Follow-Up to r1532577: Further markup clean-up. Modified: tomcat/native/trunk/xdocs/index.xml Modified: tomcat/native/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/index.xml?rev=1532585&r1=1532584&r2=1532585&view=diff == --- tomcat/native/trunk/xdocs/index.xml (original) +++ tomcat/native/trunk/xdocs/index.xml Tue Oct 15 23:19:26 2013 @@ -101,7 +101,7 @@ manual is described in more detail below On all the POSIX systems (Linux, Solaris, HP-UX, AIX etc...) a well-known configure and make is used to build tc-native. -In the jni/native runs: +In the jni/native runs: ./configure --help to read the description of all the parameters. @@ -131,8 +131,7 @@ manual is described in more detail below --with-ssl=yes \ --prefix=$CATALINA_HOME - -To build the libraries and install them: +To build the libraries and install them: make && make install @@ -210,8 +209,7 @@ INFO: Initializing Coyote HTTP/1.1 on ht set PATH=%PATH;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\native\Debug;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\apr\Debug;C:\OpenSSL\lib\VC - +>set PATH=%PATH;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\native\Debug;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\apr\Debug;C:\OpenSSL\lib\VC Start tomcat and check for the messages like this ones: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532584 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml
Author: kkolinko Date: Tue Oct 15 23:05:18 2013 New Revision: 1532584 URL: http://svn.apache.org/r1532584 Log: Update download page for Tomcat-Native 1.1.29 has been released, 1.1.27 has already been removed from the mirror system Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1532584&r1=1532583&r2=1532584&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Tue Oct 15 23:05:18 2013 @@ -279,20 +279,20 @@ - -Native 1.1.27 Source Release tar.gz + +Native 1.1.29 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.27/source/tomcat-native-1.1.27-src.tar.gz.asc";>PGP] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.asc";>PGP] -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.27/source/tomcat-native-1.1.27-src.tar.gz.md5";>MD5] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.md5";>MD5] @@ -302,20 +302,20 @@ - -Native 1.1.27 Source Release zip + +Native 1.1.29 Source Release zip (e.g. Windows) -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.27/source/tomcat-native-1.1.27-win32-src.zip.asc";>PGP] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.asc";>PGP] -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.27/source/tomcat-native-1.1.27-win32-src.zip.md5";>MD5] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.md5";>MD5] @@ -332,7 +332,7 @@ You can find binaries release too You may download them from - HERE + HERE Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1532584&r1=1532583&r2=1532584&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Tue Oct 15 23:05:18 2013 @@ -49,28 +49,28 @@ Source (please choose the correct format for your platform) - -Native 1.1.27 Source Release tar.gz + +Native 1.1.29 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.27/source/tomcat-native-1.1.27-src.tar.gz.asc";>PGP] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.asc";>PGP] -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.27/source/tomcat-native-1.1.27-src.tar.gz.md5";>MD5] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-src.tar.gz.md5";>MD5] - -Native 1.1.27 Source Release zip + +Native 1.1.29 Source Release zip (e.g. Windows) -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.27/source/tomcat-native-1.1.27-win32-src.zip.asc";>PGP] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.asc";>PGP] -[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.27/source/tomcat-native-1.1.27-win32-src.zip.md5";>MD5] +[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.29/source/tomcat-native-1.1.29-win32-src.zip.md5";>MD5] @@ -79,7 +79,7 @@ You can find binaries release too You may download them from - HERE + HERE - To unsubscribe, e-mail: dev-unsubsc
svn commit: r1532582 - in /tomcat/native/trunk/xdocs: index.xml news/2010.xml
Author: kpreisser Date: Tue Oct 15 22:52:10 2013 New Revision: 1532582 URL: http://svn.apache.org/r1532582 Log: Follow-Up to r1532577: Use an explicitely defined anchor for news items. Modified: tomcat/native/trunk/xdocs/index.xml tomcat/native/trunk/xdocs/news/2010.xml Modified: tomcat/native/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/index.xml?rev=1532582&r1=1532581&r2=1532582&view=diff == --- tomcat/native/trunk/xdocs/index.xml (original) +++ tomcat/native/trunk/xdocs/index.xml Tue Oct 15 22:52:10 2013 @@ -64,7 +64,7 @@ manual is described in more detail below -DD MMM - TC-Native-2.0.0 released +DD MMM - TC-Native-2.0.0 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 2.0.0 Stable. Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/2.0.0/source/tomcat-native-2.0.0-src.tar.gz";>TC-native 2.0.0 release sources Modified: tomcat/native/trunk/xdocs/news/2010.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/news/2010.xml?rev=1532582&r1=1532581&r2=1532582&view=diff == --- tomcat/native/trunk/xdocs/news/2010.xml (original) +++ tomcat/native/trunk/xdocs/news/2010.xml Tue Oct 15 22:52:10 2013 @@ -31,7 +31,7 @@ - + The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 2.0.0. This is a stable release adding some bug fixes. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532577 - in /tomcat/native/trunk/xdocs: ./ images/ miscellaneous/ news/
Author: kpreisser
Date: Tue Oct 15 22:39:08 2013
New Revision: 1532577
URL: http://svn.apache.org/r1532577
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55383
Improve markup and design of Tomcat Native documentation.
Added:
tomcat/native/trunk/xdocs/images/asf-feather.png
- copied unchanged from r1532527,
tomcat/trunk/webapps/docs/images/asf-feather.png
tomcat/native/trunk/xdocs/images/docs-stylesheet.css
- copied unchanged from r1532527,
tomcat/trunk/webapps/docs/images/docs-stylesheet.css
tomcat/native/trunk/xdocs/images/style.css (contents, props changed)
- copied, changed from r1532527, tomcat/native/trunk/xdocs/style.css
tomcat/native/trunk/xdocs/images/tomcat.png
- copied unchanged from r1532527,
tomcat/trunk/webapps/docs/images/tomcat.png
Removed:
tomcat/native/trunk/xdocs/style.css
Modified:
tomcat/native/trunk/xdocs/index.xml
tomcat/native/trunk/xdocs/miscellaneous/changelog-1.1.x.xml
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
tomcat/native/trunk/xdocs/miscellaneous/project.xml
tomcat/native/trunk/xdocs/news/2010.xml
tomcat/native/trunk/xdocs/news/project.xml
tomcat/native/trunk/xdocs/project.xml
tomcat/native/trunk/xdocs/style.xsl
Copied: tomcat/native/trunk/xdocs/images/style.css (from r1532527,
tomcat/native/trunk/xdocs/style.css)
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/images/style.css?p2=tomcat/native/trunk/xdocs/images/style.css&p1=tomcat/native/trunk/xdocs/style.css&r1=1532527&r2=1532577&rev=1532577&view=diff
==
--- tomcat/native/trunk/xdocs/style.css (original)
+++ tomcat/native/trunk/xdocs/images/style.css Tue Oct 15 22:39:08 2013
@@ -14,58 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-div.screen {
-margin: 10px 0px 10px 20px;
-font-size: smaller;
-color: #ff;
-}
-div.example {
-background-color: #e5ecf3;
-color: #000;
-padding: 0.5em;
-margin: 1em 2em 1em 1em;
-}
-pre {
-font-family: "Courier New", Courier, monospace;
-font-weight: normal;
-font-style: normal;
-font-size: smaller;
-}
-em.screen {
-font-weight: normal;
-font-style: normal;
-color: #c0c0c0;
-}
-p.screen {
-background-color: #00;
-border-style: none;
-color: #c0c0c0;
-margin-left: 10px;
-margin-right: 0px;
-text-align: left;
-}
-b.screen {
-font-weight: normal;
-font-style: normal;
-color: #c0c0c0;
-}
-code.screen {
-background-color: #00;
-border-style: none;
-color: #c0c0c0;
-margin-left: 10px;
-margin-right: 0px;
-text-align: left;
-}
-b.code {
-font-weight: normal;
-font-style: normal;
-color: #023264;
-}
+
p.todo {
-background-color: #ff;
-border-style: none;
-color: #00;
margin-left: 20px;
margin-right: 10px;
text-align: justify;
Propchange: tomcat/native/trunk/xdocs/images/style.css
--
svn:eol-style = native
Propchange: tomcat/native/trunk/xdocs/images/style.css
--
svn:mime-type = text/css
Modified: tomcat/native/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/index.xml?rev=1532577&r1=1532576&r2=1532577&view=diff
==
--- tomcat/native/trunk/xdocs/index.xml (original)
+++ tomcat/native/trunk/xdocs/index.xml Tue Oct 15 22:39:08 2013
@@ -1,4 +1,4 @@
-
+
http://www.w3.org/1999/XSL/Transform";
- version="1.0">
+ version="3.0">
+ html-version="5.0"
+ encoding="UTF-8"
+ indent="no"
+ doctype-system="about:legacy-compat"/>
http://tomcat.apache.org/'"/>
-
-
+
+
+
-
-
-
http://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
-
-
-
-
-
-
-
-
-
-
-
+
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PAGE HEADER
-
-
-TOMCAT LOGO
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
- APACHE LOGO
- http://www.apache.org/";>
-http://www.apache.org/images/asf-logo.gif";
- align="right" alt="Apache Logo" border="0"/>
-
-
+
+
+
svn commit: r1532557 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl
Author: kpreisser Date: Tue Oct 15 22:03:57 2013 New Revision: 1532557 URL: http://svn.apache.org/r1532557 Log: - Remove (commented-out) because "email" is not a registered name. - Reorder the $project declaration 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=1532557&r1=1532556&r2=1532557&view=diff == --- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Tue Oct 15 22:03:57 2013 @@ -55,12 +55,12 @@ /comments.html - - project.xml - + + + - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Bad mirror?
Mark, On 10/15/13 5:34 PM, Mark Thomas wrote: > On 15/10/2013 22:24, Christopher Schultz wrote: >> Konstantin, >> >> On 10/15/13 2:45 PM, Konstantin Kolinko wrote: >>> 2013/10/15 Christopher Schultz : All, I went to check-out the tcnative download links (they currently show 1.2.27 as the latest instead of 1.2.29) and clicked on the "You may download them from [HERE]" link for binaries. The selected mirror was "http://www.poolsaboveground.com/apache/"; and I got a web site for ... above-ground pools. I tried other links (just in case maybe they don't mirror tcnative) and the links for, say, Tomcat do appear to work. I'm not sure how all the mirror stuff works, but can we configure different mirrors for different downloads? Or maybe there is a misconfiguration at the mirror host and they are expecting to be serving tcnative as well. >>> >>> They are listed on this page http://www.apache.org/mirrors/ >>> >>> and appear to be a proper mirror, >>> http://www.poolsaboveground.com/apache/tomcat/tomcat-connectors/native/ >>> >>> >>> > If you hit their 404 page, they redirect you to the main page of their site, >>> >>> (In theory, behaviour of a site may depend on a client >>> properties, such as client location. I just hope that it is not >>> the case here). >> >> My initial reaction was that some company had signed-up to be a >> "mirror" with no intention of actually mirroring the code but >> instead was just trying to get some links from ASF web pages to >> their own products. It was only after trying again with the same >> mirror to fetch Tomcat (i.e. apache-tomcat-*.tar.gz) instead ot >> tcnative that I saw they were a legitimate mirror and not just an >> advertisement trap. >> >> Is there any kind of mirroring agreement that providers have to >> sign to become an ASF mirror? Redirecting to a home page for a "not >> found" condition is confusing to say the least. > > https://www.apache.org/info/how-to-mirror > > The 404 response of this mirror indicates they have an invalid > configuration. Raise an INFRA Jira ticket and they will take it up > with the mirror, removing them if they fail to fix their configuration. Done. Thanks. On a side note, it's interesting that ASF requires that httpd be used as the web server. That's too bad. Tomcat FTW! -chris signature.asc Description: OpenPGP digital signature
Re: Bad mirror?
On 15/10/2013 22:24, Christopher Schultz wrote: > Konstantin, > > On 10/15/13 2:45 PM, Konstantin Kolinko wrote: >> 2013/10/15 Christopher Schultz : >>> All, >>> >>> I went to check-out the tcnative download links (they currently >>> show 1.2.27 as the latest instead of 1.2.29) and clicked on the >>> "You may download them from [HERE]" link for binaries. The >>> selected mirror was "http://www.poolsaboveground.com/apache/"; >>> and I got a web site for ... above-ground pools. >>> >>> I tried other links (just in case maybe they don't mirror >>> tcnative) and the links for, say, Tomcat do appear to work. >>> >>> I'm not sure how all the mirror stuff works, but can we >>> configure different mirrors for different downloads? Or maybe >>> there is a misconfiguration at the mirror host and they are >>> expecting to be serving tcnative as well. >>> >> >> They are listed on this page http://www.apache.org/mirrors/ >> >> and appear to be a proper mirror, >> http://www.poolsaboveground.com/apache/tomcat/tomcat-connectors/native/ >> >> >> If you hit their 404 page, they redirect you to the main page of their site, >> >> (In theory, behaviour of a site may depend on a client >> properties, such as client location. I just hope that it is not >> the case here). > > My initial reaction was that some company had signed-up to be a > "mirror" with no intention of actually mirroring the code but > instead was just trying to get some links from ASF web pages to > their own products. It was only after trying again with the same > mirror to fetch Tomcat (i.e. apache-tomcat-*.tar.gz) instead ot > tcnative that I saw they were a legitimate mirror and not just an > advertisement trap. > > Is there any kind of mirroring agreement that providers have to > sign to become an ASF mirror? Redirecting to a home page for a "not > found" condition is confusing to say the least. https://www.apache.org/info/how-to-mirror The 404 response of this mirror indicates they have an invalid configuration. Raise an INFRA Jira ticket and they will take it up with the mirror, removing them if they fail to fix their configuration. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532545 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Author: markt
Date: Tue Oct 15 21:32:23 2013
New Revision: 1532545
URL: http://svn.apache.org/r1532545
Log:
Fix Gump failures when the SCI scan finds too many classes.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1532544
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java?rev=1532545&r1=1532544&r2=1532545&view=diff
==
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Tue Oct 15 21:32:23 2013
@@ -53,7 +53,14 @@ public class ExamplesConfig implements S
@Override
public Set> getAnnotatedEndpointClasses(Set> scanned) {
// Deploy all WebSocket endpoints defined by annotations in the
examples
-// web application.
-return scanned;
+// web application. Filter out all others to avoid issues when running
+// tests on Gump
+Set> results = new HashSet>();
+for (Class clazz : scanned) {
+if (clazz.getPackage().getName().startsWith("websocket.")) {
+results.add(clazz);
+}
+}
+return results;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532544 - /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Author: markt
Date: Tue Oct 15 21:31:21 2013
New Revision: 1532544
URL: http://svn.apache.org/r1532544
Log:
Fix Gump failures when the SCI scan finds too many classes.
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java?rev=1532544&r1=1532543&r2=1532544&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Tue Oct 15 21:31:21 2013
@@ -53,7 +53,14 @@ public class ExamplesConfig implements S
@Override
public Set> getAnnotatedEndpointClasses(Set> scanned) {
// Deploy all WebSocket endpoints defined by annotations in the
examples
-// web application.
-return scanned;
+// web application. Filter out all others to avoid issues when running
+// tests on Gump
+Set> results = new HashSet<>();
+for (Class clazz : scanned) {
+if (clazz.getPackage().getName().startsWith("websocket.")) {
+results.add(clazz);
+}
+}
+return results;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Bad mirror?
Konstantin, On 10/15/13 2:45 PM, Konstantin Kolinko wrote: > 2013/10/15 Christopher Schultz : >> All, >> >> I went to check-out the tcnative download links (they currently show >> 1.2.27 as the latest instead of 1.2.29) and clicked on the "You may >> download them from [HERE]" link for binaries. The selected mirror was >> "http://www.poolsaboveground.com/apache/"; and I got a web site for ... >> above-ground pools. >> >> I tried other links (just in case maybe they don't mirror tcnative) and >> the links for, say, Tomcat do appear to work. >> >> I'm not sure how all the mirror stuff works, but can we configure >> different mirrors for different downloads? Or maybe there is a >> misconfiguration at the mirror host and they are expecting to be serving >> tcnative as well. >> > > They are listed on this page > http://www.apache.org/mirrors/ > > and appear to be a proper mirror, > http://www.poolsaboveground.com/apache/tomcat/tomcat-connectors/native/ > > If you hit their 404 page, they redirect you to the main page of their site, > > (In theory, behaviour of a site may depend on a client properties, > such as client location. I just hope that it is not the case here). My initial reaction was that some company had signed-up to be a "mirror" with no intention of actually mirroring the code but instead was just trying to get some links from ASF web pages to their own products. It was only after trying again with the same mirror to fetch Tomcat (i.e. apache-tomcat-*.tar.gz) instead ot tcnative that I saw they were a legitimate mirror and not just an advertisement trap. Is there any kind of mirroring agreement that providers have to sign to become an ASF mirror? Redirecting to a home page for a "not found" condition is confusing to say the least. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1532540 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Tue Oct 15 21:24:31 2013
New Revision: 1532540
URL: http://svn.apache.org/r1532540
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1532540&r1=1532539&r2=1532540&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Tue Oct
15 21:24:31 2013
@@ -43,6 +43,7 @@ import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.ConcurrentModificationException;
import java.util.Enumeration;
import java.util.HashMap;
@@ -1234,20 +1235,7 @@ public class WebappClassLoader extends U
}
}
-final Iterator iterator = result.iterator();
-
-return new Enumeration() {
-@Override
-public boolean hasMoreElements() {
-return iterator.hasNext();
-}
-
-@Override
-public URL nextElement() {
-return iterator.next();
-}
-};
-
+return Collections.enumeration(result);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1532508 - in /tomcat/tc7.0.x/trunk: ./ conf/catalina.policy java/org/apache/catalina/loader/WebappClassLoader.java
On 15/10/2013 22:04, Konstantin Kolinko wrote:
>> Modified:
>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1532508&r1=1532507&r2=1532508&view=diff
>> ==
>> ---
>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
>> (original)
>> +++
>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
>> Tue Oct 15 20:05:48 2013
>> @@ -43,6 +43,7 @@ import java.security.PrivilegedAction;
>> import java.security.ProtectionDomain;
>> import java.util.ArrayList;
>> import java.util.Collection;
>> +import java.util.Collections;
>> import java.util.ConcurrentModificationException;
>> import java.util.Enumeration;
>> import java.util.HashMap;
>> @@ -1355,20 +1356,7 @@ public class WebappClassLoader
>>
>> }
>>
>> -final Iterator iterator = result.iterator();
>> -
>> -return new Enumeration() {
>> -@Override
>> -public boolean hasMoreElements() {
>> -return iterator.hasNext();
>> -}
>> -
>> -@Override
>> -public URL nextElement() {
>> -return iterator.next();
>> -}
>> -};
>> -
>> +return Collections.enumeration(result);
>> }
>
>
> A nice simplification.
> Why are these changes in 7.0.x only, but I do not see them in Tomcat trunk?
> (Maybe you have them, but forgot to commit).
Creating the Enumeration was failing under a security manager in 7.0.x
but not in trunk. I assumed that the change has already been made in
trunk. Obviously not. I'll do that shortly.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532530 - /tomcat/native/trunk/xdocs/index.xml
Author: kpreisser Date: Tue Oct 15 21:11:45 2013 New Revision: 1532530 URL: http://svn.apache.org/r1532530 Log: Fix invalid XML syntax. Modified: tomcat/native/trunk/xdocs/index.xml Modified: tomcat/native/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/index.xml?rev=1532530&r1=1532529&r2=1532530&view=diff == --- tomcat/native/trunk/xdocs/index.xml (original) +++ tomcat/native/trunk/xdocs/index.xml Tue Oct 15 21:11:45 2013 @@ -54,7 +54,7 @@ FIPS 140-2 support for TLS/SSL (if supported by linked OpenSSL library) - + Select one of the links from the navigation menu (to the left) to drill down to the more detailed documentation that is available. Each available manual is described in more detail below. @@ -207,7 +207,7 @@ manual is described in more detail below Edit $CATALINA_BASE\bin\setenv.bat (creating the file if necessary) and add the path to the tc-native libraries, apr and OpenSSL to PATH. For example: - + set PATH=%PATH;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\native\Debug;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\apr\Debug;C:\OpenSSL\lib\VC @@ -223,7 +223,7 @@ manual is described in more detail below Feb 8, 2010 2:48:18 PM org.apache.coyote.http11.Http11AprProtocol init INFO: Initializing Coyote HTTP/1.1 on http-8080 - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1532508 - in /tomcat/tc7.0.x/trunk: ./ conf/catalina.policy java/org/apache/catalina/loader/WebappClassLoader.java
2013/10/16 :
> Author: markt
> Date: Tue Oct 15 20:05:48 2013
> New Revision: 1532508
>
> URL: http://svn.apache.org/r1532508
> Log:
> Fix WebSocket when running under a security manager
>
> Modified:
> tomcat/tc7.0.x/trunk/ (props changed)
> tomcat/tc7.0.x/trunk/conf/catalina.policy
>
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
>
> Propchange: tomcat/tc7.0.x/trunk/
> --
> Merged /tomcat/trunk:r1532506
>
> Modified: tomcat/tc7.0.x/trunk/conf/catalina.policy
> URL:
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.policy?rev=1532508&r1=1532507&r2=1532508&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/conf/catalina.policy (original)
> +++ tomcat/tc7.0.x/trunk/conf/catalina.policy Tue Oct 15 20:05:48 2013
> @@ -186,8 +186,12 @@ grant {
> // Applications using Comet need to be able to access this package
> permission java.lang.RuntimePermission
> "accessClassInPackage.org.apache.catalina.comet";
>
> -// Applications using WebSocket need to be able to access this package
> +// Applications using the legacy WebSocket implementation need to be
> able to access this package
> permission java.lang.RuntimePermission
> "accessClassInPackage.org.apache.catalina.websocket";
> +
> +// Applications using the JSR-356 WebSocket implementation need to be
> able to access these packages
> +permission java.lang.RuntimePermission
> "accessClassInPackage.org.apache.tomcat.websocket";
> +permission java.lang.RuntimePermission
> "accessClassInPackage.org.apache.tomcat.websocket.server";
> };
>
>
>
> Modified:
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
> URL:
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1532508&r1=1532507&r2=1532508&view=diff
> ==
> ---
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
> (original)
> +++
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
> Tue Oct 15 20:05:48 2013
> @@ -43,6 +43,7 @@ import java.security.PrivilegedAction;
> import java.security.ProtectionDomain;
> import java.util.ArrayList;
> import java.util.Collection;
> +import java.util.Collections;
> import java.util.ConcurrentModificationException;
> import java.util.Enumeration;
> import java.util.HashMap;
> @@ -1355,20 +1356,7 @@ public class WebappClassLoader
>
> }
>
> -final Iterator iterator = result.iterator();
> -
> -return new Enumeration() {
> -@Override
> -public boolean hasMoreElements() {
> -return iterator.hasNext();
> -}
> -
> -@Override
> -public URL nextElement() {
> -return iterator.next();
> -}
> -};
> -
> +return Collections.enumeration(result);
> }
A nice simplification.
Why are these changes in 7.0.x only, but I do not see them in Tomcat trunk?
(Maybe you have them, but forgot to commit).
Best regards,
Konstantin Kolinko
-
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. 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 the 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 junit exists, no need to add for property hamcrest.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 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: 50 mins 11 secs Command Line: /usr/lib/jvm/java-7-oracle/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-20131015.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20131015-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-20131015.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20131015-native-src.tar.gz -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool -Dcommons-dbcp.home=/ srv/gump/public/workspace/apache-commons/dbcp -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/junit/dist/junit-20131015.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/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-junit4.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/servle t-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/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/websocket-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/catalina-storeconfig.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-jni.jar:/srv/gump/public/workspace/tomcat -trunk/output/build/lib/tomcat-spdy.jar:/srv/g
Re: [VOTE] Release Apache Tomcat 8.0.0-RC4
On 15/10/2013 15:23, Daniel Mikusa wrote: > Tested a couple apps that I have and everything worked OK for me. > One note though, there are some errors with the examples when I run > with the security manager enabled. > > Here are the steps to replicate the issues: > > 1.) Downloaded Tomcat 8.0.0-RC4 and unzip. 2.) Run "./bin/catalina.sh > start -security". > > Here are the errors: > > 1.) On startup, you'll see this error. Adding the permission that is > listed in the stack trace allows the server to start without any > errors. Fixed. > 2.) After resolving #1, you'll see this error when you access one of > the web socket examples and the example tries to make a connection. > Adding the permission listed in the stack trace resolves the errors > and the web socket examples then work fine. Fixed. > 3.) Go to the "Number Writer" Non-Blocking IO example. You'll get > the following error. Again, adding the permission listed in the > stack trace to catalina.policy seems to resolve the issue and the > example works OK. Fixed. Thanks for the quick feedback. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532511 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt
Date: Tue Oct 15 20:15:03 2013
New Revision: 1532511
URL: http://svn.apache.org/r1532511
Log:
Fix Servlet 3.1 non-blocking when running with a security manager
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1532511&r1=1532510&r2=1532511&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Tue
Oct 15 20:15:03 2013
@@ -272,6 +272,7 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage + "util.http.parser.MediaTypeCache");
// net
loader.loadClass(basePackage + "util.net.Constants");
+loader.loadClass(basePackage + "util.net.DispatchType");
loader.loadClass(basePackage +
"util.net.NioBlockingSelector$BlockPoller$1");
loader.loadClass(basePackage +
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532508 - in /tomcat/tc7.0.x/trunk: ./ conf/catalina.policy java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Tue Oct 15 20:05:48 2013
New Revision: 1532508
URL: http://svn.apache.org/r1532508
Log:
Fix WebSocket when running under a security manager
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/conf/catalina.policy
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1532506
Modified: tomcat/tc7.0.x/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.policy?rev=1532508&r1=1532507&r2=1532508&view=diff
==
--- tomcat/tc7.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc7.0.x/trunk/conf/catalina.policy Tue Oct 15 20:05:48 2013
@@ -186,8 +186,12 @@ grant {
// Applications using Comet need to be able to access this package
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.comet";
-// Applications using WebSocket need to be able to access this package
+// Applications using the legacy WebSocket implementation need to be able
to access this package
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.websocket";
+
+// Applications using the JSR-356 WebSocket implementation need to be able
to access these packages
+permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.websocket";
+permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.websocket.server";
};
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1532508&r1=1532507&r2=1532508&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Tue Oct 15 20:05:48 2013
@@ -43,6 +43,7 @@ import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.ConcurrentModificationException;
import java.util.Enumeration;
import java.util.HashMap;
@@ -1355,20 +1356,7 @@ public class WebappClassLoader
}
-final Iterator iterator = result.iterator();
-
-return new Enumeration() {
-@Override
-public boolean hasMoreElements() {
-return iterator.hasNext();
-}
-
-@Override
-public URL nextElement() {
-return iterator.next();
-}
-};
-
+return Collections.enumeration(result);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532506 - /tomcat/trunk/conf/catalina.policy
Author: markt
Date: Tue Oct 15 20:00:14 2013
New Revision: 1532506
URL: http://svn.apache.org/r1532506
Log:
Fix WebSocket when running under a security manager
Modified:
tomcat/trunk/conf/catalina.policy
Modified: tomcat/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=1532506&r1=1532505&r2=1532506&view=diff
==
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Tue Oct 15 20:00:14 2013
@@ -191,8 +191,9 @@ grant {
// Applications using Comet need to be able to access this package
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.comet";
-// Applications using WebSocket need to be able to access this package
-permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.websocket";
+// Applications using WebSocket need to be able to access these packages
+permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.websocket";
+permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.websocket.server";
};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532501 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl
Author: markt Date: Tue Oct 15 19:41:09 2013 New Revision: 1532501 URL: http://svn.apache.org/r1532501 Log: Trailing whitespace police 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=1532501&r1=1532500&r2=1532501&view=diff == --- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Tue Oct 15 19:41:09 2013 @@ -521,7 +521,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.0-RC4
On 15/10/2013 17:31, Konstantin Preißer wrote: > Note, that the documentation index.html included in the binaries > says: > > "Apache Tomcat version @VERSION_MAJOR_MINOR@ implements the Servlet > 3.1 and JavaServer Pages 2.3 specifications from the Java Community > Process [...]" > > I guess this is because the XSLT And task does not have a > "version.filters" filterset (and with r1527315 the explicit version > number was replaced with the @VERSION_MAJOR_MINOR@ variable), but I > don't know if it's possible to add a filter to the XSLT task (maybe > one would need to copy the .xml files elsewhere for applying the > filter and then start the XSLT task). I just added support for some new elements to the stylesheet. That seemed like the cleanest solution. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532498 - in /tomcat/trunk: ./ webapps/docs/ webapps/docs/appdev/
Author: markt Date: Tue Oct 15 19:36:24 2013 New Revision: 1532498 URL: http://svn.apache.org/r1532498 Log: Can't use Ant property replacement in files that are generated via XSL processing. Add processing to the stylesheet. Modified: tomcat/trunk/build.xml tomcat/trunk/webapps/docs/appdev/installation.xml tomcat/trunk/webapps/docs/appdev/processes.xml tomcat/trunk/webapps/docs/building.xml tomcat/trunk/webapps/docs/cluster-howto.xml tomcat/trunk/webapps/docs/default-servlet.xml tomcat/trunk/webapps/docs/deployer-howto.xml tomcat/trunk/webapps/docs/index.xml tomcat/trunk/webapps/docs/introduction.xml tomcat/trunk/webapps/docs/jasper-howto.xml tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml tomcat/trunk/webapps/docs/security-howto.xml tomcat/trunk/webapps/docs/tomcat-docs.xsl tomcat/trunk/webapps/docs/windows-auth-howto.xml tomcat/trunk/webapps/docs/windows-service-howto.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1532498&r1=1532497&r2=1532498&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Oct 15 19:36:24 2013 @@ -850,6 +850,8 @@ + + @@ -865,6 +867,8 @@ + + @@ -880,6 +884,8 @@ + + @@ -895,6 +901,8 @@ + + @@ -910,6 +918,8 @@ + + @@ -926,6 +936,8 @@ + + Modified: tomcat/trunk/webapps/docs/appdev/installation.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/installation.xml?rev=1532498&r1=1532497&r2=1532498&view=diff == --- tomcat/trunk/webapps/docs/appdev/installation.xml (original) +++ tomcat/trunk/webapps/docs/appdev/installation.xml Tue Oct 15 19:36:24 2013 @@ -39,7 +39,7 @@ in the following subsections. -Tomcat @VERSION_MAJOR_MINOR@ was designed to run on Java SE 7. +Tomcat was designed to run on Java SE 7. Compatible JDKs for many platforms (or links to where they can be found) @@ -53,7 +53,7 @@ are available at Binary downloads of the Tomcat server are available from http://tomcat.apache.org/";>http://tomcat.apache.org/. This manual assumes you are using the most recent release -of Tomcat @VERSION_MAJOR@. Detailed instructions for downloading and installing +of Tomcat . Detailed instructions for downloading and installing Tomcat are available here. In the remainder of this manual, example shell scripts assume that you have Modified: tomcat/trunk/webapps/docs/appdev/processes.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/processes.xml?rev=1532498&r1=1532497&r2=1532498&view=diff == --- tomcat/trunk/webapps/docs/appdev/processes.xml (original) +++ tomcat/trunk/webapps/docs/appdev/processes.xml Tue Oct 15 19:36:24 2013 @@ -130,7 +130,7 @@ You might end up with something like thi app.path=/hello # Tomcat installation directory -catalina.home=/usr/local/apache-tomcat-@VERSION_MAJOR_MINOR@ +catalina.home=/usr/local/apache-tomcat- # Manager webapp username and password manager.username=myusername Modified: tomcat/trunk/webapps/docs/building.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1532498&r1=1532497&r2=1532498&view=diff == --- tomcat/trunk/webapps/docs/building.xml (original) +++ tomcat/trunk/webapps/docs/building.xml Tue Oct 15 19:36:24 2013 @@ -82,7 +82,7 @@ available, which will be used to actuall - + Tomcat SVN repository URL: @@ -90,7 +90,7 @@ available, which will be used to actuall Tomcat source packages: - http://tomcat.apache.org/download-@version_ma...@0.cgi";>http://tomcat.apache.org/download-@version_ma...@0.cgi. + http://tomcat.apache.org/download-0.cgi. Modified: tomcat/trunk/webapps/docs/cluster-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cluster-howto.xml?rev=1532498&r1=1532497&r2=1532498&view=diff == --- tomcat/trunk/webapps/docs/cluster-howto.xml (original) +++ tomcat/trunk/webapps/docs/cluster-howto.xml Tue Oct 15 19:36:24 2013 @@ -113,7 +113,7 @@ -To run session replication in your Tomcat @VERSION_MAJOR@ container, the following steps +To run session replication in your Tomcat container, the following steps should be completed: All your session attributes must implement java.io.Serializable @@ -195,7
Re: Serving gz files in DefaultServlet (Re: r1531115, BZ 54095)
On 15.10.2013 18:43, Christopher Schultz wrote:
> It's also worth pointing out that what has been implemented for Tomcat
> is a serious pain in the neck to do in httpd. Basically, to get it to
> work as expected in httpd, you need several animal sacrifices and a fair
> amount of arcane words to get it done. At this point, I have the animal
> part done but my pronunciation must be off because I still don't have it
> working properly.
It seems I sacrificed the right animals. Here's an old recipe of mine
once done for Apache 2.2. Might be a bit easier in 2.4 using the more
powerful expressions:
Explanation:
1) mod_rewrite checks, whether the browser accepts gzip encoded
responses (RewriteCond using Accept-Encoding header from the request)
2) If "yes", check whether the URL indicates that we do have pre
compressed content on disk
3) If both are "yes", then add a .gz in front of the file suffix,
rewrite URI and remember the decision in an env var. Not adding .gz at
the end of the file name is important to let Apache still set the
correct Content-Type header from the original and unchanged file ending.
4) Finally use mod_headers to set the response Content-Encoding header
to "gzip" (if we find that the env var is set).
5) Caches will be informed by the Vary response header that there was a
content "negiotiation" going on (without mod_negotiation). This is done
by mod_rewrite automatically, it adds "Accept-Encoding" to the Vary header.
Example config:
# This needs mod_rewrite and mod_headers
# loaded as modules.
# Make static content available.
# Not needed if already mounted elsewhere.
Alias /static /my/path/to/static
# Activate mod_rewrite and debug logging.
# Not needed if mod_rewrite is already
# activated for this VHost elsewhere.
RewriteEngine On
RewriteLog "|/path/to/bin/rotatelogs /oath/to/rewrite_log 43200"
# Only for debugging
RewriteLogLevel 255
# Flip in compressed content if allowed.
# Assumes all the compressed files are on disk
# having the correct names:
# something.css -> something.gz.css
# something.js -> something.gz.js
# 1) Check whether browser accepts "gzip" encoding
RewriteCond %{HTTP:Accept-Encoding} gzip
# 2) Check whether request belongs to our
#static URLs and has the right suffix
#If yes, add ".gz" to URL before existing suffix
#and remember this in our custom environment variable.
RewriteRule (/static/.*)\.(css|js)$ $1.gz.$2 [E=gz:1]
# Fix returned encoding header, the file was gzipped.
Header set Content-Encoding gzip env=gz
# Notes:
#
# - Be careful when introducing loops for rewrite rules:
# The new .gz.js etc. file would again match the rule
# leading to unterminated recursion.
# Make regexp more precise in that case (not allowing the .gz.)
# to match again.
#
# - Content-Type header is OK, because file suffix hasn't changed.
# This would not work for files without suffix, because then
# we end up with a ".gz" suffix!
#
# - Vary header is automatically extended with "Accept-Encoding"
# by mod_rewrite because of using the "Accept-Encoding" header
# in the RewriteCond
#
# - Old-style "Accept-Encoding: x-gzip" in request also works.
# The "gzip" is a sub pattern match (not anchored).
#
# Open Questions:
#
# - Is there any interoperability issue when mod_deflate is
# activated in addition (double compress or similar).
# If so, try to set env var "no-gzip" to deactivate mod_deflate
# for those requests.
Finally a simple script to add the pre-compressed content to the disk:
CONTENT_DIR=/path/to/static/content
for suffix in css js
do
for file in `find $CONTENT_DIR -type f -name "*.$suffix" -a ! -name
"*.gz.*"`
do
gzfile=`echo $file | sed -e 's#\.'$suffix'#.gz.'$suffix'#'`
gzip --best -c $file > $gzfile
chmod 644 $gzfile
echo === $file $gzfile ===
ls -ld $file $gzfile
done
done
Or similar.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Bad mirror?
2013/10/15 Christopher Schultz : > All, > > I went to check-out the tcnative download links (they currently show > 1.2.27 as the latest instead of 1.2.29) and clicked on the "You may > download them from [HERE]" link for binaries. The selected mirror was > "http://www.poolsaboveground.com/apache/"; and I got a web site for ... > above-ground pools. > > I tried other links (just in case maybe they don't mirror tcnative) and > the links for, say, Tomcat do appear to work. > > I'm not sure how all the mirror stuff works, but can we configure > different mirrors for different downloads? Or maybe there is a > misconfiguration at the mirror host and they are expecting to be serving > tcnative as well. > They are listed on this page http://www.apache.org/mirrors/ and appear to be a proper mirror, http://www.poolsaboveground.com/apache/tomcat/tomcat-connectors/native/ If you hit their 404 page, they redirect you to the main page of their site, (In theory, behaviour of a site may depend on a client properties, such as client location. I just hope that it is not the case here). Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bad mirror?
All, I went to check-out the tcnative download links (they currently show 1.2.27 as the latest instead of 1.2.29) and clicked on the "You may download them from [HERE]" link for binaries. The selected mirror was "http://www.poolsaboveground.com/apache/"; and I got a web site for ... above-ground pools. I tried other links (just in case maybe they don't mirror tcnative) and the links for, say, Tomcat do appear to work. I'm not sure how all the mirror stuff works, but can we configure different mirrors for different downloads? Or maybe there is a misconfiguration at the mirror host and they are expecting to be serving tcnative as well. Thanks, -chris signature.asc Description: OpenPGP digital signature
Re: [VOTE] Release Apache Tomcat 8.0.0-RC4
[X] Alpha - go ahead and release as 8.0.0-RC4 alpha Focused on websocket testing, default configuration. -- Jeanfrancois On 2013-10-15 8:48 AM, Mark Thomas wrote: The proposed Apache Tomcat 8.0.0 release candidate 4 is now available for voting. Given this is a release candidate I am working on the basis that it is equivalent to an alpha. The main changes since RC3 are: - Stability fixes in the APR/native connector - Stability fixes for non-blocking IO and WebSocket - Improvements to unit tests to reduce incidence of false reports - Add a drawing board example to the WebSocket examples - A handful of bug fixes - A small number of enhancements including direct gzip support in the default Servlet - More HTML clean-up It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC4/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-176/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC4/ The proposed 8.0.0-RC4 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 8.0.0-RC4 alpha Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532447 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: markt Date: Tue Oct 15 17:19:40 2013 New Revision: 1532447 URL: http://svn.apache.org/r1532447 Log: Add xhtml file extension to list of text file types Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1532445 Modified: tomcat/tc7.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1532447&r1=1532446&r2=1532447&view=diff == --- tomcat/tc7.0.x/trunk/build.xml (original) +++ tomcat/tc7.0.x/trunk/build.xml Tue Oct 15 17:19:40 2013 @@ -253,6 +253,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532445 - /tomcat/trunk/build.xml
Author: markt Date: Tue Oct 15 17:14:15 2013 New Revision: 1532445 URL: http://svn.apache.org/r1532445 Log: Add xhtml file extension to list of text file types Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1532445&r1=1532444&r2=1532445&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Oct 15 17:14:15 2013 @@ -262,6 +262,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532441 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Author: kpreisser
Date: Tue Oct 15 17:10:59 2013
New Revision: 1532441
URL: http://svn.apache.org/r1532441
Log:
Merged revision(s) 1532437 from tomcat/trunk:
- Do not use a extra Thread for the room as synchronizing access to the Room's
internals should suffice.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1532437
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java?rev=1532441&r1=1532440&r2=1532441&view=diff
==
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
Tue Oct 15 17:10:59 2013
@@ -72,7 +72,7 @@ public final class DrawboardEndpoint ext
session.addMessageHandler(stringHandler);
final Client client = new Client(session);
-room.invoke(new Runnable() {
+room.invokeAndWait(new Runnable() {
@Override
public void run() {
try {
@@ -100,7 +100,7 @@ public final class DrawboardEndpoint ext
@Override
public void onClose(Session session, CloseReason closeReason) {
-room.invoke(new Runnable() {
+room.invokeAndWait(new Runnable() {
@Override
public void run() {
try {
@@ -148,7 +148,7 @@ public final class DrawboardEndpoint ext
@Override
public void onMessage(final String message) {
// Invoke handling of the message in the room.
-room.invoke(new Runnable() {
+room.invokeAndWait(new Runnable() {
@Override
public void run() {
try {
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java?rev=1532441&r1=1532440&r2=1532441&view=diff
==
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Tue Oct 15 17:10:59 2013
@@ -27,10 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
import javax.imageio.ImageIO;
@@ -41,10 +37,8 @@ import websocket.drawboard.wsmessages.St
* A Room represents a drawboard where a number of
* users participate.
*
- * Each Room has its own "Room Thread" which manages all the actions
- * to be done in this Room. Instance methods should only be invoked
- * from this Room's thread by calling {@link #invoke(Runnable)} or
- * {@link #invokeAndWait(Runnable)}.
+ * Note: Instance methods should only be invoked by calling
+ * {@link #invokeAndWait(Runnable)} to ensure access is correctly synchronized.
*/
public final class Room {
@@ -90,6 +84,15 @@ public final class Room {
}
+/**
+ * An object used to synchronize access to this Room.
+ */
+private final Object syncObj = new Object();
+
+/**
+ * Indicates if this room has already been shutdown.
+ */
+private volatile boolean closed = false;
/**
* If true, outgoing DrawMessages will be buffered until the
@@ -99,13 +102,6 @@ public final class Room {
private static final boolean BUFFER_DRAW_MESSAGES = true;
/**
- * A single-threaded ExecutorService where tasks
- * are scheduled that are to be run in the Room Thread.
- */
-private final ExecutorService roomExecutor =
-Executors.newSingleThreadExecutor();
-
-/**
* A timer which sends buffered drawmessages to the client at once
* at a regular interval, to avoid sending a lot of very small
* messages which would cause TCP overhead and high CPU usage.
@@ -147,18 +143,12 @@ public final class Room {
drawmessageBroadcastTimer.schedule(new TimerTask() {
@Override
public void run() {
-try {
-invokeAndWait(new Runnable() {
-@Override
-public void run() {
-
svn commit: r1532437 - in /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard: DrawboardEndpoint.java Room.java
Author: kpreisser
Date: Tue Oct 15 17:06:32 2013
New Revision: 1532437
URL: http://svn.apache.org/r1532437
Log:
- Do not use a extra Thread for the room as synchronizing access to the Room's
internals should suffice.
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java?rev=1532437&r1=1532436&r2=1532437&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
Tue Oct 15 17:06:32 2013
@@ -72,7 +72,7 @@ public final class DrawboardEndpoint ext
session.addMessageHandler(stringHandler);
final Client client = new Client(session);
-room.invoke(new Runnable() {
+room.invokeAndWait(new Runnable() {
@Override
public void run() {
try {
@@ -100,7 +100,7 @@ public final class DrawboardEndpoint ext
@Override
public void onClose(Session session, CloseReason closeReason) {
-room.invoke(new Runnable() {
+room.invokeAndWait(new Runnable() {
@Override
public void run() {
try {
@@ -148,7 +148,7 @@ public final class DrawboardEndpoint ext
@Override
public void onMessage(final String message) {
// Invoke handling of the message in the room.
-room.invoke(new Runnable() {
+room.invokeAndWait(new Runnable() {
@Override
public void run() {
try {
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java?rev=1532437&r1=1532436&r2=1532437&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Tue Oct 15 17:06:32 2013
@@ -27,10 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
import javax.imageio.ImageIO;
@@ -41,10 +37,8 @@ import websocket.drawboard.wsmessages.St
* A Room represents a drawboard where a number of
* users participate.
*
- * Each Room has its own "Room Thread" which manages all the actions
- * to be done in this Room. Instance methods should only be invoked
- * from this Room's thread by calling {@link #invoke(Runnable)} or
- * {@link #invokeAndWait(Runnable)}.
+ * Note: Instance methods should only be invoked by calling
+ * {@link #invokeAndWait(Runnable)} to ensure access is correctly synchronized.
*/
public final class Room {
@@ -90,6 +84,15 @@ public final class Room {
}
+/**
+ * An object used to synchronize access to this Room.
+ */
+private final Object syncObj = new Object();
+
+/**
+ * Indicates if this room has already been shutdown.
+ */
+private volatile boolean closed = false;
/**
* If true, outgoing DrawMessages will be buffered until the
@@ -99,13 +102,6 @@ public final class Room {
private static final boolean BUFFER_DRAW_MESSAGES = true;
/**
- * A single-threaded ExecutorService where tasks
- * are scheduled that are to be run in the Room Thread.
- */
-private final ExecutorService roomExecutor =
-Executors.newSingleThreadExecutor();
-
-/**
* A timer which sends buffered drawmessages to the client at once
* at a regular interval, to avoid sending a lot of very small
* messages which would cause TCP overhead and high CPU usage.
@@ -147,16 +143,12 @@ public final class Room {
drawmessageBroadcastTimer.schedule(new TimerTask() {
@Override
public void run() {
-try {
-invokeAndWait(new Runnable() {
-@Override
-public void run() {
-broadcastTimerTick();
-}
-});
-} catch (InterruptedException | ExecutionException e) {
-// TODO
-}
+invokeAndWait(new Runnable() {
+@Override
+publi
Re: Tagging 7.0.46
On 15/10/2013 16:10, Konstantin Preißer wrote: > Mark, > >> -Original Message- >> From: Mark Thomas [mailto:ma...@apache.org] >> Sent: Tuesday, October 15, 2013 4:59 PM >> To: Tomcat Developers List >> Subject: Re: Tagging 7.0.46 > Yes, I can reproduce 1) "java.io.IOException: Unexpected error [20,014] reading data from the APR/native" when drawing very fast on the drawboard with Firefox, 2) "java.lang.IllegalArgumentException at java.nio.Buffer.position(Buffer.java:236)" after drawing and pressing F5 >> so that a PNG image is sent to the browser, and 3) Crash in msvcrt.dll+0x122a at the same conditions of 2) > > >> I've just committed a fix that doesn't deal with the Exceptions but >> appears to have addressed the crash. Could you check? It might just be >> that I haven't managed to trigger the crash yet. > > Thank you. > Yes, I cannot reproduce 2) and 3) anymore, i.e. no crash occurs. > The only one which I still get is 1). Great. Just need to figure out of that is an error message that needs to be swallowed or if it is indicative of a wider problem. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Serving gz files in DefaultServlet (Re: r1531115, BZ 54095)
Konstantin,
On 10/15/13 7:15 AM, Konstantin Kolinko wrote:
> 2013/10/13 Mark Thomas :
>> On 13/10/2013 14:11, Konstantin Kolinko wrote:
>>
>>
>>
URL: http://svn.apache.org/r1531115
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54095
Add support to the Default Servlet for serving gzipped versions of static
resources directly from disk as an alternative to Tomcat compressing them
on each request. Patch by Philippe Marschall.
>>
>>
>>
>>> General:
>>> I think this feature should be opt-in, like the listings feature of
>>> DefaultServlet, being off by default.
>>
>> I disagree since:
>> - this is only in 8.0.x and we haven't had a stable release yet.
>> - the user has to create the gzip'd version which is unlikely to exist
>> be default before this feature does anything
>>
>> I agree if it is ever back-ported to earlier versions it needs to be
>> disabled by default.
>>
>
> My concern is that this feature is not stated by Specification, and by
> default I think people should not expect this behaviour from "default"
> servlet. Thus I think it should be an opt-in feature.
>
>
> The files may already exist there for some other reasons. E.g. if an
> application uses a framework that implements this feature by itself
> independently of Tomcat.
>
>>> (2) Additional access path for ".gz" files, which might be not covered
>>> by security constraints
>>>
>
> E.g. if "foo.gz" is protected by a constraint and should not be served
> directly, it can now be accessed by asking for "foo". It only works
> if "foo" exists as well, so unlikely it causes anything, but this is
> an additional access path.
>
>>> (3) Interoperability with filters that may preprocess or postprocess
>>> the response,
>>> including ISE handling in the following lines of DefaultServlet:
>>>
>>> [[[
>>> try {
>>> ostream = response.getOutputStream();
>>> } catch (IllegalStateException e) {
>>> ...
>>> writer = response.getWriter();
>>> ]]]
>>
>> I've disabled the fall back for (3).
>>
>
> I'd be better to fallback to serving the original resource instead of
> failing. I agree that it is a rare case, though.
>
>>
>
> There is also a list of options for DefaultServlet just above its
> definition in conf/web.xml. It has not been updated.
>
>>
>
> Looking at how Apache HTTPD deals with this content negotiation feature,
>
> First,
> this feature is present by default (mod_negation is compiled in), but
> is turned off. To enable it you have to enable it with "Options
> MultiViews" directive on specific directory. Note that using "Options
> All" does not enable this feature, you have to enable it explicitly.
> [1][4]
>
> Second,
> Apache HTTPD goes to some length to prevent unwanted caching of these
> responses by proxies.
>
> "To prevent this, httpd normally marks all responses that are returned
> after content negotiation as non-cacheable by HTTP/1.0 clients" [1]
> It is configurable with directive "CacheNegotiatedDocs".
>
> For HTTP/1.1 clients it sends a "Vary" header, such as "Vary:
> Accept-Encoding". [1][3].
>
> [1] http://httpd.apache.org/docs/current/content-negotiation.html
> [2] http://httpd.apache.org/docs/current/mod/mod_negotiation.html
> [3] http://httpd.apache.org/docs/current/mod/mod_deflate.html
> [4] http://httpd.apache.org/docs/current/mod/core.html#options
It's also worth pointing out that what has been implemented for Tomcat
is a serious pain in the neck to do in httpd. Basically, to get it to
work as expected in httpd, you need several animal sacrifices and a fair
amount of arcane words to get it done. At this point, I have the animal
part done but my pronunciation must be off because I still don't have it
working properly.
That said, making it easy to do in Tomcat - while nice - is also a bit
dangerous given the previous arguments. I agree with the decision to
disable this by default... just wanted to add a "me too" voice in case
you wanted some more input, Mark.
Thanks,
-chris
signature.asc
Description: OpenPGP digital signature
svn commit: r1532421 - /tomcat/trunk/build.xml
Author: kpreisser
Date: Tue Oct 15 16:41:47 2013
New Revision: 1532421
URL: http://svn.apache.org/r1532421
Log:
All webapps/docs/*.html files are in UTF-8, as well as webapps/ROOT/index.jsp
and res/welcome.*.html.
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1532421&r1=1532420&r2=1532421&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Oct 15 16:41:47 2013
@@ -815,7 +815,7 @@
-
+
@@ -979,7 +979,7 @@
-
+
@@ -1942,12 +1942,12 @@ Apache Tomcat ${version} native binaries
+encoding="UTF-8">
+encoding="UTF-8">
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: [VOTE] Release Apache Tomcat 8.0.0-RC4
> -Original Message- > From: Mark Thomas [mailto:ma...@apache.org] > Sent: Tuesday, October 15, 2013 2:49 PM > To: Tomcat Developers List > Subject: [VOTE] Release Apache Tomcat 8.0.0-RC4 > > The proposed Apache Tomcat 8.0.0 release candidate 4 is now available > for voting. > > Given this is a release candidate I am working on the basis that it is > equivalent to an alpha. The main changes since RC3 are: > - Stability fixes in the APR/native connector > - Stability fixes for non-blocking IO and WebSocket > - Improvements to unit tests to reduce incidence of false reports > - Add a drawing board example to the WebSocket examples > - A handful of bug fixes > - A small number of enhancements including direct gzip support in the > default Servlet > - More HTML clean-up > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC4/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-176/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC4/ > > The proposed 8.0.0-RC4 release is: > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 8.0.0-RC4 alpha > > Cheers, > > Mark Note, that the documentation index.html included in the binaries says: "Apache Tomcat version @VERSION_MAJOR_MINOR@ implements the Servlet 3.1 and JavaServer Pages 2.3 specifications from the Java Community Process [...]" I guess this is because the XSLT And task does not have a "version.filters" filterset (and with r1527315 the explicit version number was replaced with the @VERSION_MAJOR_MINOR@ variable), but I don't know if it's possible to add a filter to the XSLT task (maybe one would need to copy the .xml files elsewhere for applying the filter and then start the XSLT task). Regards, Konstantin Preißer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532411 - in /tomcat/site/trunk: docs/getinvolved.html xdocs/getinvolved.xml
Author: kpreisser
Date: Tue Oct 15 16:17:00 2013
New Revision: 1532411
URL: http://svn.apache.org/r1532411
Log:
As per http://markmail.org/message/tmgi7glrjeubh37t the acceptable line length
for new code has been extended to 100 chars.
Modified:
tomcat/site/trunk/docs/getinvolved.html
tomcat/site/trunk/xdocs/getinvolved.xml
Modified: tomcat/site/trunk/docs/getinvolved.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/getinvolved.html?rev=1532411&r1=1532410&r2=1532411&view=diff
==
--- tomcat/site/trunk/docs/getinvolved.html (original)
+++ tomcat/site/trunk/docs/getinvolved.html Tue Oct 15 16:17:00 2013
@@ -274,7 +274,8 @@ Apache Tomcat has very loosely defined c
Use spaces for indenting, not tabs
-80 char line width
+100 char line width for Java source, 80 char line width for
+ documentation source (.txt, .xml)
Java source: { at end of line, 4 space indents
Modified: tomcat/site/trunk/xdocs/getinvolved.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/getinvolved.xml?rev=1532411&r1=1532410&r2=1532411&view=diff
==
--- tomcat/site/trunk/xdocs/getinvolved.xml (original)
+++ tomcat/site/trunk/xdocs/getinvolved.xml Tue Oct 15 16:17:00 2013
@@ -60,7 +60,8 @@ to learn how to create and submit patche
Apache Tomcat has very loosely defined coding conventions, but the following
guidelines will be useful:
Use spaces for indenting, not tabs
- 80 char line width
+ 100 char line width for Java source, 80 char line width for
+ documentation source (.txt, .xml)
Java source: { at end of line, 4 space indents
XML source: 2 space indents
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-243) Tomcat7 deploys, but doesn't start apps defined in
[ https://issues.apache.org/jira/browse/MTOMCAT-243?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13795343#comment-13795343 ] Neale Upstone commented on MTOMCAT-243: --- Aha. Got somewhere. AbstractRunMojo.addContextFromArtifact() makes use of asWebapp param when we're using Tomcat7, which is currently false in my setup. Setting it to true in the debugger has just given me working app. So, what's needed is to set true within each entry. Perhaps this should default to true?? > Tomcat7 deploys, but doesn't start apps defined in > > > Key: MTOMCAT-243 > URL: https://issues.apache.org/jira/browse/MTOMCAT-243 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Reporter: Neale Upstone > > Using the same config as with the tomcat6 plugin, I'm getting the > following with Tomcat 7: > [INFO] Deploying dependency wars > [INFO] Deploy warfile: > /home/neale/.m2/repository/blah/blah-war-1.0.0.CI-SNAPSHOT.war to > contextPath: /blah-war > Oct 15, 2013 2:28:53 PM org.apache.coyote.AbstractProtocol init > INFO: Initializing ProtocolHandler ["http-bio-8082"] > Oct 15, 2013 2:28:53 PM org.apache.catalina.core.StandardService startInternal > INFO: Starting service Tomcat > Oct 15, 2013 2:28:59 PM org.apache.catalina.core.ApplicationContext log > INFO: No Spring WebApplicationInitializer types detected on classpath > Oct 15, 2013 2:28:59 PM org.apache.coyote.AbstractProtocol start > Yet this works if I run from the WAR project using run-war. > The "No Spring WebApplicationInitializer" initially caught my eye, but is > actually the default informational message emitted when run in a 3.0 > container. -- This message was sent by Atlassian JIRA (v6.1#6144) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-241) Documentation needed for config element
[
https://issues.apache.org/jira/browse/MTOMCAT-241?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13795342#comment-13795342
]
Neale Upstone commented on MTOMCAT-241:
---
May be worth clarifying what asWebapp is for somewhere too as this is the issue
in MTOMCAT-243 for Tomcat 7.
> Documentation needed for config element
> -
>
> Key: MTOMCAT-241
> URL: https://issues.apache.org/jira/browse/MTOMCAT-241
> Project: Apache Tomcat Maven Plugin
> Issue Type: Documentation
> Components: tomcat6, tomcat7
>Reporter: Neale Upstone
>Assignee: Olivier Lamy (*$^¨%`£)
>
> The following could/should be the documentation for the two
> AbstractRunMojo.webapps fields, so that documentation is more useful to end
> users.
> {code:java}
> /**
> * Collection of webapp artifacts to be deployed. Elements are
> and contain
> * usual GAVC plus contextPath and/or contextFile elements.
> * @see {@link Webapp}
> * @since 2.0
> */
> @Parameter
> private List webapps;
> {code}
--
This message was sent by Atlassian JIRA
(v6.1#6144)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-243) Tomcat7 deploys, but doesn't start apps defined in
[ https://issues.apache.org/jira/browse/MTOMCAT-243?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13795318#comment-13795318 ] Neale Upstone commented on MTOMCAT-243: --- The above log traces indicate that the WAR is at the very least getting scanned by the Tomcat container, at which point I would expect there to be no difference between running from a WAR project and running with . A bit baffled, but will investigate further. > Tomcat7 deploys, but doesn't start apps defined in > > > Key: MTOMCAT-243 > URL: https://issues.apache.org/jira/browse/MTOMCAT-243 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Reporter: Neale Upstone > > Using the same config as with the tomcat6 plugin, I'm getting the > following with Tomcat 7: > [INFO] Deploying dependency wars > [INFO] Deploy warfile: > /home/neale/.m2/repository/blah/blah-war-1.0.0.CI-SNAPSHOT.war to > contextPath: /blah-war > Oct 15, 2013 2:28:53 PM org.apache.coyote.AbstractProtocol init > INFO: Initializing ProtocolHandler ["http-bio-8082"] > Oct 15, 2013 2:28:53 PM org.apache.catalina.core.StandardService startInternal > INFO: Starting service Tomcat > Oct 15, 2013 2:28:59 PM org.apache.catalina.core.ApplicationContext log > INFO: No Spring WebApplicationInitializer types detected on classpath > Oct 15, 2013 2:28:59 PM org.apache.coyote.AbstractProtocol start > Yet this works if I run from the WAR project using run-war. > The "No Spring WebApplicationInitializer" initially caught my eye, but is > actually the default informational message emitted when run in a 3.0 > container. -- This message was sent by Atlassian JIRA (v6.1#6144) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-243) Tomcat7 deploys, but doesn't start apps defined in
[ https://issues.apache.org/jira/browse/MTOMCAT-243?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Neale Upstone updated MTOMCAT-243: -- Summary: Tomcat7 deploys, but doesn't start apps defined in (was: Tomcat7 deploys, but doesn't start webapp 2.5 apps defined in ) > Tomcat7 deploys, but doesn't start apps defined in > > > Key: MTOMCAT-243 > URL: https://issues.apache.org/jira/browse/MTOMCAT-243 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Reporter: Neale Upstone > > Using the same config as with the tomcat6 plugin, I'm getting the > following with Tomcat 7: > [INFO] Deploying dependency wars > [INFO] Deploy warfile: > /home/neale/.m2/repository/blah/blah-war-1.0.0.CI-SNAPSHOT.war to > contextPath: /blah-war > Oct 15, 2013 2:28:53 PM org.apache.coyote.AbstractProtocol init > INFO: Initializing ProtocolHandler ["http-bio-8082"] > Oct 15, 2013 2:28:53 PM org.apache.catalina.core.StandardService startInternal > INFO: Starting service Tomcat > Oct 15, 2013 2:28:59 PM org.apache.catalina.core.ApplicationContext log > INFO: No Spring WebApplicationInitializer types detected on classpath > Oct 15, 2013 2:28:59 PM org.apache.coyote.AbstractProtocol start > Yet this works if I run from the WAR project using run-war. > The "No Spring WebApplicationInitializer" initially caught my eye, but is > actually the default informational message emitted when run in a 3.0 > container. -- This message was sent by Atlassian JIRA (v6.1#6144) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-227) Can't use slf4j-jcl with tomcat7:run
[ https://issues.apache.org/jira/browse/MTOMCAT-227?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13795304#comment-13795304 ] Tony Chemit commented on MTOMCAT-227: - Awesome :) thanks Neale. > Can't use slf4j-jcl with tomcat7:run > > > Key: MTOMCAT-227 > URL: https://issues.apache.org/jira/browse/MTOMCAT-227 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.1 >Reporter: Tony Chemit >Assignee: Olivier Lamy (*$^¨%`£) > Attachments: MTOMCAT-227.tgz > > > I use in my war the slf4j-jcl, which is not compatible with the > jcl-over-slf4j used in the plugin dependencies. > I give you a little project that show the problem. -- This message was sent by Atlassian JIRA (v6.1#6144) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5113 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1532349 Blamelist: markt Build succeeded! sincerely, -The Buildbot
[jira] [Commented] (MTOMCAT-227) Can't use slf4j-jcl with tomcat7:run
[ https://issues.apache.org/jira/browse/MTOMCAT-227?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13795284#comment-13795284 ] Neale Upstone commented on MTOMCAT-227: --- Hi Tony, I just spotted this one. The following option added to the configuration will sort out your problem: true > Can't use slf4j-jcl with tomcat7:run > > > Key: MTOMCAT-227 > URL: https://issues.apache.org/jira/browse/MTOMCAT-227 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.1 >Reporter: Tony Chemit >Assignee: Olivier Lamy (*$^¨%`£) > Attachments: MTOMCAT-227.tgz > > > I use in my war the slf4j-jcl, which is not compatible with the > jcl-over-slf4j used in the plugin dependencies. > I give you a little project that show the problem. -- This message was sent by Atlassian JIRA (v6.1#6144) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-243) Tomcat7 deploys, but doesn't start webapp 2.5 apps defined in
[
https://issues.apache.org/jira/browse/MTOMCAT-243?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Neale Upstone updated MTOMCAT-243:
--
Description:
Using the same config as with the tomcat6 plugin, I'm getting the
following with Tomcat 7:
[INFO] Deploying dependency wars
[INFO] Deploy warfile:
/home/neale/.m2/repository/blah/blah-war-1.0.0.CI-SNAPSHOT.war to contextPath:
/blah-war
Oct 15, 2013 2:28:53 PM org.apache.coyote.AbstractProtocol init
INFO: Initializing ProtocolHandler ["http-bio-8082"]
Oct 15, 2013 2:28:53 PM org.apache.catalina.core.StandardService startInternal
INFO: Starting service Tomcat
Oct 15, 2013 2:28:59 PM org.apache.catalina.core.ApplicationContext log
INFO: No Spring WebApplicationInitializer types detected on classpath
Oct 15, 2013 2:28:59 PM org.apache.coyote.AbstractProtocol start
Yet this works if I run from the WAR project using run-war.
The "No Spring WebApplicationInitializer" initially caught my eye, but is
actually the default informational message emitted when run in a 3.0 container.
was:
Using the same config as with the tomcat6 plugin, I'm getting the
following with Tomcat 7:
{noformat}
[INFO] Deploying dependency wars
[INFO] Deploy warfile:
/home/neale/.m2/repository/blah/blah-war-1.0.0.CI-SNAPSHOT.war to contextPath:
/blah-war
Oct 15, 2013 2:28:53 PM org.apache.coyote.AbstractProtocol init
INFO: Initializing ProtocolHandler ["http-bio-8082"]
Oct 15, 2013 2:28:53 PM org.apache.catalina.core.StandardService startInternal
INFO: Starting service Tomcat
Oct 15, 2013 2:28:59 PM org.apache.catalina.core.ApplicationContext log
INFO: No Spring WebApplicationInitializer types detected on classpath
Oct 15, 2013 2:28:59 PM org.apache.coyote.AbstractProtocol start
{noformat}
Yet this works if I run from the WAR project using run-war.
The "No Spring WebApplicationInitializer" log message would seem to indicate
that the WAR is being treated as a 3.0 version webapp and calling the Spring
entry point.
> Tomcat7 deploys, but doesn't start webapp 2.5 apps defined in
> ---
>
> Key: MTOMCAT-243
> URL: https://issues.apache.org/jira/browse/MTOMCAT-243
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
>Reporter: Neale Upstone
>
> Using the same config as with the tomcat6 plugin, I'm getting the
> following with Tomcat 7:
> [INFO] Deploying dependency wars
> [INFO] Deploy warfile:
> /home/neale/.m2/repository/blah/blah-war-1.0.0.CI-SNAPSHOT.war to
> contextPath: /blah-war
> Oct 15, 2013 2:28:53 PM org.apache.coyote.AbstractProtocol init
> INFO: Initializing ProtocolHandler ["http-bio-8082"]
> Oct 15, 2013 2:28:53 PM org.apache.catalina.core.StandardService startInternal
> INFO: Starting service Tomcat
> Oct 15, 2013 2:28:59 PM org.apache.catalina.core.ApplicationContext log
> INFO: No Spring WebApplicationInitializer types detected on classpath
> Oct 15, 2013 2:28:59 PM org.apache.coyote.AbstractProtocol start
> Yet this works if I run from the WAR project using run-war.
> The "No Spring WebApplicationInitializer" initially caught my eye, but is
> actually the default informational message emitted when run in a 3.0
> container.
--
This message was sent by Atlassian JIRA
(v6.1#6144)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: Tagging 7.0.46
Mark, > -Original Message- > From: Mark Thomas [mailto:ma...@apache.org] > Sent: Tuesday, October 15, 2013 4:59 PM > To: Tomcat Developers List > Subject: Re: Tagging 7.0.46 > >> Yes, I can reproduce > >> 1) "java.io.IOException: Unexpected error [20,014] reading data from the > >> APR/native" when drawing very fast on the drawboard with Firefox, > >> 2) "java.lang.IllegalArgumentException at > >> java.nio.Buffer.position(Buffer.java:236)" after drawing and pressing F5 > so > >> that a PNG image is sent to the browser, and > >> 3) Crash in msvcrt.dll+0x122a at the same conditions of 2) > I've just committed a fix that doesn't deal with the Exceptions but > appears to have addressed the crash. Could you check? It might just be > that I haven't managed to trigger the crash yet. Thank you. Yes, I cannot reproduce 2) and 3) anymore, i.e. no crash occurs. The only one which I still get is 1). Regards, Konstantin Preißer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-242) Documentation needed for config element
[
https://issues.apache.org/jira/browse/MTOMCAT-242?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Neale Upstone closed MTOMCAT-242.
-
Resolution: Duplicate
Dupl due to JIRA AJAX it would seem
> Documentation needed for config element
> -
>
> Key: MTOMCAT-242
> URL: https://issues.apache.org/jira/browse/MTOMCAT-242
> Project: Apache Tomcat Maven Plugin
> Issue Type: Documentation
> Components: tomcat6, tomcat7
>Reporter: Neale Upstone
>Assignee: Olivier Lamy (*$^¨%`£)
>
> The following could/should be the documentation for the two
> AbstractRunMojo.webapps fields, so that documentation is more useful to end
> users.
> {code:java}
> /**
> * Collection of webapp artifacts to be deployed. Elements are
> and contain
> * usual GAVC plus contextPath and/or contextFile elements.
> * @see {@link Webapp}
> * @since 2.0
> */
> @Parameter
> private List webapps;
> {code}
--
This message was sent by Atlassian JIRA
(v6.1#6144)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 7.0.46
On 15/10/2013 15:51, Konstantin Preißer wrote: > > >> -Original Message- >> From: Konstantin Preißer [mailto:kpreis...@apache.org] >> Sent: Tuesday, October 15, 2013 4:47 PM >> To: 'Tomcat Developers List' >> Subject: RE: Tagging 7.0.46 >> >> Hi Mark, >> >>> -Original Message- >>> From: Mark Thomas [mailto:ma...@apache.org] >>> Sent: Tuesday, October 15, 2013 4:22 PM >>> To: Tomcat Developers List >>> Subject: Re: Tagging 7.0.46 >>> >>> On 15/10/2013 14:28, Konstantin Preißer wrote: Hi, > -Original Message- > From: Mark Thomas [mailto:ma...@apache.org] > Sent: Tuesday, October 15, 2013 1:37 PM > Thanks. I've finished now. > > Mark Note, that the crash and the exceptions I reported in [1] are still >>> reproducible in current 7.0.x trunk (r1532288) when using a HTTP-APR-SSL >>> connector with Native 1.1.29 and playing with the Drawboard Websocket >>> example (they do not occur with a non-SSL HTTP-APR connector). Might this need to be fixed before tagging? Should I open a bug report >> for >>> it? >>> >>> Do you see the same issue with 8.0.x trunk? >> >> Yes, I can reproduce >> 1) "java.io.IOException: Unexpected error [20,014] reading data from the >> APR/native" when drawing very fast on the drawboard with Firefox, >> 2) "java.lang.IllegalArgumentException at >> java.nio.Buffer.position(Buffer.java:236)" after drawing and pressing F5 so >> that a PNG image is sent to the browser, and >> 3) Crash in msvcrt.dll+0x122a at the same conditions of 2) >> >> with current 8.0.x trunk, and 2)+3) with 7.0.x trunk with a APR HTTP SSL >> connector. >> (1 is a bit hard to reproduce on my machine so maybe I need to try a bit >> longer to reproduce it). > > OK, a few minutes after I was writing this I was also able to reproduce 1) on > 7.0.x trunk. Lets concentrate on 8.0.x for now. I've just committed a fix that doesn't deal with the Exceptions but appears to have addressed the crash. Could you check? It might just be that I haven't managed to trigger the crash yet. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532374 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
Author: markt
Date: Tue Oct 15 14:58:10 2013
New Revision: 1532374
URL: http://svn.apache.org/r1532374
Log:
Use correct limits when writing SSL data
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1532373
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java?rev=1532374&r1=1532373&r2=1532374&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
Tue Oct 15 14:58:10 2013
@@ -124,7 +124,8 @@ public class AprServletOutputStream exte
// APR + SSL requires that exactly the same parameters are
// passed when re-attempting the write
}
-written = Socket.sendb(socket, sslOutputBuffer, start, left);
+written = Socket.sendb(socket, sslOutputBuffer,
+sslOutputBuffer.position(), sslOutputBuffer.limit());
if (written > 0) {
sslOutputBuffer.position(
sslOutputBuffer.position() + written);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532373 - /tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
Author: markt
Date: Tue Oct 15 14:57:40 2013
New Revision: 1532373
URL: http://svn.apache.org/r1532373
Log:
Use correct limits when writing SSL data
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java?rev=1532373&r1=1532372&r2=1532373&view=diff
==
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
Tue Oct 15 14:57:40 2013
@@ -124,7 +124,8 @@ public class AprServletOutputStream exte
// APR + SSL requires that exactly the same parameters are
// passed when re-attempting the write
}
-written = Socket.sendb(socket, sslOutputBuffer, start, left);
+written = Socket.sendb(socket, sslOutputBuffer,
+sslOutputBuffer.position(), sslOutputBuffer.limit());
if (written > 0) {
sslOutputBuffer.position(
sslOutputBuffer.position() + written);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: Tagging 7.0.46
> -Original Message- > From: Konstantin Preißer [mailto:kpreis...@apache.org] > Sent: Tuesday, October 15, 2013 4:47 PM > To: 'Tomcat Developers List' > Subject: RE: Tagging 7.0.46 > > Hi Mark, > > > -Original Message- > > From: Mark Thomas [mailto:ma...@apache.org] > > Sent: Tuesday, October 15, 2013 4:22 PM > > To: Tomcat Developers List > > Subject: Re: Tagging 7.0.46 > > > > On 15/10/2013 14:28, Konstantin Preißer wrote: > > > Hi, > > > > > >> -Original Message- > > >> From: Mark Thomas [mailto:ma...@apache.org] > > >> Sent: Tuesday, October 15, 2013 1:37 PM > > > > > >> Thanks. I've finished now. > > >> > > >> Mark > > > > > > Note, that the crash and the exceptions I reported in [1] are still > > reproducible in current 7.0.x trunk (r1532288) when using a HTTP-APR-SSL > > connector with Native 1.1.29 and playing with the Drawboard Websocket > > example (they do not occur with a non-SSL HTTP-APR connector). > > > Might this need to be fixed before tagging? Should I open a bug report > for > > it? > > > > Do you see the same issue with 8.0.x trunk? > > Yes, I can reproduce > 1) "java.io.IOException: Unexpected error [20,014] reading data from the > APR/native" when drawing very fast on the drawboard with Firefox, > 2) "java.lang.IllegalArgumentException at > java.nio.Buffer.position(Buffer.java:236)" after drawing and pressing F5 so > that a PNG image is sent to the browser, and > 3) Crash in msvcrt.dll+0x122a at the same conditions of 2) > > with current 8.0.x trunk, and 2)+3) with 7.0.x trunk with a APR HTTP SSL > connector. > (1 is a bit hard to reproduce on my machine so maybe I need to try a bit > longer to reproduce it). OK, a few minutes after I was writing this I was also able to reproduce 1) on 7.0.x trunk. Regards, Konstantin Preißer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 7.0.46
On 15/10/2013 15:46, Konstantin Preißer wrote: > Hi Mark, > >> -Original Message- >> From: Mark Thomas [mailto:ma...@apache.org] >> Sent: Tuesday, October 15, 2013 4:22 PM >> To: Tomcat Developers List >> Subject: Re: Tagging 7.0.46 >> >> On 15/10/2013 14:28, Konstantin Preißer wrote: >>> Hi, >>> -Original Message- From: Mark Thomas [mailto:ma...@apache.org] Sent: Tuesday, October 15, 2013 1:37 PM >>> Thanks. I've finished now. Mark >>> >>> Note, that the crash and the exceptions I reported in [1] are still >> reproducible in current 7.0.x trunk (r1532288) when using a HTTP-APR-SSL >> connector with Native 1.1.29 and playing with the Drawboard Websocket >> example (they do not occur with a non-SSL HTTP-APR connector). >>> Might this need to be fixed before tagging? Should I open a bug report for >> it? >> >> Do you see the same issue with 8.0.x trunk? > > Yes, I can reproduce > 1) "java.io.IOException: Unexpected error [20,014] reading data from the > APR/native" when drawing very fast on the drawboard with Firefox, > 2) "java.lang.IllegalArgumentException at > java.nio.Buffer.position(Buffer.java:236)" after drawing and pressing F5 so > that a PNG image is sent to the browser, and > 3) Crash in msvcrt.dll+0x122a at the same conditions of 2) > > with current 8.0.x trunk, and 2)+3) with 7.0.x trunk with a APR HTTP SSL > connector. > (1 is a bit hard to reproduce on my machine so maybe I need to try a bit > longer to reproduce it). I've just managed to reproduce 1) on 8.0.x trunk as well followed by a crash. I'm investigating now. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-243) Tomcat7 deploys, but doesn't start webapp 2.5 apps defined in
Neale Upstone created MTOMCAT-243:
-
Summary: Tomcat7 deploys, but doesn't start webapp 2.5 apps
defined in
Key: MTOMCAT-243
URL: https://issues.apache.org/jira/browse/MTOMCAT-243
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Reporter: Neale Upstone
Using the same config as with the tomcat6 plugin, I'm getting the
following with Tomcat 7:
{noformat}
[INFO] Deploying dependency wars
[INFO] Deploy warfile:
/home/neale/.m2/repository/blah/blah-war-1.0.0.CI-SNAPSHOT.war to contextPath:
/blah-war
Oct 15, 2013 2:28:53 PM org.apache.coyote.AbstractProtocol init
INFO: Initializing ProtocolHandler ["http-bio-8082"]
Oct 15, 2013 2:28:53 PM org.apache.catalina.core.StandardService startInternal
INFO: Starting service Tomcat
Oct 15, 2013 2:28:59 PM org.apache.catalina.core.ApplicationContext log
INFO: No Spring WebApplicationInitializer types detected on classpath
Oct 15, 2013 2:28:59 PM org.apache.coyote.AbstractProtocol start
{noformat}
Yet this works if I run from the WAR project using run-war.
The "No Spring WebApplicationInitializer" log message would seem to indicate
that the WAR is being treated as a 3.0 version webapp and calling the Spring
entry point.
--
This message was sent by Atlassian JIRA
(v6.1#6144)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: Tagging 7.0.46
Hi Mark, > -Original Message- > From: Mark Thomas [mailto:ma...@apache.org] > Sent: Tuesday, October 15, 2013 4:22 PM > To: Tomcat Developers List > Subject: Re: Tagging 7.0.46 > > On 15/10/2013 14:28, Konstantin Preißer wrote: > > Hi, > > > >> -Original Message- > >> From: Mark Thomas [mailto:ma...@apache.org] > >> Sent: Tuesday, October 15, 2013 1:37 PM > > > >> Thanks. I've finished now. > >> > >> Mark > > > > Note, that the crash and the exceptions I reported in [1] are still > reproducible in current 7.0.x trunk (r1532288) when using a HTTP-APR-SSL > connector with Native 1.1.29 and playing with the Drawboard Websocket > example (they do not occur with a non-SSL HTTP-APR connector). > > Might this need to be fixed before tagging? Should I open a bug report for > it? > > Do you see the same issue with 8.0.x trunk? Yes, I can reproduce 1) "java.io.IOException: Unexpected error [20,014] reading data from the APR/native" when drawing very fast on the drawboard with Firefox, 2) "java.lang.IllegalArgumentException at java.nio.Buffer.position(Buffer.java:236)" after drawing and pressing F5 so that a PNG image is sent to the browser, and 3) Crash in msvcrt.dll+0x122a at the same conditions of 2) with current 8.0.x trunk, and 2)+3) with 7.0.x trunk with a APR HTTP SSL connector. (1 is a bit hard to reproduce on my machine so maybe I need to try a bit longer to reproduce it). Regards, Konstantin Preißer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.0-RC4
On Oct 15, 2013, at 8:48 AM, Mark Thomas wrote:
> The proposed Apache Tomcat 8.0.0 release candidate 4 is now available
> for voting.
>
> Given this is a release candidate I am working on the basis that it is
> equivalent to an alpha. The main changes since RC3 are:
> - Stability fixes in the APR/native connector
> - Stability fixes for non-blocking IO and WebSocket
> - Improvements to unit tests to reduce incidence of false reports
> - Add a drawing board example to the WebSocket examples
> - A handful of bug fixes
> - A small number of enhancements including direct gzip support in the
> default Servlet
> - More HTML clean-up
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC4/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-176/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC4/
>
> The proposed 8.0.0-RC4 release is:
> [ ] Broken - do not release
> [ ] Alpha - go ahead and release as 8.0.0-RC4 alpha
>
> Cheers,
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
Tested a couple apps that I have and everything worked OK for me. One note
though, there are some errors with the examples when I run with the security
manager enabled.
Here are the steps to replicate the issues:
1.) Downloaded Tomcat 8.0.0-RC4 and unzip.
2.) Run "./bin/catalina.sh start -security".
Here are the errors:
1.) On startup, you'll see this error. Adding the permission that is listed in
the stack trace allows the server to start without any errors.
15-Oct-2013 10:05:18.699 SEVERE [localhost-startStop-1]
org.apache.catalina.core.ContainerBase.addChildInternal ContainerBase.addChild:
start:
org.apache.catalina.LifecycleException: Failed to start component
[StandardEngine[Catalina].StandardHost[localhost].StandardContext[/examples]]
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:154)
at
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:726)
at
org.apache.catalina.core.ContainerBase.access$000(ContainerBase.java:130)
at
org.apache.catalina.core.ContainerBase$PrivilegedAddChild.run(ContainerBase.java:152)
at
org.apache.catalina.core.ContainerBase$PrivilegedAddChild.run(ContainerBase.java:142)
at java.security.AccessController.doPrivileged(Native Method)
at
org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:700)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:698)
at
org.apache.catalina.startup.HostConfig.deployDirectory(HostConfig.java:1119)
at
org.apache.catalina.startup.HostConfig$DeployDirectory.run(HostConfig.java:1760)
at
java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: java.security.AccessControlException: access denied
("java.lang.RuntimePermission"
"accessClassInPackage.org.apache.tomcat.websocket.server")
at
java.security.AccessControlContext.checkPermission(AccessControlContext.java:372)
at
java.security.AccessController.checkPermission(AccessController.java:559)
at java.lang.SecurityManager.checkPermission(SecurityManager.java:549)
at
java.lang.SecurityManager.checkPackageAccess(SecurityManager.java:1529)
at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:305)
at java.lang.ClassLoader.loadClass(ClassLoader.java:411)
at java.lang.ClassLoader.loadClass(ClassLoader.java:357)
at java.lang.Class.forName0(Native Method)
at java.lang.Class.forName(Class.java:190)
at
javax.websocket.server.ServerEndpointConfig$Configurator.loadDefault(ServerEndpointConfig.java:174)
at
javax.websocket.server.ServerEndpointConfig$Configurator.fetchContainerDefaultConfigurator(ServerEndpointConfig.java:151)
at
javax.websocket.server.ServerEndpointConfig$Builder.(ServerEndpointConfig.java:68)
at
javax.websocket.server.ServerEndpointConfig$Builder.create(ServerEndpointConfig.java:56)
at websocket.ExamplesConfig.getEndpointConfigs(ExamplesConfig.java:38)
at org.apache.tomcat.websocket.server.WsSci.onStartup(WsSci.java:99)
at
org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5265)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
... 14 more
2.) After resolving #1, you'll see this error when you access one of the web
socket examples and the example
Re: Tagging 7.0.46
On 15/10/2013 14:28, Konstantin Preißer wrote: > Hi, > >> -Original Message- >> From: Mark Thomas [mailto:ma...@apache.org] >> Sent: Tuesday, October 15, 2013 1:37 PM > >> Thanks. I've finished now. >> >> Mark > > Note, that the crash and the exceptions I reported in [1] are still > reproducible in current 7.0.x trunk (r1532288) when using a HTTP-APR-SSL > connector with Native 1.1.29 and playing with the Drawboard Websocket example > (they do not occur with a non-SSL HTTP-APR connector). > Might this need to be fixed before tagging? Should I open a bug report for it? Do you see the same issue with 8.0.x trunk? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532349 - /tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
Author: markt
Date: Tue Oct 15 14:19:09 2013
New Revision: 1532349
URL: http://svn.apache.org/r1532349
Log:
Fix gzip test for default Servlet after it was disabled by default
Modified:
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1532349&r1=1532348&r2=1532349&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Tue
Oct 15 14:19:09 2013
@@ -39,6 +39,8 @@ import org.junit.Test;
import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
+import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
import org.apache.catalina.startup.SimpleHttpClient;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -96,8 +98,7 @@ public class TestDefaultServlet extends
Tomcat tomcat = getTomcatInstance();
-File appDir =
-new File("test/webapp");
+File appDir = new File("test/webapp");
File gzipIndex = new File(appDir, "index.html.gz");
long gzipSize = gzipIndex.length();
@@ -106,7 +107,13 @@ public class TestDefaultServlet extends
long indexSize = index.length();
// app dir is relative to server home
-tomcat.addWebapp(null, "", appDir.getAbsolutePath());
+Context ctxt = tomcat.addContext("", appDir.getAbsolutePath());
+Wrapper defaultServlet = Tomcat.addServlet(ctxt, "default",
+"org.apache.catalina.servlets.DefaultServlet");
+defaultServlet.addInitParameter("gzip", "true");
+ctxt.addServletMapping("/", "default");
+
+ctxt.addMimeMapping("html", "text/html");
tomcat.start();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-241) Documentation needed for config element
Neale Upstone created MTOMCAT-241:
-
Summary: Documentation needed for config element
Key: MTOMCAT-241
URL: https://issues.apache.org/jira/browse/MTOMCAT-241
Project: Apache Tomcat Maven Plugin
Issue Type: Documentation
Components: tomcat6, tomcat7
Reporter: Neale Upstone
Assignee: Olivier Lamy (*$^¨%`£)
The following could/should be the documentation for the two
AbstractRunMojo.webapps fields, so that documentation is more useful to end
users.
{code:java}
/**
* Collection of webapp artifacts to be deployed. Elements are
and contain
* usual GAVC plus contextPath and/or contextFile elements.
* @see {@link Webapp}
* @since 2.0
*/
@Parameter
private List webapps;
{code}
--
This message was sent by Atlassian JIRA
(v6.1#6144)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-242) Documentation needed for config element
Neale Upstone created MTOMCAT-242:
-
Summary: Documentation needed for config element
Key: MTOMCAT-242
URL: https://issues.apache.org/jira/browse/MTOMCAT-242
Project: Apache Tomcat Maven Plugin
Issue Type: Documentation
Components: tomcat6, tomcat7
Reporter: Neale Upstone
Assignee: Olivier Lamy (*$^¨%`£)
The following could/should be the documentation for the two
AbstractRunMojo.webapps fields, so that documentation is more useful to end
users.
{code:java}
/**
* Collection of webapp artifacts to be deployed. Elements are
and contain
* usual GAVC plus contextPath and/or contextFile elements.
* @see {@link Webapp}
* @since 2.0
*/
@Parameter
private List webapps;
{code}
--
This message was sent by Atlassian JIRA
(v6.1#6144)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat Native 1.1.29 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat Native 1.1.29 stable. Please refer to the change log for the list of changes: http://tomcat.apache.org/native-doc/miscellaneous/changelog.html Downloads: http://tomcat.apache.org/download-native.cgi The Apache Tomcat Native Library provides portable API for features not found in contemporary JDK's. It uses Apache Portable Runtime as operating system abstraction layer and OpenSSL for SSL networking and allows optimal performance in production environments. Thank you, -- The Apache Tomcat Team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532337 - in /tomcat/site/trunk/docs/native-doc: index.html miscellaneous/changelog.html miscellaneous/printer/changelog.html news/2013.html news/printer/2013.html printer/index.html
Author: mturk Date: Tue Oct 15 13:49:41 2013 New Revision: 1532337 URL: http://svn.apache.org/r1532337 Log: Publish native-doc Modified: tomcat/site/trunk/docs/native-doc/index.html tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html tomcat/site/trunk/docs/native-doc/news/2013.html tomcat/site/trunk/docs/native-doc/news/printer/2013.html tomcat/site/trunk/docs/native-doc/printer/index.html Modified: tomcat/site/trunk/docs/native-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1532337&r1=1532336&r2=1532337&view=diff == --- tomcat/site/trunk/docs/native-doc/index.html (original) +++ tomcat/site/trunk/docs/native-doc/index.html Tue Oct 15 13:49:41 2013 @@ -34,8 +34,8 @@ -16 September 2013 - TC-Native-1.1.28 released -The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.28 Stable. +15 October 2013 - TC-Native-1.1.29 released +The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.29 Stable. The sources and the binaries for selected platforms are available from the Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1532337&r1=1532336&r2=1532337&view=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Tue Oct 15 13:49:41 2013 @@ -6,6 +6,13 @@ It should contain fixes made only after December 19th 2007, when the new documentation project for Tomcat Native was started. +Changes between 1.1.28 and 1.1.29 + + + Change return code when removing a socket from a poller, that was + actually not in the poller from APR_SUCCESS to APR_NOTFOUND. (rjung) + + Changes between 1.1.27 and 1.1.28 @@ -27,6 +34,7 @@ http://issues.apache.org/bugzilla/show_bug.cgi?id=51813";>51813 Add NULL-checking for s->net to avoid SIGSEGV in situations where it appears a socket bas been recycled. + (schultz) Changes between 1.1.26 and 1.1.27 Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html?rev=1532337&r1=1532336&r2=1532337&view=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/printer/changelog.html Tue Oct 15 13:49:41 2013 @@ -5,6 +5,13 @@ It should contain fixes made only after December 19th 2007, when the new documentation project for Tomcat Native was started. +Changes between 1.1.28 and 1.1.29 + + + Change return code when removing a socket from a poller, that was + actually not in the poller from APR_SUCCESS to APR_NOTFOUND. (rjung) + + Changes between 1.1.27 and 1.1.28 @@ -26,6 +33,7 @@ http://issues.apache.org/bugzilla/show_bug.cgi?id=51813";>51813 Add NULL-checking for s->net to avoid SIGSEGV in situations where it appears a socket bas been recycled. + (schultz) Changes between 1.1.26 and 1.1.27 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=1532337&r1=1532336&r2=1532337&view=diff == --- tomcat/site/trunk/docs/native-doc/news/2013.html (original) +++ tomcat/site/trunk/docs/native-doc/news/2013.html Tue Oct 15 13:49:41 2013 @@ -1,6 +1,13 @@ 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 + +15 October - TC-Native-1.1.29 released + +The Apache Tomcat team is proud to announce the immediate availability +of Tomcat Native 1.1.29. This is a bug fixing release. + + 16 September - TC-Native-1.1.28 released 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=1532337&r1=1532336&r2=1532337&view=diff == --- tomcat/site/trunk/docs/native-doc/news/printer/2013.h
svn commit: r1532336 - in /tomcat/native/branches/1.1.x/xdocs: index.xml news/2013.xml
Author: mturk Date: Tue Oct 15 13:46:05 2013 New Revision: 1532336 URL: http://svn.apache.org/r1532336 Log: Add 1.1.29 release note Modified: tomcat/native/branches/1.1.x/xdocs/index.xml tomcat/native/branches/1.1.x/xdocs/news/2013.xml Modified: tomcat/native/branches/1.1.x/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/index.xml?rev=1532336&r1=1532335&r2=1532336&view=diff == --- tomcat/native/branches/1.1.x/xdocs/index.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/index.xml Tue Oct 15 13:46:05 2013 @@ -66,8 +66,8 @@ -16 September 2013 - TC-Native-1.1.28 released -The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.28 Stable. +15 October 2013 - TC-Native-1.1.29 released +The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.1.29 Stable. The sources and the binaries for selected platforms are available from the 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=1532336&r1=1532335&r2=1532336&view=diff == --- tomcat/native/branches/1.1.x/xdocs/news/2013.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/news/2013.xml Tue Oct 15 13:46:05 2013 @@ -31,6 +31,13 @@ + +15 October - TC-Native-1.1.29 released + +The Apache Tomcat team is proud to announce the immediate availability +of Tomcat Native 1.1.29. This is a bug fixing release. + + 16 September - TC-Native-1.1.28 released - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: Tagging 7.0.46
Hi, > -Original Message- > From: Mark Thomas [mailto:ma...@apache.org] > Sent: Tuesday, October 15, 2013 1:37 PM > Thanks. I've finished now. > > Mark Note, that the crash and the exceptions I reported in [1] are still reproducible in current 7.0.x trunk (r1532288) when using a HTTP-APR-SSL connector with Native 1.1.29 and playing with the Drawboard Websocket example (they do not occur with a non-SSL HTTP-APR connector). Might this need to be fixed before tagging? Should I open a bug report for it? Thanks, Konstantin Preißer [1] http://markmail.org/message/5xdj6lwdpafc3b45 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5112 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1532296 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[VOTE] Release Apache Tomcat 8.0.0-RC4
The proposed Apache Tomcat 8.0.0 release candidate 4 is now available for voting. Given this is a release candidate I am working on the basis that it is equivalent to an alpha. The main changes since RC3 are: - Stability fixes in the APR/native connector - Stability fixes for non-blocking IO and WebSocket - Improvements to unit tests to reduce incidence of false reports - Add a drawing board example to the WebSocket examples - A handful of bug fixes - A small number of enhancements including direct gzip support in the default Servlet - More HTML clean-up It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC4/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-176/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC4/ The proposed 8.0.0-RC4 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 8.0.0-RC4 alpha Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r3266 [2/2] - in /dev/tomcat/tomcat-8/v8.0.0-RC4: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-8/v8.0.0-RC4/src/apache-tomcat-8.0.0-RC4-src.tar.gz.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC4/src/apache-tomcat-8.0.0-RC4-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC4/src/apache-tomcat-8.0.0-RC4-src.tar.gz.md5 Tue Oct 15 12:30:39 2013 @@ -0,0 +1 @@ +4f848f91d3f66213f2b72681bfeeb802 *apache-tomcat-8.0.0-RC4-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.0-RC4/src/apache-tomcat-8.0.0-RC4-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.0-RC4/src/apache-tomcat-8.0.0-RC4-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.0-RC4/src/apache-tomcat-8.0.0-RC4-src.zip.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC4/src/apache-tomcat-8.0.0-RC4-src.zip.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC4/src/apache-tomcat-8.0.0-RC4-src.zip.asc Tue Oct 15 12:30:39 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSXTCIAAoJEBDAHFovYFnnKQgQANPY675Tq6UWnMycX66ve8lA +9Mu3dLsqMBe5IBEek92LJOsNUQfJQtF9Qrb11DQMTz5BqwQLdGDERtYciiGXyoZl +ZeFmslcxKStgC0Ciu4ilspZsJug6VnaZhADQ0oM/fASePIBc1PktfNHcaymcr0dY +LlS8Q7FVYiANgkUEtIV25cBNRzou/mmGYZP9vnPinGqmBNNNgXixk20O2MH2la4m +hE7bNkUpjqndwGdqSYWric/WBNMzHt+tF92wlPlPdUJ579mXqWu+CNg9aDNF5XvD +gQz0cnFeU3bQXmUPfWpv9chauhCZ/H5HPjh1uGowepWrY8PtGm3dRs2u/MLwFTe2 +vv8rdjJObBDGKatGyZ0+EdsVgZjeRBONY6zYPDBqky1NUAwbISPbKI6g27hbTb7g +VBKEfs5zgDn3zFycDH3f6HT+dj8lOpKk1LNYdJjxpK+7iQzm7ORrVyCdquThMrLz +XiAwzD89WlX/MnOwt3hhf/+qnvS6TqnZVUBRWIGE/8vZhyh5NpVhM7DM+9Omz0Ve +tThngjCFwqvPMyJruP06HO7BIrBF7qndbOYc7kLYIN8pUgjingqosmRTZphlKknF +xqNl317dNetKIW+fiFwOfJX1UjTB0wW7ZHeWSAP5ty5Y8xkyuVpFI+QY1SPUw4sE +1+78/qwSRUKD+MK9akA+ +=Ipg9 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC4/src/apache-tomcat-8.0.0-RC4-src.zip.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC4/src/apache-tomcat-8.0.0-RC4-src.zip.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC4/src/apache-tomcat-8.0.0-RC4-src.zip.md5 Tue Oct 15 12:30:39 2013 @@ -0,0 +1 @@ +c78908f54177bcd4b34ab4e5735535fd *apache-tomcat-8.0.0-RC4-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532300 - in /tomcat/tags/TOMCAT_8_0_0_RC4: ./ build.properties.default
Author: markt Date: Tue Oct 15 12:04:08 2013 New Revision: 1532300 URL: http://svn.apache.org/r1532300 Log: Tag 8.0.0-RC4 Added: tomcat/tags/TOMCAT_8_0_0_RC4/ - copied from r1532299, tomcat/trunk/ Modified: tomcat/tags/TOMCAT_8_0_0_RC4/build.properties.default Modified: tomcat/tags/TOMCAT_8_0_0_RC4/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_8_0_0_RC4/build.properties.default?rev=1532300&r1=1532299&r2=1532300&view=diff == --- tomcat/tags/TOMCAT_8_0_0_RC4/build.properties.default (original) +++ tomcat/tags/TOMCAT_8_0_0_RC4/build.properties.default Tue Oct 15 12:04:08 2013 @@ -29,7 +29,7 @@ version.major=8 version.minor=0 version.build=0 version.patch=0 -version.suffix=-dev +version.suffix=-RC4 # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532296 - in /tomcat/trunk: java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/default-servlet.xml
Author: markt Date: Tue Oct 15 11:57:48 2013 New Revision: 1532296 URL: http://svn.apache.org/r1532296 Log: Change the default for the new gzip option on the default Servlet to disabled. Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java tomcat/trunk/webapps/docs/default-servlet.xml Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1532296&r1=1532295&r2=1532296&view=diff == --- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Oct 15 11:57:48 2013 @@ -141,9 +141,9 @@ public class DefaultServlet /** - * Should be serve gzip versions of files. By default, it's set to true. + * Should be serve gzip versions of files. By default, it's set to false. */ -protected boolean gzip = true; +protected boolean gzip = false; /** Modified: tomcat/trunk/webapps/docs/default-servlet.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/default-servlet.xml?rev=1532296&r1=1532295&r2=1532296&view=diff == --- tomcat/trunk/webapps/docs/default-servlet.xml (original) +++ tomcat/trunk/webapps/docs/default-servlet.xml Tue Oct 15 11:57:48 2013 @@ -98,7 +98,7 @@ directory listings are disabled and debu If a gzipped version of a file exists (a file with .gz appended to the file name located alongside the original file), Tomcat will serve the gzipped file if the user agent supports gzip and this -option is enabled. [true] +option is enabled. [false] The file with the .gz extension will be accessible if requested directly so if the original resource is protected with a - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Serving gz files in DefaultServlet (Re: r1531115, BZ 54095)
I'm convinced. Default changed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 7.0.46
On 15/10/2013 11:39, Violeta Georgieva wrote: > 2013/10/15 Mark Thomas >> >> On 15/10/2013 09:12, Mark Thomas wrote: >>> On 15/10/2013 09:11, Violeta Georgieva wrote: Hi, I think to start preparing Tomcat 7.0.46 for voting later today. Please reply here if you need to include something in this release. >>> >>> I want to look at the WebSocket examples. I should be done in an hour or >>> two. >> >> The WebSocket fix was fairly quick. Confirming it with the unit tests is >> taking longer as I'm hitting an old issue with the unit tests. Given it >> is currently repeatable, I'd like to try and fix it once and for all. If >> you can give me a few more hours, great. > > Go :) > > Just tell me when you are ready. Thanks. I've finished now. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Serving gz files in DefaultServlet (Re: r1531115, BZ 54095)
2013/10/13 Mark Thomas :
> On 13/10/2013 14:11, Konstantin Kolinko wrote:
>
>
>
>>> URL: http://svn.apache.org/r1531115
>>> Log:
>>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54095
>>> Add support to the Default Servlet for serving gzipped versions of static
>>> resources directly from disk as an alternative to Tomcat compressing them
>>> on each request. Patch by Philippe Marschall.
>
>
>
>> General:
>> I think this feature should be opt-in, like the listings feature of
>> DefaultServlet, being off by default.
>
> I disagree since:
> - this is only in 8.0.x and we haven't had a stable release yet.
> - the user has to create the gzip'd version which is unlikely to exist
> be default before this feature does anything
>
> I agree if it is ever back-ported to earlier versions it needs to be
> disabled by default.
>
My concern is that this feature is not stated by Specification, and by
default I think people should not expect this behaviour from "default"
servlet. Thus I think it should be an opt-in feature.
The files may already exist there for some other reasons. E.g. if an
application uses a framework that implements this feature by itself
independently of Tomcat.
>> (2) Additional access path for ".gz" files, which might be not covered
>> by security constraints
>>
E.g. if "foo.gz" is protected by a constraint and should not be served
directly, it can now be accessed by asking for "foo". It only works
if "foo" exists as well, so unlikely it causes anything, but this is
an additional access path.
>> (3) Interoperability with filters that may preprocess or postprocess
>> the response,
>> including ISE handling in the following lines of DefaultServlet:
>>
>> [[[
>> try {
>> ostream = response.getOutputStream();
>> } catch (IllegalStateException e) {
>> ...
>> writer = response.getWriter();
>> ]]]
>
> I've disabled the fall back for (3).
>
I'd be better to fallback to serving the original resource instead of
failing. I agree that it is a rare case, though.
>
There is also a list of options for DefaultServlet just above its
definition in conf/web.xml. It has not been updated.
>
Looking at how Apache HTTPD deals with this content negotiation feature,
First,
this feature is present by default (mod_negation is compiled in), but
is turned off. To enable it you have to enable it with "Options
MultiViews" directive on specific directory. Note that using "Options
All" does not enable this feature, you have to enable it explicitly.
[1][4]
Second,
Apache HTTPD goes to some length to prevent unwanted caching of these
responses by proxies.
"To prevent this, httpd normally marks all responses that are returned
after content negotiation as non-cacheable by HTTP/1.0 clients" [1]
It is configurable with directive "CacheNegotiatedDocs".
For HTTP/1.1 clients it sends a "Vary" header, such as "Vary:
Accept-Encoding". [1][3].
[1] http://httpd.apache.org/docs/current/content-negotiation.html
[2] http://httpd.apache.org/docs/current/mod/mod_negotiation.html
[3] http://httpd.apache.org/docs/current/mod/mod_deflate.html
[4] http://httpd.apache.org/docs/current/mod/core.html#options
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532288 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/WEB-INF/classes/websocket/ webapps/examples/WEB-INF/classes/websocket/drawboard/ webapps/examples/WEB-INF/classes/websocket/echo/
Author: markt
Date: Tue Oct 15 11:07:03 2013
New Revision: 1532288
URL: http://svn.apache.org/r1532288
Log:
Refactor WebSocket examples to only require the SCI
Added:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
- copied, changed from r1532286,
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Removed:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/WsConfigListener.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1532286
Copied:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
(from r1532286,
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java?p2=tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java&p1=tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java&r1=1532286&r2=1532288&rev=1532288&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Tue Oct 15 11:07:03 2013
@@ -32,7 +32,7 @@ public class ExamplesConfig implements S
public Set getEndpointConfigs(
Set> scanned) {
-Set result = new HashSet<>();
+Set result = new HashSet();
if (scanned.contains(EchoEndpoint.class)) {
result.add(ServerEndpointConfig.Builder.create(
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java?rev=1532288&r1=1532287&r2=1532288&view=diff
==
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
Tue Oct 15 11:07:03 2013
@@ -24,7 +24,7 @@ import javax.websocket.MessageHandler;
import javax.websocket.RemoteEndpoint;
import javax.websocket.Session;
-public class EchoEndpoint extends Endpoint{
+public class EchoEndpoint extends Endpoint {
@Override
public void onOpen(Session session, EndpointConfig endpointConfig) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532286 - in /tomcat/trunk/webapps/examples/WEB-INF: classes/websocket/ExamplesConfig.java classes/websocket/drawboard/WsConfigListener.java classes/websocket/echo/EchoEndpoint.java class
Author: markt
Date: Tue Oct 15 11:01:08 2013
New Revision: 1532286
URL: http://svn.apache.org/r1532286
Log:
Refactor WebSocket examples to only require the SCI
Added:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
(with props)
Removed:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/WsConfigListener.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
tomcat/trunk/webapps/examples/WEB-INF/web.xml
Added:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java?rev=1532286&view=auto
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
(added)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Tue Oct 15 11:01:08 2013
@@ -0,0 +1,59 @@
+/*
+ * 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 websocket;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.websocket.Endpoint;
+import javax.websocket.server.ServerApplicationConfig;
+import javax.websocket.server.ServerEndpointConfig;
+
+import websocket.drawboard.DrawboardEndpoint;
+import websocket.echo.EchoEndpoint;
+
+public class ExamplesConfig implements ServerApplicationConfig {
+
+@Override
+public Set getEndpointConfigs(
+Set> scanned) {
+
+Set result = new HashSet<>();
+
+if (scanned.contains(EchoEndpoint.class)) {
+result.add(ServerEndpointConfig.Builder.create(
+EchoEndpoint.class,
+"/websocket/echoProgrammatic").build());
+}
+
+if (scanned.contains(DrawboardEndpoint.class)) {
+result.add(ServerEndpointConfig.Builder.create(
+DrawboardEndpoint.class,
+"/websocket/drawboard").build());
+}
+
+return result;
+}
+
+
+@Override
+public Set> getAnnotatedEndpointClasses(Set> scanned) {
+// Deploy all WebSocket endpoints defined by annotations in the
examples
+// web application.
+return scanned;
+}
+}
Propchange:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
--
svn:eol-style = native
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java?rev=1532286&r1=1532285&r2=1532286&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
Tue Oct 15 11:01:08 2013
@@ -25,7 +25,7 @@ import javax.websocket.MessageHandler;
import javax.websocket.RemoteEndpoint;
import javax.websocket.Session;
-public class EchoEndpoint extends Endpoint{
+public class EchoEndpoint extends Endpoint {
@Override
public void onOpen(Session session, EndpointConfig endpointConfig) {
Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=1532286&r1=1532285&r2=1532286&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Tue Oct 15 11:01:08 2013
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
version="3.1"
- metadata-complete="false">
+ metadata-complete="true">
Servlet and JSP Examples.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional
Re: Tagging 7.0.46
2013/10/15 Mark Thomas > > On 15/10/2013 09:12, Mark Thomas wrote: > > On 15/10/2013 09:11, Violeta Georgieva wrote: > >> Hi, > >> > >> I think to start preparing Tomcat 7.0.46 for voting later today. > >> > >> Please reply here if you need to include something in this release. > > > > I want to look at the WebSocket examples. I should be done in an hour or > > two. > > The WebSocket fix was fairly quick. Confirming it with the unit tests is > taking longer as I'm hitting an old issue with the unit tests. Given it > is currently repeatable, I'd like to try and fix it once and for all. If > you can give me a few more hours, great. Go :) Just tell me when you are ready. Vily
Re: Tagging 7.0.46
On 15/10/2013 09:12, Mark Thomas wrote: > On 15/10/2013 09:11, Violeta Georgieva wrote: >> Hi, >> >> I think to start preparing Tomcat 7.0.46 for voting later today. >> >> Please reply here if you need to include something in this release. > > I want to look at the WebSocket examples. I should be done in an hour or > two. The WebSocket fix was fairly quick. Confirming it with the unit tests is taking longer as I'm hitting an old issue with the unit tests. Given it is currently repeatable, I'd like to try and fix it once and for all. If you can give me a few more hours, great. If not, don't worry. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532270 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/cluster-howto.xml
Author: violetagg Date: Tue Oct 15 10:02:52 2013 New Revision: 1532270 URL: http://svn.apache.org/r1532270 Log: Merged revision 1532269 from tomcat/trunk: Fixed typo. Issue is reported via o.a.comments. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/cluster-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1532269 Modified: tomcat/tc7.0.x/trunk/webapps/docs/cluster-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/cluster-howto.xml?rev=1532270&r1=1532269&r2=1532270&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/cluster-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/cluster-howto.xml Tue Oct 15 10:02:52 2013 @@ -564,7 +564,7 @@ should be completed: TomcatA receives a request, invalidate is called on the session (S1) -The invalidate is call is intercepted, and the session is queued with invalidated sessions. +The invalidate call is intercepted, and the session is queued with invalidated sessions. When the request is complete, instead of sending out the session that has changed, it sends out an "expire" message to TomcatB and TomcatB will invalidate the session as well. @@ -577,9 +577,9 @@ should be completed: TomcatA The session S2 expires due to inactivity. -The invalidate is call is intercepted the same was as when a session is invalidated by the user, +The invalidate call is intercepted the same was as when a session is invalidated by the user, and the session is queued with invalidated sessions. - At this point, the invalidet session will not be replicated across until + At this point, the invalidated session will not be replicated across until another request comes through the system and checks the invalid queue. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1532269 - /tomcat/trunk/webapps/docs/cluster-howto.xml
Author: violetagg Date: Tue Oct 15 09:58:07 2013 New Revision: 1532269 URL: http://svn.apache.org/r1532269 Log: Fixed typo. Issue is reported via o.a.comments. Modified: tomcat/trunk/webapps/docs/cluster-howto.xml Modified: tomcat/trunk/webapps/docs/cluster-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cluster-howto.xml?rev=1532269&r1=1532268&r2=1532269&view=diff == --- tomcat/trunk/webapps/docs/cluster-howto.xml (original) +++ tomcat/trunk/webapps/docs/cluster-howto.xml Tue Oct 15 09:58:07 2013 @@ -538,7 +538,7 @@ should be completed: TomcatA receives a request, invalidate is called on the session (S1) -The invalidate is call is intercepted, and the session is queued with invalidated sessions. +The invalidate call is intercepted, and the session is queued with invalidated sessions. When the request is complete, instead of sending out the session that has changed, it sends out an "expire" message to TomcatB and TomcatB will invalidate the session as well. @@ -551,9 +551,9 @@ should be completed: TomcatA The session S2 expires due to inactivity. -The invalidate is call is intercepted the same was as when a session is invalidated by the user, +The invalidate call is intercepted the same was as when a session is invalidated by the user, and the session is queued with invalidated sessions. - At this point, the invalidet session will not be replicated across until + At this point, the invalidated session will not be replicated across until another request comes through the system and checks the invalid queue. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 7.0.46
On 15/10/2013 09:11, Violeta Georgieva wrote: > Hi, > > I think to start preparing Tomcat 7.0.46 for voting later today. > > Please reply here if you need to include something in this release. I want to look at the WebSocket examples. I should be done in an hour or two. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tagging 7.0.46
Hi, I think to start preparing Tomcat 7.0.46 for voting later today. Please reply here if you need to include something in this release. Regards Violeta
