diff --git a/trunk/PlanosActuacao/ant/common/evo-app-build-common.xml b/trunk/PlanosActuacao/ant/common/evo-app-build-common.xml
new file mode 100644
index 00000000..13434f6c
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/common/evo-app-build-common.xml
@@ -0,0 +1,60 @@
+<project name="evo-app-build-common" basedir="../../"> 
+	
+	<import file="evo-app-compile-common.xml" />
+	
+	<target name="app-build" description="Compiles all application classes" depends="app-prepare,app-pre-build">
+		<mkdir dir="${app.build.dir}" />
+		<depend srcdir="${app.src.dir}" destdir="${app.build.dir}" cache="${app.dependencies.chache.dir}">
+			<include name="**/*.java" />
+		</depend>
+		<javac srcdir="${app.src.dir}" destdir="${app.build.dir}" classpathref="app.build.classpath" debug="on" deprecation="on" fork="true" memoryMaximumSize="512M" />
+		<antcall target="app-post-build"/>
+	</target>
+	
+	<target name="run-codegen" description="Runs codegen for this project" depends="load-properties">
+		<available file="${codegen.project.ant}" property="codegen.project.exists"/>
+		<antcall target="show-codegen-project-error"/>
+		<antcall target="run-codegen-if-project-exists"/>
+	</target>
+	
+	<target name="run-codegen-if-project-exists" if="codegen.project.exists">
+		<available file="${codegen.properties.file}" property="codegen.properties.exists"/>
+		<antcall target="show-codegen-properties-error"/>
+		<antcall target="run-codegen-if-exists"/>
+	</target>
+	
+	<target name="show-codegen-project-error" unless="codegen.project.exists">
+		<echo message="Codegen's build-file not found at ${codegen.project.ant}"/>
+	</target>
+	
+	<target name="run-codegen-if-exists" if="codegen.properties.exists">
+		<ant inheritall="false" antfile="${codegen.project.ant}" target="app-run">
+			<property name="app.run.args" value="${basedir}" />
+		</ant>
+	</target>
+	
+	<target name="show-codegen-properties-error" unless="codegen.properties.exists">
+		<echo message="Project's codegen configuration file not found at ${codegen.properties.file}"/>
+	</target>
+	
+	<target name="run-batch-deployer" description="Batches multiple deploys" depends="load-properties">
+		<path id="deployer.classpath">
+			<fileset dir="${lib.tools.dir}" />
+			<path refid="app.build.classpath" />
+		</path>
+		<java jvmversion="${app.java.version}" classname="${deployer.main}" classpathref="deployer.classpath" fork="true" dir="${app.build.dir}">
+			<arg value="${basedir}"/>
+		</java>
+	</target>
+	
+	<target name="run-LEAF" description="Runs LEAF for this project" depends="load-properties">
+		<path id="leaf.classpath">
+			<fileset dir="${lib.tools.dir}" />
+			<path refid="app.build.classpath" />
+		</path>
+		<java jvmversion="${app.java.version}" classname="${leaf.main}" classpathref="leaf.classpath" fork="true" dir="${app.build.dir}">
+			<arg value="${app.src.dir}"/>
+		</java>
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/common/evo-app-build-obfuscate-common.xml b/trunk/PlanosActuacao/ant/common/evo-app-build-obfuscate-common.xml
new file mode 100644
index 00000000..1c844aae
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/common/evo-app-build-obfuscate-common.xml
@@ -0,0 +1,62 @@
+<project name="evo-app-build-obfuscate-common" basedir="../../">
+
+	<path id="lib.tools.classpath"/>
+	
+	<target name="obfuscate">
+		<taskdef resource="proguard/ant/task.properties" classpath="${app.dir}/lib.tools/proguard.jar" />
+
+		<delete file="${app.deploy.dist.dir}/${evolute.jar.name}" failonerror="false" />
+
+		<proguard printmapping="${app.dir}/${app.name}.map">
+
+			<injar file="${app.lib.dir}/evologger.jar" />
+			<outjar file="${app.deploy.dist.lib.dir}/evologger.jar" />
+			
+			<injar file="${app.lib.dir}/evolute.jar" />
+			<outjar file="${app.deploy.dist.lib.dir}/evolute.jar" />
+
+			<injar file="${app.deploy.dist.dir}/${app.jar.name}" />
+			<outjar file="${app.deploy.dist.dir}/${app.jar.name}_guard.jar" />
+
+			<libraryjar file="${evolute.lib.dir}" />
+			<libraryjar file="${app.lib.dir}" />
+			<libraryjar file="${java.home}/lib/jce.jar" />
+			<libraryjar file="${java.home}/lib/jsse.jar" />
+			<libraryjar file="${java.home}/lib/rt.jar" />
+					
+					-printseeds
+					-verbose
+					-dontskipnonpubliclibraryclasses
+					
+					-keepclasseswithmembers public class * {
+								        public static void main(java.lang.String[]);
+								    }
+			</proguard>
+		<delete file="${app.deploy.dist.dir}/${app.jar.name}" failonerror="true" />
+		<move file="${app.deploy.dist.dir}/${app.jar.name}_guard.jar" tofile="${app.deploy.dist.dir}/${app.jar.name}" />
+	</target>
+
+	<target name="ProguardTask">
+		<property file="${app.version.file}" prefix="version" />
+		<typedef classpathref="lib.tools.classpath" resource="net/jtools/classloadertask/antlib.xml">
+			<classpath>
+				<path refid="lib.tools.classpath"/>
+			</classpath>
+		</typedef>
+		<classloader loader="project">
+			<classpath>
+				<fileset dir="${lib.tools.dir}" includes="*.jar"/>
+				<fileset dir="${app.lib.dir}" includes="*.jar"/>
+			</classpath>
+		</classloader>
+		<taskdef name="proguardtask" classpathref="lib.tools.classpath" classname="com.evolute.ant.ProguardTask" onerror="ignore" />
+
+		<proguardtask filePath="${app.dir}/${app.name}.map" version="${version.major}.${version.minor}.${version.build}" fileName="${app.name}.map" projectName="${app.name}" />
+	</target>
+
+	<target name="pre-deploy">
+		<antcall target="obfuscate" />
+		<antcall target="ProguardTask" />
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/common/evo-app-compile-common.xml b/trunk/PlanosActuacao/ant/common/evo-app-compile-common.xml
new file mode 100644
index 00000000..2997c34b
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/common/evo-app-compile-common.xml
@@ -0,0 +1,108 @@
+<project name="evo-app-compile-common" basedir="../../"> 
+	
+	<import file="evo-app-load-properties.xml" />
+	
+	<!-- BUILD -->
+	
+	<target name="app-post-build" />
+	
+	<target name="app-pre-build" />
+	
+	<target name="app-build" />
+	
+	<target name="cifrar" depends="app-properties-exists" if="app.properties.exists" >
+		<echo message="Encrypting app.properties" />
+		<typedef classpathref="lib.tools.classpath" resource="net/jtools/classloadertask/antlib.xml">
+			<classpath>
+				<path refid="lib.tools.classpath"/>
+			</classpath>
+		</typedef>
+		<classloader loader="project">
+			<classpath>
+				<fileset dir="${lib.tools.dir}" includes="*.jar"/>
+			</classpath>
+		</classloader>
+		<taskdef name="cifrar-props" classpathref="lib.tools.classpath" classname="com.evolute.ant.PropsEncryptorTask" onerror="fail" />
+		<cifrar-props filepath="${properties.dir}${file.separator}app.properties" destpath="${app.build.dir}${file.separator}app.properties"/>
+	</target>
+	
+	<target name="app-properties-exists">
+	    <available file="${properties.dir}${file.separator}app.properties" property="app.properties.exists"/>
+	</target>
+	
+	<target name="app-prepare" depends="load-properties">
+		<echo message="Dealing with package-info.java files (ant compilation problem workaround)" />
+		<delete failonerror="false">
+			<fileset dir="${app.build.dir}" includes="**/package-info.java"/>
+		</delete>
+		<echo message="Copying non-java files to build directory" />
+		<copy failonerror="false" overwrite="true" verbose="true" todir="${app.build.dir}" file="${app.version.file}"/>
+		<copy verbose="true" failonerror="true" overwrite="true" todir="${app.build.dir}">
+			<fileset dir="${app.src.dir}">
+				<exclude name="**/*.java" />
+				<exclude name="*.java" />
+			</fileset>
+			<fileset dir="${properties.dir}">
+				<exclude name="app.properties" />
+				<include name="**/*" />
+			</fileset>
+		</copy>
+		<antcall target="cifrar"/>
+	</target>
+
+	<target name="app-clean" description="Removes all generated files" depends="load-static-properties">
+		<delete verbose="true" failonerror="false">
+			<fileset dir="${app.build.dir}">
+				<include name="**/*" />
+			</fileset>
+		</delete>
+		<delete dir="${app.build.dir}" verbose="true" failonerror="true" />
+		<delete dir="${app.dist.dir}" verbose="true" failonerror="true" />
+		<delete dir="${app.deploy.dist.dir}" verbose="true" failonerror="true" />
+	</target>
+
+	<target name="app-run" description="Runs the application" depends="app-build">
+		<java jvmversion="${app.java.version}" classname="${app.main}" maxmemory="${app.max.mem}" classpathref="app.build.classpath" fork="true" dir="${app.build.dir}">
+			<jvmarg value="${jvm.run.args}" />
+			<arg value="${app.run.args}"/>
+		</java>
+	</target>
+		
+	<!-- JAR -->
+	<target name="app-deploy-create-jar" depends="app-clean, app-build" >
+		<mkdir dir="${app.deploy.dist.dir}" />
+		<jar destfile="${app.deploy.dist.dir}/${app.jar.name}" >
+			<fileset dir="${app.build.dir}">
+				<include name="**/*" />
+			</fileset>
+		</jar>
+		<copy todir="${app.deploy.dist.lib.dir}">
+			<fileset dir="${app.lib.dir}">
+				<include name="**/*" />
+			</fileset>
+		</copy>
+	</target>
+	
+	<target name="app-create-jar" description="Make application Jar" depends="app-clean, app-build"  >
+		<pathconvert property="jar.classpath.converted" refid="app.jar.classpath" pathsep=" ">
+			<map from="${app.dir}/" to="" />
+			<map from="${basedir}/" to="" />
+		</pathconvert>
+		<mkdir dir="${app.dist.dir}" />
+		<jar destfile="${app.dist.dir}/${app.jar.name}">
+			<fileset dir="${app.build.dir}">
+				<include name="**/*" />
+			</fileset>
+			<manifest>
+				<attribute name="Main-Class" value="${app.main}" />
+				<attribute name="Class-Path" value="${jar.classpath.converted}" />
+			</manifest>
+		</jar>
+		<copy todir="${app.dist.lib.dir}">
+			<fileset dir="${app.lib.dir}">
+				<include name="**/*" />
+			</fileset>
+		</copy>
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/common/evo-app-deploy-common.xml b/trunk/PlanosActuacao/ant/common/evo-app-deploy-common.xml
new file mode 100644
index 00000000..6965be7d
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/common/evo-app-deploy-common.xml
@@ -0,0 +1,195 @@
+<project name="evo-app-deploy-common" basedir="../../"> 
+	
+	<!-- PROPERTIES -->
+	<property name="properties.key.name" value="name" />
+	<property name="properties.key.major" value="major" />
+	<property name="properties.key.minor" value="minor" />
+	<property name="properties.key.build" value="build" />
+	
+	<!-- SETUP -->
+	<target name="prepare-deploy-location">
+		<sshexec trust="yes" host="${app.deploy.server}" username="${deploy.user}" command="sh ${deploy.prepare.script} ${app.name}" password="${deploy.password}" />
+	</target>
+	
+	<target name="run-jnlp-task" >
+		<typedef classpathref="lib.tools.classpath" resource="net/jtools/classloadertask/antlib.xml">
+			<classpath>
+				<path refid="lib.tools.classpath"/>
+			</classpath>
+		</typedef>
+		<classloader loader="project">
+			<classpath>
+				<fileset dir="${lib.tools.dir}" includes="*.jar"/>
+			</classpath>
+		</classloader>
+		<taskdef name="generate-jnlp" classpathref="lib.tools.classpath" classname="com.evolute.ant.JNLPGeneratorTask" onerror="ignore"/>
+		<generate-jnlp propertiesDir="${properties.dir}" basedir="${app.dir}" />
+	</target>
+	
+	<!-- DEPLOY -->
+	
+	<target name="load-properties" />
+	
+	<target name="pre-deploy" />
+	
+	<target name="ask-deploy.version" unless="deploy.version">
+		<input defaultvalue="" addproperty="deploy.version">
+			<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.VersionInputHandler"  />
+		</input>
+	</target>
+	
+	<target name="ask-deploy.jars" unless="deploy.jars">
+		<input defaultvalue="${basedir}:${app.appName}" addproperty="deploy.jars">
+			<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.JarInputHandler"  />
+		</input>
+	</target>
+	
+	<target name="ask-deploy.user" unless="deploy.user">
+		<input message="" addproperty="deploy.user">
+			<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.UserInputHandler"  />
+		</input>
+	</target>
+	
+	<target name="ask-deploy.password" unless="deploy.password">
+		<input message="password:>" addproperty="deploy.password">
+			<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.PasswordInputHandler"  />
+		</input>
+	</target>
+	
+	<target name="app-deploy-version" if="deploy.version" depends="ask-deploy.jars,ask-deploy.user,ask-deploy.password" >
+		<antcall target="app-deploy-create-jar"/>
+		<antcall target="pre-deploy" />
+		<antcall target="run-jnlp-task" />
+		<condition property="do.abort">
+			<equals arg1="${deploy.jars}" arg2="null"/>
+		</condition>
+		<fail if="do.abort">Deploy cancelled</fail>
+		<antcall target="app-deploy-version-jars"/>
+	</target>
+	
+	<target name="app-version-increase-test">
+		<property name="TESTDEPLOY" value="yes"/>
+		<antcall target="app-version-increase-build"/>
+	</target>
+	
+	<target name="app-version-increase-major">
+		<propertyfile file="${app.version.file}" comment="${app.version.comment}" >
+			<entry key="${properties.key.name}" value="${app.name}"/>
+			<entry key="${properties.key.major}" type="int" operation="+" value="1"/>
+			<entry key="${properties.key.minor}" type="int" operation="=" value="0"/>
+			<entry key="${properties.key.build}" type="int" operation="=" value="0"/>
+		</propertyfile>
+		<antcall target="app-deploy-version"/>
+	</target>
+	
+	<target name="app-version-increase-minor">
+		<propertyfile file="${app.version.file}" comment="${app.version.comment}" >
+			<entry key="${properties.key.name}" value="${app.name}"/>
+			<entry key="${properties.key.major}" type="int" operation="+" value="0"/>
+			<entry key="${properties.key.minor}" type="int" operation="+" value="1"/>
+			<entry key="${properties.key.build}" type="int" operation="=" value="0"/>
+		</propertyfile>
+		<antcall target="app-deploy-version"/>
+	</target>
+	
+	<target name="app-version-increase-build">
+		<propertyfile file="${app.version.file}" comment="${app.version.comment}" >
+			<entry key="${properties.key.name}" value="${app.name}"/>
+			<entry key="${properties.key.major}" type="int" operation="+" value="0"/>
+			<entry key="${properties.key.minor}" type="int" operation="+" value="0"/>
+			<entry key="${properties.key.build}" type="int" operation="+" value="1"/>
+		</propertyfile>
+		<antcall target="app-deploy-version"/>
+	</target>
+	
+	<target name="deploy-test" if="TESTDEPLOY">
+		<sshexec trust="yes" host="${app.deploy.server}" username="${deploy.user}" command="sh ${app.deploy.test.script} ${app.name}" password="${deploy.password}" />
+	</target>
+	
+	<target name="deploy-production" unless="TESTDEPLOY">
+		<echo message="Deploying to ${deploy.user}@${app.deploy.server}"/>
+		<sshexec failonerror="true" trust="yes" host="${app.deploy.server}" username="${deploy.user}" command="sh ${app.deploy.production.script} ${app.name}" password="${deploy.password}" />
+	</target>
+	
+	<target name="app-deploy-version-jars-user-pass" if="deploy.password">
+		<antcall target="prepare-deploy-location" />
+		<echo message="Uploading files: ${deploy.jars}"/>
+		<scp verbose="yes" todir="${deploy.user}@${app.deploy.server}:${app.deploy.path}" password="${deploy.password}" sftp="true" trust="true" >
+			<fileset dir="${app.deploy.dist.dir}" includes="${deploy.jars}"/>
+		</scp>
+		<echo message="Uploading jnlps"/>
+		<scp verbose="yes" todir="${deploy.user}@${app.deploy.server}:${app.deploy.jnlp.path}" password="${deploy.password}" sftp="true" trust="true" >
+			<fileset dir="${jnlp.dir}" includes="**/*.jnlp"/>
+		</scp>
+		<antcall target="deploy-test"/>
+		<antcall target="deploy-production"/>
+	</target>
+	
+	<target name="app-deploy-version-jars-user" if="deploy.user">
+		<antcall target="app-deploy-version-jars-user-pass"/>
+	</target>
+	
+	<target name="app-deploy-version-jars" if="deploy.jars" >
+		<antcall target="app-deploy-version-jars-user" />
+	</target>
+	
+	<target name="app-deploy-choose-version" if="deploy.version" >
+		<antcall target="app-version-increase-${deploy.version}" />
+	</target>
+	
+	<target name="app-deploy" description="Deploys application" depends="load-properties,ask-deploy.version">
+		<antcall target="app-deploy-choose-version"/>
+		<antcall target="app-create-software-evo-licensor"/>
+	</target>
+	
+	<target name="app-create-software-evo-licensor" depends="load-properties">
+		<property file="${app.version.file}" prefix="version" />
+		<typedef classpathref="lib.tools.classpath" resource="net/jtools/classloadertask/antlib.xml">
+			<classpath>
+				<path refid="lib.tools.classpath"/>
+			</classpath>
+		</typedef>
+		<classloader loader="project">
+			<classpath>
+				<fileset dir="${lib.tools.dir}" includes="*.jar"/>
+				<fileset dir="${app.lib.dir}" includes="*.jar"/>
+			</classpath>
+		</classloader>
+		<taskdef name="createTask" classpathref="lib.tools.classpath" classname="com.evolute.ant.CreateSoftwareAntTask" onerror="ignore"/>
+
+		<createTask projectVersion="${version.major}.${version.minor}.${version.build}" projectName="${app.name}" />
+	</target>
+	
+	<!-- DOCUMENTATION -->
+	
+	<target name="docs-generate-upload" description="Generates and uploads the project documentation" depends="load-properties,docs-generate,docs-upload"/>
+	
+	<target name="docs-generate">
+		<mkdir dir="${docs.api.dir}"/>
+		<javadoc verbose="true" classpath="lib.docs.classpath" destdir="${docs.api.dir}" docencoding="UTF-8" doctitle="${app.name}" sourcepath="${app.src.dir}" />
+	</target>
+	
+	<target name="docs-upload">
+		<input message="" addproperty="deploy.user">
+			<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.UserInputHandler"  />
+		</input>
+		<input message="password:>" addproperty="deploy.password">
+			<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.PasswordInputHandler"  />
+		</input>
+		<typedef classpathref="lib.tools.classpath" resource="net/jtools/classloadertask/antlib.xml">
+			<classpath>
+				<path refid="lib.tools.classpath"/>
+			</classpath>
+		</typedef>
+		<classloader loader="project">
+			<classpath>
+				<fileset dir="${lib.tools.dir}" includes="*.jar"/>
+			</classpath>
+		</classloader>
+		<sshexec trust="yes" host="${app.deploy.docs.server}" username="${deploy.user}" command="sh ${app.docs.prepare.script} ${app.name}" password="${deploy.password}" />
+		<scp verbose="yes" todir="${deploy.user}@${app.deploy.docs.server}:${app.deploy.docs.path}" password="${deploy.password}" sftp="true" trust="true" >
+			<fileset dir="${docs.dir}"/>
+		</scp>
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/common/evo-app-load-properties.xml b/trunk/PlanosActuacao/ant/common/evo-app-load-properties.xml
new file mode 100644
index 00000000..ae68b872
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/common/evo-app-load-properties.xml
@@ -0,0 +1,89 @@
+<project name="evo-app-load-properties" basedir="../../">
+	
+	<property name="properties.base.dir" value="${basedir}/properties" />
+	<property name="lib.tools.dir" value="${basedir}/lib.tools" />
+	
+	<path id="lib.tools.classpath">
+		<fileset dir="${lib.tools.dir}" />
+	</path>
+	
+	<target name="load-static-properties" >
+		<property name="app.dir" value="${basedir}" />
+		<property name="evolute.dir" value="${basedir}/../evolute" />
+		<property name="evolute.lib.dir" value="${evolute.dir}/lib" />
+		<property name="evolute.lib.tools.dir" value="${evolute.dir}/lib.tools" />
+		<property name="evolute.ant.dir" value="${evolute.dir}/ant" />
+		<property name="evolute.jar.name" value="evolute.jar" />
+		<property name="docs.dir" value="${app.dir}/docs" />
+		<property name="docs.api.dir" value="${docs.dir}/api" />
+		<property name="app.src.dir" value="${app.dir}/src" />
+		<property name="app.lib.dir" value="${app.dir}/lib" />
+		<property name="deploy.project.relative.lib.dir" value="lib" />
+		<property name="app.dist.dir" value="${app.dir}/dist" />
+		<property name="app.dist.lib.dir" value="${app.dist.dir}/lib" />
+		<property name="app.deploy.dist.dir" value="${app.dir}/deploy" />
+		<property name="app.deploy.dist.lib.dir" value="${app.deploy.dist.dir}/lib" />
+		<property name="app.build.dir" value="${app.dir}/build" />
+		<property name="app.dependencies.chache.dir" value="${app.dir}/dependenciesCache" />
+		<property name="codegen.project.ant" value="${basedir}/../codegen/build.xml"/>
+		<property name="codegen.properties.file" value="${basedir}/properties/codegen.xml"/>
+		<property name="leaf.project.ant" value="${basedir}/../LEAF/build.xml"/>
+		
+		<path id="app.jar.classpath">
+			<fileset dir="${app.lib.dir}" />
+		</path>
+
+		<path id="app.build.classpath">
+			<pathelement location="${app.build.dir}" />
+			<path refid="app.jar.classpath" />
+			<path refid="lib.tools.classpath" />
+		</path>
+		
+		<path id="lib.docs.classpath">
+			<path refid="lib.tools.classpath" />
+			<path refid="app.jar.classpath" />
+		</path>
+		
+		<typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="lib.tools.classpath" />
+		
+	</target>
+	
+	<target name="load-properties-file" >
+		<property name="properties.dir" value="${properties.base.dir}" />
+		<property file="${properties.dir}/app.properties" />
+		<property file="${properties.dir}/project.properties" />
+		<antcall target="load-static-properties"/>
+	</target>
+	
+	<target name="load-properties" depends="load-static-properties,load-properties-file">
+		
+		<property name="app.name" value="${app.appName}" />
+		<property name="app.main" value="${app.main-class}" />
+		
+		<property name="app.jar.name" value="${app.name}.jar" />
+		<property name="jnlp.dir" value="${app.dir}/jnlp" />
+		<property name="jnlp.extensions.dir" value="${jnlp.dir}/extensions" />
+		<property name="app.java.version" value="${java.version}" />
+		<property name="app.deploy.server" value="www.evolute.pt" />
+		<property name="app.deploy.path" value="/home/software/src_${app.name}" />
+		<property name="app.deploy.jnlp.path" value="${app.deploy.path}/jnlp" />
+		<property name="app.deploy.production.script" value="/home/software/auto_deploy.sh ${app.name}" />
+		<property name="app.deploy.test.script" value="/home/software/auto_test_deploy.sh ${app.name}" />
+		<property name="deploy.prepare.script" value="/home/software/auto_prepare_deploy.sh ${app.name}" />
+		<property name="app.deploy.docs.server" value="${app.deploy.server}" />
+		<property name="app.deploy.docs.path" value="/home/software/public_html/docs/${app.name}" />
+		<property name="app.docs.prepare.script" value="/home/software/auto_prepare_docs_upload.sh" />
+		
+		<property name="app.version.file" value="${properties.base.dir}/version.properties" />
+		<property name="app.version.comment" value="${app.name} versioning file" />
+		<property name="app.run.args" value="" />
+		<property name="jvm.run.args" value="-XX:-UseGCOverheadLimit" />
+		<property name="app.ws.wsdl.url" value="${app.ws.wsdl.url.protocol}://${app.ws.wsdl.url.host}:${app.ws.wsdl.url.port}${app.ws.wsdl.url.path}" />
+		
+		<property name="app.max.mem" value="512M" />
+		
+		<property name="leaf.main" value="com.evolute.leaf.Main" />
+		<property name="deployer.main" value="com.evolute.deploy.Main" />
+	</target>
+	
+</project> 
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/common/evo-app-multiple-client-common.xml b/trunk/PlanosActuacao/ant/common/evo-app-multiple-client-common.xml
new file mode 100644
index 00000000..e06185d8
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/common/evo-app-multiple-client-common.xml
@@ -0,0 +1,22 @@
+<project name="evo-app-multiple-client-common" basedir="../../"> 
+	
+	<target name="load-properties-file" depends="ask-target">
+		<property file="${properties.dir}/app.properties" />
+		<property file="${properties.dir}/project.properties" />
+		<property file="${properties.base.dir}/app.properties" />
+		<property file="${properties.base.dir}/project.properties" />
+		<copy verbose="true" failonerror="true" overwrite="true" todir="${basedir}/build">
+			<fileset dir="${properties.dir}">
+				<include name="*" />
+				<include name="**/*" />
+			</fileset>
+		</copy>
+	</target>
+	
+	<target name="ask-target" unless="properties.dir">
+		<input defaultvalue="${properties.base.dir}" addproperty="properties.dir">
+			<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.ProjectClientInputHandler"  />
+		</input>
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/evo-app-build-java5.xml b/trunk/PlanosActuacao/ant/evo-app-build-java5.xml
new file mode 100644
index 00000000..3280e098
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/evo-app-build-java5.xml
@@ -0,0 +1,113 @@
+<project name="evo-app-build-5" basedir="../"> 
+	
+	<import file="common/evo-app-load-properties.xml" />
+	<import file="common/evo-app-deploy-common.xml" />
+	
+	<!--  CLASSPATH -->
+	<path id="app.jar.classpath">
+		<fileset dir="${app.lib.dir}" />
+	</path>
+
+	<path id="app.build.classpath">
+		<path refid="app.jar.classpath" />
+		<pathelement location="${app.build.dir}" />
+	</path>
+	
+	<path id="svn.classpath">
+		<fileset dir="${evolute.lib.tools.dir}" />
+	</path>
+	
+	<path id="jsch.classpath">
+		<fileset dir="${evolute.lib.tools.dir}" />
+	</path>
+	
+	<path id="lib.tools.classpath">
+		<fileset dir="${lib.tools.dir}" />
+	</path>
+	
+	<!-- BUILD -->
+	<target name="app-prepare" depends="load-properties">
+		<echo message="Copying non-java files to build directory" />
+		<copy todir="${app.build.dir}">
+			<fileset dir="${app.src.dir}">
+				<exclude name="**/*.java" />
+				<exclude name="*.java" />
+			</fileset>
+			<fileset dir="${properties.dir}">
+				<include name="*" />
+				<include name="**/*" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="app-build" description="Compiles all application classes" depends="app-prepare">
+		<mkdir dir="${app.build.dir}" />
+		<depend srcdir="${app.src.dir}" destdir="${app.build.dir}" cache="${app.dependencies.chache.dir}">
+			<include name="**/*.java" />
+		</depend>
+		<javac srcdir="${app.src.dir}" destdir="${app.build.dir}" classpathref="app.build.classpath" debug="on" deprecation="on" fork="true" memoryMaximumSize="512M" source="1.5" target="1.5" />
+		<antcall target="app-datanucleus"/>
+	</target>
+	
+	<target name="app-datanucleus">
+		<path id="jpox.enhancer.classpath">
+			<fileset dir="${lib.tools.dir}" />
+			<path refid="app.build.classpath" />
+		</path>
+		<taskdef name="jpoxEnhancer" description="JPOX Enhancer" classpathref="jpox.enhancer.classpath" classname="org.datanucleus.enhancer.tools.EnhancerTask" />
+		<jpoxEnhancer maxmemory="256M" classpathref="jpox.enhancer.classpath" dir="${app.build.dir}" verbose="true"/>
+	</target>
+
+	<target name="app-clean" description="Removes all generated files">
+		<delete failonerror="false">
+			<fileset dir="${app.build.dir}">
+				<include name="**/*" />
+			</fileset>
+		</delete>
+		<delete dir="${app.build.dir}" failonerror="false" />
+		<delete dir="${app.dist.dir}" failonerror="false" />
+		<delete dir="${app.deploy.dist.dir}" failonerror="false" />
+	</target>
+
+	<target name="app-run" description="Runs the application" depends="app-build">
+		<java classname="${app.main}" classpathref="app.build.classpath" fork="true" dir="${app.build.dir}" />
+	</target>
+		
+	<!-- JAR -->
+	<target name="app-deploy-create-jar" depends="app-clean, app-build" >
+		<mkdir dir="${app.deploy.dist.dir}" />
+		<jar destfile="${app.deploy.dist.dir}/${app.jar.name}" >
+			<fileset dir="${app.build.dir}">
+				<include name="**/*" />
+			</fileset>
+		</jar>
+		<copy todir="${app.deploy.dist.lib.dir}">
+			<fileset dir="${app.lib.dir}">
+				<include name="**/*" />
+			</fileset>
+		</copy>
+	</target>
+	
+	<target name="app-create-jar" description="Make application Jar" depends="app-clean, app-build"  >
+		<pathconvert property="jar.classpath.converted" refid="app.jar.classpath" pathsep=" ">
+			<map from="${app.dir}/" to="" />
+			<map from="${basedir}/" to="" />
+		</pathconvert>
+		<mkdir dir="${app.dist.dir}" />
+		<jar destfile="${app.dist.dir}/${app.jar.name}">
+			<fileset dir="${app.build.dir}">
+				<include name="**/*" />
+			</fileset>
+			<manifest>
+				<attribute name="Main-Class" value="${app.main}" />
+				<attribute name="Class-Path" value="${jar.classpath.converted}" />
+			</manifest>
+		</jar>
+		<copy todir="${app.dist.lib.dir}">
+			<fileset dir="${app.lib.dir}">
+				<include name="**/*" />
+			</fileset>
+		</copy>
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/evo-app-build-jdo.xml b/trunk/PlanosActuacao/ant/evo-app-build-jdo.xml
new file mode 100644
index 00000000..d9d46f46
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/evo-app-build-jdo.xml
@@ -0,0 +1,25 @@
+<project name="evo-app-build-jdo" basedir="../"> 
+	
+	<import file="common/evo-app-compile-common.xml" />
+	<import file="common/evo-app-deploy-common.xml" />
+
+	<target name="app-build" description="Compiles all application classes" depends="app-prepare,app-pre-build">
+		<mkdir dir="${app.build.dir}" />
+		<depend srcdir="${app.src.dir}" destdir="${app.build.dir}" cache="${app.dependencies.chache.dir}">
+			<include name="**/*.java" />
+		</depend>
+		<javac srcdir="${app.src.dir}" destdir="${app.build.dir}" classpathref="app.build.classpath" debug="on" deprecation="on" fork="true" memoryMaximumSize="512M" />
+		<antcall target="app-datanucleus"/>
+		<antcall target="app-post-build"/>
+	</target>
+	
+	<target name="app-datanucleus">
+		<path id="jpox.enhancer.classpath">
+			<fileset dir="${lib.tools.dir}" />
+			<path refid="app.build.classpath" />
+		</path>
+		<taskdef name="jpoxEnhancer" description="JPOX Enhancer" classpathref="jpox.enhancer.classpath" classname="org.datanucleus.enhancer.tools.EnhancerTask" />
+		<jpoxEnhancer maxmemory="256M" classpathref="jpox.enhancer.classpath" dir="${app.build.dir}"  verbose="true"/>
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/evo-app-build-obfuscate-jdo.xml b/trunk/PlanosActuacao/ant/evo-app-build-obfuscate-jdo.xml
new file mode 100644
index 00000000..3b1f2ba1
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/evo-app-build-obfuscate-jdo.xml
@@ -0,0 +1,6 @@
+<project name="evo-app-build-obfuscate-jdo" basedir="../">
+
+	<import file="common/evo-app-compile-common.xml" />
+	<import file="common/evo-app-deploy-common.xml" />
+
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/evo-app-build-obfuscate.xml b/trunk/PlanosActuacao/ant/evo-app-build-obfuscate.xml
new file mode 100644
index 00000000..168357f6
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/evo-app-build-obfuscate.xml
@@ -0,0 +1,7 @@
+<project name="evo-app-build-obfuscate" basedir="../">
+
+	<import file="common/evo-app-build-common.xml" />
+	<import file="common/evo-app-build-obfuscate-common.xml" />
+	<import file="common/evo-app-deploy-common.xml" />
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/evo-app-build.xml b/trunk/PlanosActuacao/ant/evo-app-build.xml
new file mode 100644
index 00000000..099651cb
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/evo-app-build.xml
@@ -0,0 +1,6 @@
+<project name="evo-app-build" basedir="../"> 
+	
+	<import file="common/evo-app-build-common.xml" />
+	<import file="common/evo-app-deploy-common.xml" />
+
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/evo-app-multiple-client-build.xml b/trunk/PlanosActuacao/ant/evo-app-multiple-client-build.xml
new file mode 100644
index 00000000..e50cb65f
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/evo-app-multiple-client-build.xml
@@ -0,0 +1,7 @@
+<project name="evo-app-multiple-client-build" basedir="../"> 
+	
+	<import file="common/evo-app-multiple-client-common.xml" />
+	<import file="common/evo-app-build-common.xml" />
+	<import file="common/evo-app-deploy-common.xml" />
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/evo-app-multiple-client-obfuscated-build.xml b/trunk/PlanosActuacao/ant/evo-app-multiple-client-obfuscated-build.xml
new file mode 100644
index 00000000..aaf21aed
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/evo-app-multiple-client-obfuscated-build.xml
@@ -0,0 +1,6 @@
+<project name="evo-app-multiple-client-build" basedir="../"> 
+	
+	<import file="common/evo-app-multiple-client-common.xml" />
+	<import file="evo-app-build-obfuscate.xml" />
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/evo-app-ws-client-build.xml b/trunk/PlanosActuacao/ant/evo-app-ws-client-build.xml
new file mode 100644
index 00000000..9c9e3e96
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/evo-app-ws-client-build.xml
@@ -0,0 +1,31 @@
+<project name="evo-app-ws-client-build" basedir="../"> 
+	
+	
+	<import file="common/evo-app-build-common.xml" />
+	
+	<path id="jaxws.classpath">
+		<path refid="lib.tools.classpath"/>
+		<pathelement location="${java.home}/../lib/tools.jar" />
+	</path>
+	
+	<target name="receitas-gen-client" depends="app-build" description="generates client">
+		<taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport" onerror="ignore">
+			<classpath refid="lib.tools.classpath" />
+		</taskdef>
+		<java fork="false" classname="com.evolute.ssl.InstallCert" classpathref="app.build.classpath">
+			<arg value="${app.ws.wsdl.url.host}"/>
+			<arg value="${app.ws.wsdl.url.port}"/>
+			<arg value="${app.ssl.truststore.file}"/>
+			<arg value="${app.ssl.truststore.pass}"/>
+			<arg value="true"/>
+			<arg value="true"/>
+		</java>
+		<wsimport fork="false" debug="true" verbose="true" keep="true" sourcedestdir="${app.src.dir}" package="${app.ws.dest.package}" wsdl="${app.ws.wsdl.url}">
+			<jvmarg value="-Djavax.net.ssl.trustStore=${basedir}/jssecacerts" />
+			<jvmarg value="-Djavax.net.ssl.trustStorePassword=changeit" />
+			<jvmarg value="-Djavax.net.ssl.keyStore=${basedir}/jssecacerts" />
+			<jvmarg value="-Djavax.net.ssl.keyStorePassword=changeit" />
+		</wsimport>
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/evo-gwt-library-build.xml b/trunk/PlanosActuacao/ant/evo-gwt-library-build.xml
new file mode 100644
index 00000000..925b756e
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/evo-gwt-library-build.xml
@@ -0,0 +1,14 @@
+<project name="evo-gwt-library-build" default="library-deploy" basedir="../"> 
+	
+	<target name="app-pre-build">
+		<copy verbose="true" failonerror="true" overwrite="true" todir="${app.build.dir}">
+			<fileset dir="${app.src.dir}">
+				<include name="**/*.java" />
+				<include name="*.java" />
+			</fileset>
+		</copy>
+	</target>
+	
+	<import file="evo-library-build.xml" />
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/evo-library-build.xml b/trunk/PlanosActuacao/ant/evo-library-build.xml
new file mode 100644
index 00000000..545cbb40
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/evo-library-build.xml
@@ -0,0 +1,21 @@
+<project name="evo-library-build" default="library-deploy" basedir="../"> 
+	
+	<import file="common/evo-app-build-common.xml" />
+	
+	<target name="deploy-default-project" depends="app-create-jar">
+		<mkdir dir="${deploy.project.dir}${file.separator}${deploy.project.relative.lib.dir}"/>
+		<copy failonerror="false" verbose="true" file="${app.dist.dir}/${app.jar.name}" toDir="${deploy.project.dir}${file.separator}${deploy.project.relative.lib.dir}" />
+	</target>
+	
+	<target name="deploy-project" if="deploy.project.dir">
+		<antcall target="deploy-default-project" />
+	</target>
+	
+	<target name="library-deploy" description="Deploys current version of evolute utilities" depends="load-static-properties">
+		<input defaultvalue="${basedir}" addproperty="deploy.project.dir">
+			<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.ProjectInputHandler"  />
+		</input>
+		<antcall target="deploy-project" />
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/ant/evo-tool-build.xml b/trunk/PlanosActuacao/ant/evo-tool-build.xml
new file mode 100644
index 00000000..043576b7
--- /dev/null
+++ b/trunk/PlanosActuacao/ant/evo-tool-build.xml
@@ -0,0 +1,21 @@
+<project name="evo-tool-build" default="tool-deploy" basedir="../"> 
+	
+	<import file="common/evo-app-build-common.xml" />
+	
+	<target name="deploy-default-tool" depends="app-create-jar">
+		<mkdir dir="${deploy.project.dir}/lib.tools"/>
+		<copy failonerror="false" verbose="true" file="${app.dist.dir}/${app.jar.name}" toDir="${deploy.project.dir}/lib.tools" />
+	</target>
+	
+	<target name="deploy-to-project" if="deploy.project.dir">
+		<antcall target="deploy-default-tool" />
+	</target>
+	
+	<target name="tool-deploy" description="Deploys current version of evolute utilities" depends="load-static-properties">
+		<input defaultvalue="${basedir}" addproperty="deploy.project.dir">
+			<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.ProjectInputHandler"  />
+		</input>
+		<antcall target="deploy-to-project" />
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/trunk/PlanosActuacao/build.xml b/trunk/PlanosActuacao/build.xml
index 053291e2..59d2394e 100644
--- a/trunk/PlanosActuacao/build.xml
+++ b/trunk/PlanosActuacao/build.xml
@@ -10,6 +10,9 @@
 <project name="PlanosActuacao" default="default" basedir=".">
     <description>Builds, tests, and runs the project PlanosActuacao.</description>
     <import file="nbproject/build-impl.xml"/>
