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

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

--- Comment #1 from Oleg Trokhov otro...@minsk.ximxim.com ---
Created attachment 32231
  -- https://issues.apache.org/bugzilla/attachment.cgi?id=32231action=edit
Resolve 1 and 2 task item

-- 
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 57261] Align /vminfo and /threaddump with other Manager commands and document them

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

Oleg Trokhov otro...@minsk.ximxim.com changed:

   What|Removed |Added

 OS||All

--- Comment #2 from Oleg Trokhov otro...@minsk.ximxim.com ---
1. I added OK and some short description to responces, but what you mean
about need to fix VminfoTask and ThreaddumpTask Ant tasks?
2. Added
3. This comments alredy exist in ManagerServlet class

-- 
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 57261] Align /vminfo and /threaddump with other Manager commands and document them

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

--- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com ---
(In reply to Oleg Trokhov from comment #2)

There exist org.apache.catalina.ant.VminfoTask and ThreaddumpTask classes that
are used as tasks in Ant. They call those manager commands via HTTP and parse
their response. They should not stop working with the change of the output
format.

-- 
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 57261] Align /vminfo and /threaddump with other Manager commands and document them

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

--- Comment #4 from Oleg Trokhov otro...@minsk.ximxim.com ---
I found this classes, they have only these code:

 public void execute() throws BuildException {

super.execute();
execute(/threaddump);

}
Output from manager commands doesn't broken, all work fine. Or I misunderstood 
something?

-- 
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: r1642043 - /tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml

2014-11-27 Thread kkolinko
Author: kkolinko
Date: Thu Nov 27 08:37:57 2014
New Revision: 1642043

URL: http://svn.apache.org/r1642043
Log:
Improve documentation of the Manager application:
Swap Using JMXProxy and Ant sections. No change in the text of the sections 
themselves.

Backport of r1641725 from Tomcat 8.

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

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=1642043r1=1642042r2=1642043view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Thu Nov 27 08:37:57 2014
@@ -867,6 +867,124 @@ 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
+ 

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

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

--- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com ---
(In reply to Oleg Trokhov from comment #4)

OK. Thank you.

Before looking at the source code I thought that there was some built-in change
in behaviour. Actually there is an explicit configuration setting available
(ignoreResponseConstraint attribute on AbstractCatalinaTask), that allows to
turn off parsing of the first line of the 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



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

2014-11-27 Thread kkolinko
Author: kkolinko
Date: Thu Nov 27 08:54:22 2014
New Revision: 1642045

URL: http://svn.apache.org/r1642045
Log:
Document the Server Status page.
Merged r1641730 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:r1641722
  Merged /tomcat/tc8.0.x/trunk:r1641730

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=1642045r1=1642044r2=1642045view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Nov 27 08:54:22 2014
@@ -116,7 +116,8 @@
 target added in 7.0.56). (kkolinko)
   /update
   update
-Improve Tomcat Manager documentation. (kkolinko)
+Improve Tomcat Manager documentation. Rearrange, add section on
+HTML GUI, document Server Status page. (kkolinko)
   /update
 /changelog
   /subsection

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=1642045r1=1642044r2=1642045view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Thu Nov 27 08:54:22 2014
@@ -819,15 +819,27 @@ has been reloaded several times, it may 
 
 /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 :
@@ -863,7 +875,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: r1642046 - /tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml

2014-11-27 Thread kkolinko
Author: kkolinko
Date: Thu Nov 27 08:59:05 2014
New Revision: 1642046

URL: http://svn.apache.org/r1642046
Log:
CTR: docs
Improving manager documentation.
Swap Using JMXProxy and Ant sections. No change in the text of the sections 
themselves.

