From dc0fd32e399ab772da3fde6817ced12fe453ce82 Mon Sep 17 00:00:00 2001
From: Diogo Neves <deactivated@coded.pt>
Date: Wed, 6 Apr 2011 12:41:06 +0000
Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1659
 bb69d46d-e84e-40c8-a05a-06db0d633741

---
 .../PlanosActuacao/nbproject/build-impl.xml                 | 6 +++---
 .../PlanosActuacao/nbproject/genfiles.properties            | 4 ++--
 .../PlanosActuacao/nbproject/project.properties             | 4 ++--
 .../PlanosActuacao/nbproject/project.xml                    | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/branches/NetbeansIndependency/PlanosActuacao/nbproject/build-impl.xml b/branches/NetbeansIndependency/PlanosActuacao/nbproject/build-impl.xml
index 1011e8f7..5f416d4b 100644
--- a/branches/NetbeansIndependency/PlanosActuacao/nbproject/build-impl.xml
+++ b/branches/NetbeansIndependency/PlanosActuacao/nbproject/build-impl.xml
@@ -546,8 +546,8 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jstl.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jstl.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.log4j-1.2.15.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.log4j-1.2.15.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.mail.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.mail.jar-1" todir="${dist.ear.dir}"/>
-        <copyfiles files="${file.reference.postgresql-8.4-701.jdbc4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.postgresql-8.4-701.jdbc4.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.richfaces-api-3.3.3.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.richfaces-api-3.3.3.Final.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.postgresql-9.0-801.jdbc4.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.richfaces-impl-3.3.3.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.richfaces-impl-3.3.3.Final.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.richfaces-impl-jsf2-3.3.3.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.richfaces-impl-jsf2-3.3.3.Final.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.richfaces-ui-3.3.3.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.richfaces-ui-3.3.3.Final.jar" todir="${dist.ear.dir}"/>
@@ -565,7 +565,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Class-Path" value="${manifest.file.reference.activation.jar} ${manifest.file.reference.appbase.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.commons-beanutils-1.8.3.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-digester-1.8.jar} ${manifest.file.reference.commons-fileupload-1.2.1.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-lang-2.4.jar} ${manifest.file.reference.commons-logging-1.1.1.jar} ${manifest.file.reference.commons-validator-1.3.1.jar} ${manifest.file.reference.cursos.jar} ${manifest.file.reference.dataprovider.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.jdbcappender.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.jsf-api.jar} ${manifest.file.reference.jsf-extensions-common-0.1.jar} ${manifest.file.reference.jsf-extensions-dynamic-faces-0.1.jar} ${manifest.file.reference.jsf-impl.jar} ${manifest.file.reference.jsfcl.jar} ${manifest.file.reference.json-2.jar} ${manifest.file.reference.jstl.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.postgresql-8.4-701.jdbc4.jar} ${manifest.file.reference.richfaces-api-3.3.3.Final.jar} ${manifest.file.reference.richfaces-impl-3.3.3.Final.jar} ${manifest.file.reference.richfaces-impl-jsf2-3.3.3.Final.jar} ${manifest.file.reference.richfaces-ui-3.3.3.Final.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.shst.jar} ${manifest.file.reference.sqlx.jar} ${manifest.file.reference.standard.jar} ${manifest.file.reference.webui-jsf-suntheme.jar} ${manifest.file.reference.webui-jsf.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} "/>
+            <attribute name="Class-Path" value="${manifest.file.reference.activation.jar} ${manifest.file.reference.appbase.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.commons-beanutils-1.8.3.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-digester-1.8.jar} ${manifest.file.reference.commons-fileupload-1.2.1.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-lang-2.4.jar} ${manifest.file.reference.commons-logging-1.1.1.jar} ${manifest.file.reference.commons-validator-1.3.1.jar} ${manifest.file.reference.cursos.jar} ${manifest.file.reference.dataprovider.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.jdbcappender.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.jsf-api.jar} ${manifest.file.reference.jsf-extensions-common-0.1.jar} ${manifest.file.reference.jsf-extensions-dynamic-faces-0.1.jar} ${manifest.file.reference.jsf-impl.jar} ${manifest.file.reference.jsfcl.jar} ${manifest.file.reference.json-2.jar} ${manifest.file.reference.jstl.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.richfaces-api-3.3.3.Final.jar} ${manifest.file.reference.postgresql-9.0-801.jdbc4.jar} ${manifest.file.reference.richfaces-impl-3.3.3.Final.jar} ${manifest.file.reference.richfaces-impl-jsf2-3.3.3.Final.jar} ${manifest.file.reference.richfaces-ui-3.3.3.Final.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.shst.jar} ${manifest.file.reference.sqlx.jar} ${manifest.file.reference.standard.jar} ${manifest.file.reference.webui-jsf-suntheme.jar} ${manifest.file.reference.webui-jsf.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} "/>
         </manifest>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
@@ -599,8 +599,8 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jstl.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.log4j-1.2.15.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.mail.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.postgresql-8.4-701.jdbc4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.richfaces-api-3.3.3.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.richfaces-impl-3.3.3.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.richfaces-impl-jsf2-3.3.3.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.richfaces-ui-3.3.3.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
diff --git a/branches/NetbeansIndependency/PlanosActuacao/nbproject/genfiles.properties b/branches/NetbeansIndependency/PlanosActuacao/nbproject/genfiles.properties
index 10069d02..d86273ea 100644
--- a/branches/NetbeansIndependency/PlanosActuacao/nbproject/genfiles.properties
+++ b/branches/NetbeansIndependency/PlanosActuacao/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ 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=b022afcb
-nbproject/build-impl.xml.script.CRC32=be34a64d
+nbproject/build-impl.xml.data.CRC32=94cc72dd
+nbproject/build-impl.xml.script.CRC32=af391f95
 nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1
diff --git a/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.properties b/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.properties
index bd4f4a46..fa65a6a2 100644
--- a/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.properties
+++ b/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.properties
@@ -52,7 +52,7 @@ file.reference.json-2.jar=lib/json-2.jar
 file.reference.jstl.jar=lib/jstl.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.4-701.jdbc4.jar=lib/postgresql-8.4-701.jdbc4.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
@@ -104,8 +104,8 @@ javac.classpath=\
     ${file.reference.jstl.jar}:\
     ${file.reference.log4j-1.2.15.jar}:\
     ${file.reference.mail.jar-1}:\
-    ${file.reference.postgresql-8.4-701.jdbc4.jar}:\
     ${file.reference.richfaces-api-3.3.3.Final.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}:\
diff --git a/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.xml b/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.xml
index 53fb8a8f..59a29b59 100644
--- a/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.xml
+++ b/branches/NetbeansIndependency/PlanosActuacao/nbproject/project.xml
@@ -128,11 +128,11 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
-                    <file>${file.reference.postgresql-8.4-701.jdbc4.jar}</file>
+                    <file>${file.reference.richfaces-api-3.3.3.Final.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
-                    <file>${file.reference.richfaces-api-3.3.3.Final.jar}</file>
+                    <file>${file.reference.postgresql-9.0-801.jdbc4.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>