Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/qpid-broker-j
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/de42f530 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/de42f530 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/de42f530 Branch: refs/heads/master Commit: de42f53048210c3f76a65344f3a3637de4d92b6a Parents: f6b5925 4e0acb2 Author: rgodfrey <rgodf...@apache.org> Authored: Tue Jul 18 22:06:17 2017 +0200 Committer: rgodfrey <rgodf...@apache.org> Committed: Tue Jul 18 22:06:17 2017 +0200 ---------------------------------------------------------------------- .../server/virtualhost/AbstractVirtualHost.java | 10 +- .../management/plugin/HttpManagement.java | 1 - .../auth/UsernamePasswordInteractiveLogin.java | 4 +- .../plugin/servlet/rest/SaslServlet.java | 2 +- .../main/java/resources/common/LoginForm.html | 47 ++++ .../src/main/java/resources/css/common.css | 6 +- .../src/main/java/resources/index.html | 144 +++++----- .../resources/js/qpid/common/ConsoleHelper.js | 78 ++++-- .../java/resources/js/qpid/common/LoginForm.js | 130 +++++++++ .../resources/js/qpid/management/Management.js | 42 +-- .../resources/js/qpid/sasl/Authenticator.js | 251 +++++++++++------ .../js/qpid/sasl/CredentialBasedSaslClient.js | 102 +------ .../java/resources/js/qpid/sasl/SaslClient.js | 35 ++- .../js/qpid/sasl/ScramShaSaslClient.js | 244 +++++++++++++++++ .../resources/js/qpid/sasl/ShaSaslClient.js | 269 ------------------- .../js/qpid/sasl/UsernamePasswordProvider.js | 41 --- .../js/qpid/sasl/cram-md5-hex/SaslClient.js | 11 +- .../js/qpid/sasl/cram-md5/SaslClient.js | 55 ++-- .../resources/js/qpid/sasl/plain/SaslClient.js | 31 +-- .../js/qpid/sasl/scram-sha-1/SaslClient.js | 6 +- .../js/qpid/sasl/scram-sha-256/SaslClient.js | 6 +- .../src/main/java/resources/login.html | 178 ------------ .../src/main/java/resources/logout.html | 2 +- pom.xml | 2 +- 24 files changed, 823 insertions(+), 874 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org