buildbot success in ASF Buildbot on tomcat-7-trunk

2013-10-30 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-7-trunk/builds/1523

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1536975
Blamelist: kfujino

Build succeeded!

sincerely,
 -The Buildbot





[Bug 55722] can't receive the response header message from tomcat, network problems or tomcat (127.0.0.1:8009) is down (errno=11)

2013-10-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55722

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #1 from Mark Thomas  ---
Bugzilla is not a support forum. Please use the Tomcat users mailing list.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Apache Tomcat invalid Transfer-Encoding header request that prevents buffer recycling

2013-10-30 Thread Mark Thomas
On 30/10/2013 04:09, kanishk.se...@accenture.com wrote:
> Hi Team,
> 
> As per our security team we need to install the below patches on
> multiple servers to remove vulnerabilities.

This is a question for the users list, not the dev list.

You should read this:
http://www.catb.org/esr/faqs/smart-questions.html

before you post your question to the users list.

Mark


> Below is the information we have received from our security team,
> Need your support to have a detailed impact analysis on the
> compatibility of the below patches.
> 
> Apache Tomcat is a container for Java Servlet and Java Server Pages
> Web applications. Multiple vulnerabilities present in some versions
> of Apache Tomcat could lead to denial of service. Multiple flaws are
> present in Tomcat, which fails to handle invalid Transfer-Encoding
> header request that prevents buffer recycling. Successful
> exploitation could allow an attacker to gain sensitive information or
> cause a denial of service condition on the affected system.
> 
> http://svn.apache.org/viewvc?view=revision&revision=958911 
> http://svn.apache.org/viewvc?view=revision&revision=958977 
> http://svn.apache.org/viewvc?view=revision&revision=959428 
> http://h2.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c03298151
>
> 
http://www.juniper.net/alerts/viewalert.jsp?txtAlertNumber=PSN-2012-05-584&actionBtn=Search
> 
> Regards Kanishk Sethi
> 
> 
> 
> This message is for the designated recipient only and may contain
> privileged, proprietary, or otherwise confidential information. If
> you have received it in error, please notify the sender immediately
> and delete the original. Any other use of the e-mail by you is
> prohibited. Where allowed by local law, electronic communications
> with Accenture and its affiliates, including e-mail and instant
> messaging (including content), may be scanned by our systems for the
> purposes of information security and assessment of internal
> compliance with Accenture policy. . 
> __
>
>  www.accenture.com
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1537041 - in /tomcat/trunk: java/org/apache/tomcat/websocket/server/ webapps/docs/

2013-10-30 Thread markt
Author: markt
Date: Wed Oct 30 11:20:08 2013
New Revision: 1537041

