[qpid-jms] branch main updated: QPIDJMS-553 Shared Netty event loop group
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
The following commit(s) were added to refs/heads/main by this push:
new 4ca0618 QPIDJMS-553 Shared Netty event loop group
4ca0618 is described below
commit 4ca0618f546d3d7b54c8639036841646c0ffa202
Author: franz1981
AuthorDate: Wed Mar 16 11:01:28 2022 +0100
QPIDJMS-553 Shared Netty event loop group
co-author: gemmellr
---
.../qpid/jms/transports/TransportOptions.java | 11 +
.../jms/transports/netty/EventLoopGroupRef.java| 27 ++
.../qpid/jms/transports/netty/EventLoopType.java | 89 ++
.../netty/NettyEventLoopGroupFactory.java | 211 +
.../jms/transports/netty/NettyTcpTransport.java| 53 ++--
.../apache/qpid/jms/util/QpidJMSThreadFactory.java | 35 ++-
.../qpid/jms/transports/TransportOptionsTest.java | 4 +
.../netty/NettySslTransportFactoryTest.java| 4 +
.../netty/NettyTcpTransportFactoryTest.java| 4 +
.../transports/netty/NettyTcpTransportTest.java| 342 ++---
10 files changed, 618 insertions(+), 162 deletions(-)
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportOptions.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportOptions.java
index ba62d04..1ed1771 100644
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportOptions.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportOptions.java
@@ -39,6 +39,7 @@ public class TransportOptions implements Cloneable {
public static final int DEFAULT_SO_TIMEOUT = -1;
public static final int DEFAULT_CONNECT_TIMEOUT = 6;
public static final int DEFAULT_TCP_PORT = 5672;
+public static final int DEFAULT_SHARED_EVENT_LOOP_THREADS = -1;
public static final boolean DEFAULT_USE_EPOLL = true;
public static final boolean DEFAULT_USE_KQUEUE = false;
public static final boolean DEFAULT_TRACE_BYTES = false;
@@ -73,6 +74,7 @@ public class TransportOptions implements Cloneable {
private boolean useKQueue = DEFAULT_USE_KQUEUE;
private boolean traceBytes = DEFAULT_TRACE_BYTES;
private boolean useOpenSSL = DEFAULT_USE_OPENSSL;
+private int sharedEventLoopThreads = DEFAULT_SHARED_EVENT_LOOP_THREADS;
private String keyStoreLocation;
private String keyStorePassword;
@@ -213,6 +215,14 @@ public class TransportOptions implements Cloneable {
this.tcpKeepAlive = keepAlive;
}
+public void setSharedEventLoopThreads(int numThreads) {
+this.sharedEventLoopThreads = numThreads;
+}
+
+public int getSharedEventLoopThreads() {
+return sharedEventLoopThreads;
+}
+
public int getConnectTimeout() {
return connectTimeout;
}
@@ -590,6 +600,7 @@ public class TransportOptions implements Cloneable {
copy.setUseOpenSSL(isUseOpenSSL());
copy.setLocalAddress(getLocalAddress());
copy.setLocalPort(getLocalPort());
+copy.setSharedEventLoopThreads(getSharedEventLoopThreads());
return copy;
}
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/EventLoopGroupRef.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/EventLoopGroupRef.java
new file mode 100644
index 000..e590e5f
--- /dev/null
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/EventLoopGroupRef.java
@@ -0,0 +1,27 @@
+/*
+ * 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.qpid.jms.transports.netty;
+
+import io.netty.channel.EventLoopGroup;
+
+public interface EventLoopGroupRef extends AutoCloseable {
+
+EventLoopGroup group();
+
+@Override
+void close();
+}
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/EventLoopType.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/EventLoopType.java
new file mode 100644
index 000..610a6ff
--- /dev/null
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/netty/EventLoopType.java
@@ -0,0 +1,89 @@
+/*
+ * L
[qpid-jms] 01/02: QPIDJMS-562: update activemq test dep to 5.17.0, align jetty deps
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit a1c23a394a2f6a9a001b27b19e44a237ab412ceb
Author: Robbie Gemmell
AuthorDate: Wed Mar 16 10:44:59 2022 +
QPIDJMS-562: update activemq test dep to 5.17.0, align jetty deps
---
pom.xml| 2 +-
qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml | 15 +--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6fbbe48..f000f0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
2.0.50.Final
-5.16.3
+5.17.0
4.13.2
1.0
9.4.43.v20210629
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
index ca04b3a..b6abf90 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
@@ -31,6 +31,19 @@
UTF-8
+
+
+
+org.eclipse.jetty
+jetty-bom
+${jetty-version}
+pom
+import
+
+
+
+
+
@@ -80,13 +93,11 @@
org.eclipse.jetty
jetty-jndi
- ${jetty-version}
test
org.eclipse.jetty.websocket
websocket-server
- ${jetty-version}
test
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-jms] branch main updated (4ca0618 -> 706514e)
This is an automated email from the ASF dual-hosted git repository. robbie pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-jms.git. from 4ca0618 QPIDJMS-553 Shared Netty event loop group new a1c23a3 QPIDJMS-562: update activemq test dep to 5.17.0, align jetty deps new 706514e QPIDJMS-562: update to jetty 9.4.45 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml| 4 ++-- qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml | 15 +-- 2 files changed, 15 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-jms] 02/02: QPIDJMS-562: update to jetty 9.4.45
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-jms.git commit 706514e7a1a75a45ceb1cff60583bcb76f769882 Author: Robbie Gemmell AuthorDate: Wed Mar 16 10:45:09 2022 + QPIDJMS-562: update to jetty 9.4.45 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f000f0c..6f3e75a 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 5.17.0 4.13.2 1.0 -9.4.43.v20210629 +9.4.45.v20220203 4.4.0 2.2 3.3.2 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch main updated: DISPATCH-2336: Fix Dockerfiles in the dockerfile folder (#1536)
This is an automated email from the ASF dual-hosted git repository. jdanek pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git The following commit(s) were added to refs/heads/main by this push: new 2fe2fe7 DISPATCH-2336: Fix Dockerfiles in the dockerfile folder (#1536) 2fe2fe7 is described below commit 2fe2fe7feb1655bc446c05b8ef5d741068089770 Author: Jiri Daněk AuthorDate: Wed Mar 16 16:00:22 2022 +0100 DISPATCH-2336: Fix Dockerfiles in the dockerfile folder (#1536) --- dockerfiles/Dockerfile-centos7 | 4 +- dockerfiles/Dockerfile-fedora | 3 +- dockerfiles/Dockerfile-fedora-only-python3 | 62 -- dockerfiles/Dockerfile-ubuntu | 9 +++-- 4 files changed, 9 insertions(+), 69 deletions(-) diff --git a/dockerfiles/Dockerfile-centos7 b/dockerfiles/Dockerfile-centos7 index 3ddc800..c39775c 100644 --- a/dockerfiles/Dockerfile-centos7 +++ b/dockerfiles/Dockerfile-centos7 @@ -64,5 +64,5 @@ RUN cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make install # RUN ctest -VV # Start the dispatch router -#ENTRYPOINT ["qdrouterd"] -CMD ["/bin/bash"] +ENTRYPOINT ["qdrouterd"] +#CMD ["/bin/bash"] diff --git a/dockerfiles/Dockerfile-fedora b/dockerfiles/Dockerfile-fedora index dd00631..fb3b0bd 100644 --- a/dockerfiles/Dockerfile-fedora +++ b/dockerfiles/Dockerfile-fedora @@ -30,12 +30,11 @@ FROM fedora:latest MAINTAINER "d...@qpid.apache.org" # Install required packages. Some in this list are from proton's INSTALL.md (https://github.com/apache/qpid-proton/blob/main/INSTALL.md) and the rest are from dispatch (https://github.com/apache/qpid-dispatch/blob/main/README) -RUN dnf -y install gcc gcc-c++ cmake openssl-devel cyrus-sasl-devel cyrus-sasl-plain cyrus-sasl-gssapi cyrus-sasl-md5 swig java-1.8.0-openjdk-devel git make valgrind emacs libwebsockets-devel python-devel curl +RUN dnf -y install gcc gcc-c++ cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain cyrus-sasl-gssapi swig git make valgrind emacs libwebsockets-devel python3-devel curl # Create a main directory and clone the qpid-proton repo from github RUN mkdir /main && cd /main && git clone https://gitbox.apache.org/repos/asf/qpid-proton.git && cd /main/qpid-proton && mkdir /main/qpid-proton/build -WORKDIR /main WORKDIR /main/qpid-proton/build # make and install proton diff --git a/dockerfiles/Dockerfile-fedora-only-python3 b/dockerfiles/Dockerfile-fedora-only-python3 deleted file mode 100644 index 3d4c8db..000 --- a/dockerfiles/Dockerfile-fedora-only-python3 +++ /dev/null @@ -1,62 +0,0 @@ -# -# 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. -# - -# Downloads and installs apache proton and qpid dispatch on the latest version of Fedora and starts the dispatch router -# /main is the top level folder under which proton (/main/qpid-proton/) and dispatch (/main/qpid-dispatch) source code is downloaded from github -# /usr/local/lib64 is the folder in which the proton artifacts are installed. -# /usr/local/sbin is the folder in which dispatch executable installed -# Copy this docker file to your local folder. Build the docker file like this - sudo docker build -t /dispatch --file=Dockerfile-fedora . (don't miss the dot at the end) -# To run it - sudo docker run -i -t /dispatch (this will launch the dispatch router) - -# Gets the latest Fedora from dockerhub -FROM fedora:latest - -MAINTAINER "d...@qpid.apache.org" - -# Install all the required packages. Some in this list were picked off from proton's INSTALL.md (https://github.com/apache/qpid-proton/blob/main/INSTALL.md) and the rest are from dispatch (https://github.com/apache/qpid-dispatch/blob/main/README) -RUN dnf -y install gcc cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain cyrus-sasl-gssapi cyrus-sasl-md5 swig java-1.8.0-openjdk-devel git make doxygen valgrind emacs libuv libuv-devel libwebsockets-devel - -# Remove python2 if it is already there. We want this environment to contain only python3 -RUN dnf -y remove python2 -RUN dnf -y install python3-devel -RUN dnf clean all -y - -RUN alternatives --install /usr/bin/python python /usr/bin/python3 1 -RUN alternatives --install /usr/b
[qpid-dispatch] branch dependabot/npm_and_yarn/console/react/prettier-2.6.0 created (now 3aaadc2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/console/react/prettier-2.6.0 in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git. at 3aaadc2 Bump prettier from 2.5.1 to 2.6.0 in /console/react No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch dependabot/npm_and_yarn/console/react/browserslist-4.20.2 created (now 77b37b3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/console/react/browserslist-4.20.2 in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git. at 77b37b3 Bump browserslist from 4.20.0 to 4.20.2 in /console/react No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch 1.19.x updated: DISPATCH-2234: Update JavaScript console packages for the 1.19.0 release (round 2) (#1537)
This is an automated email from the ASF dual-hosted git repository.
kgiusti pushed a commit to branch 1.19.x
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/1.19.x by this push:
new 0bfe00d DISPATCH-2234: Update JavaScript console packages for the
1.19.0 release (round 2) (#1537)
0bfe00d is described below
commit 0bfe00dacb58e197932510a062d1928b1f06f198
Author: Jiri Daněk
AuthorDate: Mon Mar 14 20:15:57 2022 +0100
DISPATCH-2234: Update JavaScript console packages for the 1.19.0 release
(round 2) (#1537)
(cherry picked from commit f0c7e9323b80741c53d6a8c7c230349e4fc49e89)
---
console/react/package-lock.json | 1057 +++
console/react/package.json | 28 +-
2 files changed, 542 insertions(+), 543 deletions(-)
diff --git a/console/react/package-lock.json b/console/react/package-lock.json
index cf8a183..a07e3ce 100644
--- a/console/react/package-lock.json
+++ b/console/react/package-lock.json
@@ -8,36 +8,36 @@
"name": "dispatch-console",
"version": "1.19.0",
"dependencies": {
-"@patternfly/patternfly": "^4.171.1",
-"@patternfly/react-charts": "^6.45.15",
-"@patternfly/react-core": "^4.192.15",
-"@patternfly/react-icons": "^4.43.15",
-"@patternfly/react-styles": "^4.42.15",
-"@patternfly/react-table": "^4.61.15",
-"@patternfly/react-topology": "^4.39.15",
+"@patternfly/patternfly": "^4.183.1",
+"@patternfly/react-charts": "^6.51.19",
+"@patternfly/react-core": "^4.198.19",
+"@patternfly/react-icons": "^4.49.19",
+"@patternfly/react-styles": "^4.48.19",
+"@patternfly/react-table": "^4.67.19",
+"@patternfly/react-topology": "^4.45.19",
"d3": "^3.5.17",
"d3-queue": "^3.0.7",
-"express": "^4.17.2",
+"express": "^4.17.3",
"font-awesome": "^4.7.0",
"prop-types": "^15.8.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-fontawesome": "^1.7.1",
-"react-router-dom": "^6.2.1",
+"react-router-dom": "^6.2.2",
"rhea": "^3.0.0",
"topojson-client": "^3.1.0"
},
"devDependencies": {
"@react-mock/localstorage": "^0.1.2",
"@testing-library/jest-dom": "^5.16.2",
-"@testing-library/react": "^12.1.3",
-"@types/jest": "^27.4.0",
+"@testing-library/react": "^12.1.4",
+"@types/jest": "^27.4.1",
"body-parser": "^1.19.2",
-"browserslist": "^4.19.1",
-"jest-axe": "^5.0.1",
+"browserslist": "^4.20.0",
+"jest-axe": "^6.0.0",
"prettier": "^2.5.1",
"react-scripts": "^4.0.3",
-"typescript": "^4.5.5"
+"typescript": "^4.6.2"
}
},
"node_modules/@ampproject/remapping": {
@@ -2812,35 +2812,35 @@
}
},
"node_modules/@patternfly/patternfly": {
- "version": "4.171.1",
- "resolved":
"https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.171.1.tgz";,
- "integrity":
"sha512-e5Ykg+QOo8TsyOyG6SqytAs52MJXwaP020z3twb8z9G3ZNra92uNsrxGgZEqPJoWbjU4K7LGDxy2DOM1FeRoFw=="
+ "version": "4.183.1",
+ "resolved":
"https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.183.1.tgz";,
+ "integrity":
"sha512-XJZIG/kcEbIPI/0Q6+Q5ax2m295IpQCppertUQ4RfOSkvJVfjQ4CUNmR/ycgjlGm1DItmYJe/NqVFerNlvzUeg=="
},
"node_modules/@patternfly/react-charts": {
- "version": "6.45.15",
- "resolved":
"https://registry.npmjs.org/@patternfly/react-charts/-/react-charts-6.45.15.tgz";,
- "integrity":
"sha512-uYpvFh1SRnbc6hLN35X7YFSjI26+Qh9+FrF+UzOhkjlXVWCpfRem4Z5B3w2Ssi7xPzDOW8WwIzMo75aaMfb8Tw==",
+ "version": "6.51.19",
+ "resolved":
"https://registry.npmjs.org/@patternfly/react-charts/-/react-charts-6.51.19.tgz";,
+ "integrity":
"sha512-7fLLzZ8Hc9JkEf23XM55jmIK4v9M3PyjUQjIfPQfn487q7xbbM0N1oAT1tcoQ/33Hi+/8s4wiWMq+cxOO+heZA==",
"dependencies": {
-"@patternfly/react-styles": "^4.42.15",
-"@patternfly/react-tokens": "^4.44.15",
+"@patternfly/react-styles": "^4.48.19",
+"@patternfly/react-tokens": "^4.50.19",
"hoist-non-react-statics": "^3.3.0",
"lodash": "^4.17.19",
"tslib": "^2.0.0",
-"victory-area": "^35.9.0",
-"victory-axis": "^35.9.0",
-"victory-bar": "^35.9.0",
-"victory-chart": "^35.9.0",
-"victory-core": "^35.9.0",
-"victory-create-container": "^35.9.1",
-"victory-group": "^35.9.0",
-"victory-legend": "^35.9.0",
-"victory-line": "^35.9.0",
-"victory-pie": "^35.9.0",
-"victory-scatter": "^35.9.0",
-"victory-stack": "^35.9.0",
-"victory-tooltip": "^35.9.1",
-"victory-voronoi-container": "^35.9.1",
-"victory-zoom-container": "^35.9.0"
+"victory-area": "^36.2.
svn commit: r53151 - in /dev/qpid/dispatch/1.19.0-rc2: ./ qpid-dispatch-1.19.0.tar.gz qpid-dispatch-1.19.0.tar.gz.asc qpid-dispatch-1.19.0.tar.gz.sha512
Author: kgiusti Date: Thu Mar 17 00:56:59 2022 New Revision: 53151 Log: Adding files for Qpid Dispatch 1.19.0-rc2 Added: dev/qpid/dispatch/1.19.0-rc2/ dev/qpid/dispatch/1.19.0-rc2/qpid-dispatch-1.19.0.tar.gz (with props) dev/qpid/dispatch/1.19.0-rc2/qpid-dispatch-1.19.0.tar.gz.asc (with props) dev/qpid/dispatch/1.19.0-rc2/qpid-dispatch-1.19.0.tar.gz.sha512 Added: dev/qpid/dispatch/1.19.0-rc2/qpid-dispatch-1.19.0.tar.gz == Binary file - no diff available. Propchange: dev/qpid/dispatch/1.19.0-rc2/qpid-dispatch-1.19.0.tar.gz -- svn:mime-type = application/gzip Added: dev/qpid/dispatch/1.19.0-rc2/qpid-dispatch-1.19.0.tar.gz.asc == Binary file - no diff available. Propchange: dev/qpid/dispatch/1.19.0-rc2/qpid-dispatch-1.19.0.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/qpid/dispatch/1.19.0-rc2/qpid-dispatch-1.19.0.tar.gz.sha512 == --- dev/qpid/dispatch/1.19.0-rc2/qpid-dispatch-1.19.0.tar.gz.sha512 (added) +++ dev/qpid/dispatch/1.19.0-rc2/qpid-dispatch-1.19.0.tar.gz.sha512 Thu Mar 17 00:56:59 2022 @@ -0,0 +1 @@ +f6bfc9f14c1badb59f0934f3ea0832416d112b8f2081c539902807e980edafc9cf962c6b0fff07624c12d8d2dc1b67b9770bd7028c3013ac1a240a0a07825b65 qpid-dispatch-1.19.0.tar.gz - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] tag 1.19.0-rc2 created (now 0bfe00d)
This is an automated email from the ASF dual-hosted git repository. kgiusti pushed a change to tag 1.19.0-rc2 in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git. at 0bfe00d (commit) No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
