From 415fc9fa1217a00a1c8dd20f0bef5b0cc8f49c03 Mon Sep 17 00:00:00 2001 From: Diogo Neves Date: Mon, 11 Oct 2010 12:24:57 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1525 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../nbproject/private/private.properties | 2 +- trunk/PlanosActuacao/src/java/db/Db.java | 6 +-- .../src/java/db/DbRelatorios.java | 4 +- trunk/PlanosActuacao/src/java/db/Dblocal.java | 48 ++++++++++++++++--- .../src/java/db/DblocalRelatorios.java | 4 +- .../src/java/planosactuacao/Header.java | 2 +- 6 files changed, 50 insertions(+), 16 deletions(-) diff --git a/trunk/PlanosActuacao/nbproject/private/private.properties b/trunk/PlanosActuacao/nbproject/private/private.properties index 69a1b979..5858bc8d 100644 --- a/trunk/PlanosActuacao/nbproject/private/private.properties +++ b/trunk/PlanosActuacao/nbproject/private/private.properties @@ -4,7 +4,7 @@ auxiliary.org-netbeans-modules-web-client-tools-api.FIREFOX=true auxiliary.org-netbeans-modules-web-client-tools-api.INTERNET_5f_EXPLORER=false auxiliary.org-netbeans-modules-web-client-tools-api.serverdebug=true deploy.ant.properties.file=/home/dneves/.netbeans/6.7/tomcat60.properties -j2ee.platform.classpath=/usr/local/apache-tomcat-6.0.18/lib/catalina.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/usr/local/apache-tomcat-6.0.18/lib/annotations-api.jar:/usr/local/apache-tomcat-6.0.18/lib/servlet-api.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper-el.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/usr/local/apache-tomcat-6.0.18/lib/el-api.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ha.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ant.jar:/usr/local/apache-tomcat-6.0.18/lib/jsp-api.jar:/usr/local/apache-tomcat-6.0.18/bin/tomcat-juli.jar +j2ee.platform.classpath=/usr/local/apache-tomcat-6.0.18/lib/jasper.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ant.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/usr/local/apache-tomcat-6.0.18/lib/annotations-api.jar:/usr/local/apache-tomcat-6.0.18/lib/servlet-api.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper-el.jar:/usr/local/apache-tomcat-6.0.18/lib/el-api.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ha.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/usr/local/apache-tomcat-6.0.18/lib/jsp-api.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/usr/local/apache-tomcat-6.0.18/bin/tomcat-juli.jar j2ee.server.instance=tomcat60:home=/usr/local/apache-tomcat-6.0.18:base=apache-tomcat-6.0.18_base javac.debug=true javadoc.preview=true diff --git a/trunk/PlanosActuacao/src/java/db/Db.java b/trunk/PlanosActuacao/src/java/db/Db.java index 306e3b35..5ecd236d 100644 --- a/trunk/PlanosActuacao/src/java/db/Db.java +++ b/trunk/PlanosActuacao/src/java/db/Db.java @@ -27,11 +27,11 @@ public class Db private String Pass = null; //tests -// private String server = "evoserver"; +// private String server = "localhost"; // private int port = 5432; -// private String db_name = "siprp_20100813"; +// private String db_name = "siprp"; // private String User = "postgres"; -// private String Pass = null; +// private String Pass = null; private String connectionURL = "jdbc:postgresql://" + server + ":" + port + "/" + db_name; diff --git a/trunk/PlanosActuacao/src/java/db/DbRelatorios.java b/trunk/PlanosActuacao/src/java/db/DbRelatorios.java index 68f43e4d..32e43711 100644 --- a/trunk/PlanosActuacao/src/java/db/DbRelatorios.java +++ b/trunk/PlanosActuacao/src/java/db/DbRelatorios.java @@ -25,9 +25,9 @@ public class DbRelatorios private String Pass = null; //tests -// private String server = "evoserver"; +// private String server = "localhost"; // private int port = 5432; -// private String db_name = "siprp_20100813"; +// private String db_name = "siprp"; // private String User = "postgres"; // private String Pass = null; diff --git a/trunk/PlanosActuacao/src/java/db/Dblocal.java b/trunk/PlanosActuacao/src/java/db/Dblocal.java index 0b84ead0..34717a1a 100644 --- a/trunk/PlanosActuacao/src/java/db/Dblocal.java +++ b/trunk/PlanosActuacao/src/java/db/Dblocal.java @@ -10,7 +10,18 @@ package db; import com.evolute.application.initializer.DefaultDatabaseInitializer; +import com.evolute.entity.ProviderRegistry; +import com.evolute.entity.evo.EvoDataProviderFactory; +import com.evolute.entity.utils.ConnectionIdentity; +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.error.ErrorLogger; +import com.evolute.utils.jdbc.DBStatementExecuter; +import com.evolute.utils.jdbc.StatementExecuterFactory; +import com.evolute.utils.sql.Insert; +import com.evolute.utils.sql.SQLQuery; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; @@ -24,15 +35,15 @@ import javax.servlet.http.HttpSession; */ public class Dblocal { -// String server = "evoserver"; -// String port = "5432"; -// String database = "siprp_local_3_20100813"; - String User = "postgres"; - String Pass = null; - String server = "localhost"; String port = "5436"; String database = "siprp_local_3"; + String User = "postgres"; + String Pass = null; + +// String server = "localhost"; +// String port = "5432"; +// String database = "siprp_local"; String connectionURL = "jdbc:postgresql://" + server + ":" + port + "/" + database; @@ -58,7 +69,7 @@ public class Dblocal // application.setLocalConnection(connection); // } - new DefaultDatabaseInitializer( server, port, database, User, Pass ).doInit(); + // Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); // ProviderRegistry.registerDefaultProviderFactory( new EvoDataProviderFactory() ); // ConnectionIdentity conn = new ConnectionIdentity( connectionURL, User ); @@ -68,6 +79,29 @@ public class Dblocal // // Singleton.setInstance( Singleton.DEFAULT_OBJECT_PROVIDER, provider ); // Singleton.setInstance( Singleton.DEFAULT_EVO_DATA_PROVIDER, provider ); + + + +// new DefaultDatabaseInitializer( server, port, database, User, Pass ).doInit(); +// Singleton.setInstance( Singleton.DATABASE_NAME, database ); + String dbUrl = "jdbc:postgresql://" + server + ":" + port + "/" + database + "?logUnclosedConnections=true&loginTimeout=10&tcpKeepAlive=true"; + +// System.out.println("Using database at [" + dbUrl + "]" ); + + DBManager dbManager = new JDBCManager( dbUrl, User, Pass, 14, 7, 7, new SQLQuery[]{} ); + + Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); + + ProviderRegistry.registerDefaultProviderFactory( new EvoDataProviderFactory() ); + + ConnectionIdentity conn = new ConnectionIdentity( dbUrl, User ); + conn.setPassword( Pass ); + StatementExecuterFactory.initialize( new DBStatementExecuter( dbManager.getExclusiveExecuter( this ) ) ); + ProviderRegistry.registerDefaultConnection( conn ); + +// Singleton.setInstance( Singleton.DEFAULT_EVO_DATA_PROVIDER, ProviderRegistry.getDefaultProvider( conn ) ); +// Singleton.setInstance( Singleton.DEFAULT_OBJECT_PROVIDER, ProviderRegistry.getDefaultProvider( conn ) ); +// Singleton.setInstance( Singleton.DEFAULT_DBMANAGER, dbManager ); HttpSession session = (HttpSession)FacesContext.getCurrentInstance().getExternalContext().getSession(true); diff --git a/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java b/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java index 929ea82b..58dd9ec6 100644 --- a/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java +++ b/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java @@ -27,9 +27,9 @@ public class DblocalRelatorios private String Pass = null; //tests -// private String server = "evoserver"; +// private String server = "localhost"; // private int port = 5432; -// private String db_name = "siprp_local_3_20100813"; +// private String db_name = "siprp_local"; // private String User = "postgres"; // private String Pass = null; diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/Header.java b/trunk/PlanosActuacao/src/java/planosactuacao/Header.java index ab06a77b..535bea2a 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/Header.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/Header.java @@ -204,7 +204,7 @@ public class Header extends AbstractFragmentBean { Utilizador u = session.getCurrentUser(); String url = Global.ANALISE_ACIDENTES_URL; - int tipo = u.getTipo().intValue(); + //int tipo = u.getTipo().intValue(); url += "GestaoUtilizadores.jsp?user=" + u.getId().intValue(); try