URL: http://svn.apache.org/r1537041
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55715
Add a per web application executor to the WebSocket implementation and use it 
for calling SendHandler.onResult() when there is a chance that the current 
thread also initiated the write

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
tomcat/trunk/webapps/docs/web-socket-howto.xml

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java?rev=1537041&r1=1537040&r2=1537041&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java Wed Oct 
30 11:20:08 2013
@@ -31,6 +31,14 @@ public class Constants {
 public static final String 
ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM =
 "org.apache.tomcat.websocket.noAddAfterHandshake";
 
+// Executor configuration
+public static final String EXECUTOR_CORE_SIZE_INIT_PARAM =
+"org.apache.tomcat.websocket.executorCoreSize";
+public static final String EXECUTOR_MAX_SIZE_INIT_PARAM =
+"org.apache.tomcat.websocket.executorMaxSize";
+public static final String EXECUTOR_KEEPALIVETIME_SECONDS_INIT_PARAM =
+"org.apache.tomcat.websocket.executorKeepAliveTimeSeconds";
+
 public static final String SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE =
 "javax.websocket.server.ServerContainer";
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java?rev=1537041&r1=1537040&r2=1537041&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java 
Wed Oct 30 11:20:08 2013
@@ -45,6 +45,7 @@ public class WsContextListener implement
 ServletContext sc = sce.getServletContext();
 Object obj = 
sc.getAttribute(Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
 if (obj instanceof WsServerContainer) {
+((WsServerContainer) obj).shutdownExecutor();
 ((WsServerContainer) obj).destroy();
 }
 }

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1537041&r1=1537040&r2=1537041&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java 
Wed Oct 30 11:20:08 2013
@@ -233,7 +233,9 @@ public class WsHttpUpgradeHandler implem
 
 @Override
 public void onWritePossible() {
-wsRemoteEndpointServer.onWritePossible();
+// Triggered by the poller so this isn't the same thread that
+// triggered the write so no need for a dispatch
+wsRemoteEndpointServer.onWritePossible(false);
 }
 
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1537041&r1=1537040&r2=1537041&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 Wed Oct 30 11:20:08 2013
@@ -20,6 +20,9 @@ import java.io.EOFException;
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutorService;
 
 import javax.servlet.ServletOutputStream;
 import javax.websocket.SendHandler;
@@ -42,8 +45,12 @@ public class WsRemoteEndpointImplServer 
 private static final Log log =
 LogFac

svn commit: r1537046 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/server/ webapps/docs/

2013-10-30 Thread markt
Author: markt
Date: Wed Oct 30 11:24:12 2013
New Revision: 1537046

URL: http://svn.apache.org/r1537046
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55715
Add a per web application executor to the WebSocket implementation and use it 
for calling SendHandler.onResult() when there is a chance that the current 
thread also initiated the write

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1537041

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java?rev=1537046&r1=1537045&r2=1537046&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java 
Wed Oct 30 11:24:12 2013
@@ -31,6 +31,14 @@ public class Constants {
 public static final String 
ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM =
 "org.apache.tomcat.websocket.noAddAfterHandshake";
 
+// Executor configuration
+public static final String EXECUTOR_CORE_SIZE_INIT_PARAM =
+"org.apache.tomcat.websocket.executorCoreSize";
+public static final String EXECUTOR_MAX_SIZE_INIT_PARAM =
+"org.apache.tomcat.websocket.executorMaxSize";
+public static final String EXECUTOR_KEEPALIVETIME_SECONDS_INIT_PARAM =
+"org.apache.tomcat.websocket.executorKeepAliveTimeSeconds";
+
 public static final String SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE =
 "javax.websocket.server.ServerContainer";
 

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java?rev=1537046&r1=1537045&r2=1537046&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java
 Wed Oct 30 11:24:12 2013
@@ -45,6 +45,7 @@ public class WsContextListener implement
 ServletContext sc = sce.getServletContext();
 Object obj = 
sc.getAttribute(Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
 if (obj instanceof WsServerContainer) {
+((WsServerContainer) obj).shutdownExecutor();
 ((WsServerContainer) obj).destroy();
 }
 }

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1537046&r1=1537045&r2=1537046&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
 Wed Oct 30 11:24:12 2013
@@ -233,7 +233,9 @@ public class WsHttpUpgradeHandler implem
 
 @Override
 public void onWritePossible() {
-wsRemoteEndpointServer.onWritePossible();
+// Triggered by the poller so this isn't the same thread that
+// triggered the write so no need for a dispatch
+wsRemoteEndpointServer.onWritePossible(false);
 }
 
 

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1537046&r1=1537045&r2=1537046&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 Wed Oct 30 11:24:12 2013
@@ -20,6 +20,9 @@ import java.io.E

[Bug 55715] RemoteEndpoint.Async#sendText(String, SendHandler) can cause StackOverflowErrors and contradicts Oracle's JavaDoc

2013-10-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55715

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED
 OS||All

--- Comment #1 from Mark Thomas  ---
Thanks for the report.

This has been fixed in trunk for 8.0.0-RC6 and 7.0.x for 7.0.48.

-- 
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



buildbot failure in ASF Buildbot on tomcat-trunk

2013-10-30 Thread buildbot
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/5160

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1537041
Blamelist: markt

BUILD FAILED: failed compile

sincerely,
 -The Buildbot





svn commit: r1537048 - /tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml

2013-10-30 Thread markt
Author: markt
Date: Wed Oct 30 11:28:54 2013
New Revision: 1537048

URL: http://svn.apache.org/r1537048
Log:
Fix markup

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml?rev=1537048&r1=1537047&r2=1537048&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml Wed Oct 30 11:28:54 
2013
@@ -90,7 +90,7 @@
initiated the write. Since the container thread pool is not exposed via the
Servlet API, the WebSocket implementation has to provide its own thread 
pool.
This thread pool is controlled by the following servlet context
-   initialization parameters:
+   initialization parameters:

  org.apache.tomcat.websocket.executorCoreSize: The core
  size of the executor thread pool. If not set, the default of 0 (zero)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1537050 - /tomcat/trunk/webapps/docs/web-socket-howto.xml

2013-10-30 Thread markt
Author: markt
Date: Wed Oct 30 11:29:55 2013
New Revision: 1537050

URL: http://svn.apache.org/r1537050
Log:
Fix markup

Modified:
tomcat/trunk/webapps/docs/web-socket-howto.xml

Modified: tomcat/trunk/webapps/docs/web-socket-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/web-socket-howto.xml?rev=1537050&r1=1537049&r2=1537050&view=diff
==
--- tomcat/trunk/webapps/docs/web-socket-howto.xml (original)
+++ tomcat/trunk/webapps/docs/web-socket-howto.xml Wed Oct 30 11:29:55 2013
@@ -87,7 +87,7 @@
initiated the write. Since the container thread pool is not exposed via the
Servlet API, the WebSocket implementation has to provide its own thread 
pool.
This thread pool is controlled by the following servlet context
-   initialization parameters:
+   initialization parameters:

  org.apache.tomcat.websocket.executorCoreSize: The core
  size of the executor thread pool. If not set, the default of 0 (zero)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55719] WAR's deployed via Tomcat Manager using Cargo deployer are getting corrupted.

2013-10-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55719

--- Comment #2 from Mark Thomas  ---
How many Tomcat instances are using the WARs that are being deployed to this
SAN?

-- 
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: r1537057 - in /tomcat/trunk: java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java webapps/docs/web-socket-howto.xml

2013-10-30 Thread kkolinko
Author: kkolinko
Date: Wed Oct 30 11:59:41 2013
New Revision: 1537057

URL: http://svn.apache.org/r1537057
Log:
Review of r1537041:
a pair of typos.

Modified:

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/trunk/webapps/docs/web-socket-howto.xml

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1537057&r1=1537056&r2=1537057&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 Wed Oct 30 11:59:41 2013
@@ -129,7 +129,7 @@ public class WsRemoteEndpointImplServer 
 protected void doClose() {
 if (handler != null) {
 // close() can be triggered by a wide range of scenarios. It is far
-// simpler just to always use a dispatch that it is to try and 
track
+// simpler just to always use a dispatch than it is to try and 
track
 // whether or not this method was called by the same thread that
 // triggered the write
 clearHandler(new EOFException(), true);

Modified: tomcat/trunk/webapps/docs/web-socket-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/web-socket-howto.xml?rev=1537057&r1=1537056&r2=1537057&view=diff
==
--- tomcat/trunk/webapps/docs/web-socket-howto.xml (original)
+++ tomcat/trunk/webapps/docs/web-socket-howto.xml Wed Oct 30 11:59:41 2013
@@ -82,7 +82,7 @@
property to true but any explicit setting on the servlet 
context
will always take priority.
 
-The Java WebSocket 1.0 specification requires that call backs for
+The Java WebSocket 1.0 specification requires that callbacks for
asynchronous writes are performed on a different thread to the thread that
initiated the write. Since the container thread pool is not exposed via the
Servlet API, the WebSocket implementation has to provide its own thread 
pool.



-
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-7-trunk

2013-10-30 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-7-trunk/builds/1524

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1537048
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot





svn commit: r1537073 - /tomcat/trunk/webapps/examples/websocket/drawboard.xhtml

2013-10-30 Thread kpreisser
Author: kpreisser
Date: Wed Oct 30 13:06:42 2013
New Revision: 1537073

URL: http://svn.apache.org/r1537073
Log:
Only refresh the Display Canvas on a MouseMove event if mouse was inside of the 
Canvas.

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=1537073&r1=1537072&r2=1537073&view=diff
==
--- tomcat/trunk/webapps/examples/websocket/drawboard.xhtml (original)
+++ tomcat/trunk/webapps/examples/websocket/drawboard.xhtml Wed Oct 30 13:06:42 
2013
@@ -634,12 +634,17 @@
 currentMouseX, currentMouseY, mouseX,
 mouseY, false);
 }
+
+refreshDisplayCanvas();
 } else {
 currentMouseX = mouseX;
 currentMouseY = mouseY;
+
+if (mouseInWindow) {
+refreshDisplayCanvas();
+}
 }
 
