diff --git a/trunk/PlanosActuacao/lib/commons-codec-1.3.jar b/trunk/PlanosActuacao/lib/commons-codec-1.3.jar new file mode 100644 index 00000000..957b6752 Binary files /dev/null and b/trunk/PlanosActuacao/lib/commons-codec-1.3.jar differ diff --git a/trunk/PlanosActuacao/lib/dom4j-1.6.1.jar b/trunk/PlanosActuacao/lib/dom4j-1.6.1.jar new file mode 100644 index 00000000..c8c4dbb9 Binary files /dev/null and b/trunk/PlanosActuacao/lib/dom4j-1.6.1.jar differ diff --git a/trunk/PlanosActuacao/lib/evologger.jar b/trunk/PlanosActuacao/lib/evologger.jar index dc2e8467..3f9d645e 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 6e49671b..6c14bf60 100644 Binary files a/trunk/PlanosActuacao/lib/evolute.jar and b/trunk/PlanosActuacao/lib/evolute.jar differ diff --git a/trunk/PlanosActuacao/lib/myfaces/oro-2.0.8.jar b/trunk/PlanosActuacao/lib/myfaces/oro-2.0.8.jar new file mode 100644 index 00000000..23488d26 Binary files /dev/null and b/trunk/PlanosActuacao/lib/myfaces/oro-2.0.8.jar differ diff --git a/trunk/PlanosActuacao/lib/myfaces/tomahawk12-1.1.10.jar b/trunk/PlanosActuacao/lib/myfaces/tomahawk12-1.1.10.jar new file mode 100644 index 00000000..86ce8178 Binary files /dev/null and b/trunk/PlanosActuacao/lib/myfaces/tomahawk12-1.1.10.jar differ diff --git a/trunk/PlanosActuacao/lib/myfaces/xmlParserAPIs-2.0.2.jar b/trunk/PlanosActuacao/lib/myfaces/xmlParserAPIs-2.0.2.jar new file mode 100644 index 00000000..eae78043 Binary files /dev/null and b/trunk/PlanosActuacao/lib/myfaces/xmlParserAPIs-2.0.2.jar differ diff --git a/trunk/PlanosActuacao/lib/org.springframework.beans-3.0.0.jar b/trunk/PlanosActuacao/lib/org.springframework.beans-3.0.0.jar new file mode 100644 index 00000000..37b9abe7 Binary files /dev/null and b/trunk/PlanosActuacao/lib/org.springframework.beans-3.0.0.jar differ diff --git a/trunk/PlanosActuacao/lib/org.springframework.context-3.0.0.jar b/trunk/PlanosActuacao/lib/org.springframework.context-3.0.0.jar new file mode 100644 index 00000000..7869adbb Binary files /dev/null and b/trunk/PlanosActuacao/lib/org.springframework.context-3.0.0.jar differ diff --git a/trunk/PlanosActuacao/lib/org.springframework.core-3.0.0.jar b/trunk/PlanosActuacao/lib/org.springframework.core-3.0.0.jar new file mode 100644 index 00000000..8f0134ee Binary files /dev/null and b/trunk/PlanosActuacao/lib/org.springframework.core-3.0.0.jar differ diff --git a/trunk/PlanosActuacao/lib/richfaces-impl-jsf2-3.3.3.Final.jar b/trunk/PlanosActuacao/lib/richfaces-impl-jsf2-3.3.3.Final.jar deleted file mode 100644 index 0268975c..00000000 Binary files a/trunk/PlanosActuacao/lib/richfaces-impl-jsf2-3.3.3.Final.jar and /dev/null differ diff --git a/trunk/PlanosActuacao/lib/richfaces-api-3.3.3.Final.jar b/trunk/PlanosActuacao/lib/richfaces/richfaces-api-3.3.3.Final.jar similarity index 100% rename from trunk/PlanosActuacao/lib/richfaces-api-3.3.3.Final.jar rename to trunk/PlanosActuacao/lib/richfaces/richfaces-api-3.3.3.Final.jar diff --git a/trunk/PlanosActuacao/lib/richfaces-impl-3.3.3.Final.jar b/trunk/PlanosActuacao/lib/richfaces/richfaces-impl-3.3.3.Final.jar similarity index 100% rename from trunk/PlanosActuacao/lib/richfaces-impl-3.3.3.Final.jar rename to trunk/PlanosActuacao/lib/richfaces/richfaces-impl-3.3.3.Final.jar diff --git a/trunk/PlanosActuacao/lib/richfaces-ui-3.3.3.Final.jar b/trunk/PlanosActuacao/lib/richfaces/richfaces-ui-3.3.3.Final.jar similarity index 100% rename from trunk/PlanosActuacao/lib/richfaces-ui-3.3.3.Final.jar rename to trunk/PlanosActuacao/lib/richfaces/richfaces-ui-3.3.3.Final.jar diff --git a/trunk/PlanosActuacao/lib/spring-ws-core-1.5.9.jar b/trunk/PlanosActuacao/lib/spring-ws-core-1.5.9.jar new file mode 100644 index 00000000..8c944048 Binary files /dev/null and b/trunk/PlanosActuacao/lib/spring-ws-core-1.5.9.jar differ diff --git a/trunk/PlanosActuacao/lib/spring-ws-core-tiger-1.5.9.jar b/trunk/PlanosActuacao/lib/spring-ws-core-tiger-1.5.9.jar new file mode 100644 index 00000000..8dabf02e Binary files /dev/null and b/trunk/PlanosActuacao/lib/spring-ws-core-tiger-1.5.9.jar differ diff --git a/trunk/PlanosActuacao/lib/spring-ws-support-1.5.9.jar b/trunk/PlanosActuacao/lib/spring-ws-support-1.5.9.jar new file mode 100644 index 00000000..82796229 Binary files /dev/null and b/trunk/PlanosActuacao/lib/spring-ws-support-1.5.9.jar differ diff --git a/trunk/PlanosActuacao/lib/spring-xml-1.5.9.jar b/trunk/PlanosActuacao/lib/spring-xml-1.5.9.jar new file mode 100644 index 00000000..10a8905b Binary files /dev/null and b/trunk/PlanosActuacao/lib/spring-xml-1.5.9.jar differ diff --git a/trunk/PlanosActuacao/lib/truelicense.jar b/trunk/PlanosActuacao/lib/truelicense.jar new file mode 100644 index 00000000..8c56bd12 Binary files /dev/null and b/trunk/PlanosActuacao/lib/truelicense.jar differ diff --git a/trunk/PlanosActuacao/nbproject/build-impl.xml b/trunk/PlanosActuacao/nbproject/build-impl.xml index 63ad3ad0..7aed9a87 100644 --- a/trunk/PlanosActuacao/nbproject/build-impl.xml +++ b/trunk/PlanosActuacao/nbproject/build-impl.xml @@ -526,14 +526,17 @@ exists or setup the property manually. For example like this: + + + @@ -542,23 +545,32 @@ exists or setup the property manually. For example like this: - + + + - - - + + + + + - + + + + + + - + @@ -572,14 +584,17 @@ exists or setup the property manually. For example like this: + + + @@ -588,19 +603,28 @@ exists or setup the property manually. For example like this: - + + + - - - + + + + + - + + + + + + diff --git a/trunk/PlanosActuacao/nbproject/faces-config.NavData b/trunk/PlanosActuacao/nbproject/faces-config.NavData index 1468899f..365f6c28 100644 --- a/trunk/PlanosActuacao/nbproject/faces-config.NavData +++ b/trunk/PlanosActuacao/nbproject/faces-config.NavData @@ -3,8 +3,8 @@ - + diff --git a/trunk/PlanosActuacao/nbproject/genfiles.properties b/trunk/PlanosActuacao/nbproject/genfiles.properties index 2f896a8b..1f88279e 100644 --- a/trunk/PlanosActuacao/nbproject/genfiles.properties +++ b/trunk/PlanosActuacao/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=a84a30bd +build.xml.data.CRC32=19ca635b 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=a84a30bd -nbproject/build-impl.xml.script.CRC32=ccb167f0 +nbproject/build-impl.xml.data.CRC32=19ca635b +nbproject/build-impl.xml.script.CRC32=75fcbdeb nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1 diff --git a/trunk/PlanosActuacao/nbproject/private/private.properties b/trunk/PlanosActuacao/nbproject/private/private.properties index 69a1b979..5296ab8b 100644 --- a/trunk/PlanosActuacao/nbproject/private/private.properties +++ b/trunk/PlanosActuacao/nbproject/private/private.properties @@ -4,9 +4,9 @@ auxiliary.org-netbeans-modules-web-client-tools-api.FIREFOX=true auxiliary.org-netbeans-modules-web-client-tools-api.INTERNET_5f_EXPLORER=false auxiliary.org-netbeans-modules-web-client-tools-api.serverdebug=true deploy.ant.properties.file=/home/dneves/.netbeans/6.7/tomcat60.properties -j2ee.platform.classpath=/usr/local/apache-tomcat-6.0.18/lib/catalina.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/usr/local/apache-tomcat-6.0.18/lib/annotations-api.jar:/usr/local/apache-tomcat-6.0.18/lib/servlet-api.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper-el.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/usr/local/apache-tomcat-6.0.18/lib/el-api.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ha.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ant.jar:/usr/local/apache-tomcat-6.0.18/lib/jsp-api.jar:/usr/local/apache-tomcat-6.0.18/bin/tomcat-juli.jar -j2ee.server.instance=tomcat60:home=/usr/local/apache-tomcat-6.0.18:base=apache-tomcat-6.0.18_base +j2ee.platform.classpath=/home/dneves/Software/apache-tomcat-6.0.18/lib/jasper.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/jsp-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-ant.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-ha.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/servlet-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/el-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/annotations-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/jasper-el.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/home/dneves/Software/apache-tomcat-6.0.18/bin/tomcat-juli.jar +j2ee.server.instance=tomcat60:home=/home/dneves/Software/apache-tomcat-6.0.18 javac.debug=true javadoc.preview=true -jaxws.endorsed.dir=/usr/local/netbeans-6.7.1/java2/modules/ext/jaxws21/api:/usr/local/netbeans-6.7.1/ide11/modules/ext/jaxb/api +jaxws.endorsed.dir=/home/dneves/Software/netbeans-6.7.1/java2/modules/ext/jaxws21/api:/home/dneves/Software/netbeans-6.7.1/ide11/modules/ext/jaxb/api user.properties.file=/home/dneves/.netbeans/6.7/build.properties diff --git a/trunk/PlanosActuacao/nbproject/project.properties b/trunk/PlanosActuacao/nbproject/project.properties index 02daeaf5..74799d9c 100644 --- a/trunk/PlanosActuacao/nbproject/project.properties +++ b/trunk/PlanosActuacao/nbproject/project.properties @@ -15,7 +15,7 @@ debug.client=false debug.server=true 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 @@ -27,6 +27,7 @@ file.reference.avalon-framework-4.2.0.jar=lib/avalon-framework-4.2.0.jar file.reference.batik-all-1.7.jar=lib/batik-all-1.7.jar file.reference.common-src=../common/src file.reference.commons-beanutils-1.8.3.jar=lib/commons-beanutils-1.8.3.jar +file.reference.commons-codec-1.3.jar=lib/commons-codec-1.3.jar file.reference.commons-collections-3.1.jar=lib/commons-collections-3.1.jar file.reference.commons-digester-1.8.jar=lib/commons-digester-1.8.jar file.reference.commons-fileupload-1.2.1.jar=lib/commons-fileupload-1.2.1.jar @@ -36,6 +37,7 @@ file.reference.commons-lang-2.4.jar=lib/commons-lang-2.4.jar file.reference.commons-logging-1.1.1.jar=lib/commons-logging-1.1.1.jar file.reference.commons-validator-1.3.1.jar=lib/commons-validator-1.3.1.jar file.reference.cursos.jar=lib/cursos.jar +file.reference.dom4j-1.6.1.jar=lib/dom4j-1.6.1.jar file.reference.evologger.jar=lib/evologger.jar file.reference.evolute.jar=lib/evolute.jar file.reference.fop.jar=lib/fop.jar @@ -44,18 +46,28 @@ file.reference.jdbcappender.jar=lib/jdbcappender.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.org.springframework.beans-3.0.0.jar=lib/org.springframework.beans-3.0.0.jar +file.reference.org.springframework.context-3.0.0.jar=lib/org.springframework.context-3.0.0.jar +file.reference.org.springframework.core-3.0.0.jar=lib/org.springframework.core-3.0.0.jar +file.reference.oro-2.0.8.jar=lib/myfaces/oro-2.0.8.jar file.reference.postgresql-9.0-801.jdbc4.jar=lib/postgresql-9.0-801.jdbc4.jar -file.reference.richfaces-api-3.3.3.Final.jar=lib/richfaces-api-3.3.3.Final.jar -file.reference.richfaces-impl-3.3.3.Final.jar=lib/richfaces-impl-3.3.3.Final.jar -file.reference.richfaces-impl-jsf2-3.3.3.Final.jar=lib/richfaces-impl-jsf2-3.3.3.Final.jar -file.reference.richfaces-ui-3.3.3.Final.jar=lib/richfaces-ui-3.3.3.Final.jar +file.reference.richfaces-api-3.3.3.Final.jar=lib/richfaces/richfaces-api-3.3.3.Final.jar +file.reference.richfaces-impl-3.3.3.Final.jar=lib/richfaces/richfaces-impl-3.3.3.Final.jar +file.reference.richfaces-ui-3.3.3.Final.jar=lib/richfaces/richfaces-ui-3.3.3.Final.jar file.reference.serializer-2.7.0.jar=lib/serializer-2.7.0.jar file.reference.shst.jar=lib/shst.jar +file.reference.spring-ws-core-1.5.9.jar=lib/spring-ws-core-1.5.9.jar +file.reference.spring-ws-core-tiger-1.5.9.jar=lib/spring-ws-core-tiger-1.5.9.jar +file.reference.spring-ws-support-1.5.9.jar=lib/spring-ws-support-1.5.9.jar +file.reference.spring-xml-1.5.9.jar=lib/spring-xml-1.5.9.jar +file.reference.tomahawk12-1.1.10.jar=lib/myfaces/tomahawk12-1.1.10.jar +file.reference.truelicense.jar=lib/truelicense.jar file.reference.xalan-2.7.0.jar=lib/xalan-2.7.0.jar file.reference.xercesImpl-2.7.1.jar=lib/xercesImpl-2.7.1.jar file.reference.xml-apis-1.3.04.jar=lib/xml-apis-1.3.04.jar file.reference.xml-apis-ext-1.3.04.jar=lib/xml-apis-ext-1.3.04.jar file.reference.xmlgraphics-commons-1.3.1.jar=lib/xmlgraphics-commons-1.3.1.jar +file.reference.xmlParserAPIs-2.0.2.jar=lib/myfaces/xmlParserAPIs-2.0.2.jar includes=** j2ee.deploy.on.save=false j2ee.platform=1.5 @@ -72,14 +84,17 @@ javac.classpath=\ ${file.reference.avalon-framework-4.2.0.jar}:\ ${file.reference.batik-all-1.7.jar}:\ ${file.reference.commons-beanutils-1.8.3.jar}:\ + ${file.reference.commons-codec-1.3.jar}:\ ${file.reference.commons-collections-3.1.jar}:\ ${file.reference.commons-digester-1.8.jar}:\ ${file.reference.commons-fileupload-1.2.1.jar}:\ + ${file.reference.commons-httpclient-3.1.jar}:\ ${file.reference.commons-io-1.4.jar}:\ ${file.reference.commons-lang-2.4.jar}:\ ${file.reference.commons-logging-1.1.1.jar}:\ ${file.reference.commons-validator-1.3.1.jar}:\ ${file.reference.cursos.jar}:\ + ${file.reference.dom4j-1.6.1.jar}:\ ${file.reference.evologger.jar}:\ ${file.reference.evolute.jar}:\ ${file.reference.fop.jar}:\ @@ -88,25 +103,34 @@ javac.classpath=\ ${file.reference.jdom.jar}:\ ${file.reference.log4j-1.2.15.jar}:\ ${file.reference.mail.jar-1}:\ - ${file.reference.richfaces-api-3.3.3.Final.jar}:\ + ${file.reference.org.springframework.beans-3.0.0.jar}:\ + ${file.reference.org.springframework.context-3.0.0.jar}:\ + ${file.reference.org.springframework.core-3.0.0.jar}:\ ${file.reference.postgresql-9.0-801.jdbc4.jar}:\ - ${file.reference.richfaces-impl-3.3.3.Final.jar}:\ - ${file.reference.richfaces-impl-jsf2-3.3.3.Final.jar}:\ - ${file.reference.richfaces-ui-3.3.3.Final.jar}:\ ${file.reference.serializer-2.7.0.jar}:\ ${file.reference.shst.jar}:\ + ${file.reference.spring-ws-core-1.5.9.jar}:\ + ${file.reference.spring-ws-core-tiger-1.5.9.jar}:\ + ${file.reference.spring-ws-support-1.5.9.jar}:\ + ${file.reference.spring-xml-1.5.9.jar}:\ + ${file.reference.truelicense.jar}:\ ${file.reference.xalan-2.7.0.jar}:\ ${file.reference.xercesImpl-2.7.1.jar}:\ ${file.reference.xml-apis-1.3.04.jar}:\ ${file.reference.xml-apis-ext-1.3.04.jar}:\ ${file.reference.xmlgraphics-commons-1.3.1.jar}:\ - ${file.reference.commons-httpclient-3.1.jar} + ${file.reference.richfaces-api-3.3.3.Final.jar}:\ + ${file.reference.richfaces-impl-3.3.3.Final.jar}:\ + ${file.reference.richfaces-ui-3.3.3.Final.jar}:\ + ${file.reference.oro-2.0.8.jar}:\ + ${file.reference.tomahawk12-1.1.10.jar}:\ + ${file.reference.xmlParserAPIs-2.0.2.jar} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true javac.deprecation=false -javac.source=1.5 -javac.target=1.5 +javac.source=1.6 +javac.target=1.6 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir}:\ diff --git a/trunk/PlanosActuacao/nbproject/project.xml b/trunk/PlanosActuacao/nbproject/project.xml index 96f15782..c97b14b3 100644 --- a/trunk/PlanosActuacao/nbproject/project.xml +++ b/trunk/PlanosActuacao/nbproject/project.xml @@ -47,6 +47,10 @@ ${file.reference.commons-beanutils-1.8.3.jar} WEB-INF/lib + + ${file.reference.commons-codec-1.3.jar} + WEB-INF/lib + ${file.reference.commons-collections-3.1.jar} WEB-INF/lib @@ -59,6 +63,10 @@ ${file.reference.commons-fileupload-1.2.1.jar} WEB-INF/lib + + ${file.reference.commons-httpclient-3.1.jar} + WEB-INF/lib + ${file.reference.commons-io-1.4.jar} WEB-INF/lib @@ -79,6 +87,10 @@ ${file.reference.cursos.jar} WEB-INF/lib + + ${file.reference.dom4j-1.6.1.jar} + WEB-INF/lib + ${file.reference.evologger.jar} WEB-INF/lib @@ -112,7 +124,15 @@ WEB-INF/lib - ${file.reference.richfaces-api-3.3.3.Final.jar} + ${file.reference.org.springframework.beans-3.0.0.jar} + WEB-INF/lib + + + ${file.reference.org.springframework.context-3.0.0.jar} + WEB-INF/lib + + + ${file.reference.org.springframework.core-3.0.0.jar} WEB-INF/lib @@ -120,23 +140,31 @@ WEB-INF/lib - ${file.reference.richfaces-impl-3.3.3.Final.jar} + ${file.reference.serializer-2.7.0.jar} WEB-INF/lib - ${file.reference.richfaces-impl-jsf2-3.3.3.Final.jar} + ${file.reference.shst.jar} WEB-INF/lib - ${file.reference.richfaces-ui-3.3.3.Final.jar} + ${file.reference.spring-ws-core-1.5.9.jar} WEB-INF/lib - ${file.reference.serializer-2.7.0.jar} + ${file.reference.spring-ws-core-tiger-1.5.9.jar} WEB-INF/lib - ${file.reference.shst.jar} + ${file.reference.spring-ws-support-1.5.9.jar} + WEB-INF/lib + + + ${file.reference.spring-xml-1.5.9.jar} + WEB-INF/lib + + + ${file.reference.truelicense.jar} WEB-INF/lib @@ -160,7 +188,27 @@ WEB-INF/lib - ${file.reference.commons-httpclient-3.1.jar} + ${file.reference.richfaces-api-3.3.3.Final.jar} + WEB-INF/lib + + + ${file.reference.richfaces-impl-3.3.3.Final.jar} + WEB-INF/lib + + + ${file.reference.richfaces-ui-3.3.3.Final.jar} + WEB-INF/lib + + + ${file.reference.oro-2.0.8.jar} + WEB-INF/lib + + + ${file.reference.tomahawk12-1.1.10.jar} + WEB-INF/lib + + + ${file.reference.xmlParserAPIs-2.0.2.jar} WEB-INF/lib @@ -177,5 +225,9 @@ + + + + diff --git a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java index 9b9604ef..d653b16c 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java @@ -25,7 +25,6 @@ import db.entidades.Risco; import db.entidades.Valor; import java.sql.ResultSet; import java.sql.Statement; -import java.util.ArrayList; import java.util.Date; import java.util.LinkedList; import java.util.List; @@ -200,7 +199,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider System.out.println("AREAS BY PLANO SQL : " + sql); ResultSet rs = st.executeQuery(sql); - List areas = new ArrayList(); + List< Area > areas = new LinkedList< Area >(); if(rs.isBeforeFirst()) { rs.first(); @@ -257,7 +256,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider System.out.println("RISCOS BY AREA SQL : " + sql); ResultSet rs = st.executeQuery(sql); - List< Risco > riscos = new ArrayList(); + List< Risco > riscos = new LinkedList< Risco >(); if ( rs.isBeforeFirst() ) { rs.first(); @@ -304,7 +303,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider sql += "order by subquery.valor"; System.out.println("VALORES BY RISCO : " + sql); ResultSet rs = st.executeQuery(sql); - List valores = new ArrayList(); + List< Valor > valores = new LinkedList< Valor >(); // Integer valor = null; if(rs.isBeforeFirst()) { @@ -399,7 +398,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider sql += "order by subquery.medida_id, valor"; System.out.println("MEDIDAS BY RISCO SQL : " + sql); ResultSet rs = st.executeQuery(sql); - List medidas = new ArrayList(); + List< Medida > medidas = new LinkedList< Medida >(); if(rs.isBeforeFirst()) { rs.first(); @@ -468,7 +467,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider //sql += "where valor = " + v.getValor(); System.out.println("POSTOS BY MEDIDA SQL : " + sql); ResultSet rs = st.executeQuery(sql); - List postos = new ArrayList(); + List< PostoTrabalho > postos = new LinkedList< PostoTrabalho >(); if(rs.isBeforeFirst()) { rs.first(); diff --git a/trunk/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java b/trunk/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java index 3d462e21..c1e6ff65 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java @@ -17,11 +17,9 @@ import com.evolute.utils.db.DBException; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; import com.evolute.utils.db.JDBCManager; -import com.evolute.utils.db.keyretrievers.PostgresqlAutoKeyRetriever; import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.jdbc.DBStatementExecuter; import com.evolute.utils.jdbc.StatementExecuterFactory; -import com.evolute.utils.sql.Insert; import com.evolute.utils.sql.SQLQuery; import com.evolute.utils.strings.UnicodeChecker; import db.DBConstants; @@ -64,7 +62,7 @@ public class EvoBaseProvider private void init() throws DBException { - System.out.println( "EvoBaseProvider . init() : " ); +// System.out.println( "EvoBaseProvider . init() : " ); String server = DBPropertiesLoader.getInstance().findProperty( DBConstants.SERVER_SIPRP ); int port = DBPropertiesLoader.getInstance().findProperty( DBConstants.PORT_SIPRP, -1 ); diff --git a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java index fcce160e..b0140a79 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java @@ -29,7 +29,6 @@ import db.entidades.Utilizador; import global.Global; import java.sql.ResultSet; import java.sql.Statement; -import java.util.ArrayList; import java.util.Date; import java.util.LinkedList; import java.util.List; @@ -54,23 +53,23 @@ public class PlanosDataProvider extends GenericDataProvider return INSTANCE; } - public void updatePlano(PlanoActuacao p) throws Exception + public void updatePlano( PlanoActuacao p ) throws Exception { if ( p.getConcluidoPorDesactivacao() == null ) { p.setConcluidoPorDesactivacao( false ); } - if(p.getObs_correcao() == null) + if ( p.getObs_correcao() == null ) { - p.setObs_correcao(""); + p.setObs_correcao( "" ); } - if(p.getObservacoes_dl() == null) + if ( p.getObservacoes_dl() == null ) { - p.setObservacoes_dl(""); + p.setObservacoes_dl( "" ); } - if(p.getObservacoes_dns() == null) + if ( p.getObservacoes_dns() == null ) { - p.setObservacoes_dns(""); + p.setObservacoes_dns( "" ); } if ( p.getUser_dir_loja() != null && p.getUser_dir_loja().intValue() == 0 ) { @@ -124,29 +123,29 @@ public class PlanosDataProvider extends GenericDataProvider public void updateRisco( Risco r ) throws Exception { - if(r.getResponsavel_execucao() == null) + if ( r.getResponsavel_execucao() == null ) { - r.setResponsavel_execucao(""); + r.setResponsavel_execucao( "" ); } - if(r.getPor() == null) + if ( r.getPor() == null ) { - r.setPor(""); + r.setPor( "" ); } - if(r.getRecursos_necessarios() == null) + if ( r.getRecursos_necessarios() == null ) { - r.setRecursos_necessarios(""); + r.setRecursos_necessarios( "" ); } - if(r.getParecer_dl() == null) + if ( r.getParecer_dl() == null ) { - r.setParecer_dl(""); + r.setParecer_dl( "" ); } - if(r.getParecer_dns() == null) + if ( r.getParecer_dns() == null ) { - r.setParecer_dns(""); + r.setParecer_dns( "" ); } - if(r.getVerificacao_siprp() == null) + if ( r.getVerificacao_siprp() == null ) { - r.setVerificacao_siprp(""); + r.setVerificacao_siprp( "" ); } Expression where = new Field( "id" ).isEqual( r.getId() ); @@ -181,8 +180,7 @@ public class PlanosDataProvider extends GenericDataProvider Expression where = new Field( "id" ).isEqual( m.getId() ).and( new Field( "risco_id" ).isEqual( risco.getId() ) ); - Update upd = new Update( PlanoMedidasData.TABLENAME, new Assignment[] - { + Update upd = new Update( PlanoMedidasData.TABLENAME, new Assignment[] { new Assignment( new Field( PlanoMedidasData.ESTADO_MEDIDAS_ID ), emID ) }, where ); @@ -352,9 +350,9 @@ public class PlanosDataProvider extends GenericDataProvider } - private ArrayList getFullPlanos( ResultSet rs ) throws Exception + private List< PlanoActuacao > getFullPlanos( ResultSet rs ) throws Exception { - ArrayList list = new ArrayList(); + List< PlanoActuacao > list = new LinkedList< PlanoActuacao >(); if ( rs.isBeforeFirst() ) { rs.first(); @@ -362,29 +360,29 @@ public class PlanosDataProvider extends GenericDataProvider { PlanoActuacao pa = new PlanoActuacao(); pa.setId( new Integer( rs.getInt("id") ) ); - pa.setEstabelecimento_id(new Integer(rs.getInt("estabelecimento_id"))); + pa.setEstabelecimento_id( new Integer( rs.getInt( "estabelecimento_id" ) ) ); pa.setNome_estabelecimento( Utils.unicodeToHTML( rs.getString( "nome_estabelecimento" ) ) ); pa.setNome_empresa( Utils.unicodeToHTML( rs.getString( "nome_empresa" ) ) ); - pa.setFase( new Integer( rs.getInt("fase") ) ); - java.sql.Date sqlDate = rs.getDate("data_visita"); - pa.setData_visita(new java.util.Date(sqlDate.getTime())); - pa.setValidacao_director_loja(new Boolean( rs.getBoolean("validacao_director_loja") )); - pa.setValidacao_dns(new Boolean( rs.getBoolean("validacao_dns") )); - pa.setValidacao_hs(new Boolean( rs.getBoolean("validacao_hs") )); + pa.setFase( new Integer( rs.getInt( "fase" ) ) ); + java.sql.Date sqlDate = rs.getDate( "data_visita" ); + pa.setData_visita( new java.util.Date( sqlDate.getTime() ) ); + pa.setValidacao_director_loja( new Boolean( rs.getBoolean( "validacao_director_loja" ) ) ); + pa.setValidacao_dns( new Boolean( rs.getBoolean("validacao_dns") ) ); + pa.setValidacao_hs( new Boolean( rs.getBoolean("validacao_hs") ) ); pa.setObservacoes_dl( Utils.unicodeToHTML( rs.getString("observacoes_dl") ) ); pa.setObservacoes_dns( Utils.unicodeToHTML( rs.getString("observacoes_dns") ) ); pa.setObs_correcao( Utils.unicodeToHTML( rs.getString("obs_correcao") ) ); pa.setAreas( getAreasByPlano( pa ) ); pa.setTotal_riscos( getTotalRiscosByPlano( pa.getId() ) ); - pa.setCorrecao( Utils.unicodeToHTML( rs.getString("correcao") ) ); - pa.setFase_antes_correcao(new Integer(rs.getInt("fase_antes_correcao"))); - pa.setData_validacao_dir_loja(rs.getDate("data_validacao_dir_loja")); - pa.setUser_dir_loja(new Integer(rs.getInt("user_dir_loja"))); - pa.setData_validacao_dns(rs.getDate("data_validacao_dns")); - pa.setUser_dns(new Integer(rs.getInt("user_dns"))); - pa.setData_validacao_hs(rs.getDate("data_validacao_hs")); - pa.setUser_hs(new Integer(rs.getInt("user_hs"))); - pa.setTecnico_hs_id(new Integer(rs.getInt("tecnico_hs_id"))); + pa.setCorrecao( Utils.unicodeToHTML( rs.getString( "correcao") ) ); + pa.setFase_antes_correcao( new Integer( rs.getInt( "fase_antes_correcao" ) ) ); + pa.setData_validacao_dir_loja( rs.getDate( "data_validacao_dir_loja" ) ); + pa.setUser_dir_loja( new Integer( rs.getInt( "user_dir_loja" ) ) ); + pa.setData_validacao_dns( rs.getDate( "data_validacao_dns" ) ); + pa.setUser_dns( new Integer( rs.getInt( "user_dns" ) ) ); + pa.setData_validacao_hs( rs.getDate( "data_validacao_hs" ) ); + pa.setUser_hs( new Integer( rs.getInt( "user_hs" ) ) ); + pa.setTecnico_hs_id( new Integer( rs.getInt( "tecnico_hs_id" ) ) ); pa.setTecnico_hs_nome( Utils.unicodeToHTML( rs.getString("tecnico_hs_nome") ) ); pa.setConcluidoPorDesactivacao( new Boolean( rs.getBoolean( "concluido_por_desactivacao" ) ) ); pa.setDataDesactivacao( rs.getDate( "data_desactivacao" ) ); @@ -499,7 +497,7 @@ public class PlanosDataProvider extends GenericDataProvider } - private List getMedidasByRisco( Risco r ) throws Exception + private List< Medida > getMedidasByRisco( Risco r ) throws Exception { List< Medida > list = new LinkedList< Medida >(); diff --git a/trunk/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java index 99fdd652..ef1b357d 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java @@ -16,7 +16,7 @@ import db.entidades.Risco; import db.entidades.Valor; import java.sql.ResultSet; import java.sql.Statement; -import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import utils.Utils; @@ -75,8 +75,8 @@ public class RelatoriosDataProvider extends GenericDataProvider System.out.println("AREAS BY PLANO SQL : " + sql); ResultSet rs = st.executeQuery(sql); - List areas = new ArrayList(); - if(rs.isBeforeFirst()) + List< Area > areas = new LinkedList< Area >(); + if ( rs.isBeforeFirst() ) { rs.first(); do @@ -122,7 +122,7 @@ public class RelatoriosDataProvider extends GenericDataProvider sql += "order by hs_relatorio_risco.id "; System.out.println("RISCOS BY AREA SQL : " + sql); ResultSet rs = st.executeQuery(sql); - List riscos = new ArrayList(); + List< Risco > riscos = new LinkedList< Risco >(); if(rs.isBeforeFirst()) { @@ -171,7 +171,7 @@ public class RelatoriosDataProvider extends GenericDataProvider sql += "order by subquery.valor"; System.out.println("VALORES BY RISCO : " + sql); ResultSet rs = st.executeQuery(sql); - List valores = new ArrayList(); + List< Valor > valores = new LinkedList< Valor >(); Integer valor = null; if(rs.isBeforeFirst()) { @@ -268,8 +268,8 @@ public class RelatoriosDataProvider extends GenericDataProvider sql += "order by subquery.medida_id, valor"; System.out.println("MEDIDAS BY RISCO SQL : " + sql); ResultSet rs = st.executeQuery(sql); - List medidas = new ArrayList(); - if(rs.isBeforeFirst()) + List< Medida > medidas = new LinkedList< Medida >(); + if ( rs.isBeforeFirst() ) { rs.first(); do @@ -339,7 +339,7 @@ public class RelatoriosDataProvider extends GenericDataProvider //sql += "where valor = " + v.getValor(); System.out.println("POSTOS BY MEDIDA SQL : " + sql); ResultSet rs = st.executeQuery(sql); - List postos = new ArrayList(); + List< PostoTrabalho > postos = new LinkedList< PostoTrabalho >(); if(rs.isBeforeFirst()) { rs.first(); diff --git a/trunk/PlanosActuacao/src/java/phaselistener/ContextListener.java b/trunk/PlanosActuacao/src/java/phaselistener/ContextListener.java index 23d0173b..88c9ee56 100644 --- a/trunk/PlanosActuacao/src/java/phaselistener/ContextListener.java +++ b/trunk/PlanosActuacao/src/java/phaselistener/ContextListener.java @@ -5,6 +5,7 @@ package phaselistener; +import com.evolute.properties.EvoAbstractPropertiesLoader; import com.evolute.utils.date.DateUtils; import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.timer.TimedEvent; @@ -36,9 +37,20 @@ public class ContextListener implements ServletContextListener startedTime = System.currentTimeMillis(); System.out.println( "\n\ncontextInitialized : " + startedTime ); + try + { + System.out.println( "\nInitializing PA logger ..." ); + PlanosActuacaoLogger.init(); + } + catch ( Throwable e ) + { + e.printStackTrace( System.err ); + } + try { System.out.println( "\n\tReading app.properties ..." ); + EvoAbstractPropertiesLoader.forceEncryptedPropertiesFile = false; SIPRPPropertiesLoader props = SIPRPPropertiesLoader.getInstance(); props.load(); } @@ -58,16 +70,6 @@ public class ContextListener implements ServletContextListener ErrorLogger.logException( e ); } - try - { - System.out.println( "\nInitializing PA logger ..." ); - PlanosActuacaoLogger.init(); - } - catch ( Throwable e ) - { - e.printStackTrace( System.err ); - } - System.out.println( "\nScheduling Import Event ... " ); importEvent = new TimedEvent() { diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java b/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java index e1cf8cfa..e74dccd9 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java @@ -1122,13 +1122,10 @@ public class EditarPlano extends AbstractPageBean grd.getChildren().add( st ); if ( u.getTipo().intValue() == Global.RESPONSAVEL_SEGURANCA ) { -// HtmlCalendar cal = new HtmlCalendar(); - dtInicio = new HtmlCalendar(); dtInicio.setId( "dtInicio" ); dtInicio.setDatePattern( "dd-MM-yyyy" ); -// dtInicio.setDateFormatPattern( "dd-MM-yyyy" ); dtInicio.setValue( r.getData_inicio() ); java.util.GregorianCalendar gcalendar = new java.util.GregorianCalendar(); gcalendar.set( 2000, 1, 1 ); @@ -1163,12 +1160,10 @@ public class EditarPlano extends AbstractPageBean grd.getChildren().add( st ); if ( u.getTipo().intValue() == Global.RESPONSAVEL_SEGURANCA ) { -// dtFim = new Calendar(); dtFim = new HtmlCalendar(); dtFim.setId( "dtFim" ); dtFim.setDatePattern( "dd-MM-yyyy" ); -// dtFim.setDateFormatPattern( "dd-MM-yyyy" ); java.util.GregorianCalendar gcalendar1 = new java.util.GregorianCalendar(); gcalendar1.set( 2099, 1, 1 ); // dtFim.setMaxDate( gcalendar1.getTime() ); diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java index 6d8a3bb6..ee9fc2d1 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java @@ -21,13 +21,14 @@ import db.providers.PlanosDataProvider; import global.Global; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; +import java.util.LinkedList; import java.util.List; import javax.faces.FacesException; import javax.faces.component.html.HtmlPanelGrid; import javax.faces.context.FacesContext; import javax.servlet.http.HttpServletResponse; +import org.richfaces.component.html.HtmlCalendar; import shst.higiene.planoactuacao.print.PlanoActuacaoPDFCreator; import tabledataproviders.PlanosActualDataProvider; import tabledataproviders.PlanosConcluidosDataProvider; @@ -765,18 +766,17 @@ public class ListaPlanos extends AbstractPageBean System.out.println( "\tGETTING INITIAL VALUES FOR EACH TABLE." ); long startedTime = System.currentTimeMillis(); - List listPlanosActivos = getPlanosActivos( u ); + List< PlanoActuacao > listPlanosActivos = getPlanosActivos( u ); getSessionBean1().getPlanosActualDataProvider().setList( listPlanosActivos ); - List listPlanosSeguimento = getPlanosSeguimento( u ); + List< PlanoActuacao > listPlanosSeguimento = getPlanosSeguimento( u ); getSessionBean1().getPlanosSeguimentoDataProvider().setList( listPlanosSeguimento ); - List listPlanosConcluidos = getPlanosConcluidos( u ); + List< PlanoActuacao > listPlanosConcluidos = getPlanosConcluidos( u ); getSessionBean1().getPlanosConcluidosDataProvider().setList( listPlanosConcluidos ); long endedTime = System.currentTimeMillis(); System.out.println( "\nGot Planos List in : " + getTime( startedTime, endedTime ) ); - //2010-11-12 : user scampos : 1 min (debug mode) } //checkPlanosDelayed(); } @@ -791,7 +791,7 @@ public class ListaPlanos extends AbstractPageBean RowKey rk = tableRowGroup1.getRowKey(); int k = Integer.parseInt( rk.getRowId() ); PlanosActualDataProvider provider = ( PlanosActualDataProvider ) tableRowGroup1.getSourceData(); - ArrayList list = ( ArrayList ) provider.getList(); + List< PlanoActuacao > list = ( LinkedList< PlanoActuacao > ) provider.getList(); PlanoActuacao p = ( PlanoActuacao ) list.get( k ); return p; } @@ -801,7 +801,7 @@ public class ListaPlanos extends AbstractPageBean RowKey rk = tableRowGroup2.getRowKey(); int k = Integer.parseInt( rk.getRowId() ); PlanosSeguimentoDataProvider provider = ( PlanosSeguimentoDataProvider ) tableRowGroup2.getSourceData(); - ArrayList list = ( ArrayList ) provider.getList(); + List< PlanoActuacao > list = ( LinkedList< PlanoActuacao > ) provider.getList(); PlanoActuacao p = ( PlanoActuacao ) list.get( k ); return p; @@ -812,69 +812,15 @@ public class ListaPlanos extends AbstractPageBean RowKey rk = tableRowGroup3.getRowKey(); int k = Integer.parseInt( rk.getRowId() ); PlanosConcluidosDataProvider provider = ( PlanosConcluidosDataProvider ) tableRowGroup3.getSourceData(); - ArrayList list = ( ArrayList ) provider.getList(); + List< PlanoActuacao > list = ( LinkedList< PlanoActuacao > ) provider.getList(); PlanoActuacao p = ( PlanoActuacao ) list.get( k ); return p; } - private void checkPlanosDelayed() - { - } - -// private void showPlano(PlanoActuacao p) -// { -// System.out.println("PLANO : " + p.getData_visita_str() + " | " + p.getFase_nome() + " | " + p.getNome_estabelecimento()); -// System.out.println("================================================================="); -// showAreas(p.getAreas()); -// System.out.println("================================================================="); -// } -// -// private void showAreas(List areas) -// { -// for(Area a : areas) -// { -// System.out.println(" " + a.getDescricao()); -// showRiscos(a.getRiscos()); -// } -// } -// -// private void showRiscos(List riscos) -// { -// for(Risco r : riscos) -// { -// System.out.println(" " + r.getDescricao()); -// showValores(r.getValores()); -// } -// } -// -// private void showValores(List valores) -// { -// for(Valor v : valores) -// { -// System.out.println(" " + v.getValor()); -// showMedidas(v.getMedidas()); -// } -// } -// -// private void showMedidas(List medidas) -// { -// for(Medida m : medidas) -// { -// System.out.println(" " + m.getDescricao()); -// showPostos(m.getPostos()); -// } -// } -// -// private void showPostos(List postos) -// { -// for(PostoTrabalho p : postos) -// { -// System.out.println(" " + p.getDescricao()); -// } -// } - public List searchPlanosActivos( Utilizador u, String nome, String estabelecimento, String dataVisita ) - { - List list = new ArrayList(); + + private List< PlanoActuacao > searchPlanosActivos( Utilizador u, String nome, String estabelecimento, String dataVisita ) + { + List< PlanoActuacao > list = null; try { if ( u.getTipo().intValue() != Global.DIRECTOR_SIPRP && u.getTipo().intValue() != Global.GESTOR && u.getTipo().intValue() != Global.DIRECTOR_GERAL_RH ) @@ -887,33 +833,17 @@ public class ListaPlanos extends AbstractPageBean { ErrorLogger.logException( e ); } - return list; + return list == null ? new LinkedList< PlanoActuacao >() : list; } - public List getPlanosActivos( Utilizador u ) + private List getPlanosActivos( Utilizador u ) { return searchPlanosActivos( u, null, null, null ); -// List< PlanoActuacao > list = new ArrayList(); -// try -// { -// if ( u.getTipo().intValue() != Global.DIRECTOR_SIPRP -// && u.getTipo().intValue() != Global.GESTOR -// && u.getTipo().intValue() != Global.DIRECTOR_GERAL_RH ) -// { -//// list = pdp.getPlanosActivos(u); -// list = pdp.searchPlanosActivos( u, null, null ); -// } -// } -// catch(Exception ex) -// { -// ErrorLogger.logException( ex ); -// } -// return list; - } - - public List searchPlanosSeguimento( Utilizador u, String nome, String estabelecimento, String dataVisita ) - { - List list = new ArrayList(); + } + + private List< PlanoActuacao > searchPlanosSeguimento( Utilizador u, String nome, String estabelecimento, String dataVisita ) + { + List< PlanoActuacao > list = null; try { PlanosDataProvider pdp = PlanosDataProvider.getInstance(); @@ -923,28 +853,17 @@ public class ListaPlanos extends AbstractPageBean { ErrorLogger.logException( ex ); } - return list; + return list == null ? new LinkedList< PlanoActuacao >() : list; } - public List getPlanosSeguimento( Utilizador u ) + private List< PlanoActuacao > getPlanosSeguimento( Utilizador u ) { return searchPlanosSeguimento( u, null, null, null ); -// List< PlanoActuacao > list = new ArrayList(); -// try -// { -//// list = pdp.getPlanosSeguimento(u); -// list = pdp.searchPlanosSeguimento( u, null, null ); -// } -// catch(Exception ex) -// { -// ErrorLogger.logException( ex ); -// } -// return list; - } - - public List searchPlanosConcluidos( Utilizador u, String nome, String estabelecimento, String dataVisita ) - { - List list = new ArrayList(); + } + + private List< PlanoActuacao > searchPlanosConcluidos( Utilizador u, String nome, String estabelecimento, String dataVisita ) + { + List< PlanoActuacao > list = null; try { PlanosDataProvider pdp = PlanosDataProvider.getInstance(); @@ -954,23 +873,12 @@ public class ListaPlanos extends AbstractPageBean { ErrorLogger.logException( ex ); } - return list; + return list == null ? new LinkedList< PlanoActuacao >() : list; } - public List getPlanosConcluidos( Utilizador u ) + private List< PlanoActuacao > getPlanosConcluidos( Utilizador u ) { return searchPlanosConcluidos( u, null, null, null ); -// List< PlanoActuacao > list = new ArrayList(); -// try -// { -//// list = pdp.getPlanosConcluidos(u); -// list = pdp.searchPlanosConcluidos( u, null, null ); -// } -// catch(Exception ex) -// { -// ErrorLogger.logException( ex ); -// } -// return list; } public String buttonFilterActual_action() @@ -995,16 +903,7 @@ public class ListaPlanos extends AbstractPageBean } } -// Date visitaDate = ( Date ) calFilterDateActual.getValue(); - String visitaDateStr = null; - if ( calFilterDate != null ) - { - visitaDateStr = D_F.format( calFilterDate ); - } -// if ( visitaDate != null ) -// { -// visitaDateStr = D_F.format( visitaDate ); -// } + String visitaDateStr = calFilterDate == null ? null : D_F.format( calFilterDate ); getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE ); getSessionBean1().getPlanosActualDataProvider().setList( @@ -1035,16 +934,7 @@ public class ListaPlanos extends AbstractPageBean } } -// Date visitaDate = ( Date ) calFilterDateSeg.getValue(); - String visitaDateStr = null; - if ( calFilterDateSeguimento != null ) - { - visitaDateStr = D_F.format( calFilterDateSeguimento ); - } -// if ( visitaDate != null ) -// { -// visitaDateStr = D_F.format( visitaDate ); -// } + String visitaDateStr = calFilterDateSeguimento == null ? null : D_F.format( calFilterDateSeguimento ); getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE ); getSessionBean1().getPlanosSeguimentoDataProvider().setList( @@ -1075,16 +965,7 @@ public class ListaPlanos extends AbstractPageBean } } -// Date visitaDate = ( Date ) calFilterDateConc.getValue(); - String visitaDateStr = null; - if ( calFilterDateConcluidos != null ) - { - visitaDateStr = D_F.format( calFilterDateConcluidos ); - } -// if ( visitaDate != null ) -// { -// visitaDateStr = D_F.format( visitaDate ); -// } + String visitaDateStr = calFilterDateConcluidos == null ? null : D_F.format( calFilterDateConcluidos ); getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE ); getSessionBean1().getPlanosConcluidosDataProvider().setList( diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java index 37c793d0..ae3525ef 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java @@ -16,9 +16,9 @@ import db.entidades.Valor; import db.providers.CreatePlanosDataProvider; import db.providers.UtilizadoresDataProvider; import global.Global; -import java.util.ArrayList; import java.util.Date; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.ListIterator; import mail.Mail; @@ -87,22 +87,22 @@ public class PlanosActuacao } } - private List getPlanosOnline(Integer estabelecimentoId) + private List< Date > getPlanosOnline( Integer estabelecimentoId ) { - List list = new ArrayList(); + List< Date > list = null; try { - if( estabelecimentoId != null ) + if ( estabelecimentoId != null ) { CreatePlanosDataProvider cpdp = CreatePlanosDataProvider.getInstance(); list = cpdp.getPlanosOnline( estabelecimentoId ); } } - catch(Exception ex) + catch ( Exception ex ) { ErrorLogger.logException( ex ); } - return list; + return list == null ? new LinkedList< Date >() : list; } private void initRelatorios( List< Date > list, Integer estabelecimentoId ) diff --git a/trunk/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java b/trunk/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java index d98c953b..fd64e67e 100644 --- a/trunk/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java +++ b/trunk/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java @@ -6,11 +6,12 @@ package utils; import com.evolute.utils.error.ErrorLogger; +import com.evolute.utils.error.Logger; 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; import java.util.HashMap; -import java.util.Map; /** * @@ -19,29 +20,25 @@ import java.util.Map; 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 = "2DD-rg2hLOG"; - - public static void init() + public static void init() throws Exception { - Map< LoggerProperties, String > map = new HashMap< LoggerProperties, String >(); - map.put( LoggerProperties.USERNAME, EVO_LOGGER_USER ); - 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.PROJECT_VERSION, "1" ); - map.put( LoggerProperties.SOFTWARE_NAME, "SIPRP - Planos Actuacao" ); - try - { - ErrorLogger.initializeLogger( new WSLogger( map ) ); - } - catch ( Exception e ) - { - e.printStackTrace(); - } + HashMap< LoggerProperties, String > properties = new HashMap< LoggerProperties, String >(); + properties.put( LoggerProperties.SOFTWARE_NAME, "SIPRP - Planos Actuacao" ); + properties.put( LoggerProperties.SOFTWARE_VERSION, "1" ); + properties.put( LoggerProperties.PROJECT, ProjectsEnum.PLANOS_ACTUACAO.toString() ); + properties.put( LoggerProperties.PROJECT_NAME, ProjectsEnum.PLANOS_ACTUACAO.toString() ); + properties.put( LoggerProperties.PROJECT_VERSION, "1" ); + + String user = ""; + String pass = ""; + String host = ""; + String port = ""; + + EvoProxyObject.configSystemProxySelector(); + EvoProxyObject.getProxy( user, pass, host, port ); + + Logger logger = new WSLogger( properties ); + ErrorLogger.initializeLogger( logger ); } } diff --git a/trunk/PlanosActuacao/web/ListaPlanos.jsp b/trunk/PlanosActuacao/web/ListaPlanos.jsp index 422b53a7..95530824 100644 --- a/trunk/PlanosActuacao/web/ListaPlanos.jsp +++ b/trunk/PlanosActuacao/web/ListaPlanos.jsp @@ -1,5 +1,5 @@ - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/PlanosActuacao/web/WEB-INF/web.xml b/trunk/PlanosActuacao/web/WEB-INF/web.xml index a2ee0cbf..9fa7a905 100644 --- a/trunk/PlanosActuacao/web/WEB-INF/web.xml +++ b/trunk/PlanosActuacao/web/WEB-INF/web.xml @@ -1,21 +1,7 @@ - - - org.richfaces.SKIN - blueSky - - - - - - + RichFaces Filter richfaces @@ -24,28 +10,34 @@ richfaces Faces Servlet - - + + + + + + MyFacesExtensionsFilter + org.apache.myfaces.webapp.filter.ExtensionsFilter + + uploadMaxFileSize + 20m + + + + MyFacesExtensionsFilter + FacesServlet + + + + + + + - - javax.faces.STATE_SAVING_METHOD - client - - - com.sun.faces.validateXml - true - - - com.sun.faces.verifyObjects - false - - UploadFilter com.sun.webui.jsf.util.UploadFilter @@ -64,7 +56,29 @@ UploadFilter Faces Servlet - + + + + + + org.richfaces.SKIN + blueSky + + + + javax.faces.STATE_SAVING_METHOD + client + + + com.sun.faces.validateXml + true + + + com.sun.faces.verifyObjects + false + + + Faces Servlet @@ -157,4 +171,5 @@ /AnaliseAcidentesTrabalho/Erro.jsp --> +