From 84a8c4f80cb348966fdf8fde1930bfa9eb4a2dcb Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Thu, 23 Aug 2012 20:40:39 +0000
Subject: [PATCH] Fixing issues on other computers.

---
 .../src/main/java/com/gempukku/lotro/db/DbAccess.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbAccess.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbAccess.java
index 4928f2751..f98b50674 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbAccess.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbAccess.java
@@ -1,5 +1,6 @@
 package com.gempukku.lotro.db;
 
+import com.gempukku.lotro.common.ApplicationConfiguration;
 import org.apache.commons.dbcp.ConnectionFactory;
 import org.apache.commons.dbcp.DriverManagerConnectionFactory;
 import org.apache.commons.dbcp.PoolableConnectionFactory;
@@ -13,12 +14,12 @@ public class DbAccess {
 
     public DbAccess() {
         try {
-            Class.forName("org.gjt.mm.mysql.Driver");
+            Class.forName(ApplicationConfiguration.getProperty("db.connection.class"));
         } catch (ClassNotFoundException e) {
             throw new RuntimeException("Couldn't find the DB driver", e);
         }
 
-        _dataSource = setupDataSource("jdbc:mysql://localhost/gemp-lotr");
+        _dataSource = setupDataSource(ApplicationConfiguration.getProperty("db.connection.url"));
     }
 
     public DataSource getDataSource() {
@@ -34,7 +35,8 @@ public class DbAccess {
         // arguments.
         //
         ConnectionFactory connectionFactory =
-                new DriverManagerConnectionFactory(connectURI, "gemp-lotr", "gemp-lotr");
+                new DriverManagerConnectionFactory(connectURI, ApplicationConfiguration.getProperty("db.connection.username"),
+                        ApplicationConfiguration.getProperty("db.connection.password"));
 
         //
         // Now we'll need a ObjectPool that serves as the
@@ -53,7 +55,7 @@ public class DbAccess {
         // the classes that implement the pooling functionality.
         //
         PoolableConnectionFactory poolableConnectionFactory =
-                new PoolableConnectionFactory(connectionFactory, connectionPool, null, "/* ping */ select 1", false, true);
+                new PoolableConnectionFactory(connectionFactory, connectionPool, null, ApplicationConfiguration.getProperty("db.connection.validateQuery"), false, true);
 
         connectionPool.setFactory(poolableConnectionFactory);