=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java	2010-09-20 08:49:55 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java	2011-12-09 20:14:06 +0000
@@ -1,5 +1,7 @@
 package org.hisp.dhis.document;
 
+import org.hisp.dhis.common.BaseIdentifiableObject;
+
 /*
  * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
@@ -32,11 +34,8 @@
  * @version $Id$
  */
 public class Document
+    extends BaseIdentifiableObject
 {
-    private int id;
-    
-    private String name;
-    
     private String url;
     
     private boolean external;
@@ -84,26 +83,6 @@
         return name.equals( other.name );
     }
 
-    public int getId()
-    {
-        return id;
-    }
-
-    public void setId( int id )
-    {
-        this.id = id;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
     public String getUrl()
     {
         return url;

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/hibernate/HibernateValidationRuleStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/hibernate/HibernateValidationRuleStore.java	2011-12-09 19:44:38 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/hibernate/HibernateValidationRuleStore.java	2011-12-09 20:14:06 +0000
@@ -31,8 +31,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
 import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.hibernate.HibernateGenericStore;
 import org.hisp.dhis.period.PeriodStore;
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.system.util.ConversionUtils;
@@ -45,7 +45,7 @@
  */
 
 public class HibernateValidationRuleStore
-    extends HibernateGenericStore<ValidationRule>
+    extends HibernateIdentifiableObjectStore<ValidationRule>
     implements ValidationRuleStore
 {
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml	2011-12-09 20:04:48 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml	2011-12-09 20:14:06 +0000
@@ -92,7 +92,7 @@
 
   <!-- Document -->
 
-  <bean id="org.hisp.dhis.document.DocumentStore" class="org.hisp.dhis.hibernate.HibernateGenericStore">
+  <bean id="org.hisp.dhis.document.DocumentStore" class="org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore">
     <property name="clazz" value="org.hisp.dhis.document.Document" />
     <property name="sessionFactory" ref="sessionFactory" />
     <property name="cacheable" value="true" />