svn commit: r1843879 - in /tomcat/trunk: java/org/apache/catalina/tribes/membership/ webapps/docs/

2018-10-15 Thread kfujino 
Author: kfujino
Date: Mon Oct 15 07:21:26 2018
New Revision: 1843879

URL: http://svn.apache.org/viewvc?rev=1843879&view=rev
Log:
Move the event notification ThreadPoolExecutor to MembershipProviderBase.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipProviderBase.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1843879&r1=1843878&r2=1843879&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java 
Mon Oct 15 07:21:26 2018
@@ -26,8 +26,6 @@ import java.net.InetSocketAddress;
 import java.net.MulticastSocket;
 import java.net.SocketTimeoutException;
 import java.util.Arrays;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.catalina.tribes.Channel;
@@ -36,7 +34,6 @@ import org.apache.catalina.tribes.Member
 import org.apache.catalina.tribes.MessageListener;
 import org.apache.catalina.tribes.io.ChannelData;
 import org.apache.catalina.tribes.io.XByteBuffer;
-import org.apache.catalina.tribes.util.ExecutorFactory;
 import org.apache.catalina.tribes.util.StringManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -142,12 +139,6 @@ public class McastServiceImpl extends Me
 protected boolean recoveryEnabled = true;
 
 /**
- * Dont interrupt the sender/receiver thread, but pass off to an executor
- */
-protected final ExecutorService executor =
-ExecutorFactory.newThreadPool(0, 2, 2, TimeUnit.SECONDS);
-
-/**
  * disable/enable local loopback message
  */
 protected final boolean localLoopbackDisabled;
@@ -329,6 +320,7 @@ public class McastServiceImpl extends Me
 startLevel = (startLevel & (~level));
 //we're shutting down, send a shutdown message and close the socket
 if ( startLevel == 0 ) {
+executor.shutdownNow();
 //send a stop message
 member.setCommand(Member.SHUTDOWN_PAYLOAD);
 send(false);

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipProviderBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipProviderBase.java?rev=1843879&r1=1843878&r2=1843879&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipProviderBase.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipProviderBase.java
 Mon Oct 15 07:21:26 2018
@@ -18,17 +18,22 @@
 package org.apache.catalina.tribes.membership;
 
 import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.catalina.tribes.Member;
 import org.apache.catalina.tribes.MembershipListener;
 import org.apache.catalina.tribes.MembershipProvider;
 import org.apache.catalina.tribes.MembershipService;
+import org.apache.catalina.tribes.util.ExecutorFactory;
 
 public abstract class MembershipProviderBase implements MembershipProvider {
 
 protected Membership membership;
 protected MembershipListener membershipListener;
 protected MembershipService service;
+// The event notification executor
+protected final ExecutorService executor = 
ExecutorFactory.newThreadPool(0, 10, 10, TimeUnit.SECONDS);
 
 @Override
 public void init(Properties properties) throws Exception {

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java?rev=1843879&r1=1843878&r2=1843879&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
 Mon Oct 15 07:21:26 2018
@@ -25,8 +25,6 @@ import java.nio.charset.StandardCharsets
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.catalina.tribes.Channel;
 import org.apache.catalina.tribes.ChannelException;
@@ -39,7 +37,6 @@ import org.apache.catalina.tr

svn commit: r1843880 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java

2018-10-15 Thread kfujino 
Author: kfujino
Date: Mon Oct 15 07:26:58 2018
New Revision: 1843880

URL: http://svn.apache.org/viewvc?rev=1843880&view=rev
Log:
Use executor.
The event notification of memberAdded or memberDisappeared does not prevent 
execution of the original thread.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java?rev=1843880&r1=1843879&r2=1843880&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
 Mon Oct 15 07:26:58 2018
@@ -111,7 +111,19 @@ public abstract class CloudMembershipPro
 if (log.isDebugEnabled()) {
 log.debug("Member added: " + member);
 }
-membershipListener.memberAdded(member);
+Runnable r = new Runnable() {
+@Override
+public void run(){
+String name = Thread.currentThread().getName();
+try {
+
Thread.currentThread().setName("CloudMembership-memberAdded");
+membershipListener.memberAdded(member);
+} finally {
+Thread.currentThread().setName(name);
+}
+}
+};
+executor.execute(r);
 }
 }
 // Remove non refreshed members from the membership
@@ -120,7 +132,19 @@ public abstract class CloudMembershipPro
 if (log.isDebugEnabled()) {
 log.debug("Member disappeared: " + member);
 }
-membershipListener.memberDisappeared(member);
+Runnable r = new Runnable() {
+@Override
+public void run(){
+String name = Thread.currentThread().getName();
+try {
+
Thread.currentThread().setName("CloudMembership-memberDisappeared");
+membershipListener.memberDisappeared(member);
+} finally {
+Thread.currentThread().setName(name);
+}
+}
+};
+executor.execute(r);
 }
 }
 



-
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

2018-10-15 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/3658

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] 1843879
Blamelist: kfujino

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




-
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

2018-10-15 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/3659

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] 1843880
Blamelist: kfujino

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: r1843886 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud: CloudMembershipService.java KubernetesMembershipProvider.java

2018-10-15 Thread remm 
Author: remm
Date: Mon Oct 15 08:39:26 2018
New Revision: 1843886

URL: http://svn.apache.org/viewvc?rev=1843886&view=rev
Log:
Try to get the member uid from the cloud, it seems more appropriate overall.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java?rev=1843886&r1=1843885&r2=1843886&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
 Mon Oct 15 08:39:26 2018
