Changeset 10294

Timestamp:

2005-07-25T16:17:22+12:00 (19 years ago)

Author:

kjdon

Message:

made the connection a bit more dynamic - gets server and port and password info from GlobalProperties

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/database/GS3SQLConnectionFactory.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/database/GS3SQLConnectionFactory.java

@@ -4 +4 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
-
+import java.io.InputStream;
+import java.util.Properties;
+import org.greenstone.gsdl3.util.GlobalProperties;
 
 public class GS3SQLConnectionFactory
 {
+
     public static Connection getConnection(String database)
     {
-    try {
+    try {       
+        String server = GlobalProperties.getProperty("mysql.server", "localhost");
+        String port = GlobalProperties.getProperty("mysql.tcp.port", "3306");
+        String password = GlobalProperties.getProperty("mysql.gsdl3admin.password");
+        
         Class.forName("com.mysql.jdbc.Driver").newInstance();
-        
-        Connection connection = DriverManager.getConnection("jdbc:mysql://localhost/"+database+"?user=gsdl3admin"/*&password=greenstone"*/);
+        String connection_address = "jdbc:mysql://"+server+":"+port+"/"+database+"?user=gsdl3admin";
+        if (password != null) {
+        connection_address += "&password="+password;
+        }
+        Connection connection = DriverManager.getConnection(connection_address);
         return connection;
     }
-    catch (SQLException sqlEx)
-        {   System.out.println(sqlEx.toString());
-        }
-    catch (Exception ex)
-        {   System.out.println(ex.toString());
-        return null;
-        }
+    catch (SQLException sqlEx) {
+        System.out.println(sqlEx.toString());
+    }
+    catch (Exception ex) {
+        System.out.println(ex.toString());
+    }
     return null;
     }