You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/03/04 16:02:05 UTC

[01/11] activemq-6 git commit: add flag to broker plugin to skip starting.

Repository: activemq-6
Updated Branches:
  refs/heads/master 8041f1f94 -> 6f2720703


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/xa-send/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml
index 41af659..1e3e7d9 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

[08/11] activemq-6 git commit: This closes #139 on plugin start

Posted by cl...@apache.org.
This closes #139 on plugin start


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

Branch: refs/heads/master
Commit: 6d69055243b7d57c0ef882bf3cdba4fee28eb771
Parents: 8041f1f 25f3343
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Mar 4 09:59:44 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Mar 4 09:59:44 2015 -0500

----------------------------------------------------------------------
 .../activemq/maven/ActiveMQStartPlugin.java     |  8 +++++
 .../activemq/maven/ActiveMQStopPlugin.java      |  5 +++
 .../activemq/src/main/resources/README.html     |  8 ++---
 .../resources/config/examples/bootstrap.xml     | 33 ++++++++++++++++++++
 .../src/main/resources/examples/index.html      | 10 ++++++
 examples/jms/aerogear/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/applet/pom.xml                     |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/bridge/pom.xml                     |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/browser/pom.xml                    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/client-kickoff/pom.xml             |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../jms/client-side-failoverlistener/pom.xml    |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/client-side-load-balancing/pom.xml |  8 ++---
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 .../jms/clustered-durable-subscription/pom.xml  |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/clustered-grouping/pom.xml         |  8 ++---
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 examples/jms/clustered-static-discovery/pom.xml |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 .../activemq/server3/activemq-configuration.xml |  8 ++---
 examples/jms/clustered-static-oneway/pom.xml    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 examples/jms/clustered-topic/pom.xml            |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/consumer-rate-limit/pom.xml        |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/dead-letter/pom.xml                |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/delayed-redelivery/pom.xml         |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/divert/pom.xml                     |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/durable-subscription/pom.xml       |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/embedded/pom.xml                   |  2 +-
 examples/jms/expiry/pom.xml                     |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/http-transport/pom.xml             |  4 +--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../jms/instantiate-connection-factory/pom.xml  |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/interceptor/pom.xml                |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/jms-auto-closeable/pom.xml         |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/jms-bridge/pom.xml                 |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/jms-completion-listener/pom.xml    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/jms-context/pom.xml                |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/jms-shared-consumer/pom.xml        |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/jmx/pom.xml                        |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/large-message/pom.xml              |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/last-value-queue/pom.xml           |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/management-notifications/pom.xml   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/management/pom.xml                 |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/message-counters/pom.xml           |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/message-group/pom.xml              |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/message-group2/pom.xml             |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/message-priority/pom.xml           |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/multiple-failover-failback/pom.xml |  8 ++---
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 examples/jms/multiple-failover/pom.xml          |  8 ++---
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 examples/jms/no-consumer-buffering/pom.xml      |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/non-transaction-failover/pom.xml   |  4 +--
 examples/jms/openwire/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/paging/pom.xml                     |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/perf/pom.xml                       |  2 +-
 examples/jms/pre-acknowledge/pom.xml            |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/producer-rate-limit/pom.xml        |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/proton-cpp/pom.xml                 |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/proton-j/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/proton-ruby/pom.xml                |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../jms/queue-message-redistribution/pom.xml    |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/queue-requestor/pom.xml            |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/queue-selector/pom.xml             |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/queue/pom.xml                      |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/reattach-node/pom.xml              |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/replicated-failback-static/pom.xml |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/replicated-failback/pom.xml        |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../jms/replicated-multiple-failover/pom.xml    |  8 ++---
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 .../jms/replicated-transaction-failover/pom.xml |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/request-reply/pom.xml              |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/scheduled-message/pom.xml          |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/security/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/send-acknowledgements/pom.xml      |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/ssl-enabled/pom.xml                |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/static-selector-jms/pom.xml        |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/static-selector/pom.xml            |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/stomp-websockets/pom.xml           |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/stomp/pom.xml                      |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/stomp1.1/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/stomp1.2/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/stop-server-failover/pom.xml       |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/symmetric-cluster/pom.xml          | 14 ++++-----
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 .../activemq/server3/activemq-configuration.xml |  8 ++---
 .../activemq/server4/activemq-configuration.xml |  8 ++---
 .../activemq/server5/activemq-configuration.xml |  8 ++---
 examples/jms/temp-queue/pom.xml                 |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/topic-hierarchies/pom.xml          |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/topic-selector-example1/pom.xml    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/topic-selector-example2/pom.xml    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/topic/pom.xml                      |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/transaction-failover/pom.xml       |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/transactional/pom.xml              |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/xa-heuristic/pom.xml               |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/xa-receive/pom.xml                 |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/xa-send/pom.xml                    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 194 files changed, 617 insertions(+), 561 deletions(-)
