rename users and roles properties files

artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java

@@ -160,8 +160,8 @@ public class Create implements Action
       write("etc/logging.properties", null, false);
       write("etc/bootstrap.xml", null, false);
       write("etc/broker.xml", filters, false);
-      write("etc/activemq-roles.properties", null, false);
+      write("etc/artemis-roles.properties", null, false);
-      write("etc/activemq-users.properties", null, false);
+      write("etc/artemis-users.properties", null, false);
 
       context.out.println("");
       context.out.println("You can now start the broker by executing:  ");

artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml

@@ -19,8 +19,8 @@
 <broker xmlns="http://activemq.org/schema">
 
    <basic-security
-           users="file:${artemis.instance}/etc/activemq-users.properties"
+           users="file:${artemis.instance}/etc/artemis-users.properties"
-           roles="file:${artemis.instance}/etc/activemq-roles.properties"
+           roles="file:${artemis.instance}/etc/artemis-roles.properties"
            default-user="guest"
            />
 

artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java

@@ -102,8 +102,8 @@ public class ActiveMQBootstrap
             deploymentManager.addDeployable((FileConfiguration)configuration);
             deploymentManager.addDeployable((FileJMSConfiguration) jmsFileConfiguration);
 
-            securityConfiguration = new FileSecurityConfiguration(new File(configurationDir, "activemq-users.properties").toURI().toString(),
+            securityConfiguration = new FileSecurityConfiguration(new File(configurationDir, "artemis-users.properties").toURI().toString(),
-                                                                  new File(configurationDir, "activemq-roles.properties").toURI().toString(),
+                                                                  new File(configurationDir, "artemis-roles.properties").toURI().toString(),
                                                                   "guest",
                                                                   false,
                                                                   null);

artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java

@@ -50,8 +50,8 @@ public class EmbeddedTest
    {
       server = new EmbeddedRestActiveMQJMS();
       server.getManager().setConfigResourcePath("activemq-rest.xml");
-      FileSecurityConfiguration securityConfiguration = new FileSecurityConfiguration("activemq-users.properties",
+      FileSecurityConfiguration securityConfiguration = new FileSecurityConfiguration("artemis-users.properties",
-                                                                                      "activemq-roles.properties",
+                                                                                      "artemis-roles.properties",
                                                                                       "guest",
                                                                                       false,
                                                                                       null);

docs/user-manual/en/configuration-index.md

@@ -385,7 +385,7 @@ Bridges. Example:
 With this configuration, both passwords in ra.xml and all of its MDBs
 will have to be in masked form.
 
-### Masking passwords in activemq-users.properties
+### Masking passwords in artemis-users.properties
 
 Apache ActiveMQ Artemis's built-in security manager uses plain properties files
 where the user passwords are specified in plaintext forms by default. To

docs/user-manual/en/security.md

@@ -133,7 +133,7 @@ For more information on configuring the SSL transport, please see [Configuring t
 
 Apache ActiveMQ Artemis ships with a security manager implementation that reads user
 credentials, i.e. user names, passwords and role information from properties
-files on the classpath called `activemq-users.properties` and `activemq-roles.properties`. This is the default security manager.
+files on the classpath called `artemis-users.properties` and `artemis-roles.properties`. This is the default security manager.
 
 If you wish to use this security manager, then users, passwords and
 roles can easily be added into these files.
@@ -142,8 +142,8 @@ To configure this manager then it needs to be added to the `bootstrap.xml` confi
 Lets take a look at what this might look like:
 
     <basic-security>
-      <users>file:${activemq.home}/config/non-clustered/activemq-users.properties</users>
+      <users>file:${activemq.home}/config/non-clustered/artemis-users.properties</users>
-      <roles>file:${activemq.home}/config/non-clustered/activemq-roles.properties</roles>
+      <roles>file:${activemq.home}/config/non-clustered/artemis-roles.properties</roles>
       <default-user>guest</default-user>
     </basic-security>
 
@@ -153,9 +153,9 @@ The next thing to note is the element `defaultuser`. This defines what
 user will be assumed when the client does not specify a
 username/password when creating a session. In this case they will be the
 user `guest`. Multiple roles can be specified for a default user in the
-`activemq-roles.properties`.
+`artemis-roles.properties`.
 
-Lets now take alook at the `activemq-users.properties` file, this is basically
+Lets now take alook at the `artemis-users.properties` file, this is basically
 just a set of key value pairs that define the users and their password, like so:
 
     bill=activemq
@@ -163,7 +163,7 @@ just a set of key value pairs that define the users and their password, like so:
     frank=activemq2
     sam=activemq3
 
-The `activemq-roles.properties` defines what groups these users belong too
+The `artemis-roles.properties` defines what groups these users belong too
 where the key is the user and the value is a comma seperated list of the groups
 the user belongs to, like so: