[qpid-proton] branch 0.27.x updated: PROTON-2018: Don't use a fixed port for the ssl proactor test
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch 0.27.x
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/0.27.x by this push:
new 560ba28 PROTON-2018: Don't use a fixed port for the ssl proactor test
560ba28 is described below
commit 560ba28223a6e815f9673e89baeaa4630b8b22fe
Author: Andrew Stitcher
AuthorDate: Fri Apr 12 16:56:57 2019 -0400
PROTON-2018: Don't use a fixed port for the ssl proactor test
(cherry picked with changes from commit
be0b0c277d5cdeeb2e7430b40d1b370b4d1425c9)
---
c/tests/ssl_proactor_test.cpp | 36
1 file changed, 32 insertions(+), 4 deletions(-)
diff --git a/c/tests/ssl_proactor_test.cpp b/c/tests/ssl_proactor_test.cpp
index c9eafc7..7ae89d8 100644
--- a/c/tests/ssl_proactor_test.cpp
+++ b/c/tests/ssl_proactor_test.cpp
@@ -164,6 +164,36 @@ void run(pn_proactor_t *p, app_data_t *app, handler_t
*shandler, handler_t *chan
} while(true);
}
+static void run_until_listener_open(pn_proactor_t* p) {
+ do {
+pn_event_batch_t *events = pn_proactor_wait(p);
+pn_event_t *e;
+for (e = pn_event_batch_next(events); e; e = pn_event_batch_next(events)) {
+ if (pn_event_type(e)==PN_LISTENER_OPEN) {
+pn_proactor_done(p, events);
+return;
+ }
+}
+pn_proactor_done(p, events);
+ } while (true);
+}
+
+static void setup_connection(pn_proactor_t* proactor, pn_transport_t* t) {
+ pn_listener_t* l = pn_listener();
+ pn_proactor_listen(proactor, l, ":0", 16);
+ // Don't know port until the listener is open
+ run_until_listener_open(proactor);
+
+ // Construct connect address (from listener port)
+ const pn_netaddr_t* a = pn_listener_addr(l);
+ char port[32];
+ port[0] = ':';
+ pn_netaddr_host_port(a, NULL, 0, port+1, 31);
+
+ INFO("Connecting to " << port);
+ pn_proactor_connect2(proactor, NULL, t, port);
+}
+
TEST_CASE("ssl") {
struct app_data_t app = {0};
@@ -187,8 +217,7 @@ TEST_CASE("ssl") {
REQUIRE(pn_ssl_domain_set_peer_authentication(cd, PN_SSL_VERIFY_PEER_NAME,
NULL) == 0);
REQUIRE(pn_ssl_init(pn_ssl(t), cd, NULL) == 0);
-pn_proactor_listen(proactor, pn_listener(), "", 16);
-pn_proactor_connect2(proactor, NULL, t, "");
+setup_connection(proactor, t);
run(proactor, , server_handler, client_handler);
CHECK(app.connection_succeeded==false);
@@ -200,8 +229,7 @@ TEST_CASE("ssl") {
REQUIRE(pn_ssl_domain_set_peer_authentication(cd, PN_SSL_ANONYMOUS_PEER,
NULL) == 0);
REQUIRE(pn_ssl_init(pn_ssl(t), cd, NULL) == 0);
-pn_proactor_listen(proactor, pn_listener(), "", 16);
-pn_proactor_connect2(proactor, NULL, t, "");
+setup_connection(proactor, t);
run(proactor, , server_handler, client_handler);
CHECK(app.connection_succeeded==true);
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] 01/02: PROTON-2018: Don't use a fixed port for the ssl proactor test
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
commit be0b0c277d5cdeeb2e7430b40d1b370b4d1425c9
Author: Andrew Stitcher
AuthorDate: Fri Apr 12 16:56:57 2019 -0400
PROTON-2018: Don't use a fixed port for the ssl proactor test
---
c/tests/ssl_proactor_test.cpp | 54 ++-
1 file changed, 38 insertions(+), 16 deletions(-)
diff --git a/c/tests/ssl_proactor_test.cpp b/c/tests/ssl_proactor_test.cpp
index 559d984..09e3031 100644
--- a/c/tests/ssl_proactor_test.cpp
+++ b/c/tests/ssl_proactor_test.cpp
@@ -162,6 +162,36 @@ void run(pn_proactor_t *p, app_data_t *app, handler_t
*shandler, handler_t *chan
} while(true);
}
+static void run_until_listener_open(pn_proactor_t* p) {
+ do {
+pn_event_batch_t *events = pn_proactor_wait(p);
+pn_event_t *e;
+for (e = pn_event_batch_next(events); e; e = pn_event_batch_next(events)) {
+ if (pn_event_type(e)==PN_LISTENER_OPEN) {
+pn_proactor_done(p, events);
+return;
+ }
+}
+pn_proactor_done(p, events);
+ } while (true);
+}
+
+static void setup_connection(pn_proactor_t* proactor, pn_transport_t* t) {
+ pn_listener_t* l = pn_listener();
+ pn_proactor_listen(proactor, l, ":0", 16);
+ // Don't know port until the listener is open
+ run_until_listener_open(proactor);
+
+ // Construct connect address (from listener port)
+ const pn_netaddr_t* a = pn_listener_addr(l);
+ char port[32];
+ port[0] = ':';
+ pn_netaddr_host_port(a, NULL, 0, port+1, 31);
+
+ INFO("Connecting to " << port);
+ pn_proactor_connect2(proactor, NULL, t, port);
+}
+
TEST_CASE("ssl certificate verification tests") {
struct app_data_t app = {0};
@@ -185,8 +215,7 @@ TEST_CASE("ssl certificate verification tests") {
REQUIRE(pn_ssl_init(pn_ssl(t), NULL, NULL) == 0);
REQUIRE(pn_ssl_set_peer_hostname(pn_ssl(t), "test_server") == 0);
-pn_proactor_listen(proactor, pn_listener(), "", 16);
-pn_proactor_connect2(proactor, NULL, t, "");
+setup_connection(proactor, t);
run(proactor, , server_handler, client_handler);
CHECK(app.connection_succeeded==false);
@@ -199,8 +228,7 @@ TEST_CASE("ssl certificate verification tests") {
REQUIRE(pn_ssl_domain_set_peer_authentication(cd, PN_SSL_VERIFY_PEER,
NULL) == 0);
REQUIRE(pn_ssl_init(pn_ssl(t), cd, NULL) == 0);
-pn_proactor_listen(proactor, pn_listener(), "", 16);
-pn_proactor_connect2(proactor, NULL, t, "");
+setup_connection(proactor, t);
run(proactor, , server_handler, client_handler);
CHECK(app.connection_succeeded==true);
@@ -212,8 +240,7 @@ TEST_CASE("ssl certificate verification tests") {
REQUIRE(pn_ssl_domain_set_peer_authentication(cd, PN_SSL_VERIFY_PEER,
NULL) == 0);
REQUIRE(pn_ssl_init(pn_ssl(t), cd, NULL) == 0);
-pn_proactor_listen(proactor, pn_listener(), "", 16);
-pn_proactor_connect2(proactor, NULL, t, "");
+setup_connection(proactor, t);
run(proactor, , server_handler, client_handler);
CHECK(app.connection_succeeded==false);
@@ -227,8 +254,7 @@ TEST_CASE("ssl certificate verification tests") {
REQUIRE(pn_ssl_init(pn_ssl(t), cd, NULL) == 0);
REQUIRE(pn_ssl_set_peer_hostname(pn_ssl(t), "test_server") == 0);
-pn_proactor_listen(proactor, pn_listener(), "", 16);
-pn_proactor_connect2(proactor, NULL, t, "");
+setup_connection(proactor, t);
run(proactor, , server_handler, client_handler);
CHECK(app.connection_succeeded==true);
@@ -240,8 +266,7 @@ TEST_CASE("ssl certificate verification tests") {
REQUIRE(pn_ssl_domain_set_peer_authentication(cd, PN_SSL_VERIFY_PEER_NAME,
NULL) == 0);
REQUIRE(pn_ssl_init(pn_ssl(t), cd, NULL) == 0);
-pn_proactor_listen(proactor, pn_listener(), "", 16);
-pn_proactor_connect2(proactor, NULL, t, "");
+setup_connection(proactor, t);
run(proactor, , server_handler, client_handler);
CHECK(app.connection_succeeded==false);
@@ -253,8 +278,7 @@ TEST_CASE("ssl certificate verification tests") {
REQUIRE(pn_ssl_domain_set_peer_authentication(cd, PN_SSL_ANONYMOUS_PEER,
NULL) == 0);
REQUIRE(pn_ssl_init(pn_ssl(t), cd, NULL) == 0);
-pn_proactor_listen(proactor, pn_listener(), "", 16);
-pn_proactor_connect2(proactor, NULL, t, "");
+setup_connection(proactor, t);
run(proactor, , server_handler, client_handler);
CHECK(app.connection_succeeded==true);
@@ -268,8 +292,7 @@ TEST_CASE("ssl certificate verification tests") {
app.server_ssl_domain = 0;
REQUIRE(pn_ssl_init(pn_ssl(t), NULL, NULL) == 0);
-pn_proactor_listen(proactor, pn_listener(), "", 16);
-pn_proactor_connect2(proactor, NULL, t, "");
+setup_connection(proactor, t);
run(proactor, , server_handler, client_handler);
CHECK(app.connection_succeeded==false);
@@ -282,8 +305,7 @@ TEST_CASE("ssl certificate verification
[qpid-proton] branch master updated (5b6ed8e -> 9ff0a64)
This is an automated email from the ASF dual-hosted git repository. astitcher pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/qpid-proton.git. from 5b6ed8e PROTON-2027: use make_work instead of lambda for wider platform coverage new be0b0c2 PROTON-2018: Don't use a fixed port for the ssl proactor test new 9ff0a64 NO-JIRA: Don't fail Azure MacOS build if brew upgrade fails 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: azure-pipelines/azure-pipelines.yml | 2 +- c/tests/ssl_proactor_test.cpp | 54 ++--- 2 files changed, 39 insertions(+), 17 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] 02/02: NO-JIRA: Don't fail Azure MacOS build if brew upgrade fails
This is an automated email from the ASF dual-hosted git repository. astitcher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-proton.git commit 9ff0a644032f26159862cc9441df59ffa4b3462f Author: Andrew Stitcher AuthorDate: Fri Apr 12 17:23:29 2019 -0400 NO-JIRA: Don't fail Azure MacOS build if brew upgrade fails --- azure-pipelines/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/azure-pipelines.yml b/azure-pipelines/azure-pipelines.yml index fd50140..b34dfe8 100644 --- a/azure-pipelines/azure-pipelines.yml +++ b/azure-pipelines/azure-pipelines.yml @@ -48,6 +48,6 @@ jobs: - script: | brew update brew install libuv swig pkgconfig openssl@1.1 jsoncpp - brew upgrade python@3 python@2 + brew upgrade python@3 python@2 || true name: InstallExtraStuff - template: steps.yml - 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 - Advanced version to 1.8.0-SNAPSHOT
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 d3115d7 NO-JIRA - Advanced version to 1.8.0-SNAPSHOT d3115d7 is described below commit d3115d71e33a7a6a7de8ee45b63ead8d08da59e2 Author: Ganesh Murthy AuthorDate: Fri Apr 12 14:44:57 2019 -0400 NO-JIRA - Advanced version to 1.8.0-SNAPSHOT --- VERSION.txt| 2 +- console/hawtio/pom.xml | 2 +- pom.xml| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index bd8bf88..c4954f2 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.7.0 +1.8.0-SNAPSHOT diff --git a/console/hawtio/pom.xml b/console/hawtio/pom.xml index 6aaf69f..e875b9c 100644 --- a/console/hawtio/pom.xml +++ b/console/hawtio/pom.xml @@ -24,7 +24,7 @@ org.apache.qpid dispatch-hawtio-console - 1.7.0 + 1.8.0-SNAPSHOT war 2018 https://qpid.apache.org diff --git a/pom.xml b/pom.xml index 23f4ebc..755008d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.apache.qpid qpid-dispatch -1.7.0 +1.8.0-SNAPSHOT QpidDispatch 2018 https://qpid.apache.org - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] tag 1.7.0-rc1 created (now a1d8fe1)
This is an automated email from the ASF dual-hosted git repository. gmurthy pushed a change to tag 1.7.0-rc1 in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git. at a1d8fe1 (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
svn commit: r33601 - in /dev/qpid/dispatch/1.7.0-rc1: ./ qpid-dispatch-1.7.0.tar.gz qpid-dispatch-1.7.0.tar.gz.asc qpid-dispatch-1.7.0.tar.gz.sha512
Author: gmurthy Date: Fri Apr 12 18:26:57 2019 New Revision: 33601 Log: Adding files for Qpid Dispatch 1.7.0-rc1 Added: dev/qpid/dispatch/1.7.0-rc1/ dev/qpid/dispatch/1.7.0-rc1/qpid-dispatch-1.7.0.tar.gz (with props) dev/qpid/dispatch/1.7.0-rc1/qpid-dispatch-1.7.0.tar.gz.asc (with props) dev/qpid/dispatch/1.7.0-rc1/qpid-dispatch-1.7.0.tar.gz.sha512 Added: dev/qpid/dispatch/1.7.0-rc1/qpid-dispatch-1.7.0.tar.gz == Binary file - no diff available. Propchange: dev/qpid/dispatch/1.7.0-rc1/qpid-dispatch-1.7.0.tar.gz -- svn:mime-type = application/x-gzip Added: dev/qpid/dispatch/1.7.0-rc1/qpid-dispatch-1.7.0.tar.gz.asc == Binary file - no diff available. Propchange: dev/qpid/dispatch/1.7.0-rc1/qpid-dispatch-1.7.0.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/qpid/dispatch/1.7.0-rc1/qpid-dispatch-1.7.0.tar.gz.sha512 == --- dev/qpid/dispatch/1.7.0-rc1/qpid-dispatch-1.7.0.tar.gz.sha512 (added) +++ dev/qpid/dispatch/1.7.0-rc1/qpid-dispatch-1.7.0.tar.gz.sha512 Fri Apr 12 18:26:57 2019 @@ -0,0 +1 @@ +0b34fceae2f4166ee4d80db15b480d869e01775055e6d5825d5bfce2ee03fe2e0d0fe6423bea2fd45d4e4a9a5ea66da7402982a118f45845001b51d3d771e8b5 qpid-dispatch-1.7.0.tar.gz - 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 - Set version to 1.7.0
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 a1d8fe1 NO-JIRA - Set version to 1.7.0 a1d8fe1 is described below commit a1d8fe1b5e9af357ad167f8182cf12b7d90d6725 Author: Ganesh Murthy AuthorDate: Fri Apr 12 14:06:46 2019 -0400 NO-JIRA - Set version to 1.7.0 --- VERSION.txt| 2 +- console/hawtio/pom.xml | 2 +- pom.xml| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 820fb8d..bd8bf88 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.7.0-SNAPSHOT +1.7.0 diff --git a/console/hawtio/pom.xml b/console/hawtio/pom.xml index 9064be5..6aaf69f 100644 --- a/console/hawtio/pom.xml +++ b/console/hawtio/pom.xml @@ -24,7 +24,7 @@ org.apache.qpid dispatch-hawtio-console - 1.7.0-SNAPSHOT + 1.7.0 war 2018 https://qpid.apache.org diff --git a/pom.xml b/pom.xml index e1ca075..23f4ebc 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.apache.qpid qpid-dispatch -1.7.0-SNAPSHOT +1.7.0 QpidDispatch 2018 https://qpid.apache.org - 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-1320 - Reverted two more files
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 926da78 DISPATCH-1320 - Reverted two more files
926da78 is described below
commit 926da78ebf01132ad374697391362eb7f709a5e8
Author: Ganesh Murthy
AuthorDate: Fri Apr 12 13:57:12 2019 -0400
DISPATCH-1320 - Reverted two more files
---
console/stand-alone/index.html | 4 +++-
console/stand-alone/plugin/css/dispatch.css | 1 -
console/stand-alone/plugin/js/qdrGlobals.js | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index d836b54..d69f924 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -55,7 +55,9 @@ under the License.
-
+
+ Apache Qpid Dispatch Console
+
diff --git a/console/stand-alone/plugin/css/dispatch.css
b/console/stand-alone/plugin/css/dispatch.css
index 73811dd..2a7472a 100644
--- a/console/stand-alone/plugin/css/dispatch.css
+++ b/console/stand-alone/plugin/css/dispatch.css
@@ -2105,7 +2105,6 @@ svg {
.masthead-icons {
position: absolute;
right: 1em;
-top: 0;
color: white;
padding-top: 5px;
font-size: large;
diff --git a/console/stand-alone/plugin/js/qdrGlobals.js
b/console/stand-alone/plugin/js/qdrGlobals.js
index fa21d13..42f5ee3 100644
--- a/console/stand-alone/plugin/js/qdrGlobals.js
+++ b/console/stand-alone/plugin/js/qdrGlobals.js
@@ -52,7 +52,6 @@ export const QDRTemplatePath = 'html/';
export const QDR_SETTINGS_KEY = 'QDRSettings';
export const QDR_LAST_LOCATION = 'QDRLastLocation';
export const QDR_INTERVAL = 'QDRInterval';
-export const STAND_ALONE = true;
export var QDRRedirectWhenConnected = function ($location, org) {
$location.path('/connect');
-
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-1319 - Coverity fixes
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 bce3ac6 DISPATCH-1319 - Coverity fixes bce3ac6 is described below commit bce3ac6f3e88092556e8004fe41494d21bc60de4 Author: Ganesh Murthy AuthorDate: Fri Apr 12 12:05:52 2019 -0400 DISPATCH-1319 - Coverity fixes --- src/container.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/container.c b/src/container.c index 22a4286..3b28eda 100644 --- a/src/container.c +++ b/src/container.c @@ -310,7 +310,8 @@ static int close_handler(qd_container_t *container, pn_connection_t *conn, qd_co if (qd_conn) qd_conn->closed = true; close_links(container, conn, true); -notify_closed(container, qd_conn, qd_connection_get_context(qd_conn)); +if (qd_conn) +notify_closed(container, qd_conn, qd_connection_get_context(qd_conn)); return 0; } - 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-1320 Revering commit
This is an automated email from the ASF dual-hosted git repository.
eallen 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 fdedd6a DISPATCH-1320 Revering commit
fdedd6a is described below
commit fdedd6a493b967d2f4678a839600dfb90f9f1d3c
Author: Ernest Allen
AuthorDate: Fri Apr 12 11:59:27 2019 -0400
DISPATCH-1320 Revering commit
---
bin/make_standalone_console_tarball.sh | 1 -
console/CMakeLists.txt | 1 -
.../stand-alone/plugin/img/downstream_console_logo.png | Bin 11622 -> 0 bytes
3 files changed, 2 deletions(-)
diff --git a/bin/make_standalone_console_tarball.sh
b/bin/make_standalone_console_tarball.sh
index 8c473e8..14015e6 100755
--- a/bin/make_standalone_console_tarball.sh
+++ b/bin/make_standalone_console_tarball.sh
@@ -90,7 +90,6 @@ echo Working Directory=${WORKDIR}
cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_BUILD_TYPE=Release
../$PREFIX
make install
pushd $INSTALL_DIR/share/qpid-dispatch/
-cp console/img/downstream_console_logo.png console/img/console_logo.png
tar -c -h -z \
--owner=root --group=root --numeric-owner \
--mtime="${MTIME}" \
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index e953c42..7bdb481 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -85,7 +85,6 @@ if(CONSOLE_INSTALL)
${CONSOLE_SOURCE_DIR}/plugin/img/bg-modal-about-pf.png
${CONSOLE_SOURCE_DIR}/plugin/img/logo-alt.svg
${CONSOLE_SOURCE_DIR}/plugin/img/console_logo.png
-${CONSOLE_SOURCE_DIR}/plugin/img/downstream_console_logo.png
)
## Files copied to the css/ dir
set(CSS_FONTS
diff --git a/console/stand-alone/plugin/img/downstream_console_logo.png
b/console/stand-alone/plugin/img/downstream_console_logo.png
deleted file mode 100644
index a9adea5..000
Binary files a/console/stand-alone/plugin/img/downstream_console_logo.png and
/dev/null differ
-
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-1320 Add downstream logo for masthead
This is an automated email from the ASF dual-hosted git repository.
eallen 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 8b467ea DISPATCH-1320 Add downstream logo for masthead
8b467ea is described below
commit 8b467ea966703d8691c55d80431d65ca51474d49
Author: Ernest Allen
AuthorDate: Fri Apr 12 11:44:50 2019 -0400
DISPATCH-1320 Add downstream logo for masthead
---
bin/make_standalone_console_tarball.sh | 1 +
console/CMakeLists.txt | 2 ++
console/stand-alone/index.html | 4 +---
console/stand-alone/plugin/css/dispatch.css | 1 +
console/stand-alone/plugin/img/console_logo.png | Bin 0 -> 6568 bytes
.../stand-alone/plugin/img/downstream_console_logo.png | Bin 0 -> 11622 bytes
console/stand-alone/plugin/js/qdrGlobals.js | 1 +
7 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/bin/make_standalone_console_tarball.sh
b/bin/make_standalone_console_tarball.sh
index 14015e6..8c473e8 100755
--- a/bin/make_standalone_console_tarball.sh
+++ b/bin/make_standalone_console_tarball.sh
@@ -90,6 +90,7 @@ echo Working Directory=${WORKDIR}
cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_BUILD_TYPE=Release
../$PREFIX
make install
pushd $INSTALL_DIR/share/qpid-dispatch/
+cp console/img/downstream_console_logo.png console/img/console_logo.png
tar -c -h -z \
--owner=root --group=root --numeric-owner \
--mtime="${MTIME}" \
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 66e4c0c..e953c42 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -84,6 +84,8 @@ if(CONSOLE_INSTALL)
set(IMAGES
${CONSOLE_SOURCE_DIR}/plugin/img/bg-modal-about-pf.png
${CONSOLE_SOURCE_DIR}/plugin/img/logo-alt.svg
+${CONSOLE_SOURCE_DIR}/plugin/img/console_logo.png
+${CONSOLE_SOURCE_DIR}/plugin/img/downstream_console_logo.png
)
## Files copied to the css/ dir
set(CSS_FONTS
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index 220cf50..d836b54 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -55,9 +55,7 @@ under the License.
-
-Apache Qpid Dispatch Console
-
+
diff --git a/console/stand-alone/plugin/css/dispatch.css
b/console/stand-alone/plugin/css/dispatch.css
index 2a7472a..73811dd 100644
--- a/console/stand-alone/plugin/css/dispatch.css
+++ b/console/stand-alone/plugin/css/dispatch.css
@@ -2105,6 +2105,7 @@ svg {
.masthead-icons {
position: absolute;
right: 1em;
+top: 0;
color: white;
padding-top: 5px;
font-size: large;
diff --git a/console/stand-alone/plugin/img/console_logo.png
b/console/stand-alone/plugin/img/console_logo.png
new file mode 100644
index 000..0cae841
Binary files /dev/null and b/console/stand-alone/plugin/img/console_logo.png
differ
diff --git a/console/stand-alone/plugin/img/downstream_console_logo.png
b/console/stand-alone/plugin/img/downstream_console_logo.png
new file mode 100644
index 000..a9adea5
Binary files /dev/null and
b/console/stand-alone/plugin/img/downstream_console_logo.png differ
diff --git a/console/stand-alone/plugin/js/qdrGlobals.js
b/console/stand-alone/plugin/js/qdrGlobals.js
index 42f5ee3..fa21d13 100644
--- a/console/stand-alone/plugin/js/qdrGlobals.js
+++ b/console/stand-alone/plugin/js/qdrGlobals.js
@@ -52,6 +52,7 @@ export const QDRTemplatePath = 'html/';
export const QDR_SETTINGS_KEY = 'QDRSettings';
export const QDR_LAST_LOCATION = 'QDRLastLocation';
export const QDR_INTERVAL = 'QDRInterval';
+export const STAND_ALONE = true;
export var QDRRedirectWhenConnected = function ($location, org) {
$location.path('/connect');
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
