Merge branch 'easy-fixes' of https://github.com/dkulp/activemq into trunk
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5f9aca83 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5f9aca83 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5f9aca83 Branch: refs/heads/trunk Commit: 5f9aca837a14e719c94c330238c920997046ef90 Parents: 2e5a646 17d1489 Author: Hadrian Zbarcea <[email protected]> Authored: Wed Feb 5 21:36:34 2014 -0500 Committer: Hadrian Zbarcea <[email protected]> Committed: Wed Feb 5 21:36:34 2014 -0500 ---------------------------------------------------------------------- activemq-web-console/pom.xml | 4 ++++ .../java/org/apache/activemq/web/controller/CopyMessage.java | 2 +- .../java/org/apache/activemq/web/controller/DeleteMessage.java | 2 +- .../java/org/apache/activemq/web/controller/MoveMessage.java | 2 +- activemq-web-console/src/main/webapp/WEB-INF/activemq.xml | 1 + activemq-web-console/src/main/webapp/message.jsp | 6 +++--- .../main/java/org/apache/activemq/web/DestinationFacade.java | 4 ++++ 7 files changed, 15 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
