diff --git a/trunk/PlanosActuacao/src/java/db/DBConstants.java b/trunk/PlanosActuacao/src/java/db/DBConstants.java deleted file mode 100644 index 88f02634..00000000 --- a/trunk/PlanosActuacao/src/java/db/DBConstants.java +++ /dev/null @@ -1,27 +0,0 @@ -package db; - -public interface DBConstants -{ - public static final String WEB_URL = "jdbc:postgresql://localhost:5436/siprp"; -// public static final String WEB_URL = "jdbc:postgresql://storage:5432/siprp_20091203"; - public static final String WEB_USER = "postgres"; -// public static final String WEB_PASSWORD = "Typein"; - public static final String WEB_PASSWORD = null; - -// public static final String WEB_URL = "jdbc:postgresql://www.evolute.pt:5436/siprp"; -// public static final String WEB_USER = "postgres"; -// public static final String WEB_PASSWORD = "Typein"; - - public static final String LOCAL_URL = "jdbc:postgresql://localhost:5436/siprp_local_3"; -// public static final String LOCAL_URL = "jdbc:postgresql://storage:5432/siprp_local_3_20091203"; - public static final String LOCAL_USER = "postgres"; -// public static final String LOCAL_PASSWORD = "Typein"; - public static final String LOCAL_PASSWORD = null; - -// public static final String LOCAL_URL = "jdbc:postgresql://www.evolute.pt:5436/siprp_local_3"; -// public static final String LOCAL_USER = "postgres"; -// public static final String LOCAL_PASSWORD = "Typein"; - - public static final String WEB_DBMANAGER = "WEB DBMANAGER"; - public static final String LOCAL_DBMANAGER = "LOCAL DBMANAGER"; -} diff --git a/trunk/PlanosActuacao/src/java/db/Db.java b/trunk/PlanosActuacao/src/java/db/Db.java index b2f101f7..c572c3e0 100644 --- a/trunk/PlanosActuacao/src/java/db/Db.java +++ b/trunk/PlanosActuacao/src/java/db/Db.java @@ -21,13 +21,10 @@ import utils.JSFUtils; public class Db { // String connectionURL = "jdbc:postgresql://storage:5432/siprp_20091203"; //testes // String connectionURL = "jdbc:postgresql://www.evolute.pt:5436/siprp"; //real -// String connectionURL = "jdbc:postgresql://localhost:5436/siprp"; //real - String connectionURL = DBConstants.WEB_URL; + String connectionURL = "jdbc:postgresql://localhost:5436/siprp"; //real - String User = DBConstants.WEB_USER; - String Pass = DBConstants.WEB_PASSWORD; -// String User = "postgres"; -// String Pass = null; + String User = "postgres"; + String Pass = null; Connection connection = null; /** Creates a new instance of Db */ diff --git a/trunk/PlanosActuacao/src/java/db/Dblocal.java b/trunk/PlanosActuacao/src/java/db/Dblocal.java index 5c4d27af..0cf2f6a8 100644 --- a/trunk/PlanosActuacao/src/java/db/Dblocal.java +++ b/trunk/PlanosActuacao/src/java/db/Dblocal.java @@ -26,13 +26,10 @@ public class Dblocal { // String connectionURL = "jdbc:postgresql://storage:5432/siprp_local3"; //testes //String connectionURL = "jdbc:postgresql://storage/siprp_local_3"; //testes local_3 // String connectionURL = "jdbc:postgresql://www.evolute.pt:5436/siprp_local_3"; //testes local_3 -// String connectionURL = "jdbc:postgresql://localhost:5436/siprp_local_3"; - String connectionURL = DBConstants.LOCAL_URL; + String connectionURL = "jdbc:postgresql://localhost:5436/siprp_local_3"; - String User = DBConstants.LOCAL_USER; - String Pass = DBConstants.LOCAL_PASSWORD; -// String User = "postgres"; -// String Pass = null; + String User = "postgres"; + String Pass = null; Connection connection = null; /** Creates a new instance of Dblocal */ diff --git a/trunk/PlanosActuacao/src/java/db/PlanoActuacaoDBInit.java b/trunk/PlanosActuacao/src/java/db/PlanoActuacaoDBInit.java deleted file mode 100644 index 96c0d770..00000000 --- a/trunk/PlanosActuacao/src/java/db/PlanoActuacaoDBInit.java +++ /dev/null @@ -1,46 +0,0 @@ -package db; - -import siprp.SingletonConstants; - -import com.evolute.utils.Singleton; -import com.evolute.utils.db.DBManager; -import com.evolute.utils.db.JDBCManager; -import com.evolute.utils.db.keyretrievers.PostgresqlAutoKeyRetriever; -import com.evolute.utils.sql.Insert; -import com.evolute.utils.strings.UnicodeChecker; - -public class PlanoActuacaoDBInit -{ - public static void initDB( boolean web ) - throws Exception - { - if( web ) - { - String url = DBConstants.WEB_URL; - String user = DBConstants.WEB_USER; - String pwd = DBConstants.WEB_PASSWORD; - DBManager webManager = new JDBCManager( url, user, pwd, 10, 8, 8, null ); - Singleton.setInstance( DBConstants.WEB_DBMANAGER, webManager ); - - url = DBConstants.LOCAL_URL; - user = DBConstants.LOCAL_USER; - pwd = DBConstants.LOCAL_PASSWORD; - DBManager localManager = new JDBCManager( url, user, pwd, 10, 8, 8, null ); - Singleton.setInstance( DBConstants.LOCAL_DBMANAGER, localManager ); - } - else - { - String url = ( String ) Singleton.getInstance( SingletonConstants.WEB_URL_PREFIX ); - url += ( String ) Singleton.getInstance( SingletonConstants.WEB_URL ) + "/"; - url += ( String ) Singleton.getInstance( SingletonConstants.WEB_DB_NAME ) + "/"; - String user = ( String ) Singleton.getInstance( SingletonConstants.WEB_USER ); - String pwd = ( String ) Singleton.getInstance( SingletonConstants.WEB_PASSWORD ); - DBManager webManager = new JDBCManager( url, user, pwd, 10, 8, 8, null ); - Singleton.setInstance( DBConstants.WEB_DBMANAGER, webManager ); - Singleton.setInstance( DBConstants.LOCAL_DBMANAGER, Singleton.getInstance( Singleton.DEFAULT_DBMANAGER ) ); - } - - Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); - UnicodeChecker.setUseDoubleSlash( true ); - } -}