JDK 11 Early Access build 12 available
Hi Mark, **JDK 11 EA build 12 , *under both the GPL and Oracle EA licenses, is now available at **http://jdk.java.net/11**. ** * * Newly approved Schedule, status & features o http://openjdk.java.net/projects/jdk/11/ * Release Notes: o http://jdk.java.net/11/release-notes * Summary of changes o https://download.java.net/java/early_access/jdk11/12/jdk-11+12.html *Notable changes in JDK 11 EA builds since last email:* * Build 11 - see Release Notes for details. o JDK-8201315 : SelectableChannel.register may be invoked while a selection operation is in progress * Build 10 - see Release Notes for details. o JDK-8200149 : Removal of "com.sun.awt.AWTUtilities" class o JDK-8189997 (not public) : Enhanced KeyStore Mechanisms o JDK-8175075 (not public) : 3DES Cipher Suites Disabled * Build 9: - see Release Notes for details. o JDK-8200152 : KerberosString uses UTF-8 encoding by default o JDK-8200458 : Readiness information previously recorded in SelectionKey ready set not preserved ** *Draft JEP: Deprecate pack200, unpack200 tools and related APIs. [1] * This draft JEP [2] proposes to deprecate the pack200 APIs and tools in the JDK. As outlined in the JEP, the usefulness of this technology have diminishing returns, the components using them are being removed and connectivity speeds have improved by leaps and bounds, since its inception. Feedback appreciated via http://mail.openjdk.java.net/pipermail/jdk-dev Regards, Rory [1] http://mail.openjdk.java.net/pipermail/jdk-dev/2018-April/001074.html [2] https://bugs.openjdk.java.net/browse/JDK-8200752 Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA, Dublin,Ireland
[Bug 62358] Stream not writable error when using HTTP2 upgrade protocol on Firefox
https://bz.apache.org/bugzilla/show_bug.cgi?id=62358 Mark Thomas changed: What|Removed |Added OS||All Status|NEW |NEEDINFO --- Comment #1 from Mark Thomas --- It isn't clear if this is a Tomcat bug or soemthing else. Please do the following: - stop Tomcat - remove existing log files - Add "org.apache.coyote.http2.level = FINE" at the end of logging.properties - start Tomcat - do the minimum necessary to re-create the error - attach the log file with the HTTP/2 debug messages -- 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 62358] Stream not writable error when using HTTP2 upgrade protocol on Firefox
https://bz.apache.org/bugzilla/show_bug.cgi?id=62358 --- Comment #2 from EJ Egyed --- Created attachment 35920 --> https://bz.apache.org/bugzilla/attachment.cgi?id=35920&action=edit Tomcat stderr log file with HTTP2 logging set to FINE Attaching log with the requested information -- 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 62358] Stream not writable error when using HTTP2 upgrade protocol on Firefox
https://bz.apache.org/bugzilla/show_bug.cgi?id=62358 EJ Egyed changed: What|Removed |Added Status|NEEDINFO|NEW -- 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 62358] Stream not writable error when using HTTP2 upgrade protocol on Firefox
https://bz.apache.org/bugzilla/show_bug.cgi?id=62358 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #3 from Mark Thomas --- Thanks for the debug log. It appears that this is not a Tomcat bug. The first error occurs on Connection [0], Stream [217] Following that connection in the debug log shows: 08-May-2018 06:54:13.779 - Client sends HEADERS frame and stream 217 is created - flags=36 (includes Priority, end headers) The end stream flag is not set so there should be a request body. 08-May-2018 06:54:13.779 - Stream transitions to IDLE - Headers are read - Window size updated (plenty of space before and after) 08-May-2018 06:54:13.779 - DATA frame sent (request body) - flags=1 (end stream) The data is read and the stream transitions to HALF_CLOSED_REMOTE because no more data is expected from the client. 08-May-2018 06:54:13.842 - client sends RESET frame with reason 8 (CANCEL). - Tomcat closes the stream which blocks further I/O 08-May-2018 06:54:14.701 - application tries to write to response - I/O fails because the stream has been closed The client is resetting the stream (CANCEL). The expectation is that the application catches the ClientAbortException and handles it which usually means ignore it since they can be fairly frequent. -- 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 62358] Stream not writable error when using HTTP2 upgrade protocol on Firefox
https://bz.apache.org/bugzilla/show_bug.cgi?id=62358 --- Comment #4 from EJ Egyed --- Interesting. Perhaps it is Firefox's issue with mishandling of the HTTP2 protocol. Thank you for the assistance! -- 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: [VOTE] Release Apache Tomcat 8.0.52
Hi, 2018-04-28 20:22 GMT+03:00 Violeta Georgieva : > > The proposed Apache Tomcat 8.0.52 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.52/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1182/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_52/ > > The proposed 8.0.52 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 8.0.52 +1 (binding):kkolinko, violetagg, rjung, csutherl, fschumacher No other voters were cast. The vote has passed. I'll do the release shortly and announce it once the mirrors catch up. Regards, Violeta
svn commit: r26765 - /dev/tomcat/tomcat-8/v8.0.52/ /release/tomcat/tomcat-8/v8.0.52/
Author: violetagg Date: Tue May 8 12:32:52 2018 New Revision: 26765 Log: Release 8.0.52 Added: release/tomcat/tomcat-8/v8.0.52/ - copied from r26764, dev/tomcat/tomcat-8/v8.0.52/ Removed: dev/tomcat/tomcat-8/v8.0.52/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1831167 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Tue May 8 12:37:03 2018 New Revision: 1831167 URL: http://svn.apache.org/viewvc?rev=1831167&view=rev Log: Update the release date for 8.0.52 Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1831167&r1=1831166&r2=1831167&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue May 8 12:37:03 2018 @@ -90,7 +90,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-8-trunk/builds/1312 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1831167 Blamelist: violetagg 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: r1831184 - in /tomcat/trunk: build.properties.default build.xml webapps/docs/changelog.xml
Author: markt
Date: Tue May 8 13:36:18 2018
New Revision: 1831184
URL: http://svn.apache.org/viewvc?rev=1831184&view=rev
Log:
Get Tomcat trunk building with Java 11 EA.
Note that you can't release with Java 11 but since releases have to be
performed with Java 8 this is not at issue (yet).
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.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=1831184&r1=1831183&r2=1831184&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue May 8 13:36:18 2018
@@ -210,3 +210,11 @@ findbugs.home=${base.path}/findbugs-${fi
findbugs.lib=${findbugs.home}/lib
findbugs.jar=${findbugs.lib}/findbugs-ant.jar
findbugs.loc=${base-sf.loc}/project/findbugs/findbugs/${findbugs.version}/findbugs-${findbugs.version}.tar.gz
+
+# - SAAJ API, used by Code Signing for releases -
+# - No longer part of JRE from Java 11 onwards -
+# - CDDL Licensed -
+saaj-api.version=1.3.5
+saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
+saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
+saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1831184&r1=1831183&r2=1831184&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue May 8 13:36:18 2018
@@ -200,6 +200,7 @@
+
@@ -2630,6 +2631,13 @@ skip.installer property in build.propert
+
+
+
+
+
+
+
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1831184&r1=1831183&r2=1831184&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 8 13:36:18 2018
@@ -111,6 +111,13 @@
+
+
+
+Ensure that Apache Tomcat may be built from source with Java 11.
(markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JDK 11 Early Access build 12 available
All, I've just tried building with Java 11 and performing a very simple smoke test (does the WebSocket snake game work). The only issue I found was that the removal of the java.xml.ws module meant that the utility class we use for working with the Symantec code signing service would not compile. This blocked the main compilation step as we compile everything together. I have fixed this by pulling in the CDDL licensed SAAJ API 1.3.5 JAR. This doesn't impact the overall licensing of Tomcat since the library is only used to build/run the code signing tool used during the release process. (And even if it did, we have other CDDL licensed dependencies so it wouldn't be a big deal.) Mark On 08/05/18 09:14, Rory O'Donnell wrote: > Hi Mark, > > > **JDK 11 EA build 12 , *under both the GPL and Oracle EA licenses, > is now available at **http://jdk.java.net/11**. ** > * > > * Newly approved Schedule, status & features > o http://openjdk.java.net/projects/jdk/11/ > * Release Notes: > o http://jdk.java.net/11/release-notes > * Summary of changes > o https://download.java.net/java/early_access/jdk11/12/jdk-11+12.html > > *Notable changes in JDK 11 EA builds since last email:* > > * Build 11 - see Release Notes for details. > o JDK-8201315 : SelectableChannel.register may be invoked while a > selection operation is in progress > * Build 10 - see Release Notes for details. > o JDK-8200149 : Removal of "com.sun.awt.AWTUtilities" class > o JDK-8189997 (not public) : Enhanced KeyStore Mechanisms > o JDK-8175075 (not public) : 3DES Cipher Suites Disabled > * Build 9: - see Release Notes for details. > o JDK-8200152 : KerberosString uses UTF-8 encoding by default > o JDK-8200458 : Readiness information previously recorded in > SelectionKey ready set not preserved > > ** > > > *Draft JEP: Deprecate pack200, unpack200 tools and related APIs. [1] > * > This draft JEP [2] proposes to deprecate the pack200 APIs and tools in > the JDK. As outlined in the JEP, the usefulness of this technology > have diminishing returns, the components using them are being removed > and connectivity speeds have improved by leaps and bounds, > since its inception. Feedback appreciated via > http://mail.openjdk.java.net/pipermail/jdk-dev > > Regards, > Rory > > [1] http://mail.openjdk.java.net/pipermail/jdk-dev/2018-April/001074.html > [2] https://bugs.openjdk.java.net/browse/JDK-8200752 > > Rgds,Rory O'Donnell > Quality Engineering Manager > Oracle EMEA, Dublin,Ireland > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat issue #109: fix: file resource read dir inputStream
Github user markt-asf commented on the issue: https://github.com/apache/tomcat/pull/109 The specification is not as explicit as it could be in this case. The spec text refers to the Javadoc. The Javadoc says "Returns the resource located at the named path as an InputStream object." without any details of how a directory object should be represented as an InputStream. The Javadoc does include references to URL handlers and URLConnection objects so it is not unreasonable to assume that similar behaviour is expected. One concern that I do have with replicating the URLConnection behaviour is that it is not designed for file names that include \n. The are passed on without escaping and \n is also used as the separator between file names. However, that usage is rare and it might be a limitation we have to live with. There are other APIs that can be used to get directory listings without ambiguity. Rather than going via URLConnection, I'm leaning towards replicating the behaviour. I do want to check if the \n is always used or if it varies with platform. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat issue #109: fix: file resource read dir inputStream
Github user markt-asf commented on the issue: https://github.com/apache/tomcat/pull/109 I came very close to fixing this but in the end I opted not to. I covered the argument for making this change in my previous comment. The reasons against it are: - it would be a potentially significant API change for 8.0.x, 8.5.x and 9.0.x - the behaviour isn't formally specified anywhere and has obvious problems with more unusual file names - My instinct is that null is a better option here This is probably another issue to take to the Servlet EG once it starts up at Eclipse for clarification. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request #109: fix: file resource read dir inputStream
Github user markt-asf closed the pull request at: https://github.com/apache/tomcat/pull/109 --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 47242] request for AJP command line client
https://bz.apache.org/bugzilla/show_bug.cgi?id=47242 Mark Thomas changed: What|Removed |Added Resolution|--- |WONTFIX Status|NEW |RESOLVED --- Comment #21 from Mark Thomas --- There was some interest in this for GSoC 2018 but not successful candidate. -- 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: r1831224 - /tomcat/trunk/java/org/apache/catalina/tribes/MembershipProvider.java
Author: kfujino
Date: Wed May 9 04:31:02 2018
New Revision: 1831224
URL: http://svn.apache.org/viewvc?rev=1831224&view=rev
Log:
Introduce MembershipProvider interface in order to provide membership.
Added:
tomcat/trunk/java/org/apache/catalina/tribes/MembershipProvider.java
(with props)
Added: tomcat/trunk/java/org/apache/catalina/tribes/MembershipProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/MembershipProvider.java?rev=1831224&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/tribes/MembershipProvider.java (added)
+++ tomcat/trunk/java/org/apache/catalina/tribes/MembershipProvider.java Wed
May 9 04:31:02 2018
@@ -0,0 +1,37 @@
+/*
+ * 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;
+
+import java.util.Properties;
+
+public interface MembershipProvider {
+
+public void init(Properties properties) throws Exception;
+
+public void start(int level) throws java.lang.Exception;
+
+public boolean stop(int level) throws java.lang.Exception;
+
+public void setMembershipListener(MembershipListener listener);
+
+public boolean hasMembers();
+
+public Member getMember(Member mbr);
+
+public Member[] getMembers();
+}
Propchange: tomcat/trunk/java/org/apache/catalina/tribes/MembershipProvider.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1831225 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipProviderBase.java
Author: kfujino
Date: Wed May 9 04:32:23 2018
New Revision: 1831225
URL: http://svn.apache.org/viewvc?rev=1831225&view=rev
Log:
Implements the base class of MembershipProvider.
Added:
tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipProviderBase.java
(with props)
Added:
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=1831225&view=auto
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipProviderBase.java
(added)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipProviderBase.java
Wed May 9 04:32:23 2018
@@ -0,0 +1,57 @@
+/*
+ * 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;
+
+import java.util.Properties;
+
+import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.MembershipListener;
+import org.apache.catalina.tribes.MembershipProvider;
+
+public abstract class MembershipProviderBase implements MembershipProvider {
+
+protected Membership membership;
+protected MembershipListener membershipListener;
+
+@Override
+public void init(Properties properties) throws Exception {
+}
+
+@Override
+public boolean hasMembers() {
+if (membership == null ) return false;
+return membership.hasMembers();
+}
+
+@Override
+public Member getMember(Member mbr) {
+if (membership.getMembers() == null) return null;
+return membership.getMember(mbr);
+}
+
+@Override
+public Member[] getMembers() {
+if (membership.getMembers() == null) return Membership.EMPTY_MEMBERS;
+return membership.getMembers();
+}
+
+@Override
+public void setMembershipListener(MembershipListener listener) {
+this.membershipListener = listener;
+}
+}
\ No newline at end of file
Propchange:
tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipProviderBase.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1831226 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Author: kfujino
Date: Wed May 9 04:38:34 2018
New Revision: 1831226
URL: http://svn.apache.org/viewvc?rev=1831226&view=rev
Log:
Make McastServiceImpl subclass of MembershipProviderBase.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
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=1831226&r1=1831225&r2=1831226&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Wed May 9 04:38:34 2018
@@ -50,7 +50,7 @@ import org.apache.juli.logging.LogFactor
* Need to fix this, could use java.nio and only need one thread to send and
receive, or
* just use a timeout on the receive
*/
-public class McastServiceImpl {
+public class McastServiceImpl extends MembershipProviderBase {
private static final Log log = LogFactory.getLog(McastService.class);
@@ -95,10 +95,7 @@ public class McastServiceImpl {
* Reuse the receivePacket, no need to create a new one everytime
*/
protected DatagramPacket receivePacket;
-/**
- * The membership, used so that we calculate memberships when they arrive
or don't arrive
- */
-protected Membership membership;
+
/**
* The actual listener, for callback when stuff goes down
*/
-
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
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/3249 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] 1831225 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: r1831227 - in /tomcat/trunk/java/org/apache/catalina/tribes: MembershipService.java membership/McastService.java membership/MembershipServiceBase.java
Author: kfujino
Date: Wed May 9 04:55:08 2018
New Revision: 1831227
URL: http://svn.apache.org/viewvc?rev=1831227&view=rev
Log:
-Implements the base class of MembershipServiceBase.
-Add getMembershipProvider method in MembershipService.
-Make McastService subclass of MembershipServiceBase.
Added:
tomcat/trunk/java/org/apache/catalina/tribes/membership/MembershipServiceBase.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/MembershipService.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/MembershipService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/MembershipService.java?rev=1831227&r1=1831226&r2=1831227&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/MembershipService.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/MembershipService.java Wed May
9 04:55:08 2018
@@ -18,6 +18,7 @@
package org.apache.catalina.tribes;
+
/**
* MembershipService Interface
* The MembershipService interface is the membership component
@@ -156,4 +157,9 @@ public interface MembershipService {
*/
public void setChannel(Channel channel);
+/**
+ * Get the MembershipProvider
+ * @return MembershipProvider
+ */
+public MembershipProvider getMembershipProvider();
}
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=1831227&r1=1831226&r2=1831227&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Wed May 9 04:55:08 2018
@@ -28,6 +28,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ChannelMessage;
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.MessageListener;
import org.apache.catalina.tribes.io.ChannelData;
@@ -46,7 +47,7 @@ import org.apache.juli.logging.LogFactor
* If a node fails to send out a heartbeat, the node will be dismissed.
*/
public class McastService
-implements MembershipService,MembershipListener,MessageListener,
McastServiceMBean {
+extends MembershipServiceBase implements MessageListener,
McastServiceMBean {
private static final Log log = LogFactory.getLog(McastService.class);
@@ -56,17 +57,10 @@ public class McastService
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
/**
- * The implementation specific properties
- */
-protected Properties properties = new Properties();
-/**
* A handle to the actual low level implementation
*/
protected McastServiceImpl impl;
-/**
- * A membership listener delegate (should be the cluster :)
- */
-protected volatile MembershipListener listener;
+
/**
* A message listener delegate for broadcasts
*/
@@ -82,8 +76,6 @@ public class McastService
protected byte[] domain;
-private Channel channel;
-
/**
* the ObjectName of this McastService.
*/
@@ -123,14 +115,6 @@ public class McastService
}
/**
- * {@inheritDoc}
- */
-@Override
-public Properties getProperties() {
-return properties;
-}
-
-/**
* @return the local member name
*/
@Override
@@ -291,16 +275,6 @@ public class McastService
if ( properties.getProperty(name)==null) throw new
IllegalArgumentException(sm.getString("mcastService.missing.property", name));
}
-/**
- * Start broadcasting and listening to membership pings
- * @throws java.lang.Exception if a IO error occurs
- */
-@Override
-public void start() throws java.lang.Exception {
-start(MembershipService.MBR_RX);
-start(MembershipService.MBR_TX);
-}
-
@Override
public void start(int level) throws java.lang.Exception {
hasProperty(properties,"mcastPort");
@@ -409,71 +383,6 @@ public class McastService
}
}
-
-/**
- * Return all the members by name
- */
-@Override
-public String[] getMembersByName() {
-Member[] currentMembers = getMembers();
-String [] membernames ;
-if(currentMembers != null) {
-membernames = new String[currentMembers.length];
-for (int i = 0; i < currentMembers.length; i++) {
-membernames[i] = currentMembers[i].toString() ;
-}
-} else
-
svn commit: r1831228 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Author: kfujino Date: Wed May 9 04:56:18 2018 New Revision: 1831228 URL: http://svn.apache.org/viewvc?rev=1831228&view=rev Log: remove unused import Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java 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=1831228&r1=1831227&r2=1831228&view=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java Wed May 9 04:56:18 2018 @@ -27,9 +27,7 @@ import org.apache.catalina.tribes.Channe import org.apache.catalina.tribes.ChannelException; import org.apache.catalina.tribes.ChannelMessage; 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.MessageListener; import org.apache.catalina.tribes.io.ChannelData; import org.apache.catalina.tribes.io.XByteBuffer; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1831229 - /tomcat/trunk/webapps/docs/changelog.xml
Author: kfujino Date: Wed May 9 05:02:00 2018 New Revision: 1831229 URL: http://svn.apache.org/viewvc?rev=1831229&view=rev Log: Add changelog entry for refactor of MembershipService. 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=1831229&r1=1831228&r2=1831229&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed May 9 05:02:00 2018 @@ -109,6 +109,9 @@ Ensure that the correct default value is returned when retrieve unset properties in McastService. (kfujino) + +Make MembershipService more easily extensible. (kfujino) + - 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
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/3250 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] 1831226 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
