activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r785691 - in /activemq/trunk: activemq-web-console/src/main/webapp/WEB-INF/ assembly/src/release/webapps/admin/WEB-INF/
Date Wed, 17 Jun 2009 15:53:10 GMT
Author: gtully
Date: Wed Jun 17 15:53:10 2009
New Revision: 785691

URL: http://svn.apache.org/viewvc?rev=785691&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2169 - remove duplication of spring mvc query
beans

Added:
    activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-query.xml   (with
props)
Modified:
    activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-embedded.xml
    activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-invm.xml
    activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-jndi.xml
    activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-properties.xml
    activemq/trunk/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml

Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-embedded.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-embedded.xml?rev=785691&r1=785690&r2=785691&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-embedded.xml (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-embedded.xml Wed
Jun 17 15:53:10 2009
@@ -20,9 +20,9 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
                            http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
+  <import resource="webconsole-query.xml"/>
   <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
/>
-  
-  
+    
   <bean id="sessionPool" class="org.apache.activemq.web.SessionPool">
   	<property name="connectionFactory" ref="connectionFactory"/>
   </bean>
@@ -38,9 +38,4 @@
 
   <bean id="brokerQuery" class="org.apache.activemq.web.LocalBrokerFacade" autowire="constructor"
scope="prototype"/>
 
-  <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>

Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-invm.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-invm.xml?rev=785691&r1=785690&r2=785691&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-invm.xml (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-invm.xml Wed Jun
17 15:53:10 2009
@@ -20,6 +20,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
                            http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
+  <import resource="webconsole-query.xml"/>
   <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
/>
   
   
@@ -37,9 +38,4 @@
 
   <bean id="brokerQuery" class="org.apache.activemq.web.LocalBrokerFacade" autowire="constructor"
scope="prototype"/>
 
-  <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>

Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-jndi.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-jndi.xml?rev=785691&r1=785690&r2=785691&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-jndi.xml (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-jndi.xml Wed Jun
17 15:53:10 2009
@@ -20,9 +20,9 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
                            http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
+  <import resource="webconsole-query.xml"/>  
   <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
/>
   
-  
   <bean id="sessionPool" class="org.apache.activemq.web.SessionPool">
   	<property name="connectionFactory" ref="connectionFactory"/>
   </bean>
@@ -36,8 +36,4 @@
   
   <bean id="connectionFactory" factory-bean="configuration" factory-method="getConnectionFactory"/>

 
-  <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>

Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-properties.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-properties.xml?rev=785691&r1=785690&r2=785691&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-properties.xml
(original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-properties.xml
Wed Jun 17 15:53:10 2009
@@ -20,9 +20,9 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
                            http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
+  <import resource="webconsole-query.xml"/>
   <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
/>
   
-  
   <bean id="sessionPool" class="org.apache.activemq.web.SessionPool">
   	<property name="connectionFactory" ref="connectionFactory"/>
   </bean>
@@ -36,9 +36,4 @@
   
   <bean id="connectionFactory" factory-bean="configuration" factory-method="getConnectionFactory"/>
 
-  <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>

Added: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-query.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-query.xml?rev=785691&view=auto
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-query.xml (added)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-query.xml Wed Jun
17 15:53:10 2009
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<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="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>

Propchange: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-query.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-query.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-query.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: activemq/trunk/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml?rev=785691&r1=785690&r2=785691&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml (original)
+++ activemq/trunk/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml Wed
Jun 17 15:53:10 2009
@@ -18,6 +18,9 @@
 <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">
      
+     
+  <import resource="webconsole-query.xml"/>
+     
   <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="locations">
                 <value>file:${activemq.base}/conf/credentials.properties</value>
@@ -38,9 +41,4 @@
     <property name="password" value="${activemq.password}"/>    
   </bean>
 
-  <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>



Mime
View raw message