+
+	<import file="ant/evo-app-multiple-client-build.xml" />
+
     <!--
 
     There exist several targets which are by default empty and which can be 
diff --git a/trunk/PlanosActuacao/deploy/lib/activation.jar b/trunk/PlanosActuacao/deploy/lib/activation.jar
new file mode 100644
index 00000000..589b6749
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/activation.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/appbase.jar b/trunk/PlanosActuacao/deploy/lib/appbase.jar
new file mode 100644
index 00000000..cfca6d0a
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/appbase.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/ashwood-2.0.jar b/trunk/PlanosActuacao/deploy/lib/ashwood-2.0.jar
new file mode 100644
index 00000000..55fcc9b1
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/ashwood-2.0.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/avalon-framework-4.2.0.jar b/trunk/PlanosActuacao/deploy/lib/avalon-framework-4.2.0.jar
new file mode 100644
index 00000000..b1aa6d7c
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/avalon-framework-4.2.0.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/batik-all-1.7.jar b/trunk/PlanosActuacao/deploy/lib/batik-all-1.7.jar
new file mode 100644
index 00000000..58932858
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/batik-all-1.7.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-beanutils-1.8.3.jar b/trunk/PlanosActuacao/deploy/lib/commons-beanutils-1.8.3.jar
new file mode 100644
index 00000000..218510bc
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/commons-beanutils-1.8.3.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-codec-1.3.jar b/trunk/PlanosActuacao/deploy/lib/commons-codec-1.3.jar
new file mode 100644
index 00000000..957b6752
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/commons-codec-1.3.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-collections-3.1.jar b/trunk/PlanosActuacao/deploy/lib/commons-collections-3.1.jar
new file mode 100644
index 00000000..41e230fe
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/commons-collections-3.1.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-digester-1.8.jar b/trunk/PlanosActuacao/deploy/lib/commons-digester-1.8.jar
new file mode 100644
index 00000000..1110f0aa
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/commons-digester-1.8.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-fileupload-1.2.1.jar b/trunk/PlanosActuacao/deploy/lib/commons-fileupload-1.2.1.jar
new file mode 100644
index 00000000..7db423ed
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/commons-fileupload-1.2.1.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-httpclient-3.1.jar b/trunk/PlanosActuacao/deploy/lib/commons-httpclient-3.1.jar
new file mode 100644
index 00000000..7c59774a
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/commons-httpclient-3.1.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-io-1.4.jar b/trunk/PlanosActuacao/deploy/lib/commons-io-1.4.jar
new file mode 100644
index 00000000..133dc6cb
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/commons-io-1.4.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-lang-2.4.jar b/trunk/PlanosActuacao/deploy/lib/commons-lang-2.4.jar
new file mode 100644
index 00000000..532939ec
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/commons-lang-2.4.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-logging-1.1.1.jar b/trunk/PlanosActuacao/deploy/lib/commons-logging-1.1.1.jar
new file mode 100644
index 00000000..1deef144
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/commons-logging-1.1.1.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-validator-1.3.1.jar b/trunk/PlanosActuacao/deploy/lib/commons-validator-1.3.1.jar
new file mode 100644
index 00000000..55b12b1a
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/commons-validator-1.3.1.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/cursos.jar b/trunk/PlanosActuacao/deploy/lib/cursos.jar
new file mode 100644
index 00000000..b9c85e84
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/cursos.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/dataprovider.jar b/trunk/PlanosActuacao/deploy/lib/dataprovider.jar
new file mode 100644
index 00000000..a12b68ad
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/dataprovider.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/dom4j-1.6.1.jar b/trunk/PlanosActuacao/deploy/lib/dom4j-1.6.1.jar
new file mode 100644
index 00000000..c8c4dbb9
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/dom4j-1.6.1.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/evologger.jar b/trunk/PlanosActuacao/deploy/lib/evologger.jar
new file mode 100644
index 00000000..57a7cc5d
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/evologger.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/evolute.jar b/trunk/PlanosActuacao/deploy/lib/evolute.jar
new file mode 100644
index 00000000..b0ef1483
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/evolute.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/fop.jar b/trunk/PlanosActuacao/deploy/lib/fop.jar
new file mode 100644
index 00000000..24419bcf
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/fop.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jai_imageio.jar b/trunk/PlanosActuacao/deploy/lib/jai_imageio.jar
new file mode 100644
index 00000000..359551eb
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/jai_imageio.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jdbcappender.jar b/trunk/PlanosActuacao/deploy/lib/jdbcappender.jar
new file mode 100644
index 00000000..fe9d3e67
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/jdbcappender.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jdom.jar b/trunk/PlanosActuacao/deploy/lib/jdom.jar
new file mode 100644
index 00000000..288e64cb
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/jdom.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jsf-api.jar b/trunk/PlanosActuacao/deploy/lib/jsf-api.jar
new file mode 100644
index 00000000..7824f8a0
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/jsf-api.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jsf-extensions-common-0.1.jar b/trunk/PlanosActuacao/deploy/lib/jsf-extensions-common-0.1.jar
new file mode 100644
index 00000000..e8766f33
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/jsf-extensions-common-0.1.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jsf-extensions-dynamic-faces-0.1.jar b/trunk/PlanosActuacao/deploy/lib/jsf-extensions-dynamic-faces-0.1.jar
new file mode 100644
index 00000000..4a5af1cd
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/jsf-extensions-dynamic-faces-0.1.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jsf-impl.jar b/trunk/PlanosActuacao/deploy/lib/jsf-impl.jar
new file mode 100644
index 00000000..d656bdc3
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/jsf-impl.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jsfcl.jar b/trunk/PlanosActuacao/deploy/lib/jsfcl.jar
new file mode 100644
index 00000000..524dc8af
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/jsfcl.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/json-2.jar b/trunk/PlanosActuacao/deploy/lib/json-2.jar
new file mode 100644
index 00000000..b89f579c
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/json-2.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jstl.jar b/trunk/PlanosActuacao/deploy/lib/jstl.jar
new file mode 100644
index 00000000..0e64b5fb
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/jstl.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/log4j-1.2.15.jar b/trunk/PlanosActuacao/deploy/lib/log4j-1.2.15.jar
new file mode 100644
index 00000000..c930a6ab
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/log4j-1.2.15.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/mail.jar b/trunk/PlanosActuacao/deploy/lib/mail.jar
new file mode 100644
index 00000000..59543774
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/mail.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/myfaces/commons-el-1.0.jar b/trunk/PlanosActuacao/deploy/lib/myfaces/commons-el-1.0.jar
new file mode 100644
index 00000000..608ed796
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/myfaces/commons-el-1.0.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/myfaces/tomahawk-1.1.10.jar b/trunk/PlanosActuacao/deploy/lib/myfaces/tomahawk-1.1.10.jar
new file mode 100644
index 00000000..36ef09f5
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/myfaces/tomahawk-1.1.10.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/myfaces/xmlParserAPIs-2.0.2.jar b/trunk/PlanosActuacao/deploy/lib/myfaces/xmlParserAPIs-2.0.2.jar
new file mode 100644
index 00000000..eae78043
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/myfaces/xmlParserAPIs-2.0.2.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/org.springframework.beans-3.0.0.jar b/trunk/PlanosActuacao/deploy/lib/org.springframework.beans-3.0.0.jar
new file mode 100644
index 00000000..37b9abe7
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/org.springframework.beans-3.0.0.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/org.springframework.context-3.0.0.jar b/trunk/PlanosActuacao/deploy/lib/org.springframework.context-3.0.0.jar
new file mode 100644
index 00000000..7869adbb
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/org.springframework.context-3.0.0.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/org.springframework.core-3.0.0.jar b/trunk/PlanosActuacao/deploy/lib/org.springframework.core-3.0.0.jar
new file mode 100644
index 00000000..8f0134ee
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/org.springframework.core-3.0.0.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/postgresql-9.0-801.jdbc4.jar b/trunk/PlanosActuacao/deploy/lib/postgresql-9.0-801.jdbc4.jar
new file mode 100644
index 00000000..63e54165
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/postgresql-9.0-801.jdbc4.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-api-3.3.3.Final.jar b/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-api-3.3.3.Final.jar
new file mode 100644
index 00000000..0aeb97a6
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-api-3.3.3.Final.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-impl-3.3.3.Final.jar b/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-impl-3.3.3.Final.jar
new file mode 100644
index 00000000..6c61a7fd
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-impl-3.3.3.Final.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-ui-3.3.3.Final.jar b/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-ui-3.3.3.Final.jar
new file mode 100644
index 00000000..6b02e055
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-ui-3.3.3.Final.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/serializer-2.7.0.jar b/trunk/PlanosActuacao/deploy/lib/serializer-2.7.0.jar
new file mode 100644
index 00000000..7cd80696
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/serializer-2.7.0.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/shst.jar b/trunk/PlanosActuacao/deploy/lib/shst.jar
new file mode 100644
index 00000000..6b1cd8ac
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/shst.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/spring-ws-core-1.5.9.jar b/trunk/PlanosActuacao/deploy/lib/spring-ws-core-1.5.9.jar
new file mode 100644
index 00000000..8c944048
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/spring-ws-core-1.5.9.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/spring-ws-core-tiger-1.5.9.jar b/trunk/PlanosActuacao/deploy/lib/spring-ws-core-tiger-1.5.9.jar
new file mode 100644
index 00000000..8dabf02e
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/spring-ws-core-tiger-1.5.9.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/spring-ws-support-1.5.9.jar b/trunk/PlanosActuacao/deploy/lib/spring-ws-support-1.5.9.jar
new file mode 100644
index 00000000..82796229
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/spring-ws-support-1.5.9.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/spring-xml-1.5.9.jar b/trunk/PlanosActuacao/deploy/lib/spring-xml-1.5.9.jar
new file mode 100644
index 00000000..10a8905b
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/spring-xml-1.5.9.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/sqlx.jar b/trunk/PlanosActuacao/deploy/lib/sqlx.jar
new file mode 100644
index 00000000..2b341bb3
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/sqlx.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/standard.jar b/trunk/PlanosActuacao/deploy/lib/standard.jar
new file mode 100644
index 00000000..ab559dd1
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/standard.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/truelicense.jar b/trunk/PlanosActuacao/deploy/lib/truelicense.jar
new file mode 100644
index 00000000..8c56bd12
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/truelicense.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/webui-jsf-suntheme.jar b/trunk/PlanosActuacao/deploy/lib/webui-jsf-suntheme.jar
new file mode 100644
index 00000000..8a69ce70
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/webui-jsf-suntheme.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/webui-jsf.jar b/trunk/PlanosActuacao/deploy/lib/webui-jsf.jar
new file mode 100644
index 00000000..9c939bbc
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/webui-jsf.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/xalan-2.7.0.jar b/trunk/PlanosActuacao/deploy/lib/xalan-2.7.0.jar
new file mode 100644
index 00000000..979ee761
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/xalan-2.7.0.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/xercesImpl-2.7.1.jar b/trunk/PlanosActuacao/deploy/lib/xercesImpl-2.7.1.jar
new file mode 100644
index 00000000..eac75ae8
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/xercesImpl-2.7.1.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/xml-apis-1.3.04.jar b/trunk/PlanosActuacao/deploy/lib/xml-apis-1.3.04.jar
new file mode 100644
index 00000000..d42c0ea6
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/xml-apis-1.3.04.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/xml-apis-ext-1.3.04.jar b/trunk/PlanosActuacao/deploy/lib/xml-apis-ext-1.3.04.jar
new file mode 100644
index 00000000..a7869d68
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/xml-apis-ext-1.3.04.jar differ
diff --git a/trunk/PlanosActuacao/deploy/lib/xmlgraphics-commons-1.3.1.jar b/trunk/PlanosActuacao/deploy/lib/xmlgraphics-commons-1.3.1.jar
new file mode 100644
index 00000000..81a485dc
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/lib/xmlgraphics-commons-1.3.1.jar differ
diff --git a/trunk/PlanosActuacao/deploy/siprp_planosactuacao_importer.jar b/trunk/PlanosActuacao/deploy/siprp_planosactuacao_importer.jar
new file mode 100644
index 00000000..1a1bd35b
Binary files /dev/null and b/trunk/PlanosActuacao/deploy/siprp_planosactuacao_importer.jar differ
diff --git a/trunk/PlanosActuacao/jnlp/extensions/production/activation.jnlp b/trunk/PlanosActuacao/jnlp/extensions/production/activation.jnlp
new file mode 100644
index 00000000..e217210d
--- /dev/null
+++ b/trunk/PlanosActuacao/jnlp/extensions/production/activation.jnlp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/siprp_planosactuacao_importer" href="siprp_planosactuacao_importer.jnlp">
+  <information>
+    <title>PlanosActuacaoImporter</title>
+    <vendor>Evolute 2011</vendor>
+    <homepage href="http://www.evolute.pt/~software/siprp_planosactuacao_importer" />
+    <description>PlanosActuacaoImporter, vv1.0.3</description>
+    <description kind="short">v1.0.3</description>
+    <offline-allowed />
+    <shortcut online="true">
+      <desktop />
+    </shortcut>
+  </information>
+  <security>
+    <all-permissions />
+  </security>
+  <update check="timeout" policy="always" />
+  <resources>
+    <j2se version="1.6.+" />
+    <jar href="lib/activation.jar" />
+  </resources>
+  <component-desc />
+</jnlp>
+
diff --git a/trunk/PlanosActuacao/jnlp/extensions/production/mail.jnlp b/trunk/PlanosActuacao/jnlp/extensions/production/mail.jnlp
new file mode 100644
index 00000000..b7ee7bd2
--- /dev/null
+++ b/trunk/PlanosActuacao/jnlp/extensions/production/mail.jnlp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/siprp_planosactuacao_importer" href="siprp_planosactuacao_importer.jnlp">
+  <information>
+    <title>PlanosActuacaoImporter</title>
+    <vendor>Evolute 2011</vendor>
+    <homepage href="http://www.evolute.pt/~software/siprp_planosactuacao_importer" />
+    <description>PlanosActuacaoImporter, vv1.0.3</description>
+    <description kind="short">v1.0.3</description>
+    <offline-allowed />
+    <shortcut online="true">
+      <desktop />
+    </shortcut>
+  </information>
+  <security>
+    <all-permissions />
+  </security>
+  <update check="timeout" policy="always" />
+  <resources>
+    <j2se version="1.6.+" />
+    <jar href="lib/mail.jar" />
+  </resources>
+  <component-desc />
+</jnlp>
+
diff --git a/trunk/PlanosActuacao/jnlp/extensions/test/activation.jnlp b/trunk/PlanosActuacao/jnlp/extensions/test/activation.jnlp
new file mode 100644
index 00000000..86a0ae59
--- /dev/null
+++ b/trunk/PlanosActuacao/jnlp/extensions/test/activation.jnlp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/versoes_teste/siprp_planosactuacao_importer" href="siprp_planosactuacao_importer.jnlp">
+  <information>
+    <title>PlanosActuacaoImporter</title>
+    <vendor>Evolute 2011</vendor>
+    <homepage href="http://www.evolute.pt/~software/siprp_planosactuacao_importer" />
+    <description>PlanosActuacaoImporter, vv1.0.3</description>
+    <description kind="short">v1.0.3</description>
+    <offline-allowed />
+    <shortcut online="true">
+      <desktop />
+    </shortcut>
+  </information>
+  <security>
+    <all-permissions />
+  </security>
+  <update check="timeout" policy="always" />
+  <resources>
+    <j2se version="1.6.+" />
+    <jar href="lib/activation.jar" />
+  </resources>
+  <component-desc />
+</jnlp>
+
diff --git a/trunk/PlanosActuacao/jnlp/extensions/test/mail.jnlp b/trunk/PlanosActuacao/jnlp/extensions/test/mail.jnlp
new file mode 100644
index 00000000..9a02f0f9
--- /dev/null
+++ b/trunk/PlanosActuacao/jnlp/extensions/test/mail.jnlp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/versoes_teste/siprp_planosactuacao_importer" href="siprp_planosactuacao_importer.jnlp">
+  <information>
+    <title>PlanosActuacaoImporter</title>
+    <vendor>Evolute 2011</vendor>
+    <homepage href="http://www.evolute.pt/~software/siprp_planosactuacao_importer" />
+    <description>PlanosActuacaoImporter, vv1.0.3</description>
+    <description kind="short">v1.0.3</description>
+    <offline-allowed />
+    <shortcut online="true">
+      <desktop />
+    </shortcut>
+  </information>
+  <security>
+    <all-permissions />
+  </security>
+  <update check="timeout" policy="always" />
+  <resources>
+    <j2se version="1.6.+" />
+    <jar href="lib/mail.jar" />
+  </resources>
+  <component-desc />
+</jnlp>
+
diff --git a/trunk/PlanosActuacao/jnlp/production/siprp_planosactuacao_importer.jnlp b/trunk/PlanosActuacao/jnlp/production/siprp_planosactuacao_importer.jnlp
new file mode 100644
index 00000000..378cd913
--- /dev/null
+++ b/trunk/PlanosActuacao/jnlp/production/siprp_planosactuacao_importer.jnlp
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc//DTD JNLP Descriptor 6.0//EN" "http://java.sun.com/dtd/JNLP-6.0.dtd">
+
+<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/siprp_planosactuacao_importer" href="siprp_planosactuacao_importer.jnlp">
+  <information>
+    <title>PlanosActuacaoImporter</title>
+    <vendor>Evolute 2011</vendor>
+    <homepage href="http://www.evolute.pt/~software/siprp_planosactuacao_importer" />
+    <description>PlanosActuacaoImporter, vv1.0.3</description>
+    <description kind="short">v1.0.3</description>
+    <offline-allowed />
+    <shortcut online="true">
+      <desktop />
+    </shortcut>
+  </information>
+  <security>
+    <all-permissions />
+  </security>
+  <update check="timeout" policy="always" />
+  <resources>
+    <j2se version="1.6.+" initial-heap-size="64M" max-heap-size="512M" />
+    <jar href="siprp_planosactuacao_importer.jar" />
+    <extension name="activation" href="activation.jnlp" />
+    <jar href="lib/appbase.jar" />
+    <jar href="lib/ashwood-2.0.jar" />
+    <jar href="lib/avalon-framework-4.2.0.jar" />
+    <jar href="lib/batik-all-1.7.jar" />
+    <jar href="lib/commons-beanutils-1.8.3.jar" />
+    <jar href="lib/commons-codec-1.3.jar" />
+    <jar href="lib/commons-collections-3.1.jar" />
+    <jar href="lib/commons-digester-1.8.jar" />
+    <jar href="lib/commons-fileupload-1.2.1.jar" />
+    <jar href="lib/commons-httpclient-3.1.jar" />
+    <jar href="lib/commons-io-1.4.jar" />
+    <jar href="lib/commons-lang-2.4.jar" />
+    <jar href="lib/commons-logging-1.1.1.jar" />
+    <jar href="lib/commons-validator-1.3.1.jar" />
+    <jar href="lib/cursos.jar" />
+    <jar href="lib/dataprovider.jar" />
+    <jar href="lib/dom4j-1.6.1.jar" />
+    <jar href="lib/evologger.jar" />
+    <jar href="lib/evolute.jar" />
+    <jar href="lib/fop.jar" />
+    <jar href="lib/jai_imageio.jar" />
+    <jar href="lib/jdbcappender.jar" />
+    <jar href="lib/jdom.jar" />
+    <jar href="lib/jsf-api.jar" />
+    <jar href="lib/jsf-extensions-common-0.1.jar" />
+    <jar href="lib/jsf-extensions-dynamic-faces-0.1.jar" />
+    <jar href="lib/jsf-impl.jar" />
+    <jar href="lib/jsfcl.jar" />
+    <jar href="lib/json-2.jar" />
+    <jar href="lib/jstl.jar" />
+    <jar href="lib/log4j-1.2.15.jar" />
+    <extension name="mail" href="mail.jnlp" />
+    <jar href="lib/org.springframework.beans-3.0.0.jar" />
+    <jar href="lib/org.springframework.context-3.0.0.jar" />
+    <jar href="lib/org.springframework.core-3.0.0.jar" />
+    <jar href="lib/postgresql-9.0-801.jdbc4.jar" />
+    <jar href="lib/serializer-2.7.0.jar" />
+    <jar href="lib/shst.jar" />
+    <jar href="lib/spring-ws-core-1.5.9.jar" />
+    <jar href="lib/spring-ws-core-tiger-1.5.9.jar" />
+    <jar href="lib/spring-ws-support-1.5.9.jar" />
+    <jar href="lib/spring-xml-1.5.9.jar" />
+    <jar href="lib/sqlx.jar" />
+    <jar href="lib/standard.jar" />
+    <jar href="lib/truelicense.jar" />
+    <jar href="lib/webui-jsf-suntheme.jar" />
+    <jar href="lib/webui-jsf.jar" />
+    <jar href="lib/xalan-2.7.0.jar" />
+    <jar href="lib/xercesImpl-2.7.1.jar" />
+    <jar href="lib/xml-apis-1.3.04.jar" />
+    <jar href="lib/xml-apis-ext-1.3.04.jar" />
+    <jar href="lib/xmlgraphics-commons-1.3.1.jar" />
+  </resources>
+  <application-desc main-class="importer.PlanosActuacaoImporter" />
+</jnlp>
+
diff --git a/trunk/PlanosActuacao/jnlp/test/siprp_planosactuacao_importer.jnlp b/trunk/PlanosActuacao/jnlp/test/siprp_planosactuacao_importer.jnlp
new file mode 100644
index 00000000..a605bb04
--- /dev/null
+++ b/trunk/PlanosActuacao/jnlp/test/siprp_planosactuacao_importer.jnlp
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc//DTD JNLP Descriptor 6.0//EN" "http://java.sun.com/dtd/JNLP-6.0.dtd">
+
+<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/versoes_teste/siprp_planosactuacao_importer" href="siprp_planosactuacao_importer.jnlp">
+  <information>
+    <title>PlanosActuacaoImporter</title>
+    <vendor>Evolute 2011</vendor>
+    <homepage href="http://www.evolute.pt/~software/versoes_teste/siprp_planosactuacao_importer" />
+    <description>PlanosActuacaoImporter, vv1.0.3</description>
+    <description kind="short">v1.0.3</description>
+    <offline-allowed />
+    <shortcut online="true">
+      <desktop />
+    </shortcut>
+  </information>
+  <security>
+    <all-permissions />
+  </security>
+  <update check="timeout" policy="always" />
+  <resources>
+    <j2se version="1.6.+" initial-heap-size="64M" max-heap-size="512M" />
+    <jar href="siprp_planosactuacao_importer.jar" />
+    <extension name="activation" href="activation.jnlp" />
+    <jar href="lib/appbase.jar" />
+    <jar href="lib/ashwood-2.0.jar" />
+    <jar href="lib/avalon-framework-4.2.0.jar" />
+    <jar href="lib/batik-all-1.7.jar" />
+    <jar href="lib/commons-beanutils-1.8.3.jar" />
+    <jar href="lib/commons-codec-1.3.jar" />
+    <jar href="lib/commons-collections-3.1.jar" />
+    <jar href="lib/commons-digester-1.8.jar" />
+    <jar href="lib/commons-fileupload-1.2.1.jar" />
+    <jar href="lib/commons-httpclient-3.1.jar" />
+    <jar href="lib/commons-io-1.4.jar" />
+    <jar href="lib/commons-lang-2.4.jar" />
+    <jar href="lib/commons-logging-1.1.1.jar" />
+    <jar href="lib/commons-validator-1.3.1.jar" />
+    <jar href="lib/cursos.jar" />
+    <jar href="lib/dataprovider.jar" />
+    <jar href="lib/dom4j-1.6.1.jar" />
+    <jar href="lib/evologger.jar" />
+    <jar href="lib/evolute.jar" />
+    <jar href="lib/fop.jar" />
+    <jar href="lib/jai_imageio.jar" />
+    <jar href="lib/jdbcappender.jar" />
+    <jar href="lib/jdom.jar" />
+    <jar href="lib/jsf-api.jar" />
+    <jar href="lib/jsf-extensions-common-0.1.jar" />
+    <jar href="lib/jsf-extensions-dynamic-faces-0.1.jar" />
+    <jar href="lib/jsf-impl.jar" />
+    <jar href="lib/jsfcl.jar" />
+    <jar href="lib/json-2.jar" />
+    <jar href="lib/jstl.jar" />
+    <jar href="lib/log4j-1.2.15.jar" />
+    <extension name="mail" href="mail.jnlp" />
+    <jar href="lib/org.springframework.beans-3.0.0.jar" />
+    <jar href="lib/org.springframework.context-3.0.0.jar" />
+    <jar href="lib/org.springframework.core-3.0.0.jar" />
+    <jar href="lib/postgresql-9.0-801.jdbc4.jar" />
+    <jar href="lib/serializer-2.7.0.jar" />
+    <jar href="lib/shst.jar" />
+    <jar href="lib/spring-ws-core-1.5.9.jar" />
+    <jar href="lib/spring-ws-core-tiger-1.5.9.jar" />
+    <jar href="lib/spring-ws-support-1.5.9.jar" />
+    <jar href="lib/spring-xml-1.5.9.jar" />
+    <jar href="lib/sqlx.jar" />
+    <jar href="lib/standard.jar" />
+    <jar href="lib/truelicense.jar" />
+    <jar href="lib/webui-jsf-suntheme.jar" />
+    <jar href="lib/webui-jsf.jar" />
+    <jar href="lib/xalan-2.7.0.jar" />
+    <jar href="lib/xercesImpl-2.7.1.jar" />
+    <jar href="lib/xml-apis-1.3.04.jar" />
+    <jar href="lib/xml-apis-ext-1.3.04.jar" />
+    <jar href="lib/xmlgraphics-commons-1.3.1.jar" />
+  </resources>
+  <application-desc main-class="importer.PlanosActuacaoImporter" />
+</jnlp>
+
diff --git a/trunk/PlanosActuacao/lib.tools/ant-classloadertask.jar b/trunk/PlanosActuacao/lib.tools/ant-classloadertask.jar
new file mode 100644
index 00000000..d2f58d9f
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/ant-classloadertask.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/ant-jsch.jar b/trunk/PlanosActuacao/lib.tools/ant-jsch.jar
new file mode 100644
index 00000000..59f5fd1e
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/ant-jsch.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/ant-launcher.jar b/trunk/PlanosActuacao/lib.tools/ant-launcher.jar
new file mode 100644
index 00000000..939abb57
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/ant-launcher.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/ant.jar b/trunk/PlanosActuacao/lib.tools/ant.jar
new file mode 100644
index 00000000..7f5be4a4
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/ant.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/el-api.jar b/trunk/PlanosActuacao/lib.tools/el-api.jar
new file mode 100644
index 00000000..1635111e
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/el-api.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/evo-ant.jar b/trunk/PlanosActuacao/lib.tools/evo-ant.jar
new file mode 100644
index 00000000..491edd1a
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/evo-ant.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/evoservices.jar b/trunk/PlanosActuacao/lib.tools/evoservices.jar
new file mode 100644
index 00000000..b8bebdde
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/evoservices.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/jaxen-1.1.1.jar b/trunk/PlanosActuacao/lib.tools/jaxen-1.1.1.jar
new file mode 100644
index 00000000..b6336311
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/jaxen-1.1.1.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/jdom.jar b/trunk/PlanosActuacao/lib.tools/jdom.jar
new file mode 100644
index 00000000..288e64cb
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/jdom.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/jsch-0.1.41.jar b/trunk/PlanosActuacao/lib.tools/jsch-0.1.41.jar
new file mode 100644
index 00000000..eb1e7647
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/jsch-0.1.41.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/jsp-api.jar b/trunk/PlanosActuacao/lib.tools/jsp-api.jar
new file mode 100644
index 00000000..d416e2b4
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/jsp-api.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/proguard.jar b/trunk/PlanosActuacao/lib.tools/proguard.jar
new file mode 100644
index 00000000..3a9aebcf
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/proguard.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/servlet-api.jar b/trunk/PlanosActuacao/lib.tools/servlet-api.jar
new file mode 100644
index 00000000..216c68c3
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/servlet-api.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/svnClientAdapter.jar b/trunk/PlanosActuacao/lib.tools/svnClientAdapter.jar
new file mode 100644
index 00000000..ed37ba46
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/svnClientAdapter.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/svnant.jar b/trunk/PlanosActuacao/lib.tools/svnant.jar
new file mode 100644
index 00000000..af52be0d
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/svnant.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/svnjavahl.jar b/trunk/PlanosActuacao/lib.tools/svnjavahl.jar
new file mode 100644
index 00000000..71873057
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/svnjavahl.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/svnkit.jar b/trunk/PlanosActuacao/lib.tools/svnkit.jar
new file mode 100644
index 00000000..2f53f492
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/svnkit.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/truelicense.jar b/trunk/PlanosActuacao/lib.tools/truelicense.jar
new file mode 100644
index 00000000..8c56bd12
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/truelicense.jar differ
diff --git a/trunk/PlanosActuacao/lib.tools/truexml.jar b/trunk/PlanosActuacao/lib.tools/truexml.jar
new file mode 100644
index 00000000..6ce23e31
Binary files /dev/null and b/trunk/PlanosActuacao/lib.tools/truexml.jar differ
diff --git a/trunk/PlanosActuacao/lib/appbase.jar b/trunk/PlanosActuacao/lib/appbase.jar
new file mode 100644
index 00000000..cfca6d0a
Binary files /dev/null and b/trunk/PlanosActuacao/lib/appbase.jar differ
diff --git a/trunk/PlanosActuacao/lib/dataprovider.jar b/trunk/PlanosActuacao/lib/dataprovider.jar
new file mode 100644
index 00000000..a12b68ad
Binary files /dev/null and b/trunk/PlanosActuacao/lib/dataprovider.jar differ
diff --git a/trunk/PlanosActuacao/lib/evolute.jar b/trunk/PlanosActuacao/lib/evolute.jar
index 8540b672..b0ef1483 100644
Binary files a/trunk/PlanosActuacao/lib/evolute.jar and b/trunk/PlanosActuacao/lib/evolute.jar differ
diff --git a/trunk/PlanosActuacao/lib/jsf-api.jar b/trunk/PlanosActuacao/lib/jsf-api.jar
new file mode 100644
index 00000000..7824f8a0
Binary files /dev/null and b/trunk/PlanosActuacao/lib/jsf-api.jar differ
diff --git a/trunk/PlanosActuacao/lib/jsf-extensions-common-0.1.jar b/trunk/PlanosActuacao/lib/jsf-extensions-common-0.1.jar
new file mode 100644
index 00000000..e8766f33
Binary files /dev/null and b/trunk/PlanosActuacao/lib/jsf-extensions-common-0.1.jar differ
diff --git a/trunk/PlanosActuacao/lib/jsf-extensions-dynamic-faces-0.1.jar b/trunk/PlanosActuacao/lib/jsf-extensions-dynamic-faces-0.1.jar
new file mode 100644
index 00000000..4a5af1cd
Binary files /dev/null and b/trunk/PlanosActuacao/lib/jsf-extensions-dynamic-faces-0.1.jar differ
diff --git a/trunk/PlanosActuacao/lib/jsf-impl.jar b/trunk/PlanosActuacao/lib/jsf-impl.jar
new file mode 100644
index 00000000..d656bdc3
Binary files /dev/null and b/trunk/PlanosActuacao/lib/jsf-impl.jar differ
diff --git a/trunk/PlanosActuacao/lib/jsfcl.jar b/trunk/PlanosActuacao/lib/jsfcl.jar
new file mode 100644
index 00000000..524dc8af
Binary files /dev/null and b/trunk/PlanosActuacao/lib/jsfcl.jar differ
diff --git a/trunk/PlanosActuacao/lib/json-2.jar b/trunk/PlanosActuacao/lib/json-2.jar
new file mode 100644
index 00000000..b89f579c
Binary files /dev/null and b/trunk/PlanosActuacao/lib/json-2.jar differ
diff --git a/trunk/PlanosActuacao/lib/jstl.jar b/trunk/PlanosActuacao/lib/jstl.jar
new file mode 100644
index 00000000..0e64b5fb
Binary files /dev/null and b/trunk/PlanosActuacao/lib/jstl.jar differ
diff --git a/trunk/PlanosActuacao/lib/sqlx.jar b/trunk/PlanosActuacao/lib/sqlx.jar
new file mode 100644
index 00000000..2b341bb3
Binary files /dev/null and b/trunk/PlanosActuacao/lib/sqlx.jar differ
diff --git a/trunk/PlanosActuacao/lib/standard.jar b/trunk/PlanosActuacao/lib/standard.jar
new file mode 100644
index 00000000..ab559dd1
Binary files /dev/null and b/trunk/PlanosActuacao/lib/standard.jar differ
diff --git a/trunk/PlanosActuacao/lib/webui-jsf-suntheme.jar b/trunk/PlanosActuacao/lib/webui-jsf-suntheme.jar
new file mode 100644
index 00000000..8a69ce70
Binary files /dev/null and b/trunk/PlanosActuacao/lib/webui-jsf-suntheme.jar differ
diff --git a/trunk/PlanosActuacao/lib/webui-jsf.jar b/trunk/PlanosActuacao/lib/webui-jsf.jar
new file mode 100644
index 00000000..9c939bbc
Binary files /dev/null and b/trunk/PlanosActuacao/lib/webui-jsf.jar differ
diff --git a/trunk/PlanosActuacao/nbproject/build-impl.xml b/trunk/PlanosActuacao/nbproject/build-impl.xml
index 2da747d3..d82f536d 100644
--- a/trunk/PlanosActuacao/nbproject/build-impl.xml
+++ b/trunk/PlanosActuacao/nbproject/build-impl.xml
@@ -516,12 +516,8 @@ exists or setup the property manually. For example like this:
     </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">
