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

6
legacyworlds-server-beans-simple/src/main/java/com/deepclone/lw/beans/empire/AllianceDAOBean.java
View file

@ -10,8 +10,8 @@ import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
import com.deepclone.lw.cmd.player.gdata.NameIdPair;
import com.deepclone.lw.cmd.player.gdata.alliance.AllianceLeaderData;
@ -28,7 +28,7 @@ public class AllianceDAOBean
implements AllianceDAO
{
private SimpleJdbcTemplate dTemplate;
private JdbcTemplate dTemplate;
private StoredProc fCreateAlliance;
private StoredProc fJoinAlliance;
private StoredProc fCancelJoin;
@ -42,7 +42,7 @@ public class AllianceDAOBean
@Autowired( required = true )
public void setDataSource( DataSource dataSource )
{
this.dTemplate = new SimpleJdbcTemplate( dataSource );
this.dTemplate = new JdbcTemplate( dataSource );
this.fCreateAlliance = new StoredProc( dataSource , "emp" , "create_alliance" );
this.fCreateAlliance.addParameter( "empire_id" , Types.INTEGER );

6
legacyworlds-server-beans-simple/src/main/java/com/deepclone/lw/beans/empire/EmpireDAOBean.java
View file

@ -12,8 +12,8 @@ import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
import com.deepclone.lw.cmd.ObjectNameError;
import com.deepclone.lw.cmd.player.gdata.NameIdPair;
@ -30,7 +30,7 @@ import com.deepclone.lw.utils.StoredProc;
public class EmpireDAOBean
implements EmpireDAO
{
private SimpleJdbcTemplate dTemplate;
private JdbcTemplate dTemplate;
private StoredProc fImplementTech;
private StoredProc fAddEmpEnemy;
private StoredProc fAddAllEnemy;
@ -44,7 +44,7 @@ public class EmpireDAOBean
@Autowired( required = true )
public void setDataSource( DataSource dataSource )
{
this.dTemplate = new SimpleJdbcTemplate( dataSource );
this.dTemplate = new JdbcTemplate( dataSource );
this.fImplementTech = new StoredProc( dataSource , "emp" , "implement_tech" );
this.fImplementTech.addParameter( "empire_id" , Types.INTEGER );

7
legacyworlds-server-beans-simple/src/main/java/com/deepclone/lw/beans/fleets/BattlesDAOBean.java
View file

@ -12,9 +12,8 @@ import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
import com.deepclone.lw.interfaces.game.BattlesDAO;
import com.deepclone.lw.sqld.game.battle.*;
@ -34,7 +33,7 @@ public class BattlesDAOBean
private static final String sGetAllBattles = "SELECT * FROM battles.battles_list WHERE empire = ? ORDER BY last_tick DESC NULLS FIRST , first_tick DESC , x , y , orbit";
private static final String sGetNewBattles = "SELECT * FROM battles.battles_list WHERE empire = ? AND ( last_update > ? OR NOT finished ) ORDER BY last_tick DESC NULLS FIRST , first_tick DESC , x , y , orbit";
private SimpleJdbcTemplate dTemplate;
private JdbcTemplate dTemplate;
private final RowMapper< EmpireBattleRecord > mGetBattleRecord;
private final RowMapper< PresenceRecord > mGetPresenceList;
@ -173,7 +172,7 @@ public class BattlesDAOBean
@Autowired( required = true )
public void setDataSource( DataSource dataSource )
{
this.dTemplate = new SimpleJdbcTemplate( dataSource );
this.dTemplate = new JdbcTemplate( dataSource );
}

6
legacyworlds-server-beans-simple/src/main/java/com/deepclone/lw/beans/fleets/FleetsDAOBean.java
View file

@ -13,8 +13,8 @@ import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
import com.deepclone.lw.cmd.player.gdata.NameIdPair;
import com.deepclone.lw.cmd.player.gdata.PlanetRelationType;
@ -42,7 +42,7 @@ public class FleetsDAOBean
private static String sqlSingleMoving = "SELECT * FROM fleets.moving_fleets WHERE empire = ? AND id = ?";
private static String sqlFleetShips = "SELECT * FROM fleets.ships_view WHERE empire = ? AND id = ?";
private SimpleJdbcTemplate dTemplate;
private JdbcTemplate dTemplate;
private RowMapper< FleetLocation > mLocations;
private RowMapper< RawFleetOwner > mOwners;
@ -209,7 +209,7 @@ public class FleetsDAOBean
@Autowired( required = true )
public void setDataSource( DataSource dataSource )
{
this.dTemplate = new SimpleJdbcTemplate( dataSource );
this.dTemplate = new JdbcTemplate( dataSource );
this.fMoveFleets = new StoredProc( dataSource , "fleets" , "move_fleets" );
this.fMoveFleets.addParameter( "empire_id" , Types.INTEGER );

7
legacyworlds-server-beans-simple/src/main/java/com/deepclone/lw/beans/map/PlanetDAOBean.java
View file

@ -9,9 +9,8 @@ import java.util.List;
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.simple.SimpleJdbcTemplate;
import com.deepclone.lw.cmd.player.gdata.planets.BuildableBuildingData;
import com.deepclone.lw.cmd.player.gdata.planets.BuildableShipData;
import com.deepclone.lw.cmd.player.gdata.planets.BuildingData;
@ -30,7 +29,7 @@ public class PlanetDAOBean
implements PlanetDAO
{
private SimpleJdbcTemplate dTemplate;
private JdbcTemplate dTemplate;
private RowMapper< Basic > mPlanetBasics;
private RowMapper< Orbital > mPlanetOrbital;
@ -195,7 +194,7 @@ public class PlanetDAOBean
@Autowired( required = true )
public void setDataSource( DataSource dataSource )
{
this.dTemplate = new SimpleJdbcTemplate( dataSource );
this.dTemplate = new JdbcTemplate( dataSource );
this.fFlushBuildQueue = new StoredProc( dataSource , "verse" , "flush_build_queue" );
this.fFlushBuildQueue.addParameter( "planet_id" , Types.INTEGER );

8
legacyworlds-server-beans-simple/src/main/java/com/deepclone/lw/beans/map/UniverseDAOBean.java
View file

@ -8,8 +8,8 @@ import java.util.List;
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.simple.SimpleJdbcTemplate;
import com.deepclone.lw.interfaces.game.UniverseDAO;
import com.deepclone.lw.sqld.game.MapData;
@ -19,20 +19,20 @@ import com.deepclone.lw.sqld.game.MapData;
public class UniverseDAOBean
implements UniverseDAO
{
private SimpleJdbcTemplate dTemplate;
private JdbcTemplate dTemplate;
@Autowired( required = true )
public void setDataSource( DataSource dataSource )
{
this.dTemplate = new SimpleJdbcTemplate( dataSource );
this.dTemplate = new JdbcTemplate( dataSource );
}
@Override
public void generate( )
{
this.dTemplate.getJdbcOperations( ).execute( "SELECT verse.generate( )" );
this.dTemplate.execute( "SELECT verse.generate( )" );
}

6
legacyworlds-server-beans-simple/src/main/java/com/deepclone/lw/beans/msgs/MessageBoxDAOBean.java
View file

@ -13,8 +13,8 @@ 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.simple.SimpleJdbcTemplate;
import com.deepclone.lw.cmd.msgdata.MessageType;
import com.deepclone.lw.cmd.player.msgs.MessageBoxAction;
@ -87,7 +87,7 @@ public class MessageBoxDAOBean
private final Map< CacheKey , CacheData > cache = new HashMap< CacheKey , CacheData >( );
private SimpleJdbcTemplate dTemplate;
private JdbcTemplate dTemplate;
private final RowMapper< InboxRecord > listMapper;
private StoredProc fSendSpam;
@ -135,7 +135,7 @@ public class MessageBoxDAOBean
@Autowired( required = true )
public void setDataSource( DataSource dataSource )
{
this.dTemplate = new SimpleJdbcTemplate( dataSource );
this.dTemplate = new JdbcTemplate( dataSource );
this.fSendSpam = new StoredProc( dataSource , "msgs" , "deliver_admin_spam" );
this.fSendSpam.addParameter( "admin_id" , Types.INTEGER );

6
legacyworlds-server-beans-simple/src/main/java/com/deepclone/lw/beans/msgs/MessageRecordsDAOBean.java
View file

@ -10,8 +10,8 @@ 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.simple.SimpleJdbcTemplate;
import com.deepclone.lw.interfaces.msg.MessageRecordsDAO;
import com.deepclone.lw.sqld.msgs.*;
@ -43,7 +43,7 @@ public class MessageRecordsDAOBean
private static final String sGetQueueLocations = "SELECT * FROM events.queue_locations_view WHERE event_id = ANY( ? ::BIGINT[] )";
private static final String sGetEventFleets = "SELECT * FROM events.fleet_lists WHERE event_id = ANY( ? ::BIGINT[] )";
private SimpleJdbcTemplate dTemplate;
private JdbcTemplate dTemplate;
private final RowMapper< TextMessageRecord > mTextMessage;
private final RowMapper< EventTypeRecord > mEventTypes;
@ -219,7 +219,7 @@ public class MessageRecordsDAOBean
@Autowired( required = true )
public void setDataSource( DataSource dataSource )
{
this.dTemplate = new SimpleJdbcTemplate( dataSource );
this.dTemplate = new JdbcTemplate( dataSource );
}

8
legacyworlds-server-beans-simple/src/main/java/com/deepclone/lw/beans/msgs/NotificationsDAOBean.java
View file

@ -10,8 +10,8 @@ import java.util.List;
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.simple.SimpleJdbcTemplate;
import com.deepclone.lw.interfaces.msg.NotificationsDAO;
import com.deepclone.lw.sqld.msgs.InboxRecord;
@ -26,7 +26,7 @@ public class NotificationsDAOBean
private static final String sGetInstantNotifications = "SELECT * FROM msgs.get_mail_data() WHERE last_unmailed IS NOT NULL";
private static final String sGetRecapNotifications = "SELECT * FROM msgs.get_mail_data() WHERE last_unrecaped IS NOT NULL";
private SimpleJdbcTemplate dTemplate;
private JdbcTemplate dTemplate;
private final RowMapper< NotificationsRecord > mNotifications;
private RowMapper< InboxRecord > mList;
@ -81,7 +81,7 @@ public class NotificationsDAOBean
@Autowired( required = true )
public void setDataSource( DataSource dataSource )
{
this.dTemplate = new SimpleJdbcTemplate( dataSource );
this.dTemplate = new JdbcTemplate( dataSource );
this.fMarkInstantMessages = new StoredProc( dataSource , "msgs" , "mark_instant_notifications" );
this.fMarkInstantMessages.addParameter( "empire_id" , Types.INTEGER );
@ -163,6 +163,6 @@ public class NotificationsDAOBean
@Override
public void cleanupMessages( )
{
this.dTemplate.getJdbcOperations( ).execute( "SELECT msgs.cleanup( )" );
this.dTemplate.execute( "SELECT msgs.cleanup( )" );
}
}