Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge #20

This commit is contained in:
Martyn Taylor 2014-11-20 10:02:53 +00:00
parent 3c83324bb7 a09a8ddb3a
commit c05041e2d5
39 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt
View File

@ -1,8 +1,8 @@
_ _ _ ___
| | | | ___ _ __ _ __ ___| |_ / _ \
| |_| |/ _ \| '__| '_ \ / _ \ __| | | |
| _ | (_) | | | | | | __/ |_| |_| |
|_| |_|\___/|_| |_| |_|\___|\__|\__\_\
_ _ _ __ __ ___
/ \ ___| |_(_)_ _____| \/ |/ _ \
/ _ \ / __| __| | \ / / _ \ |\/| | | | |
/ ___ \ (__| |_| |\ V / __/ | | | |_| |
/_/ \_\___|\__|_| \_/ \___|_| |_|\__\_\
ActiveMQ ${project.version}

2
activemq-server/src/test/resources/live-only-hapolicy-config.xml
View File

@ -1,7 +1,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<ha-policy>
<live-only>
<scale-down>

2
activemq-server/src/test/resources/live-only-hapolicy-config2.xml
View File

@ -1,7 +1,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<ha-policy>
<!--only one of the following-->
<!--on server shutdown scale down to another live server-->

2
activemq-server/src/test/resources/live-only-hapolicy-config3.xml
View File

@ -1,7 +1,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<ha-policy>
<!--only one of the following-->
<!--on server shutdown scale down to another live server-->

2
activemq-server/src/test/resources/live-only-hapolicy-config4.xml
View File

@ -1,7 +1,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<ha-policy/>
</configuration>

2
activemq-server/src/test/resources/live-only-hapolicy-config5.xml
View File

@ -1,6 +1,6 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
</configuration>

2
activemq-server/src/test/resources/replica-hapolicy-config.xml
View File

@ -1,7 +1,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<ha-policy>
<replication>
<slave>

2
activemq-server/src/test/resources/replica-hapolicy-config2.xml
View File

@ -1,7 +1,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<ha-policy>
<replication>
<slave>

2
activemq-server/src/test/resources/replica-hapolicy-config3.xml
View File

@ -1,7 +1,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<ha-policy>
<replication>
<slave>

2
activemq-server/src/test/resources/replicated-hapolicy-config.xml
View File

@ -1,7 +1,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<ha-policy>
<replication>
<master>

2
distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
View File

@ -3,7 +3,7 @@
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<!--
if you want to run this as a backup on different ports you would need to set the following variable
export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
-->
<paging-directory>${data.dir:../data}/paging</paging-directory>

2
distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
View File

@ -3,7 +3,7 @@
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<!--
if you want to run this as a backup on different ports you would need to set the following variable
export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
-->
<paging-directory>${data.dir:../data}/paging</paging-directory>

0
docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent → docs/quickstart-guide/en/ActiveMQ_QuickStart_Guide.ent
View File

0
docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml → docs/quickstart-guide/en/ActiveMQ_QuickStart_Guide.xml
View File

2
examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

4
examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
View File

@ -34,7 +34,7 @@
<broadcast-group name="my-broadcast-group">
<broadcast-period>5000</broadcast-period>
<jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
<jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
<jgroups-channel>active_broadcast_channel</jgroups-channel>
<connector-ref>netty-connector</connector-ref>
</broadcast-group>
</broadcast-groups>
@ -42,7 +42,7 @@
<discovery-groups>
<discovery-group name="my-discovery-group">
<jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
<jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
<jgroups-channel>active_broadcast_channel</jgroups-channel>
<refresh-timeout>10000</refresh-timeout>
</discovery-group>
</discovery-groups>

4
examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
View File

@ -33,7 +33,7 @@
<broadcast-group name="my-broadcast-group">
<broadcast-period>5000</broadcast-period>
<jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
<jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
<jgroups-channel>active_broadcast_channel</jgroups-channel>
<connector-ref>netty-connector</connector-ref>
</broadcast-group>
</broadcast-groups>
@ -41,7 +41,7 @@
<discovery-groups>
<discovery-group name="my-discovery-group">
<jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
<jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
<jgroups-channel>active_broadcast_channel</jgroups-channel>
<refresh-timeout>10000</refresh-timeout>
</discovery-group>
</discovery-groups>

4
examples/jms/clustered-standalone/readme.html
View File

@ -32,10 +32,10 @@
<li>in the first terminal, go to the <code>bin</code> directory and start the first server (with default configuration):
<pre class="prettyprint"><code>./run.sh ../config/stand-alone/clustered</code></pre>
<li>in the second terminal, start the second server:
<pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server2 -Djnp.port=2099 -Djnp.rmiPort=2098 -Dhornetq.remoting.netty.port=6445 -Dhornetq.remoting.netty.batch.port=6455"
<pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server2 -Djnp.port=2099 -Djnp.rmiPort=2098 -Dactivemq.remoting.netty.port=6445 -Dhornetq.remoting.netty.batch.port=6455"
./run.sh ../config/stand-alone/clustered</code></pre>
<li>in the third terminal, start the third server (with default configuration):
<pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server3 -Djnp.port=3099 -Djnp.rmiPort=3098 -Dhornetq.remoting.netty.port=7445 -Dhornetq.remoting.netty.batch.port=7455"
<pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server3 -Djnp.port=3099 -Djnp.rmiPort=3098 -Dactivemq.remoting.netty.port=7445 -Dhornetq.remoting.netty.batch.port=7455"
./run.sh ../config/stand-alone/clustered</code></pre>
<li>finally, in the fourth terminal, start the example
<pre class="prettyprint"><code>./build.sh runRemote</code> (or <code>build.bat runRemote</code> on windows)</pre>

2
examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
View File

@ -1,5 +1,5 @@
<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../schema/activemq-security.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-security.xsd">
<!-- the default user. this is used where username is null-->
<defaultuser name="guest" password="guest">
<role name="guest"/>

2
examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<connectors>
<connector name="netty-connector">

2
examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>

2
examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>

2
examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>

2
examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server2/data/messaging/bindings</bindings-directory>

2
examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

2
examples/soak/normal/server0/activemq-configuration.xml
View File

@ -1,6 +1,6 @@
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<connectors>
<connector name="netty-connector">