diff --git a/trunk/AnaliseAcidentesTrabalho/build.xml b/trunk/AnaliseAcidentesTrabalho/build.xml
index eb87f66d..877e9124 100644
--- a/trunk/AnaliseAcidentesTrabalho/build.xml
+++ b/trunk/AnaliseAcidentesTrabalho/build.xml
@@ -2,6 +2,11 @@
 <!-- You may freely edit this file. See commented blocks below for -->
 <!-- some examples of how to customize the build. -->
 <!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
 <project name="AnaliseAcidentesTrabalho" default="default" basedir=".">
     <description>Builds, tests, and runs the project AnaliseAcidentesTrabalho.</description>
     <import file="nbproject/build-impl.xml"/>
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml b/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml
index 780cccbc..06777b36 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml
@@ -76,21 +76,12 @@
         <condition property="do.compile.jsps">
             <istrue value="${compile.jsps}"/>
         </condition>
-        <condition property="enable.jsdebugger">
-            <and>
-                <isset property="debug.client.available"/>
-                <istrue value="${debug.client.available}"/>
-            </and>
-        </condition>
         <condition property="do.debug.server">
             <or>
                 <not>
                     <isset property="debug.server"/>
                 </not>
                 <istrue value="${debug.server}"/>
-                <not>
-                    <isset property="enable.jsdebugger"/>
-                </not>
                 <and>
                     <not>
                         <istrue value="${debug.server}"/>
@@ -102,10 +93,7 @@
             </or>
         </condition>
         <condition property="do.debug.client">
-            <and>
-                <istrue value="${debug.client}"/>
-                <isset property="enable.jsdebugger"/>
-            </and>
+            <istrue value="${debug.client}"/>
         </condition>
         <condition property="do.display.browser">
             <istrue value="${display.browser}"/>
@@ -119,7 +107,7 @@
             </and>
         </condition>
         <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
-        <available file="${conf.dir}/persistence.xml" property="has.persistence.xml"/>
+        <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
         <condition property="do.war.package.with.custom.manifest">
             <isset property="has.custom.manifest"/>
         </condition>
@@ -161,12 +149,20 @@
             </and>
         </condition>
         <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
         <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
             <and>
                 <isset property="jaxws.endorsed.dir"/>
                 <available file="nbproject/jaxws-build.xml"/>
             </and>
         </condition>
+        <property name="runmain.jvmargs" value=""/>
+    </target>
+    <target depends="init" name="-init-cos" unless="deploy.on.save">
+        <condition property="deploy.on.save" value="true">
+            <istrue value="${j2ee.deploy.on.save}"/>
+        </condition>
     </target>
     <target name="-post-init">
         <!-- Empty placeholder for easier customization. -->
@@ -207,10 +203,12 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
             <attribute default="${javac.debug}" name="debug"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" includeantruntime="false" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -222,11 +220,15 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     </target>
     <target name="-init-macrodef-junit">
         <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
-            <attribute default="**/*Test.java" name="includes"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
             <sequential>
                 <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
                     <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" includes="@{includes}"/>
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
                     </batchtest>
                     <classpath>
                         <path path="${run.test.classpath}:${j2ee.platform.classpath}"/>
@@ -237,6 +239,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
                     </syspropertyset>
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
+                    <jvmarg line="${runmain.jvmargs}"/>
                 </junit>
             </sequential>
         </macrodef>
@@ -260,7 +263,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
             </sequential>
         </macrodef>
     </target>
-    <target if="enable.jsdebugger" name="-init-macrodef-nbjsdebug">
+    <target name="-init-macrodef-nbjsdebug">
         <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
             <attribute default="${client.url}" name="webUrl"/>
             <sequential>
@@ -268,12 +271,12 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-nbjpda">
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
             <attribute default="${main.class}" name="name"/>
             <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
             <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="dt_socket">
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -309,6 +312,12 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
         <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
             <istrue value="${have-jdk-older-than-1.4}"/>
         </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
     </target>
     <target depends="-init-debug-args" name="-init-macrodef-debug">
         <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
@@ -319,7 +328,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
             <sequential>
                 <java classname="@{classname}" fork="true">
                     <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
                     <jvmarg line="${runmain.jvmargs}"/>
                     <classpath>
                         <path path="@{classpath}"/>
