diff --git a/trunk/common/src/SIPRPMap.map.xml b/trunk/common/src/SIPRPMap.map.xml
index 73c9a4ba..eadfd18e 100644
--- a/trunk/common/src/SIPRPMap.map.xml
+++ b/trunk/common/src/SIPRPMap.map.xml
@@ -181,6 +181,7 @@
 		<db-attribute name="texto" type="VARCHAR" length="65535"/>
 	</db-entity>
 	<db-entity name="hs_area" schema="public">
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="256"/>
 		<db-attribute name="empresa_id" type="INTEGER" length="10"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
@@ -191,6 +192,7 @@
 		</db-key-generator>
 	</db-entity>
 	<db-entity name="hs_equipamento_medicao" schema="public">
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-attribute name="nome" type="VARCHAR" isMandatory="true" length="255"/>
 		<db-key-generator>
@@ -201,6 +203,7 @@
 	</db-entity>
 	<db-entity name="hs_legislacao" schema="public">
 		<db-attribute name="categoria_id" type="INTEGER" length="10"/>
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="1024"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-key-generator>
@@ -210,6 +213,7 @@
 		</db-key-generator>
 	</db-entity>
 	<db-entity name="hs_legislacao_categoria" schema="public">
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="255"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-key-generator>
@@ -227,6 +231,7 @@
 		<db-attribute name="legislacao_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 	</db-entity>
 	<db-entity name="hs_medida" schema="public">
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="1024"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-attribute name="requesitos_legais" type="VARCHAR" length="1024"/>
@@ -236,17 +241,9 @@
 			<db-key-cache-size>1</db-key-cache-size>
 		</db-key-generator>
 	</db-entity>
-	<db-entity name="hs_medida_classificacao" schema="public">
-		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="255"/>
-		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-		<db-key-generator>
-			<db-generator-type>ORACLE</db-generator-type>
-			<db-generator-name>hs_medida_classificacao_id_seq</db-generator-name>
-			<db-key-cache-size>1</db-key-cache-size>
-		</db-key-generator>
-	</db-entity>
 	<db-entity name="hs_normalizacao" schema="public">
 		<db-attribute name="codigo" type="VARCHAR" isMandatory="true" length="128"/>
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="descricao" type="VARCHAR" isMandatory="true" length="1024"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-attribute name="portuguesa" type="BIT" isMandatory="true" length="1"/>
@@ -258,6 +255,7 @@
 	</db-entity>
 	<db-entity name="hs_posto" schema="public">
 		<db-attribute name="area_id" type="INTEGER" length="10"/>
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="256"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-key-generator>
@@ -270,6 +268,8 @@
 		<db-attribute name="data" type="DATE" isMandatory="true" length="13"/>
 		<db-attribute name="deleted_date" type="TIMESTAMP" length="29"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="is_submetido" type="TIMESTAMP" length="29"/>
+		<db-attribute name="marcacao_id" type="INTEGER" length="10"/>
 		<db-key-generator>
 			<db-generator-type>ORACLE</db-generator-type>
 			<db-generator-name>hs_relatorio_id_seq</db-generator-name>
@@ -277,20 +277,57 @@
 		</db-key-generator>
 	</db-entity>
 	<db-entity name="hs_relatorio_medida" schema="public">
-		<db-attribute name="classificacao_id" type="INTEGER" length="10"/>
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="1024"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
-		<db-attribute name="probabilidade" type="INTEGER" length="10"/>
 		<db-attribute name="requesitos_legais" type="VARCHAR" isMandatory="true" length="1024"/>
 		<db-attribute name="risco_id" type="INTEGER" isMandatory="true" length="10"/>
-		<db-attribute name="severidade" type="INTEGER" length="10"/>
+		<db-key-generator>
+			<db-generator-type>ORACLE</db-generator-type>
+			<db-generator-name>hs_relatorio_medida_id_seq</db-generator-name>
+			<db-key-cache-size>1</db-key-cache-size>
+		</db-key-generator>
+	</db-entity>
+	<db-entity name="hs_relatorio_medida_area" schema="public">
+		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="256"/>
+		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-key-generator>
+			<db-generator-type>ORACLE</db-generator-type>
+			<db-generator-name>hs_relatorio_medida_area_id_seq</db-generator-name>
+			<db-key-cache-size>1</db-key-cache-size>
+		</db-key-generator>
+	</db-entity>
+	<db-entity name="hs_relatorio_medida_posto" schema="public">
+		<db-attribute name="area_id" type="INTEGER" length="10"/>
+		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="256"/>
+		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-key-generator>
+			<db-generator-type>ORACLE</db-generator-type>
+			<db-generator-name>hs_relatorio_medida_posto_id_seq</db-generator-name>
+			<db-key-cache-size>1</db-key-cache-size>
+		</db-key-generator>
 	</db-entity>
 	<db-entity name="hs_relatorio_risco" schema="public">
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="255"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="is_plano_actuacao" type="CHAR" length="1"/>
+		<db-attribute name="probabilidade" type="INTEGER" length="10"/>
 		<db-attribute name="relatorio_id" type="INTEGER" isMandatory="true" length="10"/>
