=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml	2011-06-01 15:32:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml	2011-06-07 12:43:08 +0000
@@ -10,9 +10,11 @@
       <generator class="native" />
     </id>
 
-	<one-to-one name="messageRecipients" class="org.hisp.dhis.user.UserGroup"/>
+	<many-to-one name="messageRecipients" class="org.hisp.dhis.user.UserGroup" 
+		column="messagerecipientsid" foreign-key="fk_configuration_message_recipients"/>
 
-	<one-to-one name="infrastructuralDataElements" class="org.hisp.dhis.dataelement.DataElementGroup"/>
+	<many-to-one name="infrastructuralDataElements" class="org.hisp.dhis.dataelement.DataElementGroup" 
+		column="infrastructuraldataelementsid" foreign-key="fk_configuration_infrastructural_dataelements"/>
 
   </class>
 </hibernate-mapping>

=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java	2011-06-06 05:36:15 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java	2011-06-07 12:43:08 +0000
@@ -221,7 +221,7 @@
 
         crossTabService.createAggregatedDataCache( indicatorOperands, key );
         
-        log.info( "Created aggregated data cache" );
+        log.info( "Created aggregated data cache: " + TimeUtils.getHMS() );
         
         // ---------------------------------------------------------------------
         // Drop potential indexes