@@ -334,38 +343,20 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-copy-ear-war">
-        <macrodef name="copy-ear-war">
-            <attribute name="file"/>
-            <attribute name="propname"/>
-            <sequential>
-                <basename file="@{file}" property="base_@{propname}"/>
-                <zipfileset id="tld.files_@{propname}" includes="META-INF/*.tld META-INF/tlds/*.tld" src="@{file}"/>
-                <pathconvert property="tld.files.path_@{propname}" refid="tld.files_@{propname}"/>
-                <condition property="hastlds_@{propname}" value="yes">
-                    <contains casesensitive="false" string="${tld.files.path_@{propname}}" substring=".tld"/>
-                </condition>
-                <condition property="copy.to.dir_@{propname}" value="${build.web.dir}/WEB-INF/lib">
-                    <isset property="hastlds_@{propname}"/>
-                </condition>
-                <condition property="copy.to.dir_@{propname}" value="${dist.ear.dir}">
-                    <not>
-                        <isset property="hastlds_@{propname}"/>
-                    </not>
-                </condition>
-                <copy file="@{file}" todir="${copy.to.dir_@{propname}}"/>
-                <condition property="@{propname}" value="${base_@{propname}}">
-                    <not>
-                        <isset property="hastlds_@{propname}"/>
-                    </not>
-                </condition>
-                <condition property="@{propname}" value="">
-                    <isset property="hastlds_@{propname}"/>
-                </condition>
-            </sequential>
-        </macrodef>
+    <target name="-init-taskdefs">
+        <fail unless="libs.CopyLibs.classpath">
+The libs.CopyLibs.classpath property is not set up.
+This property must point to 
+org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
+of NetBeans IDE installation and is usually located at 
+&lt;netbeans_installation&gt;/java&lt;version&gt;/ant/extra folder.
+Either open the project in the IDE and make sure CopyLibs library
+exists or setup the property manually. For example like this:
+ ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar
+                </fail>
+        <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-macrodef-copy-ear-war" name="init"/>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs" name="init"/>
     <!--
                 COMPILATION SECTION
             -->
@@ -381,7 +372,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     </target>
     <target name="-copy-webdir">
         <copy todir="${build.web.dir}">
-            <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes}"/>
+            <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
         </copy>
         <copy todir="${build.web.dir}/WEB-INF">
             <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
@@ -391,7 +382,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest,-do-ws-compile" if="have.sources" name="-do-compile">
         <webproject2:javac destdir="${build.classes.dir}"/>
         <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target if="has.custom.manifest" name="-copy-manifest">
@@ -403,7 +394,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     <target if="has.persistence.xml" name="-copy-persistence-xml">
         <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
         <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
-            <fileset dir="${conf.dir}" includes="persistence.xml"/>
+            <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
         </copy>
     </target>
     <target name="-post-compile">
@@ -417,13 +408,9 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     </target>
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <webproject2:javac>
-            <customize>
-                <patternset includes="${javac.includes}"/>
-            </customize>
-        </webproject2:javac>
+        <webproject2:javac excludes="" includes="${javac.includes}"/>
         <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-single">
@@ -441,7 +428,8 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
             <arg value="-die1"/>
             <arg value="-compilerSourceVM ${javac.source}"/>
             <arg value="-compilerTargetVM ${javac.target}"/>
-            <classpath path="${java.home}/../lib/tools.jar:${copyfiles.classpath}:${jspcompilation.classpath}"/>
+            <arg value="-javaEncoding ${source.encoding}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
         </java>
         <mkdir dir="${build.generated.dir}/classes"/>
         <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
@@ -459,7 +447,8 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
             <arg path="${jsp.includes}"/>
             <arg value="-compilerSourceVM ${javac.source}"/>
             <arg value="-compilerTargetVM ${javac.target}"/>
-            <classpath path="${java.home}/../lib/tools.jar:${copyfiles.classpath}:${jspcompilation.classpath}"/>
+            <arg value="-javaEncoding ${source.encoding}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
         </java>
         <mkdir dir="${build.generated.dir}/classes"/>
         <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