@@ -18,9 +18,6 @@
 package org.apache.catalina.tribes.membership.cloud;
 
 import java.io.IOException;
-import java.net.InetAddress;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 
 import javax.management.ObjectName;
 
@@ -42,6 +39,7 @@ public class CloudMembershipService exte
 public static final String MEMBERSHIP_PROVIDER_CLASS_NAME = 
"membershipProviderClassName";
 private static final String KUBE = "kubernetes";
 private static final String KUBE_PROVIDER_CLASS = 
"org.apache.catalina.tribes.membership.cloud.KubernetesMembershipProvider";
+static final byte[] INITIAL_ID = new byte[16];
 
 private MembershipProvider membershipProvider;
 private MemberImpl localMember;
@@ -173,13 +171,7 @@ public class CloudMembershipService exte
 
 if (localMember == null) {
 localMember = new MemberImpl();
-try {
-// Set localMember unique ID to md5 hash of hostname
-localMember.setUniqueId(MessageDigest.getInstance("md5")
-
.digest(InetAddress.getLocalHost().getHostName().getBytes()));
-} catch (NoSuchAlgorithmException e) {
-throw new IOException(e);
-}
+localMember.setUniqueId(INITIAL_ID);
 localMember.setLocal(true);
 }
 localMember.setHostname(host);

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java?rev=1843886&r1=1843885&r2=1843886&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
 Mon Oct 15 08:39:26 2018
@@ -203,10 +203,15 @@ public class KubernetesMembershipProvide
 
 // We found ourselves, ignore
 if (name.equals(hostName)) {
+// Update the UID on initial lookup
+Member localMember = service.getLocalMember(false);
+if (localMember.getUniqueId() == 
CloudMembershipService.INITIAL_ID && localMember instanceof MemberImpl) {
+byte[] id = 
md5.digest(uid.getBytes(StandardCharsets.US_ASCII));
+((MemberImpl) localMember).setUniqueId(id);
+}
 continue;
 }
 
-byte[] id = 
md5.digest(uid.getBytes(StandardCharsets.US_ASCII));
 long aliveTime = 
Duration.between(Instant.parse(creationTimestamp), startTime).getSeconds() * 
1000; // aliveTime is in ms
 
 MemberImpl member = null;
@@ -218,6 +223,7 @@ public class KubernetesMembershipProvide
 
log.error(sm.getString("kubernetesMembershipProvider.memberError"), e);
 continue;
 }
+byte[] id = 
md5.digest(uid.getBytes(StandardCharsets.US_ASCII));
 member.setUniqueId(id);
 members.add(member);
 }



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

Re: svn commit: r1843415 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java

2018-10-15 Thread Rémy Maucherat 
On Mon, Oct 15, 2018 at 6:53 AM Keiichi Fujino  wrote:

> Hi Remy.
>
> Sorry for the late reply.
> I have two comments against the current code.
>
> The one is,
> the uniqueId of the local member and the other cluster members are
> different.
>
> The CloudMembershipService#createOrUpdateLocalMember method is as follows.
> ==
> // Set localMember unique ID to md5 hash of hostname
> localMember.setUniqueId(MessageDigest.getInstance("md5")
> .digest(InetAddress.getLocalHost().getHostName().getBytes()));
> ==
>
> The KubernetesMembershipProvider#parsePods method is as follows.
> ==
> byte[] id = md5.digest(uid.getBytes(StandardCharsets.US_ASCII));
> ==
>
> In other words, uniqueId of local member is obtained from hostname, while
> other cluster members are obtained from uid.
> In this case, some features such as RpcChannel do not work properly.
>
> We need to update the local member's uniqueId with the uid obtained from
> pod, or use a different way to align  the local member's uniqueId with
> other cluster member's uniqueId.
>

Yes, I had changed it (I didn't really like trying to use the "host name"
although it should actually work, and since kube was kindly giving that id)
but it was badly done.

Thanks for catching that mess ;)

Rémy

svn commit: r1843887 - /tomcat/jk/trunk/xdocs/news/20180301.xml

2018-10-15 Thread markt 
Author: markt
Date: Mon Oct 15 08:53:15 2018
New Revision: 1843887

URL: http://svn.apache.org/viewvc?rev=1843887&view=rev
Log:
Add release date

Modified:
tomcat/jk/trunk/xdocs/news/20180301.xml

Modified: tomcat/jk/trunk/xdocs/news/20180301.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20180301.xml?rev=1843887&r1=1843886&r2=1843887&view=diff
==
--- tomcat/jk/trunk/xdocs/news/20180301.xml (original)
+++ tomcat/jk/trunk/xdocs/news/20180301.xml Mon Oct 15 08:53:15 2018
@@ -31,7 +31,7 @@
 
 
 
-
+
 The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Connectors 1.2.46. This is a maintenance release.
 



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

svn commit: r1843889 - in /tomcat/site/trunk: docs/ docs/connectors-doc/ docs/connectors-doc/miscellaneous/ docs/connectors-doc/miscellaneous/printer/ docs/connectors-doc/news/ docs/connectors-doc/new

2018-10-15 Thread markt 
Author: markt
Date: Mon Oct 15 09:08:32 2018
New Revision: 1843889

URL: http://svn.apache.org/viewvc?rev=1843889&view=rev
Log:
Update site for JK 1.2.46 release

