From 2d42b629c55b25123be84134c00bbf7cc126ff51 Mon Sep 17 00:00:00 2001
From: Gary Tully <gtully@apache.org>
Date: Wed, 17 Jun 2009 14:55:52 +0000
Subject: [PATCH] resolve: https://issues.apache.org/activemq/browse/AMQ-2169 -
 distribution version of webconsole-embedded spring mvc beans were out of date
 w.r.t their scope and hense were not getting cleaned up after a request as
 expected

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@785640 13f79535-47bb-0310-9956-ffa450edef68
---
 .../admin/WEB-INF/webconsole-embedded.xml        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml b/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml
index a63515be52..2777baa621 100644
--- a/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml
+++ b/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml
@@ -15,9 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+     
   <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="locations">
                 <value>file:${activemq.base}/conf/credentials.properties</value>
@@ -25,7 +25,7 @@
   </bean>
   
   <!-- use the following bean for a local in-JVM broker -->
-  <bean id="brokerQuery" class="org.apache.activemq.web.SingletonBrokerFacade" autowire='constructor' singleton="false"/>
+  <bean id="brokerQuery" class="org.apache.activemq.web.SingletonBrokerFacade" autowire="constructor" scope="prototype"/>
 
 
   <bean id="sessionPool" class="org.apache.activemq.web.SessionPool">
@@ -38,9 +38,9 @@
     <property name="password" value="${activemq.password}"/>    
   </bean>
 
-  <bean id="queueBrowser" class="org.apache.activemq.web.QueueBrowseQuery" autowire='constructor' singleton="false"/>
-  <bean id="messageQuery" class="org.apache.activemq.web.MessageQuery" autowire='constructor' singleton="false"/>
-  <bean id="queueConsumerQuery" class="org.apache.activemq.web.QueueConsumerQuery" autowire="constructor" singleton="false"/>
-  <bean id="connectionQuery" class="org.apache.activemq.web.ConnectionQuery" autowire="constructor" singleton="false"/>
+  <bean id="queueBrowser" class="org.apache.activemq.web.QueueBrowseQuery" autowire="constructor" destroy-method="destroy" scope="request"/>
+  <bean id="messageQuery" class="org.apache.activemq.web.MessageQuery" autowire="constructor" destroy-method="destroy" scope="request"/>
+  <bean id="queueConsumerQuery" class="org.apache.activemq.web.QueueConsumerQuery" autowire="constructor" destroy-method="destroy" scope="request"/>
+  <bean id="connectionQuery" class="org.apache.activemq.web.ConnectionQuery" autowire="constructor" destroy-method="destroy" scope="request"/>
 
 </beans>