Backport of r1642043 from Tomcat 7.

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

Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=1642046r1=1642045r2=1642046view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Thu Nov 27 08:59:05 2014
@@ -1022,6 +1022,91 @@ 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
+This takes the form:
+source
+http://webserver/manager/jmxproxy/?qry=STUFF
+/source
+Where codeSTUFF/code is the JMX query you wish to perform. For example,
+here are some queries you might wish to run:
+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
+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.
+  /subsection
+
+  subsection name=JMX Set command
+Now that you can query an MBean, its time to muck with Tomcat's internals!
+The general form of the set command is :
+source
+http://webserver/manager/jmxproxy/?set=BEANNAMEamp;att=MYATTRIBUTEamp;val=NEWVALUE
+/source
+So you need to provide 3 request parameters:
+ol
+  licodeset/code: The full bean name/li
+  licodeatt/code: The attribute you wish to alter/li
+  licodeval/code: The new value /li
+/ol
+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.
+source
+http://localhost:8080/manager/jmxproxy/
+ ?set=Catalina%3Atype%3DValve%2Cname%3DErrorReportValve%2Chost%3Dlocalhost
+ amp;att=debugamp;val=10
+/source
+and my result is (YMMV):
+source
+Result: ok
+/source
+
+Here is what I see if I pass in a bad value. Here is the URL I used,
+I try set debugging equal to 'cow':
+source
+http://localhost:8080/manager/jmxproxy/
+ ?set=Catalina%3Atype%3DValve%2Cname%3DErrorReportValve%2Chost%3Dlocalhost
+ amp;att=debugamp;val=cow
+/source
+When I try that, my result is
+source
+Error: java.lang.NumberFormatException: For input string: cow
+/source
+  /subsection
+
+
+/section
+
 section name=Executing Manager Commands With Ant
 
 pIn addition to the ability to execute Manager commands via HTTP requests,
@@ -1316,91 +1401,6 @@ see the output of each task call appende
 
 /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
-   

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

2014-11-27 Thread kkolinko
Author: kkolinko
Date: Thu Nov 27 09:09:54 2014
New Revision: 1642049

URL: http://svn.apache.org/r1642049
Log:
CTR: docs
Improving manager documentation.
Document the Server Status page.
Merged r1642045 from tomcat/tc7.0.x/trunk.

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

Propchange: tomcat/tc6.0.x/trunk/
--
  Merged /tomcat/trunk:r1641722
  Merged /tomcat/tc7.0.x/trunk:r1642045
  Merged /tomcat/tc8.0.x/trunk:r1641730

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1642049r1=1642048r2=1642049view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Nov 27 09:09:54 2014
@@ -59,7 +59,8 @@
 Correct documentation for cgiPathPrefix. (kkolinko)
   /fix
   update
-Improve Tomcat Manager documentation. (kkolinko)
+Improve Tomcat Manager documentation. Rearrange, add section on
+HTML GUI, document Server Status page. (kkolinko)
   /update
 /changelog
   /subsection

Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=1642049r1=1642048r2=1642049view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Thu Nov 27 09:09:54 2014
@@ -974,15 +974,27 @@ has been reloaded several times, it may 
  
 /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
 
-pFirst, you have the server and JVM version number, JVM provider, OS name 
+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 :
@@ -1018,7 +1030,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



[Bug 57271] New: Axiom2 Update

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

Bug ID: 57271
   Summary: Axiom2 Update
   Product: Tomcat 7
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: load...@uk.ibm.com

Hi,

I like to request an update to Tomcat to use Axiom version 1.2.14 which is
required to resolve issues we're seeing with handling SOAP faults.

Many thanks

-- 
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: r1642123 - in /tomcat/tc6.0.x/trunk/webapps/manager: status.xsd xform.xsl

2014-11-27 Thread kkolinko
Author: kkolinko
Date: Thu Nov 27 12:03:54 2014
New Revision: 1642123

URL: http://svn.apache.org/r1642123
Log:
CTR: whitespace
Tabs - spaces. A part of r981579.

Modified:
tomcat/tc6.0.x/trunk/webapps/manager/status.xsd
tomcat/tc6.0.x/trunk/webapps/manager/xform.xsl

