Prepare SLC v0.14.1 release

[gpl/argeo-slc.git] / modules / server / org.argeo.slc.server.mysql / META-INF / spring / mysql.xml

diff --git a/modules/server/org.argeo.slc.server.mysql/META-INF/spring/mysql.xml b/modules/server/org.argeo.slc.server.mysql/META-INF/spring/mysql.xml
index 8286594a22f0d02df4433c7d8e7620f065106e8b..4f85f569e5e69fb10d81790836c08f303b8664a0 100644 (file)
--- a/modules/server/org.argeo.slc.server.mysql/META-INF/spring/mysql.xml
+++ b/modules/server/org.argeo.slc.server.mysql/META-INF/spring/mysql.xml
@@ -8,13 +8,11 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
        default-lazy-init="false">
 
-       <import
-               resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
+       <import resource="classpath:/org/argeo/slc/hibernate/spring.xml" />
 
        <bean
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
                <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
                <property name="locations">
                        <value>osgibundle:mysql.properties
                        </value>
@@ -31,29 +29,28 @@
             ]]></value>
                </property>
        </bean>
-<!-- 
-       <bean id="dataSource"
+       <!--
+               <bean id="dataSource"
                class="org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy">
-               <property name="targetDataSource">
-                       <bean
-                               class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
-                               destroy-method="destroy">
-                               <property name="driverClassName" value="com.mysql.jdbc.Driver" />
-                               <property name="url" value="jdbc:mysql://localhost/sparta_prod" />
-                               <property name="username" value="root" />
-                               <property name="password" value="" />
-                               <property name="suppressClose" value="true" />
-                               <property name="autoCommit" value="false" />
-                       </bean>
-               </property>
-       </bean>
- -->
+               <property name="targetDataSource"> <bean
+               class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
+               destroy-method="destroy"> <property name="driverClassName"
+               value="com.mysql.jdbc.Driver" /> <property name="url"
+               value="jdbc:mysql://localhost/sparta_prod" /> <property
+               name="username" value="root" /> <property name="password" value="" />
+               <property name="suppressClose" value="true" /> <property
+               name="autoCommit" value="false" /> </bean> </property> </bean>
+       -->
        <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
                destroy-method="close">
                <property name="driverClassName" value="com.mysql.jdbc.Driver" />
                <property name="url" value="${jdbc.url}" />
                <property name="username" value="${jdbc.username}" />
                <property name="password" value="${jdbc.password}" />
+               <property name="testOnBorrow" value="true" />
+               <property name="validationQuery" value="SELECT 1" />
+               <property name="maxActive" value="10" />
+               <property name="maxIdle" value="2" />
        </bean>