[qpid-dispatch] branch master updated: DISPATCH-1224 - Completed endpoint-initiated waypoints.
This is an automated email from the ASF dual-hosted git repository.
tross pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new b8613b8 DISPATCH-1224 - Completed endpoint-initiated waypoints.
b8613b8 is described below
commit b8613b8a64353ee021e218c8c487a9871517966c
Author: Ted Ross
AuthorDate: Fri Dec 14 17:38:08 2018 -0500
DISPATCH-1224 - Completed endpoint-initiated waypoints.
DISPATCH-1224 - Added a waypoint and multi-phase test.
DISPATCH-1224 - Replaced use of sprintf with explicit characters.
---
include/qpid/dispatch/amqp.h | 9 +
include/qpid/dispatch/router_core.h| 11 +
python/qpid_dispatch/management/qdrouter.json | 7 +
.../qpid_dispatch_internal/policy/policy_local.py | 6 +-
src/amqp.c | 19 +-
src/policy.c | 41 ++
src/policy.h | 1 +
src/router_core/connections.c | 2 +-
.../modules/address_lookup_client/lookup_client.c | 7 +-
src/router_core/modules/edge_router/addr_proxy.c | 53 ++-
src/router_core/route_control.c| 2 +
src/router_core/router_core.c | 4 +-
src/router_core/router_core_private.h | 1 +
src/router_core/terminus.c | 20 +
tests/CMakeLists.txt | 1 +
tests/system_tests_multi_phase.py | 411 +
16 files changed, 574 insertions(+), 21 deletions(-)
diff --git a/include/qpid/dispatch/amqp.h b/include/qpid/dispatch/amqp.h
index 35f7c67..9f6be37 100644
--- a/include/qpid/dispatch/amqp.h
+++ b/include/qpid/dispatch/amqp.h
@@ -127,7 +127,16 @@ extern const char * const QD_CAPABILITY_ANONYMOUS_RELAY;
extern const char * const QD_CAPABILITY_ROUTER_CONTROL;
extern const char * const QD_CAPABILITY_ROUTER_DATA;
extern const char * const QD_CAPABILITY_EDGE_DOWNLINK;
+extern const char * const QD_CAPABILITY_WAYPOINT_DEFAULT;
extern const char * const QD_CAPABILITY_WAYPOINT1;
+extern const char * const QD_CAPABILITY_WAYPOINT2;
+extern const char * const QD_CAPABILITY_WAYPOINT3;
+extern const char * const QD_CAPABILITY_WAYPOINT4;
+extern const char * const QD_CAPABILITY_WAYPOINT5;
+extern const char * const QD_CAPABILITY_WAYPOINT6;
+extern const char * const QD_CAPABILITY_WAYPOINT7;
+extern const char * const QD_CAPABILITY_WAYPOINT8;
+extern const char * const QD_CAPABILITY_WAYPOINT9;
/// @}
/** @name Dynamic Node Properties */
diff --git a/include/qpid/dispatch/router_core.h
b/include/qpid/dispatch/router_core.h
index a03db27..136ad6a 100644
--- a/include/qpid/dispatch/router_core.h
+++ b/include/qpid/dispatch/router_core.h
@@ -316,6 +316,17 @@ void qdr_terminus_add_capability(qdr_terminus_t *term,
const char *capability);
bool qdr_terminus_has_capability(qdr_terminus_t *term, const char *capability);
/**
+ * qdr_terminus_waypoint_capability
+ *
+ * If the terminus has a waypoint capability, return the ordinal of the
+ * waypoint. If not, return zero.
+ *
+ * @param term A qdr_terminus pointer returned by qdr_terminus()
+ * @return 1..9 if the terminus has waypoint capability, 0 otherwise
+ */
+int qdr_terminus_waypoint_capability(qdr_terminus_t *term);
+
+/**
* qdr_terminus_is_anonymous
*
* Indicate whether this terminus represents an anonymous endpoint.
diff --git a/python/qpid_dispatch/management/qdrouter.json
b/python/qpid_dispatch/management/qdrouter.json
index 5408c9b..180a0e0 100644
--- a/python/qpid_dispatch/management/qdrouter.json
+++ b/python/qpid_dispatch/management/qdrouter.json
@@ -1868,6 +1868,13 @@
"required": false,
"create": true
},
+"allowWaypointLinks": {
+"type": "boolean",
+"description": "Whether this connection is allowed to
claim 'waypoint.N' capability for attached links. This allows endpoints to act
as waypoints without needing auto-links.",
+"default": true,
+"required": false,
+"create": true
+},
"sources": {
"type": "string",
"description": "A list of source addresses from which
users in this group may receive messages. To specify multiple addresses,
separate the addresses with either a comma or a space. If you do not specify
any addresses, users in this group are not allowed to receive messages from any
addresses. You can use the substitution token '${user}' to specify an address
that contains a user's authenticated user name. You can use an asterisk ('*')
wildcard to match one or more ch [...]
diff --git a/python/qpid_dispatch_internal/policy/policy_local.py
b/python/qpid_dispatch_i
[qpid-dispatch] branch master updated: DISPATCH-1214 - Free the error object on second detaches
This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new ccb8585 DISPATCH-1214 - Free the error object on second detaches
ccb8585 is described below
commit ccb8585011cdbce112ecdd3b3af4e300d30e5889
Author: Ganesh Murthy
AuthorDate: Fri Dec 14 17:29:21 2018 -0500
DISPATCH-1214 - Free the error object on second detaches
---
src/router_core/core_link_endpoint.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/router_core/core_link_endpoint.c
b/src/router_core/core_link_endpoint.c
index e1867f7..532188c 100644
--- a/src/router_core/core_link_endpoint.c
+++ b/src/router_core/core_link_endpoint.c
@@ -210,11 +210,15 @@ void qdrc_endpoint_do_detach_CT(qdr_core_t *core,
qdrc_endpoint_t *ep, qdr_error
if (ep->link->detach_count == 1) {
if (!!ep->desc->on_first_detach)
ep->desc->on_first_detach(ep->link_context, error);
-else
+else {
qdr_link_outbound_detach_CT(core, ep->link, 0, QDR_CONDITION_NONE,
true);
+qdr_error_free(error);
+}
} else {
if (!!ep->desc->on_second_detach)
ep->desc->on_second_detach(ep->link_context, error);
+else
+qdr_error_free(error);
ep->link->core_endpoint = 0;
free_qdrc_endpoint_t(ep);
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] branch master updated: PROTON-985: Modify pn_transport_tick to use a monotonic clock.
This is an automated email from the ASF dual-hosted git repository.
aconway pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new a051803 PROTON-985: Modify pn_transport_tick to use a monotonic clock.
a051803 is described below
commit a051803e0fb25cef2f25e829bac6c516ab0aab7c
Author: Alan Conway
AuthorDate: Fri Dec 14 14:02:37 2018 -0500
PROTON-985: Modify pn_transport_tick to use a monotonic clock.
---
c/include/proton/transport.h | 5 +++--
c/src/core/transport.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/c/include/proton/transport.h b/c/include/proton/transport.h
index cf965c5..e9f3288 100644
--- a/c/include/proton/transport.h
+++ b/c/include/proton/transport.h
@@ -680,7 +680,8 @@ PN_EXTERN bool pn_transport_closed(pn_transport_t
*transport);
*
*
* @param[in] transport the transport to process.
- * @param[in] now the current time
+ * @param[in] now A monotonically-increasing time value in milliseconds.
+ * Does not need to be wall-clock time or a valid AMQP timestamp, but must
increase montonically.
*
* @return if non-zero, then the expiration time of the next pending timer
event for the
* transport. The caller must invoke pn_transport_tick again at least once at
or before
@@ -688,7 +689,7 @@ PN_EXTERN bool pn_transport_closed(pn_transport_t
*transport);
*
* @internal XXX Deprecate when tick is added to connection driver
*/
-PN_EXTERN pn_timestamp_t pn_transport_tick(pn_transport_t *transport,
pn_timestamp_t now);
+PN_EXTERN pn_timestamp_t pn_transport_tick(pn_transport_t *transport, int64_t
now);
/**
* **Deprecated** - No replacement.
diff --git a/c/src/core/transport.c b/c/src/core/transport.c
index 545897a..87c9351 100644
--- a/c/src/core/transport.c
+++ b/c/src/core/transport.c
@@ -2909,7 +2909,7 @@ pn_millis_t
pn_transport_get_remote_idle_timeout(pn_transport_t *transport)
return transport->remote_idle_timeout;
}
-pn_timestamp_t pn_transport_tick(pn_transport_t *transport, pn_timestamp_t now)
+pn_timestamp_t pn_transport_tick(pn_transport_t *transport, int64_t now)
{
pn_timestamp_t r = 0;
for (int i = 0; i
[qpid-dispatch] branch master updated: DISPATCH-1223: don't count transfers with 'more' set as unsettled
This is an automated email from the ASF dual-hosted git repository. chug pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git The following commit(s) were added to refs/heads/master by this push: new 0bc1456 DISPATCH-1223: don't count transfers with 'more' set as unsettled 0bc1456 is described below commit 0bc145658521f578d827f7d30c9658bbc20dd11a Author: Chuck Rolke AuthorDate: Fri Dec 14 16:36:36 2018 -0500 DISPATCH-1223: don't count transfers with 'more' set as unsettled --- tools/scraper/amqp_detail.py | 9 +++-- tools/scraper/common.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/scraper/amqp_detail.py b/tools/scraper/amqp_detail.py index 136fb6b..909e454 100755 --- a/tools/scraper/amqp_detail.py +++ b/tools/scraper/amqp_detail.py @@ -401,10 +401,15 @@ class AllDetails(): "connid:%s, line:%s\n" % (snd_disposition.data.conn_id, snd_disposition.lineno)) else: -result = "receive settlement absent" +if transfer.data.transfer_more: +result = "(pending)" +else: +result = "receive settlement absent" else: # two settlements expected -if rcv_disposition is not None: +if transfer.data.transfer_more: +result = "(pending)" +elif rcv_disposition is not None: result = "receiver: " + rtext if snd_disposition is not None: result += ", sender: " + stext diff --git a/tools/scraper/common.py b/tools/scraper/common.py index 654b8b4..a8ff727 100755 --- a/tools/scraper/common.py +++ b/tools/scraper/common.py @@ -141,5 +141,5 @@ class RestartRec(): self.datetime = _datetime def transfer_is_possibly_unsettled(plf): -return (plf.data.transfer and +return (plf.data.transfer and not plf.data.transfer_more and not (plf.data.transfer_settled or plf.data.final_disposition is not None)) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch master updated: DISPATCH-1216: Scraper - new arg default when otherwise unspecified
This is an automated email from the ASF dual-hosted git repository. chug pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git The following commit(s) were added to refs/heads/master by this push: new 0391693 DISPATCH-1216: Scraper - new arg default when otherwise unspecified 0391693 is described below commit 03916931151ef9cedb78ef2febaeb9b98b29dc90 Author: Chuck Rolke AuthorDate: Fri Dec 14 15:32:57 2018 -0500 DISPATCH-1216: Scraper - new arg default when otherwise unspecified --- tools/scraper/parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/scraper/parser.py b/tools/scraper/parser.py index 67eb0c8..a14b98f 100755 --- a/tools/scraper/parser.py +++ b/tools/scraper/parser.py @@ -720,7 +720,7 @@ class ParsedLogLine(object): return "%s" % (self.fid, "%s%d_%s" % (common.log_letter_of(self.index), self.instance, str(self.lineno))) -def __init__(self, _log_index, _instance, _lineno, _line, _comn, _router, opaque): +def __init__(self, _log_index, _instance, _lineno, _line, _comn, _router, opaque=None): """ Process a naked qpid-dispatch log line A log line looks like this: - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch master updated: DISPATCH-1154: update link route proxy tests, add missing delivery reference
This is an automated email from the ASF dual-hosted git repository.
kgiusti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new b594672 DISPATCH-1154: update link route proxy tests, add missing
delivery reference
b594672 is described below
commit b594672e41856e626d3b15e849cf39bced836b3a
Author: Kenneth Giusti
AuthorDate: Wed Dec 12 11:50:40 2018 -0500
DISPATCH-1154: update link route proxy tests, add missing delivery reference
---
src/router_core/core_client_api.c | 9 ++
tests/system_test.py | 25 +++-
tests/system_tests_edge_router.py | 234 --
tests/test_broker.py | 32 ++
4 files changed, 188 insertions(+), 112 deletions(-)
diff --git a/src/router_core/core_client_api.c
b/src/router_core/core_client_api.c
index 9ef1c4e..7483869 100644
--- a/src/router_core/core_client_api.c
+++ b/src/router_core/core_client_api.c
@@ -286,6 +286,7 @@ static void _flush_send_queue_CT(qdrc_client_t *client)
req->delivery = qdrc_endpoint_delivery_CT(client->core,
client->sender,
msg);
+qdr_delivery_incref(req->delivery, "core client send request");
qdrc_endpoint_send_CT(client->core,
client->sender,
req->delivery,
@@ -347,6 +348,10 @@ static void _free_request_CT(qdrc_client_t *client,
qd_compose_free(req->app_properties);
}
+if (req->delivery) {
+qdr_delivery_decref_CT(client->core, req->delivery, "core client send
request");
+}
+
// notify user that the request has completed
if (req->done_cb) {
req->done_cb(client->core,
@@ -478,6 +483,10 @@ static void _sender_update_CT(void *context,
DEQ_REMOVE_N(UNSETTLED, client->unsettled_list, req);
req->on_unsettled_list = false;
+// delivery no longer needed
+qdr_delivery_decref_CT(client->core, req->delivery, "core client
send request");
+req->delivery = 0;
+
if (!req->on_reply_list || disposition != PN_ACCEPTED) {
// no reply is coming, release the request
_free_request_CT(client, req, NULL);
diff --git a/tests/system_test.py b/tests/system_test.py
index 354eac6..bec6b7f 100755
--- a/tests/system_test.py
+++ b/tests/system_test.py
@@ -43,6 +43,7 @@ except ImportError:
from threading import Thread
from threading import Event
import json
+import uuid
import proton
from proton import Message, Timeout
@@ -720,11 +721,12 @@ class AsyncTestReceiver(MessagingHandler):
messages. Messages can be retrieved from this thread via the queue member.
:param wait: block the constructor until the link has been fully
established.
+:param recover_link: restart on remote link detach
"""
Empty = Queue.Empty
def __init__(self, address, source, conn_args=None, container_id=None,
- wait=True):
+ wait=True, recover_link=False):
super(AsyncTestReceiver, self).__init__()
self.address = address
self.source = source
@@ -732,9 +734,11 @@ class AsyncTestReceiver(MessagingHandler):
self.queue = Queue.Queue()
self._conn = None
self._container = Container(self)
-if container_id is not None:
-self._container.container_id = container_id
+cid = container_id or "ATR-%s:%s" % (source, uuid.uuid4())
+self._container.container_id = cid
self._ready = Event()
+self._recover_link = recover_link
+self._recover_count = 0
self._stop_thread = False
self._thread = Thread(target=self._main)
self._thread.daemon = True
@@ -770,6 +774,17 @@ class AsyncTestReceiver(MessagingHandler):
def on_link_opened(self, event):
self._ready.set()
+def on_link_closing(self, event):
+event.link.close()
+if self._recover_link and not self._stop_thread:
+# lesson learned: the generated link name will be the same as the
+# old link (which is bad) so we specify a new one
+self._recover_count += 1
+kwargs = {'source': self.source,
+ 'name': "%s:%s" % (event.link.name, self._recover_count)}
+rcv = event.container.create_receiver(event.connection,
+ **kwargs)
+
def on_message(self, event):
self.queue.put(event.message)
@@ -787,8 +802,8 @@ class AsyncTestSender(MessagingHandler):
self._unaccepted = count
self._body = body or "test"
self._container = Container(self)
-if container_id is not None:
-self._container.container_id = container_id
+
[qpid-jms] branch master updated: QPIDJMS-440 Update Netty to 4.1.32.Final
This is an automated email from the ASF dual-hosted git repository. tabish pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-jms.git The following commit(s) were added to refs/heads/master by this push: new 048102b QPIDJMS-440 Update Netty to 4.1.32.Final 048102b is described below commit 048102b1a7b7f5878178f99c80303271d3c4be18 Author: Timothy Bish AuthorDate: Fri Dec 14 12:25:41 2018 -0500 QPIDJMS-440 Update Netty to 4.1.32.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 460358a..30cb8e3 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ 0.31.0 -4.1.31.Final +4.1.32.Final 1.7.25 1.0-alpha-2 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1848931 - /qpid/trunk/README.md
Author: robbie Date: Fri Dec 14 11:59:24 2018 New Revision: 1848931 URL: http://svn.apache.org/viewvc?rev=1848931&view=rev Log: NO-JIRA: update links to reflect new ASF repo locations following migration to gitbox Modified: qpid/trunk/README.md Modified: qpid/trunk/README.md URL: http://svn.apache.org/viewvc/qpid/trunk/README.md?rev=1848931&r1=1848930&r2=1848931&view=diff == --- qpid/trunk/README.md (original) +++ qpid/trunk/README.md Fri Dec 14 11:59:24 2018 @@ -1,12 +1,12 @@ We have moved to using individual Git repositories for the Apache Qpid components and you should look to those for new development. This Subversion repository and its Git mirrors now exists mainly for historic reference and some remaining miscellaneous items. -* Qpid Broker-J [[Apache](https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git)] [[GitHub mirror](https://github.com/apache/qpid-broker-j)] -* Qpid CPP [[Apache](https://git-wip-us.apache.org/repos/asf/qpid-cpp.git)] [[GitHub mirror](https://github.com/apache/qpid-cpp)] -* Qpid Dispatch [[Apache](https://git-wip-us.apache.org/repos/asf/qpid-dispatch.git)] [[GitHub mirror](https://github.com/apache/qpid-dispatch)] -* Qpid JMS [[Apache](https://git-wip-us.apache.org/repos/asf/qpid-jms.git)] [[GitHub mirror](https://github.com/apache/qpid-jms)] -* Qpid JMS AMQP 0-x [[Apache](https://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x.git)] [[GitHub mirror](https://github.com/apache/qpid-jms-amqp-0-x)] -* Qpid Proton [[Apache](https://git-wip-us.apache.org/repos/asf/qpid-proton.git)] [[GitHub mirror](https://github.com/apache/qpid-proton)] -* Qpid Proton-J [[Apache](https://git-wip-us.apache.org/repos/asf/qpid-proton-j.git)] [[GitHub mirror](https://github.com/apache/qpid-proton-j)] -* Qpid Python [[Apache](https://git-wip-us.apache.org/repos/asf/qpid-python.git)] [[GitHub mirror](https://github.com/apache/qpid-python)] -* Qpid Interop Test[[Apache](https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git)] [[GitHub mirror](https://github.com/apache/qpid-interop-test)] -* Qpid Site [[Apache](https://git-wip-us.apache.org/repos/asf/qpid-site.git)] [[GitHub mirror](https://github.com/apache/qpid-site)] +* Qpid Broker-J [[Apache](https://gitbox.apache.org/repos/asf/qpid-broker-j.git)] [[GitHub mirror](https://github.com/apache/qpid-broker-j)] +* Qpid CPP [[Apache](https://gitbox.apache.org/repos/asf/qpid-cpp.git)] [[GitHub mirror](https://github.com/apache/qpid-cpp)] +* Qpid Dispatch [[Apache](https://gitbox.apache.org/repos/asf/qpid-dispatch.git)] [[GitHub mirror](https://github.com/apache/qpid-dispatch)] +* Qpid JMS [[Apache](https://gitbox.apache.org/repos/asf/qpid-jms.git)] [[GitHub mirror](https://github.com/apache/qpid-jms)] +* Qpid JMS AMQP 0-x [[Apache](https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git)] [[GitHub mirror](https://github.com/apache/qpid-jms-amqp-0-x)] +* Qpid Proton [[Apache](https://gitbox.apache.org/repos/asf/qpid-proton.git)] [[GitHub mirror](https://github.com/apache/qpid-proton)] +* Qpid Proton-J [[Apache](https://gitbox.apache.org/repos/asf/qpid-proton-j.git)] [[GitHub mirror](https://github.com/apache/qpid-proton-j)] +* Qpid Python [[Apache](https://gitbox.apache.org/repos/asf/qpid-python.git)] [[GitHub mirror](https://github.com/apache/qpid-python)] +* Qpid Interop Test [[Apache](https://gitbox.apache.org/repos/asf/qpid-interop-test.git)] [[GitHub mirror](https://github.com/apache/qpid-interop-test)] +* Qpid Site [[Apache](https://gitbox.apache.org/repos/asf/qpid-site.git)] [[GitHub mirror](https://github.com/apache/qpid-site)] - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch master updated: NO-JIRA: update links/metadata to reflect new qpid-dispatch repo location
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new a9006d5 NO-JIRA: update links/metadata to reflect new qpid-dispatch
repo location
a9006d5 is described below
commit a9006d592193ce21873f82c90e48eb6c3fd8abc7
Author: Robbie Gemmell
AuthorDate: Fri Dec 14 11:49:00 2018 +
NO-JIRA: update links/metadata to reflect new qpid-dispatch repo location
---
.travis.yml| 2 +-
console/hawtio/pom.xml | 6 +++---
dockerfiles/Dockerfile-fedora | 4 ++--
dockerfiles/Dockerfile-ubuntu | 2 +-
docs/books/_common/attributes.adoc | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 586f06b..fc6b844 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ addons:
install:
- PREFIX=$PWD/install
-- git submodule add https://git-wip-us.apache.org/repos/asf/qpid-proton.git
+- git submodule add https://gitbox.apache.org/repos/asf/qpid-proton.git
- git submodule update --init
# Build and install latest proton from source.
diff --git a/console/hawtio/pom.xml b/console/hawtio/pom.xml
index 1c06a61..7316f34 100644
--- a/console/hawtio/pom.xml
+++ b/console/hawtio/pom.xml
@@ -39,9 +39,9 @@
-
scm:git:http://git-wip-us.apache.org/repos/asf/qpid-dispatch.git
-
scm:git:https://git-wip-us.apache.org/repos/asf/qpid-dispatch.git
-https://git-wip-us.apache.org/repos/asf?p=qpid-dispatch.git
+
scm:git:http://gitbox.apache.org/repos/asf/qpid-dispatch.git
+
scm:git:https://gitbox.apache.org/repos/asf/qpid-dispatch.git
+https://gitbox.apache.org/repos/asf?p=qpid-dispatch.git
diff --git a/dockerfiles/Dockerfile-fedora b/dockerfiles/Dockerfile-fedora
index 2f23e75..51e450f 100644
--- a/dockerfiles/Dockerfile-fedora
+++ b/dockerfiles/Dockerfile-fedora
@@ -33,7 +33,7 @@ MAINTAINER "d...@qpid.apache.org"
RUN dnf -y install gcc cmake libuuid-devel openssl-devel cyrus-sasl-devel
cyrus-sasl-plain cyrus-sasl-gssapi cyrus-sasl-md5 swig python-devel
java-1.8.0-openjdk-devel git make doxygen valgrind emacs libuv libuv-devel
libwebsockets-devel python-unittest2 && dnf clean all -y
# Create a main directory and clone the qpid-proton repo from github
-RUN mkdir /main && cd /main && git clone
https://git-wip-us.apache.org/repos/asf/qpid-proton.git && cd
/main/qpid-proton && mkdir /main/qpid-proton/build
+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/qpid-proton/build
@@ -41,7 +41,7 @@ WORKDIR /main/qpid-proton/build
RUN cmake .. -DSYSINSTALL_BINDINGS=ON -DCMAKE_INSTALL_PREFIX=/usr
-DSYSINSTALL_PYTHON=ON && make install
# Clone the qpid-dispatch git repo
-RUN cd /main && git clone
https://git-wip-us.apache.org/repos/asf/qpid-dispatch.git && mkdir
/main/qpid-dispatch/build
+RUN cd /main && git clone
https://gitbox.apache.org/repos/asf/qpid-dispatch.git && mkdir
/main/qpid-dispatch/build
WORKDIR /main/qpid-dispatch/build
RUN cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make install
diff --git a/dockerfiles/Dockerfile-ubuntu b/dockerfiles/Dockerfile-ubuntu
index efe0ff9..e932045 100644
--- a/dockerfiles/Dockerfile-ubuntu
+++ b/dockerfiles/Dockerfile-ubuntu
@@ -29,7 +29,7 @@ RUN apt-get update && \
apt-get install -y automake libtool cmake libsasl2-dev libssl-dev python
python-dev libuv1-dev sasl2-bin swig maven git python-unittest2 && \
apt-get -y clean
-RUN git clone https://git-wip-us.apache.org/repos/asf/qpid-dispatch.git && cd
/qpid-dispatch && git submodule add -b v2.1-stable
https://github.com/warmcat/libwebsockets && git submodule add
https://git-wip-us.apache.org/repos/asf/qpid-proton.git && git submodule update
--init
+RUN git clone https://gitbox.apache.org/repos/asf/qpid-dispatch.git && cd
/qpid-dispatch && git submodule add -b v2.1-stable
https://github.com/warmcat/libwebsockets && git submodule add
https://gitbox.apache.org/repos/asf/qpid-proton.git && git submodule update
--init
WORKDIR /qpid-dispatch
diff --git a/docs/books/_common/attributes.adoc
b/docs/books/_common/attributes.adoc
index 01e6f3f..37caae5 100644
--- a/docs/books/_common/attributes.adoc
+++ b/docs/books/_common/attributes.adoc
@@ -76,7 +76,7 @@ under the License
:qdstatManPageUrl: {DispatchRouterUrlBase}/man/qdstat.html
:qdstatManPageLink: link:{qdstatManPageUrl}[qdstat man page^]
-:QpidDispatchReadmeUrl:
https://git-wip-us.apache.org/repos/asf?p=qpid-dispatch.git;a=blob_plain;f=README;hb={DispatchRouterVersion}
+:QpidDispatchReadmeUrl:
https://gitbox.apache.org/repos/asf?p=qpid-dispatch.git;a=blob_plain;f=README;hb={DispatchRouterVersion}
:QpidDispatchReadmeLink: link:{QpidDispatchReadmeUrl}[Qpid Dispatch README^]
:ClientAmqpPythonUrl: https://
[qpid-jms-amqp-0-x] branch 6.3.x updated: NO-JIRA: update pom.xml scm details to reflect new qpid-jms-amqp-0-x repo location
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch 6.3.x in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git The following commit(s) were added to refs/heads/6.3.x by this push: new 147d2e0 NO-JIRA: update pom.xml scm details to reflect new qpid-jms-amqp-0-x repo location 147d2e0 is described below commit 147d2e05c092e973a87481f566e59e7c028fac38 Author: Robbie Gemmell AuthorDate: Fri Dec 14 11:32:49 2018 + NO-JIRA: update pom.xml scm details to reflect new qpid-jms-amqp-0-x repo location (cherry picked from commit 724f205e17e31ed0c4a3dc8f97c69aa7f7edb711) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 39e4b0c..ede2466 100644 --- a/pom.xml +++ b/pom.xml @@ -62,9 +62,9 @@ - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x.git - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x.git -https://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git +https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git 6.3.x - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-jms-amqp-0-x] branch master updated: NO-JIRA: update pom.xml scm details to reflect new qpid-jms-amqp-0-x repo location
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git The following commit(s) were added to refs/heads/master by this push: new 724f205 NO-JIRA: update pom.xml scm details to reflect new qpid-jms-amqp-0-x repo location 724f205 is described below commit 724f205e17e31ed0c4a3dc8f97c69aa7f7edb711 Author: Robbie Gemmell AuthorDate: Fri Dec 14 11:26:27 2018 + NO-JIRA: update pom.xml scm details to reflect new qpid-jms-amqp-0-x repo location --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0bc3c55..3b4ec9f 100644 --- a/pom.xml +++ b/pom.xml @@ -62,9 +62,9 @@ - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x.git - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x.git -https://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git +https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git HEAD - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-interop-test] branch master updated: NO-JIRA: update repo location links/metadata
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git The following commit(s) were added to refs/heads/master by this push: new 153441f NO-JIRA: update repo location links/metadata 153441f is described below commit 153441f9af7215502c4af0fd379bb489c559d363 Author: Robbie Gemmell AuthorDate: Fri Dec 14 11:17:59 2018 + NO-JIRA: update repo location links/metadata --- QUICKSTART.md | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/QUICKSTART.md b/QUICKSTART.md index 4143754..95e9e18 100644 --- a/QUICKSTART.md +++ b/QUICKSTART.md @@ -248,7 +248,7 @@ sudo make install If you are a developer working on changes to qpid-interop-test itself, the source repository can be cloned from git as follows: -git clone https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git +git clone https://gitbox.apache.org/repos/asf/qpid-interop-test.git or diff --git a/pom.xml b/pom.xml index beac4a9..b3ef087 100644 --- a/pom.xml +++ b/pom.xml @@ -40,9 +40,9 @@ - scm:git:http://git-wip-us.apache.org/repos/asf/qpid-interop-test.git - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git -https://git-wip-us.apache.org/repos/asf?p=qpid-interop-test.git + scm:git:http://gitbox.apache.org/repos/asf/qpid-interop-test.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-interop-test.git +https://gitbox.apache.org/repos/asf?p=qpid-interop-test.git - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-python] branch master updated: NO-JIRA: trivial readme change, testing out repo and github mirror following git-wip-us to gitbox migration
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-python.git The following commit(s) were added to refs/heads/master by this push: new aeca885 NO-JIRA: trivial readme change, testing out repo and github mirror following git-wip-us to gitbox migration aeca885 is described below commit aeca8854945c4ba2a76355a3c79767a4cd7f6b04 Author: Robbie Gemmell AuthorDate: Fri Dec 14 11:13:10 2018 + NO-JIRA: trivial readme change, testing out repo and github mirror following git-wip-us to gitbox migration --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 168fdc4..d8e71c5 100644 --- a/README.md +++ b/README.md @@ -83,3 +83,4 @@ Other Qpid components depend on Qpid Python for testing. You can use # System-wide install $ sudo python setup.py install + - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] branch master updated: PROTON-830: trivial README change, testing JIRA commit notifications and GitHub mirror after git-wip-us to gitbox migration, ignore.
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-proton.git The following commit(s) were added to refs/heads/master by this push: new a2aa764 PROTON-830: trivial README change, testing JIRA commit notifications and GitHub mirror after git-wip-us to gitbox migration, ignore. a2aa764 is described below commit a2aa7642c2cb7803337af26c0bf7647cf01b602c Author: Robbie Gemmell AuthorDate: Fri Dec 14 11:05:50 2018 + PROTON-830: trivial README change, testing JIRA commit notifications and GitHub mirror after git-wip-us to gitbox migration, ignore. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f85d1c..2c445f3 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Features - Full control of AMQP 1.0 protocol semantics - Portable C implementation with bindings to popular languages - Peer-to-peer and brokered messaging - - Secure communication via SSL and SASL + - Secure communication via SSL/TLS and SASL Universal - Proton is designed to scale both up and down. Equally suitable for simple clients or high-powered servers, it can be deployed in simple - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-cpp] branch master updated: NO-JIRA: update repository details and overview text
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-cpp.git The following commit(s) were added to refs/heads/master by this push: new 6635215 NO-JIRA: update repository details and overview text 6635215 is described below commit 6635215b6b4788b29270cd32c3a87672c87d7d17 Author: Robbie Gemmell AuthorDate: Fri Dec 14 10:47:01 2018 + NO-JIRA: update repository details and overview text --- INSTALL.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index b69e14d..3090a71 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -165,9 +165,10 @@ Qpid test suite. 3. Building a Repository Working Copy = -To get the source code from the subversion repository (trunk) do: +Developers interested in building master, e.g to test ahead of release, can +get the source code from the git repository using: - # git clone https://git-wip-us.apache.org/repos/asf/qpid-cpp.git + # git clone https://gitbox.apache.org/repos/asf/qpid-cpp.git To build, cd to the new qpid-cpp directory and then follow the instructions for building from a Source Distribution in step (2). - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-jms] branch master updated: NO-JIRA: update pom.xml scm details to reflect new qpid-jms repo location
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-jms.git The following commit(s) were added to refs/heads/master by this push: new b885b6c NO-JIRA: update pom.xml scm details to reflect new qpid-jms repo location b885b6c is described below commit b885b6cd4bc7df24a44decbe10cf94a3b7725eaa Author: Robbie Gemmell AuthorDate: Fri Dec 14 10:33:27 2018 + NO-JIRA: update pom.xml scm details to reflect new qpid-jms repo location --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5e903fe..460358a 100644 --- a/pom.xml +++ b/pom.xml @@ -81,9 +81,9 @@ - scm:git:http://git-wip-us.apache.org/repos/asf/qpid-jms.git - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-jms.git -https://git-wip-us.apache.org/repos/asf?p=qpid-jms.git + scm:git:http://gitbox.apache.org/repos/asf/qpid-jms.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-jms.git +https://gitbox.apache.org/repos/asf?p=qpid-jms.git HEAD - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton-j] branch master updated: NO-JIRA: update pom.xml scm details to reflect new repo location
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-proton-j.git The following commit(s) were added to refs/heads/master by this push: new ca89dc4 NO-JIRA: update pom.xml scm details to reflect new repo location ca89dc4 is described below commit ca89dc4e25351142eb5c5146c69b551ca58353ba Author: Robbie Gemmell AuthorDate: Fri Dec 14 10:29:25 2018 + NO-JIRA: update pom.xml scm details to reflect new repo location --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0c0ac28..2caf7a7 100644 --- a/pom.xml +++ b/pom.xml @@ -192,9 +192,9 @@ http://qpid.apache.org/proton - scm:git:http://git-wip-us.apache.org/repos/asf/qpid-proton-j.git - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-proton-j.git -https://git-wip-us.apache.org/repos/asf?p=qpid-proton-j.git + scm:git:http://gitbox.apache.org/repos/asf/qpid-proton-j.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-proton-j.git +https://gitbox.apache.org/repos/asf?p=qpid-proton-j.git HEAD - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 7.0.x updated: NO-JIRA: update pom.xml scm details to reflect new repo location
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/7.0.x by this push: new 955c733 NO-JIRA: update pom.xml scm details to reflect new repo location 955c733 is described below commit 955c7331ab3c8dc04b581d87ea1e4c5329338fd8 Author: Robbie Gemmell AuthorDate: Fri Dec 14 09:52:36 2018 + NO-JIRA: update pom.xml scm details to reflect new repo location (cherry picked from commit dc4ed694cc6dd90a036d8506e690a06589644cc8) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 13f57da..2803be1 100644 --- a/pom.xml +++ b/pom.xml @@ -62,9 +62,9 @@ - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git -https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-broker-j.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-broker-j.git +https://gitbox.apache.org/repos/asf/qpid-broker-j.git 7.0.x - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 6.1.x updated: NO-JIRA: update pom.xml scm details to reflect new repo location
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch 6.1.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/6.1.x by this push: new 2d61d31 NO-JIRA: update pom.xml scm details to reflect new repo location 2d61d31 is described below commit 2d61d31f461674283d5948a27b76862da42680ae Author: Robbie Gemmell AuthorDate: Fri Dec 14 09:52:36 2018 + NO-JIRA: update pom.xml scm details to reflect new repo location (cherry picked from commit dc4ed694cc6dd90a036d8506e690a06589644cc8) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2d1d893..7da3e40 100644 --- a/pom.xml +++ b/pom.xml @@ -62,9 +62,9 @@ - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git -https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-broker-j.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-broker-j.git +https://gitbox.apache.org/repos/asf/qpid-broker-j.git HEAD - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 6.0.x updated: NO-JIRA: update pom.xml scm details to reflect new repo location
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch 6.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/6.0.x by this push: new a56384b NO-JIRA: update pom.xml scm details to reflect new repo location a56384b is described below commit a56384bd9315dcd5d27cd0189cac170c781a9f80 Author: Robbie Gemmell AuthorDate: Fri Dec 14 09:52:36 2018 + NO-JIRA: update pom.xml scm details to reflect new repo location (cherry picked from commit dc4ed694cc6dd90a036d8506e690a06589644cc8) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8a5628b..9e37474 100644 --- a/pom.xml +++ b/pom.xml @@ -62,9 +62,9 @@ - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git -https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-broker-j.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-broker-j.git +https://gitbox.apache.org/repos/asf/qpid-broker-j.git HEAD - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch master updated: NO-JIRA: update pom.xml scm details to reflect new repo location
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/master by this push: new dc4ed69 NO-JIRA: update pom.xml scm details to reflect new repo location dc4ed69 is described below commit dc4ed694cc6dd90a036d8506e690a06589644cc8 Author: Robbie Gemmell AuthorDate: Fri Dec 14 09:52:36 2018 + NO-JIRA: update pom.xml scm details to reflect new repo location --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6fcbc34..518d9b8 100644 --- a/pom.xml +++ b/pom.xml @@ -62,9 +62,9 @@ - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git - scm:git:https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git -https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-broker-j.git + scm:git:https://gitbox.apache.org/repos/asf/qpid-broker-j.git +https://gitbox.apache.org/repos/asf/qpid-broker-j.git 7.0.x - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
