Index: archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
===================================================================
--- archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml	(revision 693673)
+++ archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml	(working copy)
@@ -94,7 +94,7 @@
          |_| \_\___| .__/ \___/|___/_|\__\___/|_|   \__, |
                    |_|                              |___/
       -->
-    <!-- 
+    <!--
     <class stash.storable="true"
            jpox.table="REPOSITORIES"
            jpox.not-persisted-fields="modelEncoding">
@@ -133,7 +133,7 @@
             The URL of the repository.
           </description>
         </field>
-	<field stash.maxSize="250">
+    <field stash.maxSize="250">
           <name>repositoryUsername</name>
           <identifier>false</identifier>
           <version>1.0.0+</version>
@@ -226,9 +226,9 @@
       <name>ArchivaArtifactModel</name>
       <version>1.0.0+</version>
       <fields>
-        <!-- 
+        <!--
            NOTE TO ARCHIVA DEVELOPERS....
-           
+
            The ArchivaArtifact object should contain no platform specifics!!
            Put Java specifics in the ArchivaArtifactJavaDetails object.
            Put .Net specifics in the ArchivaArtifactDotNetDetails object.
@@ -424,13 +424,13 @@
           <code><![CDATA[
     /**
      * Identify if this artifact's contents have been processed or not.
-     * 
+     *
      * @return true if the artifact's contents have been processed.
      */
     public boolean isProcessed()
     {
         return !(whenProcessed == null);
-    }          
+    }
           ]]></code>
         </codeSegment>
       </codeSegments>
@@ -547,13 +547,13 @@
           <code><![CDATA[
     /**
      * Identify this implementation as a set of java details.
-     * 
+     *
      * @return the Java platform string
      */
     public String getPlatform()
     {
         return "java";
-    }          
+    }
           ]]></code>
         </codeSegment>
       </codeSegments>
@@ -884,10 +884,10 @@
         {
             return "";
         }
-        
+
         return value.trim();
     }
-          
+
     public static String toKey( ProjectReference reference )
     {
         StringBuffer key = new StringBuffer();
@@ -959,10 +959,10 @@
         {
             return "";
         }
-        
+
         return value.trim();
     }
-          
+
     public static String toKey( VersionedReference reference )
     {
         StringBuffer key = new StringBuffer();
@@ -1057,10 +1057,10 @@
         {
             return "";
         }
-        
+
         return value.trim();
     }
-          
+
     public static String toKey( ArtifactReference artifactReference )
     {
         StringBuffer key = new StringBuffer();
@@ -1108,12 +1108,12 @@
         {
             return true;
         }
-        
+
         if ( obj == null )
         {
             return false;
         }
-        
+
         if ( getClass() != obj.getClass() )
         {
             return false;
@@ -1168,7 +1168,7 @@
         {
             return false;
         }
-        
+
         if ( type == null )
         {
             if ( other.type != null )
@@ -1180,9 +1180,9 @@
         {
             return false;
         }
-        
+
         return true;
-    }          
+    }
           ]]></code>
         </codeSegment>
       </codeSegments>
@@ -1502,14 +1502,14 @@
     public Dependency asDependency()
     {
         Dependency dep = new Dependency();
-        
+
         dep.setGroupId( groupId );
         dep.setArtifactId( artifactId );
         dep.setVersion( version );
         dep.setType( packaging );
-        
+
         return dep;
-    }          
+    }
           ]]></code>
         </codeSegment>
       </codeSegments>
@@ -1582,7 +1582,6 @@
       <fields>
         <field stash.maxSize="250">
           <name>name</name>
-          <identifier>true</identifier>
           <version>1.0.0+</version>
           <description><![CDATA[The full name of the organization.]]></description>
           <type>String</type>
@@ -1679,7 +1678,6 @@
       <fields>
         <field stash.maxSize="250">
           <name>url</name>
-          <identifier>true</identifier>
           <version>1.0.0+</version>
           <description><![CDATA[URL for the issue management system used by the project.]]></description>
           <type>String</type>
@@ -1707,7 +1705,6 @@
       <fields>
         <field stash.maxSize="250">
           <name>url</name>
-          <identifier>true</identifier>
           <version>1.0.0+</version>
           <description>
             <![CDATA[URL for the continuous integration system used by the project if it has a web interface.]]></description>
@@ -1743,7 +1740,6 @@
       <fields>
         <field stash.maxSize="250">
           <name>email</name>
-          <identifier>true</identifier>
           <version>1.0.0+</version>
           <description><![CDATA[The email address of the individual.]]></description>
           <type>String</type>
@@ -1987,8 +1983,8 @@
     public String toString()
     {
         return Dependency.toKey( this );
-    }          
-          
+    }
+
     public static String toKey( Dependency dep )
     {
         StringBuffer key = new StringBuffer();