-        <copyfiles files="${libs.jsf12.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.jsf12.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="${libs.jsf12-support.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.jsf12-support.classpath" todir="${dist.ear.dir}"/>
-        <copyfiles files="${libs.woodstock-components.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.woodstock-components.classpath" todir="${dist.ear.dir}"/>
-        <copyfiles files="${libs.woodstock-theme-default.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.woodstock-theme-default.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.appbase.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.appbase.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.ashwood-2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.ashwood-2.0.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-all-1.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.batik-all-1.7.jar" todir="${dist.ear.dir}"/>
@@ -536,6 +532,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.commons-logging-1.1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-logging-1.1.1.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.commons-validator-1.3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-validator-1.3.1.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.cursos.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.cursos.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.dom4j-1.6.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.dom4j-1.6.1.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.evologger.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.evologger.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}"/>
@@ -543,6 +540,13 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jai_imageio.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jai_imageio.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.jdbcappender.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jdbcappender.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.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-extensions-common-0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jsf-extensions-common-0.1.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.jsf-extensions-dynamic-faces-0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jsf-extensions-dynamic-faces-0.1.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.jsfcl.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jsfcl.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.json-2.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.json-2.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.jstl.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jstl.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.log4j-1.2.15.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.log4j-1.2.15.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.mail.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.mail.jar-1" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.org.springframework.beans-3.0.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.org.springframework.beans-3.0.0.jar" todir="${dist.ear.dir}"/>
@@ -555,7 +559,11 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.spring-ws-core-tiger-1.5.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.spring-ws-core-tiger-1.5.9.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.spring-ws-support-1.5.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.spring-ws-support-1.5.9.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.spring-xml-1.5.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.spring-xml-1.5.9.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.sqlx.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.sqlx.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.standard.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.standard.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.truelicense.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.truelicense.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.webui-jsf-suntheme.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.webui-jsf-suntheme.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.webui-jsf.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.webui-jsf.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.xalan-2.7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xalan-2.7.0.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.xercesImpl-2.7.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xercesImpl-2.7.1.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.xml-apis-1.3.04.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xml-apis-1.3.04.jar" todir="${dist.ear.dir}"/>
@@ -570,16 +578,12 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Class-Path" value="${manifest.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.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.commons-beanutils-1.8.3.jar} ${manifest.file.reference.commons-codec-1.3.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-digester-1.8.jar} ${manifest.file.reference.commons-fileupload-1.2.1.jar} ${manifest.file.reference.commons-httpclient-3.1.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-lang-2.4.jar} ${manifest.file.reference.commons-logging-1.1.1.jar} ${manifest.file.reference.commons-validator-1.3.1.jar} ${manifest.file.reference.cursos.jar} ${manifest.file.reference.dom4j-1.6.1.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.jdbcappender.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.org.springframework.beans-3.0.0.jar} ${manifest.file.reference.org.springframework.context-3.0.0.jar} ${manifest.file.reference.org.springframework.core-3.0.0.jar} ${manifest.file.reference.postgresql-9.0-801.jdbc4.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.shst.jar} ${manifest.file.reference.spring-ws-core-1.5.9.jar} ${manifest.file.reference.spring-ws-core-tiger-1.5.9.jar} ${manifest.file.reference.spring-ws-support-1.5.9.jar} ${manifest.file.reference.spring-xml-1.5.9.jar} ${manifest.file.reference.truelicense.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.richfaces-api-3.3.3.Final.jar} ${manifest.file.reference.richfaces-impl-3.3.3.Final.jar} ${manifest.file.reference.richfaces-ui-3.3.3.Final.jar} ${manifest.file.reference.commons-el-1.0.jar} ${manifest.file.reference.tomahawk-1.1.10.jar} ${manifest.file.reference.xmlParserAPIs-2.0.2.jar} "/>
+            <attribute name="Class-Path" value="${manifest.file.reference.activation.jar} ${manifest.file.reference.appbase.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.commons-beanutils-1.8.3.jar} ${manifest.file.reference.commons-codec-1.3.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-digester-1.8.jar} ${manifest.file.reference.commons-fileupload-1.2.1.jar} ${manifest.file.reference.commons-httpclient-3.1.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-lang-2.4.jar} ${manifest.file.reference.commons-logging-1.1.1.jar} ${manifest.file.reference.commons-validator-1.3.1.jar} ${manifest.file.reference.cursos.jar} ${manifest.file.reference.dataprovider.jar} ${manifest.file.reference.dom4j-1.6.1.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.jdbcappender.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.jsf-api.jar} ${manifest.file.reference.jsf-extensions-common-0.1.jar} ${manifest.file.reference.jsf-extensions-dynamic-faces-0.1.jar} ${manifest.file.reference.jsf-impl.jar} ${manifest.file.reference.jsfcl.jar} ${manifest.file.reference.json-2.jar} ${manifest.file.reference.jstl.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.org.springframework.beans-3.0.0.jar} ${manifest.file.reference.org.springframework.context-3.0.0.jar} ${manifest.file.reference.org.springframework.core-3.0.0.jar} ${manifest.file.reference.postgresql-9.0-801.jdbc4.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.shst.jar} ${manifest.file.reference.spring-ws-core-1.5.9.jar} ${manifest.file.reference.spring-ws-core-tiger-1.5.9.jar} ${manifest.file.reference.spring-ws-support-1.5.9.jar} ${manifest.file.reference.spring-xml-1.5.9.jar} ${manifest.file.reference.sqlx.jar} ${manifest.file.reference.standard.jar} ${manifest.file.reference.truelicense.jar} ${manifest.file.reference.webui-jsf-suntheme.jar} ${manifest.file.reference.webui-jsf.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.richfaces-api-3.3.3.Final.jar} ${manifest.file.reference.richfaces-impl-3.3.3.Final.jar} ${manifest.file.reference.richfaces-ui-3.3.3.Final.jar} ${manifest.file.reference.commons-el-1.0.jar} ${manifest.file.reference.tomahawk-1.1.10.jar} ${manifest.file.reference.xmlParserAPIs-2.0.2.jar} "/>
         </manifest>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
