diff --git a/trunk/PlanosActuacao/lib/SIPRP.jar b/trunk/PlanosActuacao/lib/SIPRP.jar
index 9640bfa5..d677ca18 100644
Binary files a/trunk/PlanosActuacao/lib/SIPRP.jar and b/trunk/PlanosActuacao/lib/SIPRP.jar differ
diff --git a/trunk/PlanosActuacao/lib/fop.jar b/trunk/PlanosActuacao/lib/fop.jar
deleted file mode 100644
index f7a3a2c7..00000000
Binary files a/trunk/PlanosActuacao/lib/fop.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/nbproject/build-impl.xml b/trunk/PlanosActuacao/nbproject/build-impl.xml
index 436c0272..511cbbcd 100644
--- a/trunk/PlanosActuacao/nbproject/build-impl.xml
+++ b/trunk/PlanosActuacao/nbproject/build-impl.xml
@@ -524,15 +524,18 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.ashwood-1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.ashwood-1.1.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.SIPRP.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.SIPRP.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.jdom.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jdom.jar" todir="${dist.ear.dir}"/>
-        <copyfiles files="${file.reference.fop.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.fop.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.avalon-framework-4.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.avalon-framework-4.2.0.jar" todir="${dist.ear.dir}"/>
-        <copyfiles files="${file.reference.batik.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.batik.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.fop.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.fop.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.jai_imageio.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jai_imageio.jar" todir="${dist.ear.dir}"/>
-        <copyfiles files="${file.reference.evolute.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.evolute.jar-1" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.xmlgraphics-commons-1.3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xmlgraphics-commons-1.3.1.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.avalon-framework-4.2.0.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.avalon-framework-4.2.0.jar-1" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.batik-all-1.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.batik-all-1.7.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.commons-io-1.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-io-1.4.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.commons-logging-1.0.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-logging-1.0.4.jar" todir="${dist.ear.dir}"/>
         <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.libs.jsf12.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.jsf12-support.classpath} ${manifest.libs.woodstock-components.classpath} ${manifest.libs.woodstock-theme-default.classpath} ${manifest.file.reference.activation.jar} ${manifest.file.reference.mail.jar} ${manifest.file.reference.postgresql-8.0-315.jdbc3.jar} ${manifest.file.reference.postgresql-8.1-407.jdbc3.jar} ${manifest.file.reference.postgresql-8.2-506.jdbc4.jar} ${manifest.file.reference.cayenne-server-3.0M2.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-lang-2.1.jar} ${manifest.file.reference.commons-logging-1.1.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.jcalendar-1.3.2.jar} ${manifest.file.reference.log4j-1.2.8.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.TableLayout.jar} ${manifest.file.reference.ashwood-1.1.jar} ${manifest.file.reference.SIPRP.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.batik.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.evolute.jar-1} "/>
+            <attribute name="Class-Path" value="${manifest.libs.jsf12.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.jsf12-support.classpath} ${manifest.libs.woodstock-components.classpath} ${manifest.libs.woodstock-theme-default.classpath} ${manifest.file.reference.activation.jar} ${manifest.file.reference.mail.jar} ${manifest.file.reference.postgresql-8.0-315.jdbc3.jar} ${manifest.file.reference.postgresql-8.1-407.jdbc3.jar} ${manifest.file.reference.postgresql-8.2-506.jdbc4.jar} ${manifest.file.reference.cayenne-server-3.0M2.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-lang-2.1.jar} ${manifest.file.reference.commons-logging-1.1.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.jcalendar-1.3.2.jar} ${manifest.file.reference.log4j-1.2.8.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.TableLayout.jar} ${manifest.file.reference.ashwood-1.1.jar} ${manifest.file.reference.SIPRP.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar-1} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-logging-1.0.4.jar} "/>
         </manifest>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
@@ -558,11 +561,14 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.ashwood-1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.SIPRP.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jdom.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.fop.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.avalon-framework-4.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.batik.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.fop.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jai_imageio.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.evolute.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.xmlgraphics-commons-1.3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.avalon-framework-4.2.0.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.batik-all-1.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-io-1.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.0.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
diff --git a/trunk/PlanosActuacao/nbproject/genfiles.properties b/trunk/PlanosActuacao/nbproject/genfiles.properties
index 09bfd282..c23198c7 100644
--- a/trunk/PlanosActuacao/nbproject/genfiles.properties
+++ b/trunk/PlanosActuacao/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d13032c5
+build.xml.data.CRC32=d6fcc03c
 build.xml.script.CRC32=50b8b881
 build.xml.stylesheet.CRC32=c0ebde35
 # 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=d13032c5
-nbproject/build-impl.xml.script.CRC32=e228659e
+nbproject/build-impl.xml.data.CRC32=d6fcc03c
+nbproject/build-impl.xml.script.CRC32=abe897d8
 nbproject/build-impl.xml.stylesheet.CRC32=174458fc
