[Bug 57255] websocket sendMessage timeout

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57255

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas ma...@apache.org ---
Bugzilla is not a support forum. Please take your question to the Apache 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



[Bug 57256] New: Stackoverflow

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57256

Bug ID: 57256
   Summary: Stackoverflow
   Product: Tomcat 7
   Version: 7.0.42
  Hardware: PC
Status: NEW
  Severity: major
  Priority: P2
 Component: Servlet  JSP API
  Assignee: dev@tomcat.apache.org
  Reporter: m.gaw...@maxxton.com

Hello,

Currently i am using tomcat 7.0.42 with liferay 6.2-ce-ga2, and getting
stackoverflow error.

You can have a look at below link for more details

http://www.liferay.com/community/forums/-/message_boards/message/45604006


based on details from
https://issues.apache.org/bugzilla/show_bug.cgi?id=56339#c4

I downloaded tomcat 7.042/54/57 to test it, and its same on all versions.

Please suggest.

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



FW: JSR 236 with tomcat 8

2014-11-25 Thread shailendra singh
After posting my question to Tomcat users mailing list I realized that I should 
have posted my question to this mailing list.  Hence this email.

Some of the information is already mentioned in my previous email which I sent 
to Tomcat users mailing list.

Basically I am trying to figure out what is the proper way to do multi 
threading in a servlet container like tomcat.  Java EE spec mentions that it 
should be done using JSR 236 api but I am unable to find a way to do so as it 
seems that available implementations for this JSR have dependency on EJB api. 
So if JSR 236 is for doing multi threading in an application server then what 
is/are the options for servlet containers like tomcat?

- Shailendra

From: shailendra...@outlook.com
To: us...@tomcat.apache.org
Subject: RE: JSR 236 with tomcat 8
Date: Tue, 25 Nov 2014 05:53:46 +




JSR 236 seems to be only way to create managed threads in Java EE servlet/ejb 
containers. I am working on a framework (piston - 
http://github.com/koyadume/piston-master) which I am supporting on tomcat only. 
Since this framework is based on Java EE 7, I can't use TomEE at this moment.

I would like to split some tasks in multiple parallel tasks in my framework. As 
it is advised not to create own threads in a Java EE servlet/containers, I 
would like to avoid using Java SE concurrency utilities to solve this issue. 
This is the issue which JSR 236 tries to solve. Hopefully this makes my 
intention clear.


 Date: Mon, 24 Nov 2014 22:36:55 -0500
 Subject: Re: JSR 236 with tomcat 8
 From: john.d.am...@gmail.com
 To: us...@tomcat.apache.org
 
 Concurrency utils is specific to app servers, where applications are
 generally unable to create or manage threads.  This is an old EJB
 limitation.
 
 This limitation is not present in servlet containers.
 
 Why do you think you need them?
 
 On Mon, Nov 24, 2014 at 9:58 PM, shailendra singh
 shailendra...@outlook.com wrote:
  Hi,
 
  I am looking for a way to use JSR 236 with tomcat 8.  Can someone please 
  suggest a way to achieve this?
 
  - Shailendra
 
 
 -
 To unsubscribe, e-mail: users-unsubscr...@tomcat.apache.org
 For additional commands, e-mail: users-h...@tomcat.apache.org
 

  

Re: FW: JSR 236 with tomcat 8

2014-11-25 Thread Jean-Louis MONTEIRO
Hi,

works out of the box in TomEE.

JLouis

Le Tue Nov 25 2014 at 11:55:42, shailendra singh shailendra...@outlook.com
a écrit :

 After posting my question to Tomcat users mailing list I realized that I
 should have posted my question to this mailing list.  Hence this email.

 Some of the information is already mentioned in my previous email which I
 sent to Tomcat users mailing list.

 Basically I am trying to figure out what is the proper way to do multi
 threading in a servlet container like tomcat.  Java EE spec mentions that
 it should be done using JSR 236 api but I am unable to find a way to do so
 as it seems that available implementations for this JSR have dependency on
 EJB api. So if JSR 236 is for doing multi threading in an application
 server then what is/are the options for servlet containers like tomcat?

 - Shailendra

 From: shailendra...@outlook.com
 To: us...@tomcat.apache.org
 Subject: RE: JSR 236 with tomcat 8
 Date: Tue, 25 Nov 2014 05:53:46 +




 JSR 236 seems to be only way to create managed threads in Java EE
 servlet/ejb containers. I am working on a framework (piston -
 http://github.com/koyadume/piston-master) which I am supporting on tomcat
 only. Since this framework is based on Java EE 7, I can't use TomEE at this
 moment.

 I would like to split some tasks in multiple parallel tasks in my
 framework. As it is advised not to create own threads in a Java EE
 servlet/containers, I would like to avoid using Java SE concurrency
 utilities to solve this issue. This is the issue which JSR 236 tries to
 solve. Hopefully this makes my intention clear.


  Date: Mon, 24 Nov 2014 22:36:55 -0500
  Subject: Re: JSR 236 with tomcat 8
  From: john.d.am...@gmail.com
  To: us...@tomcat.apache.org
 
  Concurrency utils is specific to app servers, where applications are
  generally unable to create or manage threads.  This is an old EJB
  limitation.
 
  This limitation is not present in servlet containers.
 
  Why do you think you need them?
 
  On Mon, Nov 24, 2014 at 9:58 PM, shailendra singh
  shailendra...@outlook.com wrote:
   Hi,
  
   I am looking for a way to use JSR 236 with tomcat 8.  Can someone
 please suggest a way to achieve this?
  
   - Shailendra
  
 
  -
  To unsubscribe, e-mail: users-unsubscr...@tomcat.apache.org
  For additional commands, e-mail: users-h...@tomcat.apache.org
 




Re: FW: JSR 236 with tomcat 8

2014-11-25 Thread Romain Manni-Bucau
Hi

Tomcat doesn't prevent you to use threads so you can use whatever you
want like ExecutorServices etc...


Romain Manni-Bucau
@rmannibucau
http://www.tomitribe.com
http://rmannibucau.wordpress.com
https://github.com/rmannibucau


2014-11-25 11:57 GMT+01:00 Jean-Louis MONTEIRO jeano...@gmail.com:
 Hi,

 works out of the box in TomEE.

 JLouis

 Le Tue Nov 25 2014 at 11:55:42, shailendra singh shailendra...@outlook.com
 a écrit :

 After posting my question to Tomcat users mailing list I realized that I
 should have posted my question to this mailing list.  Hence this email.

 Some of the information is already mentioned in my previous email which I
 sent to Tomcat users mailing list.

 Basically I am trying to figure out what is the proper way to do multi
 threading in a servlet container like tomcat.  Java EE spec mentions that
 it should be done using JSR 236 api but I am unable to find a way to do so
 as it seems that available implementations for this JSR have dependency on
 EJB api. So if JSR 236 is for doing multi threading in an application
 server then what is/are the options for servlet containers like tomcat?

 - Shailendra

 From: shailendra...@outlook.com
 To: us...@tomcat.apache.org
 Subject: RE: JSR 236 with tomcat 8
 Date: Tue, 25 Nov 2014 05:53:46 +




 JSR 236 seems to be only way to create managed threads in Java EE
 servlet/ejb containers. I am working on a framework (piston -
 http://github.com/koyadume/piston-master) which I am supporting on tomcat
 only. Since this framework is based on Java EE 7, I can't use TomEE at this
 moment.

 I would like to split some tasks in multiple parallel tasks in my
 framework. As it is advised not to create own threads in a Java EE
 servlet/containers, I would like to avoid using Java SE concurrency
 utilities to solve this issue. This is the issue which JSR 236 tries to
 solve. Hopefully this makes my intention clear.


  Date: Mon, 24 Nov 2014 22:36:55 -0500
  Subject: Re: JSR 236 with tomcat 8
  From: john.d.am...@gmail.com
  To: us...@tomcat.apache.org
 
  Concurrency utils is specific to app servers, where applications are
  generally unable to create or manage threads.  This is an old EJB
  limitation.
 
  This limitation is not present in servlet containers.
 
  Why do you think you need them?
 
  On Mon, Nov 24, 2014 at 9:58 PM, shailendra singh
  shailendra...@outlook.com wrote:
   Hi,
  
   I am looking for a way to use JSR 236 with tomcat 8.  Can someone
 please suggest a way to achieve this?
  
   - Shailendra
  
 
  -
  To unsubscribe, e-mail: users-unsubscr...@tomcat.apache.org
  For additional commands, e-mail: users-h...@tomcat.apache.org
 



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



tomcat7 weird behaviour

2014-11-25 Thread Métairie , Stéphane
Hi all

We have a tomcat7 standalone in Redhat6.

Sometime the Tomcat7 suddenly stop to reply to all requests, but all server 
parameters are ok (cpu, memory, disk, ... all are ok). There is no error inside 
the logs. No exception, nothing.

The http-thread do not reply anymore, because the pool is fallen to a minimum 
to 5 or 6 threads.
I guess all http-thread are killed without any reason.

Could you help please.

--

**
This email and any files transmitted with it are confidential and intended 
solely for the use of the individual or entity to whom they are addressed.
If you have received this email in error, please notify the system manager. 
This footnote also confirms that this email message has been swept by the 
mailgateway
**


[Bug 57256] Stackoverflow

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57256

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas ma...@apache.org ---
You (or the application you are using) has created a wrapper that wraps itself.

-- 
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: tomcat7 weird behaviour

2014-11-25 Thread Mark Thomas
On 25/11/2014 11:11, Métairie, Stéphane wrote:
 Hi all
 
 We have a tomcat7 standalone in Redhat6.
 
 Sometime the Tomcat7 suddenly stop to reply to all requests, but all server 
 parameters are ok (cpu, memory, disk, ... all are ok). There is no error 
 inside the logs. No exception, nothing.
 
 The http-thread do not reply anymore, because the pool is fallen to a minimum 
 to 5 or 6 threads.
 I guess all http-thread are killed without any reason.
 
 Could you help please.

Wrong list. You want the users list, not the dev list.

Mark


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



Re: FW: JSR 236 with tomcat 8

2014-11-25 Thread Mark Thomas
On 25/11/2014 10:54, shailendra singh wrote:
 After posting my question to Tomcat users mailing list I realized that I 
 should have posted my question to this mailing list.  Hence this email.

Nope. This belongs on the users list, not the dev list.

Mark

 
 Some of the information is already mentioned in my previous email which I 
 sent to Tomcat users mailing list.
 
 Basically I am trying to figure out what is the proper way to do multi 
 threading in a servlet container like tomcat.  Java EE spec mentions that it 
 should be done using JSR 236 api but I am unable to find a way to do so as it 
 seems that available implementations for this JSR have dependency on EJB api. 
 So if JSR 236 is for doing multi threading in an application server then what 
 is/are the options for servlet containers like tomcat?
 
 - Shailendra
 
 From: shailendra...@outlook.com
 To: us...@tomcat.apache.org
 Subject: RE: JSR 236 with tomcat 8
 Date: Tue, 25 Nov 2014 05:53:46 +
 
 
 
 
 JSR 236 seems to be only way to create managed threads in Java EE servlet/ejb 
 containers. I am working on a framework (piston - 
 http://github.com/koyadume/piston-master) which I am supporting on tomcat 
 only. Since this framework is based on Java EE 7, I can't use TomEE at this 
 moment.
 
 I would like to split some tasks in multiple parallel tasks in my framework. 
 As it is advised not to create own threads in a Java EE servlet/containers, I 
 would like to avoid using Java SE concurrency utilities to solve this issue. 
 This is the issue which JSR 236 tries to solve. Hopefully this makes my 
 intention clear.
 
 
 Date: Mon, 24 Nov 2014 22:36:55 -0500
 Subject: Re: JSR 236 with tomcat 8
 From: john.d.am...@gmail.com
 To: us...@tomcat.apache.org

 Concurrency utils is specific to app servers, where applications are
 generally unable to create or manage threads.  This is an old EJB
 limitation.

 This limitation is not present in servlet containers.

 Why do you think you need them?

 On Mon, Nov 24, 2014 at 9:58 PM, shailendra singh
 shailendra...@outlook.com wrote:
 Hi,

 I am looking for a way to use JSR 236 with tomcat 8.  Can someone please 
 suggest a way to achieve this?

 - Shailendra


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

   
   
 


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



[Bug 57256] Stackoverflow

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57256

--- Comment #2 from Milind m.gaw...@maxxton.com ---
(In reply to Mark Thomas from comment #1)
 You (or the application you are using) has created a wrapper that wraps
 itself.


Thanks Mark for the update, but can be add some more description?

-- 
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 57234] Use case-insensitive substring search when filtering SSLv2/v3 protocols in connectors

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57234

--- Comment #4 from Konstantin Kolinko knst.koli...@gmail.com ---
Created attachment 32226
  -- https://issues.apache.org/bugzilla/attachment.cgi?id=32226action=edit
2014-11-25_tc6_57234_v1.patch

Patch for Tomcat 6.
Backport of r1641377 + Includes patch by Christopher Schultz to de-duplicate
code and fix name of the filtering method + A pair of compiler warning fixes
(duplicate ';' and generics for a local variable).

-- 
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: r1641615 - /tomcat/tc6.0.x/trunk/STATUS.txt

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 13:12:59 2014
New Revision: 1641615

URL: http://svn.apache.org/r1641615
Log:
Proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1641615r1=1641614r2=1641615view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov 25 13:12:59 2014
@@ -34,9 +34,22 @@ PATCHES PROPOSED TO BACKPORT:
   (Not a back-port. No functional change.)
   Also corrects spelling of filterInsecureProtocols method.
 +1: schultz, kkolinko
-+0: markt: Should fix BZ57234 at the same time
++0: markt: Should fix BZ57234 at the same time  kkolinko: Updated patch is 
proposed below.
 -1:
 
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57234
+  Make SSL protocol filtering to remove insecure protocols case
+  insensitive. Correct spelling of filterInsecureProtocols method.
+  This is
+   - Backport of r1641377
+   - + patch by Christopher Schultz to de-duplicate code and correct
+   spelling of filterInsecureProtocols method
+   - Fix a pair of compiler warnings in JSSESocketFactory.java
+(fix duplicate ';' and use generics in declaration of a local variable).
+  https://issues.apache.org/bugzilla/attachment.cgi?id=32226
+  +1: kkolinko
+  -1:
+
 
 PATCHES/ISSUES THAT ARE STALLED:
 



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



[Bug 57260] EOF Exception is thrown while parsing annotations from struts-1.2.9.jar

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57260

Florian Schäfer florian.schaefer.ext...@asideas.de changed:

   What|Removed |Added

 CC||florian.schaefer.extern@asi
   ||deas.de

-- 
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 57260] New: EOF Exception is thrown while parsing annotations from struts-1.2.9.jar

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57260

Bug ID: 57260
   Summary: EOF Exception is thrown while parsing annotations from
struts-1.2.9.jar
   Product: Tomcat 8
   Version: 8.0.15
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: florian.schaefer.ext...@asideas.de

The following Exception is thrown while parsing the struts-1.2.9.jar for
annotations. This was not the case in tomcat 8.0.12:

2014-11-25 15:44:03,989 ERROR  [localhost-startStop-1] 
(org.apache.catalina.startup.ContextConfig) Unable to process Jar entry
[org/apache/struts/util/ModuleException.class] from Jar
[jar:file:/cms/ece/tomcat/webapps/escenic-admin.war!/WEB-INF/lib/struts-1.2.9(1).jar]
for annotations
java.io.EOFException
at
org.apache.tomcat.util.bcel.classfile.FastDataInputStream.readInt(FastDataInputStream.java:145)
at
org.apache.tomcat.util.bcel.classfile.Utility.swallowAttribute(Utility.java:86)
at
org.apache.tomcat.util.bcel.classfile.Utility.swallowFieldOrMethod(Utility.java:77)
at
org.apache.tomcat.util.bcel.classfile.ClassParser.readMethods(ClassParser.java:235)
at
org.apache.tomcat.util.bcel.classfile.ClassParser.parse(ClassParser.java:92)
at
org.apache.catalina.startup.ContextConfig.processAnnotationsStream(ContextConfig.java:1994)
at
org.apache.catalina.startup.ContextConfig.processAnnotationsJar(ContextConfig.java:1944)
at
org.apache.catalina.startup.ContextConfig.processAnnotationsUrl(ContextConfig.java:1919)
at
org.apache.catalina.startup.ContextConfig.processAnnotations(ContextConfig.java:1880)
at
org.apache.catalina.startup.ContextConfig.webConfig(ContextConfig.java:1149)
at
org.apache.catalina.startup.ContextConfig.configureStart(ContextConfig.java:771)
at
org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:305)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:117)
at
org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90)
at
org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5095)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
at
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:725)
at
org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:701)
at
org.apache.catalina.core.StandardHost.addChild(StandardHost.java:714)
at
org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:917)
at
org.apache.catalina.startup.HostConfig$DeployWar.run(HostConfig.java:1701)
at
java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)