----------------------------------------------------------------------

[05/11] activemq-6 git commit: fix scripts to allow a different environment to be set

Posted by cl...@apache.org.
fix scripts to allow a different environment to be set


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/9e725457
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/9e725457
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/9e725457

Branch: refs/heads/master
Commit: 9e725457d6af54ab02be8349290608f4f94e7fa0
Parents: 8041f1f
Author: Andy Taylor <an...@apache.org>
Authored: Wed Mar 4 12:28:20 2015 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Wed Mar 4 12:28:32 2015 +0000

----------------------------------------------------------------------
 distribution/activemq/src/main/resources/bin/activemq   |  7 ++++++-
 .../activemq/src/main/resources/bin/activemq.cmd        |  2 +-
 .../activemq/src/main/resources/bin/activemq.conf       |  2 +-
 .../activemq/src/main/resources/bin/activemq.conf.bat   |  2 +-
 docs/user-manual/en/using-server.md                     | 12 ++++++++++++
 5 files changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9e725457/distribution/activemq/src/main/resources/bin/activemq
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/activemq b/distribution/activemq/src/main/resources/bin/activemq
index 74ca5da..ac08980 100755
--- a/distribution/activemq/src/main/resources/bin/activemq
+++ b/distribution/activemq/src/main/resources/bin/activemq
@@ -102,7 +102,12 @@ ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
 JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
 
 # Load Runtime Config
-. $ACTIVEMQ_HOME/bin/activemq.conf
+if [ -z "$ACTIVEMQ_CONF" ] ; then
+   ACTIVEMQ_CONF=$ACTIVEMQ_HOME/bin/activemq.conf
+else
+   ACTIVEMQ_CONF="$ACTIVEMQ_CONF"
+fi
+. $ACTIVEMQ_CONF
 
 JAVA_ARGS="$JAVA_ARGS $ACTIVEMQ_CLUSTER_PROPS -Dactivemq.home=$ACTIVEMQ_HOME -Djava.library.path=$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_HOME/bin/lib/linux-x86_64 -Ddata.dir=$ACTIVEMQ_DATA_DIR -Djava.util.logging.manager=$ACTIVEMQ_LOG_MANAGER -Dlogging.configuration=$ACTIVEMQ_LOGGING_CONF $DEBUG_ARGS"
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9e725457/distribution/activemq/src/main/resources/bin/activemq.cmd
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/activemq.cmd b/distribution/activemq/src/main/resources/bin/activemq.cmd
index 731d708..f5b452b 100755
--- a/distribution/activemq/src/main/resources/bin/activemq.cmd
+++ b/distribution/activemq/src/main/resources/bin/activemq.cmd
@@ -54,7 +54,7 @@ set ACTIVEMQ_DATA_DIR="%ACTIVEMQ_HOME%\data"
 set ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
 
 rem "Load Config"
