diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
index 3a3c69b3..06c93120 100644
--- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
+++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
@@ -93,20 +93,20 @@ public class SIPRPDataLoader implements CompanyDataLoader
 //		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 //		
-		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
-		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
-		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
-		Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" );
-		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
-		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
-		
 //		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local3" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 		
+		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
+		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
+		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
+		Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" );
+		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local3" );
+		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
+		
 //	
 //		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
diff --git a/trunk/common/src/SIPRPMap.map.xml b/trunk/common/src/SIPRPMap.map.xml
index 2bad8c45..70bb839d 100644
--- a/trunk/common/src/SIPRPMap.map.xml
+++ b/trunk/common/src/SIPRPMap.map.xml
@@ -1910,7 +1910,7 @@
 	<obj-relationship name="hsEmailEmpresa" source="Empresas" target="HsEmailEmpresa" db-relationship-path="hsEmailEmpresa"/>
 	<obj-relationship name="hsLegislacaoEmpresaArray" source="Empresas" target="HsLegislacaoEmpresa" db-relationship-path="hsLegislacaoEmpresaArray"/>
 	<obj-relationship name="hsNormalizacaoEmpresaArray" source="Empresas" target="HsNormalizacaoEmpresa" db-relationship-path="hsNormalizacaoEmpresaArray"/>
-	<obj-relationship name="hsRiscoEmpresaArray" source="Empresas" target="HsRiscoEmpresa" db-relationship-path="hsRiscoEmpresaArray"/>
+	<obj-relationship name="hsRiscoEmpresaArray" source="Empresas" target="HsRiscoEmpresa" deleteRule="Deny" db-relationship-path="hsRiscoEmpresaArray"/>
 	<obj-relationship name="lembretesArray" source="Empresas" target="Lembretes" db-relationship-path="lembretesArray"/>
 	<obj-relationship name="marcacoesEmpresaArray" source="Empresas" target="MarcacoesEmpresa" db-relationship-path="marcacoesEmpresaArray"/>
 	<obj-relationship name="prtElementosProtocoloArray" source="Empresas" target="PrtElementosProtocolo" db-relationship-path="prtElementosProtocoloArray"/>
@@ -2004,7 +2004,7 @@
 	<obj-relationship name="toHsRiscoTema" source="HsRisco" target="HsRiscoTema" deleteRule="Nullify" db-relationship-path="toHsRiscoTema"/>
 	<obj-relationship name="toEmpresa" source="HsRiscoEmpresa" target="Empresas" deleteRule="Nullify" db-relationship-path="toEmpresa"/>
 	<obj-relationship name="toHsRisco" source="HsRiscoEmpresa" target="HsRisco" deleteRule="Nullify" db-relationship-path="toHsRisco"/>
-	<obj-relationship name="toHsMedida" source="HsRiscoMedida" target="HsMedida" deleteRule="Nullify" db-relationship-path="toHsMedida"/>
+	<obj-relationship name="toHsMedida" source="HsRiscoMedida" target="HsMedida" deleteRule="Deny" 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" deleteRule="Nullify" db-relationship-path="hsRiscoArray"/>
 	<obj-relationship name="empresasArray" source="Image" target="Empresas" db-relationship-path="empresasArray"/>
diff --git a/trunk/common/src/cayenne.xml b/trunk/common/src/cayenne.xml
index ffac5a63..2b962b58 100644
--- a/trunk/common/src/cayenne.xml
+++ b/trunk/common/src/cayenne.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <domains project-version="3.0">
 <domain name="SIPRP">
-	<property name="cayenne.DataRowStore.remote.notify" value="true"/>
+	<property name="cayenne.DataDomain.sharedCache" value="false"/>
 
 	<map name="SIPRPMap" location="SIPRPMap.map.xml"/>
 </domain>
diff --git a/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java b/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java
index 828ae534..7303bc5f 100644
--- a/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java
+++ b/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java
@@ -1,7 +1,5 @@
 package siprp.database.cayenne.objects;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.DateFormat;
 import java.util.Date;