Modified:
tomcat/site/trunk/docs/connectors-doc/index.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html
tomcat/site/trunk/docs/connectors-doc/news/20180301.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20180301.html
tomcat/site/trunk/docs/connectors-doc/printer/index.html
tomcat/site/trunk/docs/connectors-doc/reference/apache.html
tomcat/site/trunk/docs/connectors-doc/reference/printer/apache.html
tomcat/site/trunk/docs/download-connectors.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/xdocs/download-connectors.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/oldnews.xml

Modified: tomcat/site/trunk/docs/connectors-doc/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/index.html?rev=1843889&r1=1843888&r2=1843889&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/index.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/index.html Mon Oct 15 09:08:32 2018
@@ -30,12 +30,12 @@ manual is described in more detail below
 
 Headlines
 
-JK-1.2.44 
released
+JK-1.2.46 
released
 The Apache Tomcat team is proud to announce the immediate availability
-   of Tomcat Connectors 1.2.44 Stable. This release contains improvements and
+   of Tomcat Connectors 1.2.46 Stable. This release contains improvements and
bug fixes for issues found in previous releases.

-Download the JK 1.2.44
+Download the JK 1.2.46
release.
 
 

Modified: tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html?rev=1843889&r1=1843888&r2=1843889&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html Mon Oct 
15 09:08:32 2018
@@ -6,6 +6,51 @@
   It should contain fixes made only after November 10th 2004, when the
   new documentation project for JK was started.
   
+Changes between 1.2.45 and 
1.2.46
+  
+  Native
+
+  
+http://issues.apache.org/bugzilla/show_bug.cgi?id=62751";>62751: 
Apache: Fix regression in 1.2.44 which resulted in
+socket_connect_timeout to be interpreted in units of seconds
+instead of milliseconds on platforms that provide poll(). (rjung)
+  
+
+  
+Changes between 1.2.44 and 
1.2.45
+  
+  Native
+
+  
+http://issues.apache.org/bugzilla/show_bug.cgi?id=62689";>62689: 
Correct regression in 1.2.44 that broke request
+handling for OPTIONS * requests. (rjung)
+  
+  
+Apache: Update the documentation to note additional limitations of the
+JkAutoAlias directive. (markt)
+  
+  
+Common: Optimize path parameter handling. (rjung)
+  
+  
+Improve path parameter parsing so that the session ID specified by the
+session_path worker property for load-balanced 
workers can
+be extracted from a path parameter in any segment of the URI, rather
+than only from the final segment. (markt)
+  
+  
+Apache: Improve path parameter handling so that
+JkStripSession can remove session IDs that are 
specified on
+path parameters in any segment of the URI rather than only the final
+segment. (markt)
+  
+  
+IIS: Improve path parameter handling so that strip_session
+can remove session IDs that are specified on path parameters in any
+segment of the URI rather than only the final segment. (markt)
+  
+
+  
 Changes between 1.2.43 and 
1.2.44
   
   Native

Modified: 
tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html?rev=1843889&r1=1843888&r2=1843889&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html 
Mon Oct 15 09:08:32 2018
@@ -5,6 +5,51 @@
   It should contain fixes made only after November 10th 2004, when the
   new documentation project for JK was started.
   
+Changes between 1.2.45 and 
1.2.46
+  
+  Native
+
+  
+http://issues.apache.org/bugzilla/show_bug.cgi?id=62751";>62751: 
Apache: Fix regression in 1.2.44 which resulted in
+socket_connect_timeout to be in

svn commit: r1843890 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

2018-10-15 Thread markt 
Author: markt
Date: Mon Oct 15 09:11:00 2018
New Revision: 1843890

URL: http://svn.apache.org/viewvc?rev=1843890&view=rev
Log:
Correct location. Latest release should be first

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/xdocs/index.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1843890&r1=1843889&r2=1843890&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Oct 15 09:11:00 2018
@@ -240,6 +240,24 @@ project logo are trademarks of the Apach
 
 
 
+
+2018-10-13 Tomcat Connectors 1.2.46 
Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 1.2.46 of
+Apache Tomcat Connectors.
+This version fixes a number of bugs found in previous releases.
+
+
+
+
+https://tomcat.apache.org/download-connectors.cgi";>Download |
+ChangeLog for 1.2.46
+
+
+
+
 
 2018-09-19 Tomcat 7.0.91 Released
 
@@ -262,24 +280,6 @@ Full details of these changes, and all t
 
 
 
-
-
-2018-10-13 Tomcat Connectors 1.2.46 
Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 1.2.46 of
-Apache Tomcat Connectors.
-This version fixes a number of bugs found in previous releases.
-
-
-
-
-https://tomcat.apache.org/download-connectors.cgi";>Download |
-ChangeLog for 1.2.46
-
-
-
 
 
 2018-09-10 Tomcat 9.0.12 Released

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1843890&r1=1843889&r2=1843890&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Mon Oct 15 09:11:00 2018
@@ -39,6 +39,18 @@ project logo are trademarks of the Apach
 
 
 
+
+
+The Apache Tomcat Project is proud to announce the release of version 1.2.46 of
+Apache Tomcat Connectors.
+This version fixes a number of bugs found in previous releases.
+
+
+Download |
+ChangeLog for 1.2.46
+
+
+
 
 
 The Apache Tomcat Project is proud to announce the release of version 7.0.91 of
@@ -55,18 +67,6 @@ Full details of these changes, and all t
 
 
 