diff --git a/trunk/PlanosActuacao/nbproject/private/private.properties b/trunk/PlanosActuacao/nbproject/private/private.properties
index 6f4faab3..702a7e1c 100644
--- a/trunk/PlanosActuacao/nbproject/private/private.properties
+++ b/trunk/PlanosActuacao/nbproject/private/private.properties
@@ -1,7 +1,7 @@
-deploy.ant.properties.file=/home/lluis/.netbeans/6.5/tomcat60.properties
-j2ee.platform.classpath=/usr/local/apache-tomcat-6.0.16/lib/jasper.jar:/usr/local/apache-tomcat-6.0.16/lib/tomcat-i18n-ja.jar:/usr/local/apache-tomcat-6.0.16/lib/catalina.jar:/usr/local/apache-tomcat-6.0.16/lib/catalina-ant.jar:/usr/local/apache-tomcat-6.0.16/lib/tomcat-coyote.jar:/usr/local/apache-tomcat-6.0.16/lib/servlet-api.jar:/usr/local/apache-tomcat-6.0.16/lib/jsp-api.jar:/usr/local/apache-tomcat-6.0.16/lib/tomcat-i18n-es.jar:/usr/local/apache-tomcat-6.0.16/lib/jasper-el.jar:/usr/local/apache-tomcat-6.0.16/lib/annotations-api.jar:/usr/local/apache-tomcat-6.0.16/lib/catalina-ha.jar:/usr/local/apache-tomcat-6.0.16/lib/catalina-tribes.jar:/usr/local/apache-tomcat-6.0.16/lib/el-api.jar:/usr/local/apache-tomcat-6.0.16/lib/tomcat-i18n-fr.jar:/usr/local/apache-tomcat-6.0.16/lib/tomcat-dbcp.jar:/usr/local/apache-tomcat-6.0.16/bin/tomcat-juli.jar
-j2ee.server.instance=tomcat60:home=/usr/local/apache-tomcat-6.0.16:base=apache-tomcat-6.0.16_base
+deploy.ant.properties.file=/home/ntaborda/.netbeans/6.5/tomcat60.properties
+j2ee.platform.classpath=/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ha.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina.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/jasper-el.jar:/usr/local/apache-tomcat-6.0.18/lib/el-api.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/usr/local/apache-tomcat-6.0.18/lib/jsp-api.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ant.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.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
 javac.debug=true
 javadoc.preview=true
-jaxws.endorsed.dir=/usr/local/netbeans-6.5/java2/modules/ext/jaxws21/api:/usr/local/netbeans-6.5/ide10/modules/ext/jaxb/api
-user.properties.file=/home/lluis/.netbeans/6.5/build.properties
+jaxws.endorsed.dir=/usr/local/netbeans-6.5.1/java2/modules/ext/jaxws21/api:/usr/local/netbeans-6.5.1/ide10/modules/ext/jaxb/api
+user.properties.file=/home/ntaborda/.netbeans/6.5/build.properties
diff --git a/trunk/PlanosActuacao/nbproject/project.properties b/trunk/PlanosActuacao/nbproject/project.properties
index bdef867e..6a898b15 100644
--- a/trunk/PlanosActuacao/nbproject/project.properties
+++ b/trunk/PlanosActuacao/nbproject/project.properties
@@ -23,15 +23,17 @@ excludes=
 file.reference.activation.jar=jars/activation.jar
 file.reference.ashwood-1.1.jar=../common/lib/ashwood-1.1.jar
 file.reference.avalon-framework-4.2.0.jar=lib/avalon-framework-4.2.0.jar
-file.reference.batik.jar=lib/batik.jar
+file.reference.avalon-framework-4.2.0.jar-1=../SIPRPSoft/lib/avalon-framework-4.2.0.jar
+file.reference.batik-all-1.7.jar=../SIPRPSoft/lib/batik-all-1.7.jar
 file.reference.cayenne-server-3.0M2.jar=../common/lib/cayenne-server-3.0M2.jar
 file.reference.common-src=../common/src
 file.reference.commons-collections-3.1.jar=../common/lib/commons-collections-3.1.jar
+file.reference.commons-io-1.4.jar=../SIPRPSoft/lib/commons-io-1.4.jar
 file.reference.commons-lang-2.1.jar=../common/lib/commons-lang-2.1.jar
+file.reference.commons-logging-1.0.4.jar=../SIPRPSoft/lib/commons-logging-1.0.4.jar
 file.reference.commons-logging-1.1.jar=../common/lib/commons-logging-1.1.jar
 file.reference.evolute.jar=../common/lib/evolute.jar
-file.reference.evolute.jar-1=jars/evolute.jar
-file.reference.fop.jar=lib/fop.jar
+file.reference.fop.jar=../SIPRPSoft/lib/fop.jar
 file.reference.jai_imageio.jar=lib/jai_imageio.jar
 file.reference.jcalendar-1.3.2.jar=../common/lib/jcalendar-1.3.2.jar
 file.reference.jdom.jar=lib/jdom.jar
