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

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

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Ricardo Santos 11 years ago
parent 2a8d5ba626
commit fc8a7f12cb
5 changed files with 78 additions and 66 deletions
Show Stats Download Patch File Download Diff File

18
trunk/SiprpWebFichasClinicas/WebContent/WEB-INF/applicationContext.xml
Unescape View File

@ -16,16 +16,14 @@
<bean id="defaultLogger" class="pt.evolute.logger.InitDefaultLogger" destroy-method="clean" scope="singleton" /> <bean id="defaultLogger" class="pt.evolute.logger.InitDefaultLogger" destroy-method="clean" scope="singleton" />
<bean id="defaultProvider" class="pt.evolute.data.ProviderSpringBean" destroy-method="clean" scope="singleton" depends-on="defaultLogger" /> <bean id="defaultProvider" class="pt.evolute.data.ProviderSpringBean" init-method="init" destroy-method="clean" scope="singleton" depends-on="defaultLogger" />
<bean id="siprpProvider" class="pt.evolute.data.ProviderSpringBean" destroy-method="clean" scope="singleton" depends-on="defaultLogger" > <bean id="siprpProvider" class="pt.evolute.data.ProviderSpringBean" init-method="init" destroy-method="clean" scope="singleton" depends-on="defaultLogger" >
<property name="server"><value>db1.evo.pt</value></property> <property name="prefix"><value>siprp</value></property>
<property name="port"><value>5432</value></property> </bean>
<property name="username"><value>rsantos</value></property>
<property name="password"><value>rsEvo2014</value></property> <bean id="siprpDocsProvider" class="pt.evolute.data.ProviderSpringBean" init-method="init" destroy-method="clean" scope="singleton" depends-on="defaultLogger" >
<property name="database"><value>shst_teste</value></property> <property name="prefix"><value>siprpdocs</value></property>
<property name="parameters"><value>ssl=true&amp;sslfactory=org.postgresql.ssl.NonValidatingFactory</value></property>
<property name="databasePrefix"><value>jdbc:postgresql://</value></property>
</bean> </bean>
<bean id="siprpMailSender" class="pt.evolute.MailSenderSpringBean" scope="singleton" > <bean id="siprpMailSender" class="pt.evolute.MailSenderSpringBean" scope="singleton" >

18
trunk/SiprpWebFichasClinicas/properties/app.properties
Unescape View File

@ -8,6 +8,24 @@ db.parameters=ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory
db.password = rsEvo2014 db.password = rsEvo2014
db.url.prefix = jdbc:postgresql:// db.url.prefix = jdbc:postgresql://
siprp.jnlp.resources.property.server.address = db1.evo.pt
siprp.jnlp.resources.property.server.port = 5432
siprp.db.name = shst_teste
siprp.db.user = rsantos
siprp.db.parameters=ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory
siprp.db.password = rsEvo2014
siprp.db.url.prefix = jdbc:postgresql://
siprpdocs.jnlp.resources.property.server.address = db1.evo.pt
siprpdocs.jnlp.resources.property.server.port = 5432
siprpdocs.db.name = shst_teste
siprpdocs.db.user = rsantos
siprpdocs.db.parameters=ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory
siprpdocs.db.password = rsEvo2014
siprpdocs.db.url.prefix = jdbc:postgresql://
web.ssl.truststore.file=jssecacerts web.ssl.truststore.file=jssecacerts
web.ssl.truststore.pass=changeit web.ssl.truststore.pass=changeit

96
trunk/SiprpWebFichasClinicas/src/pt/evolute/data/ProviderSpringBean.java
Unescape View File