-
-
-The Apache Tomcat Project is proud to announce the release of version 1.2.46 of
-Apache Tomcat Connectors.
-This version fixes a number of bugs found in previous releases.
-
-
-Download |
-ChangeLog for 1.2.46
-
-
-
 
 
 The Apache Tomcat Project is proud to announce the release of version 9.0.12



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

[ANN] Apache Tomcat JK Connectors 1.2.46 released

2018-10-15 Thread Mark Thomas 

The Apache Tomcat Project is proud to announce the release of version
1.2.46 of the Apache Tomcat Connectors.
This version fixes a number of bugs found in previous releases.

Full details of these changes and new features,
are available in the Apache Tomcat Connectors changelog:
https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html

In addition to the usual source release, this release includes Windows
binaries for the JK ISAPI connector for IIS.

Downloads:
https://tomcat.apache.org/download-connectors.cgi

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: r1843891 - in /tomcat/jk/trunk: native/STATUS.txt native/common/jk_version.h native/configure.ac native/iis/README native/netscape/README tools/dist/binaries/windows/README.html xdocs/misc

2018-10-15 Thread markt 
Author: markt
Date: Mon Oct 15 09:26:44 2018
New Revision: 1843891

URL: http://svn.apache.org/viewvc?rev=1843891&view=rev
Log:
Increment version number for next next cycle

Modified:
tomcat/jk/trunk/native/STATUS.txt
tomcat/jk/trunk/native/common/jk_version.h
tomcat/jk/trunk/native/configure.ac
tomcat/jk/trunk/native/iis/README
tomcat/jk/trunk/native/netscape/README
tomcat/jk/trunk/tools/dist/binaries/windows/README.html
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1843891&r1=1843890&r2=1843891&view=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Mon Oct 15 09:26:44 2018
@@ -18,7 +18,8 @@ Last modified at [$Date$]
 
 Release:
 
-1.2.46  : development in progress
+1.2.47  : development in progress
+1.2.46  : released October 13, 2018
 1.2.45  : not released
 1.2.44  : released September 1, 2018
 1.2.43  : released March 6, 2018

Modified: tomcat/jk/trunk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1843891&r1=1843890&r2=1843891&view=diff
==
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Mon Oct 15 09:26:44 2018
@@ -26,7 +26,7 @@
 /** START OF AREA TO MODIFY BEFORE RELEASING */
 #define JK_VERMAJOR 1
 #define JK_VERMINOR 2
-#define JK_VERFIX   46
+#define JK_VERFIX   47
 
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
 #define JK_VERISRELEASE 0

Modified: tomcat/jk/trunk/native/configure.ac
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1843891&r1=1843890&r2=1843891&view=diff
==
--- tomcat/jk/trunk/native/configure.ac (original)
+++ tomcat/jk/trunk/native/configure.ac Mon Oct 15 09:26:44 2018
@@ -23,7 +23,7 @@ AC_PREREQ(2.59)
 
 dnl package and version.
 dnl synchronization with common/jk_version.h ?
-AC_INIT([mod_jk], [1.2.46])
+AC_INIT([mod_jk], [1.2.47])
 
 AC_CONFIG_SRCDIR([common/jk_worker.h])
 AC_CONFIG_HEADER(common/config.h)

Modified: tomcat/jk/trunk/native/iis/README
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/README?rev=1843891&r1=1843890&r2=1843891&view=diff
==
--- tomcat/jk/trunk/native/iis/README (original)
+++ tomcat/jk/trunk/native/iis/README Mon Oct 15 09:26:44 2018
@@ -56,7 +56,7 @@ RELEASING
 
 Construct the binary distributions
 
-  set VER=1.2.46
+  set VER=1.2.47
   mkdir tomcat-connectors-%VER%-windows-i386-iis
   copy ..\LICENSE tomcat-connectors-%VER%-windows-i386-iis\
   copy ..\NOTICE tomcat-connectors-%VER%-windows-i386-iis\

Modified: tomcat/jk/trunk/native/netscape/README
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/README?rev=1843891&r1=1843890&r2=1843891&view=diff
==
--- tomcat/jk/trunk/native/netscape/README (original)
+++ tomcat/jk/trunk/native/netscape/README Mon Oct 15 09:26:44 2018
@@ -25,7 +25,7 @@ The steps that you need to take are:
   directory or edit the nsapi.dsp and replace all $(IPLANET_HOME)
   occurrences with the real path
3. Execute the following command:
-  nmake -f Makefile.vc [SO_VERSION=-1.2.46]
+  nmake -f Makefile.vc [SO_VERSION=-1.2.47]
 
 An alternative will be to open the isapi workspace file (nsapi.dsw) in msdev 
and
 build it using the build menu.

Modified: tomcat/jk/trunk/tools/dist/binaries/windows/README.html
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/dist/binaries/windows/README.html?rev=1843891&r1=1843890&r2=1843891&view=diff
==
--- tomcat/jk/trunk/tools/dist/binaries/windows/README.html (original)
+++ tomcat/jk/trunk/tools/dist/binaries/windows/README.html Mon Oct 15 09:26:44 
2018
@@ -27,7 +27,7 @@
connector to fail.
 
 
-The current stable release is 1.2.46
+The current stable release is 1.2.47
 
 See the Apache Tomcat Connectors
 http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html";>changelog

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1843891&r1=1843890&r2=1843891&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Oct 15 09:26:44 2018
@@ -40,6 +40,13 @@
   new documentation project for JK was started.

[GitHub] tomcat pull request #127: Add a fake attribute for source

