diff --git a/trunk/PlanosActuacao/nbproject/build-impl.xml b/trunk/PlanosActuacao/nbproject/build-impl.xml
index 511cbbcd..917911ee 100644
--- a/trunk/PlanosActuacao/nbproject/build-impl.xml
+++ b/trunk/PlanosActuacao/nbproject/build-impl.xml
@@ -532,10 +532,16 @@ exists or setup the property manually. For example like this:
         <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="${file.reference.appbase.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.appbase.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.dataprovider.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.dataprovider.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.jsf-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jsf-api.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.jsf-impl.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jsf-impl.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.webui.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.webui.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.servlet-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.servlet-api.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.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} "/>
+            <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.file.reference.appbase.jar} ${manifest.file.reference.dataprovider.jar} ${manifest.file.reference.jsf-api.jar} ${manifest.file.reference.jsf-impl.jar} ${manifest.file.reference.webui.jar} ${manifest.file.reference.servlet-api.jar} "/>
         </manifest>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
@@ -569,6 +575,12 @@ exists or setup the property manually. For example like this:
         <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="${file.reference.appbase.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.dataprovider.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jsf-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jsf-impl.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.webui.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.servlet-api.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 c23198c7..e8206d8f 100644
--- a/trunk/PlanosActuacao/nbproject/genfiles.properties
+++ b/trunk/PlanosActuacao/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d6fcc03c
+build.xml.data.CRC32=56cd2335
 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=d6fcc03c
-nbproject/build-impl.xml.script.CRC32=abe897d8
+nbproject/build-impl.xml.data.CRC32=56cd2335
+nbproject/build-impl.xml.script.CRC32=feaf8777
 nbproject/build-impl.xml.stylesheet.CRC32=174458fc
diff --git a/trunk/PlanosActuacao/nbproject/private/private.properties b/trunk/PlanosActuacao/nbproject/private/private.properties
index 702a7e1c..6a755a8d 100644
--- a/trunk/PlanosActuacao/nbproject/private/private.properties
+++ b/trunk/PlanosActuacao/nbproject/private/private.properties
@@ -1,7 +1,11 @@
-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
+deploy.ant.properties.file=/home/tsimao/.netbeans/6.5/tomcat60.properties
+j2ee.platform.classpath=/home/tsimao/apache-tomcat-6.0.13/lib/tomcat-dbcp.jar:/home/tsimao/apache-tomcat-6.0.13/lib/servlet-api.jar:/home/tsimao/apache-tomcat-6.0.13/lib/annotations-api.jar:/home/tsimao/apache-tomcat-6.0.13/lib/tomcat-i18n-fr.jar:/home/tsimao/apache-tomcat-6.0.13/lib/jasper.jar:/home/tsimao/apache-tomcat-6.0.13/lib/tomcat-i18n-es.jar:/home/tsimao/apache-tomcat-6.0.13/lib/catalina.jar:/home/tsimao/apache-tomcat-6.0.13/lib/jasper-el.jar:/home/tsimao/apache-tomcat-6.0.13/lib/catalina-ha.jar:/home/tsimao/apache-tomcat-6.0.13/lib/commons-collections-3.1.jar:/home/tsimao/apache-tomcat-6.0.13/lib/tomcat-i18n-ja.jar:/home/tsimao/apache-tomcat-6.0.13/lib/el-api.jar:/home/tsimao/apache-tomcat-6.0.13/lib/catalina-ant.jar:/home/tsimao/apache-tomcat-6.0.13/lib/jsp-api.jar:/home/tsimao/apache-tomcat-6.0.13/lib/tomcat-coyote.jar:/home/tsimao/apache-tomcat-6.0.13/lib/catalina-tribes.jar:/home/tsimao/apache-tomcat-6.0.13/bin/tomcat-juli.jar:/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-rt.jar:/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-extra-api.jar:/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-extra.jar:/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-tools.jar
+j2ee.platform.jwsdp.classpath=/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-rt.jar:/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-tools.jar
+j2ee.platform.wsgen.classpath=/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-rt.jar:/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-tools.jar
+j2ee.platform.wsimport.classpath=/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-rt.jar:/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-tools.jar
+j2ee.platform.wsit.classpath=/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-rt.jar:/home/tsimao/apache-tomcat-6.0.13/shared/lib/webservices-tools.jar
+j2ee.server.instance=tomcat60:home=/home/tsimao/apache-tomcat-6.0.13
 javac.debug=true
 javadoc.preview=true
-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
+jaxws.endorsed.dir=/home/tsimao/.netbeans/6.5/modules/ext/jaxws21/api:/home/tsimao/.netbeans/6.5/modules/ext/jaxb/api
+user.properties.file=/home/tsimao/.netbeans/6.5/build.properties
diff --git a/trunk/PlanosActuacao/nbproject/project.properties b/trunk/PlanosActuacao/nbproject/project.properties
index 6a898b15..2431abd1 100644
--- a/trunk/PlanosActuacao/nbproject/project.properties
+++ b/trunk/PlanosActuacao/nbproject/project.properties
@@ -21,6 +21,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
 excludes=
 file.reference.activation.jar=jars/activation.jar