@@ -509,113 +498,58 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
-        <basename file="${libs.jsf-designtime.classpath.libfile.2}" property="included.lib.libs.jsf-designtime.classpath.2"/>
-        <basename file="${libs.jsf-designtime.classpath.libfile.1}" property="included.lib.libs.jsf-designtime.classpath.1"/>
-        <copy-ear-war file="${libs.jsf-designtime.classpath.libfile.2}" propname="included.lib.libs.jsf-designtime.classpath.2.X"/>
-        <copy-ear-war file="${libs.jsf-designtime.classpath.libfile.1}" propname="included.lib.libs.jsf-designtime.classpath.1.X"/>
-        <basename file="${libs.jsfsupport-designtime.classpath.libfile.4}" property="included.lib.libs.jsfsupport-designtime.classpath.4"/>
-        <basename file="${libs.jsfsupport-designtime.classpath.libfile.3}" property="included.lib.libs.jsfsupport-designtime.classpath.3"/>
-        <basename file="${libs.jsfsupport-designtime.classpath.libfile.2}" property="included.lib.libs.jsfsupport-designtime.classpath.2"/>
-        <basename file="${libs.jsfsupport-designtime.classpath.libfile.1}" property="included.lib.libs.jsfsupport-designtime.classpath.1"/>
-        <copy-ear-war file="${libs.jsfsupport-designtime.classpath.libfile.4}" propname="included.lib.libs.jsfsupport-designtime.classpath.4.X"/>
-        <copy-ear-war file="${libs.jsfsupport-designtime.classpath.libfile.3}" propname="included.lib.libs.jsfsupport-designtime.classpath.3.X"/>
-        <copy-ear-war file="${libs.jsfsupport-designtime.classpath.libfile.2}" propname="included.lib.libs.jsfsupport-designtime.classpath.2.X"/>
-        <copy-ear-war file="${libs.jsfsupport-designtime.classpath.libfile.1}" propname="included.lib.libs.jsfsupport-designtime.classpath.1.X"/>
-        <basename file="${libs.webui-designtime.classpath.libfile.2}" property="included.lib.libs.webui-designtime.classpath.2"/>
-        <basename file="${libs.webui-designtime.classpath.libfile.1}" property="included.lib.libs.webui-designtime.classpath.1"/>
-        <copy-ear-war file="${libs.webui-designtime.classpath.libfile.2}" propname="included.lib.libs.webui-designtime.classpath.2.X"/>
-        <copy-ear-war file="${libs.webui-designtime.classpath.libfile.1}" propname="included.lib.libs.webui-designtime.classpath.1.X"/>
-        <basename file="${libs.jdbcsupport-designtime.classpath}" property="included.lib.libs.jdbcsupport-designtime.classpath"/>
-        <copy-ear-war file="${libs.jdbcsupport-designtime.classpath}" propname="included.lib.libs.jdbcsupport-designtime.classpath.X"/>
-        <basename file="${libs.theme-default.classpath}" property="included.lib.libs.theme-default.classpath"/>
-        <copy-ear-war file="${libs.theme-default.classpath}" propname="included.lib.libs.theme-default.classpath.X"/>
-        <basename file="${libs.jstl11.classpath.libfile.2}" property="included.lib.libs.jstl11.classpath.2"/>
-        <basename file="${libs.jstl11.classpath.libfile.1}" property="included.lib.libs.jstl11.classpath.1"/>
-        <copy-ear-war file="${libs.jstl11.classpath.libfile.2}" propname="included.lib.libs.jstl11.classpath.2.X"/>
-        <copy-ear-war file="${libs.jstl11.classpath.libfile.1}" propname="included.lib.libs.jstl11.classpath.1.X"/>
-        <basename file="${file.reference.activation.jar}" property="included.lib.file.reference.activation.jar"/>
-        <copy-ear-war file="${file.reference.activation.jar}" propname="included.lib.file.reference.activation.jar.X"/>
-        <basename file="${file.reference.mail.jar}" property="included.lib.file.reference.mail.jar"/>
-        <copy-ear-war file="${file.reference.mail.jar}" propname="included.lib.file.reference.mail.jar.X"/>
-        <basename file="${file.reference.postgresql-8.2-506.jdbc4.jar}" property="included.lib.file.reference.postgresql-8.2-506.jdbc4.jar"/>
-        <copy-ear-war file="${file.reference.postgresql-8.2-506.jdbc4.jar}" propname="included.lib.file.reference.postgresql-8.2-506.jdbc4.jar.X"/>
-        <basename file="${libs.rowset-ri.classpath}" property="included.lib.libs.rowset-ri.classpath"/>
-        <copy-ear-war file="${libs.rowset-ri.classpath}" propname="included.lib.libs.rowset-ri.classpath.X"/>
-        <basename file="${file.reference.iText-2.0.8.jar}" property="included.lib.file.reference.iText-2.0.8.jar"/>
-        <copy-ear-war file="${file.reference.iText-2.0.8.jar}" propname="included.lib.file.reference.iText-2.0.8.jar.X"/>
-        <basename file="${file.reference.evolute.jar}" property="included.lib.file.reference.evolute.jar"/>
-        <copy-ear-war file="${file.reference.evolute.jar}" propname="included.lib.file.reference.evolute.jar.X"/>
-        <basename file="${file.reference.fop.jar}" property="included.lib.file.reference.fop.jar"/>
-        <copy-ear-war file="${file.reference.fop.jar}" propname="included.lib.file.reference.fop.jar.X"/>
-        <basename file="${file.reference.jdom.jar}" property="included.lib.file.reference.jdom.jar"/>
-        <copy-ear-war file="${file.reference.jdom.jar}" propname="included.lib.file.reference.jdom.jar.X"/>
-        <basename file="${file.reference.avalon-framework-4.2.0.jar}" property="included.lib.file.reference.avalon-framework-4.2.0.jar"/>
-        <copy-ear-war file="${file.reference.avalon-framework-4.2.0.jar}" propname="included.lib.file.reference.avalon-framework-4.2.0.jar.X"/>
-        <basename file="${file.reference.batik.jar}" property="included.lib.file.reference.batik.jar"/>
-        <copy-ear-war file="${file.reference.batik.jar}" propname="included.lib.file.reference.batik.jar.X"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.6}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.5}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.4}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.3}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.4}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.3}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.webui-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.webui-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jdbcsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.theme-default.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.jsf-designtime.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.jsf-designtime.classpath" todir="${dist.ear.dir}"/>
+        <copyfiles files="${libs.jsfsupport-designtime.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.jsfsupport-designtime.classpath" todir="${dist.ear.dir}"/>
+        <copyfiles files="${libs.webui-designtime.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.webui-designtime.classpath" todir="${dist.ear.dir}"/>
+        <copyfiles files="${libs.jdbcsupport-designtime.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.jdbcsupport-designtime.classpath" todir="${dist.ear.dir}"/>
+        <copyfiles files="${libs.theme-default.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.theme-default.classpath" todir="${dist.ear.dir}"/>
+        <copyfiles files="${libs.jstl11.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.jstl11.classpath" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.activation.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.activation.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.mail.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.mail.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.postgresql-8.2-506.jdbc4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.postgresql-8.2-506.jdbc4.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${libs.rowset-ri.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.rowset-ri.classpath" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.iText-2.0.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.iText-2.0.8.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.evolute.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.evolute.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.jdom.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jdom.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="${libs.jsf-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.jsfsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.webui-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.jdbcsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.theme-default.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.jstl11.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="${included.lib.libs.jsf-designtime.classpath.1.X} ${included.lib.libs.jsf-designtime.classpath.2.X} ${included.lib.libs.jsfsupport-designtime.classpath.1.X} ${included.lib.libs.jsfsupport-designtime.classpath.2.X} ${included.lib.libs.jsfsupport-designtime.classpath.3.X} ${included.lib.libs.jsfsupport-designtime.classpath.4.X} ${included.lib.libs.webui-designtime.classpath.1.X} ${included.lib.libs.webui-designtime.classpath.2.X} ${included.lib.libs.jdbcsupport-designtime.classpath} ${included.lib.libs.theme-default.classpath} ${included.lib.libs.jstl11.classpath.1.X} ${included.lib.libs.jstl11.classpath.2.X} ${included.lib.file.reference.activation.jar} ${included.lib.file.reference.mail.jar} ${included.lib.file.reference.postgresql-8.2-506.jdbc4.jar} ${included.lib.libs.rowset-ri.classpath} ${included.lib.file.reference.iText-2.0.8.jar} ${included.lib.file.reference.evolute.jar} ${included.lib.file.reference.fop.jar} ${included.lib.file.reference.jdom.jar} ${included.lib.file.reference.avalon-framework-4.2.0.jar} ${included.lib.file.reference.batik.jar} "/>
+            <attribute name="Class-Path" value="${manifest.libs.jsf-designtime.classpath} ${manifest.libs.jsfsupport-designtime.classpath} ${manifest.libs.webui-designtime.classpath} ${manifest.libs.jdbcsupport-designtime.classpath} ${manifest.libs.theme-default.classpath} ${manifest.libs.jstl11.classpath} ${manifest.file.reference.activation.jar} ${manifest.file.reference.mail.jar} ${manifest.file.reference.postgresql-8.2-506.jdbc4.jar} ${manifest.libs.rowset-ri.classpath} ${manifest.file.reference.iText-2.0.8.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.batik.jar} "/>
         </manifest>
-        <delete dir="${dist.ear.dir}/temp"/>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
-        <copy file="${libs.jsf-designtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-designtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-designtime.classpath.libfile.4}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-designtime.classpath.libfile.3}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-designtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-designtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.webui-designtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.webui-designtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jdbcsupport-designtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.theme-default.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${file.reference.activation.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${file.reference.mail.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${file.reference.postgresql-8.2-506.jdbc4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.rowset-ri.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${file.reference.iText-2.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${file.reference.evolute.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${file.reference.fop.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${file.reference.jdom.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${file.reference.avalon-framework-4.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${file.reference.batik.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.6}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.5}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.4}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.3}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.4}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.3}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.webui-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.webui-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jdbcsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.theme-default.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.jsf-designtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.jsfsupport-designtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.webui-designtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.jdbcsupport-designtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.theme-default.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.jstl11.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.activation.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.mail.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.postgresql-8.2-506.jdbc4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.rowset-ri.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.iText-2.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.evolute.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.jdom.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="${libs.jsf-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.jsfsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.webui-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.jdbcsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.theme-default.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.jstl11.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">
         <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
@@ -629,7 +563,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
-    <target depends="init,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
+    <target depends="init,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
     <!--
                 EXECUTION SECTION
             -->
@@ -653,7 +587,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     <target name="-run-deploy-am">
         <!-- Task to deploy to the Access Manager runtime. -->
     </target>
-    <target depends="init,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
+    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
         <nbjpdaappreloaded/>
     </target>
     <target if="netbeans.home" name="-run-deploy-nb">
@@ -733,7 +667,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
             <arg line="${browser.args} ${browse.url}"/>
         </exec>
     </target>
-    <target depends="init,compile-single" name="run-main">
+    <target depends="init,-init-cos,compile-single" name="run-main">
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <webproject1:java classname="${run.class}"/>
     </target>
@@ -749,10 +683,10 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
         <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
             <classpath>
-                <path path="${debug.classpath}:${j2ee.platform.classpath}:${ws.debug.classpaths}"/>
+                <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
             </classpath>
             <sourcepath>
-                <path path="${web.docbase.dir}:${ws.web.docbase.dirs}"/>
+                <path path="${web.docbase.dir}"/>
             </sourcepath>
         </nbjpdaconnect>
     </target>
@@ -788,11 +722,9 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
             <classpath>
                 <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
             </classpath>
-            <sourcepath>
-                <pathelement location="${src.dir}"/>
-            </sourcepath>
-            <packageset dir="${src.dir}" includes="*/**"/>
-            <fileset dir="${src.dir}" includes="*.java"/>
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
         </javadoc>
     </target>
     <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
@@ -813,7 +745,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
         <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
         <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="**/*.java"/>
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test">
@@ -827,13 +759,9 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     </target>
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}">
-            <customize>
-                <patternset includes="${javac.includes}"/>
-            </customize>
-        </webproject2:javac>
+        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
         <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="**/*.java"/>
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test-single">
@@ -849,7 +777,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
         <mkdir dir="${build.test.results.dir}"/>
     </target>
     <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <webproject2:junit/>
+        <webproject2:junit testincludes="**/*Test.java"/>
     </target>
     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
         <fail if="tests.failed">Some tests failed; see details above.</fail>
@@ -862,7 +790,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     </target>
     <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
         <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <webproject2:junit includes="${test.includes}"/>
+        <webproject2:junit excludes="" includes="${test.includes}"/>
     </target>
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
         <fail if="tests.failed">Some tests failed; see details above.</fail>
@@ -915,10 +843,13 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
         <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
         <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
     </target>
+    <target depends="init" if="netbeans.home" name="undeploy-clean">
+        <nbundeploy failOnError="false" startServer="false"/>
+    </target>
     <target name="-post-clean">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
     <target depends="clean" description="Clean build products." name="clean-ear"/>
 </project>
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties b/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties
index ab3002cc..814e6850 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=306dea99
-build.xml.script.CRC32=82e52d07
-build.xml.stylesheet.CRC32=cfd7ba16
+build.xml.script.CRC32=97b5d0ef
+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=306dea99
-nbproject/build-impl.xml.script.CRC32=8bf3a1ef
-nbproject/build-impl.xml.stylesheet.CRC32=8926891b
+nbproject/build-impl.xml.script.CRC32=88678294
+nbproject/build-impl.xml.stylesheet.CRC32=174458fc
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties b/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties
index 3eca7146..00dcec9a 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties
@@ -18,6 +18,7 @@ dist.dir=dist
 dist.ear.war=${dist.dir}/${war.ear.name}
 dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
+excludes=
 file.reference.activation.jar=jars/activation.jar
 file.reference.avalon-framework-4.2.0.jar=lib/avalon-framework-4.2.0.jar
 file.reference.batik.jar=lib/batik.jar
@@ -27,6 +28,7 @@ file.reference.iText-2.0.8.jar=lib/iText-2.0.8.jar
 file.reference.jdom.jar=lib/jdom.jar
 file.reference.mail.jar=jars/mail.jar
 file.reference.postgresql-8.2-506.jdbc4.jar=jars/postgresql-8.2-506.jdbc4.jar
+includes=**
 j2ee.platform=1.4
 j2ee.server.type=Tomcat60
 jar.compress=false
@@ -71,23 +73,10 @@ javadoc.version=false
 javadoc.windowtitle=
 jspcompilation.classpath=${jspc.classpath}:${javac.classpath}
 lib.dir=${web.docbase.dir}/WEB-INF/lib
-libs.jsfsupport-designtime.classpath.libfile.1=/usr/local/netbeans-6.1/visualweb2/modules/ext/jsfcl.jar
-libs.jsfsupport-designtime.classpath.libfile.2=/usr/local/netbeans-6.1/visualweb2/modules/ext/appbase.jar
-libs.jsfsupport-designtime.classpath.libfile.3=/usr/local/netbeans-6.1/visualweb2/modules/ext/dataprovider.jar
-libs.jsfsupport-designtime.classpath.libfile.4=/usr/local/netbeans-6.1/visualweb2/modules/ext/sqlx.jar
-libs.jsfsupport-runtime.classpath.libfile.1=/usr/local/netbeans-6.1/visualweb2/modules/ext/jsfcl.jar
-libs.jsfsupport-runtime.classpath.libfile.2=/usr/local/netbeans-6.1/visualweb2/modules/ext/appbase.jar
-libs.jsfsupport-runtime.classpath.libfile.3=/usr/local/netbeans-6.1/visualweb2/modules/ext/dataprovider.jar
-libs.jsfsupport-runtime.classpath.libfile.4=/usr/local/netbeans-6.1/visualweb2/modules/ext/sqlx.jar
-libs.jstl11.classpath.libfile.1=/usr/local/netbeans-6.1/enterprise5/modules/ext/standard.jar
-libs.jstl11.classpath.libfile.2=/usr/local/netbeans-6.1/enterprise5/modules/ext/jstl.jar
 # Property libs.rowset-ri.classpath is set here just to make sharing of project simpler.
 # The library definition has always preference over this property.
 libs.rowset-ri.classpath=../../../../.netbeans/6.0/modules/ext/rowset-1.0.1.jar
-libs.webui-designtime.classpath.libfile.1=/usr/local/netbeans-6.1/visualweb2/modules/ext/webui.jar
-libs.webui-designtime.classpath.libfile.2=/usr/local/netbeans-6.1/enterprise5/modules/ext/commons-fileupload-1.0.jar
-libs.webui-runtime.classpath.libfile.1=/usr/local/netbeans-6.1/visualweb2/modules/ext/webui.jar
-libs.webui-runtime.classpath.libfile.2=/usr/local/netbeans-6.1/enterprise5/modules/ext/commons-fileupload-1.0.jar
+persistence.xml.dir=${conf.dir}
 platform.active=default_platform
 resource.dir=setup
 run.test.classpath=\
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java b/trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java
index f068a420..23f39469 100755
--- a/trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java
@@ -70,7 +70,7 @@ public class Global {
     
     
     //public static final String PLANOS_ACTUACAO_URL = "http://localhost:8084/PlanosActuacao/faces/ListaPlanos.jsp";  //testes
-    //public static final String PLANOS_ACTUACAO_URL = "http://192.168.111.24:8084/PlanosActuacao/faces/ListaPlanos.jsp";  //testes portatil    
+    //public static final String PLANOS_ACTUACAO_URL = "http://192.168.111.24:8084/PlanosActuacao/faces/ListaPlanos.jsp";  //testes portatil
     public static final String PLANOS_ACTUACAO_URL = "https://www.siprp.pt/PlanosActuacao/faces/ListaPlanos.jsp";  //real
     
     public static final String LOGOS_FOLDER = "/resources/images";  
diff --git a/trunk/AnaliseAcidentesTrabalho/web/Acesso.jsp b/trunk/AnaliseAcidentesTrabalho/web/Acesso.jsp
index 0cdecad4..ecd0d608 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/Acesso.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/Acesso.jsp
@@ -11,6 +11,15 @@
             <ui:html id="html1">
                 <ui:head id="head1">
                     <ui:link id="link1" url="/resources/stylesheet.css"/>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>
                 </ui:head>
                 <ui:body id="body1" style="-rave-layout: grid">
                     <ui:form id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp b/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp
index c87aa014..f03d59ff 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp
@@ -117,6 +117,15 @@
                         }
                         
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>
                     <style>
                         table.restricoes td {border-bottom: 1px solid #000000}
                         table.centerBlock td {border: none}                        
diff --git a/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp b/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp
index 6b25c4c9..2cff423b 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp
@@ -17,7 +17,16 @@
 			   wOpen.moveTo(0,0);
 			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
 			}                        
-                    </script>
+                </script>
+                <script type="text/javascript">
+                var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                </script>
+                <script type="text/javascript">
+                try {
+                var pageTracker = _gat._getTracker("UA-6942416-1");
+                pageTracker._trackPageview();
+                } catch(err) {}</script>
                 </ui:head>
                 <ui:body binding="#{EnviarCorrecao.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{EnviarCorrecao.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/Erro.jsp b/trunk/AnaliseAcidentesTrabalho/web/Erro.jsp
index 6c54bd5e..c2c8152d 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/Erro.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/Erro.jsp
@@ -6,6 +6,15 @@
             <ui:html binding="#{Erro.html1}" id="html1">
                 <ui:head binding="#{Erro.head1}" id="head1">
                     <ui:link binding="#{Erro.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>                    
                 </ui:head>
                 <ui:body binding="#{Erro.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{Erro.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp b/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp
index db156c06..f4e1b077 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp
@@ -37,6 +37,15 @@
                             }
                         }                        
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>                    
                 </ui:head>
                 <ui:body binding="#{FichaUtilizador.body1}" id="body1" onLoad="confirmeUserDeletion();" style="-rave-layout: grid">
                     <ui:form binding="#{FichaUtilizador.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