Modified: tomcat/tc6.0.x/trunk/webapps/manager/status.xsd
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/status.xsd?rev=1642123r1=1642122r2=1642123view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/manager/status.xsd (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/status.xsd Thu Nov 27 12:03:54 2014
@@ -18,62 +18,62 @@
 !-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by peter lin 
(consultant) --
 !--W3C Schema generated by XMLSPY v5 rel. 4 U (http://www.xmlspy.com)--
 xs:schema xmlns:xs=http://www.w3.org/2001/XMLSchema; 
elementFormDefault=qualified
-   xs:complexType name=connector
-   xs:sequence
-   xs:element name=threadInfo type=threadInfo/
-   xs:element name=requestInfo type=requestInfo/
-   xs:element name=workers type=workers/
-   /xs:sequence
-   xs:attribute name=name type=xs:string use=required/
-   /xs:complexType
-   xs:complexType name=jvm
-   xs:sequence
-   xs:element name=memory type=memory/
-   /xs:sequence
-   /xs:complexType
-   xs:complexType name=memory
-   xs:attribute name=free type=xs:long use=required/
-   xs:attribute name=total type=xs:long use=required/
-   xs:attribute name=max type=xs:long use=required/
-   /xs:complexType
-   xs:complexType name=requestInfo
-   xs:attribute name=maxTime type=xs:long use=required/
-   xs:attribute name=processingTime type=xs:int 
use=required/
-   xs:attribute name=requestCount type=xs:long 
use=required/
-   xs:attribute name=errorCount type=xs:long use=required/
-   xs:attribute name=bytesReceived type=xs:long 
use=required/
-   xs:attribute name=bytesSent type=xs:long use=required/
-   /xs:complexType
-   xs:element name=status
-   xs:complexType
-   xs:sequence
-   xs:element name=jvm type=jvm/
-   xs:element name=connector type=connector/
-   /xs:sequence
-   /xs:complexType
-   /xs:element
-   xs:complexType name=threadInfo
-   xs:attribute name=maxThreads type=xs:int use=required/
-   xs:attribute name=minSpareThreads type=xs:int 
use=required/
-   xs:attribute name=maxSpareThreads type=xs:int 
use=required/
-   xs:attribute name=currentThreadCount type=xs:int 
use=required/
-   xs:attribute name=currentThreadsBusy type=xs:int 
use=required/
-   /xs:complexType
-   xs:complexType name=worker
-   xs:attribute name=stage type=xs:string use=required/
-   xs:attribute name=requestProcessingTime type=xs:int 
use=required/
-   xs:attribute name=requestBytesSent type=xs:long 
use=required/
-   xs:attribute name=requestBytesRecieved type=xs:long 
use=required/
-   xs:attribute name=remoteAddr type=xs:string 
use=required/
-   xs:attribute name=virtualHost type=xs:string 
use=required/
-   xs:attribute name=method type=xs:string use=required/
-   xs:attribute name=currentUri type=xs:string 
use=required/
-   xs:attribute name=currentQueryString type=xs:string 
use=required/
-   xs:attribute name=protocol type=xs:string use=required/
-   /xs:complexType
-   xs:complexType name=workers
-   xs:sequence
-   xs:element name=worker type=worker/
-   /xs:sequence
-   /xs:complexType
+xs:complexType name=connector
+xs:sequence
+xs:element name=threadInfo type=threadInfo/
+xs:element name=requestInfo type=requestInfo/
+xs:element name=workers type=workers/
+/xs:sequence
+xs:attribute name=name type=xs:string use=required/
+/xs:complexType
+xs:complexType name=jvm
+xs:sequence
+xs:element name=memory type=memory/
+/xs:sequence
+/xs:complexType
+xs:complexType name=memory
+xs:attribute name=free type=xs:long use=required/
+xs:attribute name=total type=xs:long use=required/
+xs:attribute name=max type=xs:long use=required/
+/xs:complexType
+xs:complexType name=requestInfo
+xs:attribute name=maxTime type=xs:long use=required/
+xs:attribute name=processingTime type=xs:int use=required/
+xs:attribute name=requestCount type=xs:long use=required/
+xs:attribute 

[Bug 57271] Axiom2 Update

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

--- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com ---
For starters, what exact version of Tomcat 7 are you using, and where have you
found Axiom in Tomcat?

I think that Tomcat 7 does not use Apache Axiom or Apache Axis.

For reference, Axiom is this project:
http://ws.apache.org/axiom/

-- 
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 57271] Axiom2 Update

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

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

   What|Removed |Added

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

--- Comment #2 from Mark Thomas ma...@apache.org ---
Tomcat doesn't (and never has in the 10+ years I have been involved with the
project) ship with Axiom.

