activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: Web-console does not initialize under Spring-4.x because dispatcher-servlet.xml has very old bean definition. This closes #37 Signed-off-by: Daniel Kulp <dkulp@apache.org>
Date Wed, 30 Jul 2014 14:26:04 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk 1ee5108be -> c0f28e8e0


Web-console does not initialize under Spring-4.x because dispatcher-servlet.xml has very old
bean definition.
This closes #37
Signed-off-by: Daniel Kulp <dkulp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c0f28e8e
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c0f28e8e
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c0f28e8e

Branch: refs/heads/trunk
Commit: c0f28e8e0a2707c6e2e3b94bbbfb093ce347fdd4
Parents: 1ee5108
Author: Andreas Kuhtz <andreas.kuhtz@gmail.com>
Authored: Wed Jul 30 14:35:11 2014 +0200
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Jul 30 10:23:22 2014 -0400

----------------------------------------------------------------------
 .../main/webapp/WEB-INF/dispatcher-servlet.xml  | 29 +++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/c0f28e8e/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
index da02abe..5aa4951 100644
--- a/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -15,10 +15,13 @@
     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.xsd"
> 
 
-  <bean id="handlerMapping" class="org.apache.activemq.web.handler.BindingBeanNameUrlHandlerMapping"
singleton="false">
+  <bean id="handlerMapping" class="org.apache.activemq.web.handler.BindingBeanNameUrlHandlerMapping"
scope="prototype">
     <!--
     <property name="uriToClassNames">
       <props><prop key="/foo.action">org.apache.activemq.web.controller.Foo</prop></props>
@@ -26,16 +29,16 @@
     -->
   </bean>
 
-  <bean name="/createDestination.action" class="org.apache.activemq.web.controller.CreateDestination"
autowire="constructor"  singleton="false"/>
-  <bean name="/deleteDestination.action" class="org.apache.activemq.web.controller.DeleteDestination"
autowire="constructor"  singleton="false"/>
-  <bean name="/createSubscriber.action" class="org.apache.activemq.web.controller.CreateSubscriber"
autowire="constructor"  singleton="false"/>
-  <bean name="/deleteSubscriber.action" class="org.apache.activemq.web.controller.DeleteSubscriber"
autowire="constructor"  singleton="false"/>
-  <bean name="/sendMessage.action" class="org.apache.activemq.web.controller.SendMessage"
autowire="constructor"  singleton="false"/>
-  <bean name="/purgeDestination.action" class="org.apache.activemq.web.controller.PurgeDestination"
autowire="constructor"  singleton="false"/>
-  <bean name="/deleteMessage.action" class="org.apache.activemq.web.controller.DeleteMessage"
autowire="constructor"  singleton="false"/>
-  <bean name="/copyMessage.action" class="org.apache.activemq.web.controller.CopyMessage"
autowire="constructor"  singleton="false"/>	
-  <bean name="/moveMessage.action" class="org.apache.activemq.web.controller.MoveMessage"
autowire="constructor"  singleton="false"/>
-  <bean name="/deleteJob.action" class="org.apache.activemq.web.controller.DeleteJob"
autowire="constructor"  singleton="false"/>
+  <bean name="/createDestination.action" class="org.apache.activemq.web.controller.CreateDestination"
autowire="constructor"  scope="prototype"/>
+  <bean name="/deleteDestination.action" class="org.apache.activemq.web.controller.DeleteDestination"
autowire="constructor"  scope="prototype"/>
+  <bean name="/createSubscriber.action" class="org.apache.activemq.web.controller.CreateSubscriber"
autowire="constructor"  scope="prototype"/>
+  <bean name="/deleteSubscriber.action" class="org.apache.activemq.web.controller.DeleteSubscriber"
autowire="constructor"  scope="prototype"/>
+  <bean name="/sendMessage.action" class="org.apache.activemq.web.controller.SendMessage"
autowire="constructor"  scope="prototype"/>
+  <bean name="/purgeDestination.action" class="org.apache.activemq.web.controller.PurgeDestination"
autowire="constructor"  scope="prototype"/>
+  <bean name="/deleteMessage.action" class="org.apache.activemq.web.controller.DeleteMessage"
autowire="constructor"  scope="prototype"/>
+  <bean name="/copyMessage.action" class="org.apache.activemq.web.controller.CopyMessage"
autowire="constructor"  scope="prototype"/>	
+  <bean name="/moveMessage.action" class="org.apache.activemq.web.controller.MoveMessage"
autowire="constructor"  scope="prototype"/>
+  <bean name="/deleteJob.action" class="org.apache.activemq.web.controller.DeleteJob"
autowire="constructor"  scope="prototype"/>
 
   <!--
     - This bean resolves specific types of exception to corresponding error views.


Mime
View raw message