index 07722e94..b8d2a58f 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
@@ -18,6 +18,15 @@
 			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
 			}                        
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>
                 </ui:head>
                 <ui:body binding="#{FormDirGerRh.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormDirGerRh.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
index 6101796c..36772a7b 100755
--- a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
@@ -18,6 +18,15 @@
 			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
 			}                        
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>
                 </ui:head>
                 <ui:body binding="#{FormDirSiprp.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormDirSiprp.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
index 8b897b6a..9736d017 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
@@ -18,6 +18,15 @@
 			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
 			}                        
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>
                 </ui:head>
                 <ui:body binding="#{FormGestor.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormGestor.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
index cfe3404d..6d8f180e 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
@@ -18,6 +18,15 @@
 			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
 			}                        
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>                    
                 </ui:head>
                 <ui:body binding="#{FormHS.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormHS.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
index 7d19d5e3..0f018a6e 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
@@ -18,6 +18,15 @@
 			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
 			}                        
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>                    
                 </ui:head>
                 <ui:body binding="#{FormRH.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormRH.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
index 46a9e204..aed2331d 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
@@ -19,6 +19,15 @@
 			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
 			}                        
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>
                 </ui:head>
                 <ui:body binding="#{FormSeguranca.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormSeguranca.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp b/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp
