diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java
index 5bc91aa373..49662537c3 100644
--- a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java
@@ -46,6 +46,8 @@ import org.codehaus.classworlds.ClassWorld;
 public class ActiveMQStartPlugin extends AbstractMojo
 
 {
+   static final String SKIPBROKERSTART = "skipBrokerStart";
+
    /**
     * The plugin descriptor
     */
@@ -99,6 +101,12 @@ public class ActiveMQStartPlugin extends AbstractMojo
 
    public void execute() throws MojoExecutionException, MojoFailureException
    {
+      String property = System.getProperty(SKIPBROKERSTART);
+      if (property != null)
+      {
+         getLog().info("skipping Broker Start");
+         return;
+      }
       if (testClusterManager)
       {
          try
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java
index b6b374bed6..6d8cc3eb49 100644
--- a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java
@@ -43,6 +43,11 @@ public class ActiveMQStopPlugin extends AbstractMojo
 
    public void execute() throws MojoExecutionException, MojoFailureException
    {
+      String property = System.getProperty(ActiveMQStartPlugin.SKIPBROKERSTART);
+      if (property != null)
+      {
+         return;
+      }
       try
       {
          String dirName = configurationDir != null ? configurationDir : ".";
diff --git a/distribution/activemq/src/main/resources/README.html b/distribution/activemq/src/main/resources/README.html
index 3040d1a489..8e41d4fdec 100644
--- a/distribution/activemq/src/main/resources/README.html
+++ b/distribution/activemq/src/main/resources/README.html
@@ -36,15 +36,15 @@ under the License.
 
 To run the ActiveMQ broker with the default configuration, run the command shown below from the "bin" directory.</br></br>
 
-$ activemq run</br></br>
+$ ./activemq run</br></br>
 
 To specify a broker configuration file:</br></br>
 
-$ activemq run --config scheme:location</br></br>
+$ ./activemq run --config scheme:location</br></br>
 
 e.g.</br></br>
 
-$ activemq run --config xml:/home/activemq/bootstrap.xml</br></br>
+$ ./activemq run --config xml:/home/activemq/bootstrap.xml</br></br>
 
 The distribution ships with a number of example configurations that can be used to get started.  You can find these under the "config" directory.</br></br>
 
@@ -53,7 +53,7 @@ It is possible to configure run time paramters in the activemq.conf (activemq.co
 
 To stop the broker please use the activemq script:</br></br>
 
-$ activemq stop</br></br>
+$ ./activemq stop</br></br>
 
 <h2>Documentation</h2>
 
diff --git a/distribution/activemq/src/main/resources/config/examples/bootstrap.xml b/distribution/activemq/src/main/resources/config/examples/bootstrap.xml
new file mode 100644
index 0000000000..a8762d189d
--- /dev/null
+++ b/distribution/activemq/src/main/resources/config/examples/bootstrap.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements. See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License. You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<broker xmlns="http://activemq.org/schema">
+
+   <basic-security>
+      <users>file:${activemq.home}/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.properties</users>
+      <roles>file:${activemq.home}/examples/jms/queue/src/main/resources/activemq/server0/activemq-roles.properties</roles>
+      <default-user>guest</default-user>
+   </basic-security>
+
+   <server configuration="file:${activemq.home}/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml"/>
+
+   <web bind="http://localhost:8161" path="web">
+       <app url="jolokia" war="jolokia-war-1.2.3.war"/>
+   </web>
+
+</broker>
diff --git a/distribution/activemq/src/main/resources/examples/index.html b/distribution/activemq/src/main/resources/examples/index.html
index 7269c4164f..a33ca69727 100644
--- a/distribution/activemq/src/main/resources/examples/index.html
+++ b/distribution/activemq/src/main/resources/examples/index.html
@@ -19,6 +19,16 @@ under the License.
 
 <h1>Apache ActiveMQ Examples</h1>
 <h2>JMS Examples</h2>
+<p>Each example has its own instructions as to how they can be run, but for most of them it is as simple as running
+    <code>mvn verify</code> from the example directory. This will start a broker with the correct configuration, run the
+example and then stop the server so you will need to make sure there is not a broker already running</p>
+<p>If you want to run an example against an already running broker then firstly you will need to start the broker to use
+the examples configuration. An example configuration is provided which by default to run the queue example, to run this
+use the command <code>./activemq run --config xml:../config/examples/bootstrap.xml</code>. Once the server has started run the
+example with the command <code>mvn -DskipBrokerStart verify</code>. If you want to run a different example simply edit the
+<code>config/examples/bootstrap.xml</code> and change the paths. By default the broker will use the <code>data/server0</code>
+directory for the journal, to avoid problems it is best to delete this directory between running different examples or
+set the <code>ACTIVEMQ_DATA_DIR</code> environment property in <code>activemq.conf</code>to use a different location</p>
    <ol>
        <li><a href="./jms/aerogear/readme.html">AeroGear Example</a></li>
        <li><a href="./jms/applet/readme.html">Applet Example</a></li>
diff --git a/examples/jms/aerogear/pom.xml b/examples/jms/aerogear/pom.xml
index 2f574b61a9..c9cf4c92c1 100644
--- a/examples/jms/aerogear/pom.xml
+++ b/examples/jms/aerogear/pom.xml
@@ -64,7 +64,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
index 5853529964..a48e6758e6 100644
--- a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/applet/pom.xml b/examples/jms/applet/pom.xml
index 040647910a..c09ec623ef 100644
--- a/examples/jms/applet/pom.xml
+++ b/examples/jms/applet/pom.xml
@@ -132,7 +132,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
diff --git a/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
index d885047caf..74148cfeba 100644
--- a/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml
index d4beaa633d..d5cb9ea53d 100644
--- a/examples/jms/bridge/pom.xml
+++ b/examples/jms/bridge/pom.xml
@@ -153,7 +153,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
index 9f06f6c246..248d875180 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -28,13 +28,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
index 85373cfa4b..ae4375d798 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -28,13 +28,13 @@ under the License.
    </jms>
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml
index 50348ed33b..51892e07d9 100644
--- a/examples/jms/browser/pom.xml
+++ b/examples/jms/browser/pom.xml
@@ -117,7 +117,7 @@ under the License.
                <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
index 68a6041725..a92fa6cbc2 100644
--- a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml
index 250a09237e..442d88a2cc 100644
--- a/examples/jms/client-kickoff/pom.xml
+++ b/examples/jms/client-kickoff/pom.xml
@@ -65,7 +65,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
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/activemq-configuration.xml
index 7b35ae73d7..337e4346cb 100644
--- a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -27,13 +27,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- true to expose ActiveMQ resources through JMX -->
       <jmx-management-enabled>true</jmx-management-enabled>
diff --git a/examples/jms/client-side-failoverlistener/pom.xml b/examples/jms/client-side-failoverlistener/pom.xml
index 1325fb6c41..2e116e9cd0 100644
--- a/examples/jms/client-side-failoverlistener/pom.xml
+++ b/examples/jms/client-side-failoverlistener/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -165,7 +165,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 5b45f6384a..ace0831dbb 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/activemq-configuration.xml
@@ -28,13 +28,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
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/activemq-configuration.xml
index 1893c492d0..63413f68f2 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
diff --git a/examples/jms/client-side-load-balancing/pom.xml b/examples/jms/client-side-load-balancing/pom.xml
index bf55b5ed19..b1896a9895 100644
--- a/examples/jms/client-side-load-balancing/pom.xml
+++ b/examples/jms/client-side-load-balancing/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
@@ -75,7 +75,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -95,7 +95,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
@@ -185,7 +185,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 61156f0e45..b21b2f568d 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/activemq-configuration.xml
@@ -27,13 +27,13 @@ under the License.
    </jms>
 
    <core xmlns="urn:activemq:core">
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
 
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/activemq-configuration.xml
index b61f74e83a..a3ed424f9f 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/activemq-configuration.xml
@@ -26,13 +26,13 @@ under the License.
       <queue name="exampleQueue"/>
    </jms>
    <core xmlns="urn:activemq:core">
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
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/activemq-configuration.xml
index 68ca5218a9..b704957073 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/activemq-configuration.xml
@@ -24,13 +24,13 @@ under the License.
    <jms xmlns="urn:activemq:jms">
    </jms>
    <core xmlns="urn:activemq:core">
-      <bindings-directory>${build.directory}/server2/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server2/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server2/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server2/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server2/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server2/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
diff --git a/examples/jms/clustered-durable-subscription/pom.xml b/examples/jms/clustered-durable-subscription/pom.xml
index 07e26e680d..43d8ae707e 100644
--- a/examples/jms/clustered-durable-subscription/pom.xml
+++ b/examples/jms/clustered-durable-subscription/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
@@ -75,7 +75,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
@@ -160,7 +160,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index a5a7badb56..d94b55a137 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
       <!-- Connectors -->
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/activemq-configuration.xml
index 8edf2df2ad..a27d74cecc 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/activemq-configuration.xml
@@ -30,13 +30,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
diff --git a/examples/jms/clustered-grouping/pom.xml b/examples/jms/clustered-grouping/pom.xml
index ea5cdc9cc4..ffd3ea52d6 100644
--- a/examples/jms/clustered-grouping/pom.xml
+++ b/examples/jms/clustered-grouping/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -99,7 +99,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -198,7 +198,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index f92bdb485f..e363263272 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -30,13 +30,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
 
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/activemq-configuration.xml
index a57852d4a7..5c4bb4ff6c 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -30,13 +30,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
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/activemq-configuration.xml
index ab6e98fac2..0e98c4a5cf 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -30,13 +30,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server2/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server2/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server2/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server2/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server2/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server2/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
diff --git a/examples/jms/clustered-static-discovery/pom.xml b/examples/jms/clustered-static-discovery/pom.xml
index 17cd79428c..48c0d4d0ed 100644
--- a/examples/jms/clustered-static-discovery/pom.xml
+++ b/examples/jms/clustered-static-discovery/pom.xml
@@ -188,7 +188,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 4f04ecbfa7..b37f4d8fda 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/activemq-configuration.xml
@@ -30,13 +30,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
 
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/activemq-configuration.xml
index 27ea9f8541..8816fb7065 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/activemq-configuration.xml
@@ -30,13 +30,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
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/activemq-configuration.xml
index a3b1e6c7ad..a90c7b9cd5 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/activemq-configuration.xml
@@ -27,13 +27,13 @@
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server2/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server2/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server2/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server2/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server2/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server2/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
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/activemq-configuration.xml
index 9dd03a6621..b38eae0dc1 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/activemq-configuration.xml
@@ -27,13 +27,13 @@
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server3/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server3/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server3/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server3/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server3/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server3/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server3/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server3/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
diff --git a/examples/jms/clustered-static-oneway/pom.xml b/examples/jms/clustered-static-oneway/pom.xml
index 125c322aaf..ec9af39194 100644
--- a/examples/jms/clustered-static-oneway/pom.xml
+++ b/examples/jms/clustered-static-oneway/pom.xml
@@ -168,7 +168,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 3b1e2a8664..403d6a0257 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/activemq-configuration.xml
@@ -27,13 +27,13 @@
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
 
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/activemq-configuration.xml
index 17f5463611..9ba1943a28 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/activemq-configuration.xml
@@ -27,13 +27,13 @@
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
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/activemq-configuration.xml
index 5913b63ace..63c70cd879 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/activemq-configuration.xml
@@ -27,13 +27,13 @@
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server2/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server2/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server2/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server2/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server2/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server2/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
diff --git a/examples/jms/clustered-topic/pom.xml b/examples/jms/clustered-topic/pom.xml
index 4dda418912..f28b58ab8a 100644
--- a/examples/jms/clustered-topic/pom.xml
+++ b/examples/jms/clustered-topic/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -168,7 +168,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index a97eb07c29..90e975d3e0 100644
--- a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -30,13 +30,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
 
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/activemq-configuration.xml
index d23c090570..bb60ecbd54 100644
--- a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -30,13 +30,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
diff --git a/examples/jms/consumer-rate-limit/pom.xml b/examples/jms/consumer-rate-limit/pom.xml
index 6f3dbf4e08..2269fd7b56 100644
--- a/examples/jms/consumer-rate-limit/pom.xml
+++ b/examples/jms/consumer-rate-limit/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
index 2fa4eb8e65..e6fdb21b80 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/dead-letter/pom.xml b/examples/jms/dead-letter/pom.xml
index b4391a3ca4..4fa9bcac97 100644
--- a/examples/jms/dead-letter/pom.xml
+++ b/examples/jms/dead-letter/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 669916d0d6..a684f4ee40 100644
--- a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -32,13 +32,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/delayed-redelivery/pom.xml b/examples/jms/delayed-redelivery/pom.xml
index 770771cb97..eb24e1d9b7 100644
--- a/examples/jms/delayed-redelivery/pom.xml
+++ b/examples/jms/delayed-redelivery/pom.xml
@@ -117,7 +117,7 @@ under the License.
                <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 4939305a49..fca483af16 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -32,13 +32,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/divert/pom.xml b/examples/jms/divert/pom.xml
index 9ff9234c4e..2651264656 100644
--- a/examples/jms/divert/pom.xml
+++ b/examples/jms/divert/pom.xml
@@ -153,7 +153,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
index 8ef5e97cc0..8c7fe63a5c 100644
--- a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -43,13 +43,13 @@ under the License.
       <!-- We need to make it clustered otherwise the bridge won't deploy -->
 
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
 
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
index 7177bebba6..a90aee2ff2 100644
--- a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -32,13 +32,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
 
diff --git a/examples/jms/durable-subscription/pom.xml b/examples/jms/durable-subscription/pom.xml
index 13e78bfb79..ab00230f46 100644
--- a/examples/jms/durable-subscription/pom.xml
+++ b/examples/jms/durable-subscription/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 058b434696..51d9a56f57 100644
--- a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
 
diff --git a/examples/jms/embedded/pom.xml b/examples/jms/embedded/pom.xml
index ad3f8adac2..0ed98b3377 100644
--- a/examples/jms/embedded/pom.xml
+++ b/examples/jms/embedded/pom.xml
@@ -77,7 +77,7 @@ under the License.
                            <value>${basedir}/target/classes/activemq</value>
                         </property>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/expiry/pom.xml b/examples/jms/expiry/pom.xml
index c010d849a9..470ce6493f 100644
--- a/examples/jms/expiry/pom.xml
+++ b/examples/jms/expiry/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
index ffe273be3d..e7ff821e9f 100644
--- a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -32,13 +32,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/http-transport/pom.xml b/examples/jms/http-transport/pom.xml
index 56af34beca..e50d33b3eb 100644
--- a/examples/jms/http-transport/pom.xml
+++ b/examples/jms/http-transport/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
@@ -125,7 +125,7 @@ under the License.
                <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 5b3af968e9..5bb2090326 100644
--- a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
 
diff --git a/examples/jms/instantiate-connection-factory/pom.xml b/examples/jms/instantiate-connection-factory/pom.xml
index 46725d5d3e..5c5b146834 100644
--- a/examples/jms/instantiate-connection-factory/pom.xml
+++ b/examples/jms/instantiate-connection-factory/pom.xml
@@ -68,7 +68,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 701671fd24..5b6b4b4391 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/interceptor/pom.xml b/examples/jms/interceptor/pom.xml
index 0443ec805c..7eb9bd2f26 100644
--- a/examples/jms/interceptor/pom.xml
+++ b/examples/jms/interceptor/pom.xml
@@ -63,7 +63,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
index 2b58d76570..7fa4b1c805 100644
--- a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
       <remoting-incoming-interceptors>
diff --git a/examples/jms/jms-auto-closeable/pom.xml b/examples/jms/jms-auto-closeable/pom.xml
index 37dff4a1db..07ff9c7a7c 100644
--- a/examples/jms/jms-auto-closeable/pom.xml
+++ b/examples/jms/jms-auto-closeable/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index ecbe10d510..d3989711ce 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/jms-bridge/pom.xml b/examples/jms/jms-bridge/pom.xml
index bcd7d1731a..ba67817ad7 100644
--- a/examples/jms/jms-bridge/pom.xml
+++ b/examples/jms/jms-bridge/pom.xml
@@ -153,7 +153,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 6ae6887b0c..3b1b3a68a5 100644
--- a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -28,13 +28,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <acceptors>
          <acceptor name="netty">tcp://localhost:61616</acceptor>
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/activemq-configuration.xml
index f0564f0dff..00d4d23255 100644
--- a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -28,13 +28,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <acceptors>
          <acceptor name="netty">tcp://localhost:5455</acceptor>
diff --git a/examples/jms/jms-completion-listener/pom.xml b/examples/jms/jms-completion-listener/pom.xml
index 5070dab5de..bc3d2a5731 100644
--- a/examples/jms/jms-completion-listener/pom.xml
+++ b/examples/jms/jms-completion-listener/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 2fa4eb8e65..e6fdb21b80 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/jms-context/pom.xml b/examples/jms/jms-context/pom.xml
index 690899b937..9005f2867f 100644
--- a/examples/jms/jms-context/pom.xml
+++ b/examples/jms/jms-context/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
index 2fa4eb8e65..e6fdb21b80 100644
--- a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/jms-shared-consumer/pom.xml b/examples/jms/jms-shared-consumer/pom.xml
index 817213854d..68c258177c 100644
--- a/examples/jms/jms-shared-consumer/pom.xml
+++ b/examples/jms/jms-shared-consumer/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 6b3cef387f..d397c74cb5 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/jmx/pom.xml b/examples/jms/jmx/pom.xml
index a176c21f1c..dbf0d95f13 100644
--- a/examples/jms/jmx/pom.xml
+++ b/examples/jms/jmx/pom.xml
@@ -70,7 +70,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
index c70bcb9611..c2c2c3af4f 100644
--- a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
       <!-- true to expose ActiveMQ resources through JMX -->
diff --git a/examples/jms/large-message/pom.xml b/examples/jms/large-message/pom.xml
index 86e04cdad8..eb7a06a403 100644
--- a/examples/jms/large-message/pom.xml
+++ b/examples/jms/large-message/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 2fa4eb8e65..e6fdb21b80 100644
--- a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/last-value-queue/pom.xml b/examples/jms/last-value-queue/pom.xml
index a3cf8c885f..24acc7533d 100644
--- a/examples/jms/last-value-queue/pom.xml
+++ b/examples/jms/last-value-queue/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index a00a58b5fe..10bd7ac8ea 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/management-notifications/pom.xml b/examples/jms/management-notifications/pom.xml
index 8d056e201a..c9fd2fa030 100644
--- a/examples/jms/management-notifications/pom.xml
+++ b/examples/jms/management-notifications/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 4a532d3619..451ea5add4 100644
--- a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -32,13 +32,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
       <management-notification-address>jms.topic.notificationsTopic</management-notification-address>
diff --git a/examples/jms/management/pom.xml b/examples/jms/management/pom.xml
index 2f0999d290..d6e70cace4 100644
--- a/examples/jms/management/pom.xml
+++ b/examples/jms/management/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
index 3db6d3ec21..37667b75d1 100644
--- a/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
       <management-address>jms.queue.activemq.management</management-address>
diff --git a/examples/jms/message-counters/pom.xml b/examples/jms/message-counters/pom.xml
index 2b100abc23..a429a78814 100644
--- a/examples/jms/message-counters/pom.xml
+++ b/examples/jms/message-counters/pom.xml
@@ -65,7 +65,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
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/activemq-configuration.xml
index 7578f2b36e..04a7647f08 100644
--- a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -32,13 +32,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
       <jmx-management-enabled>true</jmx-management-enabled>
diff --git a/examples/jms/message-group/pom.xml b/examples/jms/message-group/pom.xml
index 32a0ddada3..575f0e6c8f 100644
--- a/examples/jms/message-group/pom.xml
+++ b/examples/jms/message-group/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- 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
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/message-group2/pom.xml b/examples/jms/message-group2/pom.xml
index 5aaf48f51a..081a8280db 100644
--- a/examples/jms/message-group2/pom.xml
+++ b/examples/jms/message-group2/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- 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
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/message-priority/pom.xml b/examples/jms/message-priority/pom.xml
index 05311c19ab..acceb38578 100644
--- a/examples/jms/message-priority/pom.xml
+++ b/examples/jms/message-priority/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- 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
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/multiple-failover-failback/pom.xml b/examples/jms/multiple-failover-failback/pom.xml
index 90288dd896..98b4cfb263 100644
--- a/examples/jms/multiple-failover-failback/pom.xml
+++ b/examples/jms/multiple-failover-failback/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -99,7 +99,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -193,7 +193,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 47b8581801..c660fcbc13 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
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/activemq-configuration.xml
index 1893c492d0..63413f68f2 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
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/activemq-configuration.xml
index b58acf72b2..a0c551cfe5 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
diff --git a/examples/jms/multiple-failover/pom.xml b/examples/jms/multiple-failover/pom.xml
index 8c09050858..b908ab3862 100644
--- a/examples/jms/multiple-failover/pom.xml
+++ b/examples/jms/multiple-failover/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -99,7 +99,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -193,7 +193,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index e9d0b3b4a8..26ec8415a6 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
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/activemq-configuration.xml
index 1893c492d0..63413f68f2 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
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/activemq-configuration.xml
index 678f5ef2e2..866807edc0 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
diff --git a/examples/jms/no-consumer-buffering/pom.xml b/examples/jms/no-consumer-buffering/pom.xml
index 48e4ce7ff7..c52775db3d 100644
--- a/examples/jms/no-consumer-buffering/pom.xml
+++ b/examples/jms/no-consumer-buffering/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- 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
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/non-transaction-failover/pom.xml b/examples/jms/non-transaction-failover/pom.xml
index 8372c0451f..ac560750ba 100644
--- a/examples/jms/non-transaction-failover/pom.xml
+++ b/examples/jms/non-transaction-failover/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
diff --git a/examples/jms/openwire/pom.xml b/examples/jms/openwire/pom.xml
index d66eeb4f2d..4457a6f246 100644
--- a/examples/jms/openwire/pom.xml
+++ b/examples/jms/openwire/pom.xml
@@ -62,7 +62,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
index 6025111393..db48b82de9 100644
--- a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <connectors>
          <connector name="netty-connector">tcp://localhost:61616</connector>
diff --git a/examples/jms/paging/pom.xml b/examples/jms/paging/pom.xml
index 26aa8e859f..9f4ca092ce 100644
--- a/examples/jms/paging/pom.xml
+++ b/examples/jms/paging/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml
index b4e8eca530..4c17f4061b 100644
--- a/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -31,13 +31,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
       <!-- Connectors -->
diff --git a/examples/jms/perf/pom.xml b/examples/jms/perf/pom.xml
index cc747855a7..77bff21ee0 100644
--- a/examples/jms/perf/pom.xml
+++ b/examples/jms/perf/pom.xml
@@ -85,7 +85,7 @@ under the License.
                            <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                            <systemProperties>
                               <property>
-                                 <name>build.directory</name>
+                                 <name>data.dir</name>
                                  <value>${basedir}/target/</value>
                               </property>
                            </systemProperties>
diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml
index 25d91bd74f..5ef6f0c819 100644
--- a/examples/jms/pre-acknowledge/pom.xml
+++ b/examples/jms/pre-acknowledge/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 18970ea61b..5151c36ab8 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/producer-rate-limit/pom.xml b/examples/jms/producer-rate-limit/pom.xml
index 4290f5562f..32b45ca253 100644
--- a/examples/jms/producer-rate-limit/pom.xml
+++ b/examples/jms/producer-rate-limit/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- 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
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml
index 68f9d09d31..a8141bb52e 100644
--- a/examples/jms/proton-cpp/pom.xml
+++ b/examples/jms/proton-cpp/pom.xml
@@ -82,7 +82,7 @@ under the License.
                            <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                            <systemProperties>
                               <property>
-                                 <name>build.directory</name>
+                                 <name>data.dir</name>
                                  <value>${basedir}/target/</value>
                               </property>
                            </systemProperties>
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/activemq-configuration.xml
index 3caa202b27..2a5ac6f135 100644
--- a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
       <!-- Acceptors -->
diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml
index d9860bf3a3..455c6004df 100644
--- a/examples/jms/proton-j/pom.xml
+++ b/examples/jms/proton-j/pom.xml
@@ -59,7 +59,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 1363c97a54..53ad18ce40 100644
--- a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
       <!-- Acceptors -->
diff --git a/examples/jms/proton-ruby/pom.xml b/examples/jms/proton-ruby/pom.xml
index b1c9e29bc3..8f1f6481f2 100644
--- a/examples/jms/proton-ruby/pom.xml
+++ b/examples/jms/proton-ruby/pom.xml
@@ -55,7 +55,7 @@ under the License.
                      <waitOnStart>true</waitOnStart>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 5b09034613..409118b073 100644
--- a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml
index 9a4ce4c975..7b17a27832 100644
--- a/examples/jms/queue-message-redistribution/pom.xml
+++ b/examples/jms/queue-message-redistribution/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -168,7 +168,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 6c5f21f5bd..8d1d1896b2 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/activemq-configuration.xml
@@ -30,13 +30,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
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/activemq-configuration.xml
index 16274c25c8..c6cfa5dfd5 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/activemq-configuration.xml
@@ -30,13 +30,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
 
diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml
index 1e3e500bb7..59d4413c89 100644
--- a/examples/jms/queue-requestor/pom.xml
+++ b/examples/jms/queue-requestor/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
index 50f82e68c8..dda202b164 100644
--- a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml
index 53fa1062df..0f4f2d3113 100644
--- a/examples/jms/queue-selector/pom.xml
+++ b/examples/jms/queue-selector/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index cd6c1bb3a2..ddb9d67073 100644
--- a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -28,13 +28,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml
index 56e65e9e18..412c6a62ba 100644
--- a/examples/jms/queue/pom.xml
+++ b/examples/jms/queue/pom.xml
@@ -59,7 +59,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- a/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml
index 84b4739ff8..9ca8b32aee 100644
--- a/examples/jms/reattach-node/pom.xml
+++ b/examples/jms/reattach-node/pom.xml
@@ -125,7 +125,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 296ae7b5c2..301581b389 100644
--- a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
 
diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml
index bc82a1cd64..8c668dfcdd 100644
--- a/examples/jms/replicated-failback-static/pom.xml
+++ b/examples/jms/replicated-failback-static/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -164,7 +164,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index b613ea175d..81a7633626 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <cluster-user>exampleUser</cluster-user>
 
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/activemq-configuration.xml
index 33ba3ae940..f7ecac73cb 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <cluster-user>exampleUser</cluster-user>
 
diff --git a/examples/jms/replicated-failback/pom.xml b/examples/jms/replicated-failback/pom.xml
index 48e94a23e8..f8b87fe257 100644
--- a/examples/jms/replicated-failback/pom.xml
+++ b/examples/jms/replicated-failback/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -164,7 +164,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 4f13e4408c..cd267dc425 100644
--- a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <cluster-user>exampleUser</cluster-user>
 
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/activemq-configuration.xml
index 6eb92a5638..6ed8c398f3 100644
--- a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <cluster-user>exampleUser</cluster-user>
 
diff --git a/examples/jms/replicated-multiple-failover/pom.xml b/examples/jms/replicated-multiple-failover/pom.xml
index 33d1de9f03..c22a131572 100644
--- a/examples/jms/replicated-multiple-failover/pom.xml
+++ b/examples/jms/replicated-multiple-failover/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -99,7 +99,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -193,7 +193,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 9279edc896..29dcbb20c7 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <replication>
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/activemq-configuration.xml
index 87b0335594..25d85b0c69 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <replication>
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/activemq-configuration.xml
index 72af4a232a..6994070598 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server2/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server2/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server2/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server2/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server2/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server2/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <replication>
diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml
index 3a03c5189b..4e6481bcfa 100644
--- a/examples/jms/replicated-transaction-failover/pom.xml
+++ b/examples/jms/replicated-transaction-failover/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -78,7 +78,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -164,7 +164,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index ca040092f3..9e90b2ce1b 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <replication>
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/activemq-configuration.xml
index f935634d5c..8c7538db35 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <replication>
diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml
index 43c98eb8a5..1efced55f4 100644
--- a/examples/jms/request-reply/pom.xml
+++ b/examples/jms/request-reply/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
index 50f82e68c8..dda202b164 100644
--- a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml
index dad7bf2a58..285b6caf94 100644
--- a/examples/jms/scheduled-message/pom.xml
+++ b/examples/jms/scheduled-message/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- 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
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml
index 76549fd2db..2b014298f3 100644
--- a/examples/jms/security/pom.xml
+++ b/examples/jms/security/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
index c87229c52f..8b964a3367 100644
--- a/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -32,13 +32,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml
index d0183ded30..6e62ebcbf7 100644
--- a/examples/jms/send-acknowledgements/pom.xml
+++ b/examples/jms/send-acknowledgements/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- 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
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/ssl-enabled/pom.xml b/examples/jms/ssl-enabled/pom.xml
index c519c6357a..1327824eb6 100644
--- a/examples/jms/ssl-enabled/pom.xml
+++ b/examples/jms/ssl-enabled/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index bd358ef399..3e28f6949a 100644
--- a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/static-selector-jms/pom.xml b/examples/jms/static-selector-jms/pom.xml
index 754591a302..122ad5f77b 100644
--- a/examples/jms/static-selector-jms/pom.xml
+++ b/examples/jms/static-selector-jms/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 46c156bf42..556339473d 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/activemq-configuration.xml
@@ -31,13 +31,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/static-selector/pom.xml b/examples/jms/static-selector/pom.xml
index 61fa9657cd..680cb78ae9 100644
--- a/examples/jms/static-selector/pom.xml
+++ b/examples/jms/static-selector/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 56e4f05ea5..64fa1d8095 100644
--- a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/stomp-websockets/pom.xml b/examples/jms/stomp-websockets/pom.xml
index 485dcfa971..a93e6654d9 100644
--- a/examples/jms/stomp-websockets/pom.xml
+++ b/examples/jms/stomp-websockets/pom.xml
@@ -133,7 +133,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 12b2288a5b..59ad29b6ca 100644
--- a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/stomp/pom.xml b/examples/jms/stomp/pom.xml
index 0582fe294f..19d404865a 100644
--- a/examples/jms/stomp/pom.xml
+++ b/examples/jms/stomp/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
index 91311e5467..5d43ce4bb7 100644
--- a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/stomp1.1/pom.xml b/examples/jms/stomp1.1/pom.xml
index 3ad3ae1694..a7ca522f3a 100644
--- a/examples/jms/stomp1.1/pom.xml
+++ b/examples/jms/stomp1.1/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 91311e5467..5d43ce4bb7 100644
--- a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/stomp1.2/pom.xml b/examples/jms/stomp1.2/pom.xml
index 4cee9086ca..0375a48d09 100644
--- a/examples/jms/stomp1.2/pom.xml
+++ b/examples/jms/stomp1.2/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 91311e5467..5d43ce4bb7 100644
--- a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/stop-server-failover/pom.xml b/examples/jms/stop-server-failover/pom.xml
index 784bb58529..c1fce775cf 100644
--- a/examples/jms/stop-server-failover/pom.xml
+++ b/examples/jms/stop-server-failover/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -168,7 +168,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index c5ce28c4bf..ef63e109be 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
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/activemq-configuration.xml
index abcaed078d..0e3c7d8df4 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/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
diff --git a/examples/jms/symmetric-cluster/pom.xml b/examples/jms/symmetric-cluster/pom.xml
index b43d118db4..200c4be076 100644
--- a/examples/jms/symmetric-cluster/pom.xml
+++ b/examples/jms/symmetric-cluster/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -81,7 +81,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -103,7 +103,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -125,7 +125,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -147,7 +147,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -169,7 +169,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -298,7 +298,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 7156cb9651..0f39cab22c 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -31,13 +31,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
       <!-- Connectors -->
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/activemq-configuration.xml
index 8bde0be2c1..10bd5a210c 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -31,13 +31,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server1/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server1/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server1/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server1/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
 
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/activemq-configuration.xml
index 4384dcc251..9f0ed5a959 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -31,13 +31,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server2/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server2/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server2/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server2/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server2/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server2/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
 
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/activemq-configuration.xml
index 2c91ddfc90..2781eac93f 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
@@ -31,13 +31,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server3/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server3/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server3/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server3/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server3/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server3/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server3/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server3/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
 
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/activemq-configuration.xml
index 6851e6ca09..1c1fa816a9 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
@@ -31,13 +31,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server4/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server4/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server4/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server4/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server4/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server4/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server4/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server4/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
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/activemq-configuration.xml
index a44e4e2135..e51abd27c5 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml
@@ -31,13 +31,13 @@ under the License.
    <core xmlns="urn:activemq:core">
 
 
-      <bindings-directory>${build.directory}/server5/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server5/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server5/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server5/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server5/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server5/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server5/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server5/data/messaging/paging</paging-directory>
 
       <!-- Connectors -->
       <connectors>
diff --git a/examples/jms/temp-queue/pom.xml b/examples/jms/temp-queue/pom.xml
index d8df46e509..6574b3e03f 100644
--- a/examples/jms/temp-queue/pom.xml
+++ b/examples/jms/temp-queue/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index 85896d0e43..e269320547 100644
--- a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
 
       <!-- Connectors -->
diff --git a/examples/jms/topic-hierarchies/pom.xml b/examples/jms/topic-hierarchies/pom.xml
index 85a0a47461..0787010ee0 100644
--- a/examples/jms/topic-hierarchies/pom.xml
+++ b/examples/jms/topic-hierarchies/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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/activemq-configuration.xml
index e02e91f92b..5e89f3efb4 100644
--- a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,13 +40,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/topic-selector-example1/pom.xml b/examples/jms/topic-selector-example1/pom.xml
index 5bf693bebe..65ad547bbb 100644
--- a/examples/jms/topic-selector-example1/pom.xml
+++ b/examples/jms/topic-selector-example1/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
index 58180ddb55..212a1447d4 100644
--- a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/topic-selector-example2/pom.xml b/examples/jms/topic-selector-example2/pom.xml
index 12a413ea58..f7d8afbdfc 100644
--- a/examples/jms/topic-selector-example2/pom.xml
+++ b/examples/jms/topic-selector-example2/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
index 58180ddb55..212a1447d4 100644
--- a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml
index 5c3b4c1c42..47afc561b4 100644
--- a/examples/jms/topic/pom.xml
+++ b/examples/jms/topic/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml
index 58180ddb55..212a1447d4 100644
--- a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml
index 52123188da..b7887ab360 100644
--- a/examples/jms/transaction-failover/pom.xml
+++ b/examples/jms/transaction-failover/pom.xml
@@ -59,7 +59,7 @@ under the License.
                      <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -79,7 +79,7 @@ under the License.
                      <fork>true</fork>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                         <property>
@@ -164,7 +164,7 @@ under the License.
                <waitOnStart>false</waitOnStart>
                <systemProperties>
                   <property>
-                     <name>build.directory</name>
+                     <name>data.dir</name>
                      <value>${basedir}/target/</value>
                   </property>
                </systemProperties>
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/activemq-configuration.xml
index 75f9e5d45b..00a6a750a8 100644
--- a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
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/activemq-configuration.xml
index 1bc395c4e2..f7cb5aec5a 100644
--- a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <ha-policy>
          <shared-store>
diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml
index 8ffc13de4f..c66afe04d2 100644
--- a/examples/jms/transactional/pom.xml
+++ b/examples/jms/transactional/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml
index 22910962b1..df9144d3e3 100644
--- a/examples/jms/xa-heuristic/pom.xml
+++ b/examples/jms/xa-heuristic/pom.xml
@@ -76,7 +76,7 @@ under the License.
                            <value>false</value>
                         </property>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- 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
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml
index c9964a303c..fc7c3e5f4a 100644
--- a/examples/jms/xa-receive/pom.xml
+++ b/examples/jms/xa-receive/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- 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
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>
diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml
index 41af659225..1e3e7d97e4 100644
--- a/examples/jms/xa-send/pom.xml
+++ b/examples/jms/xa-send/pom.xml
@@ -58,7 +58,7 @@ under the License.
                   <configuration>
                      <systemProperties>
                         <property>
-                           <name>build.directory</name>
+                           <name>data.dir</name>
                            <value>${basedir}/target/</value>
                         </property>
                      </systemProperties>
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
index 2fa4eb8e65..e6fdb21b80 100644
--- 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
@@ -29,13 +29,13 @@ under the License.
 
    <core xmlns="urn:activemq:core">
 
-      <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+      <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
 
-      <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+      <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
 
-      <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+      <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
 
-      <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+      <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
 
       <!-- Acceptors -->
       <acceptors>