From 486fea9bc088c9d7943139f981930df36f37d174 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 18 Nov 2010 17:15:45 +0000
Subject: do not launch MBeanServer by default, remove old config
 defaultConf.properties

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@844 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
index ca5ffccc..31d0d24a 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
@@ -227,7 +227,8 @@
 		<property name="bindingProcessorManager" ref="bindingProcessorManager" />
 	</bean>
 	
-	<!-- JMX -->
+  <!-- do not launch MBeanServer by default
+   |   (the contextPathFactoryBean requires Servlet 2.5)
 	<bean
     class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
     <property name="properties">
@@ -259,6 +260,7 @@
       </map>
     </property>
   </bean>
+  -->
 	
 
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3