From 42b849dedabe17028b9b0858199f5a73e2293929 Mon Sep 17 00:00:00 2001
From: Herve Boutemy <hboutemy@apache.org>
Date: Fri, 1 Jan 2010 23:05:47 +0000
Subject: [PATCH] [MNG-3266] make RepositoryBase override not only equals() but
 hashCode() too (merged from 2.2.x branch r895088) Submitted by: Jared Roberts

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@895089 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-model/src/main/mdo/maven.mdo | 69 +-----------------------------
 1 file changed, 1 insertion(+), 68 deletions(-)

diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index db7f088f99..eccc65da44 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -2357,6 +2357,7 @@
           <name>id</name>
           <version>4.0.0</version>
           <required>true</required>
+          <identifier>true</identifier>
           <description>
             <![CDATA[
             A unique identifier for a repository. This is used to match the repository
@@ -2396,40 +2397,6 @@
           <defaultValue>default</defaultValue>
         </field>
       </fields>
-      <codeSegments>
-        <codeSegment>
-          <version>4.0.0</version>
-          <code>
-            <![CDATA[
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    public boolean equals( Object obj )
-    {
-        if ( obj instanceof RepositoryBase )
-        {
-
-            final RepositoryBase other =  (RepositoryBase) obj;
-
-            if ( id != null )
-            {
-                return id.equals( other.id );
-            }
-            return super.equals(obj);
-        }
-
-        return false;
-    }
-
-    @Override
-    public String toString()
-    {
-        return ( getId() != null ) ? getId() : "[null]";
-    }
-            ]]>
-          </code>
-        </codeSegment>
-      </codeSegments>
     </class>
 
     <class>
@@ -2456,23 +2423,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>
@@ -2491,23 +2441,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 java.clone="deep">