-refreshDisplayCanvas();
 };
 document.addEventListener("mousemove", 
canvasMouseMoveHandler, false);
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1537075 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/websocket/drawboard.xhtml

2013-10-30 Thread kpreisser
Author: kpreisser
Date: Wed Oct 30 13:07:32 2013
New Revision: 1537075

URL: http://svn.apache.org/r1537075
Log:
Merged revision(s) 1537073 from tomcat/trunk:
Only refresh the Display Canvas on a MouseMove event if mouse was inside of the 
Canvas.

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:r1537073

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=1537075&r1=1537074&r2=1537075&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 30 
13:07:32 2013
@@ -634,12 +634,17 @@
 currentMouseX, currentMouseY, mouseX,
 mouseY, false);
 }
+
+refreshDisplayCanvas();
 } else {
 currentMouseX = mouseX;
 currentMouseY = mouseY;
+
+if (mouseInWindow) {
+refreshDisplayCanvas();
+}
 }
 
-refreshDisplayCanvas();
 };
 document.addEventListener("mousemove", 
canvasMouseMoveHandler, false);
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55719] WAR's deployed via Tomcat Manager using Cargo deployer are getting corrupted.

2013-10-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55719

--- Comment #3 from d...@danshome.net ---
Only a single Tomcat instance.

