Dependency upgrades
* 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:
parent
a981d1653e
commit
2adc754a2c
28 changed files with 97 additions and 105 deletions
legacyworlds-server-beans-system/src/main/java/com/deepclone/lw/beans/sys
|
@ -14,10 +14,10 @@ import java.util.Set;
|
|||
|
||||
import javax.sql.DataSource;
|
||||
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.jdbc.core.RowMapper;
|
||||
import org.springframework.jdbc.core.SqlParameter;
|
||||
import org.springframework.jdbc.core.simple.SimpleJdbcCall;
|
||||
import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
|
||||
import org.springframework.transaction.TransactionStatus;
|
||||
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
|
||||
import org.springframework.transaction.support.TransactionTemplate;
|
||||
|
@ -43,7 +43,7 @@ import com.deepclone.lw.utils.StoredProc;
|
|||
class ConstantsData
|
||||
{
|
||||
/** Database interface */
|
||||
private SimpleJdbcTemplate dTemplate;
|
||||
private JdbcTemplate dTemplate;
|
||||
|
||||
/** Transaction manager interface */
|
||||
private TransactionTemplate tTemplate;
|
||||
|
@ -85,7 +85,7 @@ class ConstantsData
|
|||
*/
|
||||
ConstantsData( DataSource dataSource , TransactionTemplate tTemplate , Logger logger )
|
||||
{
|
||||
this.dTemplate = new SimpleJdbcTemplate( dataSource );
|
||||
this.dTemplate = new JdbcTemplate( dataSource );
|
||||
|
||||
this.uocConstantNoBounds = new SimpleJdbcCall( dataSource );
|
||||
this.uocConstantNoBounds.withCatalogName( "sys" ).withFunctionName( "uoc_constant" );
|
||||
|
|
|
@ -9,10 +9,10 @@ import java.util.Map;
|
|||
import javax.sql.DataSource;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.jdbc.core.RowMapper;
|
||||
import org.springframework.jdbc.core.SqlOutParameter;
|
||||
import org.springframework.jdbc.core.simple.SimpleJdbcCall;
|
||||
import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
|
||||
import org.springframework.transaction.PlatformTransactionManager;
|
||||
import org.springframework.transaction.TransactionStatus;
|
||||
import org.springframework.transaction.support.TransactionCallback;
|
||||
|
@ -33,7 +33,7 @@ public class SystemStatusBean
|
|||
{
|
||||
|
||||
/** Database interface */
|
||||
private SimpleJdbcTemplate dTemplate;
|
||||
private JdbcTemplate dTemplate;
|
||||
|
||||
/** Transaction template */
|
||||
private TransactionTemplate tTemplate;
|
||||
|
@ -55,7 +55,7 @@ public class SystemStatusBean
|
|||
@Autowired( required = true )
|
||||
public void setDataSource( DataSource dataSource )
|
||||
{
|
||||
this.dTemplate = new SimpleJdbcTemplate( dataSource );
|
||||
this.dTemplate = new JdbcTemplate( dataSource );
|
||||
|
||||
this.fEnterMaintenanceMode = new StoredProc( dataSource , "sys" , "enter_maintenance_mode" );
|
||||
this.fEnterMaintenanceMode.addParameter( "admin_id" , Types.INTEGER );
|
||||
|
|
|
@ -17,8 +17,8 @@ import javax.sql.DataSource;
|
|||
|
||||
import org.springframework.beans.factory.InitializingBean;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.jdbc.core.RowMapper;
|
||||
import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
|
||||
import org.springframework.transaction.PlatformTransactionManager;
|
||||
import org.springframework.transaction.TransactionStatus;
|
||||
import org.springframework.transaction.support.TransactionCallback;
|
||||
|
@ -42,7 +42,7 @@ public class TickerManagerBean
|
|||
private final Set< Integer > registered = new HashSet< Integer >( );
|
||||
|
||||
private TransactionTemplate tTemplate;
|
||||
private SimpleJdbcTemplate dTemplate;
|
||||
private JdbcTemplate dTemplate;
|
||||
|
||||
private final RowMapper< TickerTaskRecord > mTask;
|
||||
|
||||
|
@ -80,7 +80,7 @@ public class TickerManagerBean
|
|||
@Autowired( required = true )
|
||||
public void setDataSource( DataSource dataSource )
|
||||
{
|
||||
this.dTemplate = new SimpleJdbcTemplate( dataSource );
|
||||
this.dTemplate = new JdbcTemplate( dataSource );
|
||||
|
||||
this.fRegisterTask = new StoredProc( dataSource , "sys" , "register_ticker_task" );
|
||||
this.fRegisterTask.addParameter( "task_name" , Types.VARCHAR );
|
||||
|
|
Reference in a new issue