dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20898
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-10-30 13:44:03 +0700
message:
  minor fixes
removed:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAudit.hbm.xml
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java
  dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2015-10-23 03:41:44 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2015-10-30 06:44:03 +0000
@@ -270,8 +270,6 @@
 
         updateAggregateQueryBuilder();
 
-        executeSql( "UPDATE trackedentityaudit SET accessedmodule='tracked_entity_instance_dashboard' WHERE accessedmodule='instance_dashboard' or accessedmodule='patient_dashboard'" );
-
         executeSql( "UPDATE programstageinstance SET status=1 WHERE completed=true" );
         executeSql( "ALTER TABLE programstageinstance DROP COLUMN completed" );
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2015-10-26 16:01:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2015-10-30 06:44:03 +0000
@@ -532,12 +532,6 @@
     <property name="sessionFactory" ref="sessionFactory" />
   </bean>
 
-  <bean id="org.hisp.dhis.trackedentity.TrackedEntityAuditStore"
-    class="org.hisp.dhis.trackedentity.hibernate.HibernateTrackedEntityAuditStore">
-    <property name="clazz" value="org.hisp.dhis.trackedentity.TrackedEntityAudit" />
-    <property name="sessionFactory" ref="sessionFactory" />
-  </bean>
-
   <bean id="org.hisp.dhis.trackedentity.TrackedEntityStore"
     class="org.hisp.dhis.trackedentity.hibernate.HibernateTrackedEntityStore">
     <property name="clazz" value="org.hisp.dhis.trackedentity.TrackedEntity" />
@@ -1223,11 +1217,6 @@
     <property name="programStageDataElementStore" ref="org.hisp.dhis.program.ProgramStageDataElementStore" />
   </bean>
 
-  <bean id="org.hisp.dhis.trackedentity.TrackedEntityAuditService"
-    class="org.hisp.dhis.trackedentity.DefaultTrackedEntityAuditService">
-    <property name="auditStore" ref="org.hisp.dhis.trackedentity.TrackedEntityAuditStore" />
-  </bean>
-
   <bean id="org.hisp.dhis.trackedentity.TrackedEntityService" class="org.hisp.dhis.trackedentity.DefaultTrackedEntityService">
     <property name="trackedEntityStore" ref="org.hisp.dhis.trackedentity.TrackedEntityStore" />
   </bean>
@@ -1700,11 +1689,6 @@
     class="org.hisp.dhis.program.ProgramStageSectionDeletionHandler">
   </bean>
 
-  <bean id="org.hisp.dhis.trackedentity.TrackedEntityAuditDeletionHandler"
-    class="org.hisp.dhis.trackedentity.TrackedEntityAuditDeletionHandler">
-    <property name="auditService" ref="org.hisp.dhis.trackedentity.TrackedEntityAuditService" />
-  </bean>
-
   <bean id="org.hisp.dhis.program.ProgramIndicatorDeletionHandler"
     class="org.hisp.dhis.program.ProgramIndicatorDeletionHandler" />
 
@@ -1766,7 +1750,6 @@
           <ref bean="org.hisp.dhis.mapping.MapViewDeletionHandler" />
           <ref bean="org.hisp.dhis.trackedentity.TrackedEntityInstanceDeletionHandler" />
           <ref bean="org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValueDeletionHandler" />
-          <ref bean="org.hisp.dhis.trackedentity.TrackedEntityAuditDeletionHandler" />
           <ref bean="org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValueDeletionHandler" />
           <ref bean="org.hisp.dhis.relationship.RelationshipDeletionHandler" />
           <ref bean="org.hisp.dhis.program.ProgramDeletionHandler" />
@@ -1822,7 +1805,6 @@
       <aop:before pointcut="execution( * org.hisp.dhis.trackedentity.TrackedEntityAttributeService.delete*(..) )" method="intercept" />
       <aop:before pointcut="execution( * org.hisp.dhis.relationship.RelationshipService.delete*(..) )" method="intercept" />
       <aop:before pointcut="execution( * org.hisp.dhis.relationship.RelationshipTypeService.delete*(..) )" method="intercept" />
-      <aop:before pointcut="execution( * org.hisp.dhis.trackedentity.TrackedEntityAuditService.delete*(..) )" method="intercept" />
       <aop:before pointcut="execution( * org.hisp.dhis.program.ProgramService.delete*(..) )" method="intercept" />
       <aop:before pointcut="execution( * org.hisp.dhis.program.ProgramStageSectionService.delete*(..) )" method="intercept" />
       <aop:before pointcut="execution( * org.hisp.dhis.program.ProgramInstanceService.delete*(..) )" method="intercept" />

=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAudit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAudit.hbm.xml	2015-06-23 15:59:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAudit.hbm.xml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
-	<class name="org.hisp.dhis.trackedentity.TrackedEntityAudit" table="trackedentityaudit">
-
-		<id name="id" column="trackedentityauditid">
-			<generator class="native" />
-		</id>
-
-		<many-to-one name="entityInstance" column="trackedentityinstanceid"
-			class="org.hisp.dhis.trackedentity.TrackedEntityInstance" foreign-key="fk_trackedentityauditid_trackedentityinstanceid" />
-
-		<property name="date" />
-		
-		<property name="visitor" />
-		
-		<property name="accessedModule" />
-	</class>
-</hibernate-mapping>