-- 
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 57260] EOF Exception is thrown while parsing annotations from struts-1.2.9.jar

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57260

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #1 from Mark Thomas ma...@apache.org ---


*** This bug has been marked as a duplicate of bug 57173 ***

-- 
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 57173] EOFException during annotation scanning

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57173

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 CC||florian.schaefer.extern@asi
   ||deas.de

--- Comment #14 from Mark Thomas ma...@apache.org ---
*** Bug 57260 has been marked as a duplicate of this bug. ***

-- 
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 57173] EOFException during annotation scanning

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57173

--- Comment #15 from Mark Thomas ma...@apache.org ---
We are seeing lots of these regressions. I am going to revert r1625504.

-- 
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: r1641634 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile: ClassParser.java FastDataInputStream.java

2014-11-25 Thread markt
Author: markt
Date: Tue Nov 25 15:35:39 2014
New Revision: 1641634

URL: http://svn.apache.org/r1641634
Log:
Revert r1625504, the fix for 
https://issues.apache.org/bugzilla/show_bug.cgi?id=56953 and an attempt to 
enhance performance of annotation scanning.
The FastDataInputStream class was broken and caused multiple reports of 
regressions (https://issues.apache.org/bugzilla/show_bug.cgi?id=57173)

Removed:

tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FastDataInputStream.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1641634r1=1641633r2=1641634view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java 
Tue Nov 25 15:35:39 2014
@@ -17,7 +17,9 @@
  */
 package org.apache.tomcat.util.bcel.classfile;
 
+import java.io.BufferedInputStream;
 import java.io.DataInput;
+import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -57,7 +59,7 @@ public final class ClassParser {
  * @param file Input stream
  */
 public ClassParser(InputStream file) {
-this.file = new FastDataInputStream(file, BUFSIZE);
+this.file = new DataInputStream(new BufferedInputStream(file, 
BUFSIZE));
 }
 
 



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



svn commit: r1641638 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/bcel/classfile/ClassParser.java webapps/docs/changelog.xml

2014-11-25 Thread markt
Author: markt
Date: Tue Nov 25 15:41:18 2014
New Revision: 1641638

URL: http://svn.apache.org/r1641638
Log:
Revert r1625504, the fix for 
https://issues.apache.org/bugzilla/show_bug.cgi?id=56953 and an attempt to 
enhance performance of annotation scanning.
The FastDataInputStream class was broken and caused multiple reports of 
regressions (https://issues.apache.org/bugzilla/show_bug.cgi?id=57173)

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
  Merged /tomcat/trunk:r1641634

Propchange: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/
--
  Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1641634

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1641638r1=1641637r2=1641638view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
 Tue Nov 25 15:41:18 2014
@@ -17,7 +17,9 @@
  */
 package org.apache.tomcat.util.bcel.classfile;
 
+import java.io.BufferedInputStream;
 import java.io.DataInput;
+import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -57,7 +59,7 @@ public final class ClassParser {
  * @param file Input stream
  */
 public ClassParser(InputStream file) {
-this.file = new FastDataInputStream(file, BUFSIZE);
+this.file = new DataInputStream(new BufferedInputStream(file, 
BUFSIZE));
 }
 
 

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1641638r1=1641637r2=1641638view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Nov 25 15:41:18 2014
@@ -53,6 +53,10 @@
 stopped. (markt/kkolinko)
   /fix
   fix
+bug57173/bug: Rvert the fix for bug56953/bug that broke
+annotation scanning in some cases. (markt)
+  /fix
+  fix
 bug57187/bug: Regression handling the special * URL. (remm)
   /fix
   fix
@@ -650,9 +654,9 @@
 when running on a case sensitive file system. (markt)
   /fix
   add
-  bug57004/bug: Add codestuckThreadCount/code property to
-  codeStuckThreadDetectionValve/code's JMX bean. Patch provided by
-  Ji#x159;#xED; Pejchal. (schultz)
+bug57004/bug: Add codestuckThreadCount/code property to
+codeStuckThreadDetectionValve/code's JMX bean. Patch provided by
+Ji#x159;#xED; Pejchal. (schultz)
   /add
   fix
 bug57011/bug: Ensure that the request and response are correctly



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



svn commit: r1641641 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/bcel/classfile/ClassParser.java webapps/docs/changelog.xml

2014-11-25 Thread markt
Author: markt
Date: Tue Nov 25 15:45:58 2014
New Revision: 1641641

URL: http://svn.apache.org/r1641641
Log:
Revert r1625559, the fix for 
https://issues.apache.org/bugzilla/show_bug.cgi?id=56953 and an attempt to 
enhance performance of annotation scanning.
The FastDataInputStream class was broken and caused multiple reports of 
regressions (https://issues.apache.org/bugzilla/show_bug.cgi?id=57173)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1641634
  Merged /tomcat/tc8.0.x/trunk:r1641638

Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
--
  Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1641634
  Merged /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel:r1641638

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1641641r1=1641640r2=1641641view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
 Tue Nov 25 15:45:58 2014
@@ -17,7 +17,9 @@
  */
 package org.apache.tomcat.util.bcel.classfile;
 
+import java.io.BufferedInputStream;
 import java.io.DataInput;
+import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -57,7 +59,7 @@ public final class ClassParser {
  * @param file Input stream
  */
 public ClassParser(InputStream file) {
-this.file = new FastDataInputStream(file, BUFSIZE);
+this.file = new DataInputStream(new BufferedInputStream(file, 
BUFSIZE));
 }
 
 

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1641641r1=1641640r2=1641641view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Nov 25 15:45:58 2014
@@ -59,6 +59,10 @@
   subsection name=Catalina
 changelog
   fix
+bug57173/bug: Rvert the fix for bug56953/bug that broke
+annotation scanning in some cases. (markt)
+  /fix
+  fix
 bug57208/bug: Prevent NPE in JNDI Realm when no results are found
 in a directory context for a user with specified user name. Based on
 a patch provided by Jason McIntosh. (violetagg)
@@ -433,9 +437,9 @@
 when running on a case sensitive file system. (markt)
   /fix
   add
-  bug57004/bug: Add codestuckThreadCount/code property to
-  codeStuckThreadDetectionValve/code's JMX bean. Patch provided by
-  Ji#x159;#xED; Pejchal. (schultz)
+bug57004/bug: Add codestuckThreadCount/code property to
+codeStuckThreadDetectionValve/code's JMX bean. Patch provided by
+Ji#x159;#xED; Pejchal. (schultz)
   /add
   fix
 bug57011/bug: Ensure that the request and response are correctly



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



[Bug 56953] A improvement for DataInputStream

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56953

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Resolution|FIXED   |WONTFIX

--- Comment #21 from Mark Thomas ma...@apache.org ---
This fix has been reverted from trunk, 8.0.x (for 8.0.16 onwards) and 7.0.x
(for 7.0.58 onwards) and will not be reapplied.

Once the issues causing the regressions found so far are fixed, the performance
improvement is only a few percent. It simply isn't worth the risk of further
regressions to shave a few percent of the scanning time at application start.

-- 
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 57173] EOFException during annotation scanning

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57173

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #16 from Mark Thomas ma...@apache.org ---
The performance improvement that triggered this regression has been reverted
from from trunk, 8.0.x (for 8.0.16 onwards) and 7.0.x (for 7.0.58 onwards) and
will not be reapplied.

-- 
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 57173] EOFException during annotation scanning

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57173

--- Comment #17 from Florian Schäfer florian.schaefer.ext...@asideas.de ---
Thanks for the fast response!

-- 
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 success in ASF Buildbot on tomcat-7-trunk

2014-11-25 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/402

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1641641
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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



svn commit: r1641651 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/Context.java java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 16:46:00 2014
New Revision: 1641651

URL: http://svn.apache.org/r1641651
Log:
Correct changelog typo.
Also merged r1641486 from tomcat/trunk:
A handful of Java 8 Javadoc clean-ups

(The StandardContext.getApplicationEventListeners(), 
getApplicationLifecycleListeners() methods are implemented as simple getters. 
They never throw an IllegalStateException, contrary to what their javadoc was 
saying.)

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
  Merged /tomcat/trunk:r1641486

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java?rev=1641651r1=1641650r2=1641651view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java Tue Nov 25 
16:46:00 2014
@@ -109,12 +109,11 @@ public interface Context extends Contain
 
 
 /**
- * Return the set of initialized application event listener objects,
- * in the order they were specified in the web application deployment
- * descriptor, for this application.
+ * Obtain the registered application event listeners.
  *
- * @exception IllegalStateException if this method is called before
- *  this application has started, or after it has been stopped
+ * @return An array containing the application event listener instances for
+ * this web application in the order they were specified in the web
+ * application deployment descriptor
  */
 public Object[] getApplicationEventListeners();
 
@@ -130,12 +129,11 @@ public interface Context extends Contain
 
 
 /**
- * Return the set of initialized application lifecycle listener objects,
- * in the order they were specified in the web application deployment
- * descriptor, for this application.
+ * Obtain the registered application lifecycle listeners.
  *
- * @exception IllegalStateException if this method is called before
- *  this application has started, or after it has been stopped
+ * @return An array containing the application lifecycle listener instances
+ * for this web application in the order they were specified in the
+ * web application deployment descriptor
  */
 public Object[] getApplicationLifecycleListeners();
 
@@ -154,12 +152,19 @@ public interface Context extends Contain
  * Obtain the character set name to use with the given Locale. Note that
  * different Contexts may have different mappings of Locale to character
  * set.
+ *
+ * @param locale The locale for which the mapped character set should be
+ *   returned
+ *
+ * @return The name of the character set to use with the given Locale
  */
 public String getCharset(Locale locale);
 
 
 /**
  * Return the URL of the XML descriptor for this context.
+ *
+ * @return The URL of the XML descriptor for this context
  */
 public URL getConfigFile();
 
@@ -174,6 +179,9 @@ public interface Context extends Contain
 
 /**
  * Return the correctly configured flag for this Context.
+ *
+ * @return codetrue/code if the Context has been correctly configured,
+ * otherwise codefalse/code
  */
 public boolean getConfigured();
 
@@ -190,6 +198,10 @@ public interface Context extends Contain
 
 /**
  * Return the use cookies for session ids flag.
+ *
+ * @return codetrue/code if it is permitted to use cookies to track
+ * session IDs for this web application, otherwise
+ * codefalse/code
  */
 public boolean getCookies();
 
@@ -303,6 +315,9 @@ public interface Context extends Contain
 
 /**
  * Return the allow crossing servlet contexts flag.
+ *
+ * @return codetrue/code if cross-contest requests are allowed from 
this
+ * web applications, otherwise codefalse/code
  */
 public boolean getCrossContext();
 

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1641651r1=1641650r2=1641651view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue 
Nov 25 16:46:00 2014
@@ -1162,27 +1162,12 @@ public class 

svn commit: r1641653 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 16:47:55 2014
New Revision: 1641653

URL: http://svn.apache.org/r1641653
Log:
Correct changelog typo.

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1641653r1=1641652r2=1641653view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Nov 25 16:47:55 2014
@@ -59,7 +59,7 @@
   subsection name=Catalina
 changelog
   fix
-bug57173/bug: Rvert the fix for bug56953/bug that broke
+bug57173/bug: Revert the fix for bug56953/bug that broke
 annotation scanning in some cases. (markt)
   /fix
   fix



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



svn commit: r1641656 - /tomcat/trunk/webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 17:28:40 2014
New Revision: 1641656

URL: http://svn.apache.org/r1641656
Log:
Correction: The default configuration uses UserDatabaseRealm, not MemoryRealm. 
Add DataSourceRealm.

Modified:
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1641656r1=1641655r2=1641656view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Nov 25 17:28:40 2014
@@ -162,13 +162,13 @@ As the majority of this document describ
 interface, let the role name for further example to be
 strongmanager-script/strong.
 Exactly how the usernames/passwords are configured depends on which
-codeRealm/code implementation you are using:/p
+a href=config/realm.htmlRealm implementation/a you are using:/p
 ul
-liemMemoryRealm/em #8212; This one is configured in the default
-code$CATALINA_BASE/conf/server.xml/code.
-If you have not configured it differently, or replaced it with
-a different codeRealm/code implementation, this realm
-reads an XML-format file stored at
+liemUserDatabaseRealm/em plus emMemoryUserDatabase/em, or 
emMemoryRealm/em
+#8212; The emUserDatabaseRealm/em and emMemoryUserDatabase/em are
+configured in the default code$CATALINA_BASE/conf/server.xml/code.
+Both emMemoryUserDatabase/em and emMemoryRealm/em read an
+XML-format file by default stored at
 code$CATALINA_BASE/conf/tomcat-users.xml/code, which can be
 edited with any text editor.  This file contains an XML
 codelt;usergt;/code for each individual user, which might
@@ -179,7 +179,8 @@ Exactly how the usernames/passwords are 
 add the strongmanager-script/strong role to the comma-delimited
 coderoles/code attribute for one or more existing users, and/or
 create new users with that assigned role./li
-liemJDBCRealm/em #8212; Your user and role information is stored in
+liemDataSourceRealm/em or emJDBCRealm/em
+#8212; Your user and role information is stored in
 a database accessed via JDBC.  Add the strongmanager-script/strong role
 to one or more existing users, and/or create one or more new users
 with this role assigned, following the standard procedures for your



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



svn commit: r1641660 - /tomcat/trunk/webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 18:00:52 2014
New Revision: 1641660

URL: http://svn.apache.org/r1641660
Log:
Add section on HTML interface with a link to a document. Correct URL.

Modified:
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1641660r1=1641659r2=1641660view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Nov 25 18:00:52 2014
@@ -83,7 +83,7 @@ example:/p
 ul
 liAs an application with a user interface you use in your browser.
 Here is an example URL where you can replace codelocalhost/code with
-your website host name:  codehttp://localhost/manager/html//code ./li
+your website host name:  codehttp://localhost:8080/manager/html/code ./li
 liA minimal version using HTTP requests only which is suitable for use
 by scripts setup by system administrators.  Commands are given as part of the
 request URI, and responses are in the form of simple text that can be easily
@@ -148,7 +148,7 @@ the CSRF protection:/p
   the session./li
 /ul
 
-pNote that JMX proxy interface is effectively low-level root-like
+pstrongNote/strong that JMX proxy interface is effectively low-level 
root-like
 administrative interface of Tomcat. One can do a lot, if he knows
 what commands to call. You should be cautious when enabling the
 strongmanager-jmx/strong role./p
@@ -211,6 +211,21 @@ an example of restricting access to the 
 
 /section
 
+section name=HTML User-friendly Interface
+
+pThe user-friendly HTML interface of Manager web application is located 
at/p
+
+sourcehttp://{host}:{port}/manager/html/source
+
+pAs has already been mentioned above, you need strongmanager-gui/strong
+role to be allowed to access it. There is a separate document that provides
+help on this interface. See:/p
+
+ul
+  lia href=html-manager-howto.htmlHTML Manager documentation/a/li
+/ul
+
+/section
 
 section name=Supported Manager Commands
 



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



[Bug 43742] .tag compiles performed one at a time -- extremely slow

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=43742

Andrew Lane Carr andrewlanec...@gmail.com changed:

   What|Removed |Added

 CC||andrewlanec...@gmail.com

-- 
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: r1641692 - /tomcat/trunk/webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 20:48:54 2014
New Revision: 1641692

URL: http://svn.apache.org/r1641692
Log:
Expand explanation on CSRF feature.

Modified:
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1641692r1=1641691r2=1641692view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Nov 25 20:48:54 2014
@@ -133,19 +133,22 @@ web application. The available roles are
 /ul
 
 pThe HTML interface is protected against CSRF (Cross-Site Request Forgery)
-attacks, but the text and JMX interfaces cannot be protected. To maintain
+attacks, but the text and JMX interfaces cannot be protected. It means that
+users who are allowed access to the text and JMX interfaces have to be cautious
+when accessing the Manager application with a web browser.
+To maintain
 the CSRF protection:/p
 
 ul
-  liUsers with the strongmanager-gui/strong role should not be granted
-  the strongmanager-script/strong or strongmanager-jmx/strong
-  roles./li
   liIf you use web browser to access the Manager application using
   a user that has either strongmanager-script/strong or
   strongmanager-jmx/strong roles (for example for testing
-  the plain text or JMX interfaces),
-  then all windows of the browser MUST be closed afterwards to terminate
-  the session./li
+  the plain text or JMX interfaces), do not visit other sites
+  where you may fall victim to a CSRF attack, and you MUST close all 
windows
+  of the browser afterwards to terminate the session./li
+  liIt is recommended to never grant
+  the strongmanager-script/strong or strongmanager-jmx/strong
+  roles to users that have the strongmanager-gui/strong role./li
 /ul
 
 pstrongNote/strong that JMX proxy interface is effectively low-level 
root-like
@@ -225,6 +228,13 @@ help on this interface. See:/p
   lia href=html-manager-howto.htmlHTML Manager documentation/a/li
 /ul
 
+pThe HTML interface is protected against CSRF (Cross-Site Request Forgery)
+attacks. Each access to the HTML pages generates a random token, which is
+stored in your session and is included in all links on the page. If your next
+action does not have correct value of the token, the action will be denied.
+If the token has expired you can start again from the main page or
+emList Applications/em page of Manager./p
+
 /section
 
 section name=Supported Manager Commands



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



svn commit: r1641704 - /tomcat/trunk/webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 21:34:57 2014
New Revision: 1641704

URL: http://svn.apache.org/r1641704
Log:
Swap Using JMXProxy and Ant sections. No change in the text of the sections 
themselves.

Modified:
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1641704r1=1641703r2=1641704view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Nov 25 21:34:57 2014
@@ -888,6 +888,123 @@ The same information is available for bo
 
 /section
 
+section name=Using the JMX Proxy Servlet
+
+  subsection name=What is JMX Proxy Servlet
+The JMX Proxy Servlet is a lightweight proxy to get and set the
+tomcat internals. (Or any class that has been exposed via an MBean)
+Its usage is not very user friendly but the UI is
+extremely help for integrating command line scripts for monitoring
+and changing the internals of tomcat. You can do two things with the proxy:
+get information and set information. For you to really understand the
+JMX Proxy Servlet, you should have a general understanding of JMX.
+If you don't know what JMX is, then prepare to be confused.
+  /subsection
+
+  subsection name=JMX Query command
+pThis takes the form:/p
+sourcehttp://webserver/manager/jmxproxy/?qry=STUFF/source
+pWhere codeSTUFF/code is the JMX query you wish to perform. For 
example,
+here are some queries you might wish to run:/p
+ul
+  li
+codeqry=*%3Atype%3DRequestProcessor%2C* --
+ type=RequestProcessor/code which will locate all
+ workers which can process requests and report
+ their state.
+  /li
+  li
+codeqry=*%3Aj2eeType=Servlet%2c* --
+j2eeType=Servlet/code which return all loaded servlets.
+  /li
+  li
+
codeqry=Catalina%3Atype%3DEnvironment%2Cresourcetype%3DGlobal%2Cname%3DsimpleValue
 --
+
Catalina:type=Environment,resourcetype=Global,name=simpleValue/code
+which look for a specific MBean by the given name.
+  /li
+/ul
+p
+You'll need to experiment with this to really understand its capabilites.
+If you provide no codeqry/code parameter, then all of the MBeans will
+be displayed. We really recommend looking at the tomcat source code and
+understand the JMX spec to get a better understanding of all the queries
+you may run.
+/p
+  /subsection
+
+  subsection name=JMX Get command
+  p
+The JXMProxyServlet also supports a get command that you can use to
+fetch the value of a specific MBean's attribute. The general form of
+the codeget/code command is:
+  /p
+
+sourcehttp://webserver/manager/jmxproxy/?get=BEANNAMEamp;att=MYATTRIBUTEamp;key=MYKEY/source
+
+pYou must provide the following parameters:/p
+ol
+  licodeget/code: The full bean name/li
+  licodeatt/code: The attribute you wish to fetch/li
+  licodekey/code: (optional) The key into a CompositeData MBean 
attribute/li
+/ol
+p
+If all goes well, then it will say OK, otherwise an error message will
+be shown. For example, let's say we wish to fetch the current heap memory
+data:
+/p
+
+sourcehttp://webserver/manager/jmxproxy/?get=java.lang:type=Memoryamp;att=HeapMemoryUsage/source
+
+pOr, if you only want the used key:/p
+
+sourcehttp://webserver/manager/jmxproxy/
+ ?get=java.lang:type=Memoryamp;att=HeapMemoryUsageamp;key=used/source
+  /subsection
+
+  subsection name=JMX Set command
+p
+Now that you can query an MBean, its time to muck with Tomcat's internals!
+The general form of the set command is :
+/p
+sourcehttp://webserver/manager/jmxproxy/?set=BEANNAMEamp;att=MYATTRIBUTEamp;val=NEWVALUE/source
+pSo you need to provide 3 request parameters:/p
+ol
+  licodeset/code: The full bean name/li
+  licodeatt/code: The attribute you wish to alter/li
+  licodeval/code: The new value /li
+/ol
+p
+If all goes ok, then it will say OK, otherwise an error message will be
+shown. For example, lets say we wish to turn up debugging on the fly for 
the
+codeErrorReportValve/code. The following will set debugging to 10.
+/p
+sourcehttp://localhost:8080/manager/jmxproxy/
+ ?set=Catalina%3Atype%3DValve%2Cname%3DErrorReportValve%2Chost%3Dlocalhost
+ amp;att=debugamp;val=10/source
+pand my result is (YMMV):/p
+sourceResult: ok/source
+
+pHere is what I see if I pass in a bad value. Here is the URL I used,
+I try set debugging equal to 'cow':/p
+sourcehttp://localhost:8080/manager/jmxproxy/
+ ?set=Catalina%3Atype%3DValve%2Cname%3DErrorReportValve%2Chost%3Dlocalhost
+ amp;att=debugamp;val=cow/source
+pWhen I try that, my result is/p
+sourceError: java.lang.NumberFormatException: For input string: 

svn commit: r1641707 - /tomcat/trunk/webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 21:52:16 2014
New Revision: 1641707

URL: http://svn.apache.org/r1641707
Log:
Wrap parameters that are common to all commands into a Common Parameters 
subsection, so that they are listed in TOC.

Modified:
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1641707r1=1641706r2=1641707view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Nov 25 21:52:16 2014
@@ -249,16 +249,18 @@ represents the Manager command you wish 
 that are specific to that command.  In the illustrations below, customize
 the host and port appropriately for your installation./p
 
+subsection name=Common Parameters
+
 pMost commands accept one or more of the following query parameters:/p
 ul
 listrongpath/strong - The context path (including the leading slash)
 of the web application you are dealing with.  To select the ROOT web
-application, specify /.  strongNOTE/strong -
+application, specify /.  strongNOTE/strong:
 It is not possible to perform administrative commands on the
 Manager application itself./li
 listrongversion/strong - The version of this web application as used by
-the parallel deployment feature,/li
-listrongwar/strong - URL of a web application archive (WAR) file,
+the a href=config/context.htmlparallel deployment/a feature,/li
+listrongwar/strong - URL of a web application archive (WAR) file, or
 pathname of a directory which contains the web application, or a
 Context configuration .xml file.  You can use URLs in any of the
 following formats:
@@ -298,6 +300,8 @@ its message strings in resource bundles,
 have been translated for your platform.  The examples below show the English
 version of the messages./p
 
+/subsection
+
 subsection name=Deploy A New Application Remotely
 
 sourcehttp://localhost:8080/manager/text/deploy?path=/foo/source



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



[Bug 57261] New: Align /vminfo and /threaddump with other Manager commands and document them

2014-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57261

Bug ID: 57261
   Summary: Align /vminfo and /threaddump with other Manager
commands and document them
   Product: Tomcat 8
   Version: 8.0.15
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Manager
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com

ManagerServlet supports the following commands that are not yet documented:

http://localhost:8080/manager/text/vminfo
http://localhost:8080/manager/text/threaddump

For reference see r1476960 (in 8.0.0) and r1578256 (in 8.0.4).

TODO:
1. It is documented that all Manager commands have output that starts with
OK.
These commands do not have an OK line, but start their output with a date. It
is wrong and has to be fixed.

This includes the need to fix VminfoTask and ThreaddumpTask Ant tasks
(r1578256).

2. Document them in manager-howto.html

3. Maybe mention them in Javadoc for ManagerServlet class, like other commands
are listed there.

-- 
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: r1641718 - in /tomcat/trunk/webapps/docs: html-manager-howto.xml manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 22:47:31 2014
New Revision: 1641718

URL: http://svn.apache.org/r1641718
Log:
Arrange description of variants of Deploy command as subsections, so that have 
a bigger header (h5-h4) and are listed in TOC.

Modified:
tomcat/trunk/webapps/docs/html-manager-howto.xml
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/html-manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/html-manager-howto.xml?rev=1641718r1=1641717r2=1641718view=diff
==
--- tomcat/trunk/webapps/docs/html-manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/html-manager-howto.xml Tue Nov 25 22:47:31 2014
@@ -300,7 +300,7 @@ This command is the logical opposite of 
 
 pThere are a number of different ways the deploy command can be used./p
 
-h5Deploy a Directory or WAR by URL/h5
+subsection name=Deploy a Directory or WAR by URL
 
 pInstall a web application directory or .war file located on the Tomcat
 server. If no iContext Path/i is specified, the directory name or the
@@ -314,8 +314,7 @@ refer to the entire WAR file./p
 pIn this example the web application located in the directory
 codeC:\path\to\foo/code on the Tomcat server (running on Windows)
 is deployed as the web application context named code/footoo/code./p
-source
-Context Path: /footoo
+sourceContext Path: /footoo
 WAR or Directory URL: file:C:/path/to/foo
 /source
 
@@ -327,8 +326,9 @@ parameter so the context path defaults t
 archive file without the .war extension./p
 sourceWAR or Directory URL: jar:file:/path/to/bar.war!//source
 
+/subsection
 
-h5Deploy a Directory or War from the Host appBase/h5
+subsection name=Deploy a Directory or War from the Host appBase
 
 pInstall a web application directory or .war file located in your Host
 appBase directory. If no iContext Path/i is specified the directory name
@@ -348,8 +348,9 @@ application context named code/bartoo
 sourceContext Path: /bartoo
 WAR or Directory URL: bar.war/source
 
+/subsection
 
-h5Deploy using a Context configuration .xml file/h5
+subsection name=Deploy using a Context configuration quot;.xmlquot; file
 
 pIf the Host deployXML flag is set to true, you can install a web
 application using a Context configuration .xml file and an optional
@@ -380,7 +381,7 @@ on the server (Tomcat running on Unix).
 sourceXML Configuration file URL: file:/path/to/context.xml
 WAR or Directory URL: jar:file:/path/to/bar.war!//source
 
-
+/subsection
 /subsection
 
 subsection name=Upload a WAR file to install

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1641718r1=1641717r2=1641718view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Nov 25 22:47:31 2014
@@ -249,6 +249,9 @@ represents the Manager command you wish 
 that are specific to that command.  In the illustrations below, customize
 the host and port appropriately for your installation./p
 
+pThe commands are usually executed by HTTP GET requests. The
+code/deploy/code command has a form that is executed by an HTTP PUT 
request./p
+
 subsection name=Common Parameters
 
 pMost commands accept one or more of the following query parameters:/p
@@ -302,7 +305,7 @@ version of the messages./p
 
 /subsection
 
-subsection name=Deploy A New Application Remotely
+subsection name=Deploy A New Application Archive (WAR) Remotely
 
 sourcehttp://localhost:8080/manager/text/deploy?path=/foo/source
 
@@ -313,6 +316,8 @@ name or the war file name without the .w
 application can later be undeployed (and the corresponding application 
directory
 removed) by use of the code/undeploy/code command./p
 
+pThis command is executed by an HTTP PUT request./p
+
 pThe .WAR file may include Tomcat specific deployment configuration, by
 including a Context configuration XML file in
 code/META-INF/context.xml/code./p
@@ -362,18 +367,21 @@ error message.  Possible causes for prob
 codepath/code (which must not be in use by any other web application).
 This command is the logical opposite of the code/undeploy/code command./p
 
-pThere are a number of different ways the deploy command can be used./p
+pThis command is executed by an HTTP GET request.
+There are a number of different ways the deploy command can be used./p
+
+subsection name=Deploy a previously deployed webapp
 
-h5Deploy a previously deployed webapp/h5
+sourcehttp://localhost:8080/manager/text/deploy?path=/footooamp;tag=footag/source
 
 pThis can be used to deploy a previously deployed web application, which
 has been deployed using the codetag/code attribute. Note that the work
-directory for the Manager webapp will contain the previously deployed WARs;
+directory of the Manager webapp will contain the previously deployed 

svn commit: r1641720 - in /tomcat/trunk: java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 23:00:20 2014
New Revision: 1641720

URL: http://svn.apache.org/r1641720
Log:
Add /sslConnectorCiphers to the list of commands in ManagerServlet javadoc.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1641720r1=1641719r2=1641720view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Tue Nov 
25 23:00:20 2014
@@ -108,6 +108,8 @@ import org.apache.tomcat.util.res.String
  * lib/expire?path=/xxxamp;idle=mm/b - Expire sessions
  * for the context path code/xxx/code which were idle for at
  * least mm minutes./li
+ * lib/sslConnectorCiphers/b - Display diagnostic info on SSL/TLS ciphers
+ * that are currently configured for each connector.
  * lib/start?path=/xxx/b - Start the web application attached to
  * context path code/xxx/code for this virtual host./li
  * lib/stop?path=/xxx/b - Stop the web application attached to

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1641720r1=1641719r2=1641720view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Nov 25 23:00:20 2014
@@ -836,15 +836,15 @@ has been reloaded several times, it may 
 
 /subsection
 
-subsection name=Connector SSL diagnostics
+subsection name=Connector SSL/TLS diagnostics
 
 sourcehttp://localhost:8080/manager/text/sslConnectorCiphers/source
 
-pThe SSL Connector/Ciphers diagnostic lists the SSL ciphers that are 
currently
+pThe SSL Connector/Ciphers diagnostic lists the SSL/TLS ciphers that are 
currently
 configured for each connector. For NIO and NIO2, the names of the individual
 cipher suites are listed. For APR, the value of SSLCipherSuite is returned./p
 
-pThe response will ook something like this:/p
+pThe response will look something like this:/p
 sourceOK - Connector / SSL Cipher information
 Connector[HTTP/1.1-8080]
   SSL is not enabled for this connector



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



svn commit: r1641721 - /tomcat/trunk/webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 23:27:50 2014
New Revision: 1641721

URL: http://svn.apache.org/r1641721
Log:
Document /expire command.

Modified:
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1641721r1=1641720r2=1641721view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Nov 25 23:27:50 2014
@@ -671,16 +671,37 @@ include an error message.  Possible caus
 sourcehttp://localhost:8080/manager/text/sessions?path=/examples/source
 
 pDisplay the default session timeout for a web application, and the
-number of currently active sessions that fall within ten-minute ranges of
+number of currently active sessions that fall within one-minute ranges of
 their actual timeout times.  For example, after restarting Tomcat and then
 executing one of the JSP samples in the code/examples/code web app,
 you might get something like this:/p
-sourceOK - Session information for application at context path /examples
+
+source![CDATA[OK - Session information for application at context path 
/examples
 Default maximum session inactive interval 30 minutes
-30 - lt;40 minutes:1 sessions/source
+1 minutes: 1 sessions
+1 - 2 minutes: 1 sessions]]/source
 
 /subsection
 
+subsection name=Expire Sessions
+
+sourcehttp://localhost:8080/manager/text/expire?path=/examplesamp;idle=num/source
+
+pDisplay the session statistics (like the above code/sessions/code
+command) and expire sessions that are idle for longer than codenum/code
+minutes. To expire all sessions, use codeamp;idle=0/code ./p
+
+source![CDATA[OK - Session information for application at context path 
/examples
+Default maximum session inactive interval 30 minutes
+1 - 2 minutes: 1 sessions
+3 - 4 minutes: 1 sessions
+0 minutes: 2 sessions were expired]]/source
+
+pActually code/sessions/code and code/expire/code are synonims for
+the same command. The difference is in the presence of codeidle/code
+parameter./p
+
+/subsection
 
 subsection name=Start an Existing Application
 



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



svn commit: r1641722 - /tomcat/trunk/webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 23:48:30 2014
New Revision: 1641722

URL: http://svn.apache.org/r1641722
Log:
Document the Server Status page.

Modified:
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1641722r1=1641721r2=1641722view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Nov 25 23:48:30 2014
@@ -878,15 +878,27 @@ Connector[HTTP/1.1-8443]
 
 /subsection
 
-subsection name=Server Status
+/section
+
+section name=Server Status
+
+pFrom the following links you can view Status information about the server.
+Any one of strongmanager-**/strong roles allows access to this page./p
+
+sourcehttp://localhost:8080/manager/status
+http://localhost:8080/manager/status/all/source
 
-pFrom this link , you can view information about the server./p
+pDisplays server status information in HTML format./p
+
+sourcehttp://localhost:8080/manager/status?XML=true
+http://localhost:8080/manager/status/all?XML=true/source
+
+pDisplays server status information in XML format./p
 
 pFirst, you have the server and JVM version number, JVM provider, OS name
 and number followed by the architecture type./p
 
-pSecond, there is several information about the memory usage of the JVM
-(available, total and max memory)./p
+pSecond, there is information about the memory usage of the JVM./p
 
 pThen, there is information about the Tomcat AJP and HTTP connectors.
 The same information is available for both of them :
@@ -922,7 +934,9 @@ The same information is available for bo
 /ul
 /li
 /ul
-/subsection
+
+pIf you are using code/status/all/code command, additional information
+on each of deployed web applications will be available./p
 
 /section
 



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



svn commit: r1641723 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 23:55:14 2014
New Revision: 1641723

URL: http://svn.apache.org/r1641723
Log:
Improve documentation of the Manager application:

Merged revisions 1641656-1641692 from tomcat/trunk:

r1641656: Correction: The default configuration uses UserDatabaseRealm, not 
MemoryRealm. Add DataSourceRealm.
r1641660: Add section on HTML interface with a link to a document. Correct URL.
r1641692: Expand explanation on CSRF feature.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
  Merged /tomcat/trunk:r1641656-1641692

Modified: tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641723r1=1641722r2=1641723view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml Tue Nov 25 23:55:14 2014
@@ -83,7 +83,7 @@ example:/p
 ul
 liAs an application with a user interface you use in your browser.
 Here is an example URL where you can replace codelocalhost/code with
-your website host name:  codehttp://localhost/manager/html//code ./li
+your website host name:  codehttp://localhost:8080/manager/html/code ./li
 liA minimal version using HTTP requests only which is suitable for use
 by scripts setup by system administrators.  Commands are given as part of the
 request URI, and responses are in the form of simple text that can be easily
@@ -133,22 +133,25 @@ web application. The available roles are
 /ul
 
 pThe HTML interface is protected against CSRF (Cross-Site Request Forgery)
-attacks, but the text and JMX interfaces cannot be protected. To maintain
+attacks, but the text and JMX interfaces cannot be protected. It means that
+users who are allowed access to the text and JMX interfaces have to be cautious
+when accessing the Manager application with a web browser.
+To maintain
 the CSRF protection:/p
 
 ul
-  liUsers with the strongmanager-gui/strong role should not be granted
-  the strongmanager-script/strong or strongmanager-jmx/strong
-  roles./li
   liIf you use web browser to access the Manager application using
   a user that has either strongmanager-script/strong or
   strongmanager-jmx/strong roles (for example for testing
-  the plain text or JMX interfaces),
-  then all windows of the browser MUST be closed afterwards to terminate
-  the session./li
+  the plain text or JMX interfaces), do not visit other sites
+  where you may fall victim to a CSRF attack, and you MUST close all 
windows
+  of the browser afterwards to terminate the session./li
+  liIt is recommended to never grant
+  the strongmanager-script/strong or strongmanager-jmx/strong
+  roles to users that have the strongmanager-gui/strong role./li
 /ul
 
-pNote that JMX proxy interface is effectively low-level root-like
+pstrongNote/strong that JMX proxy interface is effectively low-level 
root-like
 administrative interface of Tomcat. One can do a lot, if he knows
 what commands to call. You should be cautious when enabling the
 strongmanager-jmx/strong role./p
@@ -162,13 +165,13 @@ As the majority of this document describ
 interface, let the role name for further example to be
 strongmanager-script/strong.
 Exactly how the usernames/passwords are configured depends on which
-codeRealm/code implementation you are using:/p
+a href=config/realm.htmlRealm implementation/a you are using:/p
 ul
-liemMemoryRealm/em #8212; This one is configured in the default
-code$CATALINA_BASE/conf/server.xml/code.
-If you have not configured it differently, or replaced it with
-a different codeRealm/code implementation, this realm
-reads an XML-format file stored at
+liemUserDatabaseRealm/em plus emMemoryUserDatabase/em, or 
emMemoryRealm/em
+#8212; The emUserDatabaseRealm/em and emMemoryUserDatabase/em are
+configured in the default code$CATALINA_BASE/conf/server.xml/code.
+Both emMemoryUserDatabase/em and emMemoryRealm/em read an
+XML-format file by default stored at
 code$CATALINA_BASE/conf/tomcat-users.xml/code, which can be
 edited with any text editor.  This file contains an XML
 codelt;usergt;/code for each individual user, which might
@@ -179,7 +182,8 @@ Exactly how the usernames/passwords are 
 add the strongmanager-script/strong role to the comma-delimited
 coderoles/code attribute for one or more existing users, and/or
 create new users with that assigned role./li
-liemJDBCRealm/em #8212; Your user and role information is stored in
+liemDataSourceRealm/em or emJDBCRealm/em
+#8212; Your user and role information is stored in
 a database accessed via JDBC.  Add the strongmanager-script/strong role
 to one or 

svn commit: r1641725 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 23:57:08 2014
New Revision: 1641725

URL: http://svn.apache.org/r1641725
Log:
Improve documentation of the Manager application:

Merged r1641704 from tomcat/trunk:
Swap Using JMXProxy and Ant sections. No change in the text of the sections 
themselves.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
  Merged /tomcat/trunk:r1641704

Modified: tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641725r1=1641724r2=1641725view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml Tue Nov 25 23:57:08 2014
@@ -888,6 +888,123 @@ The same information is available for bo
 
 /section
 
+section name=Using the JMX Proxy Servlet
+
+  subsection name=What is JMX Proxy Servlet
+The JMX Proxy Servlet is a lightweight proxy to get and set the
+tomcat internals. (Or any class that has been exposed via an MBean)
+Its usage is not very user friendly but the UI is
+extremely help for integrating command line scripts for monitoring
+and changing the internals of tomcat. You can do two things with the proxy:
+get information and set information. For you to really understand the
+JMX Proxy Servlet, you should have a general understanding of JMX.
+If you don't know what JMX is, then prepare to be confused.
+  /subsection
+
+  subsection name=JMX Query command
+pThis takes the form:/p
+sourcehttp://webserver/manager/jmxproxy/?qry=STUFF/source
+pWhere codeSTUFF/code is the JMX query you wish to perform. For 
example,
+here are some queries you might wish to run:/p
+ul
+  li
+codeqry=*%3Atype%3DRequestProcessor%2C* --
+ type=RequestProcessor/code which will locate all
+ workers which can process requests and report
+ their state.
+  /li
+  li
+codeqry=*%3Aj2eeType=Servlet%2c* --
+j2eeType=Servlet/code which return all loaded servlets.
+  /li
+  li
+
codeqry=Catalina%3Atype%3DEnvironment%2Cresourcetype%3DGlobal%2Cname%3DsimpleValue
 --
+
Catalina:type=Environment,resourcetype=Global,name=simpleValue/code
+which look for a specific MBean by the given name.
+  /li
+/ul
+p
+You'll need to experiment with this to really understand its capabilites.
+If you provide no codeqry/code parameter, then all of the MBeans will
+be displayed. We really recommend looking at the tomcat source code and
+understand the JMX spec to get a better understanding of all the queries
+you may run.
+/p
+  /subsection
+
+  subsection name=JMX Get command
+  p
+The JXMProxyServlet also supports a get command that you can use to
+fetch the value of a specific MBean's attribute. The general form of
+the codeget/code command is:
+  /p
+
+sourcehttp://webserver/manager/jmxproxy/?get=BEANNAMEamp;att=MYATTRIBUTEamp;key=MYKEY/source
+
+pYou must provide the following parameters:/p
+ol
+  licodeget/code: The full bean name/li
+  licodeatt/code: The attribute you wish to fetch/li
+  licodekey/code: (optional) The key into a CompositeData MBean 
attribute/li
+/ol
+p
+If all goes well, then it will say OK, otherwise an error message will
+be shown. For example, let's say we wish to fetch the current heap memory
+data:
+/p
+
+sourcehttp://webserver/manager/jmxproxy/?get=java.lang:type=Memoryamp;att=HeapMemoryUsage/source
+
+pOr, if you only want the used key:/p
+
+sourcehttp://webserver/manager/jmxproxy/
+ ?get=java.lang:type=Memoryamp;att=HeapMemoryUsageamp;key=used/source
+  /subsection
+
+  subsection name=JMX Set command
+p
+Now that you can query an MBean, its time to muck with Tomcat's internals!
+The general form of the set command is :
+/p
+sourcehttp://webserver/manager/jmxproxy/?set=BEANNAMEamp;att=MYATTRIBUTEamp;val=NEWVALUE/source
+pSo you need to provide 3 request parameters:/p
+ol
+  licodeset/code: The full bean name/li
+  licodeatt/code: The attribute you wish to alter/li
+  licodeval/code: The new value /li
+/ol
+p
+If all goes ok, then it will say OK, otherwise an error message will be
+shown. For example, lets say we wish to turn up debugging on the fly for 
the
+codeErrorReportValve/code. The following will set debugging to 10.
+/p
+sourcehttp://localhost:8080/manager/jmxproxy/
+ ?set=Catalina%3Atype%3DValve%2Cname%3DErrorReportValve%2Chost%3Dlocalhost
+ amp;att=debugamp;val=10/source
+pand my result is (YMMV):/p
+sourceResult: ok/source
+
+pHere is what I see if I pass in a bad value. Here is the 

svn commit: r1641726 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/html-manager-howto.xml webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Tue Nov 25 23:59:49 2014
New Revision: 1641726

URL: http://svn.apache.org/r1641726
Log:
Improve documentation of the Manager application:

Merged revisions 1641707-1641718 from tomcat/trunk:
r1641707: Wrap parameters that are common to all commands into a Common 
Parameters subsection, so that they are listed in TOC.
r1641718: Arrange description of variants of Deploy command as subsections, so 
that have a bigger header (h5-h4) and are listed in TOC.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/html-manager-howto.xml
tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
  Merged /tomcat/trunk:r1641707-1641718

Modified: tomcat/tc8.0.x/trunk/webapps/docs/html-manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/html-manager-howto.xml?rev=1641726r1=1641725r2=1641726view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/html-manager-howto.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/html-manager-howto.xml Tue Nov 25 
23:59:49 2014
@@ -300,7 +300,7 @@ This command is the logical opposite of 
 
 pThere are a number of different ways the deploy command can be used./p
 
-h5Deploy a Directory or WAR by URL/h5
+subsection name=Deploy a Directory or WAR by URL
 
 pInstall a web application directory or .war file located on the Tomcat
 server. If no iContext Path/i is specified, the directory name or the
@@ -314,8 +314,7 @@ refer to the entire WAR file./p
 pIn this example the web application located in the directory
 codeC:\path\to\foo/code on the Tomcat server (running on Windows)
 is deployed as the web application context named code/footoo/code./p
-source
-Context Path: /footoo
+sourceContext Path: /footoo
 WAR or Directory URL: file:C:/path/to/foo
 /source
 
@@ -327,8 +326,9 @@ parameter so the context path defaults t
 archive file without the .war extension./p
 sourceWAR or Directory URL: jar:file:/path/to/bar.war!//source
 
+/subsection
 
-h5Deploy a Directory or War from the Host appBase/h5
+subsection name=Deploy a Directory or War from the Host appBase
 
 pInstall a web application directory or .war file located in your Host
 appBase directory. If no iContext Path/i is specified the directory name
@@ -348,8 +348,9 @@ application context named code/bartoo
 sourceContext Path: /bartoo
 WAR or Directory URL: bar.war/source
 
+/subsection
 
-h5Deploy using a Context configuration .xml file/h5
+subsection name=Deploy using a Context configuration quot;.xmlquot; file
 
 pIf the Host deployXML flag is set to true, you can install a web
 application using a Context configuration .xml file and an optional
@@ -380,7 +381,7 @@ on the server (Tomcat running on Unix).
 sourceXML Configuration file URL: file:/path/to/context.xml
 WAR or Directory URL: jar:file:/path/to/bar.war!//source
 
-
+/subsection
 /subsection
 
 subsection name=Upload a WAR file to install

Modified: tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641726r1=1641725r2=1641726view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml Tue Nov 25 23:59:49 2014
@@ -249,16 +249,21 @@ represents the Manager command you wish 
 that are specific to that command.  In the illustrations below, customize
 the host and port appropriately for your installation./p
 
+pThe commands are usually executed by HTTP GET requests. The
+code/deploy/code command has a form that is executed by an HTTP PUT 
request./p
+
+subsection name=Common Parameters
+
 pMost commands accept one or more of the following query parameters:/p
 ul
 listrongpath/strong - The context path (including the leading slash)
 of the web application you are dealing with.  To select the ROOT web
-application, specify /.  strongNOTE/strong -
+application, specify /.  strongNOTE/strong:
 It is not possible to perform administrative commands on the
 Manager application itself./li
 listrongversion/strong - The version of this web application as used by
-the parallel deployment feature,/li
-listrongwar/strong - URL of a web application archive (WAR) file,
+the a href=config/context.htmlparallel deployment/a feature,/li
+listrongwar/strong - URL of a web application archive (WAR) file, or
 pathname of a directory which contains the web application, or a
 Context configuration .xml file.  You can use URLs in any of the
 following formats:
@@ -298,7 +303,9 @@ its message strings in resource bundles,
 have been translated for your platform.  The examples below show the English
 version of the messages./p
 
-subsection name=Deploy A 

svn commit: r1641728 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Wed Nov 26 00:01:36 2014
New Revision: 1641728

URL: http://svn.apache.org/r1641728
Log:
Add /sslConnectorCiphers to the list of commands in ManagerServlet javadoc.
Merged r1641720 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
  Merged /tomcat/trunk:r1641720

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1641728r1=1641727r2=1641728view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
Wed Nov 26 00:01:36 2014
@@ -108,6 +108,8 @@ import org.apache.tomcat.util.res.String
  * lib/expire?path=/xxxamp;idle=mm/b - Expire sessions
  * for the context path code/xxx/code which were idle for at
  * least mm minutes./li
+ * lib/sslConnectorCiphers/b - Display diagnostic info on SSL/TLS ciphers
+ * that are currently configured for each connector.
  * lib/start?path=/xxx/b - Start the web application attached to
  * context path code/xxx/code for this virtual host./li
  * lib/stop?path=/xxx/b - Stop the web application attached to

Modified: tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641728r1=1641727r2=1641728view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml Wed Nov 26 00:01:36 2014
@@ -836,15 +836,15 @@ has been reloaded several times, it may 
 
 /subsection
 
-subsection name=Connector SSL diagnostics
+subsection name=Connector SSL/TLS diagnostics
 
 sourcehttp://localhost:8080/manager/text/sslConnectorCiphers/source
 
-pThe SSL Connector/Ciphers diagnostic lists the SSL ciphers that are 
currently
+pThe SSL Connector/Ciphers diagnostic lists the SSL/TLS ciphers that are 
currently
 configured for each connector. For BIO and NIO, the names of the individual
 cipher suites are listed. For APR, the value of SSLCipherSuite is returned./p
 
-pThe response will ook something like this:/p
+pThe response will look something like this:/p
 sourceOK - Connector / SSL Cipher information
 Connector[HTTP/1.1-8080]
   SSL is not enabled for this connector



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



svn commit: r1641729 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Wed Nov 26 00:03:09 2014
New Revision: 1641729

URL: http://svn.apache.org/r1641729
Log:
Document /expire command.
Merged r1641721 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
  Merged /tomcat/trunk:r1641721

Modified: tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641729r1=1641728r2=1641729view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml Wed Nov 26 00:03:09 2014
@@ -671,16 +671,37 @@ include an error message.  Possible caus
 sourcehttp://localhost:8080/manager/text/sessions?path=/examples/source
 
 pDisplay the default session timeout for a web application, and the
-number of currently active sessions that fall within ten-minute ranges of
+number of currently active sessions that fall within one-minute ranges of
 their actual timeout times.  For example, after restarting Tomcat and then
 executing one of the JSP samples in the code/examples/code web app,
 you might get something like this:/p
-sourceOK - Session information for application at context path /examples
+
+source![CDATA[OK - Session information for application at context path 
/examples
 Default maximum session inactive interval 30 minutes
-30 - lt;40 minutes:1 sessions/source
+1 minutes: 1 sessions
+1 - 2 minutes: 1 sessions]]/source
 
 /subsection
 
+subsection name=Expire Sessions
+
+sourcehttp://localhost:8080/manager/text/expire?path=/examplesamp;idle=num/source
+
+pDisplay the session statistics (like the above code/sessions/code
+command) and expire sessions that are idle for longer than codenum/code
+minutes. To expire all sessions, use codeamp;idle=0/code ./p
+
+source![CDATA[OK - Session information for application at context path 
/examples
+Default maximum session inactive interval 30 minutes
+1 - 2 minutes: 1 sessions
+3 - 4 minutes: 1 sessions
+0 minutes: 2 sessions were expired]]/source
+
+pActually code/sessions/code and code/expire/code are synonims for
+the same command. The difference is in the presence of codeidle/code
+parameter./p
+
+/subsection
 
 subsection name=Start an Existing Application
 



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



svn commit: r1641730 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Wed Nov 26 00:04:18 2014
New Revision: 1641730

URL: http://svn.apache.org/r1641730
Log:
Document the Server Status page.
Merged r1641722 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
  Merged /tomcat/trunk:r1641722

Modified: tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641730r1=1641729r2=1641730view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml Wed Nov 26 00:04:18 2014
@@ -878,15 +878,27 @@ Connector[HTTP/1.1-8443]
 
 /subsection
 
-subsection name=Server Status
+/section
+
+section name=Server Status
+
+pFrom the following links you can view Status information about the server.
+Any one of strongmanager-**/strong roles allows access to this page./p
+
+sourcehttp://localhost:8080/manager/status
+http://localhost:8080/manager/status/all/source
 
-pFrom this link , you can view information about the server./p
+pDisplays server status information in HTML format./p
+
+sourcehttp://localhost:8080/manager/status?XML=true
+http://localhost:8080/manager/status/all?XML=true/source
+
+pDisplays server status information in XML format./p
 
 pFirst, you have the server and JVM version number, JVM provider, OS name
 and number followed by the architecture type./p
 
-pSecond, there is several information about the memory usage of the JVM
-(available, total and max memory)./p
+pSecond, there is information about the memory usage of the JVM./p
 
 pThen, there is information about the Tomcat AJP and HTTP connectors.
 The same information is available for both of them :
@@ -922,7 +934,9 @@ The same information is available for bo
 /ul
 /li
 /ul
-/subsection
+
+pIf you are using code/status/all/code command, additional information
+on each of deployed web applications will be available./p
 
 /section
 



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



svn commit: r1641732 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Wed Nov 26 00:11:14 2014
New Revision: 1641732

URL: http://svn.apache.org/r1641732
Log:
Update changelog.

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1641732r1=1641731r2=1641732view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Nov 26 00:11:14 2014
@@ -128,6 +128,10 @@
 Improve HTML version of build instructions and align with
 BUILDING.txt. (kkolinko)
   /update
+  update
+Improve Tomcat Manager documentation. Rearrange, add section on
+HTML GUI, document /expire command and Server Status page. (kkolinko)
+  /update
   fix
 bug57245/bug: Correct the reference to codeallowLinking/code in
 the security configuration guide since that attribute has moved from 
the



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



svn commit: r1641734 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Wed Nov 26 00:19:50 2014
New Revision: 1641734

URL: http://svn.apache.org/r1641734
Log:
Improve documentation of the Manager application:

- Correction: The default configuration uses UserDatabaseRealm, not 
MemoryRealm. Add DataSourceRealm.
- Add section on HTML interface with a link to a document. Correct URL.
- Expand explanation on CSRF feature.

Merged revision 1641723 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1641656-1641692
  Merged /tomcat/tc8.0.x/trunk:r1641723

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1641734r1=1641733r2=1641734view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Nov 26 00:19:50 2014
@@ -115,6 +115,9 @@
 WebSocket classes with Java 7 (codeide-eclipse-websocket/code
 target added in 7.0.56). (kkolinko)
   /update
+  update
+Improve Tomcat Manager documentation. (kkolinko)
+  /update
 /changelog
   /subsection
   subsection name=Other

Modified: tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641734r1=1641733r2=1641734view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Wed Nov 26 00:19:50 2014
@@ -83,7 +83,7 @@ example:/p
 ul
 liAs an application with a user interface you use in your browser.
 Here is an example URL where you can replace codelocalhost/code with
-your website host name:  codehttp://localhost/manager/html//code ./li
+your website host name:  codehttp://localhost:8080/manager/html/code ./li
 liA minimal version using HTTP requests only which is suitable for use
 by scripts setup by system administrators.  Commands are given as part of the
 request URI, and responses are in the form of simple text that can be easily
@@ -133,22 +133,25 @@ web application. The available roles are
 /ul
 
 pThe HTML interface is protected against CSRF (Cross-Site Request Forgery)
-attacks, but the text and JMX interfaces cannot be protected. To maintain
+attacks, but the text and JMX interfaces cannot be protected. It means that
+users who are allowed access to the text and JMX interfaces have to be cautious
+when accessing the Manager application with a web browser.
+To maintain
 the CSRF protection:/p
 
 ul
-  liUsers with the strongmanager-gui/strong role should not be granted
-  the strongmanager-script/strong or strongmanager-jmx/strong
-  roles./li
   liIf you use web browser to access the Manager application using
   a user that has either strongmanager-script/strong or
   strongmanager-jmx/strong roles (for example for testing
-  the plain text or JMX interfaces),
-  then all windows of the browser MUST be closed afterwards to terminate
-  the session./li
+  the plain text or JMX interfaces), do not visit other sites
+  where you may fall victim to a CSRF attack, and you MUST close all 
windows
+  of the browser afterwards to terminate the session./li
+  liIt is recommended to never grant
+  the strongmanager-script/strong or strongmanager-jmx/strong
+  roles to users that have the strongmanager-gui/strong role./li
 /ul
 
-pNote that JMX proxy interface is effectively low-level root-like
+pstrongNote/strong that JMX proxy interface is effectively low-level 
root-like
 administrative interface of Tomcat. One can do a lot, if he knows
 what commands to call. You should be cautious when enabling the
 strongmanager-jmx/strong role./p
@@ -162,13 +165,13 @@ As the majority of this document describ
 interface, let the role name for further example to be
 strongmanager-script/strong.
 Exactly how the usernames/passwords are configured depends on which
-codeRealm/code implementation you are using:/p
+a href=config/realm.htmlRealm implementation/a you are using:/p
 ul
-liemMemoryRealm/em #8212; This one is configured in the default
-code$CATALINA_BASE/conf/server.xml/code.
-If you have not configured it differently, or replaced it with
-a different codeRealm/code implementation, this realm
-reads an XML-format file stored at
+liemUserDatabaseRealm/em plus emMemoryUserDatabase/em, or 
emMemoryRealm/em
+#8212; The emUserDatabaseRealm/em and emMemoryUserDatabase/em are
+configured in the default code$CATALINA_BASE/conf/server.xml/code.
+Both emMemoryUserDatabase/em and 

svn commit: r1641735 - /tomcat/trunk/webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Wed Nov 26 00:29:42 2014
New Revision: 1641735

URL: http://svn.apache.org/r1641735
Log:
Correct typos

Modified:
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1641735r1=1641734r2=1641735view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Wed Nov 26 00:29:42 2014
@@ -926,7 +926,7 @@ The same information is available for bo
 appropriate./p/li
 lipemKeep-Alive/em : The thread keeps the connection open to
 the client in case the client sends another request. If another request
-is received, the next stage will br Parse and Prepare Requst. If no
+is received, the next stage will be Parse and Prepare Request. If no
 request is received before the keep alive times out, the connection 
will
 be closed and the next stage will be Ready./p/li
 lipemReady/em : The thread is at rest and ready to be



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



svn commit: r1641736 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Wed Nov 26 00:31:37 2014
New Revision: 1641736

URL: http://svn.apache.org/r1641736
Log:
Correct typos
Merged r1641735 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
  Merged /tomcat/trunk:r1641735

Modified: tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641736r1=1641735r2=1641736view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml Wed Nov 26 00:31:37 2014
@@ -926,7 +926,7 @@ The same information is available for bo
 appropriate./p/li
 lipemKeep-Alive/em : The thread keeps the connection open to
 the client in case the client sends another request. If another request
-is received, the next stage will br Parse and Prepare Requst. If no
+is received, the next stage will be Parse and Prepare Request. If no
 request is received before the keep alive times out, the connection 
will
 be closed and the next stage will be Ready./p/li
 lipemReady/em : The thread is at rest and ready to be



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



svn commit: r1641737 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/manager-howto.xml

2014-11-25 Thread kkolinko
Author: kkolinko
Date: Wed Nov 26 00:33:15 2014
New Revision: 1641737

URL: http://svn.apache.org/r1641737
Log:
Correct typos
Merged r1641736 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1641735
  Merged /tomcat/tc8.0.x/trunk:r1641736

Modified: tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641737r1=1641736r2=1641737view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Wed Nov 26 00:33:15 2014
@@ -855,7 +855,7 @@ The same information is available for bo
 appropriate./p/li
 lipemKeep-Alive/em : The thread keeps the connection open to
 the client in case the client sends another request. If another request
-is received, the next stage will br Parse and Prepare Requst. If no
+is received, the next stage will be Parse and Prepare Request. If no
 request is received before the keep alive times out, the connection 
will
 be closed and the next stage will be Ready./p/li
 lipemReady/em : The thread is at rest and ready to be



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



Re: svn commit: r1641363 - in /tomcat/trunk: ./ conf/ java/org/apache/catalina/tribes/transport/nio/ java/org/apache/jasper/ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ java/org

2014-11-25 Thread Konstantin Kolinko
2014-11-24 14:19 GMT+03:00  ma...@apache.org:
 Author: markt
 Date: Mon Nov 24 11:19:41 2014
 New Revision: 1641363

 URL: http://svn.apache.org/r1641363
 Log:
 More changes for Java 8 as the minimum version

 Modified:
 tomcat/trunk/build.xml
 tomcat/trunk/conf/web.xml
 
 tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
 
 tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
 tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
 tomcat/trunk/java/org/apache/jasper/JspC.java
 tomcat/trunk/java/org/apache/jasper/Options.java
 tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
 tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
 tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
 tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
 tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
 tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
 tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
 tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
 tomcat/trunk/modules/jdbc-pool/build.properties.default
 tomcat/trunk/modules/jdbc-pool/pom.xml
 tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java
 
 tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
 
 tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
 tomcat/trunk/webapps/docs/jasper-howto.xml


 Modified: tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1641363r1=1641362r2=1641363view=diff
 ==
 --- tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java (original)
 +++ tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Mon Nov 24 
 11:19:41 2014
 @@ -318,9 +318,9 @@ public class JDTCompiler extends org.apa
  CompilerOptions.VERSION_1_7);

The above line is an else branch that needs 1_7 - 1_8 change as well.

  }
  } else {
 -// Default to 1.7
 +// Default to 1.8
  settings.put(CompilerOptions.OPTION_Source,
 -CompilerOptions.VERSION_1_7);
 +CompilerOptions.VERSION_1_8);
  }

  // Target JVM
 @@ -364,11 +364,11 @@ public class JDTCompiler extends org.apa
  CompilerOptions.VERSION_1_7);

Also here.

  }
  } else {
 -// Default to 1.7
 +// Default to 1.8
  settings.put(CompilerOptions.OPTION_TargetPlatform,
 -CompilerOptions.VERSION_1_7);
 +CompilerOptions.VERSION_1_8);
  settings.put(CompilerOptions.OPTION_Compliance,
 -CompilerOptions.VERSION_1_7);
 +CompilerOptions.VERSION_1_8);
  }

  final IProblemFactory problemFactory =



Best regards,
Konstantin Kolinko

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

2014-11-25 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/34

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1641736
Blamelist: kkolinko

Build succeeded!

Sincerely,
 -The Buildbot




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