[jira] [Commented] (MTOMCAT-177) tomcat7:deploy ignores proxy settings

2016-04-05 Thread ASF GitHub Bot (JIRA) 

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

ASF GitHub Bot commented on MTOMCAT-177:


Github user nalbion closed the pull request at:

https://github.com/apache/tomcat-maven-plugin/pull/3


> tomcat7:deploy ignores proxy settings
> -
>
> Key: MTOMCAT-177
> URL: https://issues.apache.org/jira/browse/MTOMCAT-177
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.0
>Reporter: Brad Larson
>Assignee: Olivier Lamy (*$^¨%`£)
>  Labels: proxy
> Fix For: 2.3
>
> Attachments: MTOMCAT-177.patch
>
>
> Using these settings:
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0-SNAPSHOT
> When running tomcat7:deploy behind a network proxy (specified in 
> ~/.m2/settings.xml), the deploy will fail with a very generic error message.  
> Running outside of the proxy (with no proxy settings in ~/.m2/settings.xml) 
> works fine.
> The error message is simply "Connection refused", no other details provided.



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

[GitHub] tomcat-maven-plugin pull request: Fix for MTOMCAT-177 - tomcat7:de...

2016-04-05 Thread nalbion 
Github user nalbion closed the pull request at:

https://github.com/apache/tomcat-maven-plugin/pull/3


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

buildbot success in on tomcat-trunk

2016-04-05 Thread buildbot 
The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1235

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

[Bug 59276] Update Checkstyle to version 6.17 needs a configuration change

2016-04-05 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=59276

Konstantin Kolinko  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Konstantin Kolinko  ---
(In reply to Konstantin Kolinko from comment #0)
> 
> A temporary backwards-compatible workaround may be to keep the property in
> both places (as setting the duplicate property on TreeWalker does not cause
> a runtime error with 6.17), but it is expected that the setter method will
> be removed from TreeWalker in some future release [4]
> 
> [4] https://github.com/checkstyle/checkstyle/issues/2883
> #2883 - Remove `cache` field from TreeWalker in Checkstyle 8.0

Such workaround is not possible. Checkstyle 6.15 does not have setCacheFile()
method on Walker. An attempt to run updated configuration with 6.15 results in

BUILD FAILED
\build.xml:586: Unable to create a Checker: configLocation
 {<...>\trunk\res\checkstyle\javax-checkstyle.xml}, classpath {null}.

without any further details provided by the error message.

I changed the configuration in Tomcat 9 in r1737903.

Tomcat 8, 8.5 are TODO.

Tomcat 7 is using Checkstyle 6.1.1 as running 6.2 requires Java 7.

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

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

svn commit: r1737903 - in /tomcat/trunk: build.properties.default res/checkstyle/checkstyle.xml res/checkstyle/javax-checkstyle.xml res/checkstyle/org-checkstyle.xml webapps/docs/changelog.xml

2016-04-05 Thread kkolinko 
Author: kkolinko
Date: Wed Apr  6 00:33:28 2016
New Revision: 1737903

URL: http://svn.apache.org/viewvc?rev=1737903=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59276
Update to Checkstyle 6.17

As I described in Bugzilla, this includes a configuration change, breaking 
compatibility with versions earlier than 6.16.

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/checkstyle/checkstyle.xml
tomcat/trunk/res/checkstyle/javax-checkstyle.xml
tomcat/trunk/res/checkstyle/org-checkstyle.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1737903=1737902=1737903=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Apr  6 00:33:28 2016
@@ -216,8 +216,8 @@ objenesis.home=${base.path}/objenesis-${
 
objenesis.loc=https://objenesis.googlecode.com/files/objenesis-${objenesis.version}-bin.zip
 objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
-# - Checkstyle, version 6.0 or later -
-checkstyle.version=6.15
+# - Checkstyle, version 6.16 or later -
+checkstyle.version=6.17
 checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
 
checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
 checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar

Modified: tomcat/trunk/res/checkstyle/checkstyle.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1737903=1737902=1737903=diff
==
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Wed Apr  6 00:33:28 2016
@@ -23,6 +23,10 @@
   
   
 
+  
+  
+
   
   
 
@@ -38,9 +42,6 @@
   
 
   
-
-
 
 
 

Modified: tomcat/trunk/res/checkstyle/javax-checkstyle.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/javax-checkstyle.xml?rev=1737903=1737902=1737903=diff
==
--- tomcat/trunk/res/checkstyle/javax-checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/javax-checkstyle.xml Wed Apr  6 00:33:28 2016
@@ -23,13 +23,13 @@
   
   
 
+  
+  
+
   
 
   
-
-
-
 
   
 

Modified: tomcat/trunk/res/checkstyle/org-checkstyle.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-checkstyle.xml?rev=1737903=1737902=1737903=diff
==
--- tomcat/trunk/res/checkstyle/org-checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/org-checkstyle.xml Wed Apr  6 00:33:28 2016
@@ -23,13 +23,13 @@
   
   
 
+  
+  
+
   
 
   
-
-
-
 
   
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1737903=1737902=1737903=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Apr  6 00:33:28 2016
@@ -177,7 +177,8 @@
 by Huxing Zhang. (violetagg)
   
   
-Update optional Checkstyle library to 6.15. (kkolinko)
+59276: Update optional Checkstyle library to 6.17.
+(kkolinko)
   
   
 Update the NSIS Installer used to build the Windows Installers to



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

[Bug 59276] New: Update Checkstyle to version 6.17 needs a configuration change

2016-04-05 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=59276

Bug ID: 59276
   Summary: Update Checkstyle to version 6.17 needs a
configuration change
   Product: Tomcat 9
   Version: 9.0.0.M4
  Hardware: PC
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com

Filing into Bugzilla to better document the issue.

As I noted in commit message for r1737833, simply dropping in Checkstyle 6.17
(6.16.1, 6.16) - any version later than 6.15 - results in notable drop in
performance of reruns.

A more detailed observation is that running Checkstyle 6.17 does not create the
cache files (output/res/checkstyle/*), so 6.17 is so slow because it is running
without a cache.

In changelog for Checkstyle 6.16 [1] there is the following item:

* Move Treewalker cache to Checker. Author: Andrei Selkin #569 [2]

[1] http://checkstyle.sourceforge.net/releasenotes.html
[2] https://github.com/checkstyle/checkstyle/issues/569

[3] Commit that fixes issue 569:
https://github.com/MEZk/checkstyle/commit/d46c2cf0e9df06bb5f424dbd7645574f082f7609


This means that "setCacheFile()" method was added to Checker class. It means
that our configurations (res/checkstyle/*) need to be updated:

The fix is to move

  

from within 
into top-level  element.


It is easy to do the change for command-line users of checkstyle. A question is
whether the same configuration files are used by developers running Checkstyle
plugin in IDEs. Moving the property will remove caching from older versions of
Xhexkstyle.


A temporary backwards-compatible workaround may be to keep the property in both
places (as setting the duplicate property on TreeWalker does not cause a
runtime error with 6.17), but it is expected that the setter method will be
removed from TreeWalker in some future release [4]

[4] https://github.com/checkstyle/checkstyle/issues/2883
#2883 - Remove `cache` field from TreeWalker in Checkstyle 8.0

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

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

[Bug 59266] Memory leak when using websockets

2016-04-05 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=59266

Remy Maucherat  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

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

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

[Bug 59261] Request getAsyncContext should throw IllegalStateException if async is not started

2016-04-05 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=59261

--- Comment #3 from Remy Maucherat  ---
Right now the spec is that getAsyncContext() should throw an ISE if
isAsyncStarted returns false (which is not the same as asyncContext != null).
This is an extremely risky change, some other places do check if asyncContext
is null because it may have been there but is no longer started, so it cannot
be swapped with isAsyncStarted.

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

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

Re: svn commit: r1737836 - /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java

2016-04-05 Thread Mark Thomas 
On 05/04/2016 17:18, Mark Thomas wrote:
> On 05/04/2016 14:42, r...@apache.org wrote:
>> Author: remm
>> Date: Tue Apr  5 13:42:39 2016
>> New Revision: 1737836
>>
>> URL: http://svn.apache.org/viewvc?rev=1737836=rev
>> Log:
>> SSL init always uses the method, which will make it unusable from Java 7 (as 
>> seen in CI runs). IMO this method is fine as a noop, but I'll leave that as 
>> a fixme for consideration.
> 
> I suspected my changes in this area weren't quite right. I have an item
> on my TODO list to review all this when I have access again to a machine
> where I can easily switch between Tomcat and Java versions. I'm unlikely
> to get to that until the weekend.
> 
> Thanks for the work-around in the meantime.

I found a way to do this with what I have to hand. Should be OK now.

Mark


> 
> Mark
> 
> 
>>
>> Modified:
>> tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
>>
>> Modified: 
>> tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1737836=1737835=1737836=diff
>> ==
>> --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java 
>> (original)
>> +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java 
>> Tue Apr  5 13:42:39 2016
>> @@ -62,7 +62,8 @@ public class JreCompat {
>>  @SuppressWarnings("unused")
>>  public void setUseServerCipherSuitesOrder(SSLEngine engine,
>>  boolean useCipherSuitesOrder) {
>> -throw new 
>> UnsupportedOperationException(sm.getString("jreCompat.noServerCipherSuiteOrder"));
>> +// FIXME: Diasabled for now as it i always called during SSL init, 
>> which makes it fail on Java 7
>> +//throw new 
>> UnsupportedOperationException(sm.getString("jreCompat.noServerCipherSuiteOrder"));
>>  }
>>  
>>  }
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

buildbot failure in on tomcat-trunk

2016-04-05 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1234

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1737866 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/compat/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/openssl/

2016-04-05 Thread markt 
Author: markt
Date: Tue Apr  5 18:13:07 2016
New Revision: 1737866

URL: http://svn.apache.org/viewvc?rev=1737866=rev
Log:
Fix the regression in 1737745
Only try and set honorCipherOrder if it appears in the config.
Trying to set this on Java 7 will trigger an error with the JSSE implementation.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr  5 18:13:07 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737860

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1737866=1737865=1737866=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
Tue Apr  5 18:13:07 2016
@@ -475,11 +475,11 @@ public abstract class AbstractHttp11Prot
 }
 
 
-public void setUseServerCipherSuitesOrder(boolean honorCipherOrder) {
+public void setUseServerCipherSuitesOrder(String honorCipherOrder) {
 registerDefaultSSLHostConfig();
 defaultSSLHostConfig.setHonorCipherOrder(honorCipherOrder);
 }
-public void setSSLHonorCipherOrder(boolean honorCipherOrder) {
+public void setSSLHonorCipherOrder(String honorCipherOrder) {
 registerDefaultSSLHostConfig();
 defaultSSLHostConfig.setHonorCipherOrder(honorCipherOrder);
 }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java?rev=1737866=1737865=1737866=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java Tue 
Apr  5 18:13:07 2016
@@ -54,7 +54,8 @@ class Jre8Compat extends JreCompat {
 boolean useCipherSuitesOrder) {
 SSLParameters sslParameters = engine.getSSLParameters();
 try {
-setUseCipherSuitesOrderMethod.invoke(sslParameters, 
Boolean.valueOf(useCipherSuitesOrder));
+setUseCipherSuitesOrderMethod.invoke(sslParameters,
+Boolean.valueOf(useCipherSuitesOrder));
 engine.setSSLParameters(sslParameters);
 } catch (IllegalArgumentException e) {
 throw new UnsupportedOperationException(e);

Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1737866=1737865=1737866=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java Tue 
Apr  5 18:13:07 2016
@@ -60,10 +60,7 @@ public class JreCompat {
 
 
 @SuppressWarnings("unused")
-public void setUseServerCipherSuitesOrder(SSLEngine engine,
-boolean useCipherSuitesOrder) {
-// FIXME: Diasabled for now as it i always called during SSL init, 
which makes it fail on Java 7
-//throw new 
UnsupportedOperationException(sm.getString("jreCompat.noServerCipherSuiteOrder"));
+public void setUseServerCipherSuitesOrder(SSLEngine engine, boolean 
useCipherSuitesOrder) {
+throw new

svn commit: r1737862 - /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

2016-04-05 Thread markt 
Author: markt
Date: Tue Apr  5 18:02:25 2016
New Revision: 1737862

URL: http://svn.apache.org/viewvc?rev=1737862=rev
Log:
With a minimum version of OpenSSL 1.0.2, these features are always available.

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1737862=1737861=1737862=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
 Tue Apr  5 18:02:25 2016
@@ -194,82 +194,32 @@ public class OpenSSLContext implements o
 return;
 }
 try {
-boolean legacyRenegSupported = false;
-try {
-legacyRenegSupported = 
SSL.hasOp(SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-if (legacyRenegSupported)
-if (sslHostConfig.getInsecureRenegotiation()) {
-SSLContext.setOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-} else {
-SSLContext.clearOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-}
-} catch (UnsatisfiedLinkError e) {
-// Ignore
-}
-if (!legacyRenegSupported) {
-// OpenSSL does not support unsafe legacy renegotiation.
-log.warn(netSm.getString("endpoint.warn.noInsecureReneg",
-  SSL.versionString()));
+if (sslHostConfig.getInsecureRenegotiation()) {
+SSLContext.setOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
+} else {
+SSLContext.clearOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
 }
+
 // Use server's preference order for ciphers (rather than
 // client's)
-boolean orderCiphersSupported = false;
-try {
-orderCiphersSupported = 
SSL.hasOp(SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-if (orderCiphersSupported) {
-if (sslHostConfig.getHonorCipherOrder()) {
-SSLContext.setOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-} else {
-SSLContext.clearOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-}
-}
-} catch (UnsatisfiedLinkError e) {
-// Ignore
-}
-if (!orderCiphersSupported) {
-// OpenSSL does not support ciphers ordering.
-log.warn(netSm.getString("endpoint.warn.noHonorCipherOrder",
-  SSL.versionString()));
+if (sslHostConfig.getHonorCipherOrder()) {
+SSLContext.setOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
+} else {
+SSLContext.clearOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
 }
 
 // Disable compression if requested
-boolean disableCompressionSupported = false;
-try {
-disableCompressionSupported = 
SSL.hasOp(SSL.SSL_OP_NO_COMPRESSION);
-if (disableCompressionSupported) {
-if (sslHostConfig.getDisableCompression()) {
-SSLContext.setOptions(ctx, SSL.SSL_OP_NO_COMPRESSION);
-} else {
-SSLContext.clearOptions(ctx, 
SSL.SSL_OP_NO_COMPRESSION);
-}
-}
-} catch (UnsatisfiedLinkError e) {
-// Ignore
-}
-if (!disableCompressionSupported) {
-// OpenSSL does not support ciphers ordering.
-log.warn(netSm.getString("endpoint.warn.noDisableCompression",
-  SSL.versionString()));
+if (sslHostConfig.getDisableCompression()) {
+SSLContext.setOptions(ctx, SSL.SSL_OP_NO_COMPRESSION);
+} else {
+SSLContext.clearOptions(ctx, SSL.SSL_OP_NO_COMPRESSION);
 }
 
 // Disable TLS Session Tickets (RFC4507) to protect perfect 
forward secrecy
-boolean disableSessionTicketsSupported = false;
-try {
-disableSessionTicketsSupported = 
SSL.hasOp(SSL.SSL_OP_NO_TICKET);
-if (disableSessionTicketsSupported) {
-if (sslHostConfig.getDisableSessionTickets()) {
-SSLContext.setOptions(ctx, SSL.SSL_OP_NO_TICKET);
-} else {
-

svn commit: r1737860 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

2016-04-05 Thread markt 
Author: markt
Date: Tue Apr  5 18:00:49 2016
New Revision: 1737860

URL: http://svn.apache.org/viewvc?rev=1737860=rev
Log:
With a minimum version of OpenSSL 1.0.2, these features are always available.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1737860=1737859=1737860=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
Tue Apr  5 18:00:49 2016
@@ -192,82 +192,32 @@ public class OpenSSLContext implements o
 return;
 }
 try {
-boolean legacyRenegSupported = false;
-try {
-legacyRenegSupported = 
SSL.hasOp(SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-if (legacyRenegSupported)
-if (sslHostConfig.getInsecureRenegotiation()) {
-SSLContext.setOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-} else {
-SSLContext.clearOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-}
-} catch (UnsatisfiedLinkError e) {
-// Ignore
-}
-if (!legacyRenegSupported) {
-// OpenSSL does not support unsafe legacy renegotiation.
-log.warn(netSm.getString("endpoint.warn.noInsecureReneg",
-  SSL.versionString()));
+if (sslHostConfig.getInsecureRenegotiation()) {
+SSLContext.setOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
+} else {
+SSLContext.clearOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
 }
+
 // Use server's preference order for ciphers (rather than
 // client's)
-boolean orderCiphersSupported = false;
-try {
-orderCiphersSupported = 
SSL.hasOp(SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-if (orderCiphersSupported) {
-if (sslHostConfig.getHonorCipherOrder()) {
-SSLContext.setOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-} else {
-SSLContext.clearOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-}
-}
-} catch (UnsatisfiedLinkError e) {
-// Ignore
-}
-if (!orderCiphersSupported) {
-// OpenSSL does not support ciphers ordering.
-log.warn(netSm.getString("endpoint.warn.noHonorCipherOrder",
-  SSL.versionString()));
+if (sslHostConfig.getHonorCipherOrder()) {
+SSLContext.setOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
+} else {
+SSLContext.clearOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
 }
 
 // Disable compression if requested
-boolean disableCompressionSupported = false;
-try {
-disableCompressionSupported = 
SSL.hasOp(SSL.SSL_OP_NO_COMPRESSION);
-if (disableCompressionSupported) {
-if (sslHostConfig.getDisableCompression()) {
-SSLContext.setOptions(ctx, SSL.SSL_OP_NO_COMPRESSION);
-} else {
-SSLContext.clearOptions(ctx, 
SSL.SSL_OP_NO_COMPRESSION);
-}
-}
-} catch (UnsatisfiedLinkError e) {
-// Ignore
-}
-if (!disableCompressionSupported) {
-// OpenSSL does not support ciphers ordering.
-log.warn(netSm.getString("endpoint.warn.noDisableCompression",
-  SSL.versionString()));
+if (sslHostConfig.getDisableCompression()) {
+SSLContext.setOptions(ctx, SSL.SSL_OP_NO_COMPRESSION);
+} else {
+SSLContext.clearOptions(ctx, SSL.SSL_OP_NO_COMPRESSION);
 }
 
 // Disable TLS Session Tickets (RFC4507) to protect perfect 
forward secrecy
-boolean disableSessionTicketsSupported = false;
-try {
-disableSessionTicketsSupported = 
SSL.hasOp(SSL.SSL_OP_NO_TICKET);
-if (disableSessionTicketsSupported) {
-if (sslHostConfig.getDisableSessionTickets()) {
-SSLContext.setOptions(ctx, SSL.SSL_OP_NO_TICKET);
-} else {
-SSLContext.clearOptions(ctx, SSL.SSL_OP_NO_TICKET);
-

[Bug 59270] Regression with Spring with AspectJ Load-Time Weaving

2016-04-05 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=59270

--- Comment #3 from Remy Maucherat  ---
Well, keeping this around actually seemed to use a lot of memory (not an issue
with small webapps obviously), so it's probably not going to be restored.

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

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

Re: svn commit: r1737836 - /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java

2016-04-05 Thread Mark Thomas 
On 05/04/2016 14:42, r...@apache.org wrote:
> Author: remm
> Date: Tue Apr  5 13:42:39 2016
> New Revision: 1737836
> 
> URL: http://svn.apache.org/viewvc?rev=1737836=rev
> Log:
> SSL init always uses the method, which will make it unusable from Java 7 (as 
> seen in CI runs). IMO this method is fine as a noop, but I'll leave that as a 
> fixme for consideration.

I suspected my changes in this area weren't quite right. I have an item
on my TODO list to review all this when I have access again to a machine
where I can easily switch between Tomcat and Java versions. I'm unlikely
to get to that until the weekend.

Thanks for the work-around in the meantime.

Mark


> 
> Modified:
> tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
> 
> Modified: 
> tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1737836=1737835=1737836=diff
> ==
> --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java 
> (original)
> +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java 
> Tue Apr  5 13:42:39 2016
> @@ -62,7 +62,8 @@ public class JreCompat {
>  @SuppressWarnings("unused")
>  public void setUseServerCipherSuitesOrder(SSLEngine engine,
>  boolean useCipherSuitesOrder) {
> -throw new 
> UnsupportedOperationException(sm.getString("jreCompat.noServerCipherSuiteOrder"));
> +// FIXME: Diasabled for now as it i always called during SSL init, 
> which makes it fail on Java 7
> +//throw new 
> UnsupportedOperationException(sm.getString("jreCompat.noServerCipherSuiteOrder"));
>  }
>  
>  }
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

[Bug 59270] Regression with Spring with AspectJ Load-Time Weaving

2016-04-05 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=59270

--- Comment #2 from Andrei Ivanov  ---
Hi,
As I've shown in https://bz.apache.org/bugzilla/show_bug.cgi?id=58143, the
recommended Spring solution didn't work for me as Tomcat was already loading
the class I want to weave before Spring gets initialized.

Indeed, the custom classloader gets picked up.
Ha, seems that the API has changed again:
On 8.0.32, the new method was called: findResourceInternal(String name, String
path, boolean manifestRequired)
This created the issue for Spring earlier :)

On 8.0.33, it reverts back to calling the initial method:
findResourceInternal(String name, String path)

This is the Spring method body (in both cases):
protected ResourceEntry findResourceInternal(String name, String path) {
ResourceEntry entry = super.findResourceInternal(name, path);
if (entry != null && entry.binaryContent != null &&
path.endsWith(CLASS_SUFFIX)) {
String className = (name.endsWith(CLASS_SUFFIX) ? name.substring(0,
name.length() - CLASS_SUFFIX.length()) : name);
entry.binaryContent =
this.weavingTransformer.transformIfNecessary(className, entry.binaryContent);
}
return entry;
}

The problem now is that entry.binaryContent is null, so the weaving doesn't
take place.

This might be the cause:
https://github.com/apache/tomcat/commit/bd3cd71dd8a40b02e1728d98a9c241ef630573ef#diff-3f0901a8e99cbddfc81363aeb77a0109

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

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

svn commit: r1737836 - /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java

2016-04-05 Thread remm 
Author: remm
Date: Tue Apr  5 13:42:39 2016
New Revision: 1737836

URL: http://svn.apache.org/viewvc?rev=1737836=rev
Log:
SSL init always uses the method, which will make it unusable from Java 7 (as 
seen in CI runs). IMO this method is fine as a noop, but I'll leave that as a 
fixme for consideration.

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1737836=1737835=1737836=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java Tue 
Apr  5 13:42:39 2016
@@ -62,7 +62,8 @@ public class JreCompat {
 @SuppressWarnings("unused")
 public void setUseServerCipherSuitesOrder(SSLEngine engine,
 boolean useCipherSuitesOrder) {
-throw new 
UnsupportedOperationException(sm.getString("jreCompat.noServerCipherSuiteOrder"));
+// FIXME: Diasabled for now as it i always called during SSL init, 
which makes it fail on Java 7
+//throw new 
UnsupportedOperationException(sm.getString("jreCompat.noServerCipherSuiteOrder"));
 }
 
 }



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

svn commit: r1737834 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml

2016-04-05 Thread kkolinko 
Author: kkolinko
Date: Tue Apr  5 13:04:36 2016
New Revision: 1737834

URL: http://svn.apache.org/viewvc?rev=1737834=rev
Log:
Update to NSIS 2.51.

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1737834=1737833=1737834=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue Apr  5 13:04:36 2016
@@ -163,7 +163,7 @@ tomcat-native.win.1=${base-tomcat.loc.1}
 
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
 
 # - NSIS, version 2.0 or later -
-nsis.version=2.50
+nsis.version=2.51
 nsis.home=${base.path}/nsis-${nsis.version}
 nsis.exe=${nsis.home}/makensis.exe
 nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1737834=1737833=1737834=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr  5 13:04:36 2016
@@ -179,6 +179,10 @@
   
 Update optional Checkstyle library to 6.15. (kkolinko)
   
+  
+Update the NSIS Installer used to build the Windows Installers to
+version 2.51. (kkolinko)
+  
 
   
 



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

svn commit: r1737833 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml

2016-04-05 Thread kkolinko 
Author: kkolinko
Date: Tue Apr  5 13:01:38 2016
New Revision: 1737833

URL: http://svn.apache.org/viewvc?rev=1737833=rev
Log:
Update to Checkstyle 6.15.

For some reason 6.16/6.16.1/6.17 are notably slower (rerun is 35-45 seconds vs 
5 of 6.14.1/6.15),
so I am not using them. It needs to be retested, though.

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1737833=1737832=1737833=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue Apr  5 13:01:38 2016
@@ -217,7 +217,7 @@ objenesis.loc=https://objenesis.googleco
 objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
 # - Checkstyle, version 6.0 or later -
-checkstyle.version=6.14.1
+checkstyle.version=6.15
 checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
 
checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
 checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1737833=1737832=1737833=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr  5 13:01:38 2016
@@ -176,6 +176,9 @@
 59211: Add hamcrest to Eclipse classpath. Patch is provided
 by Huxing Zhang. (violetagg)
   
+  
+Update optional Checkstyle library to 6.15. (kkolinko)
+  
 
   
 



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

buildbot success in on tomcat-trunk

2016-04-05 Thread buildbot 
The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1232

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1737827 - /tomcat/trunk/webapps/docs/changelog.xml

2016-04-05 Thread kkolinko 
Author: kkolinko
Date: Tue Apr  5 12:10:05 2016
New Revision: 1737827

URL: http://svn.apache.org/viewvc?rev=1737827=rev
Log:
Correct typos in changelog.xml

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1737827=1737826=1737827=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr  5 12:10:05 2016
@@ -92,8 +92,8 @@
 from the standard JAR scanning by default. (violetagg)
   
   
-Clarify in the log message that specifying both urlPatterns and value
-attributes in WebServlet and WebFilter annotations is not allowed.
+Clarify the log message that specifying both urlPatterns and value
+attributes in @WebServlet and @WebFilter annotations is not allowed.
 (violetagg)
   
   
@@ -239,7 +239,7 @@
 memory footprint of a running Tomcat instance. (markt)
   
   
-Switch to the web application class loader to the
+Switch the web application class loader to the
 ParallelWebappClassLoader by default. (markt)
   
   
@@ -325,7 +325,7 @@
   
   
 59154: Fix a NullPointerException in the
-JASSMemoryLoginModue resulting from the introduction of 
the
+JAASMemoryLoginModule resulting from the introduction of 
the
 CredentialHandler to Realms. (schultz/markt)
   
 



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

[Bug 58490] Webapp does not start when using web-fragments icw unpackWARs="false"

2016-04-05 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58490

Violeta Georgieva  changed:

   What|Removed |Added

 CC||tho...@m3y3r.de

--- Comment #2 from Violeta Georgieva  ---
*** Bug 59274 has been marked as a duplicate of this bug. ***

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

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

[Bug 59274] web-fragment.xml ordering broken with unpackWARs="false" (MalformedURLException: no !/ in spec)

2016-04-05 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=59274

Violeta Georgieva  changed:

   What|Removed |Added

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

--- Comment #1 from Violeta Georgieva  ---


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

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

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

[Bug 59274] New: web-fragment.xml ordering broken with unpackWARs="false" (MalformedURLException: no !/ in spec)

2016-04-05 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=59274

Bug ID: 59274
   Summary: web-fragment.xml ordering broken with
unpackWARs="false" (MalformedURLException: no !/ in
spec)
   Product: Tomcat 8
   Version: 8.0.28
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: tho...@m3y3r.de

Hi,

when using web-fragment.xml to define a order between JARs inside a WAR file
and when running Tomcat with unpackWARs="false" the container fails with an
MalformedURLException. Stack trace is:
Daemon Thread [localhost-startStop-1] (Suspended (exception
MalformedURLException))
owns: ContextConfig  (id=65)
owns: StandardContext  (id=66)
URL.(URL, String, URLStreamHandler) line: 622
URL.(URL, String) line: 483
URL.(String) line: 432
JarURLConnection(JarURLConnection).parseSpecs(URL) line: 175
JarURLConnection(JarURLConnection).(URL) line: 158
JarURLConnection.(URL, Handler) line: 81
Handler.openConnection(URL) line: 41
URL.openConnection() line: 972
URL.openStream() line: 1038
WebappServiceLoader.parseConfigFile(LinkedHashSet, URL) line:
161
WebappServiceLoader.load(Class) line: 118
ContextConfig.processServletContainerInitializers() line: 1616
ContextConfig.webConfig() line: 1128
ContextConfig.configureStart() line: 771
ContextConfig.lifecycleEvent(LifecycleEvent) line: 305
LifecycleSupport.fireLifecycleEvent(String, Object) line: 95
StandardContext(LifecycleBase).fireLifecycleEvent(String, Object) line: 90  
StandardContext.startInternal() line: 5080
StandardContext(LifecycleBase).start() line: 150
StandardHost(ContainerBase).addChildInternal(Container) line: 725
StandardHost(ContainerBase).addChild(Container) line: 701
StandardHost.addChild(Container) line: 717
HostConfig.deployWAR(ContextName, File) line: 945
HostConfig$DeployWar.run() line: 1798
Executors$RunnableAdapter.call() line: 511
FutureTask.run() line: 266
ThreadPoolExecutor.runWorker(ThreadPoolExecutor$Worker) line: 1142
ThreadPoolExecutor$Worker.run() line: 617
Thread.run() line: 745

The problem seems to be in class WebappServiceLoader which has this flawed
logic in the load() method:
String base = jarUrl.toExternalForm();
URL url;
if (base.endsWith("/")) {
url = new URL(base + configFile);
} else {
url = new URL("jar:" + base + "!/" + configFile);
}

I think the problem is that when running in unpackWARs="false" the base URL can
be something like this:
jar:file:/path/to/tomcat/installation/webapps/webapp.war!/WEB-INF/lib/library-file.jar

it then adds another jar: infront of the URL resulting in a URL of:
jar:jar:file:/path/to/tomcat/installation/webapps/webapp.war!/WEB-INF/lib/library-file.jar

which cannot be parsed be the URL class:
java.net.MalformedURLException: no !/ in spec

I think this bug was introduced in commit
646bba33e0e269a2c1ffa03d92da3aea3a36d95a ( Fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=55287 )

When running with unpackWARs="true" the web-fragment.xml ordering is correctly
processed.

-- 
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-04-05 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: 32 mins 17 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 
-Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs 
-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-20160405.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 -Dexec
 ute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160405-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160405-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-12/dest-20160405/lib 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160405.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@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

2016-04-05 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: 40 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 
-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-20160405-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-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-20160405/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160405.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160405-nat
 ive-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-20160405/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

buildbot failure in on tomcat-trunk

2016-04-05 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1231

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1737796 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/group/interceptors/ java/org/apache/catalina/tribes/membership/ webapps/docs/

2016-04-05 Thread kfujino 
Author: kfujino
Date: Tue Apr  5 07:40:25 2016
New Revision: 1737796

URL: http://svn.apache.org/viewvc?rev=1737796=rev
Log:
Add the flag indicating that member is a localMember.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=1737796=1737795=1737796=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
 Tue Apr  5 07:40:25 2016
@@ -65,6 +65,7 @@ public class StaticMembershipInterceptor
 
 public void setLocalMember(Member member) {
 this.localMember = member;
+((StaticMember)localMember).setLocal(true);
 }
 
 @Override

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1737796=1737795=1737796=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 Tue Apr  5 07:40:25 2016
@@ -171,6 +171,7 @@ public class McastService implements Mem
 localMember.setUniqueId(UUIDGenerator.randomUUID(true));
 localMember.setPayload(getPayload());
 localMember.setDomain(getDomain());
+localMember.setLocal(true);
 }
 localMember.setSecurePort(securePort);
 localMember.setUdpPort(udpPort);
@@ -391,6 +392,7 @@ public class McastService implements Mem
 if ( localMember == null ) {
 localMember = new MemberImpl(host, port, 100);
 localMember.setUniqueId(UUIDGenerator.randomUUID(true));
+localMember.setLocal(true);
 } else {
 localMember.setHostname(host);
 localMember.setPort(port);

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1737796=1737795=1737796=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java 
Tue Apr  5 07:40:25 2016
@@ -123,6 +123,11 @@ public class MemberImpl implements Membe
 protected byte[] domain = new byte[0];
 
 /**
+ * The flag indicating that this member is a local member.
+ */
+protected volatile boolean local = false;
+
+/**
  * Empty constructor for serialization
  */
 public MemberImpl() {
@@ -646,6 +651,14 @@ public class MemberImpl implements Membe
 this.dataPkg = null;
 }
 
+public boolean isLocal() {
+return local;
+}
+
+public void setLocal(boolean local) {
+this.local = local;
+}
+
 @Override
 public void readExternal(ObjectInput in) throws IOException, 
ClassNotFoundException {
 int length = in.readInt();

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml?rev=1737796=1737795=1737796=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
 Tue Apr  5 07:40:25 2016
@@ -161,6 +161,12 @@
   description="The upd port the member is listening on"
   type="int"
   writeable="false"/>
+
   
   
+
   
 

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1737796=1737795=1737796=diff
==
---

svn commit: r1737795 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/group/interceptors/ java/org/apache/catalina/tribes/membership/ webapps/docs/

2016-04-05 Thread kfujino 
Author: kfujino
Date: Tue Apr  5 07:36:34 2016
New Revision: 1737795

URL: http://svn.apache.org/viewvc?rev=1737795=rev
Log:
Add the flag indicating that member is a localMember.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=1737795=1737794=1737795=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
 Tue Apr  5 07:36:34 2016
@@ -28,6 +28,7 @@ import org.apache.catalina.tribes.group.
 import org.apache.catalina.tribes.group.ChannelInterceptorBase;
 import org.apache.catalina.tribes.io.ChannelData;
 import org.apache.catalina.tribes.io.XByteBuffer;
+import org.apache.catalina.tribes.membership.StaticMember;
 import org.apache.catalina.tribes.util.StringManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -67,6 +68,7 @@ public class StaticMembershipInterceptor
 
 public void setLocalMember(Member member) {
 this.localMember = member;
+((StaticMember)localMember).setLocal(true);
 }
 
 @Override

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1737795=1737794=1737795=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 Tue Apr  5 07:36:34 2016
@@ -155,6 +155,7 @@ public class McastService implements Mem
 localMember.setUniqueId(UUIDGenerator.randomUUID(true));
 localMember.setPayload(getPayload());
 localMember.setDomain(getDomain());
+localMember.setLocal(true);
 }
 localMember.setSecurePort(securePort);
 localMember.setUdpPort(udpPort);
@@ -305,6 +306,7 @@ public class McastService implements Mem
 if ( localMember == null ) {
 localMember = new MemberImpl(host, port, 100);
 localMember.setUniqueId(UUIDGenerator.randomUUID(true));
+localMember.setLocal(true);
 } else {
 localMember.setHostname(host);
 localMember.setPort(port);

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1737795=1737794=1737795=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java 
Tue Apr  5 07:36:34 2016
@@ -109,6 +109,11 @@ public class MemberImpl implements Membe
 protected volatile byte[] domain = new byte[0];
 
 /**
+ * The flag indicating that this member is a local member.
+ */
+protected volatile boolean local = false;
+
+/**
  * Empty constructor for serialization
  */
 public MemberImpl() {
@@ -653,6 +658,14 @@ public class MemberImpl implements Membe
 this.dataPkg = null;
 }
 
+public boolean isLocal() {
+return local;
+}
+
+public void setLocal(boolean local) {
+this.local = local;
+}
+
 @Override
 public void readExternal(ObjectInput in) throws IOException, 
ClassNotFoundException {
 int length = in.readInt();

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml?rev=1737795=1737794=1737795=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
 Tue Apr  5 07:36:34

svn commit: r1737794 - in /tomcat/tc8.5.x/trunk: java/org/apache/catalina/tribes/ java/org/apache/catalina/tribes/group/interceptors/ java/org/apache/catalina/tribes/membership/ webapps/docs/

2016-04-05 Thread kfujino 
Author: kfujino
Date: Tue Apr  5 07:33:41 2016
New Revision: 1737794

URL: http://svn.apache.org/viewvc?rev=1737794=rev
Log:
Add the flag indicating that member is a localMember.

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Member.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Member.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Member.java?rev=1737794=1737793=1737794=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Member.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/Member.java Tue Apr  5 
07:33:41 2016
@@ -148,4 +148,11 @@ public interface Member {
  * @return the data length
  */
 public int getDataLength();
+
+/**
+ * @return boolean - true if the member is local member
+ */
+public boolean isLocal();
+
+public void setLocal(boolean local);
 }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=1737794=1737793=1737794=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
 Tue Apr  5 07:33:41 2016
@@ -67,6 +67,7 @@ public class StaticMembershipInterceptor
 
 public void setLocalMember(Member member) {
 this.localMember = member;
+localMember.setLocal(true);
 }
 
 @Override

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1737794=1737793=1737794=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 Tue Apr  5 07:33:41 2016
@@ -156,6 +156,7 @@ public class McastService implements Mem
 localMember.setUniqueId(UUIDGenerator.randomUUID(true));
 localMember.setPayload(getPayload());
 localMember.setDomain(getDomain());
+localMember.setLocal(true);
 }
 localMember.setSecurePort(securePort);
 localMember.setUdpPort(udpPort);
@@ -306,6 +307,7 @@ public class McastService implements Mem
 if ( localMember == null ) {
 localMember = new MemberImpl(host, port, 100);
 localMember.setUniqueId(UUIDGenerator.randomUUID(true));
+localMember.setLocal(true);
 } else {
 localMember.setHostname(host);
 localMember.setPort(port);

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1737794=1737793=1737794=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java 
Tue Apr  5 07:33:41 2016
@@ -109,6 +109,11 @@ public class MemberImpl implements Membe
 protected volatile byte[] domain = new byte[0];
 
 /**
+ * The flag indicating that this member is a local member.
+ */
+protected volatile boolean local = false;
+
+/**
  * Empty constructor for serialization
  */
 public MemberImpl() {
@@ -654,6 +659,16 @@ public class MemberImpl implements Membe
 }
 
 @Override
+public boolean isLocal() {
+return local;
+}
+
+@Override
+public void setLocal(boolean local) {
+this.local = local;
+}
+
+@Override
 public void readExternal(ObjectInput in) throws IOException, 
ClassNotFoundException {
 int length = in.readInt();
 byte[] message = new byte[length];

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
URL:

svn commit: r1737793 - in /tomcat/trunk/java/org/apache/catalina/tribes: Member.java group/interceptors/StaticMembershipInterceptor.java membership/MemberImpl.java

2016-04-05 Thread kfujino 
Author: kfujino
Date: Tue Apr  5 07:28:24 2016
New Revision: 1737793

URL: http://svn.apache.org/viewvc?rev=1737793=rev
Log:
Move the isLocal method and setLocal method to Member interface.

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/Member.java

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/Member.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/Member.java?rev=1737793=1737792=1737793=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/Member.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/Member.java Tue Apr  5 
07:28:24 2016
@@ -148,4 +148,11 @@ public interface Member {
  * @return the data length
  */
 public int getDataLength();
+
+/**
+ * @return boolean - true if the member is local member
+ */
+public boolean isLocal();
+
+public void setLocal(boolean local);
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=1737793=1737792=1737793=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
 Tue Apr  5 07:28:24 2016
@@ -28,7 +28,6 @@ import org.apache.catalina.tribes.group.
 import org.apache.catalina.tribes.group.ChannelInterceptorBase;
 import org.apache.catalina.tribes.io.ChannelData;
 import org.apache.catalina.tribes.io.XByteBuffer;
-import org.apache.catalina.tribes.membership.StaticMember;
 import org.apache.catalina.tribes.util.StringManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -68,7 +67,7 @@ public class StaticMembershipInterceptor
 
 public void setLocalMember(Member member) {
 this.localMember = member;
-((StaticMember)localMember).setLocal(true);
+localMember.setLocal(true);
 }
 
 @Override

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1737793=1737792=1737793=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Tue 
Apr  5 07:28:24 2016
@@ -658,10 +658,12 @@ public class MemberImpl implements Membe
 this.dataPkg = null;
 }
 
+@Override
 public boolean isLocal() {
 return local;
 }
 
+@Override
 public void setLocal(boolean local) {
 this.local = local;
 }



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

svn commit: r1737792 - in /tomcat/trunk/java/org/apache/catalina/tribes: group/interceptors/StaticMembershipInterceptor.java membership/mbeans-descriptors.xml

2016-04-05 Thread kfujino 
Author: kfujino
Date: Tue Apr  5 07:22:36 2016
New Revision: 1737792

URL: http://svn.apache.org/viewvc?rev=1737792=rev
Log:
Apply the local member flag to static member.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=1737792=1737791=1737792=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
 Tue Apr  5 07:22:36 2016
@@ -28,6 +28,7 @@ import org.apache.catalina.tribes.group.
 import org.apache.catalina.tribes.group.ChannelInterceptorBase;
 import org.apache.catalina.tribes.io.ChannelData;
 import org.apache.catalina.tribes.io.XByteBuffer;
+import org.apache.catalina.tribes.membership.StaticMember;
 import org.apache.catalina.tribes.util.StringManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -67,6 +68,7 @@ public class StaticMembershipInterceptor
 
 public void setLocalMember(Member member) {
 this.localMember = member;
+((StaticMember)localMember).setLocal(true);
 }
 
 @Override

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml?rev=1737792=1737791=1737792=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml 
Tue Apr  5 07:22:36 2016
@@ -227,5 +227,11 @@
   description="The upd port the member is listening on"
   type="int"
   writeable="false"/>
+
   
 



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

svn commit: r1737791 - in /tomcat/trunk: java/org/apache/catalina/tribes/membership/McastService.java java/org/apache/catalina/tribes/membership/MemberImpl.java java/org/apache/catalina/tribes/members

2016-04-05 Thread kfujino 
Author: kfujino
Date: Tue Apr  5 07:15:36 2016
New Revision: 1737791

URL: http://svn.apache.org/viewvc?rev=1737791=rev
Log:
Add the flag indicating that member is a localMember.

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1737791=1737790=1737791=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java 
Tue Apr  5 07:15:36 2016
@@ -156,6 +156,7 @@ public class McastService implements Mem
 localMember.setUniqueId(UUIDGenerator.randomUUID(true));
 localMember.setPayload(getPayload());
 localMember.setDomain(getDomain());
+localMember.setLocal(true);
 }
 localMember.setSecurePort(securePort);
 localMember.setUdpPort(udpPort);
@@ -306,6 +307,7 @@ public class McastService implements Mem
 if ( localMember == null ) {
 localMember = new MemberImpl(host, port, 100);
 localMember.setUniqueId(UUIDGenerator.randomUUID(true));
+localMember.setLocal(true);
 } else {
 localMember.setHostname(host);
 localMember.setPort(port);

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1737791=1737790=1737791=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Tue 
Apr  5 07:15:36 2016
@@ -109,6 +109,11 @@ public class MemberImpl implements Membe
 protected volatile byte[] domain = new byte[0];
 
 /**
+ * The flag indicating that this member is a local member.
+ */
+protected volatile boolean local = false;
+
+/**
  * Empty constructor for serialization
  */
 public MemberImpl() {
@@ -653,6 +658,14 @@ public class MemberImpl implements Membe
 this.dataPkg = null;
 }
 
+public boolean isLocal() {
+return local;
+}
+
+public void setLocal(boolean local) {
+this.local = local;
+}
+
 @Override
 public void readExternal(ObjectInput in) throws IOException, 
ClassNotFoundException {
 int length = in.readInt();

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml?rev=1737791=1737790=1737791=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml 
Tue Apr  5 07:15:36 2016
@@ -156,6 +156,12 @@
   description="The upd port the member is listening on"
   type="int"
   writeable="false"/>
+
   
   http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1737791=1737790=1737791=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr  5 07:15:36 2016
@@ -165,6 +165,9 @@
   
 Avoid NPE when a proxy node failed to retrieve a backup entry. 
(kfujino)
   
+  
+Add the flag indicating that member is a localMember. (kfujino)
+  
 
   
   



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

svn commit: r1737786 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/config/http.xml

2016-04-05 Thread markt 
Author: markt
Date: Tue Apr  5 06:52:53 2016
New Revision: 1737786

URL: http://svn.apache.org/viewvc?rev=1737786=rev
Log:
s/certificateValidation/certificateVerification/ as reported on users list

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr  5 06:52:53 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785

Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml?rev=1737786=1737785=1737786=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml Tue Apr  5 06:52:53 2016
@@ -1427,7 +1427,7 @@
 
 
 
-  This is an alias for the certificateValidation attribute
+  This is an alias for the certificateVerification 
attribute
   of the default SSLHostConfig
   element.
 
@@ -1645,7 +1645,7 @@
 
 
 
-  This is an alias for the certificateValidation attribute
+  This is an alias for the certificateVerification 
attribute
   of the default SSLHostConfig
   element.
 



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

svn commit: r1737785 - /tomcat/trunk/webapps/docs/config/http.xml

2016-04-05 Thread markt 
Author: markt
Date: Tue Apr  5 06:51:33 2016
New Revision: 1737785

URL: http://svn.apache.org/viewvc?rev=1737785=rev
Log:
s/certificateValidation/certificateVerification/ as reported on users list

Modified:
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1737785=1737784=1737785=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Tue Apr  5 06:51:33 2016
@@ -1426,7 +1426,7 @@
 
 
 
-  This is an alias for the certificateValidation attribute
+  This is an alias for the certificateVerification 
attribute
   of the default SSLHostConfig
   element.
 
@@ -1644,7 +1644,7 @@
 
 
 
-  This is an alias for the certificateValidation attribute
+  This is an alias for the certificateVerification 
attribute
   of the default SSLHostConfig
   element.
 



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