index 2cbd783f..ead8b630 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp
@@ -34,6 +34,15 @@
                             }                            
                         }
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>                    
                 </ui:head>
                 <ui:body binding="#{GestaoUtilizadores.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{GestaoUtilizadores.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/LoadImage.jsp b/trunk/AnaliseAcidentesTrabalho/web/LoadImage.jsp
index 20cbd07d..1f5aef3f 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/LoadImage.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/LoadImage.jsp
@@ -6,6 +6,15 @@
             <ui:html binding="#{LoadImage.html1}" id="html1">
                 <ui:head binding="#{LoadImage.head1}" id="head1">
                     <ui:link binding="#{LoadImage.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>                    
                 </ui:head>
                 <ui:body binding="#{LoadImage.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{LoadImage.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/Login.jsp b/trunk/AnaliseAcidentesTrabalho/web/Login.jsp
index 21e24972..a9b75719 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/Login.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/Login.jsp
@@ -6,6 +6,15 @@
             <ui:html binding="#{Login.html1}" id="html1">
                 <ui:head binding="#{Login.head1}" id="head1">
                     <ui:link binding="#{Login.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>
                 </ui:head>
                 <ui:body binding="#{Login.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{Login.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp b/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
index 8b556a43..bc4061ee 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
@@ -78,6 +78,15 @@
                         }
                         
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>                    
                 </ui:head>
                 <ui:body binding="#{NovoUtilizador.body1}" id="body1" onLoad="highlight()" style="-rave-layout: grid">
                     <ui:form binding="#{NovoUtilizador.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp b/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp
