diff --git a/trunk/SIPRPSoft/src/siprp/TestKafenio.java b/trunk/SIPRPSoft/src/siprp/TestKafenio.java
deleted file mode 100644
index 6f77ac69..00000000
--- a/trunk/SIPRPSoft/src/siprp/TestKafenio.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package siprp;
-
-import java.awt.GridLayout;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.JFrame;
-
-import de.xeinfach.kafenio.KafenioPanel;
-import de.xeinfach.kafenio.KafenioPanelConfiguration;
-
-public class TestKafenio 
-{
-	
-	public static void main( String args[] )
-	{
-		KafenioPanelConfiguration configuration = new KafenioPanelConfiguration();
-		configuration.setLanguage( "pt" );
-		KafenioPanel panel = new KafenioPanel( configuration );
-		JFrame frm = new JFrame();
-		frm.getContentPane().setLayout( new GridLayout( 1, 1 ) );
-		frm.getContentPane().add( panel );
-		frm.addWindowListener( new WindowAdapter(){
-			public void windowClosing( WindowEvent e )
-			{
-				System.exit( 0 );
-			}
-		} );
-		frm.setSize( 1024, 768 );
-		frm.setVisible( true );
-	}
-
-}
diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java
index 5cfe90ad..898ce892 100755
--- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java
+++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java
@@ -51,6 +51,12 @@ public class TrabalhadoresEcdsDatas extends _TrabalhadoresEcdsDatas implements M
 		}
 		super.setEstado( estado );
 	}
+	
+	@Override
+	public String toString()
+	{
+		return getDataString() + ": " + getEstadoString();
+	}
 }
 
 
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java
index 2790586a..f09e49fe 100755
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java
@@ -335,6 +335,7 @@ public class ProcessoAccoesPanel extends JPanel
 	{
 		if( marcacao != null )
 		{
+			
 			cardLayout.show( cardPanel, PANEL_EXAME_MARCACAO_NAME );
 		}
 		else
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
index 49ca07e6..bf3af4d2 100755
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
@@ -28,6 +28,7 @@ import info.clearthought.layout.TableLayoutConstraints;
 import java.awt.CardLayout;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
@@ -35,11 +36,14 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
+import siprp.database.cayenne.objects.Empresas;
+import siprp.database.cayenne.objects.PrtElementosProtocolo;
 import siprp.database.cayenne.objects.Trabalhadores;
 import siprp.database.cayenne.objects.TrabalhadoresConsultas;
 import siprp.database.cayenne.objects.TrabalhadoresConsultasDatas;
 import siprp.database.cayenne.objects.TrabalhadoresConsultasDatasEmails;
 import siprp.database.cayenne.objects.TrabalhadoresConsultasDatasObservacoes;
+import siprp.database.cayenne.objects.TrabalhadoresEcd;
 import siprp.database.cayenne.objects.TrabalhadoresEcds;
 import siprp.database.cayenne.objects.TrabalhadoresEcdsDatas;
 import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasEmails;
@@ -325,6 +329,21 @@ public class ProcessoDadosPanel extends JPanel
 			inputExameData.setObject( exame.getData() );
 			inputExameEstado.setObject( exame.getEstados() );
 			inputExameEstado.setSelectedObject( exame.getEstado() );
+			//TODO mostrar lista de exames disponiveis para o trabalhador
+			Trabalhadores trabalhador = exame.getToTrabalhadores();
+			Integer perfil = trabalhador.getPerfil();
+			if(perfil != null)
+			{
+				Empresas empresa = trabalhador.getToEstabelecimentos().getToEmpresas();
+				List<PrtElementosProtocolo> ecdsPerfil = (List<PrtElementosProtocolo> )empresa.getPrtElementosProtocoloArray();
+				for( PrtElementosProtocolo ecdPerfil : ecdsPerfil )
+				{
+					if(perfil.equals( ecdPerfil.getNumeroPerfil() ) )
+					{
+						
+					}
+				}
+			}
 			cardLayout.show( this, PANEL_EXAME_NAME );
 		}
 		else
@@ -341,6 +360,13 @@ public class ProcessoDadosPanel extends JPanel
 			inputExameMarcacaoData.setObject( exameMarcacao.getData() );
 			inputExameMarcacaoEstado.setObject( exameMarcacao.getEstados() );
 			inputExameMarcacaoEstado.setSelectedObject( exameMarcacao.getEstado() );
+			// TODO mostrar lista de exames disponiveis para a marcacao
+			List<TrabalhadoresEcd> ecds = (List<TrabalhadoresEcd>) exameMarcacao.getTrabalhadoresEcdArray();
+			for(TrabalhadoresEcd ecd : ecds)
+			{
+				Integer ecdEstado = ecd.getEstado();
+//				ecd.get
+			}
 			cardLayout.show( this, PANEL_EXAME_MARCACAO_NAME );
 		}
 		else
diff --git a/trunk/build.xml b/trunk/build.xml
index 6b9f378f..52ab8b05 100644
--- a/trunk/build.xml
+++ b/trunk/build.xml
@@ -154,6 +154,7 @@
 			</fileset>
 		</delete>
 		<delete dir="${app.build.dir}" failonerror="false" />
+		<delete dir="${app.dist.dir}" failonerror="false" />
 	</target>
 
 	<target name="app-run" description="Runs the application" depends="app-build">
@@ -168,6 +169,7 @@
 	<target name="app-makeJar" description="Make application Jar" depends="app-jpox">
 		<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}">