2018-10-15 Thread mdfst13 
GitHub user mdfst13 opened a pull request:

https://github.com/apache/tomcat/pull/127

Add a fake attribute for source

Eclipse adds a source attribute to Tomcat's Context element.  Presumably 
this helps it keep track of what context element relates to what project.  
Tomcat however warns on unrecognized attributes.  This sets source as a fake 
attribute, which tells Tomcat not to report it.  

You can see more of a description of this on Stack Overflow, e.g. at 
https://stackoverflow.com/a/3566358/6660678

As you can see, several people ascribed unrelated behavior to this warning. 
 Meanwhile, all the warning is saying is that Tomcat doesn't know what a source 
attribute is in server.xml.  Removing the warning thus makes it easier to find 
the real warning.  

Due to the way that fakeAttributes work (see 
java/org/apache/tomcat/util/digester/SetPropertiesRule.java lines 72-78), they 
are not checked until just before the system would issue the warning.  So this 
would make no difference if someone actually added a source attribute.  

All this does is suppress the warning for a correctly spelled source 
attribute.  The warning would still appear for incorrectly spelled attributes 
like sorce or peth.  I can't really see any circumstance where one could 
misspell a legitimate (not fake) attribute as source.  

You can also view java/org/apache/tomcat/util/digester/Digester.java at 
lines 734-773 (particularly 748-761) for more context.  Convenience links:  


https://github.com/apache/tomcat/blob/18e106480a59f3b7b5b1d2f3bda3b2d7e065361e/java/org/apache/tomcat/util/digester/Digester.java#L734-L773

https://github.com/apache/tomcat/blob/18e106480a59f3b7b5b1d2f3bda3b2d7e065361e/java/org/apache/tomcat/util/digester/SetPropertiesRule.java#L72-L78

In case you were wondering, `top` is declared here as type `Object`, so 
there isn't a more specific class that we could use for indexing in this case.  

