diff --git a/trunk/PlanosActuacao/lib/SIPRP.jar b/trunk/PlanosActuacao/lib/SIPRP.jar
deleted file mode 100644
index 6d4f7d1f..00000000
Binary files a/trunk/PlanosActuacao/lib/SIPRP.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/nbproject/build-impl.xml b/trunk/PlanosActuacao/nbproject/build-impl.xml
index 0ea6c504..b1211290 100644
--- a/trunk/PlanosActuacao/nbproject/build-impl.xml
+++ b/trunk/PlanosActuacao/nbproject/build-impl.xml
@@ -531,9 +531,9 @@ exists or setup the property manually. For example like this:
-
+
@@ -548,7 +548,7 @@ exists or setup the property manually. For example like this:
-
+
@@ -567,9 +567,9 @@ exists or setup the property manually. For example like this:
-
+
diff --git a/trunk/PlanosActuacao/nbproject/genfiles.properties b/trunk/PlanosActuacao/nbproject/genfiles.properties
index 3c0c13e7..99c5587e 100644
--- a/trunk/PlanosActuacao/nbproject/genfiles.properties
+++ b/trunk/PlanosActuacao/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=7ab0589b
+build.xml.data.CRC32=52281a81
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=7ab0589b
-nbproject/build-impl.xml.script.CRC32=a142f504
+nbproject/build-impl.xml.data.CRC32=52281a81
+nbproject/build-impl.xml.script.CRC32=8db4e609
nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1
diff --git a/trunk/PlanosActuacao/nbproject/project.properties b/trunk/PlanosActuacao/nbproject/project.properties
index 17dfd895..7ac0acd2 100644
--- a/trunk/PlanosActuacao/nbproject/project.properties
+++ b/trunk/PlanosActuacao/nbproject/project.properties
@@ -67,9 +67,9 @@ javac.classpath=\
${file.reference.evologger.jar}:\
${file.reference.batik-all-1.7.jar}:\
${file.reference.xmlgraphics-commons-1.3.1.jar}:\
- ${file.reference.SIPRP.jar}:\
${file.reference.commons-io-1.4.jar}:\
${file.reference.commons-collections-3.1.jar}:\
+ ${file.reference.SIPRP.jar}:\
${file.reference.commons-lang-2.1.jar}:\
${file.reference.commons-logging-1.1.jar}:\
${file.reference.evolute.jar}:\
diff --git a/trunk/PlanosActuacao/nbproject/project.xml b/trunk/PlanosActuacao/nbproject/project.xml
index 1113ab50..3c407c73 100644
--- a/trunk/PlanosActuacao/nbproject/project.xml
+++ b/trunk/PlanosActuacao/nbproject/project.xml
@@ -68,15 +68,15 @@
WEB-INF/lib
- ${file.reference.SIPRP.jar}
+ ${file.reference.commons-io-1.4.jar}
WEB-INF/lib
- ${file.reference.commons-io-1.4.jar}
+ ${file.reference.commons-collections-3.1.jar}
WEB-INF/lib
- ${file.reference.commons-collections-3.1.jar}
+ ${file.reference.SIPRP.jar}
WEB-INF/lib
diff --git a/trunk/PlanosActuacao/src/java/db/Db.java b/trunk/PlanosActuacao/src/java/db/Db.java
index d2d34a60..9ea4277c 100644
--- a/trunk/PlanosActuacao/src/java/db/Db.java
+++ b/trunk/PlanosActuacao/src/java/db/Db.java
@@ -17,8 +17,9 @@ import javax.servlet.http.HttpSession;
*
* @author lluis
*/
-public class Db {
-// String connectionURL = "jdbc:postgresql://evoserver:5432/siprp_20100629"; //testes
+public class Db
+{
+// String connectionURL = "jdbc:postgresql://evoserver:5432/siprp_20100813"; //testes
// String connectionURL = "jdbc:postgresql://www.evolute.pt:5436/siprp"; //real
String connectionURL = "jdbc:postgresql://localhost:5436/siprp"; //real
diff --git a/trunk/PlanosActuacao/src/java/db/DbRelatorios.java b/trunk/PlanosActuacao/src/java/db/DbRelatorios.java
index 696dc2d5..06b71334 100644
--- a/trunk/PlanosActuacao/src/java/db/DbRelatorios.java
+++ b/trunk/PlanosActuacao/src/java/db/DbRelatorios.java
@@ -15,8 +15,9 @@ import java.sql.Statement;
*
* @author lluis
*/
-public class DbRelatorios {
-// String connectionURL = "jdbc:postgresql://evoserver:5432/siprp_20100629"; //testes
+public class DbRelatorios
+{
+// String connectionURL = "jdbc:postgresql://evoserver:5432/siprp_20100813"; //testes
String connectionURL = "jdbc:postgresql://localhost:5436/siprp"; //real
diff --git a/trunk/PlanosActuacao/src/java/db/Dblocal.java b/trunk/PlanosActuacao/src/java/db/Dblocal.java
index 1c9e3003..0b84ead0 100644
--- a/trunk/PlanosActuacao/src/java/db/Dblocal.java
+++ b/trunk/PlanosActuacao/src/java/db/Dblocal.java
@@ -22,10 +22,11 @@ import javax.servlet.http.HttpSession;
*
* @author lluis
*/
-public class Dblocal {
+public class Dblocal
+{
// String server = "evoserver";
// String port = "5432";
-// String database = "siprp_local_3_20100713";
+// String database = "siprp_local_3_20100813";
String User = "postgres";
String Pass = null;
diff --git a/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java b/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java
index 2b85090d..8dd120db 100644
--- a/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java
+++ b/trunk/PlanosActuacao/src/java/db/DblocalRelatorios.java
@@ -19,7 +19,7 @@ import com.evolute.utils.error.ErrorLogger;
*/
public class DblocalRelatorios
{
-// String connectionURL = "jdbc:postgresql://evoserver/siprp_local_3_20100713"; //testes local_3
+// String connectionURL = "jdbc:postgresql://evoserver/siprp_local_3_20100813"; //testes local_3
String connectionURL = "jdbc:postgresql://localhost:5436/siprp_local_3";
diff --git a/trunk/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java b/trunk/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java
index 0c867494..26c7ea1d 100644
--- a/trunk/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java
+++ b/trunk/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java
@@ -94,7 +94,7 @@ public class MainPhaseListener implements PhaseListener{
System.out.println( "SESSION VALID : " + req.isRequestedSessionIdValid() );
//if(!req.isRequestedSessionIdValid() && view.getViewId().indexOf("Login") == -1 ){
- if ( ! req.isRequestedSessionIdValid() && referer.indexOf( "AnaliseAcidentes" ) == -1 )
+ if ( ! req.isRequestedSessionIdValid() && referer != null && referer.indexOf( "AnaliseAcidentes" ) == -1 )
{
System.out.println( "VIEW ID :" + view.getViewId() );
//NavigationHandler nh = fc.getApplication().getNavigationHandler();
@@ -145,7 +145,7 @@ public class MainPhaseListener implements PhaseListener{
}
catch ( Exception ex )
{
- session.setMsg( "Utilizador inválido." );
+// session.setMsg( "Utilizador inválido." );
// try
// {
// JSFUtils.redirect( fc, Global.PLANOS_ACTUACAO_URL + "Erro.jsp" );
diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
index f0edb61b..63a6cda3 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
+++ b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
@@ -591,7 +591,9 @@ public class ListaPlanos extends AbstractPageBean {
PlanoActuacaoPDFCreator pdfCreator = new PlanoActuacaoPDFCreator();
try
{
+ System.out.println( "CREATING PDF ..." );
byte[] pdf = pdfCreator.createPDF( pID, true );
+ System.out.println( ".. DONE !" );
showPdf( pdf );
}
catch(Exception ex)