-- 
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



[VOTE] Release Apache Commons Pool 2.0 RC1 as 2.0

2013-10-30 Thread Mark Thomas
Development on Pool 2 is complete and a review of the remaining DBCP
bugs has not highlighted any that are likely to trigger significant API
changes in Pool so it is time for a release.

 The Pool 2.0 RC1 is available for review here:
  https://dist.apache.org/repos/dist/dev/commons/pool/ (r3380)

 Maven artifacts are here:
  https://repository.apache.org/content/repositories/orgapachecommons-046/

 Details of changes since 1.x are in the release notes:
  https://dist.apache.org/repos/dist/dev/commons/pool/RELEASE-NOTES.txt

http://people.apache.org/~markt/dev/commons-pool-2.0-RC1/changes-report.html

 The tag is here:
  http://svn.apache.org/repos/asf/commons/proper/foo/tags/POOL_2_0_RC1/
  (r 1537146)

 Site:
  http://people.apache.org/~markt/dev/commons-pool-2.0-RC1
  (There are various broken links - I'm in the process of working out if
   any of them are going to require a new release)

 KEYS:
  http://www.apache.org/dist/commons/KEYS

  Please review the release candidate and vote.
  This vote will close no sooner that 72 hours from now

  [ ] +1 Release these artifacts
  [ ] +0 OK, but...
  [ ] -0 OK, but really should fix...
  [ ] -1 I oppose this release because...


Cheers,

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release Apache Commons Pool 2.0 RC1 as 2.0

2013-10-30 Thread Mark Thomas
Sorry, wrong list. Whoops.

Mark

On 30/10/2013 17:16, Mark Thomas wrote:
> Development on Pool 2 is complete and a review of the remaining DBCP
> bugs has not highlighted any that are likely to trigger significant API
> changes in Pool so it is time for a release.
> 
>  The Pool 2.0 RC1 is available for review here:
>   https://dist.apache.org/repos/dist/dev/commons/pool/ (r3380)
> 
>  Maven artifacts are here:
>   https://repository.apache.org/content/repositories/orgapachecommons-046/
> 
>  Details of changes since 1.x are in the release notes:
>   https://dist.apache.org/repos/dist/dev/commons/pool/RELEASE-NOTES.txt
> 
> http://people.apache.org/~markt/dev/commons-pool-2.0-RC1/changes-report.html
> 
>  The tag is here:
>   http://svn.apache.org/repos/asf/commons/proper/foo/tags/POOL_2_0_RC1/
>   (r 1537146)
> 
>  Site:
>   http://people.apache.org/~markt/dev/commons-pool-2.0-RC1
>   (There are various broken links - I'm in the process of working out if
>any of them are going to require a new release)
> 
>  KEYS:
>   http://www.apache.org/dist/commons/KEYS
> 
>   Please review the release candidate and vote.
>   This vote will close no sooner that 72 hours from now
> 
>   [ ] +1 Release these artifacts
>   [ ] +0 OK, but...
>   [ ] -0 OK, but really should fix...
>   [ ] -1 I oppose this release because...
> 
> 
> 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



[Bug 55719] WAR's deployed via Tomcat Manager using Cargo deployer are getting corrupted.

2013-10-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55719

--- Comment #4 from Mark Thomas  ---
The manager app does the following:
- marks the context as services so the auto deployer leaves it alone
- removes the old war
- reads the input stream and writes the WAR directly to the appBase
- triggers a deploy for the new WAR
- removes the serviced marker

Given that auto deployment is disabled in your environment anyway, the only way
I can see the problem you are having arising is if the file upload somehow goes
wrong and a partial file is written to the appBase.

Let me look though the source code to check if all the possible errors are
correctly handled.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55719] WAR's deployed via Tomcat Manager using Cargo deployer are getting corrupted.