+		<db-attribute name="severidade" type="INTEGER" length="10"/>
+		<db-attribute name="valor_qualitativo_id" type="INTEGER" length="10"/>
+		<db-key-generator>
+			<db-generator-type>ORACLE</db-generator-type>
+			<db-generator-name>hs_relatorio_risco_id_seq</db-generator-name>
+			<db-key-cache-size>1</db-key-cache-size>
+		</db-key-generator>
+	</db-entity>
+	<db-entity name="hs_relatorio_risco_valor_qualitativo" schema="public">
+		<db-attribute name="description" type="VARCHAR" length="64"/>
+		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 	</db-entity>
 	<db-entity name="hs_risco" schema="public">
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="256"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-attribute name="tema_id" type="INTEGER" length="10"/>
@@ -305,11 +342,12 @@
 		<db-attribute name="risco_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 	</db-entity>
 	<db-entity name="hs_risco_tema" schema="public">
+		<db-attribute name="deleted_date" type="TIMESTAMP"/>
 		<db-attribute name="description" type="VARCHAR" isMandatory="true" length="256"/>
 		<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-key-generator>
 			<db-generator-type>ORACLE</db-generator-type>
-			<db-generator-name>hs_risco_tema</db-generator-name>
+			<db-generator-name>hs_risco_tema_id_seq</db-generator-name>
 			<db-key-cache-size>1</db-key-cache-size>
 		</db-key-generator>
 	</db-entity>
@@ -791,17 +829,21 @@
 		<obj-attribute name="id" type="java.lang.Integer" db-attribute-path="id"/>
 		<obj-attribute name="texto" type="java.lang.String" db-attribute-path="texto"/>
 	</obj-entity>
-	<obj-entity name="HsArea" className="siprp.database.cayenne.objects.HsArea" dbEntityName="hs_area">
+	<obj-entity name="HsArea" className="siprp.database.cayenne.objects.HsArea" dbEntityName="hs_area" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 		<obj-attribute name="empresaId" type="java.lang.Integer" db-attribute-path="empresa_id"/>
 	</obj-entity>
 	<obj-entity name="HsEquipamentoMedicao" className="siprp.database.cayenne.objects.HsEquipamentoMedicao" dbEntityName="hs_equipamento_medicao" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="nome" type="java.lang.String" db-attribute-path="nome"/>
 	</obj-entity>
 	<obj-entity name="HsLegislacao" className="siprp.database.cayenne.objects.HsLegislacao" dbEntityName="hs_legislacao" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 	</obj-entity>
 	<obj-entity name="HsLegislacaoCategoria" className="siprp.database.cayenne.objects.HsLegislacaoCategoria" dbEntityName="hs_legislacao_categoria" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 	</obj-entity>
 	<obj-entity name="HsLegislacaoEmpresa" className="siprp.database.cayenne.objects.HsLegislacaoEmpresa" dbEntityName="hs_legislacao_empresa" superClassName="siprp.database.cayenne.objects.BaseObject">
@@ -809,39 +851,54 @@
 	<obj-entity name="HsLegislacaoEstabelecimento" className="siprp.database.cayenne.objects.HsLegislacaoEstabelecimento" dbEntityName="hs_legislacao_estabelecimento" superClassName="siprp.database.cayenne.objects.BaseObject">
 	</obj-entity>
 	<obj-entity name="HsMedida" className="siprp.database.cayenne.objects.HsMedida" dbEntityName="hs_medida" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 		<obj-attribute name="requesitosLegais" type="java.lang.String" db-attribute-path="requesitos_legais"/>
 	</obj-entity>