-- 
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 57274] New: Annotation scanning can cause classes to skip class transformation

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

Bug ID: 57274
   Summary: Annotation scanning can cause classes to skip class
transformation
   Product: Tomcat 8
   Version: 8.0.14
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: major
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: pverhey...@broadleafcommerce.com

Full context, I am using Spring 4.1.2.RELEASE in my application with Spring
Instrument hooked up as a -javaagent
(-javaagent:/path/to/spring-instrument-4.1.2.RELEASE). We are relying on class
transformation to transform some of our JPA classes and add new methods/fields
on startup. However, I observed that for some classes, class transformation is
completely skipped.

After some debugging, I have narrowed this down to the getResourceInternal
method of WebappClassLoaderBase. Specifically, this is giving me grief:

protected ResourceEntry findResourceInternal(final String name, final
String path) {

if (!state.isAvailable()) {
log.info(sm.getString(webappClassLoader.stopped, name));
return null;
}

if (name == null || path == null) {
return null;
}
// This is returning a non-null entry. On every other class that I
observed, this returns null and it continues on to the class transformers
ResourceEntry entry = resourceEntries.get(path);
if (entry != null) {
return entry;
}
...
...
// Remaining implementation excluded, but below here is where it loops
through the configured `ClassFileTransformer`s

When my JPA persistent unit is loaded, about 98% of the classes return null for
resourceEntries.get(path). Some classes return a non-null entry, and so they
are immediately returned thus skipping the class transformation below.

With more debugging, I came across the code on startup that scans every class
in every jar in the web application on startup to look for SCIs
(ContextConfig.webConfig()). For almost every class that it looks for, it grabs
an input stream based for the class file based on the FileInputStream and then
puts it in a cache.

However, this process also looks for super classes (from ContextConfig):

private void populateJavaClassCache(String className, JavaClass javaClass)
{
if (javaClassCache.containsKey(className)) {
return;
}

// Add this class to the cache
javaClassCache.put(className, new JavaClassCacheEntry(javaClass));

populateJavaClassCache(javaClass.getSuperclassName());

for (String iterface : javaClass.getInterfaceNames()) {
populateJavaClassCache(iterface);
}
}

where populateJavaClassCache:

private void populateJavaClassCache(String className) {
if (!javaClassCache.containsKey(className)) {
String name = className.replace('.', '/') + .class;
try (InputStream is =
context.getLoader().getClassLoader().getResourceAsStream(name)) {
if (is == null) {
return;
}
ClassParser parser = new ClassParser(is);
JavaClass clazz = parser.parse();
populateJavaClassCache(clazz.getClassName(), clazz);
} catch (ClassFormatException e) {
log.debug(sm.getString(contextConfig.invalidSciHandlesTypes,
className), e);
} catch (IOException e) {
log.debug(sm.getString(contextConfig.invalidSciHandlesTypes,
className), e);
}
}
}

Using context.getLoader().getClassLoader().getResourceAsStream() causes the
WebappClassLoader to load the class and store it in the resourceEntries map.
However at this point, the WebappClassLoader does not have any
ClassTransformers registered with it yet, and thus no class transformation
happens.

So, if you have any JPA entity that is a superclass of something else, class
transformation would be skipped.

I am not sure exactly what the right fix is here but I feel like it should be
something that skips using the WebappClassLoader to load the class? That could
be very expensive though as we would need to scan through all of the jars in
the classpath again to find the superclass definition (which would make this
O(n2).

I have some additional information at
https://github.com/BroadleafCommerce/BroadleafCommerce/issues/1171 but I put in
just the Tomcat-relevant info here.

-- 
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 57275] New: Constant WriteClient failed with 1229

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

Bug ID: 57275
   Summary: Constant WriteClient failed with 1229
   Product: Tomcat Connectors
   Version: 1.2.40
  Hardware: Macintosh
Status: NEW
  Severity: normal
  Priority: P2
 Component: isapi
  Assignee: dev@tomcat.apache.org
  Reporter: hostmas...@raymears.com

We use the isapi_redirect.dll 1.2.40 (401920 bytes) from Adobe with ColdFusion
10 on Windows 2012R2/IIS 8.5. The previous connector that Adobe released
(update 14) caused a IIS application pool crash for us, and so Adobe released a
DLL to address our particular scenario.

Throughout the day, the log will fill with these errors:

[Thu Nov 27 13:20:38.621 2014] [21352:21236] [error]
isapi_write_client::jk_isapi_plugin.c (1400): WriteClient failed with 995
(0x03e3)
[Thu Nov 27 13:20:38.655 2014] [21352:21236] [info]
ajp_process_callback::jk_ajp_common.c (2089): Writing to client aborted or
client network problems
[Thu Nov 27 13:20:38.701 2014] [21352:21236] [info]
ajp_service::jk_ajp_common.c (2795): (cfusion) sending request to tomcat failed
(unrecoverable), because of client write error (attempt=1)
[Thu Nov 27 13:20:38.743 2014] [21352:21236] [info]
HttpExtensionProc::jk_isapi_plugin.c (2603): service() failed because client
aborted connection
[Thu Nov 27 13:20:39.669 2014] [21352:15436] [error]
start_response::jk_isapi_plugin.c (1271): HSE_REQ_SEND_RESPONSE_HEADER failed
with error=87 (0x0057)
[Thu Nov 27 13:20:39.700 2014] [21352:15436] [error]
isapi_write_client::jk_isapi_plugin.c (1400): WriteClient failed with 1229
(0x04cd)
[Thu Nov 27 13:20:39.721 2014] [21352:15436] [info]
ajp_process_callback::jk_ajp_common.c (2089): Writing to client aborted or
client network problems
[Thu Nov 27 13:20:39.829 2014] [21352:15436] [info]
ajp_service::jk_ajp_common.c (2795): (cfusion) sending request to tomcat failed
(unrecoverable), because of client write error (attempt=1)
[Thu Nov 27 13:20:39.868 2014] [21352:15436] [info]
HttpExtensionProc::jk_isapi_plugin.c (2603): service() failed because client
aborted connection


We have dynamic and static compression enabled on the server, but disabling
both/either does not stop the error. We have tried to tune the connector with
various settings (increasing/decreating timeouts/threads etc) and still nothing
will stop the errors.

In addition, the log level of the connector is not adhered to. We have
log_level set to info, yet we see error, warn and info.

Our settings:

isapi_redirect.properties:

worker.list=cfusion
worker.cfusion.type=ajp13
worker.cfusion.host=localhost
worker.cfusion.port=8012
worker.cfusion.max_reuse_connections=250
worker.cfusion.connection_pool_size=500
worker.cfusion.connection_pool_timeout=60

workers.properties:

extension_uri=/jakarta/isapi_redirect.dll
log_file=C:\ColdFusion10\config\wsconfig\2\isapi_redirect.log
log_level=info
worker_file=C:\ColdFusion10\config\wsconfig\2\workers.properties
worker_mount_file=C:\ColdFusion10\config\wsconfig\2\uriworkermap.properties
iis_buffer_enable=true

Please can someone tell me if this version of the connector has an issue/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 57275] Constant WriteClient failed with 1229

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

