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

Merge branch 'easy-fixes' of https://github.com/dkulp/activemq into trunk

This commit is contained in:
Hadrian Zbarcea 2014-02-05 21:36:34 -05:00
parent 2e5a64652d 17d1489c62
commit 5f9aca837a
7 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-web-console/pom.xml
View File

@ -78,6 +78,10 @@
<name>webconsole.type</name>
<value>embedded</value>
</systemProperty>
<systemProperty>
<name>activemq.data</name>
<value>${project.build.directory}/activemq-data</value>
</systemProperty>
<!--
Use the following configuration to connect to a remote broker using JMX

2
activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java
View File

@ -49,7 +49,7 @@ public class CopyMessage extends DestinationFacade implements Controller {
log.warn("No queue named: " + getPhysicalDestinationName());
}
}
return redirectToBrowseView();
return redirectToDestinationView();
}
public String getMessageId() {

2
activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java
View File

@ -48,7 +48,7 @@ public class DeleteMessage extends DestinationFacade implements Controller {
log.warn("No queue named: " + getPhysicalDestinationName());
}
}
return redirectToBrowseView();
return redirectToDestinationView();
}
public String getMessageId() {

2
activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java
View File

@ -49,7 +49,7 @@ public class MoveMessage extends DestinationFacade implements Controller {
log.warn("No queue named: " + getPhysicalDestinationName());
}
}
return redirectToBrowseView();
return redirectToDestinationView();
}
public String getMessageId() {

1
activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
View File

@ -25,6 +25,7 @@
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
<broker brokerName="web-console" useJmx="true" xmlns="http://activemq.apache.org/schema/core">

6
activemq-web-console/src/main/webapp/message.jsp
View File

@ -133,10 +133,10 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
</thead>
<tbody>
<tr>
<td colspan="2"><a href="deleteMessage.action?JMSDestination=<c:out value="${row.JMSDestination}" />&messageId=${row.JMSMessageID}&secret=<c:out value='${sessionScope["secret"]}'/>">Delete</a></td>
<td colspan="2"><a href="deleteMessage.action?JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&secret=<c:out value='${sessionScope["secret"]}'/>">Delete</a></td>
</tr>
<tr class="odd">
<td><a href="javascript:confirmAction('queue', 'copyMessage.action?destination=%target%&JMSDestination=<c:out value="${row.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Copy</a></td>
<td><a href="javascript:confirmAction('queue', 'copyMessage.action?destination=%target%&JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Copy</a></td>
<td rowspan="2">
<select id="queue">
<option value=""> -- Please select --</option>
@ -150,7 +150,7 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
</tr>
<tr class="odd">
<td><a href="javascript:confirmAction('queue', 'moveMessage.action?destination=%target%&JMSDestination=<c:out value="${row.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Move</a></td>
<td><a href="javascript:confirmAction('queue', 'moveMessage.action?destination=%target%&JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Move</a></td>
</tr>
</tbody>
</table>

4
activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
View File

@ -128,6 +128,10 @@ public class DestinationFacade {
return new ModelAndView("redirect:" + (isQueue() ? "queues.jsp" : "topics.jsp"));
}
protected ModelAndView redirectToDestinationView() {
return new ModelAndView("redirect:browse.jsp?JMSDestination=" + jmsDestination);
}
protected String getPhysicalDestinationName() {
return createDestination().getPhysicalName();
}