Project

General

Profile

« Previous | Next » 

Revision 49898

1. Create new update methods for repository api
2. Rename piwik file.
3. Create bean repomanager.datasource
4. Update converter methods ( typology, datasourceClass )

View differences:

applicationContext.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<beans xmlns="http://www.springframework.org/schema/beans"
3 3
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
       xmlns:context="http://www.springframework.org/schema/context"
5
       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
4
       xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx"
5
       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
6 6

  
7 7
    <import resource="classpath*:/application-context.xml"/>
8 8

  
......
25 25

  
26 26
    <import resource="classpath*:/eu/dnetlib/repos/springContext-repos-dms-cached.xml"/>
27 27

  
28

  
29 28
    <context:property-placeholder location="classpath*:/eu/**/application.properties" />
30 29

  
31 30
    <bean class="eu.dnetlib.repo.manager.service.config.CascadingPropertyLoader" id="propertyLoader">
......
57 56
        </property>
58 57
    </bean>
59 58

  
59
    <bean id="repomanager.dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
60
        <property name="driverClassName" value="${repomanager.db.driverClassName}" />
61
        <property name="url" value="${repomanager.db.url}" />
62
        <property name="username" value="${repomanager.db.username}" />
63
        <property name="password" value="${repomanager.db.password}" />
64
        <property name="maxIdle" value="10" />
65
        <property name="maxActive" value="100" />
66
        <property name="maxWait" value="10000" />
67
        <property name="validationQuery" value="SELECT 1;" />
68
        <property name="testOnBorrow" value="true" />
69
        <property name="testOnReturn" value="true" />
70
        <property name="testWhileIdle" value="true" />
71
        <property name="timeBetweenEvictionRunsMillis" value="1200000" />
72
        <property name="minEvictableIdleTimeMillis" value="1800000" />
73
        <property name="numTestsPerEvictionRun" value="5" />
74
        <property name="poolPreparedStatements" value="true" />
75
        <property name="defaultAutoCommit" value="true" />
76
    </bean>
77

  
78
    <tx:annotation-driven transaction-manager="txManager"/>
79

  
80
    <bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
81
        <property name="dataSource" ref="repomanager.dataSource"/>
82
    </bean>
83

  
60 84
</beans>

Also available in: Unified diff