-	<obj-entity name="HsMedidaClassificacao" className="siprp.database.cayenne.objects.HsMedidaClassificacao" dbEntityName="hs_medida_classificacao" superClassName="siprp.database.cayenne.objects.BaseObject">
-		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
-	</obj-entity>
 	<obj-entity name="HsNormalizacao" className="siprp.database.cayenne.objects.HsNormalizacao" dbEntityName="hs_normalizacao" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="codigo" type="java.lang.String" db-attribute-path="codigo"/>
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="descricao" type="java.lang.String" db-attribute-path="descricao"/>
 		<obj-attribute name="portuguesa" type="java.lang.Boolean" db-attribute-path="portuguesa"/>
 	</obj-entity>
 	<obj-entity name="HsPosto" className="siprp.database.cayenne.objects.HsPosto" dbEntityName="hs_posto" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 	</obj-entity>
 	<obj-entity name="HsRelatorio" className="siprp.database.cayenne.objects.HsRelatorio" dbEntityName="hs_relatorio" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="data" type="java.util.Date" db-attribute-path="data"/>
 		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
+		<obj-attribute name="isSubmetido" type="java.util.Date" db-attribute-path="is_submetido"/>
 	</obj-entity>
 	<obj-entity name="HsRelatorioMedida" className="siprp.database.cayenne.objects.HsRelatorioMedida" dbEntityName="hs_relatorio_medida" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
-		<obj-attribute name="probabilidade" type="java.lang.Integer" db-attribute-path="probabilidade"/>
 		<obj-attribute name="requesitosLegais" type="java.lang.String" db-attribute-path="requesitos_legais"/>
-		<obj-attribute name="severidade" type="java.lang.Integer" db-attribute-path="severidade"/>
+	</obj-entity>
+	<obj-entity name="HsRelatorioMedidaArea" className="siprp.database.cayenne.objects.HsRelatorioMedidaArea" dbEntityName="hs_relatorio_medida_area" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
+	</obj-entity>
+	<obj-entity name="HsRelatorioMedidaPosto" className="siprp.database.cayenne.objects.HsRelatorioMedidaPosto" dbEntityName="hs_relatorio_medida_posto" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 	</obj-entity>
 	<obj-entity name="HsRelatorioRisco" className="siprp.database.cayenne.objects.HsRelatorioRisco" dbEntityName="hs_relatorio_risco" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
+		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
+		<obj-attribute name="isPlanoActuacao" type="java.lang.String" db-attribute-path="is_plano_actuacao"/>
+		<obj-attribute name="probabilidade" type="java.lang.Integer" db-attribute-path="probabilidade"/>
+		<obj-attribute name="severidade" type="java.lang.Integer" db-attribute-path="severidade"/>
+	</obj-entity>
+	<obj-entity name="HsRelatorioRiscoValorQualitativo" className="siprp.database.cayenne.objects.HsRelatorioRiscoValorQualitativo" dbEntityName="hs_relatorio_risco_valor_qualitativo" superClassName="siprp.database.cayenne.objects.BaseObject">
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 	</obj-entity>
 	<obj-entity name="HsRisco" className="siprp.database.cayenne.objects.HsRisco" dbEntityName="hs_risco" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 	</obj-entity>
 	<obj-entity name="HsRiscoMedida" className="siprp.database.cayenne.objects.HsRiscoMedida" dbEntityName="hs_risco_medida" superClassName="siprp.database.cayenne.objects.BaseObject">
 	</obj-entity>
 	<obj-entity name="HsRiscoTema" className="siprp.database.cayenne.objects.HsRiscoTema" dbEntityName="hs_risco_tema" superClassName="siprp.database.cayenne.objects.BaseObject">
+		<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/>
 	</obj-entity>
 	<obj-entity name="Image" className="siprp.database.cayenne.objects.Image" dbEntityName="image">
@@ -1154,27 +1211,36 @@
 	<db-relationship name="hsRiscoMedidaArray" source="hs_medida" target="hs_risco_medida" toDependentPK="true" toMany="true">
 		<db-attribute-pair source="id" target="medida_id"/>
 	</db-relationship>
-	<db-relationship name="hsRelatorioMedidaArray" source="hs_medida_classificacao" target="hs_relatorio_medida" toMany="true">
-		<db-attribute-pair source="id" target="classificacao_id"/>
-	</db-relationship>
 	<db-relationship name="toHsArea" source="hs_posto" target="hs_area" toMany="false">
 		<db-attribute-pair source="area_id" target="id"/>
 	</db-relationship>
 	<db-relationship name="hsRelatorioRiscoArray" source="hs_relatorio" target="hs_relatorio_risco" toMany="true">
 		<db-attribute-pair source="id" target="relatorio_id"/>
 	</db-relationship>