hostmas...@raymears.com changed:

   What|Removed |Added

   Hardware|Macintosh   |PC
 OS||Windows Server 2012

-- 
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 57275] Constant WriteClient failed with 1229

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

hostmas...@raymears.com changed:

   What|Removed |Added

 OS||Windows Server 2012

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

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



[jira] [Created] (MTOMCAT-288) Tomcat cluster deployment?

2014-11-27 Thread Sbremal (JIRA)
Sbremal created MTOMCAT-288:
---

 Summary: Tomcat cluster deployment?
 Key: MTOMCAT-288
 URL: https://issues.apache.org/jira/browse/MTOMCAT-288
 Project: Apache Tomcat Maven Plugin
  Issue Type: Wish
Reporter: Sbremal


Would it be possible that add a feature to deploy WARs on multiple Tomcat 
instances building a Tomcat cluster? As cluster is the feature of Tomcat I 
would assume there is a feature for cluster deployment as well. The closest I 
found was FarmWarDeployer, does not look PRD ready.

1. We do not want to restructure our Jenkins jobs to accommodate cluster 
deployment (cut jobs half, introduce loops etc.)
2. We want to keep the cluster deployment as close to Tomcat as possible.
3. Tomcat manager is running on each Tomcat instance, i.e. there is no cluster 
manager. (?)
4. Apparently the best place for this feature would be the Maven Tomcat plug-in.