@ -18,6 +18,7 @@ import com.evolute.utils.db.DriverProvider;
import com.evolute.utils.db.JDBCManager; import com.evolute.utils.db.JDBCManager;
import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.error.ErrorLogger;
import com.evolute.utils.sql.SQLQuery; import com.evolute.utils.sql.SQLQuery;
import com.evolute.utils.sql.Select;
import com.evolute.utils.timer.Timer; import com.evolute.utils.timer.Timer;
public class ProviderSpringBean { public class ProviderSpringBean {
@ -33,9 +34,11 @@ public class ProviderSpringBean {
private String parameters; private String parameters;
private String databasePrefix; private String databasePrefix;
private String url; private String url;
private SQLQuery[] initQueries;
private boolean readDefaults = true ; private boolean readDefaults = true ;
private String prefix = "";
public ProviderSpringBean() public ProviderSpringBean()
@ -47,12 +50,15 @@ public class ProviderSpringBean {
if(ENTITY_PROVIDER != null) if(ENTITY_PROVIDER != null)
{ {
((EvoDataProvider) ENTITY_PROVIDER).clearCache( );
ENTITY_PROVIDER.close(); ENTITY_PROVIDER.close();
ENTITY_PROVIDER = null;
} }
if(DBMANAGER != null) if(DBMANAGER != null)
{ {
DBMANAGER.close(); DBMANAGER.close();
DBMANAGER = null;
} }
Timer.stop(); Timer.stop();
@ -61,40 +67,17 @@ public class ProviderSpringBean {
} }
public synchronized ProviderInterface<EvoDataObject<?>, EvoDataException> getENTITY_PROVIDER() { public ProviderInterface<EvoDataObject<?>, EvoDataException> getENTITY_PROVIDER()
if(ENTITY_PROVIDER == null)
{ {
try
{
init();
}
catch (Exception e)
{
ErrorLogger.logException(e, Level.SEVERE);
}
}
return ENTITY_PROVIDER; return ENTITY_PROVIDER;
} }
public synchronized DBManager getDBMANAGER() { public DBManager getDBMANAGER()
if(DBMANAGER == null)
{ {
try
{
init();
}
catch (Exception e)
{
ErrorLogger.logException(e, Level.SEVERE);
}
}
return DBMANAGER; return DBMANAGER;
} }
public void init() throws Exception
private void init() throws Exception
{ {
if(readDefaults) if(readDefaults)
{ {
@ -102,10 +85,11 @@ public class ProviderSpringBean {
} }
setupProperties(); setupProperties();
DBMANAGER = new JDBCManager( url, username, password, 50,10, new SQLQuery[]{} ); DBMANAGER = new JDBCManager( url, username, password, 50,10, initQueries );
ConnectionIdentity conn = new ConnectionIdentity( url, username ); ConnectionIdentity conn = new ConnectionIdentity( url, username );
conn.setPassword( password ); conn.setPassword( password );
conn.setInitQueries(initQueries);
ENTITY_PROVIDER = new EvoDataProvider(conn); ENTITY_PROVIDER = new EvoDataProvider(conn);
} }
@ -121,21 +105,28 @@ public class ProviderSpringBean {
} }
catch (PropertiesException e) catch (PropertiesException e)
{ {
e.printStackTrace(System.out); ErrorLogger.logException(e,Level.SEVERE);
}
} }
server = EvoDefaultPropertiesLoader.getInstance().findProperty( prefix + EvoPropertyKey.DB.CONNECTION.HOSTNAME );
port = EvoDefaultPropertiesLoader.getInstance().findProperty( prefix + EvoPropertyKey.DB.CONNECTION.PORT );
username = EvoDefaultPropertiesLoader.getInstance().findProperty( prefix + EvoPropertyKey.DB.USER );
password = EvoDefaultPropertiesLoader.getInstance().findProperty( prefix + EvoPropertyKey.DB.PASSWORD );
database = EvoDefaultPropertiesLoader.getInstance().findProperty( prefix + EvoPropertyKey.DB.NAME );
parameters = EvoDefaultPropertiesLoader.getInstance().findProperty( prefix + EvoPropertyKey.DB.PARAMETERS, "" );
databasePrefix = EvoDefaultPropertiesLoader.getInstance().findProperty( prefix + EvoPropertyKey.DB.CONNECTION.PREFIX, EvoPropertyKey.DEFAULT_DATABASE_PREFIX );
url = EvoDefaultPropertiesLoader.getInstance().findProperty( prefix + EvoPropertyKey.DB.CONNECTION.DB_URL_FULL );
if( EvoDefaultPropertiesLoader.getInstance().findProperty( prefix + EvoPropertyKey.DB.ALLOW_JNLP_OVERRIDE, false ) )
{
url = EvoDefaultPropertiesLoader.getInstance().findProperty( prefix + EvoPropertyKey.DB.CONNECTION.DB_URL_JNLP_FULL, url );
} }
server = EvoDefaultPropertiesLoader.getInstance().findProperty( EvoPropertyKey.DB.CONNECTION.HOSTNAME ); String initQueriesString = EvoDefaultPropertiesLoader.getInstance().findProperty( prefix + "db.initQueries" );
port = EvoDefaultPropertiesLoader.getInstance().findProperty( EvoPropertyKey.DB.CONNECTION.PORT ); if(null != initQueriesString && !initQueriesString.isEmpty())
username = EvoDefaultPropertiesLoader.getInstance().findProperty( EvoPropertyKey.DB.USER );
password = EvoDefaultPropertiesLoader.getInstance().findProperty( EvoPropertyKey.DB.PASSWORD );
database = EvoDefaultPropertiesLoader.getInstance().findProperty( EvoPropertyKey.DB.NAME );
parameters = EvoDefaultPropertiesLoader.getInstance().findProperty( EvoPropertyKey.DB.PARAMETERS, "" );
databasePrefix = EvoDefaultPropertiesLoader.getInstance().findProperty( EvoPropertyKey.DB.CONNECTION.PREFIX, EvoPropertyKey.DEFAULT_DATABASE_PREFIX );
url = EvoDefaultPropertiesLoader.getInstance().findProperty( EvoPropertyKey.DB.CONNECTION.DB_URL_FULL );
if( EvoDefaultPropertiesLoader.getInstance().findProperty( EvoPropertyKey.DB.ALLOW_JNLP_OVERRIDE, false ) )
{ {
url = EvoDefaultPropertiesLoader.getInstance().findProperty( EvoPropertyKey.DB.CONNECTION.DB_URL_JNLP_FULL, url ); String[] initQueriesStrings = initQueriesString.split(";");
setInitQueries(initQueriesStrings);
} }
} }
@ -155,19 +146,8 @@ public class ProviderSpringBean {
} }
} }
public synchronized void setAsSingletonDefaults() public void setAsSingletonDefaults()
{
if(ENTITY_PROVIDER == null || DBMANAGER == null)
{
try
{ {
init();
}
catch (Exception e)
{
ErrorLogger.logException(e, Level.SEVERE);
}
}
Singleton.setInstance(Singleton.DEFAULT_EVO_DATA_PROVIDER, ENTITY_PROVIDER); Singleton.setInstance(Singleton.DEFAULT_EVO_DATA_PROVIDER, ENTITY_PROVIDER);
Singleton.setInstance(Singleton.DEFAULT_DBMANAGER, DBMANAGER); Singleton.setInstance(Singleton.DEFAULT_DBMANAGER, DBMANAGER);
Singleton.setInstance(Singleton.DEFAULT_OBJECT_PROVIDER, ENTITY_PROVIDER ); Singleton.setInstance(Singleton.DEFAULT_OBJECT_PROVIDER, ENTITY_PROVIDER );
@ -215,5 +195,21 @@ public class ProviderSpringBean {
readDefaults = false ; readDefaults = false ;
} }
public void setInitQueries(String[] initQueries)
{
this.initQueries = new SQLQuery[initQueries.length] ;
for(int i=0;i<initQueries.length;i++)
{
SQLQuery sel = new Select(initQueries[i]);
this.initQueries[i] = sel;
}
}
public void setPrefix(String prefix)
{
this.prefix = prefix+".";
}
} }

