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 2018/04/04 00:33:33 UTC

activemq-artemis git commit: Revert "NO-JIRA fixing variable on a few examples"

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a8e81f226 -> 32090121d


Revert "NO-JIRA fixing variable on a few examples"

This reverts commit eb3cc5cb676acd0b6526a4610ef4e95355ae3505.

Reverting PR #1983


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

Branch: refs/heads/master
Commit: 32090121d2e9bcc715a4a9afc31336bdfeec8127
Parents: a8e81f2
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Apr 3 20:33:12 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Apr 3 20:33:12 2018 -0400

----------------------------------------------------------------------
 .../src/main/resources/activemq/server0/bootstrap.xml              | 2 +-
 .../src/main/resources/activemq/server0/bootstrap.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/32090121/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml b/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
index 5ffd6d5..2d753e7 100644
--- a/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
+++ b/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
@@ -20,7 +20,7 @@
 
    <jaas-security domain="activemq" certificate-domain="activemq-cert"/>
 
-   <server configuration="${artemis.URI.instance}/etc/broker.xml"/>
+   <server configuration="file:${artemis.instance}/etc/broker.xml"/>
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/32090121/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
index f473f69..2eabc51 100644
--- a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
+++ b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
@@ -20,7 +20,7 @@
 
    <jaas-security domain="activemq" certificate-domain="activemq-cert"/>
 
-   <server configuration="file:${artemis.URI.instance}/etc/broker.xml"/>
+   <server configuration="file:${artemis.instance}/etc/broker.xml"/>
 
 </broker>