From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 28 Jun 2008 12:11:36 +0000 (+0000)
Subject: Introduce JMX and Hibernate statistics
X-Git-Tag: argeo-slc-2.1.7~2733
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=7c0d5dc15687dd033ec6c255780899aceab236a8;p=gpl%2Fargeo-slc.git

Introduce JMX and Hibernate statistics

git-svn-id: https://svn.argeo.org/slc/trunk@1309 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 5c990249d..ea87d4025 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -1,10 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.5.xsd"
-	default-lazy-init="true">
-
-	<import
-		resource="classpath:/org/argeo/slc/server/spring/servletContext.xml" />
-
+<?xml version="1.0" encoding="UTF-8"?>
+<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.5.xsd"
+	default-lazy-init="true">
+
+	<import
+		resource="classpath:/org/argeo/slc/server/spring/servletContext.xml" />
+
+	<import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
+
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties
index 86ac8ce28..3f6e3de34 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties
@@ -1,7 +1,7 @@
 # Rename this file to local.properties
 
 # For in memory database switch following lines
-sessionFactoryParentBean=slcDefault.sessionFactory.hibernateTestHSQL
+sessionFactoryParentBean=slcServerDefault.sessionFactory.hibernateTestHSQL
 #sessionFactoryParentBean=slcServerDefault.sessionFactory.persistentHSQL
 
 # URL of the persistent database
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties
index cc1ed800d..ee7a36932 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties
@@ -10,7 +10,8 @@ log4j.logger.org.springframework=WARN
 
 # Hibernate
 log4j.logger.org.hibernate=WARN
-#log4j.logger.org.hibernate.SQL=TRACE
+log4j.logger.org.hibernate.stat=INFO
+log4j.logger.org.hibernate.SQL=DEBUG
 #log4j.logger.org.hibernate.tool.hbm2ddl=TRACE
 #log4j.logger.org.hibernate.type=TRACE