You can view the issue yourself, outside of Eclipse, by adding something 
like `source="org.eclipse.jst.jee.server"` to your Context entry in servers.xml 
(assuming that's where you have your context defined).  

This issue annoys me because inevitably, just as I've forgotten the whole 
thing, I find myself scanning logs trying to diagnose something.  I see this 
warning, remember that it's not really important, but wonder about getting rid 
of it.  Then I go through the whole process again of finding out what causes 
it.  And of course, short of dropping Eclipse or modifying code, there is no 
way to get rid of the warning.  

I don't want to drop Eclipse.  Can we make this small code modification, 
please?  

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/mdfst13/tomcat fake-eclipse-source

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/127.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #127


commit f12b732ea381f45e6670a613eaccf85c357aa672
Author: mdfst13 <43025590+mdfst13@...>
Date:   2018-10-15T09:05:16Z

Add a fake attribute for source

Eclipse adds a source attribute to Tomcat's Context element.  Presumably 
this helps it keep track of what context element relates to what project.  
Tomcat however warns on unrecognized attributes.  This sets source as a fake 
attribute, which tells Tomcat not to report it.




---

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

JDK 12 Early Access build 15 is available

2018-10-15 Thread Rory O'Donnell 

Hi Mark,

*JDK 12 Early Access build 15 is available at : - jdk.java.net/12/*

 * JDK 12 Schedule is confirmed.
 o 2018/12/13 Rampdown Phase One 
 o 2019/01/17 Rampdown Phase Two 
 o 2019/02/07 Release-Candidate Phase
   
 o 2019/03/19 General Availability
 * Release Notes for JDK 12 [1]
 * JEPs targeted to JDK 12, so far
 o 325: Switch Expressions (Preview [2]) - Integrated
 o 326: Raw String Literals (Preview [2]) - Integrated
 o 340: One AArch64 Port, Not Two
    - Targeted
 o 341: Default CDS Archives -
   Integrated
 * Important fixes since last email
 o (b15)  Implementation of JEP 341: Default CDS Archives
 o (b14) LDAPS Communication Failure (JDK-8211107
   )
 o (b14) Support dns_canonicalize_hostname in krb5.conf
   (JDK-8210821 )
 o (b14) Removal of com.sun.awt.SecurityWarning Class (JDK-8210692
   )


*JDK 8u202 planning [3]*

 * 8u202 is proposed to be the last Oracle led release for this OpenJDK
   Project.
 * A proposed timeline is as follows :
 o July 2018 8u-dev forest begins collecting 8u202 fixes
 o Mid October 2018 RampDown 2
 o Mid January 2019 GA

Rgds, Rory

[1] http://jdk.java.net/12/release-notes
[2] http://openjdk.java.net/jeps/12
[3] 
http://mail.openjdk.java.net/pipermail/jdk8u-dev/2018-September/007923.html
 



--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

[Bug 62808] "function-signature" text containing line breaks causes JasperException

2018-10-15 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62808

--- Comment #2 from Mark Thomas  ---
It is a related issue but not the same. Investigating...

-- 
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: r1843900 - in /tomcat/trunk: java/org/apache/jasper/compiler/Validator.java test/webapp/WEB-INF/test.tld

2018-10-15 Thread markt 
Author: markt
Date: Mon Oct 15 11:42:28 2018
New Revision: 1843900

URL: http://svn.apache.org/viewvc?rev=1843900&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62808
Correct a regression (not included in a release) in the TLD whitespace parsing 
when the function signature was split over multiple lines.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/trunk/test/webapp/WEB-INF/test.tld

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1843900&r1=1843899&r2=1843900&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Mon Oct 15 
11:42:28 2018
@@ -423,7 +423,8 @@ class Validator {
 private static class ValidateVisitor extends Node.Visitor {
 
 // Pattern to extract a method name from a full method signature
-private static final Pattern METHOD_NAME_PATTERN = 
Pattern.compile(".*[ \t\n\r]+(.+?)[ \t\n\r]*\\(.*");
+private static final Pattern METHOD_NAME_PATTERN =
+Pattern.compile(".*[ \t\n\r]+(.+?)[ \t\n\r]*\\(.*", 
Pattern.DOTALL);
 
 private final PageInfo pageInfo;
 

Modified: tomcat/trunk/test/webapp/WEB-INF/test.tld
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/test.tld?rev=1843900&r1=1843899&r2=1843900&view=diff
==
--- tomcat/trunk/test/webapp/WEB-INF/test.tld (original)
+++ tomcat/trunk/test/webapp/WEB-INF/test.tld Mon Oct 15 11:42:28 2018
@@ -43,8 +43,11 @@
   
 toArray
 org.apache.el.TesterFunctions
+
 
-  java.lang.String toArray(java.lang.String,java.lang.String)
+  java.lang.String toArray(java.lang.String,
+   java.lang.String)
 
   
 



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

svn commit: r1843901 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/Validator.java test/webapp/WEB-INF/test.tld

2018-10-15 Thread markt 
Author: markt
Date: Mon Oct 15 11:45:55 2018
New Revision: 1843901

URL: http://svn.apache.org/viewvc?rev=1843901&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62808
Correct a regression (not included in a release) in the TLD whitespace parsing 
when the function signature was split over multiple lines.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/test.tld

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 15 11:45:55 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-17

svn commit: r1843902 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/Validator.java test/webapp-3.0/WEB-INF/test.tld webapps/docs/changelog.xml

2018-10-15 Thread markt 
Author: markt
Date: Mon Oct 15 11:50:04 2018
New Revision: 1843902

URL: http://svn.apache.org/viewvc?rev=1843902&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62808
Correct a regression in the TLD whitespace parsing when the function signature 
was split over multiple lines.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/test.tld
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 15 11:50:04 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816

[Bug 62808] "function-signature" text containing line breaks causes JasperException

2018-10-15 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62808

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #3 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.13 onwards
- 8.5.x for 8.5.35 onwards
- 7.0.x for 7.0.92 onwards

Note: This regression only made it into a 7.0.x release.

-- 
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: r1843879 - in /tomcat/trunk: java/org/apache/catalina/tribes/membership/ webapps/docs/

2018-10-15 Thread Rémy Maucherat 
On Mon, Oct 15, 2018 at 9:21 AM  wrote:

>
> +// The event notification executor
> +protected final ExecutorService executor =
> ExecutorFactory.newThreadPool(0, 10, 10, TimeUnit.SECONDS);
>

Ok, so the Container provides the backgroundProcess callback. In addition
to that, I see a Container.execute(Runnable) could also be useful, and
maybe then refactor using an ExecutorService.

Rémy

Re: TLSv1.3 and 9.0.next

2018-10-15 Thread Mark Thomas 
On 11/10/18 21:39, Mark Thomas wrote:



> My plan going forwards is as follows:
> 
> - give folks until early next week to review the native changes
> - tag 1.2.18 early next week

Just a heads up that I plan to tag 1.2.18 tomorrow.

Mark

> - hopefully release 1.2.18 late next week
> - update 9.0.x to require 1.2.18 or later
> - tag / release 9.0.x
> 
> Alongside the above, I'll be backporting the TLSv1.3 support to 8.5.x
> and 9.0.x.
> 
> Thoughts, comments and especially code reviews welcome.
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

Threads

2018-10-15 Thread Rémy Maucherat 
Hi,

Looking at threads since there's a proliferation of executors and loose
threads, I notice a possible refactoring:
- start/stopExecutor is an obvious target, but by default is not there.
However, it does not delegate to the parent container if not there.
- The background thread is a loose thread, if the start/stopExecutor or
whatever it is was a ScheduledThreadPoolExecutor, then it can probably be
refactored.
- Some executors in the clustering code, they could be run by that
"start/stopExecutor" of thir parent container.
- As for the catalina.Executor(s) in the Service, it could still wrap all
this stuff, *if* our ThreadPoolExecutor used a ScheduledThreadPoolExecutor
instead (at least as an option).

So .. Options are:
a) Do nothing.
b) Merge everything except catalina.Executor into a new
ScheduledThreadPoolExecutor at the Container level (and delegate to
parent), so the Engine will have it by default. Given how the background
thread delay config and how startStopThreads work, this can remain mostly
compatible, except some internal API from the start/stop executor is going
to be gone.
c) Merge everything into one executor. Hopefully NIO2 users remember they
should give their connector its own executor.

So personally, I think b) is nice as the Excecutor is more for connector
pools configuration and we shouldn't pollute that with side uses. Is that
doable in 9, or should it be added to the "10" todo list ?

Comments ?

Rémy

Re: Threads

2018-10-15 Thread Mark Thomas 
On 15/10/18 15:49, Rémy Maucherat wrote:
> Hi,
> 
> Looking at threads since there's a proliferation of executors and loose
> threads, I notice a possible refactoring:
> - start/stopExecutor is an obvious target, but by default is not there.
> However, it does not delegate to the parent container if not there.
> - The background thread is a loose thread, if the start/stopExecutor or
> whatever it is was a ScheduledThreadPoolExecutor, then it can probably be
> refactored.
> - Some executors in the clustering code, they could be run by that
> "start/stopExecutor" of thir parent container.
> - As for the catalina.Executor(s) in the Service, it could still wrap all
> this stuff, *if* our ThreadPoolExecutor used a ScheduledThreadPoolExecutor
> instead (at least as an option).
> 
> So .. Options are:
> a) Do nothing.
> b) Merge everything except catalina.Executor into a new
> ScheduledThreadPoolExecutor at the Container level (and delegate to
> parent), so the Engine will have it by default. Given how the background
> thread delay config and how startStopThreads work, this can remain mostly
> compatible, except some internal API from the start/stop executor is going
> to be gone.
> c) Merge everything into one executor. Hopefully NIO2 users remember they
> should give their connector its own executor.
> 
> So personally, I think b) is nice as the Excecutor is more for connector
> pools configuration

+1

> and we shouldn't pollute that with side uses. Is that
> doable in 9, or should it be added to the "10" todo list ?

No strong view. If it can be done without impacting the external API
then no objections here.

Mark

> 
> Comments ?
> 
> Rémy
> 


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

[Bug 62809] cannot remote deploy with Ant DeployTask

2018-10-15 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62809

Mark Thomas  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Mark Thomas  ---
This appears to be a consequence of the way DIGEST support was implemented for
bug 45832. I'm currently looking at options for fixing this.

-- 
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 62809] cannot remote deploy with Ant DeployTask

2018-10-15 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62809

--- Comment #2 from Mark Thomas  ---
As a work-around, use the following code before the DeployTask. It causes the
credentials to be cached so the DeployTask is performed with the credentials
present which avoids this issue.

-- 
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 62809] cannot remote deploy with Ant DeployTask

2018-10-15 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62809

--- Comment #3 from Mark Thomas  ---
Sorry, missed the code:

ListTask list = new ListTask();
list.setUsername("tomcat");
list.setPassword("tomcat");
list.setUrl("http://localhost:8080/manager/text";);
list.execute();

-- 
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-vm3]: Project tomcat-tc7.0.x (in module tomcat-7.0.x) failed

2018-10-15 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 has an issue affecting its community integration.
This issue affects 4 projects.
The current state of this project is 'Failed', with reason 'Missing Build 
Outputs'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x :  Tomcat 7.x, a web server implementing Java Servlet 3.0,
...
- tomcat-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...
- tomcat-tc7.0.x-test-bio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...
- tomcat-tc7.0.x-test-nio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x/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 junit exists, no need to add for property junit.jar.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason missing build outputs
 -ERROR- Missing Output: 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-jni.jar
 -ERROR- See Directory Listing Work for Missing Outputs
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x (Type: Build)
Work ended in a state of : Success
Elapsed: 20 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20181015.jar
 
[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/classes:/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/junit/target/junit-4.13-SNAPSHOT.jar:/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar:/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20181015.jar:/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
-
[javac] Note: Some input files use or override a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/jsp/plugin/applet
[javac] Compiling 1 source file to 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/jsp/plugin/applet

deploy:
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin
 [copy] Copying 18 files to 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin
 [copy] Copying 7 files to 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/conf
 [copy] Copying 265 files to 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/ROOT
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-7.

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

2018-10-15 Thread Bill Barker 
To whom it may engage...

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

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


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 25 mins 8 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20181015/bin/openssl
 -Dtest.temp=output/test-tmp-NIO 
 -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.0-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/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output

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

2018-10-15 Thread Bill Barker 
To whom it may engage...

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

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


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 25 mins 4 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20181016/bin/openssl
 -Dtest.temp=output/test-tmp-NIO 
 -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.0-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/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat

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

2018-10-15 Thread Bill Barker 
To whom it may engage...

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

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


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 24 mins 5 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20181016/bin/openssl
 -Dtest.temp=output/test-tmp-NIO2
  -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.0-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/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 
ild/lib/

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

2018-10-15 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-vm3.apache.org/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 bnd exists, no need to add for property bndlib.jar.
 -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-vm3.apache.org/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: 27 mins 54 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20181016/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=true -Dtest.r
 eports=output/logs-APR -Dexecute.test.nio2=false 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20181016/lib 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.0-SNAPSHOT.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/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/t

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

2018-10-15 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 2 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-vm3.apache.org/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 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-vm3.apache.org/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: 3 mins 36 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
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-3.1-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.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.exclude=**/TestFlushableGZIPOutputStream.java 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.j
 ar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false -Dtest.reports=output/logs-APR 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-1.2-1.0.2/dest-20181016/lib
 -Dtest.relaxTiming=true -Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20181016.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.0-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/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat

Re: svn commit: r1843886 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud: CloudMembershipService.java KubernetesMembershipProvider.java

2018-10-15 Thread Keiichi Fujino 
2018年10月15日(月) 17:39 :

> Author: remm
> Date: Mon Oct 15 08:39:26 2018
> New Revision: 1843886
>
> URL: http://svn.apache.org/viewvc?rev=1843886&view=rev
> Log:
> Try to get the member uid from the cloud, it seems more appropriate
> overall.
>
> Modified:
>
> tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
>
> tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java?rev=1843886&r1=1843885&r2=1843886&view=diff
>
> ==
> ---
> tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
> (original)
> +++
> tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
> Mon Oct 15 08:39:26 2018
> @@ -18,9 +18,6 @@
>  package org.apache.catalina.tribes.membership.cloud;
>
>  import java.io.IOException;
> -import java.net.InetAddress;
> -import java.security.MessageDigest;
> -import java.security.NoSuchAlgorithmException;
>
>  import javax.management.ObjectName;
>
> @@ -42,6 +39,7 @@ public class CloudMembershipService exte
>  public static final String MEMBERSHIP_PROVIDER_CLASS_NAME =
> "membershipProviderClassName";
>  private static final String KUBE = "kubernetes";
>  private static final String KUBE_PROVIDER_CLASS =
> "org.apache.catalina.tribes.membership.cloud.KubernetesMembershipProvider";
> +static final byte[] INITIAL_ID = new byte[16];
>
>  private MembershipProvider membershipProvider;
>  private MemberImpl localMember;
> @@ -173,13 +171,7 @@ public class CloudMembershipService exte
>
>  if (localMember == null) {
>  localMember = new MemberImpl();
> -try {
> -// Set localMember unique ID to md5 hash of hostname
> -localMember.setUniqueId(MessageDigest.getInstance("md5")
> -
> .digest(InetAddress.getLocalHost().getHostName().getBytes()));
> -} catch (NoSuchAlgorithmException e) {
> -throw new IOException(e);
> -}
> +localMember.setUniqueId(INITIAL_ID);
>  localMember.setLocal(true);
>  }
>  localMember.setHostname(host);
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java?rev=1843886&r1=1843885&r2=1843886&view=diff
>
> ==
> ---
> tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
> (original)
> +++
> tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
> Mon Oct 15 08:39:26 2018
> @@ -203,10 +203,15 @@ public class KubernetesMembershipProvide
>
>  // We found ourselves, ignore
>  if (name.equals(hostName)) {
> +// Update the UID on initial lookup
> +Member localMember = service.getLocalMember(false);
> +if (localMember.getUniqueId() ==
> CloudMembershipService.INITIAL_ID && localMember instanceof MemberImpl) {
> +byte[] id =
> md5.digest(uid.getBytes(StandardCharsets.US_ASCII));
> +((MemberImpl) localMember).setUniqueId(id);
> +}
>  continue;
>  }
>
> -byte[] id =
> md5.digest(uid.getBytes(StandardCharsets.US_ASCII));
>  long aliveTime =
> Duration.between(Instant.parse(creationTimestamp), startTime).getSeconds()
> * 1000; // aliveTime is in ms
>
>  MemberImpl member = null;
> @@ -218,6 +223,7 @@ public class KubernetesMembershipProvide
>
>  log.error(sm.getString("kubernetesMembershipProvider.memberError"), e);
>  continue;
>  }
> +byte[] id =
> md5.digest(uid.getBytes(StandardCharsets.US_ASCII));
>  member.setUniqueId(id);
>  members.add(member);
>  }
>
>
>
>
Thanks for the fix.

