projects/lwb6
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dependency upgrades

Browse source 
* Spring upgraded from 3.0.3 to 3.1.0 - As a consequence, all code that
used SimpleJdbcTemplate has been modified to use JdbcTemplate, as the
former has been deprecated.

* SLF4J upgraded from 1.5.11 to 1.6.4

* Apache Commons: DBCP upgraded from 1.2.2 to 1.4, Codec upgraded from
1.4 to 1.6

* CGLib upgraded from 2.2 to 2.2.2

* javax.mail upgraded from 1.4.1 to 1.4.4

* XStream upgraded from 1.3.1 to 1.4.2

* JUnit upgraded from 4.7 to 4.10

* FreeMarker upgraded from 2.3.16 to 2.3.18

* PostgreSQL JDBC glue upgraded from 8.4-701 to 9.1-901

* legacyworlds-server-tests no longer considered a dummy package
This commit is contained in:
Emmanuel BENOîT 2012-01-16 18:09:45 +01:00
parent a981d1653e
commit 2adc754a2c
28 changed files with 97 additions and 105 deletions
legacyworlds-server-beans-i18n/src/main/java/com/deepclone/lw/beans/i18n
I18NData.javaLoaderTransaction.java

6
legacyworlds-server-beans-i18n/src/main/java/com/deepclone/lw/beans/i18n/I18NData.java
View file

@ -12,7 +12,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.sql.DataSource;
import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
import org.springframework.transaction.support.TransactionTemplate;
@ -35,7 +35,7 @@ class I18NData
private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock( );
/** Database interface */
private final SimpleJdbcTemplate dTemplate;
private final JdbcTemplate dTemplate;
/** Transaction manager interface */
private final TransactionTemplate tTemplate;
@ -53,7 +53,7 @@ class I18NData
/** Copies the required references then loads all data */
I18NData( DataSource dataSource , TransactionTemplate tTemplate )
{
this.dTemplate = new SimpleJdbcTemplate( dataSource );
this.dTemplate = new JdbcTemplate( dataSource );
this.tTemplate = tTemplate;
this.fUocLanguage = new StoredProc( dataSource , "defs" , "uoc_language" );

6
legacyworlds-server-beans-i18n/src/main/java/com/deepclone/lw/beans/i18n/LoaderTransaction.java
View file

@ -6,8 +6,8 @@ import java.sql.SQLException;
import java.util.HashMap;
import java.util.HashSet;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
@ -27,7 +27,7 @@ class LoaderTransaction
{
/** Database interface */
private final SimpleJdbcTemplate dTemplate;
private final JdbcTemplate dTemplate;
/** String definition map being initialised */
private final HashSet< String > strings;
@ -37,7 +37,7 @@ class LoaderTransaction
/** Copies the required references */
LoaderTransaction( SimpleJdbcTemplate dTemplate , HashSet< String > strings ,
LoaderTransaction( JdbcTemplate dTemplate , HashSet< String > strings ,
HashMap< String , LanguageStore > languages )
{
this.dTemplate = dTemplate;