Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: chirino@apache.org
To: commits@activemq.apache.org
Date: Thu, 10 Oct 2013 14:40:25 -0000
Message-Id: <0045f358f3dc4104b7ffa3ce9358d19b@git.apache.org>
In-Reply-To: <b952ada65df04a2faeff729e94a36315@git.apache.org>
References: <b952ada65df04a2faeff729e94a36315@git.apache.org>
Subject: [02/18] Porting apollo examples structure to ActiveMQ 5.9.

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/release/examples/stomp/websocket/js/stomp.js
----------------------------------------------------------------------
diff --git a/assembly/src/release/examples/stomp/websocket/js/stomp.js b/assembly/src/release/examples/stomp/websocket/js/stomp.js
new file mode 100644
index 0000000..3e237f1
--- /dev/null
+++ b/assembly/src/release/examples/stomp/websocket/js/stomp.js
@@ -0,0 +1,379 @@
+// Generated by CoffeeScript 1.3.3
+(function() {
+  var Byte, Client, Frame, Stomp,
+    __hasProp = {}.hasOwnProperty;
+  
+  var MAX_FRAME_SIZE=16*1024;;
+  
+  Byte = {
+    LF: '\x0A',
+    NULL: '\x00'
+  };
+
+  Frame = (function() {
+
+    function Frame(command, headers, body) {
+      this.command = command;
+      this.headers = headers != null ? headers : {};
+      this.body = body != null ? body : '';
+    }
+
+    Frame.prototype.toString = function() {
+      var lines, name, value, _ref;
+      lines = [this.command];
+      _ref = this.headers;
+      for (name in _ref) {
+        if (!__hasProp.call(_ref, name)) continue;
+        value = _ref[name];
+        lines.push("" + name + ":" + value);
+      }
+      if (this.body) {
+        lines.push("content-length:" + ('' + this.body).length);
+      }
+      lines.push(Byte.LF + this.body);
+      return lines.join(Byte.LF);
+    };
+
+    Frame._unmarshallSingle = function(data) {
+      var body, chr, command, divider, headerLines, headers, i, idx, len, line, start, trim, _i, _j, _ref, _ref1;
+      divider = data.search(RegExp("" + Byte.LF + Byte.LF));
+      headerLines = data.substring(0, divider).split(Byte.LF);
+      command = headerLines.shift();
+      headers = {};
+      trim = function(str) {
+        return str.replace(/^\s+|\s+$/g, '');
+      };
+      line = idx = null;
+      for (i = _i = 0, _ref = headerLines.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+        line = headerLines[i];
+        idx = line.indexOf(':');
+        headers[trim(line.substring(0, idx))] = trim(line.substring(idx + 1));
+      }
+      body = '';
+      start = divider + 2;
+      if (headers['content-length']) {
+        len = parseInt(headers['content-length']);
+        body = ('' + data).substring(start, start + len);
+      } else {
+        chr = null;
+        for (i = _j = start, _ref1 = data.length; start <= _ref1 ? _j < _ref1 : _j > _ref1; i = start <= _ref1 ? ++_j : --_j) {
+          chr = data.charAt(i);
+          if (chr === Byte.NULL) {
+            break;
+          }
+          body += chr;
+        }
+      }
+      return new Frame(command, headers, body);
+    };
+
+    Frame.unmarshall = function(datas) {
+      var data;
+      return (function() {
+        var _i, _len, _ref, _results;
+        _ref = datas.split(RegExp("" + Byte.NULL + Byte.LF + "*"));
+        _results = [];
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          data = _ref[_i];
+          if ((data != null ? data.length : void 0) > 0) {
+            _results.push(Frame._unmarshallSingle(data));
+          }
+        }
+        return _results;
+      })();
+    };
+
+    Frame.marshall = function(command, headers, body) {
+      var frame;
+      frame = new Frame(command, headers, body);
+      return frame.toString() + Byte.NULL;
+    };
+
+    return Frame;
+
+  })();
+
+  Client = (function() {
+
+    function Client(ws) {
+      this.ws = ws;
+      this.ws.binaryType = "arraybuffer";
+      this.counter = 0;
+      this.connected = false;
+      this.heartbeat = {
+        outgoing: 10000,
+        incoming: 10000
+      };
+      this.subscriptions = {};
+    }
+
+    Client.prototype._transmit = function(command, headers, body) {
+      var out;
+      out = Frame.marshall(command, headers, body);
+      if (typeof this.debug === "function") {
+        this.debug(">>> " + out);
+      }
+      while( true) {
+        if( out.length > MAX_FRAME_SIZE ) {
+          this.ws.send(out.substring(0, MAX_FRAME_SIZE));
+          out = out.substring(MAX_FRAME_SIZE);
+        } else {
+          return this.ws.send(out);
+        }
+      }
+    };
+
+    Client.prototype._setupHeartbeat = function(headers) {
+      var serverIncoming, serverOutgoing, ttl, v, _ref, _ref1,
+        _this = this;
+      if ((_ref = headers.version) !== Stomp.VERSIONS.V1_1 && _ref !== Stomp.VERSIONS.V1_2) {
+        return;
+      }
+      _ref1 = (function() {
+        var _i, _len, _ref1, _results;
+        _ref1 = headers['heart-beat'].split(",");
+        _results = [];
+        for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+          v = _ref1[_i];
+          _results.push(parseInt(v));
+        }
+        return _results;
+      })(), serverOutgoing = _ref1[0], serverIncoming = _ref1[1];
+      if (!(this.heartbeat.outgoing === 0 || serverIncoming === 0)) {
+        ttl = Math.max(this.heartbeat.outgoing, serverIncoming);
+        if (typeof this.debug === "function") {
+          this.debug("send PING every " + ttl + "ms");
+        }
+        this.pinger = typeof window !== "undefined" && window !== null ? window.setInterval(function() {
+          _this.ws.send(Byte.LF);
+          return typeof _this.debug === "function" ? _this.debug(">>> PING") : void 0;
+        }, ttl) : void 0;
+      }
+      if (!(this.heartbeat.incoming === 0 || serverOutgoing === 0)) {
+        ttl = Math.max(this.heartbeat.incoming, serverOutgoing);
+        if (typeof this.debug === "function") {
+          this.debug("check PONG every " + ttl + "ms");
+        }
+        return this.ponger = typeof window !== "undefined" && window !== null ? window.setInterval(function() {
+          var delta;
+          delta = Date.now() - _this.serverActivity;
+          if (delta > ttl * 2) {
+            if (typeof _this.debug === "function") {
+              _this.debug("did not receive server activity for the last " + delta + "ms");
+            }
+            return _this._cleanUp();
+          }
+        }, ttl) : void 0;
+      }
+    };
+
+    Client.prototype.connect = function(login, passcode, connectCallback, errorCallback, vhost) {
+      var _this = this;
+      this.connectCallback = connectCallback;
+      if (typeof this.debug === "function") {
+        this.debug("Opening Web Socket...");
+      }
+      this.ws.onmessage = function(evt) {
+        var arr, c, data, frame, onreceive, _i, _len, _ref, _results;
+        data = typeof ArrayBuffer !== 'undefined' && evt.data instanceof ArrayBuffer ? (arr = new Uint8Array(evt.data), typeof _this.debug === "function" ? _this.debug("--- got data length: " + arr.length) : void 0, ((function() {
+          var _i, _len, _results;
+          _results = [];
+          for (_i = 0, _len = arr.length; _i < _len; _i++) {
+            c = arr[_i];
+            _results.push(String.fromCharCode(c));
+          }
+          return _results;
+        })()).join('')) : evt.data;
+        _this.serverActivity = Date.now();
+        if (data === Byte.LF) {
+          if (typeof _this.debug === "function") {
+            _this.debug("<<< PONG");
+          }
+          return;
+        }
+        if (typeof _this.debug === "function") {
+          _this.debug("<<< " + data);
+        }
+        _ref = Frame.unmarshall(data);
+        _results = [];
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          frame = _ref[_i];
+          switch (frame.command) {
+            case "CONNECTED":
+              if (typeof _this.debug === "function") {
+                _this.debug("connected to server " + frame.headers.server);
+              }
+              _this.connected = true;
+              _this._setupHeartbeat(frame.headers);
+              _results.push(typeof _this.connectCallback === "function" ? _this.connectCallback(frame) : void 0);
+              break;
+            case "MESSAGE":
+              onreceive = _this.subscriptions[frame.headers.subscription];
+              _results.push(typeof onreceive === "function" ? onreceive(frame) : void 0);
+              break;
+            case "RECEIPT":
+              _results.push(typeof _this.onreceipt === "function" ? _this.onreceipt(frame) : void 0);
+              break;
+            case "ERROR":
+              _results.push(typeof errorCallback === "function" ? errorCallback(frame) : void 0);
+              break;
+            default:
+              _results.push(typeof _this.debug === "function" ? _this.debug("Unhandled frame: " + frame) : void 0);
+          }
+        }
+        return _results;
+      };
+      this.ws.onclose = function() {
+        var msg;
+        msg = "Whoops! Lost connection to " + _this.ws.url;
+        if (typeof _this.debug === "function") {
+          _this.debug(msg);
+        }
+        return typeof errorCallback === "function" ? errorCallback(msg) : void 0;
+      };
+      return this.ws.onopen = function() {
+        var headers;
+        if (typeof _this.debug === "function") {
+          _this.debug('Web Socket Opened...');
+        }
+        headers = {
+          "accept-version": Stomp.VERSIONS.supportedVersions(),
+          "heart-beat": [_this.heartbeat.outgoing, _this.heartbeat.incoming].join(',')
+        };
+        if (vhost) {
+          headers.host = vhost;
+        }
+        if (login) {
+          headers.login = login;
+        }
+        if (passcode) {
+          headers.passcode = passcode;
+        }
+        return _this._transmit("CONNECT", headers);
+      };
+    };
+
+    Client.prototype.disconnect = function(disconnectCallback) {
+      this._transmit("DISCONNECT");
+      this.ws.onclose = null;
+      this._cleanUp();
+      return typeof disconnectCallback === "function" ? disconnectCallback() : void 0;
+    };
+
+    Client.prototype._cleanUp = function() {
+      this.ws.close();
+      this.connected = false;
+      if (this.pinger) {
+        if (typeof window !== "undefined" && window !== null) {
+          window.clearInterval(this.pinger);
+        }
+      }
+      if (this.ponger) {
+        return typeof window !== "undefined" && window !== null ? window.clearInterval(this.ponger) : void 0;
+      }
+    };
+
+    Client.prototype.send = function(destination, headers, body) {
+      if (headers == null) {
+        headers = {};
+      }
+      if (body == null) {
+        body = '';
+      }
+      headers.destination = destination;
+      return this._transmit("SEND", headers, body);
+    };
+
+    Client.prototype.subscribe = function(destination, callback, headers) {
+      if (headers == null) {
+        headers = {};
+      }
+      if (!headers.id) {
+        headers.id = "sub-" + this.counter++;
+      }
+      headers.destination = destination;
+      this.subscriptions[headers.id] = callback;
+      this._transmit("SUBSCRIBE", headers);
+      return headers.id;
+    };
+
+    Client.prototype.unsubscribe = function(id) {
+      delete this.subscriptions[id];
+      return this._transmit("UNSUBSCRIBE", {
+        id: id
+      });
+    };
+
+    Client.prototype.begin = function(transaction) {
+      return this._transmit("BEGIN", {
+        transaction: transaction
+      });
+    };
+
+    Client.prototype.commit = function(transaction) {
+      return this._transmit("COMMIT", {
+        transaction: transaction
+      });
+    };
+
+    Client.prototype.abort = function(transaction) {
+      return this._transmit("ABORT", {
+        transaction: transaction
+      });
+    };
+
+    Client.prototype.ack = function(messageID, subscription, headers) {
+      if (headers == null) {
+        headers = {};
+      }
+      headers["message-id"] = messageID;
+      headers.subscription = subscription;
+      return this._transmit("ACK", headers);
+    };
+
+    Client.prototype.nack = function(messageID, subscription, headers) {
+      if (headers == null) {
+        headers = {};
+      }
+      headers["message-id"] = messageID;
+      headers.subscription = subscription;
+      return this._transmit("NACK", headers);
+    };
+
+    return Client;
+
+  })();
+
+  Stomp = {
+    libVersion: "2.0.0-next",
+    VERSIONS: {
+      V1_0: '1.0',
+      V1_1: '1.1',
+      V1_2: '1.2',
+      supportedVersions: function() {
+        return '1.1,1.0';
+      }
+    },
+    client: function(url, protocols) {
+      var klass, ws;
+      if (protocols == null) {
+        protocols = ['v10.stomp', 'v11.stomp'];
+      }
+      klass = Stomp.WebSocketClass || WebSocket;
+      ws = new klass(url, protocols);
+      return new Client(ws);
+    },
+    over: function(ws) {
+      return new Client(ws);
+    },
+    Frame: Frame
+  };
+
+  if (typeof window !== "undefined" && window !== null) {
+    window.Stomp = Stomp;
+  } else {
+    exports.Stomp = Stomp;
+    Stomp.WebSocketClass = require('./test/server.mock.js').StompServerMock;
+  }
+
+}).call(this);

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/release/examples/stomp/websocket/readme.md
----------------------------------------------------------------------
diff --git a/assembly/src/release/examples/stomp/websocket/readme.md b/assembly/src/release/examples/stomp/websocket/readme.md
new file mode 100644
index 0000000..daf516a
--- /dev/null
+++ b/assembly/src/release/examples/stomp/websocket/readme.md
@@ -0,0 +1,18 @@
+## Overview
+
+This is an example of how use the 
+['stomp-websocket'](https://github.com/jmesnil/stomp-websocket) 
+JavaScript APIs with the ActiveMQ message broker.
+
+## Prereqs
+
+- Use a modern browser with WebSocket support like Chrome or WebKit
+
+## Running
+
+Run the ActiveMQ sever locally and then open the `index.html`
+in the current directory using a web browser.
+
+## Credits
+
+This example is a modified version of Jeff Mesnil's chat example.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/release/user-guide.html
----------------------------------------------------------------------
diff --git a/assembly/src/release/user-guide.html b/assembly/src/release/user-guide.html
deleted file mode 100755
index b8d31c2..0000000
--- a/assembly/src/release/user-guide.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!--
-    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.
--->
-<html><head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>Getting Started</title>
-
-</head>
-<body>
-<h1>Getting Started<br>
-</h1>
-
-<p>
-Welcome to Apache ActiveMQ. This document gives you a quick overview of how to get started trying out Apache ActiveMQ.
-</p>
-
-<h2>Running the broker</h2>
-
-<p>
-From the binary distribution you can run the Apache ActiveMQ server via the bin/activemq command.
-If you're using Windows, just type
-</p>
-<pre>
-    cd bin
-    activemq.bat
-</pre>
-<p>
-On Unix-like systems, type
-</p>
-<pre>
-    ./bin/activemq console
-</pre>
-<p>to start the broker in foreground.</p>
-<p>
-The Apache ActiveMQ broker should now have started
-</p>
-<p>
-Tip: If you run the bin/activemq command without any arguments it will output usage.
-</p>
-
-To stop the broker you can press ctrl + c to stop the process.
-
-<h2>Running the broker in the background</h2>
-
-<p>
-The broker can be started as a background process via the bin/activemq command
-on Unix-like systems, type
-</p>
-<pre>
-    ./bin/activemq start
-</pre>
-<p>to start the broker in background. The broker will write to its log in the data/activemq.log file.</p>
-
-<h2>Stopping the broker</h2>
-
-<p>
-The broker can be stopped via the bin/activemq command
-If you're using Windows, just type
-</p>
-<pre>
-    cd bin
-    activemq.bat stop
-</pre>
-<p>
-On Unix-like systems, type
-</p>
-<pre>
-    ./bin/activemq stop
-</pre>
-<p>to stop the broker.
-
-
-<h2>Access the web console</h2>
-
-In a web browser you can access the url <a href="http://0.0.0.0:8161/admin">http://0.0.0.0:8161/admin</a> to access the ActiveMQ web console.
-<br/>
-The broker may ask for credentials to login the web console the first time.
-The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.
-
-<h2>Access the web demos</h2>
-
-You would need to start the broker with the demos included, which you do as follows:
-If you're using Windows, just type
-</p>
-<pre>
-    cd bin
-    activemq.bat console xbean:conf/activemq-demo.xml
-</pre>
-<p>
-On Unix-like systems, type
-</p>
-<pre>
-    ./bin/activemq console xbean:conf/activemq-demo.xml
-</pre>
-
-In a web browser you can access the url <a href="http://0.0.0.0:8161/demo">http://0.0.0.0:8161/demo</a> to access the ActiveMQ web demos.
-<br/>
-The broker may ask for credentials to login the web console the first time.
-The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.
-
-
-<h2>Running the example programs</h2>
-
-<p>
-To run the demo producer/consumer tools, you need Java and Ant installed.
-</p>
-
-<h3>Installing Ant</h3>
-
-
-<p>
-The example programs depend on <a href="http://ant.apache.org/">Ant</a> being installed. There are more detailed
-instructions on the Ant website - but essentially you need to follow these steps.
-</p>
-<ul>
-<li>
-JAVA_HOME must point to your JDK installation, such that $JAVA_HOME/bin contains the java executable and $JAVA_HOME/lib contains some jar files.
-</li>
-<li>
-ANT_HOME must point to where you installed Apache Ant (http://ant.apache.org)
-</li>
-<li>
-then you need to add $JAVA_HOME/bin and $ANT_HOME/bin to your PATH variable.
-</li>
-</ul>
-
-<p>
-To test this is all working, try typing
-</p>
-
-<pre>
-    java -version
-    cd example
-    ant -version
-</pre>
-
-<h3>Running the example producer and consumer</h3>
-
-<p>
-Once you've got Java and Ant installed correctly you should be able to run
-</p>
-
-<pre>
-    cd example
-    ant consumer
-</pre>
-
-<p>
-and in another shell
-</p>
-
-<pre>
-    cd example
-    ant producer
-</pre>
-
-<p>
-you can specify exact URLs to connect to via command like arguments. e.g.
-</p>
-
-<pre>
-    ant producer -Durl=tcp://somehost:port
-</pre>
-
-
-
-<h2>Further Readings</h2>
-
-You can find more details about Apache ActiveMQ at its website <a href="http://activemq.apache.org">http://activemq.apache.org</a>,
-as well the guide <a href="http://activemq.apache.org/version-5-getting-started.html">getting started</a> guide.
-
-</body>
-</html>
-
-

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-demo.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-demo.xml b/assembly/src/sample-conf/activemq-demo.xml
deleted file mode 100644
index 05a5380..0000000
--- a/assembly/src/sample-conf/activemq-demo.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!--
-    Demonstrates various ActiveMQ configuration options
-
-    To run ActiveMQ with this configuration add xbean:conf/activemq-demo.xml to your command
-
-    e.g. $ bin/activemq console xbean:conf/activemq-demo.xml
- -->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
-  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-    <!--
-        Allows us to use system properties as variables in this configuration
-        file. For more information, see the Javadoc:
-
-        http://static.springframework.org/spring/docs/2.5.x/api/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.html
-    -->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="locations">
-            <value>file:${activemq.conf}/credentials.properties</value>
-        </property>
-    </bean>
-
-    <!--
-        The <broker> element is used to configure the ActiveMQ broker.
-
-        Tips:
-          - Change the brokerName attribute to something unique
-    -->
-
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="amq-broker" useJmx="true">
-
-        <!--
-            Examples of destination-specific policies using destination
-            names or wildcards. For more information, see:
-
-            http://activemq.apache.org/per-destination-policies.html
-            http://activemq.apache.org/destination-features.html
-            http://activemq.apache.org/slow-consumer-handling.html
-            http://activemq.apache.org/subscription-recovery-policy.html
-        -->
-        <destinationPolicy>
-            <policyMap>
-                <policyEntries>
-                    <!--
-                        Limit ALL queues and topics to using 5mb of memory and turn on producer flow control
-                    -->
-                    <policyEntry queue=">" producerFlowControl="true" memoryLimit="5mb"/>
-                    <policyEntry topic=">" producerFlowControl="true" memoryLimit="5mb">
-                        <dispatchPolicy>
-                            <!--
-                              Use total ordering, see:
-                                 http://activemq.apache.org/total-ordering.html
-                            -->
-                            <strictOrderDispatchPolicy/>
-                        </dispatchPolicy>
-                        <subscriptionRecoveryPolicy>
-                            <!--
-                                Upon subscription, receive the last image sent
-                                on the destination.
-                            -->
-                            <lastImageSubscriptionRecoveryPolicy/>
-                        </subscriptionRecoveryPolicy>
-                    </policyEntry>
-                </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-        <!--
-            The managementContext is used to configure how ActiveMQ is exposed in
-            JMX. By default, ActiveMQ uses the MBean server that is started by
-            the JVM. For more information, see:
-
-            http://activemq.apache.org/jmx.html
-        -->
-        <managementContext>
-            <managementContext createConnector="false"/>
-        </managementContext>
-
-        <!--
-            The network connectors are used to create a network of brokers. For
-            more information, see:
-
-            http://activemq.apache.org/networks-of-brokers.html
-        -->
-        <!-- networkConnectors-->
-            <!--
-                This connector automatically discovers the other brokers using
-                IP multicast. Such discovery is possible only because the
-                openwire transport connector is advertised via the default IP
-                multicast group. For more information on multicast, see:
-
-                http://activemq.apache.org/multicast-transport-reference.html
-
-            <networkConnector name="default-nc" uri="multicast://default"/>
-            -->
-
-            <!--
-                Example of a static configuration. For more information, see:
-
-                http://activemq.apache.org/static-transport-reference.html
-
-            <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
-            -->
-        <!-- /networkConnectors-->
-
-        <!--
-            Configure message persistence for the broker. The default persistence
-            mechanism is the AMQ store (identified by the amqPersistenceAdapter).
-            For more information, see:
-
-            http://activemq.apache.org/persistence.html
-        -->
-        <persistenceAdapter>
-             <kahaDB directory="${activemq.data}/dynamic-broker1/kahadb" indexWriteBatchSize="1000" enableIndexWriteAsync="true" enableJournalDiskSyncs="false" />
-        </persistenceAdapter>
-
-        <!--
-            Configure the following if you wish to use journaled JDBC for message
-            persistence.
-
-        <persistenceFactory>
-            <journalPersistenceAdapterFactory dataDirectory="${activemq.data}" dataSource="#postgres-ds"/>
-        </persistenceFactory>
-        -->
-
-        <!--
-            Configure the following if you wish to use non-journaled JDBC for message
-            persistence.
-
-        <persistenceAdapter>
-            <jdbcPersistenceAdapter dataSource="#postgres-ds"/>
-        </persistenceAdapter>
-        -->
-
-        <!--
-            The sslContext can be used to configure broker-specific SSL properties.
-            For more information, see:
-
-            http://activemq.apache.org/how-do-i-use-ssl.html
-        -->
-        <sslContext>
-            <sslContext keyStore="file:${activemq.conf}/broker.ks"
-              keyStorePassword="password" trustStore="file:${activemq.conf}/broker.ts"
-              trustStorePassword="password"/>
-        </sslContext>
-
-
-        <!--
-            The systemUsage controls the maximum amount of space the broker will
-            use before slowing down producers. For more information, see:
-
-            http://activemq.apache.org/producer-flow-control.html
-        -->
-        <systemUsage>
-          <systemUsage>
-            <memoryUsage>
-              <memoryUsage limit="20 mb" />
-            </memoryUsage>
-            <storeUsage>
-              <storeUsage limit="1 gb" />
-            </storeUsage>
-            <tempUsage>
-              <tempUsage limit="100 mb" />
-            </tempUsage>
-          </systemUsage>
-        </systemUsage>
-
-
-        <!--
-            The transport connectors expose ActiveMQ over a given protocol to
-            clients and other brokers. For more information, see:
-
-            http://activemq.apache.org/configuring-transports.html
-        -->
-        <transportConnectors>
-            <!-- Create a TCP transport that is advertised on via an IP multicast
-              group named default. -->
-            <transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
-            <!-- Create a SSL transport. Make sure to configure the SSL options
-              via the system properties or the sslContext element. -->
-            <transportConnector name="ssl" uri="ssl://localhost:61617"/>
-            <!-- Create a STOMP transport for STOMP clients. -->
-            <transportConnector name="stomp" uri="stomp://localhost:61613"/>
-            <!-- Create a Websocket transport for the websocket dmeo -->
-            <transportConnector name="ws" uri="ws://localhost:61614/" />
-        </transportConnectors>
-
-        <!-- destroy the spring context on shutdown to stop jetty -->
-        <shutdownHooks>
-            <bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" />
-        </shutdownHooks>
-
-    </broker>
-
-    <!--
-       Lets deploy some Enterprise Integration Patterns inside the ActiveMQ Message Broker
-       For more details see
-
-       http://activemq.apache.org/enterprise-integration-patterns.html
-    -->
-    <import resource="camel.xml"/>
-
-
-    <!--
-        An embedded servlet engine for serving up the Admin console and other demos.
-        For more information, see:
-
-          http://activemq.apache.org/web-console.html
-    -->
-    <import resource="jetty-demo.xml"/>
-
-
-    <!--
-        Uncomment to create a command agent to respond to message based admin
-        commands on the ActiveMQ.Agent topic. For more information, see:
-
-        http://activemq.apache.org/command-agent.html
-
-    <commandAgent xmlns="http://activemq.apache.org/schema/core" brokerUrl="vm://localhost"/>
-    -->
-
-
-    <!--
-        This xbean configuration file supports all the standard Spring XML
-        configuration options such as the following bean definitions.
-    -->
-
-    <!-- Postgres DataSource Sample Setup -->
-    <!--
-    <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
-      <property name="serverName" value="localhost"/>
-      <property name="databaseName" value="activemq"/>
-      <property name="portNumber" value="0"/>
-      <property name="user" value="activemq"/>
-      <property name="password" value="activemq"/>
-      <property name="dataSourceName" value="postgres"/>
-      <property name="initialConnections" value="1"/>
-      <property name="maxConnections" value="10"/>
-    </bean>
-    -->
-
-    <!-- MySql DataSource Sample Setup -->
-    <!--
-    <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-      <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-      <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
-      <property name="username" value="activemq"/>
-      <property name="password" value="activemq"/>
-      <property name="maxActive" value="200"/>
-      <property name="poolPreparedStatements" value="true"/>
-    </bean>
-    -->
-
-    <!-- Oracle DataSource Sample Setup -->
-    <!--
-    <bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-      <property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/>
-      <property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
-      <property name="username" value="scott"/>
-      <property name="password" value="tiger"/>
-      <property name="maxActive" value="200"/>
-      <property name="poolPreparedStatements" value="true"/>
-    </bean>
-    -->
-
-    <!-- Embedded Derby DataSource Sample Setup -->
-    <!--
-    <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
-      <property name="databaseName" value="derbydb"/>
-      <property name="createDatabase" value="create"/>
-    </bean>
-    -->
-
-</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml b/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml
deleted file mode 100644
index 6666df7..0000000
--- a/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!--
-    Create a dynamic network of brokers
-    For more information, see:
-
-    http://activemq.apache.org/networks-of-brokers.html
-
-    To run this example network of ActiveMQ brokers run
-
-    $ bin/activemq console xbean:conf/activemq-dynamic-network-broker1.xml
-
-    and
-
-    $ bin/activemq console xbean:conf/activemq-dynamic-network-broker2.xml
-
-    in separate consoles
- -->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="dynamic-broker1" dataDirectory="${activemq.data}">
-
-        <!-- Destination specific policies using destination names or wildcards -->
-        <destinationPolicy>
-            <policyMap>
-                <policyEntries>
-                    <policyEntry queue=">" producerFlowControl="true" memoryLimit="20mb">
-                        <deadLetterStrategy>
-                          <individualDeadLetterStrategy queuePrefix="DLQ." useQueueForQueueMessages="true" />
-                        </deadLetterStrategy>
-                    </policyEntry>
-                    <policyEntry topic=">" producerFlowControl="true" memoryLimit="20mb">
-                    </policyEntry>
-                </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-        <!-- Use the following to configure how ActiveMQ is exposed in JMX -->
-        <managementContext>
-            <managementContext createConnector="true"/>
-        </managementContext>
-
-        <!--
-            Configure network connector to use multicast protocol
-            For more information, see
-
-            http://activemq.apache.org/multicast-transport-reference.html
-        -->
-        <networkConnectors>
-          <networkConnector uri="multicast://default"
-            dynamicOnly="true"
-            networkTTL="3"
-            prefetchSize="1"
-            decreaseNetworkConsumerPriority="true" />
-        </networkConnectors>
-
-        <persistenceAdapter>
-            <kahaDB directory="${activemq.data}/dynamic-broker1/kahadb"/>
-        </persistenceAdapter>
-
-        <!--  The maximum amount of space the broker will use before slowing down producers -->
-        <systemUsage>
-            <systemUsage>
-                <memoryUsage>
-                    <memoryUsage limit="20 mb"/>
-                </memoryUsage>
-                <storeUsage>
-                    <storeUsage limit="1 gb" name="foo"/>
-                </storeUsage>
-                <tempUsage>
-                    <tempUsage limit="100 mb"/>
-                </tempUsage>
-            </systemUsage>
-        </systemUsage>
-
-        <!--
-            The transport connectors ActiveMQ will listen to
-            Configure discovery URI to use multicast protocol
-        -->
-        <transportConnectors>
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616" discoveryUri="multicast://default" />
-        </transportConnectors>
-
-
-    </broker>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml b/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml
deleted file mode 100644
index 3f8c951..0000000
--- a/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!--
-    Create a dynamic network of brokers
-    For more information, see:
-
-    http://activemq.apache.org/networks-of-brokers.html
-
-    To run this example network of ActiveMQ brokers run
-
-    $ bin/activemq console xbean:conf/activemq-dynamic-network-broker1.xml
-
-    and
-
-    $ bin/activemq console xbean:conf/activemq-dynamic-network-broker2.xml
-
-    in separate consoles
- -->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
-  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
-
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="dynamic-broker2" dataDirectory="${activemq.data}">
-
-        <!-- Destination specific policies using destination names or wildcards -->
-        <destinationPolicy>
-            <policyMap>
-                <policyEntries>
-                    <policyEntry queue=">" producerFlowControl="true" memoryLimit="20mb">
-                        <deadLetterStrategy>
-                          <individualDeadLetterStrategy queuePrefix="DLQ." useQueueForQueueMessages="true" />
-                        </deadLetterStrategy>
-                    </policyEntry>
-                    <policyEntry topic=">" producerFlowControl="true" memoryLimit="20mb">
-                    </policyEntry>
-                </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-        <!-- Use the following to configure how ActiveMQ is exposed in JMX -->
-        <managementContext>
-            <managementContext createConnector="true" connectorPort="1100"/>
-        </managementContext>
-
-        <!--
-            Configure network connector to use multicast protocol
-            For more information, see
-
-            http://activemq.apache.org/multicast-transport-reference.html
-        -->
-        <networkConnectors>
-          <networkConnector uri="multicast://default"
-            dynamicOnly="true"
-            networkTTL="3"
-            prefetchSize="1"
-            decreaseNetworkConsumerPriority="true" />
-        </networkConnectors>
-
-
-        <persistenceAdapter>
-            <kahaDB directory="${activemq.data}/dynamic-broker2/kahadb" />
-        </persistenceAdapter>
-
-        <!--  The maximum amount of space the broker will use before slowing down producers -->
-        <systemUsage>
-            <systemUsage>
-                <memoryUsage>
-                    <memoryUsage limit="20 mb"/>
-                </memoryUsage>
-                <storeUsage>
-                    <storeUsage limit="1 gb" name="foo"/>
-                </storeUsage>
-                <tempUsage>
-                    <tempUsage limit="100 mb"/>
-                </tempUsage>
-            </systemUsage>
-        </systemUsage>
-
-        <!--
-            The transport connectors ActiveMQ will listen to
-            Configure discovery URI to use multicast protocol
-        -->
-        <transportConnectors>
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61618" discoveryUri="multicast://default" />
-        </transportConnectors>
-
-    </broker>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-jdbc-performance.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-jdbc-performance.xml b/assembly/src/sample-conf/activemq-jdbc-performance.xml
deleted file mode 100644
index da87933..0000000
--- a/assembly/src/sample-conf/activemq-jdbc-performance.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!--
-    Use JDBC for message persistence
-    For more information, see:
-
-    http://activemq.apache.org/persistence.html
-
-    You need to add Derby database to your classpath in order to make this example work.
-    Download it from http://db.apache.org/derby/ and put it in the ${ACTIVEMQ_HOME}/lib/optional/ folder
-    Optionally you can configure any other RDBM as shown below
-
-    To run ActiveMQ with this configuration add xbean:conf/activemq-jdbc.xml to your command
-
-    e.g. $ bin/activemq console xbean:conf/activemq-jdbc.xml
- -->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
-  <!-- Allows us to use system properties as variables in this configuration file -->
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-      <property name="locations">
-          <value>file:${activemq.conf}/credentials.properties</value>
-      </property>
-  </bean>
-
-  <broker useJmx="true" brokerName="jdbcBroker" xmlns="http://activemq.apache.org/schema/core">
-
-        <destinationPolicy>
-            <policyMap>
-              <policyEntries>
-                <policyEntry topic=">" expireMessagesPeriod="0" prioritizedMessages="false">
-                </policyEntry>
-                <policyEntry queue=">" expireMessagesPeriod="0" prioritizedMessages="false">
-                </policyEntry>
-              </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-    <!--
-        See more database locker options at http://activemq.apache.org/pluggable-storage-lockers.html
-    -->
-    <persistenceAdapter>
-       <!--  for mysql-ds below, add attribute: dataSource="#mysql-ds" -->
-       <jdbcPersistenceAdapter dataDirectory="${activemq.data}" cleanupPeriod="0" />
-    </persistenceAdapter>
-
-    <transportConnectors>
-       <transportConnector name="openwire" uri="tcp://0.0.0.0:61616"/>
-    </transportConnectors>
-  </broker>
-
-
-
-  <!-- MySql DataSource Sample Setup -->
-  <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-    <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
-    <property name="username" value="root"/>
-    <property name="password" value="root"/>
-    <property name="maxActive" value="200"/>
-    <property name="poolPreparedStatements" value="true"/>
-  </bean>
-
-</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-jdbc.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-jdbc.xml b/assembly/src/sample-conf/activemq-jdbc.xml
deleted file mode 100644
index 0e49aa7..0000000
--- a/assembly/src/sample-conf/activemq-jdbc.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!--
-    Use JDBC for message persistence
-    For more information, see:
-
-    http://activemq.apache.org/persistence.html
-
-    You need to add Derby database to your classpath in order to make this example work.
-    Download it from http://db.apache.org/derby/ and put it in the ${ACTIVEMQ_HOME}/lib/optional/ folder
-    Optionally you can configure any other RDBM as shown below
-
-    To run ActiveMQ with this configuration add xbean:conf/activemq-jdbc.xml to your command
-
-    e.g. $ bin/activemq console xbean:conf/activemq-jdbc.xml
- -->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
-  <!-- Allows us to use system properties as variables in this configuration file -->
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-      <property name="locations">
-          <value>file:${activemq.conf}/credentials.properties</value>
-      </property>
-  </bean>
-
-  <broker useJmx="false" brokerName="jdbcBroker" xmlns="http://activemq.apache.org/schema/core">
-
-    <!--
-        See more database locker options at http://activemq.apache.org/pluggable-storage-lockers.html
-    -->
-    <persistenceAdapter>
-       <jdbcPersistenceAdapter dataDirectory="${activemq.data}" dataSource="#derby-ds"/>
-    </persistenceAdapter>
-
-    <transportConnectors>
-       <transportConnector name="openwire" uri="tcp://0.0.0.0:61616"/>
-    </transportConnectors>
-  </broker>
-
-  <!-- Embedded Derby DataSource Sample Setup -->
-  <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
-    <property name="databaseName" value="derbydb"/>
-    <property name="createDatabase" value="create"/>
-  </bean>
-
-  <!-- Postgres DataSource Sample Setup -->
-  <!--
-  <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
-    <property name="serverName" value="localhost"/>
-    <property name="databaseName" value="activemq"/>
-    <property name="portNumber" value="0"/>
-    <property name="user" value="activemq"/>
-    <property name="password" value="activemq"/>
-    <property name="dataSourceName" value="postgres"/>
-    <property name="initialConnections" value="1"/>
-    <property name="maxConnections" value="10"/>
-  </bean>
-  -->
-
-  <!-- MySql DataSource Sample Setup -->
-  <!--
-  <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-    <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
-    <property name="username" value="activemq"/>
-    <property name="password" value="activemq"/>
-    <property name="maxActive" value="200"/>
-    <property name="poolPreparedStatements" value="true"/>
-  </bean>
-  -->
-
-  <!-- Oracle DataSource Sample Setup -->
-  <!--
-  <bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/>
-    <property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
-    <property name="username" value="scott"/>
-    <property name="password" value="tiger"/>
-    <property name="maxActive" value="200"/>
-    <property name="poolPreparedStatements" value="true"/>
-  </bean>
-  -->
-
-</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-leveldb-replicating.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-leveldb-replicating.xml b/assembly/src/sample-conf/activemq-leveldb-replicating.xml
deleted file mode 100644
index c8a6560..0000000
--- a/assembly/src/sample-conf/activemq-leveldb-replicating.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!-- START SNIPPET: example -->
-<beans
-        xmlns="http://www.springframework.org/schema/beans"
-        xmlns:amq="http://activemq.apache.org/schema/core"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
-    <!-- Allows us to use system properties as variables in this configuration file -->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="locations">
-            <value>file:${activemq.conf}/credentials.properties</value>
-        </property>
-    </bean>
-
-    <!--
-        The <broker> element is used to configure the ActiveMQ broker.
-    -->
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="replicating-broker" dataDirectory="${activemq.data}" start="false" >
-
-        <!--
-            For better performances use VM cursor and small memory limit.
-            For more information, see:
-
-            http://activemq.apache.org/message-cursors.html
-
-            Also, if your producer is "hanging", it's probably due to producer flow control.
-            For more information, see:
-            http://activemq.apache.org/producer-flow-control.html
-        -->
-
-        <destinationPolicy>
-            <policyMap>
-                <policyEntries>
-                    <policyEntry topic=">" producerFlowControl="true">
-                        <!-- The constantPendingMessageLimitStrategy is used to prevent
-                             slow topic consumers to block producers and affect other consumers
-                             by limiting the number of messages that are retained
-                             For more information, see:
-
-                             http://activemq.apache.org/slow-consumer-handling.html
-
-                        -->
-                        <pendingMessageLimitStrategy>
-                            <constantPendingMessageLimitStrategy limit="1000"/>
-                        </pendingMessageLimitStrategy>
-                    </policyEntry>
-                    <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb">
-                        <!-- Use VM cursor for better latency
-                             For more information, see:
-
-                             http://activemq.apache.org/message-cursors.html
-
-                        <pendingQueuePolicy>
-                          <vmQueueCursor/>
-                        </pendingQueuePolicy>
-                        -->
-                    </policyEntry>
-                </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-
-        <!--
-            The managementContext is used to configure how ActiveMQ is exposed in
-            JMX. By default, ActiveMQ uses the MBean server that is started by
-            the JVM. For more information, see:
-
-            http://activemq.apache.org/jmx.html
-        -->
-        <managementContext>
-            <managementContext createConnector="false"/>
-        </managementContext>
-
-        <!--
-            Configure message persistence for the broker. The default persistence
-            mechanism is the KahaDB store. In this sample, we use level db with
-            replication. Zookeeper is used as the distributed coordinator, so you
-            must have a zookeeper ensemble (minimum 1) to run the broker with
-            this configuration.
-
-            http://activemq.apache.org/replicated-leveldb-store.html
-        -->
-        <persistenceAdapter>
-            <replicatedLevelDB
-                    directory="${activemq.data}"
-                    replicas="2"
-                    bind="tcp://0.0.0.0:61619"
-                    zkAddress="127.0.0.1:2181"
-                    zkPassword="password"
-                    zkPath="/activemq/leveldb-stores"
-                    />
-        </persistenceAdapter>
-
-
-        <!--
-          The systemUsage controls the maximum amount of space the broker will
-          use before slowing down producers. For more information, see:
-          http://activemq.apache.org/producer-flow-control.html
-          If using ActiveMQ embedded - the following limits could safely be used:
-
-      <systemUsage>
-          <systemUsage>
-              <memoryUsage>
-                  <memoryUsage limit="20 mb"/>
-              </memoryUsage>
-              <storeUsage>
-                  <storeUsage limit="1 gb"/>
-              </storeUsage>
-              <tempUsage>
-                  <tempUsage limit="100 mb"/>
-              </tempUsage>
-          </systemUsage>
-      </systemUsage>
-      -->
-        <systemUsage>
-            <systemUsage>
-                <memoryUsage>
-                    <memoryUsage limit="64 mb"/>
-                </memoryUsage>
-                <storeUsage>
-                    <storeUsage limit="100 gb"/>
-                </storeUsage>
-                <tempUsage>
-                    <tempUsage limit="50 gb"/>
-                </tempUsage>
-            </systemUsage>
-        </systemUsage>
-
-        <!--
-            The transport connectors expose ActiveMQ over a given protocol to
-            clients and other brokers. For more information, see:
-
-            http://activemq.apache.org/configuring-transports.html
-        -->
-        <transportConnectors>
-            <!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB -->
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000&amp;wireFormat.maxFrameSize=104857600"/>
-            <transportConnector name="amqp" uri="amqp://0.0.0.0:5672?maximumConnections=1000&amp;wireFormat.maxFrameSize=104857600"/>
-        </transportConnectors>
-
-        <!-- destroy the spring context on shutdown to stop jetty -->
-        <shutdownHooks>
-            <bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" />
-        </shutdownHooks>
-
-    </broker>
-
-    <!--
-        Enable web consoles, REST and Ajax APIs and demos
-
-        Take a look at ${ACTIVEMQ_HOME}/conf/jetty.xml for more details
-    -->
-    <import resource="jetty.xml"/>
-
-</beans>
-        <!-- END SNIPPET: example -->

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-scalability.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-scalability.xml b/assembly/src/sample-conf/activemq-scalability.xml
deleted file mode 100644
index 89d41ef..0000000
--- a/assembly/src/sample-conf/activemq-scalability.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!--
-    Tune ActiveMQ broker so it can handle large number of queues (tens of thousands)
-    For more information, see:
-    http://activemq.apache.org/how-do-i-configure-10s-of-1000s-of-queues-in-a-single-broker-.html
-
-    Be sure to make necessary changes in your startup script, to
-
-    1. Give broker enough memory
-    2. Disable dedicated task runner
-
-    e.g. ACTIVEMQ_OPTS="-Xmx1024M -Dorg.apache.activemq.UseDedicatedTaskRunner=false"
-
-    To run ActiveMQ with this configuration add xbean:conf/activemq-scalability.xml to your command
-    e.g. $ bin/activemq console xbean:conf/activemq-scalability.xml
- -->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
-    <!-- Allows us to use system properties as variables in this configuration file -->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}" useJmx="false" advisorySupport="false">
-
-        <!--
-            Turn on optimizedDispatch
-            For more information, see:
-            http://activemq.apache.org/per-destination-policies.html
-        -->
-        <destinationPolicy>
-            <policyMap>
-                <policyEntries>
-                    <policyEntry queue=">" optimizedDispatch="true" />
-                </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-        <!--
-            Use KahaDB for persistence
-            For more information, see:
-            http://activemq.apache.org/kahadb.html
-        -->
-        <persistenceAdapter>
-            <kahaDB directory="${activemq.data}/kahadb" enableIndexWriteAsync="true"/>
-        </persistenceAdapter>
-
-        <!--
-            Use NIO transport
-            For more information, see:
-            http://activemq.apache.org/configuring-transports.html#ConfiguringTransports-TheNIOTransport
-        -->
-        <transportConnectors>
-            <transportConnector name="nio" uri="nio://0.0.0.0:61616"/>
-        </transportConnectors>
-
-    </broker>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-security.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-security.xml b/assembly/src/sample-conf/activemq-security.xml
deleted file mode 100644
index 7b116ff..0000000
--- a/assembly/src/sample-conf/activemq-security.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-<!--  
-    Secure ActiveMQ broker
-    For more information, see:
-    
-    http://activemq.apache.org/security.html
-    
-    Before you can run this configuration, you need to set ACTIVEMQ_ENCRYPTION_PASSWORD environment variable, like
-    
-    $ export ACTIVEMQ_ENCRYPTION_PASSWORD=activemq
-    
-    For more information see: http://activemq.apache.org/encrypted-passwords.html
-    
-    To run ActiveMQ with this configuration add xbean:conf/activemq-security.xml to your command
-    
-    e.g. $ bin/activemq console xbean:conf/activemq-security.xml
- -->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-  
-  <!-- Allows us to use encrypted system properties as variables in this configuration file -->
-  <bean id="environmentVariablesConfiguration" class="org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig">
-    <property name="algorithm" value="PBEWithMD5AndDES" />
-    <property name="passwordEnvName" value="ACTIVEMQ_ENCRYPTION_PASSWORD" />
-  </bean>
-                                                                     
-  <bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
-    <property name="config" ref="environmentVariablesConfiguration" />
-  </bean>  
-    
-  <bean id="propertyConfigurer" class="org.jasypt.spring.properties.EncryptablePropertyPlaceholderConfigurer"> 
-      <constructor-arg ref="configurationEncryptor" /> 
-      <property name="location" value="file:${activemq.conf}/credentials-enc.properties"/> 
-  </bean> 
-  
-  <!--     
-    Use this configuration if you don't want to set encryptor password using environment variable
-    Note however, that with this solution your passwords can be easily decrypted once the encrypter password is known
-    
-  <bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
-     <property name="algorithm" value="PBEWithMD5AndDES"/>
-     <property name="password" value="activemq"/>
-  </bean> 
-  -->
-
-  <broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" >
-
-    <managementContext>
-        <managementContext createConnector="true">
-            <property xmlns="http://www.springframework.org/schema/beans" name="environment">
-                <map xmlns="http://www.springframework.org/schema/beans">
-                    <entry xmlns="http://www.springframework.org/schema/beans" key="jmx.remote.x.password.file"
-                           value="${activemq.conf}/jmx.password"/>
-                    <entry xmlns="http://www.springframework.org/schema/beans" key="jmx.remote.x.access.file"
-                           value="${activemq.conf}/jmx.access"/>
-                </map>
-            </property>
-        </managementContext>
-    </managementContext>
-
-    <plugins>
-        <!-- Configure authentication; Username, passwords and groups -->
-        <simpleAuthenticationPlugin>
-            <users>
-                <authenticationUser username="system" password="${activemq.password}"
-                    groups="users,admins"/>
-                <authenticationUser username="user" password="${guest.password}"
-                    groups="users"/>
-                <authenticationUser username="guest" password="${guest.password}" groups="guests"/>
-            </users>
-        </simpleAuthenticationPlugin>
-
-
-      <!--  Lets configure a destination based authorization mechanism -->
-      <authorizationPlugin>
-        <map>
-          <authorizationMap>
-            <authorizationEntries>
-              <authorizationEntry queue=">" read="admins" write="admins" admin="admins" />
-              <authorizationEntry queue="USERS.>" read="users" write="users" admin="users" />
-              <authorizationEntry queue="GUEST.>" read="guests" write="guests,users" admin="guests,users" />
-              
-              <authorizationEntry queue="TEST.Q" read="guests" write="guests" />
-              
-              <authorizationEntry topic=">" read="admins" write="admins" admin="admins" />
-              <authorizationEntry topic="USERS.>" read="users" write="users" admin="users" />
-              <authorizationEntry topic="GUEST.>" read="guests" write="guests,users" admin="guests,users" />
-              
-              <authorizationEntry topic="ActiveMQ.Advisory.>" read="guests,users" write="guests,users" admin="guests,users"/>
-            </authorizationEntries>
-          </authorizationMap>
-        </map>
-      </authorizationPlugin>
-    </plugins>
-    
-    <transportConnectors>
-       <transportConnector name="openwire" uri="tcp://0.0.0.0:61616"/>
-    </transportConnectors>
-
-    <!-- destroy the spring context on shutdown to stop jetty -->
-    <shutdownHooks>
-        <bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" />
-    </shutdownHooks>
-
-  </broker>
-
-  <!-- Use Web applications and Camel in secured broker environment -->
-  <import resource="jetty.xml"/>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-specjms.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-specjms.xml b/assembly/src/sample-conf/activemq-specjms.xml
deleted file mode 100644
index 2c8349c..0000000
--- a/assembly/src/sample-conf/activemq-specjms.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
-    <!-- Allows us to use system properties as variables in this configuration file -->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
-
-    <!--
-        The <broker> element is used to configure the ActiveMQ broker.
-
-        advisories incurr a hit with every add connection|destination|producer|consumer
-          - client side:  providerUrl = tcp://localhost:61616?jms.watchTopicAdvisories=false
-        statistics have a small impact on concurrency so disable
-        schedualer has a small impact as it checks for the presence three properties on each message
-        jmx adds a bunch of wrapper classes
-
-        ACTIVEMQ_OPTS_MEMORY="-Xmx11g -Xms6g -Dorg.apache.activemq.UseDedicatedTaskRunner=false -Djava.util.logging.config.file=logging.properties -XX:+UseLargePages"
-    -->
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost"
-        dataDirectory="${activemq.data}" deleteAllMessagesOnStartup="true"
-        advisorySupport="false"
-        enableStatistics="false"
-        schedulerSupport="false"
-        useJmx="false">
-
-        <destinationPolicy>
-            <policyMap>
-              <policyEntries>
-                <!--
-                    producerFlowControll thread unnecessary with no memory limits
-                    with no failover, no need to suppress duplicates so audit can be disabled
-                    message expiry thread unnecessary as normal dispatch will handle expiry
-                -->
-                <policyEntry topic=">" producerFlowControl="false" enableAudit="false" expireMessagesPeriod="0">
-                  <pendingSubscriberPolicy>
-                    <!-- keep all references in memory -->
-                    <vmCursor />
-                  </pendingSubscriberPolicy>
-                </policyEntry>
-                <policyEntry queue=">" producerFlowControl="false" enableAudit="false" expireMessagesPeriod="0">
-                  <pendingQueuePolicy>
-                    <!-- keep all references in memory -->
-                    <vmQueueCursor/>
-                  </pendingQueuePolicy>
-
-                </policyEntry>
-              </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-
-        <!--
-            The managementContext is used to configure how ActiveMQ is exposed in
-            JMX. By default, ActiveMQ uses the MBean server that is started by
-            the JVM. For more information, see:
-
-            http://activemq.apache.org/jmx.html
-        -->
-        <managementContext>
-            <managementContext createConnector="false"/>
-        </managementContext>
-
-        <persistenceAdapter>
-            <!-- defer cleanup/checkpoint -->
-            <!-- write in max 62k chunks to max disk io bandwith -->
-            <!-- use small number of data files (seldom switch) -->
-            <!-- keep index off the disk (in cache) -->
-
-            <kahaDB directory="${activemq.data}/kahadb"
-                cleanupInterval="300000" checkpointInterval="50000"
-                journalMaxWriteBatchSize="62k"
-                journalMaxFileLength="1g"
-                indexCacheSize="100000" indexWriteBatchSize="100000"
-            />
-        </persistenceAdapter>
-
-        <!-- ensure there is loads or memory for destinations -->
-        <systemUsage>
-            <systemUsage>
-                <memoryUsage>
-                    <memoryUsage limit="2 g"/>
-                </memoryUsage>
-            </systemUsage>
-        </systemUsage>
-
-
-        <!--
-            The transport connectors expose ActiveMQ over a given protocol to
-            clients and other brokers. For more information, see:
-
-            http://activemq.apache.org/configuring-transports.html
-        -->
-        <transportConnectors>
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616"/>
-        </transportConnectors>
-
-    </broker>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-static-network-broker1.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-static-network-broker1.xml b/assembly/src/sample-conf/activemq-static-network-broker1.xml
deleted file mode 100644
index 6503648..0000000
--- a/assembly/src/sample-conf/activemq-static-network-broker1.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!--
-    Create a static network of brokers
-    For more information, see:
-
-    http://activemq.apache.org/networks-of-brokers.html
-
-    To run this example network of ActiveMQ brokers run
-
-    $ bin/activemq console xbean:conf/activemq-static-network-broker1.xml
-
-    and
-
-    $ bin/activemq console xbean:conf/activemq-static-network-broker2.xml
-
-    in separate consoles
- -->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
-  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
-
-    <!-- Allows us to use system properties as variables in this configuration file -->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="static-broker1" dataDirectory="${activemq.data}">
-
-        <!-- Destination specific policies using destination names or wildcards -->
-        <destinationPolicy>
-            <policyMap>
-                <policyEntries>
-                    <policyEntry queue=">" producerFlowControl="true" memoryLimit="20mb">
-                        <deadLetterStrategy>
-                          <individualDeadLetterStrategy queuePrefix="DLQ." useQueueForQueueMessages="true" />
-                        </deadLetterStrategy>
-                    </policyEntry>
-                    <policyEntry topic=">" producerFlowControl="true" memoryLimit="20mb">
-                    </policyEntry>
-                </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-        <!-- Use the following to configure how ActiveMQ is exposed in JMX -->
-        <managementContext>
-            <managementContext createConnector="true"/>
-        </managementContext>
-
-        <!--
-            The store and forward broker networks ActiveMQ will listen to.
-            We'll leave it empty as duplex network will be configured by another broker
-            Take a look at activemq-static_network-broker2.xml for example
-        -->
-        <networkConnectors>
-        </networkConnectors>
-
-        <persistenceAdapter>
-            <kahaDB directory="${activemq.data}/static-broker1/kahadb" />
-        </persistenceAdapter>
-
-        <!--  The maximum amount of space the broker will use before slowing down producers -->
-        <systemUsage>
-            <systemUsage>
-                <memoryUsage>
-                    <memoryUsage limit="20 mb"/>
-                </memoryUsage>
-                <storeUsage>
-                    <storeUsage limit="1 gb" name="foo"/>
-                </storeUsage>
-                <tempUsage>
-                    <tempUsage limit="100 mb"/>
-                </tempUsage>
-            </systemUsage>
-        </systemUsage>
-
-        <!-- The transport connectors ActiveMQ will listen to -->
-        <transportConnectors>
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616"/>
-        </transportConnectors>
-
-    </broker>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-static-network-broker2.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-static-network-broker2.xml b/assembly/src/sample-conf/activemq-static-network-broker2.xml
deleted file mode 100644
index 5f0d2da..0000000
--- a/assembly/src/sample-conf/activemq-static-network-broker2.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!--
-    Create a static network of brokers
-    For more information, see:
-
-    http://activemq.apache.org/networks-of-brokers.html
-
-    To run this example network of ActiveMQ brokers run
-
-    $ bin/activemq console xbean:conf/activemq-static-network-broker1.xml
-
-    and
-
-    $ bin/activemq console xbean:conf/activemq-static-network-broker2.xml
-
-    in separate consoles
- -->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
-  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
-
-    <!-- Allows us to use system properties as variables in this configuration file -->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="static-broker2" dataDirectory="${activemq.data}">
-
-        <!-- Destination specific policies using destination names or wildcards -->
-        <destinationPolicy>
-            <policyMap>
-                <policyEntries>
-                    <policyEntry queue=">" producerFlowControl="true" memoryLimit="20mb">
-                        <deadLetterStrategy>
-                          <individualDeadLetterStrategy queuePrefix="DLQ." useQueueForQueueMessages="true" />
-                        </deadLetterStrategy>
-                    </policyEntry>
-                    <policyEntry topic=">" producerFlowControl="true" memoryLimit="20mb">
-                    </policyEntry>
-                </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-        <!-- Use the following to configure how ActiveMQ is exposed in JMX -->
-        <managementContext>
-            <managementContext createConnector="true" connectorPort="1100"/>
-        </managementContext>
-
-        <!--
-            The store and forward broker networks ActiveMQ will listen to
-            Create a duplex connector to the first broker
-        -->
-        <networkConnectors>
-            <networkConnector uri="static:(tcp://localhost:61616)" duplex="true"/>
-        </networkConnectors>
-
-        <persistenceAdapter>
-            <kahaDB directory="${activemq.data}/static-broker2/kahadb" />
-        </persistenceAdapter>
-
-        <!--  The maximum amount of space the broker will use before slowing down producers -->
-        <systemUsage>
-            <systemUsage>
-                <memoryUsage>
-                    <memoryUsage limit="20 mb"/>
-                </memoryUsage>
-                <storeUsage>
-                    <storeUsage limit="1 gb" name="foo"/>
-                </storeUsage>
-                <tempUsage>
-                    <tempUsage limit="100 mb"/>
-                </tempUsage>
-            </systemUsage>
-        </systemUsage>
-
-        <!-- The transport connectors ActiveMQ will listen to -->
-        <transportConnectors>
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61618"/>
-        </transportConnectors>
-
-    </broker>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-stomp.xml
----------------------------------------------------------------------
diff --git a/assembly/src/sample-conf/activemq-stomp.xml b/assembly/src/sample-conf/activemq-stomp.xml
deleted file mode 100644
index fccdf10..0000000
--- a/assembly/src/sample-conf/activemq-stomp.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!--
-    Use Stomp protocol
-
-    For better behavior under heavy usage, be sure to:
-
-    1. Give broker enough memory
-    2. Disable dedicated task runner
-
-    e.g. ACTIVEMQ_OPTS="-Xmx1024M -Dorg.apache.activemq.UseDedicatedTaskRunner=false"
-
-    To run ActiveMQ with this configuration add xbean:conf/activemq-stomp.xml to your command
-    e.g. $ bin/activemq console xbean:conf/activemq-stomp.xml
- -->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
-    <!-- Allows us to use system properties as variables in this configuration file -->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="locations">
-            <value>file:${activemq.conf}/credentials.properties</value>
-        </property>
-    </bean>
-
-    <!--
-        The <broker> element is used to configure the ActiveMQ broker.
-    -->
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}">
-
-        <!--
-            For better performances use VM cursor and small memory limit.
-            For more information, see:
-
-            http://activemq.apache.org/message-cursors.html
-
-            Also, if your producer is "hanging", it's probably due to producer flow control.
-            For more information, see:
-            http://activemq.apache.org/producer-flow-control.html
-        -->
-
-        <destinationPolicy>
-            <policyMap>
-              <policyEntries>
-                <policyEntry topic=">" producerFlowControl="false">
-                  <pendingSubscriberPolicy>
-                    <vmCursor />
-                  </pendingSubscriberPolicy>
-                </policyEntry>
-                <policyEntry queue=">" producerFlowControl="false">
-                  <!-- Use VM cursor for better latency
-                       For more information, see:
-
-                       http://activemq.apache.org/message-cursors.html
-
-                  <pendingQueuePolicy>
-                    <vmQueueCursor/>
-                  </pendingQueuePolicy>
-                  -->
-                </policyEntry>
-              </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-
-        <!--
-            The managementContext is used to configure how ActiveMQ is exposed in
-            JMX. By default, ActiveMQ uses the MBean server that is started by
-            the JVM. For more information, see:
-
-            http://activemq.apache.org/jmx.html
-        -->
-        <managementContext>
-            <managementContext createConnector="false"/>
-        </managementContext>
-
-        <!--
-            Configure message persistence for the broker. The default persistence
-            mechanism is the KahaDB store (identified by the kahaDB tag).
-            For more information, see:
-
-            http://activemq.apache.org/persistence.html
-        -->
-        <persistenceAdapter>
-            <kahaDB directory="${activemq.data}/kahadb"/>
-        </persistenceAdapter>
-
-
-        <!--
-            The transport connectors expose ActiveMQ over a given protocol to
-            clients and other brokers. For more information, see:
-
-            http://activemq.apache.org/configuring-transports.html
-        -->
-        <transportConnectors>
-            <transportConnector name="stomp" uri="stomp://0.0.0.0:61612?transport.closeAsync=false"/>
-            <transportConnector name="stomp+nio" uri="stomp+nio://0.0.0.0:61613?transport.closeAsync=false"/>
-        </transportConnectors>
-
-        <!-- destroy the spring context on shutdown to stop jetty -->
-        <shutdownHooks>
-            <bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" />
-        </shutdownHooks>
-
-    </broker>
-
-    <!--
-        Uncomment to enable Camel
-        Take a look at activemq-camel.xml for more details
-
-    <import resource="camel.xml"/>
-    -->
-
-    <!--
-        Enable web consoles, REST and Ajax APIs 
-        Take a look at activemq-jetty.xml for more details
-    -->
-    <import resource="jetty.xml"/>
-
-</beans>
\ No newline at end of file