diff --git a/trunk/PlanosActuacao/lib/evologger.jar b/trunk/PlanosActuacao/lib/evologger.jar index b833488f..82b72a33 100644 Binary files a/trunk/PlanosActuacao/lib/evologger.jar and b/trunk/PlanosActuacao/lib/evologger.jar differ diff --git a/trunk/PlanosActuacao/lib/evolute.jar b/trunk/PlanosActuacao/lib/evolute.jar index 2e8008ed..c3bcf984 100644 Binary files a/trunk/PlanosActuacao/lib/evolute.jar and b/trunk/PlanosActuacao/lib/evolute.jar differ diff --git a/trunk/PlanosActuacao/lib/log4j-1.2.15.jar b/trunk/PlanosActuacao/lib/log4j-1.2.15.jar new file mode 100644 index 00000000..c930a6ab Binary files /dev/null and b/trunk/PlanosActuacao/lib/log4j-1.2.15.jar differ diff --git a/trunk/PlanosActuacao/nbproject/build-impl.xml b/trunk/PlanosActuacao/nbproject/build-impl.xml index aa494e29..fdf59b14 100644 --- a/trunk/PlanosActuacao/nbproject/build-impl.xml +++ b/trunk/PlanosActuacao/nbproject/build-impl.xml @@ -539,10 +539,11 @@ exists or setup the property manually. For example like this: + - + @@ -569,6 +570,7 @@ exists or setup the property manually. For example like this: + diff --git a/trunk/PlanosActuacao/nbproject/genfiles.properties b/trunk/PlanosActuacao/nbproject/genfiles.properties index 69141a73..ea275fd8 100644 --- a/trunk/PlanosActuacao/nbproject/genfiles.properties +++ b/trunk/PlanosActuacao/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=d5ba76b8 +build.xml.data.CRC32=164c7b50 build.xml.script.CRC32=50b8b881 build.xml.stylesheet.CRC32=c0ebde35@1.15.2.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=d5ba76b8 -nbproject/build-impl.xml.script.CRC32=cf96f201 +nbproject/build-impl.xml.data.CRC32=164c7b50 +nbproject/build-impl.xml.script.CRC32=8aa9b36f nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1 diff --git a/trunk/PlanosActuacao/nbproject/project.properties b/trunk/PlanosActuacao/nbproject/project.properties index 11f29ecf..00cff1c1 100644 --- a/trunk/PlanosActuacao/nbproject/project.properties +++ b/trunk/PlanosActuacao/nbproject/project.properties @@ -35,6 +35,7 @@ file.reference.evolute.jar=lib/evolute.jar file.reference.fop.jar=lib/fop.jar file.reference.jai_imageio.jar=lib/jai_imageio.jar file.reference.jdom.jar=lib/jdom.jar +file.reference.log4j-1.2.15.jar=lib/log4j-1.2.15.jar file.reference.mail.jar-1=lib/mail.jar file.reference.postgresql-8.2-506.jdbc4.jar=lib/postgresql-8.2-506.jdbc4.jar file.reference.shst.jar=lib/shst.jar @@ -68,7 +69,8 @@ javac.classpath=\ ${file.reference.commons-logging-1.1.jar}:\ ${file.reference.evolute.jar}:\ ${file.reference.mail.jar-1}:\ - ${file.reference.shst.jar} + ${file.reference.shst.jar}:\ + ${file.reference.log4j-1.2.15.jar} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true diff --git a/trunk/PlanosActuacao/nbproject/project.xml b/trunk/PlanosActuacao/nbproject/project.xml index 615cdc36..197d8611 100644 --- a/trunk/PlanosActuacao/nbproject/project.xml +++ b/trunk/PlanosActuacao/nbproject/project.xml @@ -99,6 +99,10 @@ ${file.reference.shst.jar} WEB-INF/lib + + ${file.reference.log4j-1.2.15.jar} + WEB-INF/lib + diff --git a/trunk/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java b/trunk/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java index d45f4f94..cf4b329e 100644 --- a/trunk/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java +++ b/trunk/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java @@ -21,7 +21,7 @@ public class PlanosActuacaoLogger private static String EVO_LOGGER_DB = "jdbc:postgresql://www.evolute.pt:5436/evo_logging?logUnclosedConnections=true&loginTimeout=5&socketTimeout=5&tcpKeepAlive=true"; private static String EVO_LOGGER_USER = "evo_logger"; - private static String EVO_LOGGER_PASSWD = "Typein1"; + private static String EVO_LOGGER_PASSWD = "2DD-rg2hLOG"; public static void init() { @@ -30,6 +30,7 @@ public class PlanosActuacaoLogger map.put( LoggerProperties.PASSWORD, EVO_LOGGER_PASSWD ); map.put( LoggerProperties.URL, EVO_LOGGER_DB ); map.put( LoggerProperties.PROJECT, ProjectsEnum.PLANOS_ACTUACAO.toString() ); + map.put( LoggerProperties.PROJECT_NAME, ProjectsEnum.PLANOS_ACTUACAO.toString() ); map.put( LoggerProperties.SOFTWARE_VERSION, "1" ); map.put( LoggerProperties.SOFTWARE_NAME, "SIPRP - Planos Actuacao" ); // TODO - firewall - must be implemented over http (ws)