You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/06/17 16:44:20 UTC

[2/2] activemq-artemis git commit: This closes #585

This closes #585


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/279780c8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/279780c8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/279780c8

Branch: refs/heads/master
Commit: 279780c89d22ca046425ccc53aec24927f089af5
Parents: 70562ad 7715b5e
Author: Martyn Taylor <mt...@redhat.com>
Authored: Fri Jun 17 17:43:29 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Fri Jun 17 17:43:29 2016 +0100

----------------------------------------------------------------------
 .../artemis/factory/JaasSecurityHandler.java    |   2 +-
 .../activemq/artemis/dto/JaasSecurityDTO.java   |   3 +
 .../security/ActiveMQJAASSecurityManager.java   |  38 ++++-
 docs/user-manual/en/security.md                 |  49 +++++--
 examples/features/standard/pom.xml              |   2 +
 .../ssl-enabled-dual-authentication/pom.xml     | 110 ++++++++++++++
 .../ssl-enabled-dual-authentication/readme.html |  75 ++++++++++
 .../example/SSLDualAuthenticationExample.java   |  99 +++++++++++++
 .../activemq/server0/artemis-roles.properties   |  17 +++
 .../activemq/server0/artemis-users.properties   |  17 +++
 .../resources/activemq/server0/bootstrap.xml    |  28 ++++
 .../main/resources/activemq/server0/broker.xml  |  57 ++++++++
 .../activemq/server0/cert-roles.properties      |  18 +++
 .../activemq/server0/cert-users.properties      |  18 +++
 .../activemq/server0/client-side-keystore.jks   | Bin 0 -> 1303 bytes
 .../activemq/server0/client-side-truststore.jks | Bin 0 -> 963 bytes
 .../resources/activemq/server0/login.config     |  30 ++++
 .../activemq/server0/server-side-keystore.jks   | Bin 0 -> 2253 bytes
 .../activemq/server0/server-side-truststore.jks | Bin 0 -> 1732 bytes
 .../src/main/resources/jndi.properties          |  21 +++
 .../ssl/CoreClientOverTwoWaySSLTest.java        |   6 +-
 .../integration/ssl/DualAuthenticationTest.java | 142 +++++++++++++++++++
 .../dual-authentication-cert-roles.properties   |  18 +++
 .../dual-authentication-cert-users.properties   |  18 +++
 .../dual-authentication-roles.properties        |  18 +++
 .../dual-authentication-users.properties        |  18 +++
 .../src/test/resources/login.config             |  14 ++
 27 files changed, 802 insertions(+), 16 deletions(-)
----------------------------------------------------------------------