activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject git commit: AMQ-4750: Include details about 2 web consoles now in distro.
Date Mon, 30 Sep 2013 14:37:02 GMT
Updated Branches:
  refs/heads/trunk 6725350e0 -> bdbe3d2d0


AMQ-4750: Include details about 2 web consoles now in distro.


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

Branch: refs/heads/trunk
Commit: bdbe3d2d08bf2c208248403d82724bbb66867d05
Parents: 6725350
Author: Claus Ibsen <claus.ibsen@gmail.com>
Authored: Mon Sep 30 16:36:54 2013 +0200
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Mon Sep 30 16:36:54 2013 +0200

----------------------------------------------------------------------
 activemq-web/README.txt                    |  2 +-
 assembly/src/release/WebConsole-README.txt | 14 +++++++++++++-
 assembly/src/release/webapps/index.html    |  3 ++-
 3 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/bdbe3d2d/activemq-web/README.txt
----------------------------------------------------------------------
diff --git a/activemq-web/README.txt b/activemq-web/README.txt
index 5b52f8d..f2b1f0e 100755
--- a/activemq-web/README.txt
+++ b/activemq-web/README.txt
@@ -1,7 +1,7 @@
 Here be the home of the web-module.
 
 The demonstration webapp has been moved to the activemq-web-demo module.
-This module now onlu builds the jar for activemq-web.
+This module now only builds the jar for activemq-web.
 The javascript modules needed for the AJAX interface are included as 
 resources and served my the MessageListenerServlet
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/bdbe3d2d/assembly/src/release/WebConsole-README.txt
----------------------------------------------------------------------
diff --git a/assembly/src/release/WebConsole-README.txt b/assembly/src/release/WebConsole-README.txt
index 8099696..a1453ef 100644
--- a/assembly/src/release/WebConsole-README.txt
+++ b/assembly/src/release/WebConsole-README.txt
@@ -1,8 +1,20 @@
 Deploying the ActiveMQ-WebConsole
 =================================
 
+From ActiveMQ 5.9 onwards ActiveMQ ships with two web consoles:
+- new console using hawtio
+- old console
+
+The old console is deprecated and replaced with a new modern console based on hawtio (http://hawt.io)
+
+The old console is accessible at its usual location at:
+  http://localhost:8161/admin/
+
+And the new console is located at:
+  http://localhost:8161/hawtio/
+
 In the default configuration ActiveMQ automatically starts the web console in the
-same VM as the broker. The console is accessibly under http://localhost:8161/admin/.
+same VM as the broker. The console is accessibly under http://localhost:8161/hawtio/.
 
 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

http://git-wip-us.apache.org/repos/asf/activemq/blob/bdbe3d2d/assembly/src/release/webapps/index.html
----------------------------------------------------------------------
diff --git a/assembly/src/release/webapps/index.html b/assembly/src/release/webapps/index.html
index 99d26b8..d96262d 100644
--- a/assembly/src/release/webapps/index.html
+++ b/assembly/src/release/webapps/index.html
@@ -90,7 +90,8 @@
                                             
                                                 <p>What do you want to do next?</p>
                                                 <ul class="alternate" type="square">

-                                                    <li><a title="Manage ActiveMQ
broker" href="/admin/">Manage ActiveMQ broker</a></li> 
+                                                    <li><a title="Manage ActiveMQ
broker" href="/hawtio/">Manage ActiveMQ broker</a></li> 
+                                                    <li><a title="Manage ActiveMQ
broker (old console)" href="/admin/">Manage ActiveMQ broker using the old console</a></li>

                                                     <li><a title="See some Web demos"
href="/demo/">See some Web demos (demos not included in default configuration)</a></li>
 
                                                 </ul> 
                                     </div> 


Mime
View raw message