-set ACTIVEMQ_CONF="%ACTIVEMQ_HOME%\bin\activemq.conf.bat"
+if "%ACTIVEMQ_CONF%" == "" set ACTIVEMQ_DATA="%ACTIVEMQ_HOME%\bin\activemq.conf.bat"
 if exist "%ACTIVEMQ_CONF%" (
    call "%ACTIVEMQ_CONF%" %*
 ) else (

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9e725457/distribution/activemq/src/main/resources/bin/activemq.conf
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/activemq.conf b/distribution/activemq/src/main/resources/bin/activemq.conf
index 9ac1e18..fbfa243 100644
--- a/distribution/activemq/src/main/resources/bin/activemq.conf
+++ b/distribution/activemq/src/main/resources/bin/activemq.conf
@@ -25,7 +25,7 @@ ACTIVEMQ_DATA_DIR=$ACTIVEMQ_HOME/data
 ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
 
 # Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in activemq-configuration.xml
-#ACTIVEMQ_CLUSTER_PROPS="-Dactivemq.remoting.netty.port=61618"
+#ACTIVEMQ_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446"
 
 # Java Opts
 JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9e725457/distribution/activemq/src/main/resources/bin/activemq.conf.bat
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/activemq.conf.bat b/distribution/activemq/src/main/resources/bin/activemq.conf.bat
index b1a231b..c97ce3f 100644
--- a/distribution/activemq/src/main/resources/bin/activemq.conf.bat
+++ b/distribution/activemq/src/main/resources/bin/activemq.conf.bat
@@ -25,7 +25,7 @@ rem Log manager class
 set ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
 
 rem Cluster Properties: Used to pass arguments to ActiveMQ.  These can be referenced in activemq-configuration.xml
-rem set ACTIVEMQ_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617
+rem set ACTIVEMQ_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
 
 rem Java Opts
 set JAVA_ARGS=-Xmx1024m

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9e725457/docs/user-manual/en/using-server.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/using-server.md b/docs/user-manual/en/using-server.md
index 451a957..f4e6f1c 100644
--- a/docs/user-manual/en/using-server.md
+++ b/docs/user-manual/en/using-server.md
@@ -37,6 +37,18 @@ used. The configuration can be changed e.g. by running
 `./activemq run -- xml:../config/clustered/bootstrap.xml` or another
 config of your choosing.
 
+Environment variables are used to provide ease of changing ports, hosts and
+data directories used and can be found in `activemq.conf` on linux and
+`activemq.conf.bat` on Windows. A different properties file can be used by
+setting the property `ACTIVEMQ_CONF`, on linux this would be:
+
+      export ACTIVEMQ_CONF=myenv.env
+
+or on Windows
+
+      set ACTIVEMQ_CONF=myenv.env
+
+
 ## Server JVM settings
 
 The run scripts set some JVM settings for tuning the garbage collection

[07/11] activemq-6 git commit: Add source build to release profile

Posted by cl...@apache.org.
Add source build to release profile


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

Branch: refs/heads/master
Commit: b7caa5d8e67504c08148d140a1cf39c2fb0fd897
Parents: 8041f1f
Author: Martyn Taylor <mt...@redhat.com>
Authored: Wed Mar 4 14:41:52 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Wed Mar 4 14:41:52 2015 +0000

----------------------------------------------------------------------
 pom.xml | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/b7caa5d8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c54af26..7798394 100644
--- a/pom.xml
+++ b/pom.xml
@@ -494,6 +494,49 @@
             <module>examples</module>
             <module>distribution</module>
          </modules>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-assembly-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <goals>
+                           <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                           <finalName>apache-activemq-${project.version}</finalName>
+                           <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                           <descriptorRefs>
+                              <descriptorRef>
+                                 source-release
+                              </descriptorRef>
+                           </descriptorRefs>
+                        </configuration>
+                     </execution>
+                  </executions>
+                  <dependencies>
+                     <dependency>
+                        <!-- apache version not yet released -->
+                        <!--<groupId>org.apache</groupId>-->
+                        <groupId>org.apache.geronimo.genesis</groupId>
+                        <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                        <!-- apache version not yet known -->
+                        <version>2.0</version>
+                     </dependency>
+                  </dependencies>
+               </plugin>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <version>2.14.1</version>
+                  <configuration>
+                     <test>false</test>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
       </profile>
       <profile>
          <id>hudson-tests</id>

[11/11] activemq-6 git commit: This closes #142 - source release build

Posted by cl...@apache.org.
This closes #142 - source release build


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

Branch: refs/heads/master
Commit: 6f2720703d8c5accaf69ae3e6c7892a948f8c518
Parents: 40b1f38 b7caa5d
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Mar 4 10:01:42 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Mar 4 10:01:42 2015 -0500

----------------------------------------------------------------------
 pom.xml | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
----------------------------------------------------------------------

[04/11] activemq-6 git commit: add flag to broker plugin to skip starting.

Posted by cl...@apache.org.
add flag to broker plugin to skip starting.

Also added an example bootstrap and updated the examples so this would work.


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/25f3343b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/25f3343b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/25f3343b

Branch: refs/heads/master
Commit: 25f3343ba51ff647aa215448c1ae5a461d103917
Parents: 8041f1f
Author: Andy Taylor <an...@apache.org>
Authored: Tue Mar 3 16:35:24 2015 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Wed Mar 4 11:48:46 2015 +0000

----------------------------------------------------------------------
 .../activemq/maven/ActiveMQStartPlugin.java     |  8 +++++
 .../activemq/maven/ActiveMQStopPlugin.java      |  5 +++
 .../activemq/src/main/resources/README.html     |  8 ++---
 .../resources/config/examples/bootstrap.xml     | 33 ++++++++++++++++++++
 .../src/main/resources/examples/index.html      | 10 ++++++
 examples/jms/aerogear/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/applet/pom.xml                     |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/bridge/pom.xml                     |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/browser/pom.xml                    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/client-kickoff/pom.xml             |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../jms/client-side-failoverlistener/pom.xml    |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/client-side-load-balancing/pom.xml |  8 ++---
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 .../jms/clustered-durable-subscription/pom.xml  |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/clustered-grouping/pom.xml         |  8 ++---
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 examples/jms/clustered-static-discovery/pom.xml |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 .../activemq/server3/activemq-configuration.xml |  8 ++---
 examples/jms/clustered-static-oneway/pom.xml    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 examples/jms/clustered-topic/pom.xml            |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/consumer-rate-limit/pom.xml        |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/dead-letter/pom.xml                |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/delayed-redelivery/pom.xml         |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/divert/pom.xml                     |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/durable-subscription/pom.xml       |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/embedded/pom.xml                   |  2 +-
 examples/jms/expiry/pom.xml                     |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/http-transport/pom.xml             |  4 +--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../jms/instantiate-connection-factory/pom.xml  |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/interceptor/pom.xml                |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/jms-auto-closeable/pom.xml         |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/jms-bridge/pom.xml                 |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/jms-completion-listener/pom.xml    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/jms-context/pom.xml                |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/jms-shared-consumer/pom.xml        |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/jmx/pom.xml                        |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/large-message/pom.xml              |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/last-value-queue/pom.xml           |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/management-notifications/pom.xml   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/management/pom.xml                 |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/message-counters/pom.xml           |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/message-group/pom.xml              |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/message-group2/pom.xml             |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/message-priority/pom.xml           |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/multiple-failover-failback/pom.xml |  8 ++---
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 examples/jms/multiple-failover/pom.xml          |  8 ++---
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 examples/jms/no-consumer-buffering/pom.xml      |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/non-transaction-failover/pom.xml   |  4 +--
 examples/jms/openwire/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/paging/pom.xml                     |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/perf/pom.xml                       |  2 +-
 examples/jms/pre-acknowledge/pom.xml            |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/producer-rate-limit/pom.xml        |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/proton-cpp/pom.xml                 |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/proton-j/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/proton-ruby/pom.xml                |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../jms/queue-message-redistribution/pom.xml    |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/queue-requestor/pom.xml            |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/queue-selector/pom.xml             |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/queue/pom.xml                      |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/reattach-node/pom.xml              |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/replicated-failback-static/pom.xml |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/replicated-failback/pom.xml        |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../jms/replicated-multiple-failover/pom.xml    |  8 ++---
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 .../jms/replicated-transaction-failover/pom.xml |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/request-reply/pom.xml              |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/scheduled-message/pom.xml          |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/security/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/send-acknowledgements/pom.xml      |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/ssl-enabled/pom.xml                |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/static-selector-jms/pom.xml        |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/static-selector/pom.xml            |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/stomp-websockets/pom.xml           |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/stomp/pom.xml                      |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/stomp1.1/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/stomp1.2/pom.xml                   |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/stop-server-failover/pom.xml       |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/symmetric-cluster/pom.xml          | 14 ++++-----
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 .../activemq/server2/activemq-configuration.xml |  8 ++---
 .../activemq/server3/activemq-configuration.xml |  8 ++---
 .../activemq/server4/activemq-configuration.xml |  8 ++---
 .../activemq/server5/activemq-configuration.xml |  8 ++---
 examples/jms/temp-queue/pom.xml                 |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/topic-hierarchies/pom.xml          |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/topic-selector-example1/pom.xml    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/topic-selector-example2/pom.xml    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/topic/pom.xml                      |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/transaction-failover/pom.xml       |  6 ++--
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 .../activemq/server1/activemq-configuration.xml |  8 ++---
 examples/jms/transactional/pom.xml              |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/xa-heuristic/pom.xml               |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/xa-receive/pom.xml                 |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 examples/jms/xa-send/pom.xml                    |  2 +-
 .../activemq/server0/activemq-configuration.xml |  8 ++---
 194 files changed, 617 insertions(+), 561 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java
----------------------------------------------------------------------
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 5bc91aa..4966253 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

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java
----------------------------------------------------------------------
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 b6b374b..6d8cc3e 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 : ".";

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/distribution/activemq/src/main/resources/README.html
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/README.html b/distribution/activemq/src/main/resources/README.html
index 3040d1a..8e41d4f 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>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/distribution/activemq/src/main/resources/config/examples/bootstrap.xml
----------------------------------------------------------------------
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 0000000..a8762d1
--- /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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/distribution/activemq/src/main/resources/examples/index.html
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/examples/index.html b/distribution/activemq/src/main/resources/examples/index.html
index 7269c41..a33ca69 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/aerogear/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/pom.xml b/examples/jms/aerogear/pom.xml
index 2f574b6..c9cf4c9 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 5853529..a48e675 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/applet/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/pom.xml b/examples/jms/applet/pom.xml
index 0406479..c09ec62 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 d885047..74148cf 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml
index d4beaa6..d5cb9ea 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 9f06f6c..248d875 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 85373cf..ae4375d 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/browser/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml
index 50348ed..51892e0 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 68a6041..a92fa6c 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/client-kickoff/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml
index 250a092..442d88a 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 7b35ae7..337e434 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/client-side-failoverlistener/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/pom.xml b/examples/jms/client-side-failoverlistener/pom.xml
index 1325fb6..2e116e9 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 5b45f63..ace0831 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 1893c49..63413f6 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/client-side-load-balancing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/pom.xml b/examples/jms/client-side-load-balancing/pom.xml
index bf55b5e..b1896a9 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 61156f0..b21b2f5 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 b61f74e..a3ed424 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
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 68ca521..b704957 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-durable-subscription/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/pom.xml b/examples/jms/clustered-durable-subscription/pom.xml
index 07e26e6..43d8ae7 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 a5a7bad..d94b55a 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 -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 8edf2df..a27d74c 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-grouping/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/pom.xml b/examples/jms/clustered-grouping/pom.xml
index ea5cdc9..ffd3ea5 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 f92bdb4..e363263 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 a57852d..5c4bb4f 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
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 ab6e98f..0e98c4a 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-static-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/pom.xml b/examples/jms/clustered-static-discovery/pom.xml
index 17cd794..48c0d4d 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 4f04ecb..b37f4d8 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 27ea9f8..8816fb7 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
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 a3b1e6c..a90c7b9 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
----------------------------------------------------------------------
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 9dd03a6..b38eae0 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-static-oneway/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/pom.xml b/examples/jms/clustered-static-oneway/pom.xml
index 125c322..ec9af39 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 3b1e2a8..403d6a0 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 17f5463..9ba1943 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
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 5913b63..63c70cd 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-topic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/pom.xml b/examples/jms/clustered-topic/pom.xml
index 4dda418..f28b58a 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 a97eb07..90e975d 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 d23c090..bb60ecb 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/consumer-rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/pom.xml b/examples/jms/consumer-rate-limit/pom.xml
index 6f3dbf4..2269fd7 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/dead-letter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/pom.xml b/examples/jms/dead-letter/pom.xml
index b4391a3..4fa9bca 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 669916d..a684f4e 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/delayed-redelivery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/pom.xml b/examples/jms/delayed-redelivery/pom.xml
index 770771c..eb24e1d 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 4939305..fca483a 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/divert/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/pom.xml b/examples/jms/divert/pom.xml
index 9ff9234..2651264 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 8ef5e97..8c7fe63 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 7177beb..a90aee2 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/durable-subscription/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/pom.xml b/examples/jms/durable-subscription/pom.xml
index 13e78bf..ab00230 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 058b434..51d9a56 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/embedded/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded/pom.xml b/examples/jms/embedded/pom.xml
index ad3f8ad..0ed98b3 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/expiry/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/pom.xml b/examples/jms/expiry/pom.xml
index c010d84..470ce64 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>

[03/11] activemq-6 git commit: add flag to broker plugin to skip starting.

Posted by cl...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 ffe273b..e7ff821 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/http-transport/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/pom.xml b/examples/jms/http-transport/pom.xml
index 56af34b..e50d33b 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 5b3af96..5bb2090 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/instantiate-connection-factory/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/pom.xml b/examples/jms/instantiate-connection-factory/pom.xml
index 46725d5..5c5b146 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 701671f..5b6b4b4 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/interceptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/pom.xml b/examples/jms/interceptor/pom.xml
index 0443ec8..7eb9bd2 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2b58d76..7fa4b1c 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jms-auto-closeable/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/pom.xml b/examples/jms/jms-auto-closeable/pom.xml
index 37dff4a..07ff9c7 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 ecbe10d..d398971 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jms-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/pom.xml b/examples/jms/jms-bridge/pom.xml
index bcd7d17..ba67817 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 6ae6887..3b1b3a6 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 f0564f0..00d4d23 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jms-completion-listener/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/pom.xml b/examples/jms/jms-completion-listener/pom.xml
index 5070dab..bc3d2a5 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jms-context/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/pom.xml b/examples/jms/jms-context/pom.xml
index 690899b..9005f28 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jms-shared-consumer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/pom.xml b/examples/jms/jms-shared-consumer/pom.xml
index 8172138..68c2581 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 6b3cef3..d397c74 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jmx/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/pom.xml b/examples/jms/jmx/pom.xml
index a176c21..dbf0d95 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 c70bcb9..c2c2c3a 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 -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/large-message/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/pom.xml b/examples/jms/large-message/pom.xml
index 86e04cd..eb7a06a 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/last-value-queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/pom.xml b/examples/jms/last-value-queue/pom.xml
index a3cf8c8..24acc75 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 a00a58b..10bd7ac 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/management-notifications/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/pom.xml b/examples/jms/management-notifications/pom.xml
index 8d056e2..c9fd2fa 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 4a532d3..451ea5a 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/management/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/pom.xml b/examples/jms/management/pom.xml
index 2f0999d..d6e70ca 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 3db6d3e..37667b7 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/message-counters/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/pom.xml b/examples/jms/message-counters/pom.xml
index 2b100ab..a429a78 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 7578f2b..04a7647 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/message-group/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/pom.xml b/examples/jms/message-group/pom.xml
index 32a0dda..575f0e6 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/message-group2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/pom.xml b/examples/jms/message-group2/pom.xml
index 5aaf48f..081a828 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/message-priority/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/pom.xml b/examples/jms/message-priority/pom.xml
index 05311c1..acceb38 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/multiple-failover-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/pom.xml b/examples/jms/multiple-failover-failback/pom.xml
index 90288dd..98b4cfb 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 47b8581..c660fcb 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 1893c49..63413f6 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
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 b58acf7..a0c551c 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/pom.xml b/examples/jms/multiple-failover/pom.xml
index 8c09050..b908ab3 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 e9d0b3b..26ec841 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 1893c49..63413f6 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
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 678f5ef..866807e 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/no-consumer-buffering/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/pom.xml b/examples/jms/no-consumer-buffering/pom.xml
index 48e4ce7..c52775d 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/non-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/pom.xml b/examples/jms/non-transaction-failover/pom.xml
index 8372c04..ac56075 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/openwire/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/pom.xml b/examples/jms/openwire/pom.xml
index d66eeb4..4457a6f 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 6025111..db48b82 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/paging/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/paging/pom.xml b/examples/jms/paging/pom.xml
index 26aa8e8..9f4ca09 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 b4e8eca..4c17f40 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 -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/pom.xml b/examples/jms/perf/pom.xml
index cc74785..77bff21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/pre-acknowledge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml
index 25d91bd..5ef6f0c 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 18970ea..5151c36 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/producer-rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/pom.xml b/examples/jms/producer-rate-limit/pom.xml
index 4290f55..32b45ca 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/proton-cpp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml
index 68f9d09..a8141bb 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 3caa202..2a5ac6f 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 -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/proton-j/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml
index d9860bf..455c600 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 1363c97..53ad18c 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 -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/proton-ruby/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-ruby/pom.xml b/examples/jms/proton-ruby/pom.xml
index b1c9e29..8f1f648 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 5b09034..409118b 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/queue-message-redistribution/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml
index 9a4ce4c..7b17a27 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 6c5f21f..8d1d189 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 16274c2..c6cfa5d 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/queue-requestor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml
index 1e3e500..59d4413 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 50f82e6..dda202b 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/queue-selector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml
index 53fa106..0f4f2d3 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 cd6c1bb..ddb9d67 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml
index 56e65e9..412c6a6 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

[06/11] activemq-6 git commit: fix gitbook command name for windows

Posted by cl...@apache.org.
fix gitbook command name for windows


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

Branch: refs/heads/master
Commit: e178092dcc8ab7f1e72b1ddb784264f3f98b9f5a
Parents: 8041f1f
Author: Howard Gao <hg...@redhat.com>
Authored: Wed Mar 4 21:34:20 2015 +0800
Committer: Howard Gao <hg...@redhat.com>
Committed: Wed Mar 4 21:35:54 2015 +0800

----------------------------------------------------------------------
 activemq-website/pom.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e178092d/activemq-website/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-website/pom.xml b/activemq-website/pom.xml
index 5c27894..9060013 100644
--- a/activemq-website/pom.xml
+++ b/activemq-website/pom.xml
@@ -119,10 +119,13 @@
                       <phase>generate-sources</phase>
                       <configuration>
                         <target>
+			  <condition property="gitbook.cmd" value="gitbook.cmd" else="gitbook">
+			    <os family="windows"/>
+			  </condition>
                           <!-- lets generate the gitbook -->
                           <mkdir dir="${webapp-outdir}/gitbook" />
-                          <echo>executing gitbook</echo>
-                          <exec executable="gitbook">
+                          <echo>executing ${gitbook.cmd}</echo>
+                          <exec executable="${gitbook.cmd}">
                             <arg value="build" />
                             <arg value="${basedir}/../docs/user-manual/en" />
                             <arg value="--output=${webapp-outdir}" />

[09/11] activemq-6 git commit: This closes #140 - environment variables being set on script

Posted by cl...@apache.org.
This closes #140 - environment variables being set on script


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/53f56a41
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/53f56a41
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/53f56a41

Branch: refs/heads/master
Commit: 53f56a419034a9a56553100a8e6b979e82ffaf42
Parents: 6d69055 9e72545
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Mar 4 10:00:28 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Mar 4 10:00:28 2015 -0500

----------------------------------------------------------------------
 distribution/activemq/src/main/resources/bin/activemq   |  7 ++++++-
 .../activemq/src/main/resources/bin/activemq.cmd        |  2 +-
 .../activemq/src/main/resources/bin/activemq.conf       |  2 +-
 .../activemq/src/main/resources/bin/activemq.conf.bat   |  2 +-
 docs/user-manual/en/using-server.md                     | 12 ++++++++++++
 5 files changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------

[02/11] activemq-6 git commit: add flag to broker plugin to skip starting.

Posted by cl...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/reattach-node/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml
index 84b4739..9ca8b32 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 296ae7b..301581b 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-failback-static/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml
index bc82a1c..8c668df 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 b613ea1..81a7633 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>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 33ba3ae..f7ecac7 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>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/pom.xml b/examples/jms/replicated-failback/pom.xml
index 48e94a2..f8b87fe 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 4f13e44..cd267dc 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>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 6eb92a5..6ed8c39 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>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/pom.xml b/examples/jms/replicated-multiple-failover/pom.xml
index 33d1de9..c22a131 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 9279edc..29dcbb2 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 87b0335..25d85b0 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
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 72af4a2..6994070 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml
index 3a03c51..4e6481b 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 ca04009..9e90b2c 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 f935634..8c7538d 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/request-reply/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml
index 43c98eb..1efced5 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 50f82e6..dda202b 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/scheduled-message/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml
index dad7bf2..285b6ca 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml
index 76549fd..2b01429 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 c87229c..8b964a3 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/send-acknowledgements/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml
index d0183de..6e62ebc 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/ssl-enabled/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/pom.xml b/examples/jms/ssl-enabled/pom.xml
index c519c63..1327824 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 bd358ef..3e28f69 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/static-selector-jms/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/pom.xml b/examples/jms/static-selector-jms/pom.xml
index 754591a..122ad5f 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 46c156b..5563394 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/static-selector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/pom.xml b/examples/jms/static-selector/pom.xml
index 61fa965..680cb78 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 56e4f05..64fa1d8 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/stomp-websockets/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/pom.xml b/examples/jms/stomp-websockets/pom.xml
index 485dcfa..a93e665 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 12b2288..59ad29b 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/stomp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/pom.xml b/examples/jms/stomp/pom.xml
index 0582fe2..19d4048 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 91311e5..5d43ce4 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/stomp1.1/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/pom.xml b/examples/jms/stomp1.1/pom.xml
index 3ad3ae1..a7ca522 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 91311e5..5d43ce4 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/stomp1.2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/pom.xml b/examples/jms/stomp1.2/pom.xml
index 4cee908..0375a48 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 91311e5..5d43ce4 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/stop-server-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/pom.xml b/examples/jms/stop-server-failover/pom.xml
index 784bb58..c1fce77 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 c5ce28c..ef63e10 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 abcaed0..0e3c7d8 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/symmetric-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/pom.xml b/examples/jms/symmetric-cluster/pom.xml
index b43d118..200c4be 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 7156cb9..0f39cab 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 -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 8bde0be..10bd5a2 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
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 4384dcc..9f0ed5a 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
----------------------------------------------------------------------
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 2c91ddf..2781eac 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 -->
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
----------------------------------------------------------------------
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 6851e6c..1c1fa81 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml
----------------------------------------------------------------------
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 a44e4e2..e51abd2 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/temp-queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/pom.xml b/examples/jms/temp-queue/pom.xml
index d8df46e..6574b3e 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 85896d0..e269320 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 -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/topic-hierarchies/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/pom.xml b/examples/jms/topic-hierarchies/pom.xml
index 85a0a47..0787010 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 e02e91f..5e89f3e 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/topic-selector-example1/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/pom.xml b/examples/jms/topic-selector-example1/pom.xml
index 5bf693b..65ad547 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 58180dd..212a144 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/topic-selector-example2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/pom.xml b/examples/jms/topic-selector-example2/pom.xml
index 12a413e..f7d8afb 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 58180dd..212a144 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/topic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml
index 5c3b4c1..47afc56 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 58180dd..212a144 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml
index 5212318..b7887ab 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 75f9e5d..00a6a75 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
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 1bc395c..f7cb5ae 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/transactional/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml
index 8ffc13d..c66afe0 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/xa-heuristic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml
index 2291096..df9144d 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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 2fa4eb8..e6fdb21 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>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25f3343b/examples/jms/xa-receive/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml
index c9964a3..fc7c3e5 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>

[10/11] activemq-6 git commit: This closes #141 - gitbook command on windows (build on windows)

Posted by cl...@apache.org.
This closes #141 - gitbook command on windows (build on windows)


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/40b1f385
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/40b1f385
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/40b1f385

Branch: refs/heads/master
Commit: 40b1f3852e27fe5ed5f75bf09434b9b31ed31914
Parents: 53f56a4 e178092
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Mar 4 10:00:56 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Mar 4 10:00:56 2015 -0500

----------------------------------------------------------------------
 activemq-website/pom.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------