diff --git a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java similarity index 95% rename from artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java rename to artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java index 5182c54b34..bf83100f15 100644 --- a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java +++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java @@ -32,19 +32,19 @@ import java.util.Comparator; * execution off to the ActiveMQ cli main. *
*/ -public class ActiveMQ +public class Artemis { public static void main(String[] args) throws Throwable { ArrayList
* To add an interceptor to ActiveMQ server, you have to modify the server configuration file
- * {@literal activemq-configuration.xml}.
* To add an interceptor to ActiveMQ server, you have to modify the server configuration file
- * {@literal activemq-configuration.xml}. And on your mobile app you should see a message from ActiveMQ Now lets look a bit more closely at the configuration in activemq-configuration.xml Now lets look a bit more closely at the configuration in broker.xml
+ * {@literal broker.xml}.
* To add it to a client, use {@link org.apache.activemq.artemis.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)}
*/
public interface Interceptor extends BaseInterceptor
+ * {@literal broker.xml}.
*/
public interface StompFrameInterceptor extends BaseInterceptorconfig/examples/bootstrap.xml
aand change the paths to point
the correct configuration (this will be found in the directory of the example you wish to run). By default the broker
will use the data/server0
directory for the journal, to avoid problems it is best to delete this
- directory between running different examples or set the ACTIVEMQ_DATA_DIR
environment property in
+ directory between running different examples or set the ARTEMIS_DATA_DIR
environment property in
activemq.conf
to use a different location
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/aerogear/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/aerogear/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/aerogear/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/aerogear/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/aerogear/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml
index a48e6758e6..8645df43a3 100644
--- a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
Moreover it is known that Aardvarks normally wear blue hats, and it's important that we only make sausages using Aardvarks with green hats, so on the way we are going transform the property "hat" from "green" to "blue".
-Here's a snippet from activemq-configuration.xml
showing the bridge configuration
Here's a snippet from broker.xml
showing the bridge configuration
<bridge name="my-bridge">
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/bridge/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/bridge/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/bridge/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/bridge/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/bridge/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
index 248d875180..cc79ef07a5 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/bridge/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/bridge/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/bridge/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/bridge/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/bridge/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server1/broker.xml
similarity index 96%
rename from examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/bridge/src/main/resources/activemq/server1/broker.xml
index ae4375d798..516f179cdf 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/bridge/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/browser/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/browser/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/browser/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/browser/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/browser/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/browser/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/browser/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/browser/src/main/resources/activemq/server0/broker.xml
index a92fa6cbc2..50039913ca 100644
--- a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/browser/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/client-kickoff/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/client-kickoff/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/client-kickoff/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/client-kickoff/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
similarity index 95%
rename from examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
index 337e4346cb..df642d1782 100644
--- a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
index ace0831dbb..18550ef69d 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
index 63413f68f2..eb70455fff 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/client-side-load-balancing/readme.html b/examples/jms/client-side-load-balancing/readme.html
index da543875eb..4ca46211a5 100644
--- a/examples/jms/client-side-load-balancing/readme.html
+++ b/examples/jms/client-side-load-balancing/readme.html
@@ -38,7 +38,7 @@ under the License.
to use UDP discovery to discover the list of servers over which to round-robin. This example will use UDP
discovery to obtain the list.
This example starts three servers which all broadcast their location using UDP discovery. The UDP broadcast configuration
- can be seen in the activemq-configuration.xml
file.
+ can be seen in the broker.xml
file.
A JMS ConnectionFactory is deployed on each server specifying the discovery group that will be used by that
connection factory.
For more information on ActiveMQ load balancing, and clustering in general, please see the clustering
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
index b21b2f568d..7d54128a08 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
index a3ed424f9f..3d6efdd66e 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
similarity index 97%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
index b704957073..e4bcf5e443 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
index d94b55a137..e32c8cbd38 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
index a27d74cecc..b863f560d3 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
index e363263272..8c14b205c7 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml
index 5c4bb4ff6c..06fefc6d6c 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml
similarity index 97%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml
index 0e98c4a5cf..7ad49e4737 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml
index cb6abfd741..3edefd06ae 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml
index 6a6b1da32d..aacaecb57a 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-queue/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-queue/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml
index cd5ec4d763..ebdbd530dc 100644
--- a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-queue/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-queue/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml
index 25f49d25db..7e6426dcca 100644
--- a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml
index d13506ae10..f9db9bc634 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml
index b7fc5e5f2f..6cb750ec7e 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
similarity index 97%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
index 3f0bdd1af3..6ea8a26bf3 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
index b37f4d8fda..a655fa1711 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
index 8816fb7065..7925ff9dba 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
similarity index 97%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
index a90c7b9cd5..0888816709 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
@@ -17,7 +17,7 @@
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-roles.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/artemis-roles.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/artemis-users.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
similarity index 97%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
index b38eae0dc1..60fb6cef63 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
@@ -17,7 +17,7 @@
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
index 403d6a0257..4da5fa916c 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
@@ -17,7 +17,7 @@
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
index 9ba1943a28..f8662cfe6d 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
@@ -17,7 +17,7 @@
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
similarity index 97%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
index 63c70cd879..a3a8a47566 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
@@ -17,7 +17,7 @@
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-topic/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-topic/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml
index 90e975d3e0..4856aa828f 100644
--- a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-topic/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-topic/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml
index bb60ecbd54..a9d16a8c7f 100644
--- a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
similarity index 98%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
index 779f66f963..c9dec4ce4c 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
similarity index 98%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
index f8e1a17f87..20ceb15731 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/colocated-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/colocated-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
similarity index 98%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
index f125585f80..5b3221d7c7 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/colocated-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/colocated-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
similarity index 98%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
index f2c8d50b1d..84f38f1302 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/dead-letter/readme.html b/examples/jms/dead-letter/readme.html
index 435b71db8d..e91061ff35 100644
--- a/examples/jms/dead-letter/readme.html
+++ b/examples/jms/dead-letter/readme.html
@@ -40,7 +40,7 @@ under the License.
We will then consume this dead letter message.
Example setup
- Dead letter addresses and maximum delivery attempts are defined in the configuration file activemq-configuration.xml:
+ Dead letter addresses and maximum delivery attempts are defined in the configuration file broker.xml:
<address-setting match="jms.queue.exampleQueue">
<dead-letter-address>jms.queue.deadLetterQueue</dead-letter-address>
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/dead-letter/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/dead-letter/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/dead-letter/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/dead-letter/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml
index a684f4ee40..3180b7efb7 100644
--- a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/delayed-redelivery/readme.html b/examples/jms/delayed-redelivery/readme.html
index d349421d84..81fb6edfb3 100644
--- a/examples/jms/delayed-redelivery/readme.html
+++ b/examples/jms/delayed-redelivery/readme.html
@@ -39,7 +39,7 @@ under the License.
matching on the address settings.
Example setup
- Redelivery delay is specified in the configuration file activemq-configuration.xml:
+ Redelivery delay is specified in the configuration file broker.xml:
In this example we set the redelivery delay to 5 seconds for the specific example queue. We could set redelivery delay on
on multiple queues by specifying a wild-card in the match, e.g. match="jms.#"
would apply the settings
to all JMS queues and topics.
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/delayed-redelivery/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/delayed-redelivery/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
index fca483af16..d23db3d8ae 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/divert/readme.html b/examples/jms/divert/readme.html
index 759cce6d47..adcf0cae20 100644
--- a/examples/jms/divert/readme.html
+++ b/examples/jms/divert/readme.html
@@ -54,7 +54,7 @@ under the License.
We will create a topic, spyTopic
on the London server, and there will be two subscribers both in London.
We will create a non-exclusive divert on the London server which will siphon off a copy of each order
received to the topic spyTopic
.
- Here's the xml config for that divert, from activemq-configuration.xml
+ Here's the xml config for that divert, from broker.xml
<divert name="order-divert">
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/divert/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/divert/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/divert/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/divert/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/divert/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/divert/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
similarity index 98%
rename from examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/divert/src/main/resources/activemq/server0/broker.xml
index 8c7fe63a5c..295f882d75 100644
--- a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/divert/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/divert/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/divert/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/divert/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/divert/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/divert/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server1/broker.xml
similarity index 96%
rename from examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/divert/src/main/resources/activemq/server1/broker.xml
index a90aee2ff2..d624897313 100644
--- a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/durable-subscription/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/durable-subscription/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/durable-subscription/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/durable-subscription/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
index 51d9a56f57..6b661e4d37 100644
--- a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/embedded-simple/readme.html b/examples/jms/embedded-simple/readme.html
index bf412588d6..9b165f57b1 100644
--- a/examples/jms/embedded-simple/readme.html
+++ b/examples/jms/embedded-simple/readme.html
@@ -34,7 +34,7 @@ under the License.
- Create ActiveMQ core configuration files and make sure they are within your classpath. By default, ActiveMQ
- expects the configuration file name to be "activemq-configuration.xml".
+ expects the configuration file name to be "broker.xml".
- Create an embedded ActiveMQ JMS server
EmbeddedJMS jmsServer = new EmbeddedJMS();
diff --git a/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml b/examples/jms/embedded-simple/src/main/resources/broker.xml
similarity index 95%
rename from examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
rename to examples/jms/embedded-simple/src/main/resources/broker.xml
index 68cca46ace..0448e3b6d9 100644
--- a/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/embedded-simple/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/expiry/readme.html b/examples/jms/expiry/readme.html
index ea2e38a790..534acfc4d2 100644
--- a/examples/jms/expiry/readme.html
+++ b/examples/jms/expiry/readme.html
@@ -38,7 +38,7 @@ under the License.
We will instead consume it from an expiry queue where it was moved when it expired.
Example setup
- Expiry destinations are defined in the configuration file activemq-configuration.xml:
+ Expiry destinations are defined in the configuration file broker.xml:
<address-setting match="jms.queue.exampleQueue">
<expiry-address>jms.queue.expiryQueue</expiry-address>
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/expiry/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/expiry/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/expiry/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/expiry/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/expiry/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/expiry/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/expiry/src/main/resources/activemq/server0/broker.xml
index e7ff821e9f..3333732716 100644
--- a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/expiry/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
similarity index 98%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
index 08ee2551c8..8c38aead9b 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
similarity index 98%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
index d40f743c87..ca0f81157e 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/http-transport/readme.html b/examples/jms/http-transport/readme.html
index a159deb8d0..0cf324dc02 100644
--- a/examples/jms/http-transport/readme.html
+++ b/examples/jms/http-transport/readme.html
@@ -32,7 +32,7 @@ under the License.
ActiveMQ supports a variety of network protocols to be its underlying transport without any specific code change.
This example is taken from the queue example without any code change. By changing the configuration file, one can get ActiveMQ working with HTTP transport.
- All you need to do is open the server0/activemq-configuration.xml and enable HTTP like the following
+ All you need to do is open the server0/broker.xml and enable HTTP like the following
diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/http-transport/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/http-transport/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/http-transport/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/http-transport/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/http-transport/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml
index 5bb2090326..40cf947242 100644
--- a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
index 5b6b4b4391..273b698304 100644
--- a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/interceptor/readme.html b/examples/jms/interceptor/readme.html
index 737d5219bd..8f4e188688 100644
--- a/examples/jms/interceptor/readme.html
+++ b/examples/jms/interceptor/readme.html
@@ -39,7 +39,7 @@ under the License.
}
- Once you have your own interceptor class, add it to the activemq-configuration.xml, as follows:
+ Once you have your own interceptor class, add it to the broker.xml, as follows:
<configuration>
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/interceptor/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/interceptor/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/interceptor/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/interceptor/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/interceptor/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
index 7fa4b1c805..b9d2c3c013 100644
--- a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
index d3989711ce..0f0eebc7c7 100644
--- a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jms-bridge/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jms-bridge/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml
index 3b1b3a68a5..d1e96e7de0 100644
--- a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/jms-bridge/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/jms-bridge/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml
similarity index 96%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml
index 00d4d23255..a8802d3f69 100644
--- a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jms-completion-listener/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jms-completion-listener/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-context/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-context/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jms-context/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-context/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jms-context/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
index d397c74cb5..0ee3f9dc0c 100644
--- a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jmx/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jmx/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jmx/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jmx/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jmx/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
index c2c2c3af4f..b167295084 100644
--- a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/large-message/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/large-message/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/large-message/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/large-message/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/large-message/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/large-message/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/large-message/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/large-message/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/last-value-queue/readme.html b/examples/jms/last-value-queue/readme.html
index b5b5903ad4..260ef8a412 100644
--- a/examples/jms/last-value-queue/readme.html
+++ b/examples/jms/last-value-queue/readme.html
@@ -37,7 +37,7 @@ under the License.
We will then consume from the queue the last message.
Example setup
- Last-Value queues are defined in the configuration file activemq-configuration.xml:
+ Last-Value queues are defined in the configuration file broker.xml:
<address-setting match="jms.queue.lastValueQueue">
<last-value-queue>true</last-value-queue>
diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/last-value-queue/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/last-value-queue/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/last-value-queue/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/last-value-queue/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml
index 10bd7ac8ea..470de98b31 100644
--- a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/management-notifications/readme.html b/examples/jms/management-notifications/readme.html
index 4c8d7fe876..5075360c35 100644
--- a/examples/jms/management-notifications/readme.html
+++ b/examples/jms/management-notifications/readme.html
@@ -37,7 +37,7 @@ under the License.
Example configuration
ActiveMQ can configured to send JMS messages when management notifications are emitted on the server.
- By default, the management name is called activemq.notifications
but this can be configured in activemq-configuration.xml.
+
By default, the management name is called activemq.notifications
but this can be configured in broker.xml.
For this example, we will set it to jms.topic.notificationsTopic
to be able to receive notifications from a JMS Topic.
<management-notification-address>jms.topic.notificationsTopic</management-notification-address>
@@ -50,7 +50,7 @@ under the License.
</topic>
The notification queue requires permission to create/delete temporary queues and consume messages.
- This is also configured in activemq-configuration.xml
+ This is also configured in broker.xml
<security-setting match="jms.topic.notificationsTopic">
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/management-notifications/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/management-notifications/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/management-notifications/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/management-notifications/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
similarity index 99%
rename from examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
index 451ea5add4..2c97901adc 100644
--- a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq ../../../../src/schema/artemis-server.xsd">
diff --git a/examples/jms/management/readme.html b/examples/jms/management/readme.html
index e905ad8bd8..b7ec5cf486 100644
--- a/examples/jms/management/readme.html
+++ b/examples/jms/management/readme.html
@@ -32,13 +32,13 @@ under the License.
Example configuration
ActiveMQ can be managed by sending JMS messages with specific properties to its management queue.
- By default, the management name is called activemq.management
but this can be configured in activemq-configuration.xml
+ By default, the management name is called activemq.management
but this can be configured in broker.xml
<management-address>activemq.management</management-address>
The management queue requires a "special" user permission manage
to be able to receive management messages.
- This is also configured in activemq-configuration.xml
+ This is also configured in broker.xml
<security-setting match="activemq.management">
<permission type="manage" roles="guest" />
diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/management/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/management/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/management/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/management/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/management/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/management/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/management/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/management/src/main/resources/activemq/server0/broker.xml
index 37667b75d1..36eec300b0 100644
--- a/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/management/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/message-counters/readme.html b/examples/jms/message-counters/readme.html
index 5e816ad3d0..e4b2fb497e 100644
--- a/examples/jms/message-counters/readme.html
+++ b/examples/jms/message-counters/readme.html
@@ -33,7 +33,7 @@ under the License.
at different times to display the metrics on the queue.
Example setup
- Message counter is configured in the server configuration file activemq-configuration.xml:
+ Message counter is configured in the server configuration file broker.xml:
<message-counter-enabled>true</message-counter-enabled>
<message-counter-sample-period>2000</message-counter-sample-period>
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-counters/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/message-counters/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/message-counters/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-counters/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/message-counters/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
similarity index 99%
rename from examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
index 04a7647f08..8d4ed29590 100644
--- a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq ../../../../src/schema/artemis-server.xsd">
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-group/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/message-group/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/message-group/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-group/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/message-group/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml b/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-group2/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/message-group2/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/message-group2/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-group2/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/message-group2/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-priority/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/message-priority/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/message-priority/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-priority/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/message-priority/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
index c660fcbc13..52eb917eda 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
index 63413f68f2..eb70455fff 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
similarity index 97%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
index a0c551cfe5..dff08b3d9b 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
index 26ec8415a6..ca23965f0f 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
index 63413f68f2..eb70455fff 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
similarity index 97%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
index 866807edc0..482b4ced72 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
index 372045946e..1a5bc0b768 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
index 3e9396e5b1..ecb5cdaabd 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/openwire/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/openwire/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/openwire/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/openwire/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/openwire/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
index db48b82de9..73823a6550 100644
--- a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/paging/readme.html b/examples/jms/paging/readme.html
index 6813b043b4..841d5174d7 100644
--- a/examples/jms/paging/readme.html
+++ b/examples/jms/paging/readme.html
@@ -28,7 +28,7 @@ under the License.
Paging Example
This example shows how ActiveMQ would avoid running out of memory resources by paging messages.
- A maxSize can be specified per Destination via the destinations settings configuration file (activemq-configuration.xml).
+ A maxSize can be specified per Destination via the destinations settings configuration file (broker.xml).
When messages routed to an address exceed the specified maxSize the server will begin to write messages to the file
system, this is called paging. This will continue to occur until messages have been delivered to consumers and subsequently
acknowledged freeing up memory. Messages will then be read from the file system , i.e. depaged, and routed as normal.
diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/paging/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/paging/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/paging/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/paging/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/paging/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/paging/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/paging/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/paging/src/main/resources/activemq/server0/broker.xml
index 4c17f4061b..a7a196963f 100644
--- a/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/paging/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/perf/src/main/resources/activemq/server0/broker.xml
similarity index 94%
rename from examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/perf/src/main/resources/activemq/server0/broker.xml
index 38bed8c14e..a642ac5174 100644
--- a/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/perf/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/pre-acknowledge/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/pre-acknowledge/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
index 5151c36ab8..f29acbc0ed 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/producer-rate-limit/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/producer-rate-limit/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-cpp/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/proton-cpp/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-cpp/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/proton-cpp/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
index 2a5ac6f135..eafc6c8f1d 100644
--- a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-j/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/proton-j/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-j/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/proton-j/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
index 53ad18ce40..c27781de3d 100644
--- a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-ruby/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/proton-ruby/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-ruby/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/proton-ruby/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
index 409118b073..81e0b07353 100644
--- a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/queue-message-redistribution/readme.html b/examples/jms/queue-message-redistribution/readme.html
index 86b40e34a9..7fc43fb75d 100644
--- a/examples/jms/queue-message-redistribution/readme.html
+++ b/examples/jms/queue-message-redistribution/readme.html
@@ -37,7 +37,7 @@ under the License.
with no consumers, to nodes where there are consumers. If the consumers have JMS selectors set on them, then they
will only be redistributed to nodes with consumers whose selectors match.
By default, message redistribution is disabled, but can be enabled by specifying some AddressSettings configuration
- in either activemq-queues.xml
or activemq-configuration.xml
+ in either activemq-queues.xml
or broker.xml
Setting redistribution-delay
to 0
will cause redistribution to occur immediately
once there are no more matching consumers on a particular queue instance. Setting it to a positive value > 0 specifies
a delay in milliseconds before attempting to redistribute. The delay is useful in the case that another consumer is
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
similarity index 98%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
index 8d1d1896b2..e745c71664 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
similarity index 98%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
index c6cfa5dfd5..7bb693f601 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue-requestor/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/queue-requestor/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue-requestor/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/queue-requestor/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
index dda202b164..6c344c28f8 100644
--- a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue-selector/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/queue-selector/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue-selector/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/queue-selector/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
index ddb9d67073..78f96f3899 100644
--- a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
@@ -19,7 +19,7 @@ under the License.
-->
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/queue/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/queue/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/queue/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/queue/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/broker.xml b/examples/jms/queue/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/queue/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/reattach-node/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/reattach-node/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/reattach-node/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/reattach-node/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
index 301581b389..0edc66a327 100644
--- a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
index 81a7633626..2bb35527e2 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
index f7ecac73cb..71e2e4e774 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/replicated-failback/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/replicated-failback/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
index cd267dc425..8a933506f2 100644
--- a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/replicated-failback/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/replicated-failback/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
index 6ed8c398f3..eec921f25c 100644
--- a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
index 29dcbb20c7..eb47eb2b34 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
index 25d85b0c69..344bfbfd07 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
similarity index 97%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
index 6994070598..804f63f641 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
index 9e90b2ce1b..597f828773 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
index 8c7538db35..cdefc88f11 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/request-reply/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/request-reply/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/request-reply/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/request-reply/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/request-reply/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
index dda202b164..6c344c28f8 100644
--- a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
index 1a20ecbbdd..6fe4547dab 100644
--- a/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-roles.properties b/examples/jms/rest/dup-send/src/main/resources/artemis-roles.properties
similarity index 100%
rename from examples/jms/rest/dup-send/src/main/resources/activemq-roles.properties
rename to examples/jms/rest/dup-send/src/main/resources/artemis-roles.properties
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-users.properties b/examples/jms/rest/dup-send/src/main/resources/artemis-users.properties
similarity index 100%
rename from examples/jms/rest/dup-send/src/main/resources/activemq-users.properties
rename to examples/jms/rest/dup-send/src/main/resources/artemis-users.properties
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml b/examples/jms/rest/dup-send/src/main/resources/broker.xml
similarity index 96%
rename from examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml
rename to examples/jms/rest/dup-send/src/main/resources/broker.xml
index 640bf6e475..8cc0fa654f 100644
--- a/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-roles.properties b/examples/jms/rest/javascript-chat/src/main/resources/artemis-roles.properties
similarity index 100%
rename from examples/jms/rest/javascript-chat/src/main/resources/activemq-roles.properties
rename to examples/jms/rest/javascript-chat/src/main/resources/artemis-roles.properties
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-users.properties b/examples/jms/rest/javascript-chat/src/main/resources/artemis-users.properties
similarity index 100%
rename from examples/jms/rest/javascript-chat/src/main/resources/activemq-users.properties
rename to examples/jms/rest/javascript-chat/src/main/resources/artemis-users.properties
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml b/examples/jms/rest/javascript-chat/src/main/resources/broker.xml
similarity index 96%
rename from examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml
rename to examples/jms/rest/javascript-chat/src/main/resources/broker.xml
index 01bb590e99..e5e1364023 100644
--- a/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/rest/javascript-chat/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
index 1a20ecbbdd..6fe4547dab 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-roles.properties b/examples/jms/rest/jms-to-rest/src/main/resources/artemis-roles.properties
similarity index 100%
rename from examples/jms/rest/jms-to-rest/src/main/resources/activemq-roles.properties
rename to examples/jms/rest/jms-to-rest/src/main/resources/artemis-roles.properties
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.properties b/examples/jms/rest/jms-to-rest/src/main/resources/artemis-users.properties
similarity index 100%
rename from examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.properties
rename to examples/jms/rest/jms-to-rest/src/main/resources/artemis-users.properties
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml b/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
similarity index 96%
rename from examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml
rename to examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
index 640bf6e475..8cc0fa654f 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/rest/push/src/main/resources/activemq-client.xml b/examples/jms/rest/push/src/main/resources/activemq-client.xml
index 1a20ecbbdd..6fe4547dab 100644
--- a/examples/jms/rest/push/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/push/src/main/resources/activemq-client.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/rest/push/src/main/resources/activemq-roles.properties b/examples/jms/rest/push/src/main/resources/artemis-roles.properties
similarity index 100%
rename from examples/jms/rest/push/src/main/resources/activemq-roles.properties
rename to examples/jms/rest/push/src/main/resources/artemis-roles.properties
diff --git a/examples/jms/rest/push/src/main/resources/activemq-users.properties b/examples/jms/rest/push/src/main/resources/artemis-users.properties
similarity index 100%
rename from examples/jms/rest/push/src/main/resources/activemq-users.properties
rename to examples/jms/rest/push/src/main/resources/artemis-users.properties
diff --git a/examples/jms/rest/push/src/main/resources/activemq-configuration.xml b/examples/jms/rest/push/src/main/resources/broker.xml
similarity index 96%
rename from examples/jms/rest/push/src/main/resources/activemq-configuration.xml
rename to examples/jms/rest/push/src/main/resources/broker.xml
index 19ab6b36c2..13f2f23732 100644
--- a/examples/jms/rest/push/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/rest/push/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/scale-down/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/scale-down/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/scale-down/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/scale-down/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/scale-down/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
similarity index 98%
rename from examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
index eded681c74..4a38a74593 100644
--- a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/scale-down/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/scale-down/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/scale-down/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/scale-down/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/scale-down/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
similarity index 98%
rename from examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
index e2959c29d2..57fa72d848 100644
--- a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/scheduled-message/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/scheduled-message/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/scheduled-message/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/scheduled-message/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/jms/security/readme.html b/examples/jms/security/readme.html
index ef6321dbed..5bcd22033e 100644
--- a/examples/jms/security/readme.html
+++ b/examples/jms/security/readme.html
@@ -77,7 +77,7 @@ under the License.
User name and password consists of a valid account that can be used to establish connections to a ActiveMQ server, while
roles are used in controlling the access privileges against ActiveMQ topics and queues. You can achieve this control by
- configuring proper permissions in activemq-configuration.xml
, like the following
+ configuring proper permissions in broker.xml
, like the following
<security-settings>
diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/security/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/security/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/security/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/security/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/security/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/security/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/security/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/security/src/main/resources/activemq/server0/broker.xml
index 8b964a3367..6a8b82bc75 100644
--- a/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/security/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/send-acknowledgements/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/send-acknowledgements/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/jms/spring-integration/src/main/resources/activemq-roles.properties b/examples/jms/spring-integration/src/main/resources/artemis-roles.properties
similarity index 100%
rename from examples/jms/spring-integration/src/main/resources/activemq-roles.properties
rename to examples/jms/spring-integration/src/main/resources/artemis-roles.properties
diff --git a/examples/jms/spring-integration/src/main/resources/activemq-users.properties b/examples/jms/spring-integration/src/main/resources/artemis-users.properties
similarity index 100%
rename from examples/jms/spring-integration/src/main/resources/activemq-users.properties
rename to examples/jms/spring-integration/src/main/resources/artemis-users.properties
diff --git a/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml b/examples/jms/spring-integration/src/main/resources/broker.xml
similarity index 95%
rename from examples/jms/spring-integration/src/main/resources/activemq-configuration.xml
rename to examples/jms/spring-integration/src/main/resources/broker.xml
index fdc8811736..29703295a6 100644
--- a/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/spring-integration/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/ssl-enabled/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/ssl-enabled/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
index 3e28f6949a..f0de0fc2ad 100644
--- a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/static-selector-jms/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/static-selector-jms/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
index 556339473d..7442fac3fa 100644
--- a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/static-selector/readme.html b/examples/jms/static-selector/readme.html
index 36ebb244cc..834d8061a4 100644
--- a/examples/jms/static-selector/readme.html
+++ b/examples/jms/static-selector/readme.html
@@ -33,7 +33,7 @@ under the License.
Static message selectors are ActiveMQ's extension to message selectors as defined in JMS spec 1.1.
Rather than specifying the selector in the application code, static message selectors are defined in one of
- ActiveMQ's configuration files, activemq-configuration.xml, as an element called 'filter' inside each queue
+ ActiveMQ's configuration files, broker.xml, as an element called 'filter' inside each queue
definition, like
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/static-selector/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/static-selector/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/static-selector/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/static-selector/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/static-selector/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
index 64fa1d8095..ca09b3b974 100644
--- a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/stomp-websockets/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/stomp-websockets/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
index 59ad29b6ca..ce256a9f7f 100644
--- a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/stomp/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/stomp/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/stomp/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
index 5d43ce4bb7..b24f1da6bd 100644
--- a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp1.1/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/stomp1.1/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp1.1/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/stomp1.1/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
index 5d43ce4bb7..b24f1da6bd 100644
--- a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp1.2/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/stomp1.2/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp1.2/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/stomp1.2/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
index 5d43ce4bb7..b24f1da6bd 100644
--- a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
index ef63e109be..6ea24c1a8d 100644
--- a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
index 0e3c7d8df4..da69fce8d3 100644
--- a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/symmetric-cluster/readme.html b/examples/jms/symmetric-cluster/readme.html
index 59acd5847e..35e0ce485c 100644
--- a/examples/jms/symmetric-cluster/readme.html
+++ b/examples/jms/symmetric-cluster/readme.html
@@ -39,7 +39,7 @@ under the License.
The configuration used in this example is very similar to the configuration used by ActiveMQ
when installed as a clustered profile in JBoss Application Server.
To set up ActiveMQ to form a symmetric cluster we simply need to mark each server as clustered
- and we need to define a cluster-connection
in activemq-configuration.xml
.
+ and we need to define a cluster-connection
in broker.xml
.
The cluster-connection
tells the nodes what other nodes to make connections to.
With a cluster-connection
each node that we connect to can either be specified
indivually, or we can use UDP discovery to find out what other nodes are in the cluster.
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
index 0f39cab22c..312d7a2b41 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
index 10bd5a210c..f7c2569a7a 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
similarity index 97%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
index 9f0ed5a959..b87a19e7ac 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server3/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server3/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
similarity index 97%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
index 2781eac93f..03748768e1 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server4/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server4/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
similarity index 97%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
index 1c1fa816a9..25b099c97c 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server5/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server5/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
similarity index 97%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
index e51abd27c5..8efb4aa83a 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/temp-queue/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/temp-queue/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/temp-queue/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/temp-queue/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
index e269320547..d5950867ff 100644
--- a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/topic-hierarchies/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/topic-hierarchies/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
index 5e89f3efb4..1f94195d48 100644
--- a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/topic-selector-example1/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/topic-selector-example1/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
index 212a1447d4..e7c1a14cbd 100644
--- a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/topic-selector-example2/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/topic-selector-example2/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
index 212a1447d4..e7c1a14cbd 100644
--- a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/topic/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/topic/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/topic/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/topic/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic/src/main/resources/activemq/server0/broker.xml
similarity index 96%
rename from examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/topic/src/main/resources/activemq/server0/broker.xml
index 212a1447d4..e7c1a14cbd 100644
--- a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
similarity index 97%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
index 00a6a750a8..1041acadc2 100644
--- a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
similarity index 97%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
index f7cb5aec5a..27f33f6365 100644
--- a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/transactional/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/transactional/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/transactional/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/transactional/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/transactional/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml b/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/xa-heuristic/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/xa-heuristic/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/xa-receive/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/xa-receive/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/xa-receive/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/xa-receive/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml
deleted file mode 100644
index e6fdb21b80..0000000000
--- a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${data.dir}/server0/data/messaging/bindings
-
- ${data.dir}/server0/data/messaging/journal
-
- ${data.dir}/server0/data/messaging/largemessages
-
- ${data.dir}/server0/data/messaging/paging
-
-
-
- tcp://localhost:61616
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/xa-send/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/xa-send/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/xa-send/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/xa-send/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/xa-send/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000000..7690094861
--- /dev/null
+++ b/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${data.dir}/server0/data/messaging/bindings
+
+ ${data.dir}/server0/data/messaging/journal
+
+ ${data.dir}/server0/data/messaging/largemessages
+
+ ${data.dir}/server0/data/messaging/paging
+
+
+
+ tcp://localhost:61616
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/soak/normal/README b/examples/soak/normal/README
index acbd2f7a57..b422dd5892 100644
--- a/examples/soak/normal/README
+++ b/examples/soak/normal/README
@@ -27,7 +27,7 @@ settings.
To run a server with the same configuration but on a different host. Check out this source on the host machine and
change:
-* activemq.remoting.netty.host property in activemq-configuration.xml
+* activemq.remoting.netty.host property in broker.xml
* bindAddress and rmiBindAddress properties in activemq-beans.xml
$ mvn verify -P server
@@ -35,7 +35,7 @@ change:
Configure Server Dump
=====================
-The server can "dump" info at regular interval. In activemq-configuration.xml, set
+The server can "dump" info at regular interval. In broker.xml, set
10000
diff --git a/examples/soak/normal/server0/activemq-configuration.xml b/examples/soak/normal/server0/broker.xml
similarity index 95%
rename from examples/soak/normal/server0/activemq-configuration.xml
rename to examples/soak/normal/server0/broker.xml
index 8a168b3f63..7f1f435f86 100644
--- a/examples/soak/normal/server0/activemq-configuration.xml
+++ b/examples/soak/normal/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/tests/config/server-start-stop-backup-config1.xml b/tests/config/server-start-stop-backup-config1.xml
index 7996fdbc0c..47c114597b 100644
--- a/tests/config/server-start-stop-backup-config1.xml
+++ b/tests/config/server-start-stop-backup-config1.xml
@@ -16,7 +16,7 @@
-->
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/tests/config/server-start-stop-backup-jms-config1.xml b/tests/config/server-start-stop-backup-jms-config1.xml
index b9044a8288..4dc3b12eaf 100644
--- a/tests/config/server-start-stop-backup-jms-config1.xml
+++ b/tests/config/server-start-stop-backup-jms-config1.xml
@@ -16,7 +16,7 @@
-->
+ xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/tests/config/server-start-stop-live-jms-config1.xml b/tests/config/server-start-stop-live-jms-config1.xml
index 7c84896260..055833cf9e 100644
--- a/tests/config/server-start-stop-live-jms-config1.xml
+++ b/tests/config/server-start-stop-live-jms-config1.xml
@@ -16,7 +16,7 @@
-->
+ xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
diff --git a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
index cff73314ae..1990d93cf6 100644
--- a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
+++ b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
@@ -16,7 +16,7 @@
-->
+ xsi:schemaLocation="urn:activemq ../../src/schemas/artemis-server.xsd ">
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
index c04de3d9bc..f3380d0377 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
@@ -16,7 +16,7 @@
-->
+ xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
tcp://localhost:61616
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
index 1e0b266a93..1cf81e51f2 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
@@ -16,7 +16,7 @@
-->
+ xsi:schemaLocation="urn:activemq schema/artemis-configuration.xsd">
tcp://localhost:5645
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
index 4025851aa5..5e1d9a2e58 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
@@ -16,7 +16,7 @@
-->
+ xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
index 4025851aa5..5e1d9a2e58 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
@@ -16,7 +16,7 @@
-->
+ xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
diff --git a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
index 46142dda54..b85e5815c8 100644
--- a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
@@ -16,7 +16,7 @@
-->
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
diff --git a/tests/integration-tests/src/test/resources/spring-activemq-config.xml b/tests/integration-tests/src/test/resources/spring-activemq-config.xml
index e7dd1cc8ee..1e0d2c236b 100644
--- a/tests/integration-tests/src/test/resources/spring-activemq-config.xml
+++ b/tests/integration-tests/src/test/resources/spring-activemq-config.xml
@@ -16,7 +16,7 @@
-->
+ xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
diff --git a/tests/jms-tests/src/test/resources/activemq-configuration.xml b/tests/jms-tests/src/test/resources/broker.xml
similarity index 99%
rename from tests/jms-tests/src/test/resources/activemq-configuration.xml
rename to tests/jms-tests/src/test/resources/broker.xml
index 10f6a8d8bf..4a060124fe 100644
--- a/tests/jms-tests/src/test/resources/activemq-configuration.xml
+++ b/tests/jms-tests/src/test/resources/broker.xml
@@ -16,7 +16,7 @@
-->
+ xsi:schemaLocation="urn:activemq ../../../src/schema/artemis-server.xsd">
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
index 48f3f9d41f..5972d3dda5 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
@@ -40,7 +40,7 @@ public class ConfigurationValidationTest extends UnitTestCase
// Public --------------------------------------------------------
/**
- * test does not pass in eclipse (because it can not find activemq-configuration.xsd).
+ * test does not pass in eclipse (because it can not find artemis-configuration.xsd).
* It runs fine on the CLI with the proper env setting.
*/
@Test
@@ -49,7 +49,7 @@ public class ConfigurationValidationTest extends UnitTestCase
String xml = "" + " ";
Element element = XMLUtil.stringToElement(xml);
Assert.assertNotNull(element);
- XMLUtil.validate(element, "schema/activemq-configuration.xsd");
+ XMLUtil.validate(element, "schema/artemis-configuration.xsd");
}
@Test