[Bug 58837] support "X-Content-Security-Policy" a.k.a as "CSP"

2016-01-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58837

--- Comment #1 from Mark Thomas  ---
This looks sufficiently complex that a dedicated filter is required.

What isn't clear at this point is if a useful generic filter can be written (in
which case it could be added to Tomcat's standard set of filters) or if user
really needs to write there own.

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



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

2016-01-12 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-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-tc7.0.x-test-apr :  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-apr/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-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 6 mins 54 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 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160112.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160112/lib 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160112.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.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/

Re: Tomcat CWiki commit notifications missing

2016-01-12 Thread Konstantin Kolinko
2016-01-11 14:47 GMT+03:00 Mark Thomas :
> On 11/01/2016 11:38, Mark Thomas wrote:
>> On 11/01/2016 11:04, Konstantin Kolinko wrote:
>>> Hi!
>>>
>>> Does Confluence wiki at [1] generate commit notification e-mails?
>>
>> I think we'll need to create an account for the dev list and then set up
>> a watch on the space.
>>
>> I'll get that set up and post the password in the usual place.
>
> Hmm. That might not be such a good idea. The notification e-mail
> contains links for managing watches that might work without authentication.
>
> I'm currently watching the entire Tomcat space. Could you make a small
> edit and I'll see what the notification e-mail I get looks like.


I have just created a CWiki account, apparently no edit rights yet.
Can you add me to $project-committers group?
Username: kkolinko

Found a manual/FAQ item about setting up a project space and about the
notifications:
https://cwiki.apache.org/confluence/display/INFRA/Cwiki#Cwiki-Postingemailalertstoamailinglist

Best regards,
Konstantin Kolinko

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



Re: Tomcat CWiki commit notifications missing

2016-01-12 Thread Mark Thomas
On 12/01/2016 11:37, Konstantin Kolinko wrote:
> 2016-01-11 14:47 GMT+03:00 Mark Thomas :
>> On 11/01/2016 11:38, Mark Thomas wrote:
>>> On 11/01/2016 11:04, Konstantin Kolinko wrote:
 Hi!

 Does Confluence wiki at [1] generate commit notification e-mails?
>>>
>>> I think we'll need to create an account for the dev list and then set up
>>> a watch on the space.
>>>
>>> I'll get that set up and post the password in the usual place.
>>
>> Hmm. That might not be such a good idea. The notification e-mail
>> contains links for managing watches that might work without authentication.
>>
>> I'm currently watching the entire Tomcat space. Could you make a small
>> edit and I'll see what the notification e-mail I get looks like.
> 
> 
> I have just created a CWiki account, apparently no edit rights yet.
> Can you add me to $project-committers group?
> Username: kkolinko

We don't use groups any more. It requires full admin privs on the entire
instance to manage groups so users are added individually. You know have
full control on the Tomcat cwiki instance.

> Found a manual/FAQ item about setting up a project space and about the
> notifications:
> https://cwiki.apache.org/confluence/display/INFRA/Cwiki#Cwiki-Postingemailalertstoamailinglist

Looks like that is the way to go but I'd like to check the e-mail before
we start sending stuff to the dev list.

Mark


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



Re: Tomcat CWiki commit notifications missing

2016-01-12 Thread Konstantin Kolinko
2016-01-12 14:51 GMT+03:00 Mark Thomas :
> On 12/01/2016 11:37, Konstantin Kolinko wrote:
>> 2016-01-11 14:47 GMT+03:00 Mark Thomas :
>>> On 11/01/2016 11:38, Mark Thomas wrote:
 On 11/01/2016 11:04, Konstantin Kolinko wrote:
> Hi!
>
> Does Confluence wiki at [1] generate commit notification e-mails?

 I think we'll need to create an account for the dev list and then set up
 a watch on the space.
>>>
>>> Hmm. That might not be such a good idea. The notification e-mail
>>> contains links for managing watches that might work without authentication.
>>>
>>> I'm currently watching the entire Tomcat space. Could you make a small
>>> edit and I'll see what the notification e-mail I get looks like.
>>

Done an edit.

Best regards,
Konstantin Kolinko

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



Re: Tomcat CWiki commit notifications missing

2016-01-12 Thread Mark Thomas
On 12/01/2016 12:17, Konstantin Kolinko wrote:
> 2016-01-12 14:51 GMT+03:00 Mark Thomas :
>> On 12/01/2016 11:37, Konstantin Kolinko wrote:
>>> 2016-01-11 14:47 GMT+03:00 Mark Thomas :
 On 11/01/2016 11:38, Mark Thomas wrote:
> On 11/01/2016 11:04, Konstantin Kolinko wrote:
>> Hi!
>>
>> Does Confluence wiki at [1] generate commit notification e-mails?
>
> I think we'll need to create an account for the dev list and then set up
> a watch on the space.

 Hmm. That might not be such a good idea. The notification e-mail
 contains links for managing watches that might work without authentication.

 I'm currently watching the entire Tomcat space. Could you make a small
 edit and I'll see what the notification e-mail I get looks like.
>>>
> 
> Done an edit.

Got the e-mail.

The links are there but they all require a login to do anything so that
should be fine. I'll set up a role account to watch the entire space.
I'll configure it per commit for now. We can change that to daily
summaries if the volume gets too much.

Mark


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



svn commit: r1724218 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 12:46:19 2016
New Revision: 1724218

URL: http://svn.apache.org/viewvc?rev=1724218&view=rev
Log:
Fix Javadoc

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1724218&r1=1724217&r2=1724218&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Jan 12 
12:46:19 2016
@@ -1086,7 +1086,7 @@ public class Request implements HttpServ
 
 
 /**
- * @return a Map of the parameters of this request.
+ * Returns a Map of the parameters of this request.
  * Request parameters are extra information sent with the request.
  * For HTTP servlets, parameters are contained in the query string
  * or posted form data.



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



svn commit: r1724219 - /tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 13:03:04 2016
New Revision: 1724219

URL: http://svn.apache.org/viewvc?rev=1724219&view=rev
Log:
Fix IDE nag

Modified:
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1724219&r1=1724218&r2=1724219&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Tue Jan 12 
13:03:04 2016
@@ -426,7 +426,6 @@ import org.apache.juli.logging.LogFactor
  * FINE: Request "/docs/config/manager.html" with response status "200" 
content-type "text/html", no expiration configured
  * 
  */
-@SuppressWarnings("javadoc")
 public class ExpiresFilter extends FilterBase {
 
 /**



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



Re: Tomcat CWiki commit notifications missing

2016-01-12 Thread Konstantin Kolinko
2016-01-12 15:27 GMT+03:00 Mark Thomas :
> On 12/01/2016 12:17, Konstantin Kolinko wrote:
>> 2016-01-12 14:51 GMT+03:00 Mark Thomas :
>>> On 12/01/2016 11:37, Konstantin Kolinko wrote:
 2016-01-11 14:47 GMT+03:00 Mark Thomas :
> On 11/01/2016 11:38, Mark Thomas wrote:
>> On 11/01/2016 11:04, Konstantin Kolinko wrote:
>>> Hi!
>>>
>>> Does Confluence wiki at [1] generate commit notification e-mails?
>>
>> I think we'll need to create an account for the dev list and then set up
>> a watch on the space.
>
> Hmm. That might not be such a good idea. The notification e-mail
> contains links for managing watches that might work without 
> authentication.
>
> I'm currently watching the entire Tomcat space. Could you make a small
> edit and I'll see what the notification e-mail I get looks like.

>>
>> Done an edit.
>
> Got the e-mail.
>
> The links are there but they all require a login to do anything so that
> should be fine. I'll set up a role account to watch the entire space.
> I'll configure it per commit for now. We can change that to daily
> summaries if the volume gets too much.


I got e-mails to my personal e-mail address, but I see none at the mailing list.
All those emails use HTML formatting to show changed page content.

I logged in as dev user, but I do not see any setting to disable HTML
formatting of e-mails.
There is a "Show changed content" checkbox (enabled) (Help text: Check
this option to see changes made in Edit notification emails.) in EMail
settings,
but I see no option for plain-text e-mails.

I wonder how other projects are handling this.

Best regards,
Konstantin Kolinko

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



Re: Tomcat CWiki commit notifications missing

2016-01-12 Thread Mark Thomas
On 12/01/2016 13:22, Konstantin Kolinko wrote:
> 2016-01-12 15:27 GMT+03:00 Mark Thomas :
>> On 12/01/2016 12:17, Konstantin Kolinko wrote:
>>> 2016-01-12 14:51 GMT+03:00 Mark Thomas :
 On 12/01/2016 11:37, Konstantin Kolinko wrote:
> 2016-01-11 14:47 GMT+03:00 Mark Thomas :
>> On 11/01/2016 11:38, Mark Thomas wrote:
>>> On 11/01/2016 11:04, Konstantin Kolinko wrote:
 Hi!

 Does Confluence wiki at [1] generate commit notification e-mails?
>>>
>>> I think we'll need to create an account for the dev list and then set up
>>> a watch on the space.
>>
>> Hmm. That might not be such a good idea. The notification e-mail
>> contains links for managing watches that might work without 
>> authentication.
>>
>> I'm currently watching the entire Tomcat space. Could you make a small
>> edit and I'll see what the notification e-mail I get looks like.
>
>>>
>>> Done an edit.
>>
>> Got the e-mail.
>>
>> The links are there but they all require a login to do anything so that
>> should be fine. I'll set up a role account to watch the entire space.
>> I'll configure it per commit for now. We can change that to daily
>> summaries if the volume gets too much.
> 
> 
> I got e-mails to my personal e-mail address, but I see none at the mailing 
> list.

Same here. I need to look in the mail logs to figure out what is wrong.

> All those emails use HTML formatting to show changed page content.
> 
> I logged in as dev user, but I do not see any setting to disable HTML
> formatting of e-mails.
> There is a "Show changed content" checkbox (enabled) (Help text: Check
> this option to see changes made in Edit notification emails.) in EMail
> settings,
> but I see no option for plain-text e-mails.

Nor me.

> I wonder how other projects are handling this.

I suspect they just accept the HTML mail.

Mark


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



svn commit: r1724232 - in /tomcat/trunk/java/org/apache/catalina: mbeans/ realm/ security/

2016-01-12 Thread remm
Author: remm
Date: Tue Jan 12 13:43:14 2016
New Revision: 1724232

URL: http://svn.apache.org/viewvc?rev=1724232&view=rev
Log:
Javadoc fixes.

Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java?rev=1724232&r1=1724231&r2=1724232&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java Tue Jan 12 
13:43:14 2016
@@ -118,6 +118,7 @@ public class ContainerMBean extends Base
  * Container.
  *
  * @param name Name of the existing child Container to be removed
+ * @throws MBeanException if the child cannot be removed
  */
 public void removeChild(String name) throws MBeanException{
 if(name != null){
@@ -139,8 +140,8 @@ public class ContainerMBean extends Base
  * Adds a valve to this Container instance.
  *
  * @param valveType ClassName of the valve to be added
- *
- * @exception MBeanException if a component cannot be removed
+ * @return the MBean name of the new valve
+ * @throws MBeanException if adding the valve failed
  */
 public String addValve(String valveType) throws MBeanException{
 Valve valve = null;
@@ -222,7 +223,8 @@ public class ContainerMBean extends Base
  * Add a LifecycleEvent listener to this component.
  *
  * @param type ClassName of the listener to add
- */
+ * @throws MBeanException if adding the listener failed
+*/
 public void addLifecycleListener(String type) throws MBeanException{
 LifecycleListener listener = null;
 try {
@@ -254,6 +256,7 @@ public class ContainerMBean extends Base
  *
  * @param type The ClassName of the listeners to be removed.
  * Note that all the listeners having given ClassName will be removed.
+ * @throws MBeanException propagated from the managed resource access
  */
 public void removeLifecycleListeners(String type) throws MBeanException{
 Container container=null;
@@ -279,6 +282,8 @@ public class ContainerMBean extends Base
 /**
  * List the class name of each of the lifecycle listeners added to this
  * container.
+ * @return the lifecycle listeners class names
+ * @throws MBeanException propagated from the managed resource access
  */
 public String[] findLifecycleListenerNames() throws MBeanException {
 Container container = null;
@@ -306,6 +311,8 @@ public class ContainerMBean extends Base
 /**
  * List the class name of each of the container listeners added to this
  * container.
+ * @return the container listeners class names
+ * @throws MBeanException propagated from the managed resource access
  */
 public String[] findContainerListenerNames() throws MBeanException {
 Container container = null;

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java?rev=1724232&r1=1724231&r2=1724232&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java Tue Jan 12 
13:43:14 2016
@@ -38,6 +38,8 @@ public class ContextMBean extends Contai
 
  /**
  * Return the set of application parameters for this applicat

svn commit: r1724234 - in /tomcat/trunk/java/org/apache: catalina/manager/ tomcat/util/net/ tomcat/util/net/jsse/ tomcat/util/net/openssl/

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 13:48:06 2016
New Revision: 1724234

URL: http://svn.apache.org/viewvc?rev=1724234&view=rev
Log:
Refactor

1. More clearly differentiate between:
- implemented protocols/ciphers
- configured protocols/ciphers
- enabled protocols/ciphers
and use common terminology throughout.

2. Remove the ensbledCiphers hack for JSSE+OpenSSL and replace with full 
implementation so the manager app now correctly reports the enabled ciphers.

3. Simplify. SSLContextWrapper has been removed.

4. Standardise treatment of unknown protocol. JSSE silently swallowed it. 
OpenSSL refused to start. Both now log a warning and continue.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java

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=1724234&r1=1724233&r2=1724234&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Tue Jan 
12 13:48:06 2016
@@ -62,7 +62,6 @@ import org.apache.tomcat.util.Diagnostic
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.net.SSLHostConfig;
-import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.apache.tomcat.util.res.StringManager;
 
 
@@ -1707,16 +1706,13 @@ public class ManagerServlet extends Http
 if (Boolean.TRUE.equals(connector.getProperty("SSLEnabled"))) {
 SSLHostConfig[] sslHostConfigs = 
connector.getProtocolHandler().findSslHostConfigs();
 for (SSLHostConfig sslHostConfig : sslHostConfigs) {
-for (SSLHostConfigCertificate cert : 
sslHostConfig.getCertificates()) {
-String name = connector.toString() + "-" + 
sslHostConfig.getHostName() +
-"-" + cert.getType();
-Set cipherList = new HashSet<>();
-String[] cipherNames = cert.getEnabledCiphers();
-for (String cipherName : cipherNames) {
-cipherList.add(cipherName);
-}
-result.put(name, cipherList);
+String name = connector.toString() + "-" + 
sslHostConfig.getHostName();
+Set cipherList = new HashSet<>();
+String[] cipherNames = sslHostConfig.getEnabledCiphers();
+for (String cipherName : cipherNames) {
+cipherList.add(cipherName);
 }
+result.put(name, cipherList);
 }
 } else {
 Set cipherList = new HashSet<>();

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1724234&r1=1724233&r2=1724234&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Tue 
Jan 12 13:48:06 2016
@@ -77,8 +77,14 @@ public abstract class AbstractJsseEndpoi
 sslImplementation = 
SSLImplementation.getInstance(getSslImplementationName());
 
 for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
+boolean firstCertificate = true;
 for (SSLHostConfigCertificate certificate : 
sslHostConfig.getCertificates(true)) {
 SSLUtil sslUtil = 
sslImplementation.getSSLUtil(certificate);
+if (firstCertificate) {
+firstCertificate = false;
+
sslHostConfig.setEnabledProtocols(sslUtil.getEnabledProtocols());
+
sslHostConfig.setEnabledCiph

svn commit: r1724241 - in /tomcat/site/trunk: docs/download-native.html docs/index.html docs/oldnews.html xdocs/download-native.xml xdocs/index.xml xdocs/oldnews.xml

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 14:28:24 2016
New Revision: 1724241

URL: http://svn.apache.org/viewvc?rev=1724241&view=rev
Log:
Update site for tomcat-native 1.2.4 release

Modified:
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/xdocs/download-native.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/oldnews.xml

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1724241&r1=1724240&r2=1724241&view=diff
==
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Tue Jan 12 14:28:24 2016
@@ -277,14 +277,14 @@
 
 
   
-
-Native 1.2.3 Source Release tar.gz (e.g. Unix, Linux, Mac 
OS)
+
+Native 1.2.4 Source Release tar.gz (e.g. Unix, Linux, Mac 
OS)
 
   
 
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/source/tomcat-native-1.2.3-src.tar.gz.asc";>PGP],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/source/tomcat-native-1.2.3-src.tar.gz.md5";>MD5],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/source/tomcat-native-1.2.3-src.tar.gz.sha1";>SHA1]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-src.tar.gz.asc";>PGP],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-src.tar.gz.md5";>MD5],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-src.tar.gz.sha1";>SHA1]
   
 
 
@@ -293,14 +293,14 @@
 
 
   
-
-Native 1.2.3 Source Release zip (e.g. Windows)
+
+Native 1.2.4 Source Release zip (e.g. Windows)
 
   
 
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/source/tomcat-native-1.2.3-win32-src.zip.asc";>PGP],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/source/tomcat-native-1.2.3-win32-src.zip.md5";>MD5],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/source/tomcat-native-1.2.3-win32-src.zip.sha1";>SHA1]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-win32-src.zip.asc";>PGP],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-win32-src.zip.md5";>MD5],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-win32-src.zip.sha1";>SHA1]
   
 
 
@@ -315,7 +315,7 @@
 
 You can find binaries release too.
 You may download them from
-  HERE
+  HERE
 
 
 
@@ -344,14 +344,14 @@
   
 
 
-
-  Native 1.2.3 Windows Binaries zip (recommended)
+
+  Native 1.2.4 Windows Binaries zip (recommended)
   
 
 
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/binaries/tomcat-native-1.2.3-win32-bin.zip.asc";>PGP],
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/binaries/tomcat-native-1.2.3-win32-bin.zip.md5";>MD5],
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/binaries/tomcat-native-1.2.3-win32-bin.zip.sha1";>SHA1]
+  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip.asc";>PGP],
+  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip.md5";>MD5],
+  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip.sha1";>SHA1]
 
   
 
@@ -360,15 +360,15 @@
   
 
 
-
-  Native 1.2.3 Windows OCSP-enabled Binaries zip
+
+  Native 1.2.4 Windows OCSP-enabled Binaries zip
   
 
 
 
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/binaries/tomcat-native-1.2.3-ocsp-win32-bin.zip.asc";>PGP],
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/binaries/tomcat-native-1.2.3-ocsp-win32-bin.zip.md5";>MD5],
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.3/binaries/tomcat-native-1.2.3-ocsp-win32-bin.zip.sha1";>SHA1]
+  [https://www.apache.org/dist/tomcat/tomcat-connecto

svn commit: r1724242 - in /tomcat/native/trunk/xdocs: index.xml news/2016.xml project.xml

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 14:33:37 2016
New Revision: 1724242

URL: http://svn.apache.org/viewvc?rev=1724242&view=rev
Log:
Update tc-native docs for 1.2.4 release

Added:
tomcat/native/trunk/xdocs/news/2016.xml   (with props)
Modified:
tomcat/native/trunk/xdocs/index.xml
tomcat/native/trunk/xdocs/project.xml

Modified: tomcat/native/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/index.xml?rev=1724242&r1=1724241&r2=1724242&view=diff
==
--- tomcat/native/trunk/xdocs/index.xml (original)
+++ tomcat/native/trunk/xdocs/index.xml Tue Jan 12 14:33:37 2016
@@ -64,9 +64,9 @@ manual is described in more detail below
 
 
 
-15 Dec 2015 - TC-Native-1.2.3 
released
+11 Jan 2016 - TC-Native-1.2.4 
released
 The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.3 Stable.
+Tomcat Native 1.2.4 Stable.
 
 The sources and the binaries for selected platforms are available from the
 Download page.

Added: tomcat/native/trunk/xdocs/news/2016.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/news/2016.xml?rev=1724242&view=auto
==
--- tomcat/native/trunk/xdocs/news/2016.xml (added)
+++ tomcat/native/trunk/xdocs/news/2016.xml Tue Jan 12 14:33:37 2016
@@ -0,0 +1,40 @@
+
+
+
+]>
+
+
+  &project;
+
+  
+2016 News and Status
+  
+
+
+
+
+ 
+  The Apache Tomcat team is proud to announce the immediate availability
+  of Tomcat Native 1.2.4. This is a bug fix release and includes Windows
+  binaries built with OpenSSL 1.0.2e and APR 1.5.1.
+  
+ 
+
+
+

Propchange: tomcat/native/trunk/xdocs/news/2016.xml
--
svn:eol-style = native

Modified: tomcat/native/trunk/xdocs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/project.xml?rev=1724242&r1=1724241&r2=1724242&view=diff
==
--- tomcat/native/trunk/xdocs/project.xml (original)
+++ tomcat/native/trunk/xdocs/project.xml Tue Jan 12 14:33:37 2016
@@ -34,6 +34,7 @@
 
 
 
+
 
 
 



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



svn commit: r1724243 - in /tomcat/site/trunk/docs/native-doc: index.html miscellaneous/changelog.html news/2008.html news/2009.html news/2010.html news/2011.html news/2012.html news/2013.html news/201

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 14:35:55 2016
New Revision: 1724243

URL: http://svn.apache.org/viewvc?rev=1724243&view=rev
Log:
Update site docs for tc-native 1.2.4 (less empty 1.2.5 section in changelog)

Modified:
tomcat/site/trunk/docs/native-doc/index.html
tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
tomcat/site/trunk/docs/native-doc/news/2008.html
tomcat/site/trunk/docs/native-doc/news/2009.html
tomcat/site/trunk/docs/native-doc/news/2010.html
tomcat/site/trunk/docs/native-doc/news/2011.html
tomcat/site/trunk/docs/native-doc/news/2012.html
tomcat/site/trunk/docs/native-doc/news/2013.html
tomcat/site/trunk/docs/native-doc/news/2014.html
tomcat/site/trunk/docs/native-doc/news/2015.html

Modified: tomcat/site/trunk/docs/native-doc/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1724243&r1=1724242&r2=1724243&view=diff
==
--- tomcat/site/trunk/docs/native-doc/index.html (original)
+++ tomcat/site/trunk/docs/native-doc/index.html Tue Jan 12 14:35:55 2016
@@ -1,5 +1,5 @@
 
-Apache Tomcat Native Library - Documentation 
Indexhttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">Apache Tomcat Native 
LibraryLinksDocs 
HomeMiscellaneous 
DocumentationChangelogNews20152014201320122011201020092008Documentation IndexIntroduction
+Apache Tomcat Native Library - Documentation 
Indexhttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">Apache Tomcat Native 
LibraryLinksDocs 
HomeMiscellaneous 
DocumentationChangelogNews201620152014201320122011201020092008Documentation IndexIntroduction
 
   
 The Apache Tomcat Native Library is an optional component for use with
@@ -32,9 +32,9 @@ manual is described in more detail below
 Headlines
 
 
-15 Dec 2015 - TC-Native-1.2.3 
released
+11 Jan 2016 - TC-Native-1.2.4 
released
 The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.3 Stable.
+Tomcat Native 1.2.4 Stable.
 
 The sources and the binaries for selected platforms are available from the
 Download page.
@@ -186,5 +186,5 @@ INFO: Initializing Coyote HTTP/1.1 on ht
 
 
 
-Copyright © 2008-2015, The Apache Software Foundation
+Copyright © 2008-2016, The Apache Software Foundation
   
\ No newline at end of file

Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1724243&r1=1724242&r2=1724243&view=diff
==
--- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original)
+++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Tue Jan 12 
14:35:55 2016
@@ -3,6 +3,13 @@
   
   This is the Changelog for Tomcat Native 1.2.
   
+Changes in 1.2.4
+  
+
+  SSL.getHandshakeCount(), which was unused, now returns the handshake
+  completed count rather than the handshake started count. (remm)
+
+  
 Changes in 1.2.3
   
 
@@ -26,7 +33,7 @@
   the native Java method is declared. (rjung)
 
 
-  Add support for using Java ketstores for certificates and keys. (jfclere)
+  Add support for using Java keystores for certificates and keys. (jfclere)
 
 
   Remove code that performs a read after a renegotiation that appears to be
@@ -104,5 +111,5 @@
 Please see the 1.1.x
changelog.
 
-Copyright © 2008-2015, The Apache Software Foundation
+Copyright © 2008-2016, The Apache Software Foundation
   
\ No newline at end of file

Modified: tomcat/site/trunk/docs/native-doc/news/2008.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2008.html?rev=1724243&r1=1724242&r2=1724243&view=diff
==
--- tomcat/site/trunk/docs/native-doc/news/2008.html (original)
+++ tomcat/site/trunk/docs/native-doc/news/2008.html Tue Jan 12 14:35:55 2016
@@ -24,5 +24,5 @@ and some bug fixes.
 
 
 
-Copyright © 2008-2015, The Apache Software Foundation
+Copyright © 2008-2016, The Apache Software Foundation
   
\ No newline at end of file

Modified: tomcat/site/trunk/docs/native-doc/news/2009.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2009.html?rev=1724243&r1=1724242&r2=1724243&view=diff
==
--- tomcat/site/trunk/docs/native-doc/news/2009.html (original)
+++ tomcat/site/trunk/docs/native-doc/news/2009.html Tue Jan 12 14:35:55 2016
@@ -8,5 +8,5 @@ of Tomcat Native 1.1.18. This is a stabl
 
 
 
-Copyright © 2008-2015, The Apache Software Foundation
+Copyright © 2008-2016, The Apache Software Foundation
   
\ No newline at end of file

Modified: tomcat/site/trunk/docs/native-doc/news/2010.html
URL: 
http://svn.apache.

svn commit: r1724244 - /tomcat/site/trunk/docs/native-doc/news/2016.html

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 14:36:40 2016
New Revision: 1724244

URL: http://svn.apache.org/viewvc?rev=1724244&view=rev
Log:
Add new file missed in r1724243

Added:
tomcat/site/trunk/docs/native-doc/news/2016.html   (with props)

Added: tomcat/site/trunk/docs/native-doc/news/2016.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2016.html?rev=1724244&view=auto
==
--- tomcat/site/trunk/docs/native-doc/news/2016.html (added)
+++ tomcat/site/trunk/docs/native-doc/news/2016.html Tue Jan 12 14:36:40 2016
@@ -0,0 +1,11 @@
+
+The Apache Tomcat Native - News - 2016 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
NewsLinksDocs Home
 Miscellaneous 
DocumentationChangelogNews201520142013201220112010200920082016 News and Status2016 News & Status
+ 11 Jan 2016 - TC-Native-1.2.4 
released
+  The Apache Tomcat team is proud to announce the immediate availability
+  of Tomcat Native 1.2.4. This is a bug fix release and includes Windows
+  binaries built with OpenSSL 1.0.2e and APR 1.5.1.
+  
+ 
+
+Copyright © 2008-2016, The Apache Software Foundation
+  
\ No newline at end of file

Propchange: tomcat/site/trunk/docs/native-doc/news/2016.html
--
svn:eol-style = native



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



svn commit: r1724246 - /tomcat/native/trunk/xdocs/news/project.xml

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 14:38:00 2016
New Revision: 1724246

URL: http://svn.apache.org/viewvc?rev=1724246&view=rev
Log:
Add 2016 page to menu for news pages

Modified:
tomcat/native/trunk/xdocs/news/project.xml

Modified: tomcat/native/trunk/xdocs/news/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/news/project.xml?rev=1724246&r1=1724245&r2=1724246&view=diff
==
--- tomcat/native/trunk/xdocs/news/project.xml (original)
+++ tomcat/native/trunk/xdocs/news/project.xml Tue Jan 12 14:38:00 2016
@@ -34,6 +34,7 @@
 
 
 
+
 
 
 



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



svn commit: r1724247 - in /tomcat/site/trunk/docs/native-doc/news: 2008.html 2009.html 2010.html 2011.html 2012.html 2013.html 2014.html 2015.html 2016.html

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 14:39:07 2016
New Revision: 1724247

URL: http://svn.apache.org/viewvc?rev=1724247&view=rev
Log:
Add 2016 page to menu for news pages

Modified:
tomcat/site/trunk/docs/native-doc/news/2008.html
tomcat/site/trunk/docs/native-doc/news/2009.html
tomcat/site/trunk/docs/native-doc/news/2010.html
tomcat/site/trunk/docs/native-doc/news/2011.html
tomcat/site/trunk/docs/native-doc/news/2012.html
tomcat/site/trunk/docs/native-doc/news/2013.html
tomcat/site/trunk/docs/native-doc/news/2014.html
tomcat/site/trunk/docs/native-doc/news/2015.html
tomcat/site/trunk/docs/native-doc/news/2016.html

Modified: tomcat/site/trunk/docs/native-doc/news/2008.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2008.html?rev=1724247&r1=1724246&r2=1724247&view=diff
==
--- tomcat/site/trunk/docs/native-doc/news/2008.html (original)
+++ tomcat/site/trunk/docs/native-doc/news/2008.html Tue Jan 12 14:39:07 2016
@@ -1,5 +1,5 @@
 
-The Apache Tomcat Native - News - 2008 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
NewsLinksDocs Home
 Miscellaneous 
DocumentationChangelogNews201520142013201220112010200920082008 News and Status2008 News & Status
+The Apache Tomcat Native - News - 2008 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
NewsLinksDocs Home
 Miscellaneous 
DocumentationChangelogNews2016201520142013201220112010200920082008 News and Status2008 News & Status
 18 November - TC-Native-1.1.16 
released
 The Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Native 1.1.16. This is a stable release adding some bug fixes.

Modified: tomcat/site/trunk/docs/native-doc/news/2009.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2009.html?rev=1724247&r1=1724246&r2=1724247&view=diff
==
--- tomcat/site/trunk/docs/native-doc/news/2009.html (original)
+++ tomcat/site/trunk/docs/native-doc/news/2009.html Tue Jan 12 14:39:07 2016
@@ -1,5 +1,5 @@
 
-The Apache Tomcat Native - News - 2009 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
NewsLinksDocs Home
 Miscellaneous 
DocumentationChangelogNews201520142013201220112010200920082009 News and Status2009 News & Status
+The Apache Tomcat Native - News - 2009 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
NewsLinksDocs Home
 Miscellaneous 
DocumentationChangelogNews2016201520142013201220112010200920082009 News and Status2009 News & Status
 23 November - TC-Native-1.1.18 
released
 The Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Native 1.1.18. This is a stable release adding some bug fixes.

Modified: tomcat/site/trunk/docs/native-doc/news/2010.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2010.html?rev=1724247&r1=1724246&r2=1724247&view=diff
==
--- tomcat/site/trunk/docs/native-doc/news/2010.html (original)
+++ tomcat/site/trunk/docs/native-doc/news/2010.html Tue Jan 12 14:39:07 2016
@@ -1,5 +1,5 @@
 
-The Apache Tomcat Native - News - 2010 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
NewsLinksDocs Home
 Miscellaneous 
DocumentationChangelogNews201520142013201220112010200920082010 News and Status2010 News & Status
+The Apache Tomcat Native - News - 2010 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
NewsLinksDocs Home
 Miscellaneous 
DocumentationChangelogNews2016201520142013201220112010200920082010 News and Status2010 News & Status
 17 February - TC-Native-1.1.20 
released
 The Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Native 1.1.20. This is a stable release adding some bug fixes.

Modified: tomcat/site/trunk/docs/native-doc/news/2011.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2011.html?rev=1724247&r1=1724246&r2=1724247&view=diff
==
--- tomcat/site/trunk/docs/native-doc/news/2011.html (original)
+++ tomcat/site/trunk/docs/native-doc/news/2011.html Tue Jan 12 14:39:07 2016
@@ -1,5 +1,5 @@
 
-The Apache Tomcat Native - News - 2011 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
NewsLinksDocs Home
 Miscellaneous 
DocumentationChangelogNews201520142013201220112010200920082011 News and Status2011 News & Status
+The Apache Tomcat Native - News - 2011 News and 
Statushttp://tomc

svn commit: r1724250 - /tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 14:41:41 2016
New Revision: 1724250

URL: http://svn.apache.org/viewvc?rev=1724250&view=rev
Log:
Add 2016 page to menu for changelog

Modified:
tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html

Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1724250&r1=1724249&r2=1724250&view=diff
==
--- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original)
+++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Tue Jan 12 
14:41:41 2016
@@ -1,5 +1,5 @@
 
-The Apache Tomcat Native - Miscellaneous Documentation - 
http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
Miscellaneous Documentation
 LinksDocs 
HomeMiscellaneous 
DocumentationChangelogNews20152014201320122011201020092008Preface
+The Apache Tomcat Native - Miscellaneous Documentation - 
http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
Miscellaneous Documentation
 LinksDocs 
HomeMiscellaneous 
DocumentationChangelogNews201620152014201320122011201020092008Preface
   
   This is the Changelog for Tomcat Native 1.2.
   



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



svn commit: r1724249 - /tomcat/native/trunk/xdocs/miscellaneous/project.xml

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 14:40:57 2016
New Revision: 1724249

URL: http://svn.apache.org/viewvc?rev=1724249&view=rev
Log:
Add 2016 page to menu for changelog

Modified:
tomcat/native/trunk/xdocs/miscellaneous/project.xml

Modified: tomcat/native/trunk/xdocs/miscellaneous/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/project.xml?rev=1724249&r1=1724248&r2=1724249&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/project.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/project.xml Tue Jan 12 14:40:57 2016
@@ -34,6 +34,7 @@
 
 
 
+
 
 
 



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



[jira] [Commented] (MTOMCAT-276) Could not properly stop Tomcat when integration tests are failing

2016-01-12 Thread Benson Margulies (JIRA)

[ 
https://issues.apache.org/jira/browse/MTOMCAT-276?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15093974#comment-15093974
 ] 

Benson Margulies commented on MTOMCAT-276:
--

I'm suffering from this and I am not trying to run 'mvn integration-test'.


> Could not properly stop Tomcat when integration tests are failing
> -
>
> Key: MTOMCAT-276
> URL: https://issues.apache.org/jira/browse/MTOMCAT-276
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.2
>Reporter: vigi
>Assignee: Olivier Lamy (*$^¨%`£)
>Priority: Minor
>  Labels: integration-test, integration-tests, maven, tomcat
>
> When running integration tests with the Maven Tomcat plugin 2.2 and if the 
> tests are failing, Tomcat generates a nasty error while trying to be stopped.
> Everything is fine if the tests pass. Here is the stacktrace:
> ERROR: IllegalAccessException for stop method in class 
> org.apache.tomcat.maven.plugin.tomcat7.run.ExtendedTomcat
> java.lang.reflect.InvocationTargetException
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>   at 
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   at java.lang.reflect.Method.invoke(Method.java:606)
>   at 
> org.apache.tomcat.maven.common.run.EmbeddedRegistry.shutdownAll(EmbeddedRegistry.java:110)
>   at 
> org.apache.tomcat.maven.common.run.EmbeddedRegistry$1.run(EmbeddedRegistry.java:69)
> Caused by: org.apache.catalina.LifecycleException: Failed to stop component 
> [StandardServer[-1]]
>   at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236)
>   at org.apache.catalina.startup.Tomcat.stop(Tomcat.java:351)
>   ... 6 more
> Caused by: org.apache.catalina.LifecycleException: Failed to stop component 
> [StandardService[Tomcat]]
>   at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236)
>   at 
> org.apache.catalina.core.StandardServer.stopInternal(StandardServer.java:753)
>   at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232)
>   ... 7 more
> Caused by: org.apache.catalina.LifecycleException: Failed to stop component 
> [StandardEngine[Tomcat]]
>   at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236)
>   at 
> org.apache.catalina.core.StandardService.stopInternal(StandardService.java:502)
>   at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232)
>   ... 9 more
> Caused by: java.lang.NoClassDefFoundError: 
> org/apache/catalina/core/ContainerBase$StopChild
>   at 
> org.apache.catalina.core.ContainerBase.stopInternal(ContainerBase.java:1173)
>   at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232)
>   ... 11 more
> Caused by: java.lang.ClassNotFoundException: 
> org.apache.catalina.core.ContainerBase$StopChild
>   at 
> org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50)
>   at 
> org.codehaus.plexus.classworlds.realm.ClassRealm.unsynchronizedLoadClass(ClassRealm.java:259)
>   at 
> org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:235)
>   at 
> org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:227)
>   ... 13 more



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



[ANN] Apache Tomcat Native 1.2.4 released

2016-01-12 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat Native 1.2.4 stable.

The key features of this release are:
- Improvements to renegotiation

Note that, unless a regression is discovered in 1.2.x, users should now
be using 1.2.x in preference to 1.1.x.

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/native-doc/miscellaneous/changelog.html

Downloads:
http://tomcat.apache.org/download-native.cgi

The Apache Tomcat Native Library provides portable API for features
not found in contemporary JDK's. It uses Apache Portable Runtime as
operating system abstraction layer and OpenSSL for SSL networking and
allows optimal performance in production environments.


Thank you,
-- 
The Apache Tomcat Team

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



svn commit: r1724252 - /tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 14:59:58 2016
New Revision: 1724252

URL: http://svn.apache.org/viewvc?rev=1724252&view=rev
Log:
Deprecate unused parameter

Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=1724252&r1=1724251&r2=1724252&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Tue 
Jan 12 14:59:58 2016
@@ -128,14 +128,28 @@ public class JMXAccessorQueryTask extend
 oindex++;
 setProperty(pname + "Name", oname.toString());
 if (isAttributebinding()) {
-bindAttributes(jmxServerConnection, resultproperty, pname, 
oname);
+bindAttributes(jmxServerConnection, pname, oname);
 }
 }
 }
 return isError;
 }
 
-protected void bindAttributes(MBeanServerConnection jmxServerConnection, 
String resultproperty, String pname, ObjectName oname) {
+/**
+ * @param jmxServerConnection
+ * @param resultproperty
+ * @param pname
+ * @param oname
+ *
+ * @Deprecated Unused. Will be removed in Tomcat 9.0.x
+ */
+@Deprecated
+protected void bindAttributes(MBeanServerConnection jmxServerConnection,
+String resultproperty, String pname, ObjectName oname) {
+bindAttributes(jmxServerConnection, pname, oname);
+}
+
+protected void bindAttributes(MBeanServerConnection jmxServerConnection, 
String pname, ObjectName oname) {
 try {
 MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname);
 MBeanAttributeInfo attrs[] = minfo.getAttributes();



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



svn commit: r1724253 - /tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 15:00:16 2016
New Revision: 1724253

URL: http://svn.apache.org/viewvc?rev=1724253&view=rev
Log:
Remove deprecated code

Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=1724253&r1=1724252&r2=1724253&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Tue 
Jan 12 15:00:16 2016
@@ -135,20 +135,6 @@ public class JMXAccessorQueryTask extend
 return isError;
 }
 
-/**
- * @param jmxServerConnection
- * @param resultproperty
- * @param pname
- * @param oname
- *
- * @Deprecated Unused. Will be removed in Tomcat 9.0.x
- */
-@Deprecated
-protected void bindAttributes(MBeanServerConnection jmxServerConnection,
-String resultproperty, String pname, ObjectName oname) {
-bindAttributes(jmxServerConnection, pname, oname);
-}
-
 protected void bindAttributes(MBeanServerConnection jmxServerConnection, 
String pname, ObjectName oname) {
 try {
 MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname);



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



svn commit: r1724255 - in /tomcat/trunk/java/org/apache/catalina: servlets/ session/ ssi/

2016-01-12 Thread remm
Author: remm
Date: Tue Jan 12 15:02:50 2016
New Revision: 1724255

URL: http://svn.apache.org/viewvc?rev=1724255&view=rev
Log:
Javadoc fixes.

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java

Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1724255&r1=1724254&r2=1724255&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Tue Jan 12 
15:02:50 2016
@@ -173,8 +173,8 @@ import org.apache.catalina.util.IOTools;
  * and stderr (which should not be too hard).
  * 
  * If you find your cgi scripts are timing out receiving input, you can set
- * the init parameter  of your webapps' cgi-handling servlet
- * to be
+ * the init parameter stderrTimeout of your webapps' cgi-handling
+ * servlet.
  * 
  * 
  *
@@ -211,7 +211,6 @@ import org.apache.catalina.util.IOTools;
  * http://cgi-spec.golux.com";>http://cgi-spec.golux.com.
  *
  * 
- * 
  * TODO:
  * 
  *  Support for setting headers (for example, Location headers don't work)
@@ -231,7 +230,6 @@ import org.apache.catalina.util.IOTools;
  *
  * @author Martin T Dengler [r...@martindengler.com]
  * @author Amy Roh
- * @since Tomcat 4.0
  */
 public final class CGIServlet extends HttpServlet {
 
@@ -631,7 +629,7 @@ public final class CGIServlet extends Ht
 }
 
 
-/*
+/**
  * Behaviour depends on the status code and the value of debug.
  *
  * Status < 400  - Always calls setStatus. Returns false. CGI servlet will
@@ -657,11 +655,6 @@ public final class CGIServlet extends Ht
 /**
  * Encapsulates the CGI environment and rules to derive
  * that environment from the servlet container and request information.
- *
- * 
- * 
- *
- * @sinceTomcat 4.0
  */
 protected class CGIEnvironment {
 
@@ -708,7 +701,7 @@ public final class CGIServlet extends Ht
  *   the Servlet API
  * @param  context   ServletContext for information provided by the
  *   Servlet API
- *
+ * @throws IOException an IO error occurred
  */
 protected CGIEnvironment(HttpServletRequest req,
  ServletContext context) throws IOException {
@@ -744,7 +737,7 @@ public final class CGIServlet extends Ht
  *
  * @param  req   HttpServletRequest for information provided by
  *   the Servlet API
- * @throws UnsupportedEncodingException
+ * @throws UnsupportedEncodingException Unknown encoding
  */
 protected void setupFromRequest(HttpServletRequest req)
 throws UnsupportedEncodingException {
@@ -861,8 +854,6 @@ public final class CGIServlet extends Ht
  * name -simple name (no directories) of the
  *cgi script, or null if no cgi was found
  * 
- *
- * @since Tomcat 4.0
  */
 protected String[] findCGI(String pathInfo, String webAppRootDir,
String contextPath, String servletPath,
@@ -939,6 +930,7 @@ public final class CGIServlet extends Ht
  *
  * @return   true if environment was set OK, false if there
  *   was a problem and no environment was set
+ * @throws IOException an IO error occurred
  */
 protected boolean setCGIEnvironment(HttpServletRequest req) throws 
IOException {
 

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1724255&r1=1724254&r2=1724255&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Jan 
12 15:02:50 2016
@@ -329,6 +329,7 @@ public class Default

svn commit: r1724256 - /tomcat/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 15:02:52 2016
New Revision: 1724256

URL: http://svn.apache.org/viewvc?rev=1724256&view=rev
Log:
Javadoc

Modified:

tomcat/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java?rev=1724256&r1=1724255&r2=1724256&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java 
Tue Jan 12 15:02:52 2016
@@ -22,7 +22,10 @@ import java.util.Comparator;
 import org.apache.catalina.Session;
 
 /**
- * Comparator which permits to compare on a session's content
+ * Comparator which permits to compare on a session's content.
+ *
+ * @param  The type of the session content to be compared
+ *
  * @author Cédrik LIME
  */
 public abstract class BaseSessionComparator implements Comparator {



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



Re: dropping windows ia64 in Tomcat6

2016-01-12 Thread Christopher Schultz
Jean-Frederic,

On 1/11/16 2:03 AM, jean-frederic clere wrote:
> I would like to drop Itanium support in the windows binaries, we have
> dropped it in native 1.1.34 so we can't have a complete Itanium in
> Tomcat 6.0.45.
> 
> Comments?

-0

Users can still use earlier versions of tcnative that support Itanium,
and might want the latest stable release of Tomcat (and tools). This
will make deployment more difficult for Itanium users, but the ship has
sailed on tcnative so they'll jsut have to deal with that situation, I
guess.

Dropping Itanium at this stage essentially kills support for Tomcat 6
many months earlier than advertised here[1]. If we intend to support
Tomcat 6 through the end of 2016, I think we should continue to include
Itanium support for the binary distribution of Tomcat 6.

-chris

[1] http://tomcat.apache.org/tomcat-60-eol.html

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



svn commit: r1724310 - /tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 20:18:41 2016
New Revision: 1724310

URL: http://svn.apache.org/viewvc?rev=1724310&view=rev
Log:
Fix Javadoc

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1724310&r1=1724309&r2=1724310&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Tue Jan 
12 20:18:41 2016
@@ -2571,26 +2571,26 @@ public class WebdavServlet
 
 
 /**
- * Return true if the lock has expired.
+ * @return true if the lock has expired.
  */
 public boolean hasExpired() {
-return (System.currentTimeMillis() > expiresAt);
+return System.currentTimeMillis() > expiresAt;
 }
 
 
 /**
- * Return true if the lock is exclusive.
+ * @return true if the lock is exclusive.
  */
 public boolean isExclusive() {
-
-return (scope.equals("exclusive"));
-
+return scope.equals("exclusive");
 }
 
 
 /**
- * Get an XML representation of this lock token. This method will
- * append an XML fragment to the given XML writer.
+ * Get an XML representation of this lock token.
+ *
+ * @param generatedXML The XML write to which the fragment will be
+ * appended
  */
 public void toXML(XMLWriter generatedXML) {
 



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



svn commit: r1724325 - in /tomcat/trunk/java/org/apache/catalina/session: LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties StandardManager.java

2016-01-12 Thread markt
Author: markt
Date: Tue Jan 12 21:15:18 2016
New Revision: 1724325

URL: http://svn.apache.org/viewvc?rev=1724325&view=rev
Log:
Use try-with-resources to simplify code
Some exception logging removed since it is duplicated in [start|stop]Internal

Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1724325&r1=1724324&r2=1724325&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Tue 
Jan 12 21:15:18 2016
@@ -35,11 +35,8 @@ managerBase.createSession.ise=createSess
 managerBase.sessionTimeout=Invalid session timeout setting {0}
 standardManager.loading=Loading persisted sessions from {0}
 standardManager.loading.exception=Exception while loading persisted sessions
-standardManager.loading.cnfe=Class not found while loading persisted sessions 
[{0}]
-standardManager.loading.ioe=IOException while loading persisted sessions [{0}]
 standardManager.unloading=Saving persisted sessions to {0}
 standardManager.unloading.debug=Unloading persisted sessions
-standardManager.unloading.ioe=IOException while saving persisted sessions: {0}
 standardManager.unloading.nosessions=No persisted sessions to unload
 standardManager.managerLoad=Exception loading sessions from persistent storage
 standardManager.managerUnload=Exception unloading sessions to persistent 
storage

Modified: 
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties?rev=1724325&r1=1724324&r2=1724325&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties 
Tue Jan 12 21:15:18 2016
@@ -29,7 +29,6 @@ managerBase.sessionTimeout = Valor inv\u
 standardManager.loading = Cargando sesiones persistidas desde {0}
 standardManager.loading.exception = Exception al cargar sesiones persistidas
 standardManager.unloading = Salvando sesiones persistidas a {0}
-standardManager.unloading.ioe = IOException al salvar sesiones persistidas\: 
{0}
 standardManager.managerLoad = Excepci\u00F3n cargando sesiones desde 
almacenamiento persistente
 standardManager.managerUnload = Excepci\u00F3n descargando sesiones a 
almacenamiento persistente
 standardSession.attributeEvent = El oyente de eventos de atributo de 
Sesi\u00F3n lanz\u00F3 una excepci\u00F3n

Modified: 
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties?rev=1724325&r1=1724324&r2=1724325&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties 
Tue Jan 12 21:15:18 2016
@@ -29,7 +29,6 @@ managerBase.sessionTimeout=R\u00e9glage
 standardManager.loading=Chargement des sessions qui ont persist\u00e9 depuis 
{0}
 standardManager.loading.exception="Exception" lors du chargement de sessions 
persistantes
 standardManager.unloading=Sauvegarde des sessions ayant persist\u00e9 vers {0}
-standardManager.unloading.ioe="IOException" lors de la sauvegarde de sessions 
persistantes: {0}
 standardManager.managerLoad=Exception au chargement des sessions depuis le 
stockage persistant (persistent storage)
 standardManager.managerUnload=Exception au d\u00e9chargement des sessions vers 
le stockage persistant (persistent storage)
 standardSession.attributeEvent=L''\u00e9couteur d''\u00e9v\u00e8nement 
Attribut de Session (attribute event listener) a g\u00e9n\u00e9r\u00e9 une 
exception

Modified: 
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties?rev=1724325&r1=1724324&r2=1724325&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties 
Tue Jan 12 21:15:18 2016
@@ -30,7

[Bug 58827] Review/remove references to JSR77 StateManageable

2016-01-12 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58827

--- Comment #2 from Mark Thomas  ---
My initial reaction was to say fix the JSR77 implementation.

However, having seen that this was broken back in Tomcat 7 and that no-one has
complained, my preference would be to mark anything JSR77 related deprecated in
8.0.x and remove it entirely in 9.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



[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

2016-01-12 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-tc8.0.x-test-apr 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-tc8.0.x-test-apr :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-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-8.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 11 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.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160112/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160112.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-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-1.0.2/dest-20160112/bin/openssl
 -Dexecute.test.bio=false -Dexecute.test.apr=true 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.

svn commit: r1724345 - /tomcat/native/branches/1.1.x/native/src/ssl.c

2016-01-12 Thread billbarker
Author: billbarker
Date: Wed Jan 13 02:16:18 2016
New Revision: 1724345

URL: http://svn.apache.org/viewvc?rev=1724345&view=rev
Log:
It seems that CRYPTO_malloc_init has been removed from OpenSSL master, but not 
yet from the header files. Waiting for next Gump run to see if anything else is 
missing before porting to trunk

Modified:
tomcat/native/branches/1.1.x/native/src/ssl.c

Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1724345&r1=1724344&r2=1724345&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Jan 13 02:16:18 2016
@@ -462,7 +462,7 @@ static void ssl_dyn_lock_function(int mo
 else {
 apr_thread_mutex_unlock(l->mutex);
 }
-}
+
 
 /*
  * Dynamic lock destruction callback
@@ -661,11 +661,12 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize
 ssl_initialized = 0;
 return (jint)APR_EINVAL;
 }
-#endif
+
 /* We must register the library in full, to ensure our configuration
  * code can successfully test the SSL environment.
  */
 CRYPTO_malloc_init();
+#endif
 ERR_load_crypto_strings();
 SSL_load_error_strings();
 SSL_library_init();



-
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

2016-01-12 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: 31 mins 22 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 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-BIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160112.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=true 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160112.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.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/tomca

svn commit: r1724346 - /tomcat/native/branches/1.1.x/native/src/ssl.c

2016-01-12 Thread billbarker
Author: billbarker
Date: Wed Jan 13 02:22:24 2016
New Revision: 1724346

URL: http://svn.apache.org/viewvc?rev=1724346&view=rev
Log:
Fix clumbsy fingers

Modified:
tomcat/native/branches/1.1.x/native/src/ssl.c

Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1724346&r1=1724345&r2=1724346&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Jan 13 02:22:24 2016
@@ -462,7 +462,7 @@ static void ssl_dyn_lock_function(int mo
 else {
 apr_thread_mutex_unlock(l->mutex);
 }
-
+}
 
 /*
  * Dynamic lock destruction callback



-
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-apr (in module tomcat-trunk) failed

2016-01-12 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.
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
 -WARNING- No directory 
[/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: 47 mins 45 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.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20160112/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160112.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-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-master/dest-20160112/bin/openssl
 -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.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/jaspic-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/outpu

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

2016-01-12 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-apr 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-apr :  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-apr/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-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 6 mins 38 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 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160112.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160112/lib 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160112.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.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

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

2016-01-12 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-nio 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-nio :  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-nio/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-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 32 mins 53 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 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160112.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/w
 
orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=true -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160112.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.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/tomca