diff --git a/trunk/AnaliseAcidentesTrabalho/lib/evologger.jar b/trunk/AnaliseAcidentesTrabalho/lib/evologger.jar index 07b8a8ec..dc2e8467 100644 Binary files a/trunk/AnaliseAcidentesTrabalho/lib/evologger.jar and b/trunk/AnaliseAcidentesTrabalho/lib/evologger.jar differ diff --git a/trunk/AnaliseAcidentesTrabalho/lib/evolute.jar b/trunk/AnaliseAcidentesTrabalho/lib/evolute.jar index 4ae1de1b..6e49671b 100644 Binary files a/trunk/AnaliseAcidentesTrabalho/lib/evolute.jar and b/trunk/AnaliseAcidentesTrabalho/lib/evolute.jar differ diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties b/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties index 2004df2a..5f133633 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties @@ -14,7 +14,7 @@ creator=3.0 debug.classpath=${javac.classpath}:${build.classes.dir} debug.test.classpath=\ ${run.test.classpath} -display.browser=true +display.browser=false dist.dir=dist dist.ear.war=${dist.dir}/${war.ear.name} dist.javadoc.dir=${dist.dir}/javadoc diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java index 12b679ea..63881aa2 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java @@ -2115,7 +2115,7 @@ public class FormHS extends AbstractPageBean Option[] opts = Utils.getYearDropValues(); dropCurrentYear.setItems( opts ); - dropCurrentYear.setSelected( selectedYear != null ? selectedYear : opts.length > 0 ? opts[ 0].getValue() : null ); + dropCurrentYear.setSelected( selectedYear != null ? selectedYear : opts.length > 0 ? opts[ 0 ].getValue() : null ); } public void dropCurrentYear_valueChangeListener( ValueChangeEvent event ) diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/EvoBaseProvider.java b/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/EvoBaseProvider.java index 553b2469..6a404b6f 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/EvoBaseProvider.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/EvoBaseProvider.java @@ -116,7 +116,7 @@ public class EvoBaseProvider DBManager manager = new JDBCManager( dbUrl, username, password , 14, 7, 7, new SQLQuery[] { } ); StatementExecuterFactory.initialize( new DBStatementExecuter( manager.getSharedExecuter( EvoBaseProvider.class ) ) ); UnicodeChecker.setUseDoubleSlash( true ); - Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); +// Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); dbManager = manager; System.out.println( "\nDBManager : " + dbManager ); } @@ -130,7 +130,7 @@ public class EvoBaseProvider DBManager manager = new JDBCManager( dbUrl, username, password , 14, 7, 7, new SQLQuery[] { } ); StatementExecuterFactory.initialize( new DBStatementExecuter( manager.getSharedExecuter( EvoBaseProvider.class ) ) ); UnicodeChecker.setUseDoubleSlash( true ); - Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); +// Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); localDBManager = manager; Singleton.setInstance( Singleton.DEFAULT_DBMANAGER, localDBManager ); System.out.println( "\nLocalDBManager : " + localDBManager ); diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/ContextListener.java b/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/ContextListener.java index 28cc5094..c9e47bc5 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/ContextListener.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/ContextListener.java @@ -6,6 +6,7 @@ package phaselistener; import com.evolute.utils.error.ErrorLogger; +import db.providers.EvoBaseProvider; import java.text.SimpleDateFormat; import java.util.Date; import javax.servlet.ServletContextEvent; @@ -22,26 +23,26 @@ public class ContextListener implements ServletContextListener private static Boolean loggerIsLoaded = Boolean.FALSE; - static - { - try - { - if ( ! loggerIsLoaded ) - { - System.out.println( "\nInitializing AAT logger ..." ); - AnaliseAcidentesTrabalhoLogger.init(); - loggerIsLoaded = Boolean.TRUE; - } - } - catch ( Throwable e ) - { - e.printStackTrace( System.err ); - } - } +// static +// { +// try +// { +// if ( ! loggerIsLoaded ) +// { +// System.out.println( "\nInitializing AAT logger ..." ); +// AnaliseAcidentesTrabalhoLogger.init(); +// loggerIsLoaded = Boolean.TRUE; +// } +// } +// catch ( Throwable e ) +// { +// e.printStackTrace( System.err ); +// } +// } private long startedTime = 0L; - + @Override public void contextInitialized( ServletContextEvent sce ) { startedTime = System.currentTimeMillis(); @@ -49,17 +50,35 @@ public class ContextListener implements ServletContextListener try { - System.out.println( "\tReading app.properties ..." ); + System.out.println( "\nReading app.properties ..." ); SIPRPPropertiesLoader props = SIPRPPropertiesLoader.getInstance(); props.load(); } catch ( Exception e ) { ErrorLogger.logException( e ); - System.out.println( "\n\n<---- ERROR ! " + e.getMessage() ); } + + try + { + System.out.println( "\nInitializing DB ... " ); + EvoBaseProvider.getInstance(); + } + catch ( Exception e ) + { + e.printStackTrace(); + } + + if ( ! loggerIsLoaded ) + { + System.out.println( "\nInitializing error logger ..." ); + AnaliseAcidentesTrabalhoLogger.init(); + loggerIsLoaded = Boolean.TRUE; + } + } + @Override public void contextDestroyed( ServletContextEvent sce ) { long endTime = System.currentTimeMillis(); diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/utils/AnaliseAcidentesTrabalhoLogger.java b/trunk/AnaliseAcidentesTrabalho/src/java/utils/AnaliseAcidentesTrabalhoLogger.java index deb63049..8ce126d9 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/utils/AnaliseAcidentesTrabalhoLogger.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/utils/AnaliseAcidentesTrabalhoLogger.java @@ -8,7 +8,7 @@ package utils; import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.error.LoggerProperties; import com.evolute.utils.error.ProjectsEnum; -import com.evolute.utils.error.log4j.DBLogger; +import com.evolute.utils.error.ws.WSLogger; import java.util.HashMap; import java.util.Map; @@ -34,7 +34,14 @@ public class AnaliseAcidentesTrabalhoLogger map.put( LoggerProperties.SOFTWARE_VERSION, "1" ); map.put( LoggerProperties.PROJECT_VERSION, "1" ); map.put( LoggerProperties.SOFTWARE_NAME, "SIPRP - Analise Acidentes Trabalho" ); - ErrorLogger.initializeLogger( new DBLogger( map ) ); + try + { + ErrorLogger.initializeLogger( new WSLogger( map ) ); + } + catch ( Exception e ) + { + e.printStackTrace(); + } } }