Is this uniqueId 16 bytes?
The uniqueId should be 16 bytes in channel Specs.



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

svn commit: r1843969 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud: CloudMembershipService.java CloudMembershipServiceMBean.java

2018-10-15 Thread kfujino 
Author: kfujino
Date: Tue Oct 16 05:38:51 2018
New Revision: 1843969

URL: http://svn.apache.org/viewvc?rev=1843969&view=rev
Log:
Add CloudMembershipServiceMBean in order to avoid warinings.

Added:

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipServiceMBean.java
   (with props)
Modified:

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java?rev=1843969&r1=1843968&r2=1843969&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
 Tue Oct 16 05:38:51 2018
@@ -32,7 +32,9 @@ import org.apache.catalina.tribes.util.S
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
-public class CloudMembershipService extends MembershipServiceBase {
+public class CloudMembershipService extends MembershipServiceBase
+implements CloudMembershipServiceMBean {
+
 private static final Log log = 
LogFactory.getLog(CloudMembershipService.class);
 protected static final StringManager sm = 
StringManager.getManager(Constants.Package);
 
@@ -206,4 +208,23 @@ public class CloudMembershipService exte
 this.membershipProvider = memberProvider;
 }
 
+@Override
+public int getConnectTimeout() {
+String connectTimeout = properties.getProperty("connectTimeout");
+return Integer.parseInt(connectTimeout);
+}
+
+public void setConnectTimeout(int connectTimeout) {
+properties.setProperty("connectTimeout", 
String.valueOf(connectTimeout));
+}
+
+@Override
+public int getReadTimeout() {
+String readTimeout = properties.getProperty("readTimeout");
+return Integer.parseInt(readTimeout);
+}
+
+public void setReadTimeout(int readTimeout) {
+properties.setProperty("readTimeout", String.valueOf(readTimeout));
+}   
 }

Added: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipServiceMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipServiceMBean.java?rev=1843969&view=auto
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipServiceMBean.java
 (added)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipServiceMBean.java
 Tue Oct 16 05:38:51 2018
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.tribes.membership.cloud;
+
+import java.util.Properties;
+
+import org.apache.catalina.tribes.Member;
+
+public interface CloudMembershipServiceMBean {
+
+// Attributes
+public int getConnectTimeout();
+
+public int getReadTimeout();
+
+// Operation
+public Properties getProperties();
+
+public boolean hasMembers();
+
+public String[] getMembersByName();
+
+public Member findMemberByName(String name);
+}

Propchange: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipServiceMBean.java
--
svn:eol-style = native



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