=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueAudit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueAudit.java	2015-11-27 08:42:42 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueAudit.java	2015-11-27 15:24:32 +0000
@@ -45,6 +45,8 @@
 public class TrackedEntityDataValueAudit
     implements Serializable
 {
+    private int id;
+    
     private DataElement dataElement;
 
     private ProgramStageInstance programStageInstance;
@@ -113,6 +115,16 @@
     // Getters and setters
     // -------------------------------------------------------------------------
 
+    public int getId()
+    {
+        return id;
+    }
+
+    public void setId( int id )
+    {
+        this.id = id;
+    }
+
     @JsonProperty
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
     public ProgramStageInstance getProgramStageInstance()

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentitydatavalue/hibernate/TrackedEntityDataValueAudit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentitydatavalue/hibernate/TrackedEntityDataValueAudit.hbm.xml	2015-11-27 08:42:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentitydatavalue/hibernate/TrackedEntityDataValueAudit.hbm.xml	2015-11-27 15:24:32 +0000
@@ -6,13 +6,16 @@
 <hibernate-mapping>
   <class name="org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValueAudit" table="trackedentitydatavalueaudit">
 
-    <composite-id>
-      <key-many-to-one name="programStageInstance" class="org.hisp.dhis.program.ProgramStageInstance"
+    <id name="id" column="trackedentitydatavalueauditid">
+      <generator class="native" />
+    </id>
+
+    <many-to-one name="programStageInstance" class="org.hisp.dhis.program.ProgramStageInstance"
         column="programstageinstanceid" foreign-key="fk_entityinstancedatavalue_programstageinstanceid" />
-      <key-many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid"
+    
+    <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid"
         foreign-key="fk_entityinstancedatavalue_dataelementid" />
-    </composite-id>
-
+    
     <property name="value" length="50000" />
 
     <property name="timestamp" type="timestamp" />

=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentitydatavalueaudit'