You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2011/06/16 18:40:49 UTC
svn commit: r1136539 - in
/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo:
dto/ web/resources/
Author: chirino
Date: Thu Jun 16 16:40:49 2011
New Revision: 1136539
URL: http://svn.apache.org/viewvc?rev=1136539&view=rev
Log:
Make all web interface links have an .html extension so to avoid conflicts with resources who's name end in stuff like ".json"
Modified:
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.jade
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.jade
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/TopicStatusDTO.jade
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.jade
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/EditConfig.jade
activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/ListConfigs.jade
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.jade?rev=1136539&r1=1136538&r2=1136539&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.jade (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/BrokerStatusDTO.jade Thu Jun 16 16:40:49 2011
@@ -20,7 +20,7 @@
h1 Apache ActiveMQ Apollo #{version}
p state: #{state} #{ uptime(state_since) } ago
-a(href={path("config/files")}) Edit Configuration
+a(href={path("config/files.html")}) Edit Configuration
- if( state == "STARTED" )
form(method="post" action={path("action/shutdown")})
input(type="submit" value="shutdown")
@@ -29,20 +29,20 @@ h2 Virtual Hosts
ul
- for( x <- virtual_hosts )
li
- a(href={ path("virtual-hosts/"+ x) }) #{x}
+ a(href={ path("virtual-hosts/"+x+".html") }) #{x}
h2 Connectors
ul
- for( x <- connectors )
li
- a(href={ path("connectors/"+x) }) #{x}
+ a(href={ path("connectors/"+x+".html") }) #{x}
h2 Connections
p total connections ever : #{connection_counter}
ul
- for( x <- connections )
li
- a(href={ path("connections/"+x.id) }) #{x.label}
+ a(href={ path("connections/"+x.id+".html") }) #{x.label}
h2 Operating System
p Name : #{jvm_metrics.os_name}
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade?rev=1136539&r1=1136538&r2=1136539&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectionStatusDTO.jade Thu Jun 16 16:40:49 2011
@@ -18,7 +18,7 @@
- import helper._
.breadcumbs
- a(href={strip_resolve("..")}) Back
+ a(href={strip_resolve("..")+".html"}) Back
p state: #{state} #{ uptime(state_since) } ago
- if( state == "STARTED" )
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.jade?rev=1136539&r1=1136538&r2=1136539&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.jade (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/ConnectorStatusDTO.jade Thu Jun 16 16:40:49 2011
@@ -16,7 +16,7 @@
- val helper = new org.apache.activemq.apollo.web.resources.ViewHelper
- import helper._
.breadcumbs
- a(href={strip_resolve("..")}) Back
+ a(href={strip_resolve("..")+".html"}) Back
h1 Connector: #{id}
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade?rev=1136539&r1=1136538&r2=1136539&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/QueueStatusDTO.jade Thu Jun 16 16:40:49 2011
@@ -24,7 +24,7 @@
- "%,.2f %%".format(n.toFloat*100.0/d)
.breadcumbs
- a(href={strip_resolve("..")}) Back
+ a(href={strip_resolve("..")+".html"}) Back
- binding match
- case x:QueueDestinationDTO =>
@@ -75,7 +75,7 @@ ul
- x.kind match
- case "connection" =>
li.producer
- a(href={ path("../../../../connections/"+x.id) }) #{x.label}
+ a(href={ path("../../../../connections/"+x.id+".html") }) #{x.label}
- case _ =>
@@ -86,7 +86,7 @@ ul
- import consumer._
li.consumer
- if( link !=null )
- a(href={ path("../../../../connections/"+link.id ) }) #{link.label}
+ a(href={ path("../../../../connections/"+link.id+".html") }) #{link.label}
p next message seq: #{position}
p acquired: #{acquired_count} messages (#{memory(acquired_size)})
@@ -98,11 +98,11 @@ ul
- if ( entries.isEmpty )
h2
Entries Dump
- a(href={ id+"?entries=true" }) (Show)
+ a(href={ id+".html?entries=true" }) (Show)
- else
h2
Entries Dump
- a(href={ id }) (Hide)
+ a(href={ id+".html" }) (Hide)
table.queue-entries
tr
th State
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/TopicStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/TopicStatusDTO.jade?rev=1136539&r1=1136538&r2=1136539&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/TopicStatusDTO.jade (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/TopicStatusDTO.jade Thu Jun 16 16:40:49 2011
@@ -18,7 +18,7 @@
- import helper._
.breadcumbs
- a(href={strip_resolve("..")}) Back
+ a(href={strip_resolve("..")+".html"}) Back
h1 Topic: #{id}
@@ -32,7 +32,7 @@ ul
- x.kind match
- case "connection" =>
li
- a(href={ path("../../../../connections/"+x.id) }) #{x.label}
+ a(href={ path("../../../../connections/"+x.id+".html") }) #{x.label}
- case _ =>
h4 Consumers
@@ -42,14 +42,14 @@ ul
- x.kind match
- case "queue" =>
li
- a(href={ path("../../queues/"+x.id) }) #{x.label}
+ a(href={ path("../../queues/"+x.id+".html") }) #{x.label}
- case "connection" =>
li
- a(href={ path("../../../../connections/"+x.id) }) #{x.label}
+ a(href={ path("../../../../connections/"+x.id+".html") }) #{x.label}
- case _ =>
h4 Durable Subscribers
ul
- for( x <- dsubs )
li
- a(href={ path("../../ds/"+x) }) #{x}
+ a(href={ path("../../dsubs/"+x+".html") }) #{x}
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.jade?rev=1136539&r1=1136538&r2=1136539&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.jade (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.jade Thu Jun 16 16:40:49 2011
@@ -18,7 +18,7 @@
- import helper._
.breadcumbs
- a(href={strip_resolve("..")}) Back
+ a(href={strip_resolve("..")+".html"}) Back
h1 Virtual Host: #{id}
@@ -32,16 +32,16 @@ h2 Queues
ul
- for( x <- queues )
li
- a(href={ path("queues/"+x) }) #{x}
+ a(href={ path("queues/"+x+".html") }) #{x}
h2 Topics
ul
- for( x <- topics )
li
- a(href={ path("topics/"+x) }) #{x}
+ a(href={ path("topics/"+x+".html") }) #{x}
h2 Durable Subscriptions
ul
- for( x <- dsubs )
li
- a(href={ path("dsubs/"+x) }) #{x}
+ a(href={ path("dsubs/"+x+".html") }) #{x}
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/EditConfig.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/EditConfig.jade?rev=1136539&r1=1136538&r2=1136539&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/EditConfig.jade (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/EditConfig.jade Thu Jun 16 16:40:49 2011
@@ -18,7 +18,7 @@
- import helper._
.breadcumbs
- a(href={strip_resolve(".")}) Back
+ a(href={strip_resolve(".")+".html"}) Back
form(method="post" action={file+".html"})
- if( can_write )
Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/ListConfigs.jade
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/ListConfigs.jade?rev=1136539&r1=1136538&r2=1136539&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/ListConfigs.jade (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/org/apache/activemq/apollo/web/resources/ListConfigs.jade Thu Jun 16 16:40:49 2011
@@ -18,7 +18,7 @@
- import helper._
.breadcumbs
- a(href={strip_resolve("..")}) Back
+ a(href={strip_resolve("..")+".html"}) Back
ul
- for( file <- files )