2013-10-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55719

--- Comment #5 from Dan McLaughlin  ---
Hi Mark,

As I stated in my original posting "We DO have auto deploy enabled at this
time."  We moved our SAN backups last night so they didn't run during the
nightly deployment and there were no zip failures this time.  We'll have to
watch things over the the next few days, but it seems that the I/O contention
somehow allowed for the Tomcat Manager deployment and autodeploy to collide. 
The idea that the transfer of the WAR failed sounds reasonable.  Even so, if we
hit some timeout that caused the WAR to abort the upload, shouldn't Tomcat
Manager have caught the disconnect and removed the incomplete WAR?

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55719] WAR's deployed via Tomcat Manager using Cargo deployer are getting corrupted.

2013-10-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55719

--- Comment #6 from Mark Thomas  ---
Even with auto deployment enabled, the use of the serviced flag by the manager
means it should not be a factor here.

I suspect some form of timeout as well. I agree it should be handled. I want to
check to make sure that it is handled.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1537046 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/server/ webapps/docs/

2013-10-30 Thread Konstantin Kolinko
2013/10/30  :
> Author: markt
> Date: Wed Oct 30 11:24:12 2013
> New Revision: 1537046
>
> URL: http://svn.apache.org/r1537046
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55715
> Add a per web application executor to the WebSocket implementation and use it 
> for calling SendHandler.onResult() when there is a chance that the current 
> thread also initiated the write
>
> Modified:
> tomcat/tc7.0.x/trunk/   (props changed)
> 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java
> 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java
> 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
> 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
> 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
> 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
> tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml
>
> Propchange: tomcat/tc7.0.x/trunk/
> --
>   Merged /tomcat/trunk:r1537041
>




> Modified: 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1537046&r1=1537045&r2=1537046&view=diff
> ==
> --- 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
>  (original)
> +++ 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
>  Wed Oct 30 11:24:12 2013
> @@ -26,6 +26,12 @@ import java.util.Set;
>  import java.util.SortedSet;
>  import java.util.TreeSet;
>  import java.util.concurrent.ConcurrentHashMap;
> +import java.util.concurrent.ExecutorService;
> +import java.util.concurrent.LinkedBlockingQueue;
> +import java.util.concurrent.ThreadFactory;
> +import java.util.concurrent.ThreadPoolExecutor;
> +import java.util.concurrent.TimeUnit;
> +import java.util.concurrent.atomic.AtomicLong;
>
>  import javax.servlet.DispatcherType;
>  import javax.servlet.FilterRegistration;
> @@ -81,6 +87,7 @@ public class WsServerContainer extends W
>  private volatile boolean addAllowed = true;
>  private final ConcurrentHashMap> 
> authenticatedSessions =
>  new ConcurrentHashMap>();
> +private final ExecutorService executorService;
>
>  WsServerContainer(ServletContext servletContext) {
>
> @@ -104,6 +111,25 @@ public class WsServerContainer extends W
>  if (value != null) {
>  setEnforceNoAddAfterHandshake(Boolean.parseBoolean(value));
>  }
> +// Executor config
> +int executorCoreSize = 0;
> +int executorMaxSize = 10;
> +long executorKeepAliveTimeSeconds = 60;
> +value = servletContext.getInitParameter(
> +Constants.EXECUTOR_CORE_SIZE_INIT_PARAM);
> +if (value != null) {
> +executorCoreSize = Integer.parseInt(value);
> +}
> +value = servletContext.getInitParameter(
> +Constants.EXECUTOR_MAX_SIZE_INIT_PARAM);
> +if (value != null) {
> +executorMaxSize = Integer.parseInt(value);
> +}
> +value = servletContext.getInitParameter(
> +Constants.EXECUTOR_KEEPALIVETIME_SECONDS_INIT_PARAM);
> +if (value != null) {
> +executorKeepAliveTimeSeconds = Long.parseLong(value);
> +}
>
>  FilterRegistration.Dynamic fr = servletContext.addFilter(
>  WsFilter.class.getName(), new WsFilter());
> @@ -113,6 +139,22 @@ public class WsServerContainer extends W
>  DispatcherType.FORWARD);
>
>  fr.addMappingForUrlPatterns(types, true, "/*");
> +
> +// Use a per web application executor for any threads the the 
> WebSocket
> +// server code needs to create. Group all of the threads under a 
> single
> +// ThreadGroup.
> +StringBuffer threadGroupName = new StringBuffer("WebSocketServer-");
> +if ("".equals(servletContext.getContextPath())) {
> +threadGroupName.append("ROOT");
> +} else {
> +threadGroupName.append(servletContext.getContextPath());
> +}
> +ThreadGroup threadGroup = new 
> ThreadGroup(threadGroupName.toString());
> +WsThreadFactory wsThreadFactory = new WsThreadFactory(threadGroup);
> +
> +executorService = new ThreadPoolExecutor(executorCoreSize,
> +executorMaxSize, executorKeepAliveTimeSeconds, 
> TimeUnit.SECONDS,
> +new LinkedBlockingQueue(), wsThreadFactory);
>  }
>

