diff --git a/trunk/SIPRPSoft/lib/evologger.jar b/trunk/SIPRPSoft/lib/evologger.jar index 68854eb2..4308a04f 100644 Binary files a/trunk/SIPRPSoft/lib/evologger.jar and b/trunk/SIPRPSoft/lib/evologger.jar differ diff --git a/trunk/SIPRPSoft/lib/evolute.jar b/trunk/SIPRPSoft/lib/evolute.jar index 5352f424..3ee13494 100644 Binary files a/trunk/SIPRPSoft/lib/evolute.jar and b/trunk/SIPRPSoft/lib/evolute.jar differ diff --git a/trunk/SIPRPSoft/lib/shst.jar b/trunk/SIPRPSoft/lib/shst.jar index 27dd146d..c67318f1 100644 Binary files a/trunk/SIPRPSoft/lib/shst.jar and b/trunk/SIPRPSoft/lib/shst.jar differ diff --git a/trunk/SIPRPSoft/src/siprp/SHSTLogger.java b/trunk/SIPRPSoft/src/siprp/SHSTLogger.java index 10cfbc11..86141d63 100644 --- a/trunk/SIPRPSoft/src/siprp/SHSTLogger.java +++ b/trunk/SIPRPSoft/src/siprp/SHSTLogger.java @@ -45,10 +45,8 @@ CREATE TABLE errors */ public class SHSTLogger implements Logger { - private final String java = System.getProperty( "java.version" ) - + "-" + System.getProperty( "java.vm.version" ); - private final String os = System.getProperty( "os.name" ) + " - " + - System.getProperty( "os.version" ); + private final String java = System.getProperty( "java.version" ) + "-" + System.getProperty( "java.vm.version" ); + private final String os = System.getProperty( "os.name" ) + " - " + System.getProperty( "os.version" ); private final String user = ( String )Singleton.getInstance( Singleton.USERNAME ); private final String ENV = "Java: " + java + " \nOS: " + os + " \nUser: " + user + "\n Software: " + ( String )Singleton.getInstance( SingletonConstants.SOFTWARE_NAME ) diff --git a/trunk/SIPRPSoft/src/siprp/initializer/SIPRPLoggerInit.java b/trunk/SIPRPSoft/src/siprp/initializer/SIPRPLoggerInit.java index c4533c8b..fb18fb25 100644 --- a/trunk/SIPRPSoft/src/siprp/initializer/SIPRPLoggerInit.java +++ b/trunk/SIPRPSoft/src/siprp/initializer/SIPRPLoggerInit.java @@ -1,46 +1,48 @@ package siprp.initializer; 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.log4j.DBLogger; +import com.evolute.utils.error.ws.WSLogger; +import com.evolute.utils.network.proxy.EvoProxyObject; 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 ); -// } + Map map = new HashMap(); - 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 ); + 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 ); } }