+file.reference.appbase.jar=../lib.netbeans/appbase.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.avalon-framework-4.2.0.jar-1=../SIPRPSoft/lib/avalon-framework-4.2.0.jar
@@ -32,19 +33,24 @@ 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.dataprovider.jar=../lib.netbeans/dataprovider.jar
 file.reference.evolute.jar=../common/lib/evolute.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
+file.reference.jsf-api.jar=../lib.netbeans/jsf-api.jar
+file.reference.jsf-impl.jar=../lib.netbeans/jsf-impl.jar
 file.reference.log4j-1.2.8.jar=../common/lib/log4j-1.2.8.jar
 file.reference.mail.jar=jars/mail.jar
 file.reference.mail.jar-1=../common/lib/mail.jar
 file.reference.postgresql-8.0-315.jdbc3.jar=jars/postgresql-8.0-315.jdbc3.jar
 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.servlet-api.jar=../lib.tools/servlet-api.jar
 file.reference.SIPRP.jar=lib/SIPRP.jar
 file.reference.TableLayout.jar=../common/lib/TableLayout.jar
+file.reference.webui.jar=../lib.netbeans/webui.jar
 file.reference.xmlgraphics-commons-1.3.1.jar=../SIPRPSoft/lib/xmlgraphics-commons-1.3.1.jar
 includes=**
 j2ee.deploy.on.save=false
@@ -81,7 +87,13 @@ javac.classpath=\
     ${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}
+    ${file.reference.commons-logging-1.0.4.jar}:\
+    ${file.reference.appbase.jar}:\
+    ${file.reference.dataprovider.jar}:\
+    ${file.reference.jsf-api.jar}:\
+    ${file.reference.jsf-impl.jar}:\
+    ${file.reference.webui.jar}:\
+    ${file.reference.servlet-api.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 22827dbe..59689626 100644
--- a/trunk/PlanosActuacao/nbproject/project.xml
+++ b/trunk/PlanosActuacao/nbproject/project.xml
@@ -127,6 +127,30 @@
                     <file>${file.reference.commons-logging-1.0.4.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library>
+                    <file>${file.reference.appbase.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.dataprovider.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.jsf-api.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.jsf-impl.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.webui.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.servlet-api.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries>
                 <library>
diff --git a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java
index 020578eb..384678d0 100644
--- a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java
+++ b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java
@@ -95,16 +95,23 @@ public class CreatePlanosDataProvider {
     public List<Integer> getEstabelecimentosWithPlanos()
     {
     	List<Integer> result = new ArrayList<Integer>();
-    	Statement st = createStatement();
-        String sql = "select estabelecimento_id from planos_actuacao where deleted_date is not null;";
-        ResultSet rs = st.executeQuery(sql);
-        if(rs.isBeforeFirst())
+        try
         {
-            rs.first();
-            do
+            Statement st = createStatement();
+            String sql = "select estabelecimento_id from planos_actuacao where deleted_date is not null;";
+            ResultSet rs = st.executeQuery(sql);
+            if(rs.isBeforeFirst())
             {
-                result.add( rs.getInt("estabelecimento_id") );
-            }while(rs.next());
+                rs.first();
+                do
+                {
+                    result.add( rs.getInt("estabelecimento_id") );
+                }while(rs.next());
+            }
+        }
+        catch( Exception e )
+        {
+            e.printStackTrace();
         }
     	return result;
     }
diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java
index 4985a326..decb1d4c 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java
+++ b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java
@@ -59,9 +59,9 @@ public class PlanosActuacao {
 //            
 //            List<Date> planosOnlineList = getPlanosOnline(null);
 //            System.out.println("PLANOS ONLINE LIST : " + planosOnlineList.size());
-            List<HsRelatorio> listRelatorios = initRelatorios(null,null);
-            System.out.println("LIST RELATORIOS : " + listRelatorios.size());
-            putPlanosOnline(listRelatorios);
+            initRelatorios(null,null);
+//            System.out.println("LIST RELATORIOS : " + listRelatorios.size());
+//            putPlanosOnline(listRelatorios);
         }
         catch(Exception ex)
         {
@@ -80,7 +80,7 @@ public class PlanosActuacao {
             }
             List<Date> planosOnlineList = getPlanosOnline(estabelecimentoId);
             System.out.println("PLANOS ONLINE LIST : " + planosOnlineList.size());
-            List<HsRelatorio> listRelatorios = initRelatorios(planosOnlineList, estabelecimentoId);
+            initRelatorios(planosOnlineList, estabelecimentoId);
         }
         catch(Exception ex)
         {
@@ -112,7 +112,14 @@ public class PlanosActuacao {
     		List<Integer> estabelecimentos = cpdp.getEstabelecimentosWithPlanos();
     		for( Integer estabelecimentoID : estabelecimentos )
     		{
-    			putPlanosOnline(pa.getRelatoriosNotIn(cpdp.getPlanosOnline(estabelecimentoID), estabelecimentoID));
+                try
+                {
+                    putPlanosOnline(pa.getRelatoriosNotIn(cpdp.getPlanosOnline(estabelecimentoID), estabelecimentoID));
+                }
+                catch(Exception e )
+                {
+                    e.printStackTrace();
+                }
     		}
     	}
     	else