-        <copyfiles files="${libs.jsf12.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.jstl11.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.jsf12-support.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.woodstock-components.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.woodstock-theme-default.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.appbase.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.ashwood-2.0.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-all-1.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
@@ -594,6 +598,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.commons-logging-1.1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-validator-1.3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.cursos.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.dom4j-1.6.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.evologger.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.evolute.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
@@ -601,6 +606,13 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jai_imageio.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jdbcappender.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.jsf-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jsf-extensions-common-0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jsf-extensions-dynamic-faces-0.1.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.jsfcl.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.json-2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jstl.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.log4j-1.2.15.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.mail.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.org.springframework.beans-3.0.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
@@ -613,7 +625,11 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.spring-ws-core-tiger-1.5.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.spring-ws-support-1.5.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.spring-xml-1.5.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.sqlx.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.standard.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.truelicense.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.webui-jsf-suntheme.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.webui-jsf.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.xalan-2.7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.xercesImpl-2.7.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.xml-apis-1.3.04.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
diff --git a/trunk/PlanosActuacao/nbproject/genfiles.properties b/trunk/PlanosActuacao/nbproject/genfiles.properties
index 042ed3a6..9602dc74 100644
--- a/trunk/PlanosActuacao/nbproject/genfiles.properties
+++ b/trunk/PlanosActuacao/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=50b8b881
 build.xml.stylesheet.CRC32=c0ebde35@1.15.2.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=bcd9760d
-nbproject/build-impl.xml.script.CRC32=65855de9
+nbproject/build-impl.xml.data.CRC32=c7d4e274
+nbproject/build-impl.xml.script.CRC32=9d729bb1
 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 60f555b3..c8ea55ec 100644
--- a/trunk/PlanosActuacao/nbproject/project.properties
+++ b/trunk/PlanosActuacao/nbproject/project.properties
@@ -22,6 +22,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
 excludes=
 file.reference.activation.jar=lib/activation.jar
+file.reference.appbase.jar=lib/appbase.jar
 file.reference.ashwood-2.0.jar=lib/ashwood-2.0.jar
 file.reference.avalon-framework-4.2.0.jar=lib/avalon-framework-4.2.0.jar
 file.reference.batik-all-1.7.jar=lib/batik-all-1.7.jar
@@ -38,6 +39,7 @@ file.reference.commons-lang-2.4.jar=lib/commons-lang-2.4.jar
 file.reference.commons-logging-1.1.1.jar=lib/commons-logging-1.1.1.jar
 file.reference.commons-validator-1.3.1.jar=lib/commons-validator-1.3.1.jar
 file.reference.cursos.jar=lib/cursos.jar
+file.reference.dataprovider.jar=lib/dataprovider.jar
 file.reference.dom4j-1.6.1.jar=lib/dom4j-1.6.1.jar
 file.reference.evologger.jar=lib/evologger.jar
 file.reference.evolute.jar=lib/evolute.jar
@@ -45,6 +47,13 @@ file.reference.fop.jar=lib/fop.jar
 file.reference.jai_imageio.jar=lib/jai_imageio.jar
 file.reference.jdbcappender.jar=lib/jdbcappender.jar
 file.reference.jdom.jar=lib/jdom.jar
+file.reference.jsf-api.jar=lib/jsf-api.jar
+file.reference.jsf-extensions-common-0.1.jar=lib/jsf-extensions-common-0.1.jar
+file.reference.jsf-extensions-dynamic-faces-0.1.jar=lib/jsf-extensions-dynamic-faces-0.1.jar
+file.reference.jsf-impl.jar=lib/jsf-impl.jar
+file.reference.jsfcl.jar=lib/jsfcl.jar
+file.reference.json-2.jar=lib/json-2.jar
+file.reference.jstl.jar=lib/jstl.jar
 file.reference.log4j-1.2.15.jar=lib/log4j-1.2.15.jar
 file.reference.mail.jar-1=lib/mail.jar
 file.reference.org.springframework.beans-3.0.0.jar=lib/org.springframework.beans-3.0.0.jar
@@ -60,8 +69,12 @@ file.reference.spring-ws-core-1.5.9.jar=lib/spring-ws-core-1.5.9.jar
 file.reference.spring-ws-core-tiger-1.5.9.jar=lib/spring-ws-core-tiger-1.5.9.jar
 file.reference.spring-ws-support-1.5.9.jar=lib/spring-ws-support-1.5.9.jar
 file.reference.spring-xml-1.5.9.jar=lib/spring-xml-1.5.9.jar
+file.reference.sqlx.jar=lib/sqlx.jar
+file.reference.standard.jar=lib/standard.jar
 file.reference.tomahawk-1.1.10.jar=lib/myfaces/tomahawk-1.1.10.jar
 file.reference.truelicense.jar=lib/truelicense.jar
+file.reference.webui-jsf-suntheme.jar=lib/webui-jsf-suntheme.jar
+file.reference.webui-jsf.jar=lib/webui-jsf.jar
 file.reference.xalan-2.7.0.jar=lib/xalan-2.7.0.jar
 file.reference.xercesImpl-2.7.1.jar=lib/xercesImpl-2.7.1.jar
 file.reference.xml-apis-1.3.04.jar=lib/xml-apis-1.3.04.jar
@@ -74,12 +87,8 @@ j2ee.platform=1.5
 j2ee.server.type=Tomcat60
 jar.compress=false
 javac.classpath=\
-    ${libs.jsf12.classpath}:\
-    ${libs.jstl11.classpath}:\
-    ${libs.jsf12-support.classpath}:\
-    ${libs.woodstock-components.classpath}:\
-    ${libs.woodstock-theme-default.classpath}:\
     ${file.reference.activation.jar}:\
+    ${file.reference.appbase.jar}:\
     ${file.reference.ashwood-2.0.jar}:\
     ${file.reference.avalon-framework-4.2.0.jar}:\
     ${file.reference.batik-all-1.7.jar}:\
@@ -94,6 +103,7 @@ javac.classpath=\
     ${file.reference.commons-logging-1.1.1.jar}:\
     ${file.reference.commons-validator-1.3.1.jar}:\
     ${file.reference.cursos.jar}:\
+    ${file.reference.dataprovider.jar}:\
     ${file.reference.dom4j-1.6.1.jar}:\
     ${file.reference.evologger.jar}:\
     ${file.reference.evolute.jar}:\
@@ -101,6 +111,13 @@ javac.classpath=\
     ${file.reference.jai_imageio.jar}:\
     ${file.reference.jdbcappender.jar}:\
     ${file.reference.jdom.jar}:\
+    ${file.reference.jsf-api.jar}:\
+    ${file.reference.jsf-extensions-common-0.1.jar}:\
+    ${file.reference.jsf-extensions-dynamic-faces-0.1.jar}:\
+    ${file.reference.jsf-impl.jar}:\
+    ${file.reference.jsfcl.jar}:\
+    ${file.reference.json-2.jar}:\
+    ${file.reference.jstl.jar}:\
     ${file.reference.log4j-1.2.15.jar}:\
     ${file.reference.mail.jar-1}:\
     ${file.reference.org.springframework.beans-3.0.0.jar}:\
@@ -113,7 +130,11 @@ javac.classpath=\
     ${file.reference.spring-ws-core-tiger-1.5.9.jar}:\
     ${file.reference.spring-ws-support-1.5.9.jar}:\
     ${file.reference.spring-xml-1.5.9.jar}:\
+    ${file.reference.sqlx.jar}:\
+    ${file.reference.standard.jar}:\
     ${file.reference.truelicense.jar}:\
+    ${file.reference.webui-jsf-suntheme.jar}:\
+    ${file.reference.webui-jsf.jar}:\
     ${file.reference.xalan-2.7.0.jar}:\
     ${file.reference.xercesImpl-2.7.1.jar}:\
     ${file.reference.xml-apis-1.3.04.jar}:\
diff --git a/trunk/PlanosActuacao/nbproject/project.xml b/trunk/PlanosActuacao/nbproject/project.xml
index 5485ae38..73d8f513 100644
--- a/trunk/PlanosActuacao/nbproject/project.xml
+++ b/trunk/PlanosActuacao/nbproject/project.xml
@@ -8,27 +8,11 @@
             <minimum-ant-version>1.6</minimum-ant-version>
             <web-module-libraries>
                 <library>