This commit broke the test on tomcat-7 buildbot.

The only failing te

[Bug 55726] New: getting java.lang.NoClassDefFoundError: javax.transaction.TransactionManager at java.lang.J9VMInternals.verifyImpl(Native Method)

2013-10-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55726

Bug ID: 55726
   Summary: getting java.lang.NoClassDefFoundError:
javax.transaction.TransactionManager at
java.lang.J9VMInternals.verifyImpl(Native Method)
   Product: Tomcat 6
   Version: 6.0.35
  Hardware: PC
OS: Linux
Status: NEW
  Severity: regression
  Priority: P2
 Component: Servlet & JSP API
  Assignee: dev@tomcat.apache.org
  Reporter: ibmossg_middlew...@nsdl.co.in

Created attachment 30986
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=30986&action=edit
please find attached cataliine.out

Hi All,

We are using the tomcat 6.0.35 and IBM java 1.7 .after restarting the tomcat we
are getting below exceptions  and kindly let us know how to fix this exception

Oct 31, 2013 11:02:06 AM org.apache.catalina.core.ApplicationContext log
SEVERE: StandardWrapper.Throwable
java.lang.NoClassDefFoundError: javax.transaction.TransactionManager
at java.lang.J9VMInternals.verifyImpl(Native Method)
at java.lang.J9VMInternals.verify(J9VMInternals.java:93)
at java.lang.J9VMInternals.initialize(J9VMInternals.java:170)
at
com.ibm.ws.naming.util.WsnInitCtxFactory.getCosRootContext(WsnInitCtxFactory.java:1035)
at
com.ibm.ws.naming.util.WsnInitCtxFactory.getRootContextFromServer(WsnInitCtxFactory.java:688)
at
com.ibm.ws.naming.util.WsnInitCtxFactory.getRootJndiContext(WsnInitCtxFactory.java:606)
at
com.ibm.ws.naming.util.WsnInitCtxFactory.getInitialContextInternal(WsnInitCtxFactory.java:481)
at com.ibm.ws.naming.util.WsnInitCtx.getContext(WsnInitCtx.java:102)
at
com.ibm.ws.naming.util.WsnInitCtx.getContextIfNull(WsnInitCtx.java:408)
at com.ibm.ws.naming.util.WsnInitCtx.lookup(WsnInitCtx.java:131)
at javax.naming.InitialContext.lookup(InitialContext.java:411)
at
com.tin.common.util.ServiceLocator.getRemoteHome(ServiceLocator.java:76)
at com.tin.common.util.EjbLookUp.getEjbObject(EjbLookUp.java:54)
at
com.tin.security.servlets.UpdatecacheOPV.init(UpdatecacheOPV.java:44)
at javax.servlet.GenericServlet.init(GenericServlet.java:212)
at
org.apache.catalina.core.StandardWrapper.loadServlet(StandardWrapper.java:1206)
at
org.apache.catalina.core.StandardWrapper.load(StandardWrapper.java:1026)
at
org.apache.catalina.core.StandardContext.loadOnStartup(StandardContext.java:4421)
at
org.apache.catalina.core.StandardContext.start(StandardContext.java:4734)
at
org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1057)
at org.apache.catalina.core.StandardHost.start(StandardHost.java:840)
at
org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1057)
at
org.apache.catalina.core.StandardEngine.start(StandardEngine.java:463)
at
org.apache.catalina.core.StandardService.start(StandardService.java:525)
at
org.apache.catalina.core.StandardServer.start(StandardServer.java:754)
at org.apache.catalina.startup.Catalina.start(Catalina.java:595)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:76)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:607)
at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:289)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:414)
Caused by: java.lang.ClassNotFoundException:
javax.transaction.TransactionManager
at
org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1680)
at
org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1526)
... 32 more


also please find attached log

-- 
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