index 2ed373fe..80199f17 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp
@@ -6,6 +6,15 @@
             <ui:html binding="#{RecuperarPassword.html1}" id="html1">
                 <ui:head binding="#{RecuperarPassword.head1}" id="head1">
                     <ui:link binding="#{RecuperarPassword.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>                    
                 </ui:head>
                 <ui:body binding="#{RecuperarPassword.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{RecuperarPassword.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp b/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp
index b3de3901..2c7488a8 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp
@@ -37,6 +37,15 @@
                             }
                         }                        
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>                    
                 </ui:head>
                 <ui:body binding="#{UtilizadorFields.body1}" id="body1" onLoad="confirmeUserDeletion();" style="-rave-layout: grid">
                     <ui:form binding="#{UtilizadorFields.form1}" id="form1">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp b/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp
index a6074300..a5492227 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp
@@ -36,6 +36,15 @@
                             }
                         }                                                                        
                     </script>
+                    <script type="text/javascript">
+                    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+                    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+                    </script>
+                    <script type="text/javascript">
+                    try {
+                    var pageTracker = _gat._getTracker("UA-6942416-1");
+                    pageTracker._trackPageview();
+                    } catch(err) {}</script>                    
                 </ui:head>
                 <ui:body binding="#{ViewAnaliseAcidenteTrabalho.body1}" id="body1" onLoad="confirmeAnaliseDeletion();" style="-rave-layout: grid">
                     <ui:form binding="#{ViewAnaliseAcidenteTrabalho.form1}" id="form1">