lxbfYeaa9897955
/
SIPRP
forked from Coded/SIPRP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: https://svn.coded.pt/svn/SIPRP@1525 bb69d46d-e84e-40c8-a05a-06db0d633741

Browse Source
lxbfYeaa
Diogo Neves 15 years ago
parent c6444da2ea
commit 415fc9fa12
6 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
trunk/PlanosActuacao/nbproject/private/private.properties
Unescape View File

@ -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

6
trunk/PlanosActuacao/src/java/db/Db.java
Unescape View File

@ -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;

4
trunk/PlanosActuacao/src/java/db/DbRelatorios.java
Unescape View File

@ -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;

48
trunk/PlanosActuacao/src/java/db/Dblocal.java
Unescape View File

@ -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);

4
trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java
Unescape View File

@ -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;

2
trunk/PlanosActuacao/src/java/planosactuacao/Header.java
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save