The URL Maven passes to the plug-in would be a comma separated list of Tomcat 
instances, and the plug-in would iterate through this list performing 
deployment on each Tomcat.

What do you think?



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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



[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed

2014-11-27 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-test-bio has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-bio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 16 mins 2 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141127-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141127-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141127.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dexecute.test.nio=false -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/wo
 rkspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20141127.jar
 -Dtest.temp=output/test-tmp-BIO 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141127.jar
 test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump

svn commit: r1642190 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

2014-11-27 Thread remm
Author: remm
Date: Thu Nov 27 17:07:59 2014
New Revision: 1642190

URL: http://svn.apache.org/r1642190
Log:
Also encode primitive types.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1642190r1=1642189r2=1642190view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Thu Nov 27 17:07:59 2014
@@ -544,14 +544,14 @@ public abstract class WsRemoteEndpointIm
 throw new 
IllegalArgumentException(sm.getString(wsRemoteEndpoint.nullHandler));
 }
 
-if (Util.isPrimitive(obj.getClass())) {
+Encoder encoder = findEncoder(obj);
+
+if (encoder == null  Util.isPrimitive(obj.getClass())) {
 String msg = obj.toString();
 sendStringByCompletion(msg, completion);
 return;
 }
 
-Encoder encoder = findEncoder(obj);
-
 try {
 if (encoder instanceof Encoder.Text) {
 String msg = ((Encoder.Text) encoder).encode(obj);



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



svn commit: r1642233 - in /tomcat/trunk: java/org/apache/jasper/compiler/Generator.java java/org/apache/jasper/compiler/PageInfo.java java/org/apache/jasper/compiler/Validator.java test/org/apache/el/

2014-11-27 Thread markt
Author: markt
Date: Thu Nov 27 21:16:40 2014
New Revision: 1642233

URL: http://svn.apache.org/r1642233
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57142
Page imports need to be visible to EL

Added:
tomcat/trunk/test/webapp/bug5/bug57142.jsp   (with props)
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/trunk/test/org/apache/el/TestELInJsp.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1642233r1=1642232r2=1642233view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Thu Nov 27 
21:16:40 2014
@@ -712,6 +712,34 @@ class Generator {
 out.printil(out = pageContext.getOut(););
 out.printil(_jspx_out = out;);
 out.println();
+
+if (pageInfo.isELUsed()) {
+// If EL is going to be used on this page then make sure that the
+// EL Context is properly configured with the imports.
+// The clarification provided in 
https://java.net/jira/browse/JSP-44
+// is the the page import directive applies both to the scripting
+// environment and to the EL environment.
+out.printin(javax.el.ImportHandler _jspx_handler = 
pageContext.getELContext().getImportHandler(););
+out.println();
+for (String importName : pageInfo.getImports()) {
+if (importName == null) {
+continue;
+}
+String trimmed = importName.trim();
+if (trimmed.length() == 0) {
+continue;
+}
+if (trimmed.endsWith(.*)) {
+out.printin(_jspx_handler.importPackage(\);
+out.print(trimmed.substring(0, trimmed.length() - 2));
+out.println(\););
+} else {
+out.printin(_jspx_handler.importClass(\);
+out.print(trimmed);
+out.println(\););
+}
+}
+}
 }
 
 /**

Modified: tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java?rev=1642233r1=1642232r2=1642233view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java Thu Nov 27 
21:16:40 2014
@@ -72,6 +72,7 @@ class PageInfo {
 
 private String isELIgnoredValue;
 private boolean isELIgnored = false;
+private boolean isELUsed = false;
 
 // JSP 2.1
 private String deferredSyntaxAllowedAsLiteralValue;
@@ -677,6 +678,27 @@ class PageInfo {
 return isELIgnored;
 }
 
+/**
+ * Marks the current page as using EL. This allows an optimisation when
+ * generating the page. The imports need to be added to the EL Context but
+ * this is wasteful if the EL Context is never going to be used. The
+ * associated field allows the Generator to determine whether or not to
+ * configure the imports.
+ */
+public void setELUsed() {
+isELUsed = true;
+}
+
+/**
+ * Is expression language used on this page.
+ *
+ * @return codetrue/code if expression language is used, otherwise
+ * codefalse/code
+ */
+public boolean isELUsed() {
+return isELUsed;
+}
+
 public void putNonCustomTagPrefix(String prefix, Mark where) {
 nonCustomTagPrefixMap.put(prefix, where);
 }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1642233r1=1642232r2=1642233view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Thu Nov 27 
21:16:40 2014
@@ -730,6 +730,10 @@ class Validator {
 if (pageInfo.isELIgnored())
 return;
 
+// EL is known to be used on this page. Mark the PageInfo
+// accordingly.
+pageInfo.setELUsed();
+
 // JSP.2.2 - '#{' not allowed in template text
 if (n.getType() == '#') {
 if (!pageInfo.isDeferredSyntaxAllowedAsLiteral()) {
@@ -1120,6 +1124,12 @@ class Validator {
 }
 }
 
+if (elExpression) {
+

[Bug 57142] JSP 2.3 EL 3.0 - %page import directive EL ImportHandler

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

--- Comment #8 from Mark Thomas ma...@apache.org ---
Fixed in trunk. I'll leave it a few days for folks to comment before
back-porting it to 8.0.x.

-- 
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: r1642236 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

2014-11-27 Thread markt
Author: markt
Date: Thu Nov 27 21:39:11 2014
New Revision: 1642236

URL: http://svn.apache.org/r1642236
Log:
Add a comment.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1642236r1=1642235r2=1642236view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Thu Nov 27 21:39:11 2014
@@ -544,6 +544,11 @@ public abstract class WsRemoteEndpointIm
 throw new 
IllegalArgumentException(sm.getString(wsRemoteEndpoint.nullHandler));
 }
 
+/*
+ * Note that the implementation will convert primitives and their 
object
+ * equivalents by default but that users are free to specify their own
+ * encoders and decoders for this if they wish.
+ */
 Encoder encoder = findEncoder(obj);
 
 if (encoder == null  Util.isPrimitive(obj.getClass())) {



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



buildbot failure in ASF Buildbot on tomcat-trunk

2014-11-27 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/693

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1642233
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed

2014-11-27 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-nio has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 3 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 23 mins 16 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141128-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141128.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141128-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141128/bin/openssl
 
 -Dexecute.test.apr=false -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141128.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

2014-11-27 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 3 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 22 mins 49 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141128-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20141128/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141128.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141128-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 .openssl.path=/srv/gump/public/workspace/openssl/dest-20141128/bin/openssl 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141128.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 

[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed

2014-11-27 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-nio2 has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 3 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 23 mins 24 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141128-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141128.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141128-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141128/bin/opens
 sl -Dexecute.test.apr=false -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141128.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 

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

2014-11-27 Thread rjung
Author: rjung
Date: Fri Nov 28 07:24:23 2014
New Revision: 1642265

URL: http://svn.apache.org/r1642265
Log:
Move Fix from Catalina to Coyote in changelog
according to the final patch in r1637848.

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=1642265r1=1642264r2=1642265view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Fri Nov 28 07:24:23 2014
@@ -57,9 +57,6 @@
 annotation scanning in some cases. (markt)
   /fix
   fix
-bug57187/bug: Regression handling the special * URL. (remm)
-  /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)
@@ -96,6 +93,9 @@
 additional content is sent along with the upgrade header. (remm)
   /fix
   fix
+bug57187/bug: Regression handling the special * URL. (remm)
+  /fix
+  fix
 bug57234/bug: Make SSL protocol filtering to remove insecure
 protocols case insensitive. (markt)
   /fix



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