-                    <file>${libs.jsf12.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library>
-                    <file>${libs.jstl11.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library>
-                    <file>${libs.jsf12-support.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library>
-                    <file>${libs.woodstock-components.classpath}</file>
+                    <file>${file.reference.activation.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
-                    <file>${libs.woodstock-theme-default.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library>
-                    <file>${file.reference.activation.jar}</file>
+                    <file>${file.reference.appbase.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
@@ -87,6 +71,10 @@
                     <file>${file.reference.cursos.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.dom4j-1.6.1.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
@@ -115,6 +103,34 @@
                     <file>${file.reference.jdom.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-extensions-common-0.1.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.jsf-extensions-dynamic-faces-0.1.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.jsfcl.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.json-2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.jstl.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
                 <library>
                     <file>${file.reference.log4j-1.2.15.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
@@ -163,10 +179,26 @@
                     <file>${file.reference.spring-xml-1.5.9.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library>
+                    <file>${file.reference.sqlx.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.standard.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
                 <library>
                     <file>${file.reference.truelicense.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library>
+                    <file>${file.reference.webui-jsf-suntheme.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.webui-jsf.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
                 <library>
                     <file>${file.reference.xalan-2.7.0.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
diff --git a/trunk/PlanosActuacao/properties/0-Importer/app.properties b/trunk/PlanosActuacao/properties/0-Importer/app.properties
new file mode 100644
index 00000000..2488c168
--- /dev/null
+++ b/trunk/PlanosActuacao/properties/0-Importer/app.properties
@@ -0,0 +1,26 @@
+app.appName = siprp_planosactuacao_importer
+app.main-class = importer.PlanosActuacaoImporter
+
+app.resources.j2se.version = 1.6.+
+app.resources.j2se.initial-heap-size = 64M
+app.resources.j2se.max-heap-size = 512M
+
+jnlp.information.title = PlanosActuacaoImporter
+jnlp.information.vendor = Evolute $year
+jnlp.information.description = PlanosActuacaoImporter, v$version
+jnlp.information.description.short = $version
+#jnlp.information.icon = images/logo.png
+#jnlp.information.icon.splash = images/logo.png
+
+
+server.siprp = www.evolute.pt
+port.siprp = 5436
+database.siprp = siprp
+username.siprp = postgres
+password.siprp = -rg2hpgsql
+
+server.siprp_local = www.evolute.pt
+port.siprp_local = 5436
+database.siprp_local = siprp_local_3
+username.siprp_local = postgres
+password.siprp_local = -rg2hpgsql
diff --git a/trunk/PlanosActuacao/properties/version.properties b/trunk/PlanosActuacao/properties/version.properties
new file mode 100644
index 00000000..d7ea7f96
--- /dev/null
+++ b/trunk/PlanosActuacao/properties/version.properties
@@ -0,0 +1,6 @@
+#siprp_planosactuacao_importer versioning file
+#Tue Aug 23 11:35:48 WEST 2011
+major=1
+name=siprp_planosactuacao_importer
+minor=0
+build=3
diff --git a/trunk/PlanosActuacao/src/java/app.properties b/trunk/PlanosActuacao/src/java/app.properties
index bc8f2e0f..a783d5e9 100644
--- a/trunk/PlanosActuacao/src/java/app.properties
+++ b/trunk/PlanosActuacao/src/java/app.properties
@@ -1,3 +1,9 @@
+app.appName = siprp_planosactuacao
+
+app.resources.j2se.version = 1.6.+
+app.resources.j2se.initial-heap-size = 64M
+app.resources.j2se.max-heap-size = 512M
+
 
 # production
 server.siprp = localhost
diff --git a/trunk/PlanosActuacao/src/java/db/entidades/PlanoActuacao.java b/trunk/PlanosActuacao/src/java/db/entidades/PlanoActuacao.java
index 285d80ba..f985f993 100644
--- a/trunk/PlanosActuacao/src/java/db/entidades/PlanoActuacao.java
+++ b/trunk/PlanosActuacao/src/java/db/entidades/PlanoActuacao.java
@@ -5,7 +5,7 @@
 
 package db.entidades;
 
-import global.Global;
+import utils.Global;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java
index b0140a79..4638ddbd 100644
--- a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java
+++ b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java
@@ -12,6 +12,7 @@ import com.evolute.utils.sql.Expression;
 import com.evolute.utils.sql.Field;
 import com.evolute.utils.sql.Select2;
 import com.evolute.utils.sql.Update;
+import com.evolute.utils.sql.expression.Par;
 import com.evolute.utils.strings.StringPlainer;
 import db.data.siprp.outer.EstadoMedidasData;
 import db.data.siprp.outer.PlanoAreasData;
@@ -26,9 +27,8 @@ import db.entidades.PlanoActuacao;
 import db.entidades.PostoTrabalho;
 import db.entidades.Risco;
 import db.entidades.Utilizador;
-import global.Global;
-import java.sql.ResultSet;
-import java.sql.Statement;
+import java.sql.Timestamp;
+import utils.Global;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -150,8 +150,7 @@ public class PlanosDataProvider extends GenericDataProvider
 
 		Expression where = new Field( "id" ).isEqual( r.getId() );
 
-		Update upd = new Update( PlanoRiscosData.TABLENAME, new Assignment[]
-		{
+		Update upd = new Update( PlanoRiscosData.TABLENAME, new Assignment[] {
 			new Assignment( new Field( PlanoRiscosData.RESPONSAVEL_EXECUCAO ), r.getResponsavel_execucao() ),
 			new Assignment( new Field( PlanoRiscosData.POR ), r.getPor() ),
 			new Assignment( new Field( PlanoRiscosData.RECURSOS_NECESSARIOS ), r.getRecursos_necessarios() ),
@@ -190,243 +189,529 @@ public class PlanosDataProvider extends GenericDataProvider
 		}
 	}
 
-	public String getExpression( String nome, String estabelecimento, String dataVisita )
+
+
+
+//	private String getExpression( String nome, String estabelecimento, String dataVisita )
+//	{
+//		String tables = "planos_actuacao";
+//		String whereExpression = "planos_actuacao.deleted_date IS NULL ";
+//
+//		if ( nome != null )
+//		{
+//			nome = StringPlainer.convertString( nome.trim() );
+//			nome = nome.replaceAll( " ", "%" );
+//			whereExpression += "AND ( " +
+//				"plain_utf8( planos_actuacao.tecnico_hs_nome ) LIKE '%" + nome + "%' " +
+//				"OR plain_utf8( planos_actuacao.tecnico_superior_hs_nome ) LIKE '%" + nome + "%' " +
+//			") ";
+//		}
+//		if ( estabelecimento != null )
+//		{
+//			estabelecimento = StringPlainer.convertString( estabelecimento.trim() );
+//			estabelecimento = estabelecimento.replaceAll( " ", "%" );
+//			whereExpression += "AND plain_utf8( planos_actuacao.nome_estabelecimento ) LIKE '%" + estabelecimento + "%' ";
+//		}
+//		if ( dataVisita != null )
+//		{
+//			whereExpression += "AND planos_actuacao.data_visita = '" + dataVisita + "' ";
+//		}
+//
+//		return "SELECT * FROM " + tables + " WHERE " + whereExpression;
+//	}
+
+	private enum SECTION { ACTIVOS, SEGUIMENTO, CONCLUIDOS; };
+
+	private Select2 getExpression( SECTION section, Utilizador u, String nome, String estabelecimento, String dataVisita )
 	{
-		String tables = "planos_actuacao";
-		String whereExpression = "planos_actuacao.deleted_date IS NULL ";
+		Expression where = getWhereExpression( nome, estabelecimento, dataVisita );
+		Expression faseExpression = null;
+		switch ( section )
+		{
+			case ACTIVOS :
+				faseExpression = getFaseActivos( u );
+				break;
+			case SEGUIMENTO :
+				faseExpression = getFaseSeguimento( u );
+				break;
+			case CONCLUIDOS :
+				faseExpression = getFaseConcluidos( u );
+				break;
+		}
+		if ( faseExpression != null )
+		{
+			where = where.and( faseExpression );
+		}
+		
+		Select2 query = new Select2(
+			new String[] { PlanosActuacaoData.TABLENAME },
+			new Integer[] {},
+			new Expression[] {},
+			new String[] {
+				PlanosActuacaoData.ESTABELECIMENTO_ID_FULL, PlanosActuacaoData.FASE_FULL, PlanosActuacaoData.DATA_VISITA_FULL,
+				PlanosActuacaoData.NOME_ESTABELECIMENTO_FULL, PlanosActuacaoData.VALIDACAO_DIRECTOR_LOJA_FULL, PlanosActuacaoData.VALIDACAO_DNS_FULL,
+				PlanosActuacaoData.VALIDACAO_HS_FULL, PlanosActuacaoData.PARECER_DNS_FULL, PlanosActuacaoData.OBS_CORRECAO_FULL,
+				PlanosActuacaoData.DATA_VALIDACAO_DIR_LOJA_FULL, PlanosActuacaoData.USER_DIR_LOJA_FULL, PlanosActuacaoData.DATA_VALIDACAO_DNS_FULL,
+				PlanosActuacaoData.USER_DNS_FULL, PlanosActuacaoData.DATA_VALIDACAO_HS_FULL, PlanosActuacaoData.USER_HS_FULL,
+				PlanosActuacaoData.FASE_ANTES_CORRECAO_FULL, PlanosActuacaoData.CORRECAO_FULL, PlanosActuacaoData.OBSERVACOES_DL_FULL,
+				PlanosActuacaoData.OBSERVACOES_DNS_FULL, PlanosActuacaoData.VERIFICACAO_SIPRP_FULL, PlanosActuacaoData.DATA_CONTROLO_FULL, 
+				PlanosActuacaoData.DATA_EMAIL_CONTROLO_FULL, PlanosActuacaoData.EMPRESA_ID_FULL, PlanosActuacaoData.NOME_EMPRESA_FULL,
+				PlanosActuacaoData.TECNICO_HS_ID_FULL, PlanosActuacaoData.TECNICO_HS_NOME_FULL, PlanosActuacaoData.ID_FULL,
+				PlanosActuacaoData.DATA_RELATORIO_FULL, PlanosActuacaoData.DELETED_DATE_FULL, PlanosActuacaoData.CONCLUIDO_POR_DESACTIVACAO_FULL,
+				PlanosActuacaoData.TECNICO_SUPERIOR_HS_ID_FULL, PlanosActuacaoData.TECNICO_SUPERIOR_HS_NOME_FULL, PlanosActuacaoData.DATA_DESACTIVACAO_FULL,
+				PlanosActuacaoData.DATA_DISPONIBILIZACAO_FULL, PlanosActuacaoData.DATA_VALIDACAO_SEG_FULL, PlanosActuacaoData.USER_SEG_FULL,
+				PlanosActuacaoData.HS_RELATORIO_ID_FULL
+			},
+			where,
+			null, null, null, null
+		);
+		return query;
+	}
 
+	private Expression getWhereExpression( String nome, String estabelecimento, String dataVisita )
+	{
+		Expression result = new Field( PlanosActuacaoData.DELETED_DATE_FULL ).isEqual( null );
 		if ( nome != null )
 		{
 			nome = StringPlainer.convertString( nome.trim() );
 			nome = nome.replaceAll( " ", "%" );
-			whereExpression += "AND ( plain_utf8( planos_actuacao.tecnico_hs_nome ) LIKE '%" + nome + "%' OR plain_utf8( planos_actuacao.tecnico_superior_hs_nome ) LIKE '%" + nome + "%' ) ";
+			result = result.and( new Par(
+				new Field( "plain_utf8( " + PlanosActuacaoData.TECNICO_HS_NOME_FULL + " )" ).isLike( "%" + nome + "%" )
+				.or( new Field( "plain_utf8( " + PlanosActuacaoData.TECNICO_SUPERIOR_HS_NOME_FULL + " )" ).isLike( "%" + nome + "%" ) )
+			) );
 		}
 		if ( estabelecimento != null )
 		{
 			estabelecimento = StringPlainer.convertString( estabelecimento.trim() );
 			estabelecimento = estabelecimento.replaceAll( " ", "%" );
-			whereExpression += "AND plain_utf8( planos_actuacao.nome_estabelecimento ) LIKE '%" + estabelecimento + "%' ";
+			result = result.and( new Field( "plain_utf8( " + PlanosActuacaoData.NOME_ESTABELECIMENTO_FULL + " )" ).isLike( "%" + estabelecimento + "%" ) );
 		}
 		if ( dataVisita != null )
 		{
-			whereExpression += "AND planos_actuacao.data_visita = '" + dataVisita + "' ";
+			result = result.and( new Field( PlanosActuacaoData.DATA_VISITA_FULL ).isEqual( dataVisita ) );
 		}
-
-		return "SELECT * FROM " + tables + " WHERE " + whereExpression;
+		return result;
 	}
 
-	private String getFaseActivos( Utilizador u )
-	{
-		String sql = "";
-		int userType = u.getTipo().intValue();
-		switch ( userType )
-        {
-            case Global.TECNICO_HS:
-                sql += " AND (fase = 1 OR fase = 5)";
-                break;
 
-            case Global.RESPONSAVEL_SEGURANCA:
-                sql += " AND fase = 2";
-                break;
+	public List< PlanoActuacao > searchPlanosActivos( Utilizador u, String nome, String estabelecimento, String dataVisita )
+		throws Exception
+	{
+        System.out.println( "\nPlanosDataProvider . searchPlanosActivos() : " );
 
-            case Global.DIRECTOR_LOJA:
-                sql += " AND fase = 3";
-                break;
+		Select2 query = getExpression( SECTION.ACTIVOS, u, nome, estabelecimento, dataVisita );
+		System.out.println( "\tSQL : " + query );
 
-            case Global.DIRECTOR_NACIONAL_SEGURANCA:
-                sql += " AND fase = 4";
-                break;
-        }
-        if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA )
-        {
-            sql += " AND estabelecimento_id = " + u.getEstabelecimento_id();
-        }
+		Virtual2DArray array = getExecuter().executeQuery( query );
+		return getFullPlanos( array );
 
-		return sql;
+//      String sql = getExpression( nome, estabelecimento, dataVisita );
+//		sql += " AND " + getFaseActivos( u );
+//		Statement st = createStatement();
+//		ResultSet rs = st.executeQuery( query );
+//		return getFullPlanos( rs );
 	}
+	
+	public List< PlanoActuacao > searchPlanosSeguimento( Utilizador u, String nome, String estabelecimento, String dataVisita )
+		throws Exception
+	{
+		System.out.println( "\nPlanosDataProvider . searchPlanosSeguimento() : " );
 
+		Select2 query = getExpression( SECTION.SEGUIMENTO, u, nome, estabelecimento, dataVisita );
+		System.out.println( "\tSQL : " + query );
 
-	public List< PlanoActuacao > searchPlanosActivos( Utilizador u, String nome, String estabelecimento, String dataVisita )
+		Virtual2DArray array = getExecuter().executeQuery( query );
+		return getFullPlanos( array );
+
+//		String sql = getExpression( nome, estabelecimento, dataVisita );
+//		sql += " AND " + getFaseSeguimento( u );
+//		Statement st = createStatement();
+//		ResultSet rs = st.executeQuery( sql );
+//      return getFullPlanos( rs );
+	}
+
+	public List< PlanoActuacao > searchPlanosConcluidos( Utilizador u, String nome, String estabelecimento, String dataVisita )
 		throws Exception
 	{
-        Statement st = createStatement();
-        String sql = getExpression( nome, estabelecimento, dataVisita );
-//		sql += " AND " + getFaseActivos( u );
-		sql += getFaseActivos( u );
+		System.out.println( "\nPlanosDataProvider . searchPlanosConcluidos() : " );
 
-		System.out.println( "SEARCH ACTIVOS" );
-		System.out.println( "SQL: " + sql );
+		Select2 query = getExpression( SECTION.CONCLUIDOS, u, nome, estabelecimento, dataVisita );
+		System.out.println( "\tSQL : " + query );
 
-		ResultSet rs = st.executeQuery( sql );
-		return getFullPlanos( rs );
+		Virtual2DArray array = getExecuter().executeQuery( query );
+		return getFullPlanos( array );
+		
+//		String sql = getExpression( nome, estabelecimento, dataVisita );
+//		sql += " AND " + getFaseConcluidos( u );
+//		Statement st = createStatement();
+//		ResultSet rs = st.executeQuery( sql );
+//		return getFullPlanos( rs );
 	}
 
-	private String getFaseSeguimento( Utilizador u )
+
+
+	private Expression getFaseActivos( Utilizador u )
 	{
-		int userType = u.getTipo();
-		String sql = "";
-		switch( userType )
-        {
-            case Global.TECNICO_HS:
-                sql = " AND (fase <> 1 AND fase <> 5 AND fase <> 6) ";
+		Expression result = null;
+		int userType = u.getTipo().intValue();
+		switch ( userType )
+		{
+			case Global.TECNICO_HS :
+				result = new Par(
+					new Field( "fase" ).isEqual( new Integer( 1 ) )
+					.or( new Field( "fase" ).isEqual( new Integer( 5 ) ) )
+				);
 				break;
-            case Global.RESPONSAVEL_SEGURANCA:
-                sql = " AND (fase <> 2 AND fase <> 6) ";
+			case Global.RESPONSAVEL_SEGURANCA :
+				result = new Field( "fase" ).isEqual( new Integer( 2 ) );
 				break;
-            case Global.DIRECTOR_LOJA:
-                sql = " AND (fase <> 3 AND fase <> 6) ";
+			case Global.DIRECTOR_LOJA :
+				result = new Field( "fase" ).isEqual( new Integer( 3 ) );
 				break;
-            case Global.DIRECTOR_NACIONAL_SEGURANCA:
-                sql = " AND (fase <> 4 AND fase <> 6) ";
+			case Global.DIRECTOR_NACIONAL_SEGURANCA :
+				result = new Field( "fase" ).isEqual( new Integer( 4 ) );
 				break;
-            case Global.DIRECTOR_SIPRP:
-            case Global.RH:
-            case Global.DIRECTOR_GERAL_RH:
-            case Global.GESTOR:
-                sql = " AND (fase > 1 AND fase < 6) ";
+		}
+		if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA )
+		{
+			Expression expr = new Field( "estabelecimento_id" ).isEqual( new Integer( u.getEstabelecimento_id() ) );
+			result = result == null ? expr : result.and( expr );
+		}
+		return result;
+	}
+
+//	private String getFaseActivos( Utilizador u )
+//	{
+//		String sql = "";
+//		int userType = u.getTipo().intValue();
+//		switch ( userType )
+//        {
+//            case Global.TECNICO_HS:
+//                sql += " AND (fase = 1 OR fase = 5)";
+//                break;
+//
+//            case Global.RESPONSAVEL_SEGURANCA:
+//                sql += " AND fase = 2";
+//                break;
+//
+//            case Global.DIRECTOR_LOJA:
+//                sql += " AND fase = 3";
+//                break;
+//
+//            case Global.DIRECTOR_NACIONAL_SEGURANCA:
+//                sql += " AND fase = 4";
+//                break;
+//        }
+//        if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA )
+//        {
+//            sql += " AND estabelecimento_id = " + u.getEstabelecimento_id();
+//        }
+//
+//		return sql;
+//	}
+
+//	private String getFaseSeguimento( Utilizador u )
+//	{
+//		int userType = u.getTipo();
+//		String sql = "";
+//		switch( userType )
+//        {
+//            case Global.TECNICO_HS:
+//                sql = " AND (fase <> 1 AND fase <> 5 AND fase <> 6) ";
+//				break;
+//            case Global.RESPONSAVEL_SEGURANCA:
+//                sql = " AND (fase <> 2 AND fase <> 6) ";
+//				break;
+//            case Global.DIRECTOR_LOJA:
+//                sql = " AND (fase <> 3 AND fase <> 6) ";
+//				break;
+//            case Global.DIRECTOR_NACIONAL_SEGURANCA:
+//                sql = " AND (fase <> 4 AND fase <> 6) ";
+//				break;
+//            case Global.DIRECTOR_SIPRP:
+//            case Global.RH:
+//            case Global.DIRECTOR_GERAL_RH:
+//            case Global.GESTOR:
+//                sql = " AND (fase > 1 AND fase < 6) ";
+//				break;
+//			default:
+//				break;
+//        }
+//
+//		if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS
+//			&& userType != Global.DIRECTOR_NACIONAL_SEGURANCA && userType != Global.DIRECTOR_GERAL_RH
+//			&& userType != Global.GESTOR )
+//        {
+//            sql += " AND estabelecimento_id = " + u.getEstabelecimento_id();
+//        }
+//		if ( userType == Global.GESTOR )
+//        {
+//            if ( u.getEstabelecimento_gestor().intValue() > 0 )
+//            {
+//                sql += " AND estabelecimento_id = " + u.getEstabelecimento_gestor();
+//            }
+//        }
+//		return sql;
+//	}
+	private Expression getFaseSeguimento( Utilizador u )
+	{
+		Expression result = null;
+		int userType = u.getTipo().intValue();
+		switch ( userType )
+		{
+			case Global.TECNICO_HS :
+				result = new Par(
+					new Field( "fase" ).isDifferent( new Integer( 1 ) )
+					.and( new Field( "fase" ).isDifferent( new Integer( 5 ) ) )
+					.and( new Field( "fase" ).isDifferent( new Integer( 6 ) ) )
+				);
 				break;
-			default:
+			case Global.RESPONSAVEL_SEGURANCA :
+				result = new Par(
+					new Field( "fase" ).isDifferent( new Integer( 2 ) )
+					.and( new Field( "fase" ).isDifferent( new Integer( 6 ) ) )
+				);
 				break;
-        }
+			case Global.DIRECTOR_LOJA :
+				result = new Par(
+					new Field( "fase" ).isDifferent( new Integer( 3 ) )
+					.and( new Field( "fase" ).isDifferent( new Integer( 6 ) ) )
+				);
+				break;
+			case Global.DIRECTOR_NACIONAL_SEGURANCA :
+				result = new Par(
+					new Field( "fase" ).isDifferent( new Integer( 4 ) )
+					.and( new Field( "fase" ).isDifferent( new Integer( 6 ) ) )
+				);
+				break;
+			case Global.DIRECTOR_SIPRP :
+			case Global.RH :
+			case Global.DIRECTOR_GERAL_RH :
+			case Global.GESTOR :
+				result = new Par(
+					new Field( "fase" ).isGreater( new Integer( 1 ) )
+					.and( new Field( "fase" ).isLess( new Integer( 6 ) ) )
+				);
+				break;
+		}
 
 		if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS
 			&& userType != Global.DIRECTOR_NACIONAL_SEGURANCA && userType != Global.DIRECTOR_GERAL_RH
 			&& userType != Global.GESTOR )
         {
-            sql += " AND estabelecimento_id = " + u.getEstabelecimento_id();
+			Expression expr = new Field( "estabelecimento_id" ).isEqual( u.getEstabelecimento_id() );
+			result = result == null ? expr : result.and( expr );
         }
 		if ( userType == Global.GESTOR )
         {
             if ( u.getEstabelecimento_gestor().intValue() > 0 )
             {
-                sql += " AND estabelecimento_id = " + u.getEstabelecimento_gestor();
+				Expression expr = new Field( "estabelecimento_id" ).isEqual( u.getEstabelecimento_gestor() );
+				result = result == null ? expr : result.and( expr );
             }
         }
-		return sql;
-	}
-	
-	public List< PlanoActuacao > searchPlanosSeguimento( Utilizador u, String nome, String estabelecimento, String dataVisita )
-		throws Exception
-	{
-		Statement st = createStatement();
-
-		String sql = getExpression( nome, estabelecimento, dataVisita );
-		sql += getFaseSeguimento( u );
-
-		System.out.println( "SEARCH SEGUIMENTO" );
-		System.out.println( "SQL: " + sql );
-
-		ResultSet rs = st.executeQuery( sql );
-        return getFullPlanos( rs );
+		return result;
 	}
 
-
-	private String getFaseConcluidos( Utilizador u )
+//	private String getFaseConcluidos( Utilizador u )
+//	{
+//		int userType = u.getTipo().intValue();
+//		String sql = " AND fase = 6 ";
+//
+//		if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS
+//			&& userType != Global.DIRECTOR_NACIONAL_SEGURANCA && userType != Global.DIRECTOR_GERAL_RH )
+//        {
+//            sql += " AND estabelecimento_id = " + u.getEstabelecimento_id();
+//        }
+//
+//		return sql;
+//	}
+	private Expression getFaseConcluidos( Utilizador u )
 	{
+		Expression result = new Field( "fase" ).isEqual( new Integer( 6 ) );
 		int userType = u.getTipo().intValue();
-		String sql = " AND fase = 6 ";
-
 		if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS
 			&& userType != Global.DIRECTOR_NACIONAL_SEGURANCA && userType != Global.DIRECTOR_GERAL_RH )
-        {
-            sql += " AND estabelecimento_id = " + u.getEstabelecimento_id();
-        }
-
-		return sql;
+		{
+			result = result.and( new Field( "estabelecimento_id" ).isEqual( u.getEstabelecimento_id() ) );
+		}
+		return result;
 	}
 
-    public List< PlanoActuacao > searchPlanosConcluidos( Utilizador u, String nome, String estabelecimento, String dataVisita )
-		throws Exception
-	{
-		String sql = getExpression( nome, estabelecimento, dataVisita );
-		sql += getFaseConcluidos( u );
 
-		System.out.println( "SEARCH CONCLUIDOS" );
-		System.out.println( "SQL: " + sql );
 
-		Statement st = createStatement();
-		ResultSet rs = st.executeQuery( sql );
-		return getFullPlanos( rs );
+	private List< PlanoActuacao > getFullPlanos( Virtual2DArray array )
+	{
+		List< PlanoActuacao > result = new LinkedList< PlanoActuacao >();
+		if ( array != null )
+		{
+			for ( int i = 0; i < array.columnLength(); i++ )
+			{
+				Integer estabelecimentoID = array.get( i, 0 );
+				Integer fase = array.get( i, 1 );
+				Date dataVisita = array.get( i, 2 );
+				String nomeEstabelecimento = array.get( i, 3 );
+				Boolean validacaoDirectorLoja = array.get( i, 4 );
+				Boolean validacaoDNS = array.get( i, 5 );
+				Boolean validacaoHS = array.get( i, 6 );
+				String parecerDNS = array.get( i, 7 );
+				String observacaoCorreccao = array.get( i, 8 );
+				Date dataValidacaoDirectorLoja = array.get( i, 9 );
+				Integer userDirectorLoja = array.get( i, 10 );
+				Date dataValidacaoDNS = array.get( i, 11 );
+				Integer userDNS = array.get( i, 12 );
+				Date dataValidacaoHS = array.get( i, 13 );
+				Integer userHS = array.get( i, 14 );
+				Integer faseAntesCorreccao = array.get( i, 15 );
+				String correccao = array.get( i, 16 );
+				String observacoesDL = array.get( i, 17 );
+				String observacoesDNS = array.get( i, 18 );
+				String verificacaoSIPRP = array.get( i, 19 );
+				Date dataControlo = array.get( i, 20 );
+				Date dataEmailControlo = array.get( i, 21 );
+				Integer empresaID = array.get( i, 22 );
+				String nomeEmpresa = array.get( i, 23 );
+				Integer tecnicoHSID = array.get( i, 24 );
+				String tecnicoHSNome = array.get( i, 25 );
+				Integer id = array.get( i, 26 );
+				Date dataRelatorio = array.get( i, 27 );
+				Timestamp deletedStamp = array.get( i, 28 );
+				Boolean concluidoPorDesactivacao = array.get( i, 29 );
+				Integer tecnicoSuperiorHSID = array.get( i, 30 );
+				String tecnicoSuperiorHSNome = array.get( i, 31 );
+				Date dataDesactivacao = array.get( i, 32 );
+				Date dataDisponibilizacao = array.get( i, 33 );
+				Date dataValidacaoSeg = array.get( i, 34 );
+				Integer userSeg = array.get( i, 35 );
+				Integer hsRelatorioID = array.get( i, 36 );
+
+				PlanoActuacao pa = new PlanoActuacao();
+				pa.setId( id );
+				pa.setEstabelecimento_id( estabelecimentoID );
+				pa.setNome_estabelecimento( Utils.unicodeToHTML( nomeEstabelecimento ) );
+				pa.setNome_empresa( Utils.unicodeToHTML( nomeEmpresa ) );
+				pa.setFase( fase );
+				pa.setData_visita( dataVisita );
+				pa.setValidacao_director_loja( validacaoDirectorLoja );
+				pa.setValidacao_dns( validacaoDNS );
+				pa.setValidacao_hs( validacaoHS );
+				pa.setObservacoes_dl( Utils.unicodeToHTML( observacoesDL ) );
+				pa.setObservacoes_dns( Utils.unicodeToHTML( observacoesDNS ) );
+				pa.setObs_correcao( Utils.unicodeToHTML( observacaoCorreccao ) );
+				pa.setAreas( getAreasByPlanoID( id ) );
+				pa.setTotal_riscos( getTotalRiscosByPlanoID( id ) );
+				pa.setCorrecao( Utils.unicodeToHTML( correccao ) );
+				pa.setFase_antes_correcao( faseAntesCorreccao );
+				pa.setData_validacao_dir_loja( dataValidacaoDirectorLoja );
+				pa.setUser_dir_loja( userDirectorLoja );
+				pa.setData_validacao_dns( dataValidacaoDNS );
+				pa.setUser_dns( userDNS );
+				pa.setData_validacao_hs( dataValidacaoHS );
+				pa.setUser_hs( userHS );
+				pa.setTecnico_hs_id( tecnicoHSID );
+				pa.setTecnico_hs_nome( Utils.unicodeToHTML( tecnicoHSNome ) );
+				pa.setConcluidoPorDesactivacao( concluidoPorDesactivacao );
+				pa.setDataDesactivacao( dataDesactivacao );
+				pa.setTecnico_superior_hs_id( tecnicoSuperiorHSID );
+				pa.setTecnico_superior_hs_nome( Utils.unicodeToHTML( tecnicoSuperiorHSNome ) );
+				pa.setData_disponibilizacao( dataDisponibilizacao );
+				pa.setData_validacao_seg( dataValidacaoSeg );
+				pa.setUser_seg( userSeg );
+				pa.setHs_relatorio_id( hsRelatorioID );
+
+//				pa.setData_controlo( dataControlo );
+//				pa.setData_email_controlo( dataEmailControlo );
+//				pa.setEmpresa_id( empresaID );
+//				pa.setData_relatorio( dataRelatorio );
+
+				result.add( pa );
+			}
+		}
+		return result;
 	}
 
-
-    private List< PlanoActuacao > getFullPlanos( ResultSet rs ) throws Exception
-    {
-        List< PlanoActuacao > list = new LinkedList< PlanoActuacao >();
-        if ( rs.isBeforeFirst() )
-        {
-            rs.first();
-            do
-            {
-                PlanoActuacao pa = new PlanoActuacao();
-                pa.setId( new Integer( rs.getInt("id") )  );
-                pa.setEstabelecimento_id( new Integer( rs.getInt( "estabelecimento_id" ) ) );
-                pa.setNome_estabelecimento( Utils.unicodeToHTML( rs.getString( "nome_estabelecimento" ) ) );
-                pa.setNome_empresa( Utils.unicodeToHTML( rs.getString( "nome_empresa" ) ) );
-                pa.setFase( new Integer( rs.getInt( "fase" ) )  );
-                java.sql.Date sqlDate = rs.getDate( "data_visita" );
-                pa.setData_visita( new java.util.Date( sqlDate.getTime() ) );
-                pa.setValidacao_director_loja( new Boolean( rs.getBoolean( "validacao_director_loja" ) ) );
-                pa.setValidacao_dns( new Boolean( rs.getBoolean("validacao_dns") ) );
-                pa.setValidacao_hs( new Boolean( rs.getBoolean("validacao_hs") ) );
-                pa.setObservacoes_dl( Utils.unicodeToHTML( rs.getString("observacoes_dl") ) );
-                pa.setObservacoes_dns( Utils.unicodeToHTML( rs.getString("observacoes_dns") ) );
-                pa.setObs_correcao( Utils.unicodeToHTML( rs.getString("obs_correcao") ) );
-                pa.setAreas( getAreasByPlano( pa ) );
-                pa.setTotal_riscos( getTotalRiscosByPlano( pa.getId() ) );
-                pa.setCorrecao( Utils.unicodeToHTML( rs.getString( "correcao") ) );
-                pa.setFase_antes_correcao( new Integer( rs.getInt( "fase_antes_correcao" ) ) );
-                pa.setData_validacao_dir_loja( rs.getDate( "data_validacao_dir_loja" ) );
-                pa.setUser_dir_loja( new Integer( rs.getInt( "user_dir_loja" ) ) );
-                pa.setData_validacao_dns( rs.getDate( "data_validacao_dns" ) );
-                pa.setUser_dns( new Integer( rs.getInt( "user_dns" ) ) );
-                pa.setData_validacao_hs( rs.getDate( "data_validacao_hs" ) );
-                pa.setUser_hs( new Integer( rs.getInt( "user_hs" ) ) );
-                pa.setTecnico_hs_id( new Integer( rs.getInt( "tecnico_hs_id" ) ) );
-                pa.setTecnico_hs_nome( Utils.unicodeToHTML( rs.getString("tecnico_hs_nome") ) );
-				pa.setConcluidoPorDesactivacao( new Boolean( rs.getBoolean( "concluido_por_desactivacao" ) ) );
-				pa.setDataDesactivacao( rs.getDate( "data_desactivacao" ) );
-				pa.setTecnico_superior_hs_id( new Integer( rs.getInt( "tecnico_superior_hs_id" ) ) );
-				pa.setTecnico_superior_hs_nome( Utils.unicodeToHTML( rs.getString( "tecnico_superior_hs_nome" ) ) );
-				pa.setData_disponibilizacao( rs.getDate( "data_disponibilizacao" ) );
-				pa.setData_validacao_seg( rs.getDate( "data_validacao_seg" ) );
-				pa.setUser_seg( rs.getInt( "user_seg" ) );
-				pa.setHs_relatorio_id( rs.getInt( "hs_relatorio_id" ) );
-				
-                list.add( pa );
-            }
-			while ( rs.next() );
-        }
-        return list;
-    }
+//    private List< PlanoActuacao > getFullPlanos( ResultSet rs ) throws Exception
+//    {
+//        List< PlanoActuacao > list = new LinkedList< PlanoActuacao >();
+//        if ( rs.isBeforeFirst() )
+//        {
+//            rs.first();
+//            do
+//            {
+//                PlanoActuacao pa = new PlanoActuacao();
+//                pa.setId( new Integer( rs.getInt("id") )  );
+//                pa.setEstabelecimento_id( new Integer( rs.getInt( "estabelecimento_id" ) ) );
+//                pa.setNome_estabelecimento( Utils.unicodeToHTML( rs.getString( "nome_estabelecimento" ) ) );
+//                pa.setNome_empresa( Utils.unicodeToHTML( rs.getString( "nome_empresa" ) ) );
+//                pa.setFase( new Integer( rs.getInt( "fase" ) )  );
+//                java.sql.Date sqlDate = rs.getDate( "data_visita" );
+//                pa.setData_visita( new java.util.Date( sqlDate.getTime() ) );
+//                pa.setValidacao_director_loja( new Boolean( rs.getBoolean( "validacao_director_loja" ) ) );
+//                pa.setValidacao_dns( new Boolean( rs.getBoolean("validacao_dns") ) );
+//                pa.setValidacao_hs( new Boolean( rs.getBoolean("validacao_hs") ) );
+//                pa.setObservacoes_dl( Utils.unicodeToHTML( rs.getString("observacoes_dl") ) );
+//                pa.setObservacoes_dns( Utils.unicodeToHTML( rs.getString("observacoes_dns") ) );
+//                pa.setObs_correcao( Utils.unicodeToHTML( rs.getString("obs_correcao") ) );
+//                pa.setAreas( getAreasByPlano( pa ) );
+//                pa.setTotal_riscos( getTotalRiscosByPlano( pa.getId() ) );
+//                pa.setCorrecao( Utils.unicodeToHTML( rs.getString( "correcao") ) );
+//                pa.setFase_antes_correcao( new Integer( rs.getInt( "fase_antes_correcao" ) ) );
+//                pa.setData_validacao_dir_loja( rs.getDate( "data_validacao_dir_loja" ) );
+//                pa.setUser_dir_loja( new Integer( rs.getInt( "user_dir_loja" ) ) );
+//                pa.setData_validacao_dns( rs.getDate( "data_validacao_dns" ) );
+//                pa.setUser_dns( new Integer( rs.getInt( "user_dns" ) ) );
+//                pa.setData_validacao_hs( rs.getDate( "data_validacao_hs" ) );
+//                pa.setUser_hs( new Integer( rs.getInt( "user_hs" ) ) );
+//                pa.setTecnico_hs_id( new Integer( rs.getInt( "tecnico_hs_id" ) ) );
+//                pa.setTecnico_hs_nome( Utils.unicodeToHTML( rs.getString("tecnico_hs_nome") ) );
+//				pa.setConcluidoPorDesactivacao( new Boolean( rs.getBoolean( "concluido_por_desactivacao" ) ) );
+//				pa.setDataDesactivacao( rs.getDate( "data_desactivacao" ) );
+//				pa.setTecnico_superior_hs_id( new Integer( rs.getInt( "tecnico_superior_hs_id" ) ) );
+//				pa.setTecnico_superior_hs_nome( Utils.unicodeToHTML( rs.getString( "tecnico_superior_hs_nome" ) ) );
+//				pa.setData_disponibilizacao( rs.getDate( "data_disponibilizacao" ) );
+//				pa.setData_validacao_seg( rs.getDate( "data_validacao_seg" ) );
+//				pa.setUser_seg( rs.getInt( "user_seg" ) );
+//				pa.setHs_relatorio_id( rs.getInt( "hs_relatorio_id" ) );
+//
+//                list.add( pa );
+//            }
+//			while ( rs.next() );
+//        }
+//        return list;
+//    }
     
-    private List< Area > getAreasByPlano( PlanoActuacao p ) throws Exception
+    private List< Area > getAreasByPlanoID( final Integer planoID ) 
     {
 		List< Area > list = new LinkedList< Area >();
-
-		Select2 query = new Select2( PlanoAreasData.TABLENAME,
-			new Field( PlanoAreasData.PLANO_ID_FULL ).isEqual( p.getId() ),
-			new String[] { PlanoAreasData.ID_FULL, PlanoAreasData.PLANO_ID_FULL, PlanoAreasData.DESCRICAO_FULL },
-			new String[] { PlanoAreasData.DESCRICAO_FULL }
-		);
-		Virtual2DArray array = getExecuter().executeQuery( query );
-		if ( array != null && array.columnLength() > 0 )
+		try
 		{
-			for ( int i = 0; i < array.columnLength(); i++ )
+			Select2 query = new Select2( PlanoAreasData.TABLENAME,
+				new Field( PlanoAreasData.PLANO_ID_FULL ).isEqual( planoID ),
+				new String[] { PlanoAreasData.ID_FULL, PlanoAreasData.PLANO_ID_FULL, PlanoAreasData.DESCRICAO_FULL },
+				new String[] { PlanoAreasData.DESCRICAO_FULL }
+			);
+			Virtual2DArray array = getExecuter().executeQuery( query );
+			if ( array != null && array.columnLength() > 0 )
 			{
-				Integer areaID = array.get( i, 0 );
-				Integer planoID = array.get( i, 1 );
-				String descricao = array.get( i, 2 );
-
-				Area area = new Area();
-				area.setId( areaID );
-				area.setPlano_id( planoID );
-				area.setDescricao( Utils.unicodeToHTML( descricao ) );
-				area.setRiscos( getRiscosByArea( area ) );
-				list.add( area );
+				for ( int i = 0; i < array.columnLength(); i++ )
+				{
+					Integer areaID = array.get( i, 0 );
+					Integer pID = array.get( i, 1 );
+					String descricao = array.get( i, 2 );
+
+					Area area = new Area();
+					area.setId( areaID );
+					area.setPlano_id( pID );
+					area.setDescricao( Utils.unicodeToHTML( descricao ) );
+					area.setRiscos( getRiscosByArea( area ) );
+					list.add( area );
+				}
 			}
 		}
-		
+		catch ( Exception e )
+		{
+			ErrorLogger.logException( e );
+		}
 		return list;
     }
 
@@ -560,7 +845,7 @@ public class PlanosDataProvider extends GenericDataProvider
 		return list;
     }  
     
-    public int getTotalRiscosByPlano( Integer planoID )
+    private int getTotalRiscosByPlanoID( Integer planoID )
     {
 		int count = 0;
 		try
diff --git a/trunk/PlanosActuacao/src/java/db/providers/RiscoLogic.java b/trunk/PlanosActuacao/src/java/db/providers/RiscoLogic.java
index 42d59464..2948a7d7 100644
--- a/trunk/PlanosActuacao/src/java/db/providers/RiscoLogic.java
+++ b/trunk/PlanosActuacao/src/java/db/providers/RiscoLogic.java
@@ -8,7 +8,7 @@ package db.providers;
 import db.entidades.Medida;
 import db.entidades.Risco;
 import db.entidades.Utilizador;
-import global.Global;
+import utils.Global;
 import java.util.Date;
 import java.util.List;
 
diff --git a/trunk/PlanosActuacao/src/java/db/providers/UtilizadoresDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/UtilizadoresDataProvider.java
index c5a43068..be190c5e 100644
--- a/trunk/PlanosActuacao/src/java/db/providers/UtilizadoresDataProvider.java
+++ b/trunk/PlanosActuacao/src/java/db/providers/UtilizadoresDataProvider.java
@@ -11,7 +11,7 @@ import com.evolute.utils.sql.Field;
 import com.evolute.utils.sql.Select2;
 import db.data.siprp.outer.UtilizadoresData;
 import db.entidades.Utilizador;
-import global.Global;
+import utils.Global;
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.LinkedList;
diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java b/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporter.java
similarity index 58%
rename from trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java
rename to trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporter.java
index f0bcb7ca..34fee6ca 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java
+++ b/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporter.java
@@ -1,9 +1,4 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package planosactuacao;
+package importer;
 
 import com.evolute.utils.error.ErrorLogger;
 import db.entidades.Area;
@@ -13,102 +8,160 @@ import db.entidades.PostoTrabalho;
 import db.entidades.Risco;
 import db.entidades.Utilizador;
 import db.entidades.Valor;
-import db.providers.CreatePlanosDataProvider;
+import db.providers.EvoBaseProvider;
 import db.providers.UtilizadoresDataProvider;
-import global.Global;
+import java.io.File;
+import java.io.FileInputStream;
+import utils.Global;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Properties;
 import mail.Mail;
 import mail.MailNextPhase;
 import mail.MailNextPhase.SIPRP_TO_RESPONSAVEL_SEGURANCA;
+import shst.companydataloaders.SIPRPPropertiesLoader;
 import shst.data.outer.HsRelatorioData;
 import shst.data.provider.PlanoActuacaoDataProvider;
-import static com.evolute.utils.strings.UnicodeLatin1Map.*;
+import utils.PlanosActuacaoLogger;
+
 
-/**
- *
- * @author lluis
- */
-public class PlanosActuacao
+public class PlanosActuacaoImporter
 {
-    private List< PlanoActuacao > planosList;
-    private List< Date > planosOnlineList;
 
+	public static void main( final String[] args )
+	{
+		try
+		{
+			System.out.println( "\nInit: PA logger ..." );
+			PlanosActuacaoLogger.init();
 
-    public PlanosActuacao()
-    {
-        try
-        {
-        	System.out.println( "Importar planos de actua" + ccedil + atilde + "o" );
-            //rdp = new RelatoriosDataProvider();
-           // Integer estabelecimentoId = null;
+			System.out.println( "\nInit: properties ..." );
+			readProperties( args );
+
+			System.out.println( "\nInit: db ..." );
+			EvoBaseProvider.getInstance();
+
+			System.out.println( "\nInit: A importar Planos de Actua\u00E7\u00E3o ..." );
+			PlanosActuacaoImporter.getInstace().init();
+		}
+		catch ( Exception e )
+		{
+			e.printStackTrace( System.out );
+		}
+	}
+
+	private static void readProperties( String[] args ) throws Exception
+	{
+		if ( args != null && args.length > 0 )
+		{
+			String filepath = args[ 0 ];
+			File f = new File( filepath );
+			if ( f.isFile() )
+			{
+				Properties props = new Properties();
+				props.load( new FileInputStream( f ) );
+				Iterator< Object > it = props.keySet().iterator();
+				while ( it.hasNext() )
+				{
+					Object key = it.next();
+					Object value = props.get( key );
+					System.setProperty( ( String ) key, ( String ) value );
+				}
+			}
+			else
+			{
+				throw new IllegalArgumentException( "USAGE: java PlanosActuacaoImporter <app.properties path>" );
+			}
+		}
+		else
+		{
+//			throw new IllegalArgumentException( "USAGE: java PlanosActuacaoImporter <app.properties path>" );
+			System.out.println( "\tNo properties file given. Trying to use project properties ..." );
+			readProjectProperties();
+		}
+	}
+
+	private static void readProjectProperties() throws Exception
+	{
+		SIPRPPropertiesLoader.forceEncryptedPropertiesFile = false;
+		SIPRPPropertiesLoader.getInstance().load();
+	}
+
+
+	
+	private static PlanosActuacaoImporter INSTANCE = null;
+
+	private PlanosActuacaoImporter()
+	{
+
+	}
+
+	public static synchronized PlanosActuacaoImporter getInstace()
+	{
+		if ( INSTANCE == null )
+		{
+			INSTANCE = new PlanosActuacaoImporter();
+		}
+		return INSTANCE;
+	}
+
+	public void init()
+	{
+		initRelatorios( null, null );
+	}
+	
+//    private List< PlanoActuacao > planosList;
+//    private List< Date > planosOnlineList;
+    
+//    public PlanosActuacao( Utilizador u )
+//	{
+//        try
+//        {
+//            //rdp = new RelatoriosDataProvider();
+//            Integer estabelecimentoId = null;
 //            if(u.getTipo().intValue() != Global.TECNICO_HS && u.getTipo().intValue() != Global.DIRECTOR_SIPRP)
 //            {
 //                estabelecimentoId = u.getEstabelecimento_id();
 //            }
-//            
-//            List<Date> planosOnlineList = getPlanosOnline(null);
+//            List< Date > planosOnlineList = getPlanosOnline( estabelecimentoId );
 //            System.out.println("PLANOS ONLINE LIST : " + planosOnlineList.size());
-            initRelatorios( null, null );
-//            System.out.println("LIST RELATORIOS : " + listRelatorios.size());
-//            putPlanosOnline(listRelatorios);
-        }
-        catch ( Exception ex )
-        {
-            ErrorLogger.logException( ex );
-        }
-    }
-    
-    public PlanosActuacao( Utilizador u )
-	{
-        try
-        {
-            //rdp = new RelatoriosDataProvider();
-            Integer estabelecimentoId = null;
-            if(u.getTipo().intValue() != Global.TECNICO_HS && u.getTipo().intValue() != Global.DIRECTOR_SIPRP)
-            {
-                estabelecimentoId = u.getEstabelecimento_id();
-            }
-            List< Date > planosOnlineList = getPlanosOnline( estabelecimentoId );
-            System.out.println("PLANOS ONLINE LIST : " + planosOnlineList.size());
-            initRelatorios( planosOnlineList, estabelecimentoId );
-        }
-        catch ( Exception ex )
-        {
-            ErrorLogger.logException( ex );
-        }
-    }
+//            initRelatorios( planosOnlineList, estabelecimentoId );
+//        }
+//        catch ( Exception ex )
+//        {
+//            ErrorLogger.logException( ex );
+//        }
+//    }
     
-    private List< Date > getPlanosOnline( Integer estabelecimentoId )
-    {
-        List< Date > list = null;
-        try
-        {
-        	if ( estabelecimentoId != null )
-            {
-				CreatePlanosDataProvider cpdp = CreatePlanosDataProvider.getInstance();
-        		list = cpdp.getPlanosOnline( estabelecimentoId );
-            }
-        }
-        catch ( Exception ex )
-        {
-            ErrorLogger.logException( ex );
-        }
-        return list == null ? new LinkedList< Date >() : list;
-    }
+//    private List< Date > getPlanosOnline( Integer estabelecimentoId )
+//    {
+//        List< Date > list = null;
+//        try
+//        {
+//        	if ( estabelecimentoId != null )
+//            {
+//				CreatePlanosDataProvider cpdp = CreatePlanosDataProvider.getInstance();
+//        		list = cpdp.getPlanosOnline( estabelecimentoId );
+//            }
+//        }
+//        catch ( Exception ex )
+//        {
+//            ErrorLogger.logException( ex );
+//        }
+//        return list == null ? new LinkedList< Date >() : list;
+//    }
     
     private void initRelatorios( List< Date > list, Integer estabelecimentoId )
     {
         System.out.println("initRelatorios for estabelecimento id: " + estabelecimentoId );
 		try
 		{
-			CreatePlanosDataProvider cpdp = CreatePlanosDataProvider.getInstance();
+			PlanosActuacaoImporterProvider cpdp = PlanosActuacaoImporterProvider.getInstance();
 			PlanoActuacaoDataProvider pa = PlanoActuacaoDataProvider.getProvider();
 			
-			if( estabelecimentoId == null )
+			if ( estabelecimentoId == null )
 			{
 				System.out.println("A adicionar planos de estabelecimentos novos");
 				List< Integer > estabelecimentos = cpdp.getEstabelecimentosWithPlanos();
@@ -138,7 +191,7 @@ public class PlanosActuacao
 							}
 						}
 					}
-					catch(Exception e )
+					catch ( Exception e )
 					{
 						ErrorLogger.logException( e );
 					}
@@ -170,7 +223,6 @@ public class PlanosActuacao
                 {
                     enviarMail( p );
                 }
-                //showPlano(p);
             }
             catch ( Exception ex )
             {
@@ -180,60 +232,45 @@ public class PlanosActuacao
         }
     }
     
-    private PlanoActuacao createPlano(HsRelatorioData relatorio) throws Exception
+    private PlanoActuacao createPlano( HsRelatorioData relatorio ) throws Exception
     {
         System.out.println("CREATE PLANO - RELATORIO ID : " + relatorio.getId().toString());
 
-		CreatePlanosDataProvider cpdp = CreatePlanosDataProvider.getInstance();
+		PlanosActuacaoImporterProvider cpdp = PlanosActuacaoImporterProvider.getInstance();
 		
         PlanoActuacao p = new PlanoActuacao();
 		p.setData_visita( relatorio.toMarcacao_id().getData() );
-//        p.setData_visita(relatorio.getToHsMarcacoesEstabelecimento().getData());
-        
-        
-//        if(relatorio.getToHsMarcacoesEstabelecimento().getToMarcacoesTecnicosHst() != null)
+
 		if ( relatorio.toMarcacao_id().toTecnico_hst() != null )
         {
-//            p.setTecnico_hs_id(relatorio.getToHsMarcacoesEstabelecimento().getToMarcacoesTecnicosHst().getId());
-//            p.setTecnico_hs_nome(relatorio.getToHsMarcacoesEstabelecimento().getToMarcacoesTecnicosHst().getNome());
 			p.setTecnico_hs_id( relatorio.toMarcacao_id().toTecnico_hst().getId() );
 			p.setTecnico_hs_nome( relatorio.toMarcacao_id().toTecnico_hst().getNome() );
         }
 
-//		if ( relatorio.getToHsMarcacoesEstabelecimento().getToMarcacoesTecnicosSuperioresHst() != null )
 		if ( relatorio.toMarcacao_id().toTecnico_superior_hst() != null )
 		{
-//			p.setTecnico_superior_hs_id( relatorio.getToHsMarcacoesEstabelecimento().getToMarcacoesTecnicosSuperioresHst().getId() );
-//			p.setTecnico_superior_hs_nome( relatorio.getToHsMarcacoesEstabelecimento().getToMarcacoesTecnicosSuperioresHst().getNome() );
 			p.setTecnico_superior_hs_id( relatorio.toMarcacao_id().toTecnico_superior_hst().getId() );
 			p.setTecnico_superior_hs_nome( relatorio.toMarcacao_id().toTecnico_superior_hst().getNome() );
 		}
 
-        /////////
-        p.setFase(new Integer(Global.FASE_SEGURANCA_PREENCHIMENTO));
+        p.setFase( new Integer( Global.FASE_SEGURANCA_PREENCHIMENTO ) );
 
-//        p.setEstabelecimento_id(relatorio.getToHsMarcacoesEstabelecimento().getToEstabelecimentos().getId());
-//        p.setEmpresa_id(relatorio.getToHsMarcacoesEstabelecimento().getToEstabelecimentos().getToEmpresas().getId());
 		p.setEstabelecimento_id( relatorio.toMarcacao_id().toEstabelecimento_id().getId() );
 		p.setEmpresa_id( relatorio.toMarcacao_id().toEstabelecimento_id().toEmpresa_id().getId() );
         try
         {
-            //p.setNome_empresa(utils.Utils.unicodeToHTML(rdp.getEmpresaNome(p.getEmpresa_id())));
-            p.setNome_empresa(utils.Utils.unicodeToHTML(cpdp.getEmpresaNome(p.getEmpresa_id())));
+            p.setNome_empresa( utils.Utils.unicodeToHTML( cpdp.getEmpresaNome( p.getEmpresa_id() ) ) );
         }
-        catch(Exception ex)
+        catch ( Exception ex )
         {
             ErrorLogger.logException( ex );
         }
-//        p.setNome_estabelecimento(relatorio.getToHsMarcacoesEstabelecimento().getToEstabelecimentos().getNome());
 		p.setNome_estabelecimento( relatorio.toMarcacao_id().toEstabelecimento_id().getNome() );
-        p.setData_relatorio(relatorio.getData());
+        p.setData_relatorio( relatorio.getData() );
 		p.setData_disponibilizacao( relatorio.getIs_submetido() );
 		p.setHs_relatorio_id( relatorio.getId() );
 		
-        //p = rdp.getFullPlano(p, relatorio.getId());
         p = cpdp.getFullPlano( p, relatorio.getId() );
-        
         if ( p.getAreas() != null )
         {
             if ( p.getAreas().size() > 0 )
@@ -255,50 +292,36 @@ public class PlanosActuacao
             p = null;
         }
 
-
-
         return p;
     }
     
-    private void createAreas(Integer plano_id, List<Area> areas) throws Exception
+    private void createAreas( Integer plano_id, List< Area > areas ) throws Exception
     {
-		CreatePlanosDataProvider cpdp = CreatePlanosDataProvider.getInstance();
-
-        for(Area a : areas)
+		PlanosActuacaoImporterProvider cpdp = PlanosActuacaoImporterProvider.getInstance();
+        for ( Area a : areas )
         {
             a.setPlano_id( plano_id );
             a.setId( cpdp.createArea( a ) );
-            System.out.println("AREA =: " + a.getId().toString());            
-            if(a.getRiscos() != null)
+            System.out.println( "AREA =: " + a.getId().toString() );
+            if ( a.getRiscos() != null )
             {
-                System.out.println("AREA RISCOS: " + a.getRiscos().size());                
-                createRiscos(a.getId(), a.getRiscos());                
+                System.out.println( "AREA RISCOS: " + a.getRiscos().size() );
+                createRiscos( a.getId(), a.getRiscos() );
             }
-
         }
     }
-
-	/**
-	 * FIXME : importacao -> r.setPatrimonial( ... )
-	 *
-	 * @param area_id
-	 * @param riscos
-	 * @throws Exception
-	 */
+	
     private void createRiscos( Integer area_id, List< Risco > riscos ) throws Exception
     {
-		CreatePlanosDataProvider cpdp = CreatePlanosDataProvider.getInstance();
-
+		PlanosActuacaoImporterProvider cpdp = PlanosActuacaoImporterProvider.getInstance();
         for ( Risco r : riscos )
         {
             r.setArea_id( area_id );
-            //r.setId(pdp.createRisco(r));
             System.out.println( "CREATE RISCO: " );
             if ( r.getValores() != null )
             {
                 for ( Valor v : r.getValores() )
                 {
-                    //System.out.println("RISCO -> " + r.getRisco_id().toString() + "VALOR -> " + v.getValor().toString());                    
                     r.setValor( v.getValor() );
                     r.setId( cpdp.createRisco( r ) );
                 }
@@ -310,27 +333,24 @@ public class PlanosActuacao
         }
     }
     
-    private void createMedidas(Integer risco_id, List<Medida> medidas) throws Exception
+    private void createMedidas( Integer risco_id, List< Medida > medidas ) throws Exception
     {
-		CreatePlanosDataProvider cpdp = CreatePlanosDataProvider.getInstance();
-
-        for(Medida m : medidas)
+		PlanosActuacaoImporterProvider cpdp = PlanosActuacaoImporterProvider.getInstance();
+        for ( Medida m : medidas )
         {
             m.setRisco_id( risco_id );
             m.setId( cpdp.createMedida( m ) );
-            if(m.getPostos() != null)
+            if ( m.getPostos() != null )
             {
-                createPostos(m.getId(), m.getPostos());                
+                createPostos( m.getId(), m.getPostos() );
             }
-
         }
     }
     
-    private void createPostos(Integer medida_id, List<PostoTrabalho> postos) throws Exception
+    private void createPostos( Integer medida_id, List< PostoTrabalho > postos ) throws Exception
     {
-		CreatePlanosDataProvider cpdp = CreatePlanosDataProvider.getInstance();
-
-        for(PostoTrabalho p : postos)
+		PlanosActuacaoImporterProvider cpdp = PlanosActuacaoImporterProvider.getInstance();
+        for ( PostoTrabalho p : postos )
         {
             p.setMedida_id( medida_id );
             cpdp.createPostoTrabalho( p );
diff --git a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java b/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporterProvider.java
similarity index 66%
rename from trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java
rename to trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporterProvider.java
index 2b1c2ee2..15c91864 100644
--- a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java
+++ b/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporterProvider.java
@@ -1,10 +1,6 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package db.providers;
+package importer;
 
+import db.providers.*;
 import com.evolute.utils.arrays.Virtual2DArray;
 import com.evolute.utils.error.ErrorLogger;
 import com.evolute.utils.sql.Expression;
@@ -30,44 +26,26 @@ import java.util.LinkedList;
 import java.util.List;
 import utils.Utils;
 
-/**
- *
- * @author lluis
- */
-public class CreatePlanosDataProvider extends GenericDataProvider
-{
-//	private DbRelatorios db;
-//	private DbLocalRelatorios dblocal;
 
-	private static CreatePlanosDataProvider INSTANCE = null;
+public class PlanosActuacaoImporterProvider extends GenericDataProvider
+{
+	private static PlanosActuacaoImporterProvider INSTANCE = null;
 
-    private CreatePlanosDataProvider() throws Exception
+    private PlanosActuacaoImporterProvider() throws Exception
     {
 		super();
-//        try
-//        {
-//			db = DbRelatorios.getInstance();
-//            db.connect();
-//			dblocal = DbLocalRelatorios.getInstance();
-//            dblocal.connect();
-//        }
-//        catch ( Exception ex )
-//        {
-//			System.out.println( "CreatePlanosDataProvider . () : " + ex.getMessage() );
-//            ErrorLogger.logException( ex );
-//        }
     }
 
-	public static synchronized CreatePlanosDataProvider getInstance() throws Exception
+	protected static synchronized PlanosActuacaoImporterProvider getInstance() throws Exception
 	{
 		if ( INSTANCE == null )
 		{
-			INSTANCE = new CreatePlanosDataProvider();
+			INSTANCE = new PlanosActuacaoImporterProvider();
 		}
 		return INSTANCE;
 	}
 
-    public List<Date> getPlanosOnline( Integer estabelecimentoID ) throws Exception
+    public List< Date > getPlanosOnline( Integer estabelecimentoID ) throws Exception
     {
 		List< Date > list = new LinkedList< Date >();
 
@@ -93,31 +71,9 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 			}
 		}
 		return list;
-		
-//        ArrayList<Date> list = new ArrayList<Date>();
-//        Statement st = createStatement();
-//        String sql = "select data_visita from planos_actuacao where deleted_date is null";
-//        if( estabelecimentoID != null )
-//        {
-//        	sql += " and estabelecimento_id = " + estabelecimentoID;
-//        }
-//        ResultSet rs = st.executeQuery(sql);
-//
-//        if(rs.isBeforeFirst())
-//        {
-//            rs.first();
-//            do
-//            {
-//                java.sql.Date sqlDate = rs.getDate("data_visita");
-//                java.util.Date data_visita = new java.util.Date(sqlDate.getTime());
-//                System.out.println("DATA PLANO : " + data_visita.toString());
-//                list.add(data_visita);
-//            }while(rs.next());
-//        }
-//        return list;
     }
     
-    public List<Integer> getEstabelecimentosWithPlanos()
+    public List< Integer > getEstabelecimentosWithPlanos()
     {
 		List< Integer > list = new LinkedList< Integer >();
 
@@ -143,51 +99,25 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 			ErrorLogger.logException( e );
 		}
 		return list;
-
-//    	List<Integer> result = new ArrayList<Integer>();
-//        try
-//        {
-//            Statement st = createStatement();
-//            String sql = "select distinct estabelecimento_id from planos_actuacao where deleted_date is null";
-//            ResultSet rs = st.executeQuery(sql);
-//            if(rs.isBeforeFirst())
-//            {
-//                rs.first();
-//                do
-//                {
-//                    result.add( rs.getInt("estabelecimento_id") );
-//                }while(rs.next());
-//            }
-//        }
-//        catch( Exception e )
-//        {
-//            ErrorLogger.logException( e );
-//        }
-//    	return result;
     }
 
 
 
-    //===================
-
-    public PlanoActuacao getFullPlano(PlanoActuacao plano, Integer relatorioId)
+    public PlanoActuacao getFullPlano( PlanoActuacao plano, Integer relatorioId )
     {
         try
         {
-            plano = getAreasByPlano(plano, relatorioId);
+            plano = getAreasByPlano( plano, relatorioId );
         }
-        catch(Exception ex)
+        catch ( Exception ex )
         {
             ErrorLogger.logException( ex );
         }
-
         return plano;
     }
 
-    private PlanoActuacao getAreasByPlano(PlanoActuacao plano, Integer relatorioId) throws Exception
+    private PlanoActuacao getAreasByPlano( PlanoActuacao plano, Integer relatorioId ) throws Exception
     {
-        Statement st = createLocalStatement();
-
         String sql = "select distinct area_id, hs_relatorio_area.description as descricao from hs_relatorio_posto ";
         sql += "inner join hs_relatorio_posto_medida on hs_relatorio_posto_medida.posto_id = hs_relatorio_posto.id ";
         sql += "inner join hs_relatorio_medida on hs_relatorio_medida.id = hs_relatorio_posto_medida.medida_id ";
@@ -196,52 +126,41 @@ public class CreatePlanosDataProvider extends GenericDataProvider
         sql += "inner join hs_relatorio_area on hs_relatorio_area.id = area_id ";
         sql += "where hs_relatorio.id = " + relatorioId + " ";
         sql += "order by area_id ";
-        System.out.println("AREAS BY PLANO SQL : " + sql);
-        ResultSet rs = st.executeQuery(sql);
+        System.out.println( "AREAS BY PLANO SQL : " + sql );
 
+		Statement st = createLocalStatement();
+        ResultSet rs = st.executeQuery( sql );
         List< Area > areas = new LinkedList< Area >();
-        if(rs.isBeforeFirst())
+        if ( rs.isBeforeFirst() )
         {
             rs.first();
             do
             {
                 Area a = new Area();
-                a.setId(new Integer( rs.getInt("area_id") ));
-                a.setArea_id(a.getId());
-                if(existemMedidasByArea(a.getId()))
+                a.setId( new Integer( rs.getInt( "area_id" ) ) );
+                a.setArea_id( a.getId() );
+                if ( existemMedidasByArea( a.getId() ) )
                 {
-                    a.setDescricao(Utils.unicodeToHTML(rs.getString("descricao")));
+                    a.setDescricao( Utils.unicodeToHTML( rs.getString( "descricao") ) );
                     try
                     {
-                        a.setRiscos(getRiscosByArea(a));
+                        a.setRiscos( getRiscosByArea( a ) );
                     }
-                    catch(Exception ex)
+                    catch ( Exception ex )
                     {
-                        System.out.println("ERRO RISCOS BY AREA !!!!");
+                        System.out.println( "ERRO RISCOS BY AREA !!!!" );
                         ErrorLogger.logException( ex );
-                        a.setRiscos(null);
+                        a.setRiscos( null );
                     }
-
-                    areas.add(a);
+                    areas.add( a );
                 }
-
-            }while(rs.next());
-            plano.setAreas(areas);
+            } while ( rs.next() );
+            plano.setAreas( areas );
         }
         return plano;
     }
 
-
-	/**
-	 * create Risco here with isPatrimonial :
-	 *	select column in query
-	 *	set property
-	 *
-	 * @param a
-	 * @return
-	 * @throws Exception
-	 */
-    private List<Risco> getRiscosByArea(Area a) throws Exception
+    private List< Risco > getRiscosByArea( Area a ) throws Exception
     {
         Statement st = createLocalStatement();
         String sql = "select distinct hs_relatorio_risco.id, hs_relatorio_risco.description as descricao, hs_relatorio_risco.is_patrimonial as is_patrimonial " +
@@ -283,7 +202,6 @@ public class CreatePlanosDataProvider extends GenericDataProvider
     }
 
     private List< Valor > getValoresByRisco( Risco r, Area a ) throws Exception
-    //private Integer getValorByRisco(Risco r, Area a) throws Exception
     {
         String sql = "select valor from ";
         sql += "(select distinct hs_relatorio_posto_risco.risco_id,  ";
@@ -305,36 +223,20 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 		Statement st = createLocalStatement();
         ResultSet rs = st.executeQuery( sql );
         List< Valor > valores = new LinkedList< Valor >();
-//        Integer valor = null;
         if ( rs.isBeforeFirst() )
         {
             rs.first();
             do
             {
-                Valor v = new Valor();
-                Object oValor = rs.getObject( "valor" );
+				Object oValor = rs.getObject( "valor" );
 
-                if ( oValor == null )
-                {
-                    v.setValor( null );
-                    //r.setValor(null);
-//                    valor = null;
-                }
-                else
-                {
-                    v.setValor( ( Integer ) oValor );
-                    //r.setValor((Integer) oValor);
-//                    valor = (Integer) oValor;
-                }
-//                System.out.println("RISCO : " + r.getId().toString() + "VALOR : " + oValor.toString());
-                //int valor = rs.getInt("valor");
-                //v.setValor(new Integer(valor));
-                //v.setMedidas(getMedidasByValor(v, r, a));
+                Valor v = new Valor();
+                v.setValor( oValor == null ? null : ( Integer ) oValor );
                 valores.add( v );
-            } while ( rs.next() );
+            }
+			while ( rs.next() );
         }
         return valores;
-        //return valor;
     }
 
 //    private List<Medida> getMedidasByValor(Valor v, Risco r, Area a) throws Exception
@@ -379,7 +281,6 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 
     private List<Medida> getMedidasByRisco(Risco r, Area a) throws Exception
     {
-        Statement st = createLocalStatement();
         String sql = "select distinct medida_id, valor, descricao from ";
         sql += "( select distinct hs_relatorio_posto_medida.medida_id, hs_relatorio_posto_risco.risco_id,  hs_relatorio_medida.description as descricao, ";
         sql += "case when hs_relatorio_posto_risco.valor_qualitativo_id isnull and hs_relatorio_posto_risco.probabilidade isnull and hs_relatorio_posto_risco.severidade isnull then null ";
@@ -398,23 +299,23 @@ public class CreatePlanosDataProvider extends GenericDataProvider
         //sql += "where valor = " + v.getValor() + " ";
         sql += "order by subquery.medida_id, valor";
         System.out.println("MEDIDAS BY RISCO SQL : " + sql);
-        ResultSet rs = st.executeQuery(sql);
+		Statement st = createLocalStatement();
+        ResultSet rs = st.executeQuery( sql );
         List< Medida > medidas = new LinkedList< Medida >();
-        if(rs.isBeforeFirst())
+        if ( rs.isBeforeFirst() )
         {
             rs.first();
             do
             {
                 Medida m = new Medida();
-                //int valor = rs.getInt("valor");
-                //m.setValor(new Integer(valor));
-                m.setId(new Integer( rs.getInt("medida_id") ));
-                m.setMedida_id(m.getId());
-                m.setDescricao(Utils.unicodeToHTML(rs.getString("descricao")));
+                m.setId( new Integer( rs.getInt("medida_id") ) );
+                m.setMedida_id( m.getId() );
+                m.setDescricao( Utils.unicodeToHTML( rs.getString( "descricao" ) ) );
                 //m.setPostos(getPostosByMedidaAndValor(m, v, a));
-                m.setPostos(getPostosByMedida(r, m, a));
-                medidas.add(m);
-            }while(rs.next());
+                m.setPostos( getPostosByMedida( r, m, a ) );
+                medidas.add( m );
+            }
+			while ( rs.next() );
         }
         return medidas;
     }
@@ -453,7 +354,6 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 
     private List<PostoTrabalho> getPostosByMedida(Risco r, Medida m, Area a) throws Exception
     {
-        Statement st = createLocalStatement();
         String sql = "select subquery.posto_id, valor, descricao from ";
         sql += "(select hs_relatorio_posto_medida.posto_id, hs_relatorio_posto.description as descricao, ";
         sql += "case when hs_relatorio_posto_risco.valor_qualitativo_id isnull and hs_relatorio_posto_risco.probabilidade isnull and hs_relatorio_posto_risco.severidade isnull then null ";
@@ -467,19 +367,21 @@ public class CreatePlanosDataProvider extends GenericDataProvider
         sql += "where medida_id = " + m.getId() + " and area_id = " + a.getId() + " and risco_id = " + r.getId() + ") subquery ";
         //sql += "where valor = " + v.getValor();
         System.out.println("POSTOS BY MEDIDA SQL : " + sql);
-        ResultSet rs = st.executeQuery(sql);
+		Statement st = createLocalStatement();
+        ResultSet rs = st.executeQuery( sql );
         List< PostoTrabalho > postos = new LinkedList< PostoTrabalho >();
-        if(rs.isBeforeFirst())
+        if ( rs.isBeforeFirst() )
         {
             rs.first();
             do
             {
                 PostoTrabalho p = new PostoTrabalho();
-                p.setId(new Integer( rs.getInt("posto_id") ));
-                p.setPosto_id(p.getId());
-                p.setDescricao(Utils.unicodeToHTML(rs.getString("descricao")));
-                postos.add(p);
-            }while(rs.next());
+                p.setId( new Integer( rs.getInt("posto_id") ) );
+                p.setPosto_id( p.getId() );
+                p.setDescricao( Utils.unicodeToHTML( rs.getString( "descricao" ) ) );
+                postos.add( p );
+            }
+			while ( rs.next() );
         }
         return postos;
     }
@@ -488,7 +390,6 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 
     private boolean existemMedidasByArea(Integer area_id) throws Exception
     {
-        Statement st = createLocalStatement();
         String sql = "select distinct medida_id, valor, descricao ";
         sql += "from ( select distinct hs_relatorio_posto_medida.medida_id, hs_relatorio_posto_risco.risco_id,  hs_relatorio_medida.description as descricao,  ";
         sql += "case when hs_relatorio_posto_risco.valor_qualitativo_id isnull and hs_relatorio_posto_risco.probabilidade isnull and hs_relatorio_posto_risco.severidade isnull then null  ";
@@ -501,20 +402,13 @@ public class CreatePlanosDataProvider extends GenericDataProvider
         sql += "inner join hs_relatorio_area on hs_relatorio_area.id = area_id ";
         sql += "where area_id = " + area_id + " and hs_relatorio_posto_medida.is_plano_actuacao = true) subquery order by subquery.medida_id, valor";
         System.out.println("EXISTEM MEDIDAS BY AREA SQL : " + sql);
-        ResultSet rs = st.executeQuery(sql);
-        if(rs.isBeforeFirst())
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
+		Statement st = createLocalStatement();
+        ResultSet rs = st.executeQuery( sql );
+		return rs.isBeforeFirst();
     }
 
     private boolean existemMedidasByRisco(Integer risco_id) throws Exception
     {
-        Statement st = createLocalStatement();
         String sql = "select distinct medida_id ";
         sql += "from ( select distinct hs_relatorio_posto_medida.medida_id, hs_relatorio_posto_risco.risco_id,  hs_relatorio_medida.description as descricao, ";
         sql += "case when hs_relatorio_posto_risco.valor_qualitativo_id isnull and hs_relatorio_posto_risco.probabilidade isnull and hs_relatorio_posto_risco.severidade isnull then null ";
@@ -527,18 +421,9 @@ public class CreatePlanosDataProvider extends GenericDataProvider
         sql += "inner join hs_relatorio_area on hs_relatorio_area.id = area_id ";
         sql += "where hs_relatorio_posto_risco.risco_id = " + risco_id + " and hs_relatorio_posto_medida.is_plano_actuacao = true) subquery order by medida_id";
         System.out.println("EXISTEM MEDIDAS BY RISCO SQL : " + sql);
-        ResultSet rs = st.executeQuery(sql);
-		
+		Statement st = createLocalStatement();
+        ResultSet rs = st.executeQuery( sql );
 		return rs.isBeforeFirst();
-
-//        if(rs.isBeforeFirst())
-//        {
-//            return true;
-//        }
-//        else
-//        {
-//            return false;
-//        }
     }
 
 
@@ -612,67 +497,6 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 		return newPlanoID;
 	}
 
-//    public Integer createPlano( PlanoActuacao p ) throws Exception
-//    {
-//        Statement st = createStatement();
-//        Integer newId = getMaxTableId("planos_actuacao");
-//        String sql = "insert into planos_actuacao (id, estabelecimento_id, fase, data_visita, data_relatorio, nome_estabelecimento, empresa_id, nome_empresa, data_controlo, tecnico_hs_id, tecnico_hs_nome, tecnico_superior_hs_id, tecnico_superior_hs_nome, concluido_por_desactivacao, data_desactivacao) values (";
-//        sql += newId + ", ";
-//        sql += p.getEstabelecimento_id() + ", ";
-//        sql += p.getFase() + ", '";
-//        java.sql.Date sqlDate = new java.sql.Date(p.getData_visita().getTime());
-//        sql += sqlDate + "', '";
-//        sqlDate = new java.sql.Date(p.getData_relatorio().getTime());
-//        sql += sqlDate + "', '";
-//        sql += p.getNome_estabelecimento() + "', ";
-//        sql += p.getEmpresa_id() + ", '";
-//        sql += p.getNome_empresa() + "', '";
-//        Date today = new Date();
-//        sqlDate = new java.sql.Date(today.getTime());
-//        sql += sqlDate + "', ";
-//		//tecnico
-//        sql += p.getTecnico_hs_id() + ", ";
-//        if(p.getTecnico_hs_nome() == null)
-//        {
-//            sql += null;
-//        }
-//        else
-//        {
-//            sql += "'" + p.getTecnico_hs_nome() + "'";
-//        }
-//
-//		//tecnico_superior
-//		sql += ", ";
-//		sql += p.getTecnico_superior_hs_id() + ", ";
-//		sql += p.getTecnico_superior_hs_nome() == null ? null : "'" + p.getTecnico_superior_hs_nome() + "'";
-//
-//		//concluido_por_desactivacao
-//		sql += ", ";
-//		sql += p.getConcluidoPorDesactivacao() == null ? "false" : p.getConcluidoPorDesactivacao();
-//
-//		//data_desactivacao
-//		sql += ", ";
-//
-//		java.sql.Date deactiveDate = null;
-//		if ( p.getDataDesactivacao() != null )
-//		{
-//			deactiveDate = new java.sql.Date( p.getDataDesactivacao().getTime() );
-//		}
-//		else if ( p.getConcluidoPorDesactivacao() != null && p.getConcluidoPorDesactivacao() )
-//		{
-//			deactiveDate = new java.sql.Date( new Date().getTime() );
-//		}
-//		sql += deactiveDate == null ? "null" : "'" + deactiveDate + "'";
-//
-//        sql += ")";
-//
-//        System.out.println("SQL CREATE PLANO : " + sql);
-//        st.execute(sql);
-//
-//        return newId;
-//    }
-
-
 	public Integer createArea( Area a ) throws Exception
 	{
 		Integer newAreaID = null;
@@ -690,22 +514,6 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 
 		return newAreaID;
 	}
-//    public Integer createArea( Area a ) throws Exception
-//    {
-//        Statement st = createStatement();
-//        Integer newId = getMaxTableId("plano_areas");
-//        String sql = "insert into plano_areas (id, area_id, plano_id, descricao) values (";
-//        sql += newId + ", ";
-//        sql += a.getArea_id() + ", ";
-//        sql += a.getPlano_id() + ", '";
-//        sql += a.getDescricao() + "' ";
-//        sql += ")";
-//
-//        System.out.println("SQL CREATE AREA : " + sql);
-//        st.execute(sql);
-//        return newId;
-//    }
-
 
 	public Integer createRisco( Risco r ) throws Exception
 	{
@@ -727,40 +535,6 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 		
 		return newRiscoID;
 	}
-	
-//    public Integer createRisco(Risco r) throws Exception
-//    {
-//        Statement st = createStatement();
-//        Integer newId = getMaxTableId("plano_riscos");
-//        String sql = "insert into plano_riscos (id, area_id, descricao, valor, risco_id) values (";
-//        sql += newId + ", ";
-//        sql += r.getArea_id() + ", '";
-//        sql += r.getDescricao() + "', ";
-//        sql += r.getValor() + ", ";
-//        sql += r.getId();
-//        sql += ")";
-//
-//        System.out.println("SQL CREATE RISCO : " + sql);
-//        st.execute(sql);
-//        return newId;
-//    }
-
-	
-//    public Integer createValor(Valor v) throws Exception
-//    {
-//        Statement st = createStatement();
-//        Integer newId = getMaxTableId("plano_valores");
-//        String sql = "insert into plano_valores (id, risco_id, valor) values (";
-//        sql += newId + ", ";
-//        sql += v.getRisco_id() + ", ";
-//        sql += v.getValor() + "";
-//        sql += ")";
-//
-//        System.out.println("SQL CREATE VALOR : " + sql);
-//        st.execute(sql);
-//        return newId;
-//    }
-
 
 	public Integer createMedida( Medida m ) throws Exception
 	{
@@ -779,22 +553,6 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 
 		return newMedidaID;
 	}
-//    public Integer createMedida(Medida m) throws Exception
-//    {
-//        Statement st = createStatement();
-//        Integer newId = getMaxTableId("plano_medidas");
-//        String sql = "insert into plano_medidas (id, medida_id, risco_id, descricao) values (";
-//        sql += newId + ", ";
-//        sql += m.getMedida_id() + ", ";
-//        sql += m.getRisco_id() + ", '";
-//        sql += m.getDescricao() + "' ";
-//        sql += ")";
-//
-//        System.out.println("SQL CREATE MEDIDA : " + sql);
-//        st.execute(sql);
-//        return newId;
-//    }
-
 
 	public void createPostoTrabalho( PostoTrabalho p ) throws Exception
 	{
@@ -807,26 +565,10 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 		postoData.setProvider( EvoBaseProvider.getInstance().getProvider( DB.SIPRP ) );
 		postoData.save();
 	}
-//    public void createPostoTrabalho(PostoTrabalho p) throws Exception
-//    {
-//        Statement st = createStatement();
-//        Integer newId = getMaxTableId("plano_postos_trabalho");
-//        String sql = "insert into plano_postos_trabalho (id, posto_id, medida_id, descricao) values (";
-//        sql += newId + ", ";
-//        sql += p.getPosto_id() + ", ";
-//        sql += p.getMedida_id() + ", '";
-//        sql += p.getDescricao() + "' ";
-//        sql += ")";
-//
-//        System.out.println("SQL CREATE POSTO : " + sql);
-//        st.execute(sql);
-//    }
 
 
 
     //====================
-
-
 	public String getEmpresaNome( Integer empresaID ) throws Exception
 	{
 		String nome = null;
@@ -843,57 +585,5 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 		}
 		return nome;
 	}
-//    public String getEmpresaNome(Integer empresa_id) throws Exception
-//    {
-//        Statement st = createLocalStatement();
-//        String sql ="SELECT designacao_social FROM empresas WHERE id = " + empresa_id;
-//        ResultSet rslocal = st.executeQuery(sql);
-//        rslocal.first();
-//        String nome = Utils.unicodeToHTML(rslocal.getString("designacao_social"));
-//        return nome;
-//    }
-
-
 	
-//    private Statement createStatement()
-//    {
-//		Statement st = null;
-//		try
-//		{
-//			if ( db == null )
-//			{
-////				db = new DbRelatorios();
-//				db = DbRelatorios.getInstance();
-//				db.connect();
-//			}
-//			st = db.createStatement();
-//		}
-//		catch ( Exception e )
-//		{
-//			System.out.println( "\nCreatePlanosDataProvider . createStatement() : db was null ! error connecting : " + e.getMessage() );
-//			ErrorLogger.logException( e );
-//		}
-//		return st;
-//    }
-
-//    private Statement createLocalStatement()
-//    {
-//		Statement st = null;
-//		try
-//		{
-//			if ( dblocal == null )
-//			{
-////				dblocal = new DbLocalRelatorios();
-//				dblocal = DbLocalRelatorios.getInstance();
-//				dblocal.connect();
-//			}
-//			st = dblocal.createStatement();
-//		}
-//		catch ( Exception e )
-//		{
-//			System.out.println( "\nCreatePlanosDataProvider . createLocalStatement() : dblocal was null ! error connecting : " + e.getMessage() );
-//			ErrorLogger.logException( e );
-//		}
-//        return st;
-//    }
 }
diff --git a/trunk/PlanosActuacao/src/java/pagination/Pagination.java b/trunk/PlanosActuacao/src/java/pagination/Pagination.java
index 3180b7ab..441e1df6 100644
--- a/trunk/PlanosActuacao/src/java/pagination/Pagination.java
+++ b/trunk/PlanosActuacao/src/java/pagination/Pagination.java
@@ -9,7 +9,7 @@ import db.entidades.PlanoActuacao;
 import db.entidades.Risco;
 import db.entidades.Utilizador;
 import db.providers.RiscoLogic;
-import global.Global;
+import utils.Global;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/trunk/PlanosActuacao/src/java/phaselistener/PAContextListener.java b/trunk/PlanosActuacao/src/java/phaselistener/PAContextListener.java
index 36a5bc92..77ec5eab 100644
--- a/trunk/PlanosActuacao/src/java/phaselistener/PAContextListener.java
+++ b/trunk/PlanosActuacao/src/java/phaselistener/PAContextListener.java
@@ -16,7 +16,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import planosactuacao.PlanosActuacao;
+import importer.PlanosActuacaoImporter;
 import shst.companydataloaders.SIPRPPropertiesLoader;
 import utils.PlanosActuacaoLogger;
 
@@ -71,25 +71,25 @@ public class PAContextListener implements ServletContextListener
 			ErrorLogger.logException( e );
 		}
 
-		System.out.println( "\nScheduling Import Event ... " );
-		importEvent = new TimedEvent()
-		{
-			@Override
-			public void executeAction() throws Exception
-			{
-				try
-				{
-					PlanosActuacao planos = new PlanosActuacao();
-				}
-				catch ( Exception e )
-				{
-					ErrorLogger.logException( e );
-				}
-				Timer.resetEvent( this );
-			}
-		};
-		Timer.scheduleEvent( importEvent, IMPORT_INTERVAL );
-		System.out.println( "\tExecuting Import each " + ( IMPORT_INTERVAL / 60 ) + " minutes." );
+//		System.out.println( "\nScheduling Import Event ... " );
+//		importEvent = new TimedEvent()
+//		{
+//			@Override
+//			public void executeAction() throws Exception
+//			{
+//				try
+//				{
+//					PlanosActuacao planos = new PlanosActuacao();
+//				}
+//				catch ( Exception e )
+//				{
+//					ErrorLogger.logException( e );
+//				}
+//				Timer.resetEvent( this );
+//			}
+//		};
+//		Timer.scheduleEvent( importEvent, IMPORT_INTERVAL );
+//		System.out.println( "\tExecuting Import each " + ( IMPORT_INTERVAL / 60 ) + " minutes." );
 	}
 
 	@Override
diff --git a/trunk/PlanosActuacao/src/java/phaselistener/PAMainPhaseListener.java b/trunk/PlanosActuacao/src/java/phaselistener/PAMainPhaseListener.java
index 4c7c74bc..75a119f2 100644
--- a/trunk/PlanosActuacao/src/java/phaselistener/PAMainPhaseListener.java
+++ b/trunk/PlanosActuacao/src/java/phaselistener/PAMainPhaseListener.java
@@ -8,7 +8,7 @@ package phaselistener;
 import com.evolute.utils.error.ErrorLogger;
 import db.entidades.Utilizador;
 import db.providers.UtilizadoresDataProvider;
-import global.Global;
+import utils.Global;
 import java.util.HashMap;
 import java.util.Map;
 import javax.faces.component.UIViewRoot;
diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java b/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java
index 41d85e59..bad2ba98 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java
+++ b/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java
@@ -30,7 +30,7 @@ import db.providers.PlanosDataProvider;
 import db.providers.RiscoLogic;
 import db.providers.UtilizadoresDataProvider;
 import db.providers.UtilizadoresLogic;
-import global.Global;
+import utils.Global;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -898,15 +898,8 @@ public class EditarPlano extends AbstractPageBean
 		pg.getChildren().add( st );
 		st = new StaticText();
 		st.setEscape( false );
-		if ( r.getValor() == null )
-		{
-			st.setText( "IND" );
-		}
-		else
-		{
-			st.setText( r.getValor().toString() );
-		}
-
+		st.setText( r.getValor() == null ? Global.VALOR_INDETERMINADO : r.getValor().toString() );
+		
 		pg.getChildren().add( st );
 		gridValor.getChildren().add( pg );
 
diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/EnviarCorrecao.java b/trunk/PlanosActuacao/src/java/planosactuacao/EnviarCorrecao.java
index 0f89b91e..4d4892fe 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/EnviarCorrecao.java
+++ b/trunk/PlanosActuacao/src/java/planosactuacao/EnviarCorrecao.java
@@ -17,7 +17,7 @@ import db.entidades.PlanoActuacao;
 import db.entidades.Utilizador;
 import db.providers.PlanosDataProvider;
 import db.providers.UtilizadoresDataProvider;
-import global.Global;
+import utils.Global;
 import java.util.List;
 import java.util.ListIterator;
 import javax.faces.FacesException;
diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/Header.java b/trunk/PlanosActuacao/src/java/planosactuacao/Header.java
index 12bba90c..430bc831 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/Header.java
+++ b/trunk/PlanosActuacao/src/java/planosactuacao/Header.java
@@ -11,7 +11,7 @@ import com.sun.rave.web.ui.appbase.AbstractFragmentBean;
 import com.sun.webui.jsf.component.ImageComponent;
 import com.sun.webui.jsf.component.StaticText;
 import db.entidades.Utilizador;
-import global.Global;
+import utils.Global;
 import javax.faces.FacesException;
 import javax.faces.context.FacesContext;
 import utils.JSFHTTPUtils;
diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
index ee9fc2d1..00963594 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
+++ b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
@@ -18,7 +18,7 @@ import com.sun.webui.jsf.component.TextField;
 import db.entidades.PlanoActuacao;
 import db.entidades.Utilizador;
 import db.providers.PlanosDataProvider;
-import global.Global;
+import utils.Global;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java b/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java
index 87d642c3..5296c56f 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java
+++ b/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java
@@ -18,6 +18,7 @@ import db.entidades.PlanoActuacao;
 import db.entidades.PostoTrabalho;
 import db.entidades.Risco;
 import db.providers.UtilizadoresLogic;
+import utils.Global;
 import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Comparator;
@@ -348,14 +349,8 @@ public class ViewPlano extends AbstractPageBean
 		pg.getChildren().add( st );
 		st = new StaticText();
 		st.setEscape( false );
-		if ( r.getValor() == null )
-		{
-			st.setText( "IND" );
-		}
-		else
-		{
-			st.setText( r.getValor().toString() );
-		}
+		st.setText( r.getValor() == null ? Global.VALOR_INDETERMINADO : r.getValor().toString() );
+		
 		pg.getChildren().add( st );
 		gridValor.getChildren().add( pg );
 
diff --git a/trunk/PlanosActuacao/src/java/utils/Global.java b/trunk/PlanosActuacao/src/java/utils/Global.java
new file mode 100644
index 00000000..ce317ea3
--- /dev/null
+++ b/trunk/PlanosActuacao/src/java/utils/Global.java
@@ -0,0 +1,67 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package utils;
+
+/**
+ *
+ * @author lluis
+ */
+public class Global
+{
+
+    //tipos utilizadores
+    public static final int RESPONSAVEL_SEGURANCA = 1;
+    public static final int RH = 2;
+    public static final int TECNICO_HS = 3;
+    public static final int GESTOR = 6;
+    public static final int DIRECTOR_GERAL_RH = 7;
+    public static final int DIRECTOR_SIPRP = 8;
+    public static final int DIRECTOR_LOJA = 9;
+    public static final int DIRECTOR_NACIONAL_SEGURANCA = 10;
+    
+    //Fases do plano
+    public static final int FASE_SIPRP_EMISSAO = 1;
+    public static final int FASE_SEGURANCA_PREENCHIMENTO = 2;
+    public static final int FASE_DIR_LOJA_VALIDACAO = 3;
+    public static final int FASE_DNS_PARECER = 4;
+    public static final int FASE_SIPRP_CONCLUSAO = 5;
+    public static final int FASE_CONCLUIDO = 6;
+    
+    //Fases do plano - texto
+    public static final String FASE_SIPRP_EMISSAO_TXT = "SIPRP(Emissão)";
+    public static final String FASE_SEGURANCA_PREENCHIMENTO_TXT = "Segurança Auchan(Preenchimento)";
+    public static final String FASE_DIR_LOJA_VALIDACAO_TXT = "Director de loja(Validação)";
+    public static final String FASE_DNS_PARECER_TXT = "DNS(Parecer)";
+    public static final String FASE_SIPRP_CONCLUSAO_TXT = "SIPRP(Verificação/Conclusão)";
+    
+    public static final String[] FASES_TEXTO = new String[] {
+		"SIPRP(Emissão)",
+		"Segurança Auchan(Preenchimento)",
+		"Director de loja(Validação)",
+		"DNS(Parecer)",
+		"SIPRP(Verificação/Conclusão)",
+		"Concluído"
+	};
+    
+    //public static final String ANALISE_ACIDENTES_URL = "http://localhost:8084/AnaliseAcidentesTrabalho/faces/";  //testes    
+    //public static final String ANALISE_ACIDENTES_URL = "http://192.168.111.24:8084/AnaliseAcidentesTrabalho/faces/";  //testes portatil
+    public static final String ANALISE_ACIDENTES_URL = "https://www.siprp.pt/AnaliseAcidentesTrabalho/faces/";  //real
+	public static final String PLANOS_ACTUACAO_URL = "https://www.siprp.pt/PlanosActuacao/faces/";
+    
+    public static final String LOGOS_FOLDER = "/resources/images";
+    public static final String PDF_FOLDER_URL = "/resources/pdf";
+
+
+	public static final int ESTADO_MEDIDA_IMPLEMENTADA = 1;
+	public static final int ESTADO_MEDIDA_NAO_IMPLEMENTADA = 2;
+	public static final int ESTADO_MEDIDA_EM_IMPLEMENTACAO = 3;
+
+
+	public static final int MAX_TEXTAREA_CHARS = 100;
+
+
+	public static final String VALOR_INDETERMINADO = "IND";
+}
diff --git a/trunk/PlanosActuacao/src/java/utils/Logos.java b/trunk/PlanosActuacao/src/java/utils/Logos.java
index 699877c4..45f08506 100644
--- a/trunk/PlanosActuacao/src/java/utils/Logos.java
+++ b/trunk/PlanosActuacao/src/java/utils/Logos.java
@@ -7,7 +7,6 @@ package utils;
 
 import com.evolute.utils.error.ErrorLogger;
 import db.providers.RelatoriosDataProvider;
-import global.Global;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;