-	<db-relationship name="toHsMedidaClassificacao" source="hs_relatorio_medida" target="hs_medida_classificacao" toMany="false">
-		<db-attribute-pair source="classificacao_id" target="id"/>
+	<db-relationship name="toHsMarcacoesEstabelecimento" source="hs_relatorio" target="marcacoes_estabelecimento" toMany="false">
+		<db-attribute-pair source="marcacao_id" target="id"/>
 	</db-relationship>
 	<db-relationship name="toHsRelatorioRisco" source="hs_relatorio_medida" target="hs_relatorio_risco" toMany="false">
 		<db-attribute-pair source="risco_id" target="id"/>
 	</db-relationship>
+	<db-relationship name="hsRelatorioMedidaPostoArray" source="hs_relatorio_medida_area" target="hs_relatorio_medida_posto" toMany="true">
+		<db-attribute-pair source="id" target="area_id"/>
+	</db-relationship>
+	<db-relationship name="toHsRelatorioMedidaArea" source="hs_relatorio_medida_posto" target="hs_relatorio_medida_area" toMany="false">
+		<db-attribute-pair source="area_id" target="id"/>
+	</db-relationship>
 	<db-relationship name="hsRelatorioMedidaArray" source="hs_relatorio_risco" target="hs_relatorio_medida" toMany="true">
 		<db-attribute-pair source="id" target="risco_id"/>
 	</db-relationship>
 	<db-relationship name="toHsRelatorio" source="hs_relatorio_risco" target="hs_relatorio" toMany="false">
 		<db-attribute-pair source="relatorio_id" target="id"/>
 	</db-relationship>
+	<db-relationship name="toHsRelatorioRiscoValorQualitativo" source="hs_relatorio_risco" target="hs_relatorio_risco_valor_qualitativo" toMany="false">
+		<db-attribute-pair source="valor_qualitativo_id" target="id"/>
+	</db-relationship>
+	<db-relationship name="hsRelatorioRiscoArray" source="hs_relatorio_risco_valor_qualitativo" target="hs_relatorio_risco" toMany="true">
+		<db-attribute-pair source="id" target="valor_qualitativo_id"/>
+	</db-relationship>
 	<db-relationship name="hsRiscoMedidaArray" source="hs_risco" target="hs_risco_medida" toDependentPK="true" toMany="true">
 		<db-attribute-pair source="id" target="risco_id"/>
 	</db-relationship>
@@ -1217,6 +1283,9 @@
 	<db-relationship name="toEmpresas" source="marcacoes_empresa" target="empresas" toMany="false">
 		<db-attribute-pair source="empresa_id" target="id"/>
 	</db-relationship>
+	<db-relationship name="hsRelatorioArray" source="marcacoes_estabelecimento" target="hs_relatorio" toMany="true">
+		<db-attribute-pair source="id" target="marcacao_id"/>
+	</db-relationship>
 	<db-relationship name="lembretesArray" source="marcacoes_estabelecimento" target="lembretes" toMany="true">
 		<db-attribute-pair source="id" target="marcacao_estabelecimento_id"/>
 	</db-relationship>
@@ -1493,17 +1562,20 @@
 	<obj-relationship name="toHsLegislacao" source="HsLegislacaoEmpresa" target="HsLegislacao" db-relationship-path="toHsLegislacao"/>
 	<obj-relationship name="toHsLegislacao" source="HsLegislacaoEstabelecimento" target="HsLegislacao" db-relationship-path="toHsLegislacao"/>
 	<obj-relationship name="hsRiscoMedidaArray" source="HsMedida" target="HsRiscoMedida" db-relationship-path="hsRiscoMedidaArray"/>
-	<obj-relationship name="hsRelatorioMedidaArray" source="HsMedidaClassificacao" target="HsRelatorioMedida" db-relationship-path="hsRelatorioMedidaArray"/>
 	<obj-relationship name="toHsArea" source="HsPosto" target="HsArea" db-relationship-path="toHsArea"/>
 	<obj-relationship name="hsRelatorioRiscoArray" source="HsRelatorio" target="HsRelatorioRisco" db-relationship-path="hsRelatorioRiscoArray"/>