4
trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/logic/DocumentosLogic.java
Unescape View File

@ -42,7 +42,7 @@ public class DocumentosLogic
result.setSuccess(false); result.setSuccess(false);
EvoMessageBean msg = new EvoMessageBean(); EvoMessageBean msg = new EvoMessageBean();
msg.setType(EvoMessageTypeBean.ERROR); msg.setType(EvoMessageTypeBean.ERROR);
msg.setMessageData("Erro ao comunicar com a Base de dados!"); msg.setMessageData("Erro ao comunicar com a Base de dados da SIPRP!");
result.addMessage(msg); result.addMessage(msg);
ErrorLogger.logException(ex, Level.SEVERE); ErrorLogger.logException(ex, Level.SEVERE);
} }
@ -92,7 +92,7 @@ public class DocumentosLogic
result.setSuccess(false); result.setSuccess(false);
EvoMessageBean msg = new EvoMessageBean(); EvoMessageBean msg = new EvoMessageBean();
msg.setType(EvoMessageTypeBean.ERROR); msg.setType(EvoMessageTypeBean.ERROR);
msg.setMessageData("Erro ao comunicar com a Base de dados!"); msg.setMessageData("Erro ao comunicar com a Base de dados da SIPRP!");
result.addMessage(msg); result.addMessage(msg);
ErrorLogger.logException(ex, Level.SEVERE); ErrorLogger.logException(ex, Level.SEVERE);
} }

2
trunk/SiprpWebFichasClinicas/src/shst/medicina/fichasclinicas/provider/DocumentosDataProvider.java
Unescape View File

@ -18,7 +18,7 @@ import com.evolute.utils.sql.Select2;
public class DocumentosDataProvider public class DocumentosDataProvider
{ {
@Autowired(required = true) @Autowired(required = true)
@Qualifier("siprpProvider") @Qualifier("siprpDocsProvider")
ProviderSpringBean siprpProvidersBean; ProviderSpringBean siprpProvidersBean;

Write Preview
Loading…
Cancel
Save