svn commit: r579332 - /maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java

[joakime]

Author: joakime
Date: Tue Sep 25 11:02:43 2007
New Revision: 579332

URL: http://svn.apache.org/viewvc?rev=579332&view=rev
Log:
Cleaning up error message from ProjectModelToDatabaseConsumer on bad/unexpected 
models.

Modified:
    
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java

Modified: 
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java?rev=579332&r1=579331&r2=579332&view=diff
==============================================================================
--- 
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
 (original)
+++ 
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
 Tue Sep 25 11:02:43 2007
@@ -289,11 +289,14 @@
 
             if ( !parts.artifactId.equalsIgnoreCase( model.getArtifactId() ) )
             {
-                getLogger().warn( "Project Model " + model + " artifactId: " + 
model.getArtifactId() +
-                    " does not match the pom file's artifactId: " + 
parts.artifactId );
-
-                addProblem( artifact, "Project Model " + model + " artifactId: 
" + model.getArtifactId() +
-                    " does not match the pom file's artifactId: " + 
parts.artifactId );
+                StringBuffer emsg = new StringBuffer();
+                emsg.append( "File " ).append( artifactFile.getName() );
+                emsg.append( " has an invalid project model <" ).append( 
model.toString() ).append( ">: " );
+                emsg.append( "The model artifactId <" ).append( 
model.getArtifactId() );
+                emsg.append( "> does not match the artifactId portion of the 
filename: " ).append( parts.artifactId );
+                
+                getLogger().warn(emsg.toString() );
+                addProblem( artifact, emsg.toString() );
 
                 return false;
             }
@@ -301,11 +304,14 @@
             if ( !parts.version.equalsIgnoreCase( model.getVersion() ) &&
                 !VersionUtil.getBaseVersion( parts.version ).equalsIgnoreCase( 
model.getVersion() ) )
             {
-                getLogger().warn( "Project Model " + model + " version: " + 
model.getVersion() +
-                    " does not match the pom file's version: " + parts.version 
);
-
-                addProblem( artifact, "Project Model " + model + " version: " 
+ model.getVersion() +
-                    " does not match the pom file's version: " + parts.version 
);
+                StringBuffer emsg = new StringBuffer();
+                emsg.append( "File " ).append( artifactFile.getName() );
+                emsg.append( " has an invalid project model <" ).append( 
model.toString() ).append( ">: " );
+                emsg.append( "The model version <" ).append( 
model.getVersion() );
+                emsg.append( "> does not match the version portion of the 
filename: " ).append( parts.version );
+                
+                getLogger().warn(emsg.toString() );
+                addProblem( artifact, emsg.toString() );
 
                 return false;
             }