@@ -43,6 +45,7 @@ file.reference.postgresql-8.1-407.jdbc3.jar=jars/postgresql-8.1-407.jdbc3.jar
 file.reference.postgresql-8.2-506.jdbc4.jar=jars/postgresql-8.2-506.jdbc4.jar
 file.reference.SIPRP.jar=lib/SIPRP.jar
 file.reference.TableLayout.jar=../common/lib/TableLayout.jar
+file.reference.xmlgraphics-commons-1.3.1.jar=../SIPRPSoft/lib/xmlgraphics-commons-1.3.1.jar
 includes=**
 j2ee.deploy.on.save=false
 j2ee.platform=1.5
@@ -71,11 +74,14 @@ javac.classpath=\
     ${file.reference.ashwood-1.1.jar}:\
     ${file.reference.SIPRP.jar}:\
     ${file.reference.jdom.jar}:\
-    ${file.reference.fop.jar}:\
     ${file.reference.avalon-framework-4.2.0.jar}:\
-    ${file.reference.batik.jar}:\
+    ${file.reference.fop.jar}:\
     ${file.reference.jai_imageio.jar}:\
-    ${file.reference.evolute.jar-1}
+    ${file.reference.xmlgraphics-commons-1.3.1.jar}:\
+    ${file.reference.avalon-framework-4.2.0.jar-1}:\
+    ${file.reference.batik-all-1.7.jar}:\
+    ${file.reference.commons-io-1.4.jar}:\
+    ${file.reference.commons-logging-1.0.4.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 31e06595..22827dbe 100644
--- a/trunk/PlanosActuacao/nbproject/project.xml
+++ b/trunk/PlanosActuacao/nbproject/project.xml
@@ -95,24 +95,36 @@
                     <file>${file.reference.jdom.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library>
+                    <file>${file.reference.avalon-framework-4.2.0.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
                 <library>
                     <file>${file.reference.fop.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
-                    <file>${file.reference.avalon-framework-4.2.0.jar}</file>
+                    <file>${file.reference.jai_imageio.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
-                    <file>${file.reference.batik.jar}</file>
+                    <file>${file.reference.xmlgraphics-commons-1.3.1.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
-                    <file>${file.reference.jai_imageio.jar}</file>
+                    <file>${file.reference.avalon-framework-4.2.0.jar-1}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.batik-all-1.7.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.commons-io-1.4.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
-                    <file>${file.reference.evolute.jar-1}</file>
+                    <file>${file.reference.commons-logging-1.0.4.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
             </web-module-libraries>
diff --git a/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java b/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java
index 5fa83e3a..561e7d3f 100644
--- a/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java
+++ b/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java
@@ -9,7 +9,6 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import javax.faces.context.FacesContext;
 
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
@@ -20,9 +19,7 @@ import org.apache.cayenne.map.DataMap;
 
 import com.evolute.utils.Singleton;
 
-import planosactuacao.ApplicationBean1;
 import siprp.SingletonConstants;
-import utils.JSFUtils;
 
 /**
  *
@@ -47,7 +44,7 @@ public class DblocalRelatorios {
 
         DataDomain domain = DefaultConfiguration.getSharedConfiguration().getDomain();
 		DataMap map = domain.getMap( "SIPRPMap" );
-		DriverDataSource dataSource = new DriverDataSource((String) Singleton.getInstance( SingletonConstants.LOCAL_DRIVER_NAME ), url, user, password );
+		DriverDataSource dataSource = new DriverDataSource((String) Singleton.getInstance( SingletonConstants.LOCAL_DRIVER_NAME ), connectionURL, User, Pass );
 		DataNode node = new DataNode("SIPRPNode");
 		node.setDataSource( dataSource );
 		node.setAdapter( new AutoAdapter(dataSource) );
diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
index ce920b18..5e6e7500 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
+++ b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
@@ -311,7 +311,7 @@ public class ListaPlanos extends AbstractPageBean {
         PlanoActuacaoPDFCreator pdfCreator = new PlanoActuacaoPDFCreator();
         try
         {
-            byte[] pdf = pdfCreator.createPDF(p.getId()); 
+            byte[] pdf = pdfCreator.createPDF(p.getId(), true);
             showPdf(pdf);
         }
         catch(Exception ex)
@@ -329,7 +329,7 @@ public class ListaPlanos extends AbstractPageBean {
         PlanoActuacaoPDFCreator pdfCreator = new PlanoActuacaoPDFCreator();
         try
         {
-            byte[] pdf = pdfCreator.createPDF(p.getId()); 
+            byte[] pdf = pdfCreator.createPDF(p.getId(), true);
             showPdf(pdf);
         }
         catch(Exception ex)
@@ -347,7 +347,7 @@ public class ListaPlanos extends AbstractPageBean {
         PlanoActuacaoPDFCreator pdfCreator = new PlanoActuacaoPDFCreator();
         try
         {
-            byte[] pdf = pdfCreator.createPDF(p.getId()); 
+            byte[] pdf = pdfCreator.createPDF(p.getId(), true);
             showPdf(pdf);
         }
         catch(Exception ex)