You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/05/05 16:59:09 UTC
[1/3] activemq-artemis git commit: use host argument properly with
CLI create command
Repository: activemq-artemis
Updated Branches:
refs/heads/master 391db0b01 -> 7707a9c96
use host argument properly with CLI create command
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/56e4bd79
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/56e4bd79
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/56e4bd79
Branch: refs/heads/master
Commit: 56e4bd79bc01129c907852d53b2c299e60b04738
Parents: 5e4c3e3
Author: Andy Taylor <an...@gmail.com>
Authored: Tue May 5 11:08:52 2015 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 5 10:58:24 2015 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/Create.java | 2 +-
.../apache/activemq/artemis/cli/commands/etc/broker.xml | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/56e4bd79/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 653776b..a3da9f1 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -94,7 +94,7 @@ public class Create implements Action
context.out.println(String.format("Creating ActiveMQ Artemis instance at: %s", directory.getCanonicalPath()));
if (host == null)
{
- host = directory.getName();
+ host = "localhost";
}
HashMap<String, String> filters = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/56e4bd79/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 35ca9c6..7b92851 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -38,21 +38,21 @@ under the License.
<connectors>
<!-- Default Connector. Returned to clients during broadcast and distributed around cluster. See broadcast and discovery-groups -->
- <connector name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</connector>
+ <connector name="activemq">tcp://${activemq.remoting.default.host:${host}}:${activemq.remoting.default.port:61616}</connector>
</connectors>
<acceptors>
<!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. -->
- <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
+ <acceptor name="activemq">tcp://${activemq.remoting.default.host:${host}}:${activemq.remoting.default.port:61616}</acceptor>
<!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.-->
- <acceptor name="amqp">tcp://${activemq.remoting.amqp.host:localhost}:${activemq.remoting.amqp.port:5672}?protocols=AMQP</acceptor>
+ <acceptor name="amqp">tcp://${activemq.remoting.amqp.host:${host}}:${activemq.remoting.amqp.port:5672}?protocols=AMQP</acceptor>
<!-- STOMP Acceptor. -->
- <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
+ <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:${host}}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
<!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients. -->
- <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
+ <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:${host}}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
</acceptors>
${cluster.settings}${replicated.settings}${shared-store.settings}
[3/3] activemq-artemis git commit: This closes #225 on CLI fixes
Posted by cl...@apache.org.
This closes #225 on CLI fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7707a9c9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7707a9c9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7707a9c9
Branch: refs/heads/master
Commit: 7707a9c962b96caaca57c710d4744fb145cc5f09
Parents: 391db0b 56e4bd7
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue May 5 10:58:40 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 5 10:58:40 2015 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/Create.java | 4 ++--
.../apache/activemq/artemis/cli/commands/etc/broker.xml | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[2/3] activemq-artemis git commit: fixed create CLI typo
Posted by cl...@apache.org.
fixed create CLI typo
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5e4c3e3b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5e4c3e3b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5e4c3e3b
Branch: refs/heads/master
Commit: 5e4c3e3baedc797d17ec566eb971aff49f693752
Parents: 391db0b
Author: Andy Taylor <an...@gmail.com>
Authored: Tue May 5 10:36:08 2015 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 5 10:58:24 2015 -0400
----------------------------------------------------------------------
.../main/java/org/apache/activemq/artemis/cli/commands/Create.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5e4c3e3b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index ad379c1..653776b 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -112,7 +112,7 @@ public class Create implements Action
clustered = true;
sharedStoreSettings = readTextFile("etc/shared-store-settings.txt");
}
- filters.put("${hared-store.settings}", sharedStoreSettings);
+ filters.put("${shared-store.settings}", sharedStoreSettings);
String clusterSettings = "";
if (clustered)