Index: maven-model/src/main/mdo/maven.mdo
===================================================================
--- maven-model/src/main/mdo/maven.mdo	(revision 590272)
+++ maven-model/src/main/mdo/maven.mdo	(working copy)
@@ -2619,19 +2619,28 @@
      */
     public boolean equals( Object obj )
     {
-        if ( obj instanceof RepositoryBase ) {
-        
-            final RepositoryBase other =  (RepositoryBase) obj;
-    
+        if ( obj instanceof RepositoryBase )
+        {
+
+            final RepositoryBase other = (RepositoryBase) obj;
+
             if ( id != null )
             {
                 return id.equals( other.id );
             }
-            return super.equals(obj);
-        }    
-        
+            return super.equals( obj );
+        }
+
         return false;
     }
+
+    /**
+     * @see java.lang.Object#hashCode()
+     */
+    public int hashCode()
+    {
+        return 217 + id == null ? 0 : id.hashCode();
+    }
             ]]>
           </code>
         </codeSegment>
@@ -2668,23 +2677,6 @@
           </association>
         </field>
       </fields>
-      <!-- TODO:prevent modello generation of an incorrect equals method. Could be avoided by using <identity/> tags to mark ID as the only identity field -->
-      <codeSegments>
-        <codeSegment>
-          <version>4.0.0</version>
-          <code>
-            <![CDATA[
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    public boolean equals( Object obj )
-    {
-        return super.equals( obj );
-    }
-            ]]>
-          </code>
-        </codeSegment>
-      </codeSegments>
     </class>
 
     <class>
@@ -2708,23 +2700,6 @@
           <version>4.0.0</version>
         </field>
       </fields>
-      <!-- TODO:prevent modello generation of an incorrect equals method. Could be avoided by using <identity/> tags to mark ID as the only identity field -->
-      <codeSegments>
-        <codeSegment>
-          <version>4.0.0</version>
-          <code>
-            <![CDATA[
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    public boolean equals( Object obj )
-    {
-        return super.equals( obj );
-    }
-            ]]>
-          </code>
-        </codeSegment>
-      </codeSegments>
     </class>
 
     <class>