From 72f5a1f5bc7baf289a3407d2b757dae5aaa61419 Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Mon, 24 Feb 2020 13:28:37 -0600 Subject: [PATCH] NO-JIRA fix up docs for security-ldap example --- docs/user-manual/en/examples.md | 10 ++++++++-- .../features/standard/security-ldap/readme.md | 2 ++ .../activemq/server0/artemis-roles.properties | 20 ------------------- .../activemq/server0/artemis-users.properties | 20 ------------------- 4 files changed, 10 insertions(+), 42 deletions(-) delete mode 100644 examples/features/standard/security-ldap/src/main/resources/activemq/server0/artemis-roles.properties delete mode 100644 examples/features/standard/security-ldap/src/main/resources/activemq/server0/artemis-users.properties diff --git a/docs/user-manual/en/examples.md b/docs/user-manual/en/examples.md index 516795716a..f5ee5619c6 100644 --- a/docs/user-manual/en/examples.md +++ b/docs/user-manual/en/examples.md @@ -715,8 +715,14 @@ delivered until a specified time in the future. ## Security -The `security` example shows you how configure and use role based queue -security with Apache ActiveMQ Artemis. +The `security` example shows you how configure and use role based security with +Apache ActiveMQ Artemis. + +## Security LDAP + +The `security-ldap` example shows you how configure and use role based security +with Apache ActiveMQ Artemis & an embedded instance of the Apache DS LDAP +server. ## Send Acknowledgements diff --git a/examples/features/standard/security-ldap/readme.md b/examples/features/standard/security-ldap/readme.md index d966ec4852..5fd81a8603 100644 --- a/examples/features/standard/security-ldap/readme.md +++ b/examples/features/standard/security-ldap/readme.md @@ -2,6 +2,8 @@ To run the example, simply type **mvn verify** from this directory, or **mvn -PnoServer verify** if you want to start and create the broker manually. +**Note:** The logging from the embedded Apache DS LDAP server is verbose and it may appear that there are errors, but these logs can be ignored. + This example shows how to configure and use security using ActiveMQ Artemis and the Apache DS LDAP server. With security properly configured, ActiveMQ Artemis can restrict client access to its resources, including connection creation, message sending/receiving, etc. This is done by configuring users and roles as well as permissions in the configuration files. diff --git a/examples/features/standard/security-ldap/src/main/resources/activemq/server0/artemis-roles.properties b/examples/features/standard/security-ldap/src/main/resources/activemq/server0/artemis-roles.properties deleted file mode 100644 index 71e672d40b..0000000000 --- a/examples/features/standard/security-ldap/src/main/resources/activemq/server0/artemis-roles.properties +++ /dev/null @@ -1,20 +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. -## --------------------------------------------------------------------------- -user=bill,andrew,frank,sam -europe-user=andrew -news-user=frank,sam -us-user=frank \ No newline at end of file diff --git a/examples/features/standard/security-ldap/src/main/resources/activemq/server0/artemis-users.properties b/examples/features/standard/security-ldap/src/main/resources/activemq/server0/artemis-users.properties deleted file mode 100644 index 0a206c6053..0000000000 --- a/examples/features/standard/security-ldap/src/main/resources/activemq/server0/artemis-users.properties +++ /dev/null @@ -1,20 +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. -## --------------------------------------------------------------------------- -bill=activemq -andrew=activemq1 -frank=activemq2 -sam=activemq3 \ No newline at end of file