-	<obj-relationship name="toHsMedidaClassificacao" source="HsRelatorioMedida" target="HsMedidaClassificacao" db-relationship-path="toHsMedidaClassificacao"/>
+	<obj-relationship name="toHsMarcacoesEstabelecimento" source="HsRelatorio" target="MarcacoesEstabelecimento" db-relationship-path="toHsMarcacoesEstabelecimento"/>
 	<obj-relationship name="toHsRelatorioRisco" source="HsRelatorioMedida" target="HsRelatorioRisco" db-relationship-path="toHsRelatorioRisco"/>
+	<obj-relationship name="hsRelatorioMedidaPostoArray" source="HsRelatorioMedidaArea" target="HsRelatorioMedidaPosto" db-relationship-path="hsRelatorioMedidaPostoArray"/>
+	<obj-relationship name="toHsRelatorioMedidaArea" source="HsRelatorioMedidaPosto" target="HsRelatorioMedidaArea" db-relationship-path="toHsRelatorioMedidaArea"/>
 	<obj-relationship name="hsRelatorioMedidaArray" source="HsRelatorioRisco" target="HsRelatorioMedida" db-relationship-path="hsRelatorioMedidaArray"/>
 	<obj-relationship name="toHsRelatorio" source="HsRelatorioRisco" target="HsRelatorio" db-relationship-path="toHsRelatorio"/>
+	<obj-relationship name="toHsRelatorioRiscoValorQualitativo" source="HsRelatorioRisco" target="HsRelatorioRiscoValorQualitativo" db-relationship-path="toHsRelatorioRiscoValorQualitativo"/>
+	<obj-relationship name="hsRelatorioRiscoArray" source="HsRelatorioRiscoValorQualitativo" target="HsRelatorioRisco" db-relationship-path="hsRelatorioRiscoArray"/>
 	<obj-relationship name="hsRiscoMedidaArray" source="HsRisco" target="HsRiscoMedida" db-relationship-path="hsRiscoMedidaArray"/>
 	<obj-relationship name="toHsRiscoTema" source="HsRisco" target="HsRiscoTema" db-relationship-path="toHsRiscoTema"/>
-	<obj-relationship name="toHsMedida" source="HsRiscoMedida" target="HsMedida" db-relationship-path="toHsMedida"/>
-	<obj-relationship name="toHsRisco" source="HsRiscoMedida" target="HsRisco" db-relationship-path="toHsRisco"/>
+	<obj-relationship name="toHsMedida" source="HsRiscoMedida" target="HsMedida" deleteRule="Nullify" db-relationship-path="toHsMedida"/>
+	<obj-relationship name="toHsRisco" source="HsRiscoMedida" target="HsRisco" deleteRule="Nullify" db-relationship-path="toHsRisco"/>
 	<obj-relationship name="hsRiscoArray" source="HsRiscoTema" target="HsRisco" db-relationship-path="hsRiscoArray"/>
 	<obj-relationship name="empresasArray" source="Image" target="Empresas" db-relationship-path="empresasArray"/>
 	<obj-relationship name="toEmpresas" source="Lembretes" target="Empresas" db-relationship-path="toEmpresas"/>
@@ -1514,6 +1586,7 @@
 	<obj-relationship name="toTrabalhadores" source="Lembretes" target="Trabalhadores" db-relationship-path="toTrabalhadores"/>
 	<obj-relationship name="lembretesArray" source="LembretesTipos" target="Lembretes" db-relationship-path="lembretesArray"/>
 	<obj-relationship name="toEmpresas" source="MarcacoesEmpresa" target="Empresas" db-relationship-path="toEmpresas"/>
+	<obj-relationship name="hsRelatorioArray" source="MarcacoesEstabelecimento" target="HsRelatorio" db-relationship-path="hsRelatorioArray"/>
 	<obj-relationship name="lembretesArray" source="MarcacoesEstabelecimento" target="Lembretes" db-relationship-path="lembretesArray"/>
 	<obj-relationship name="toEstabelecimentos" source="MarcacoesEstabelecimento" target="Estabelecimentos" db-relationship-path="toEstabelecimentos"/>
 	<obj-relationship name="toMarcacoesTecnicosHst" source="MarcacoesEstabelecimento" target="MarcacoesTecnicosHst" db-relationship-path="toMarcacoesTecnicosHst"/>
diff --git a/trunk/common/src/SIPRPNode.driver.xml b/trunk/common/src/SIPRPNode.driver.xml
deleted file mode 100644
index 74f29b42..00000000
--- a/trunk/common/src/SIPRPNode.driver.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<driver project-version="3.0">
-	<connectionPool min="1" max="1"/>
-	<login/>
-</driver>