From 3321f99643edc5ebc4bd8f4b9eaea90744fc6d60 Mon Sep 17 00:00:00 2001
From: Daniel Kulp <dkulp@apache.org>
Date: Wed, 5 Feb 2014 15:19:44 -0500
Subject: [PATCH 1/2] [AMQ-4174] Redirect back to queue overview after
 delete/moving message Patch from Robert Balent applied

---
 .../org/apache/activemq/web/controller/CopyMessage.java     | 2 +-
 .../org/apache/activemq/web/controller/DeleteMessage.java   | 2 +-
 .../org/apache/activemq/web/controller/MoveMessage.java     | 2 +-
 activemq-web-console/src/main/webapp/message.jsp            | 6 +++---
 .../java/org/apache/activemq/web/DestinationFacade.java     | 4 ++++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java
index 3a82898873..178eadd998 100644
--- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java
+++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java
@@ -49,7 +49,7 @@ public class CopyMessage extends DestinationFacade implements Controller {
             	log.warn("No queue named: " + getPhysicalDestinationName());
             }
         }
-        return redirectToBrowseView();
+        return redirectToDestinationView();
     }
 
     public String getMessageId() {
diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java
index 1f060fe05e..d9bf009be2 100644
--- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java
+++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java
@@ -48,7 +48,7 @@ public class DeleteMessage extends DestinationFacade implements Controller {
             	log.warn("No queue named: " + getPhysicalDestinationName());
             }
         }
-        return redirectToBrowseView();
+        return redirectToDestinationView();
     }
 
     public String getMessageId() {
diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java
index 2155382261..5a4916580b 100644
--- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java
+++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java
@@ -49,7 +49,7 @@ public class MoveMessage extends DestinationFacade implements Controller {
             	log.warn("No queue named: " + getPhysicalDestinationName());
             }
         }
-        return redirectToBrowseView();
+        return redirectToDestinationView();
     }
 
     public String getMessageId() {
diff --git a/activemq-web-console/src/main/webapp/message.jsp b/activemq-web-console/src/main/webapp/message.jsp
index be4e14fcd7..cc5ff0c19e 100644
--- a/activemq-web-console/src/main/webapp/message.jsp
+++ b/activemq-web-console/src/main/webapp/message.jsp
@@ -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>
diff --git a/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java b/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
index 7e4e548719..367f11017c 100644
--- a/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
+++ b/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
@@ -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();
     }

From 17d1489c62b6bc33b77bce38eeecdc357f9c61bf Mon Sep 17 00:00:00 2001
From: Daniel Kulp <dkulp@apache.org>
Date: Wed, 5 Feb 2014 16:08:26 -0500
Subject: [PATCH 2/2] [AMQ-5029] embedded webconsole broker does not resolve
 activemq.data system property

---
 activemq-web-console/pom.xml                              | 4 ++++
 activemq-web-console/src/main/webapp/WEB-INF/activemq.xml | 1 +
 2 files changed, 5 insertions(+)

diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index e5f2e94af0..771ee02584 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -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
diff --git a/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml b/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
index 4baf3b5206..7203bef1fe 100755
--- a/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
@@ -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">