diff --git a/trunk/SIPRPSoft/src/siprp/Main.java b/trunk/SIPRPSoft/src/siprp/Main.java index 87f59495..0e8d4cff 100644 --- a/trunk/SIPRPSoft/src/siprp/Main.java +++ b/trunk/SIPRPSoft/src/siprp/Main.java @@ -24,6 +24,7 @@ import javax.swing.tree.MutableTreeNode; import siprp.clientes.AvisosPanel; import siprp.companydataloaders.SIPRPDataLoader; import siprp.companydataloaders.SIPRPPropertiesLoader; +import siprp.initializer.SIPRPLoggerInit; import siprp.initializer.SIPRPUIInitializer; import siprp.lembretes.LembretesDemon; import siprp.update.UpdateList; diff --git a/trunk/SIPRPSoft/src/siprp/SIPRPLoggerInit.java b/trunk/SIPRPSoft/src/siprp/SIPRPLoggerInit.java deleted file mode 100644 index cee2eb64..00000000 --- a/trunk/SIPRPSoft/src/siprp/SIPRPLoggerInit.java +++ /dev/null @@ -1,37 +0,0 @@ -package siprp; - -import java.util.HashMap; -import java.util.Map; - -import com.evolute.project.ProjectTools; -import com.evolute.utils.error.ErrorLogger; -import com.evolute.utils.error.LoggerProperties; -import com.evolute.utils.error.ProjectsEnum; -import com.evolute.utils.error.ws.WSLogger; -import com.evolute.utils.network.proxy.EvoProxyObject; - -public class SIPRPLoggerInit -{ - - static void init() - { - Map map = new HashMap(); - - map.put( LoggerProperties.PROJECT, ProjectsEnum.SIPRP.toString() ); - map.put( LoggerProperties.PROJECT_NAME, ProjectTools.getInstance().getProjectName() ); - map.put( LoggerProperties.SOFTWARE_VERSION, ProjectTools.getInstance().getVersion().toString() ); - map.put( LoggerProperties.SOFTWARE_NAME, "SIPRPSoft" ); - - try - { - EvoProxyObject.configSystemProxySelector(); - EvoProxyObject.getProxy(); - ErrorLogger.initializeLogger( new WSLogger( map ) ); - } - catch ( Exception e ) - { - ErrorLogger.logException( e ); - } - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/initializer/SIPRPLoggerInit.java b/trunk/SIPRPSoft/src/siprp/initializer/SIPRPLoggerInit.java new file mode 100644 index 00000000..c4533c8b --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/initializer/SIPRPLoggerInit.java @@ -0,0 +1,46 @@ +package siprp.initializer; + +import java.util.HashMap; + +import com.evolute.project.ProjectTools; +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; + +public class SIPRPLoggerInit +{ + + public static void init() + { +// Map map = new HashMap(); +// +// map.put( LoggerProperties.PROJECT, ProjectsEnum.SIPRP.toString() ); +// map.put( LoggerProperties.PROJECT_NAME, ProjectTools.getInstance().getProjectName() ); +// map.put( LoggerProperties.SOFTWARE_VERSION, ProjectTools.getInstance().getVersion().toString() ); +// map.put( LoggerProperties.SOFTWARE_NAME, "SIPRPSoft" ); +// +// try +// { +// EvoProxyObject.configSystemProxySelector(); +// EvoProxyObject.getProxy(); +// ErrorLogger.initializeLogger( new WSLogger( map ) ); +// } +// catch ( Exception e ) +// { +// ErrorLogger.logException( e ); +// } + + HashMap properties = new HashMap(); + properties.put( LoggerProperties.PROJECT, ProjectsEnum.SIPRP.toString() ); + properties.put( LoggerProperties.PROJECT_NAME, ProjectTools.getInstance().getProjectName() ); + properties.put( LoggerProperties.SOFTWARE_VERSION, ProjectTools.getInstance().getVersion().toString() ); + properties.put( LoggerProperties.SOFTWARE_NAME, "SIPRPSoft" ); + properties.put(LoggerProperties.PASSWORD, "2DD-rg2hLOG" ); + properties.put(LoggerProperties.USERNAME, "evo_logger" ); + properties.put(LoggerProperties.URL, "jdbc:postgresql://www.evolute.pt:5436/evo_logging"); + DBLogger logger = new DBLogger(properties); + ErrorLogger.initializeLogger( logger ); + } + +}