You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2007/06/20 12:21:48 UTC
svn commit: r549048 -
/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
Author: oching
Date: Wed Jun 20 03:21:47 2007
New Revision: 549048
URL: http://svn.apache.org/viewvc?view=rev&rev=549048
Log:
[MRM-409] Updated validation of poms.
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?view=diff&rev=549048&r1=549047&r2=549048
==============================================================================
--- 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 Wed Jun 20 03:21:47 2007
@@ -176,7 +176,6 @@
getLogger().warn( "Invalid or corrupt pom. Project model " + model + " was not added in the database." );
}
- dao.getProjectModelDAO().saveProjectModel( model );
}
catch ( ProjectModelException e )
{
@@ -284,7 +283,7 @@
{
getLogger().warn(
"Project Model " + model + " artifactId: " + model.getArtifactId()
- + " does not match the pom file's artifactId: " + parts.artifactId );
+ + " 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 );
@@ -295,8 +294,8 @@
if ( !parts.version.equalsIgnoreCase( model.getVersion() ) )
{
getLogger().warn(
- "Project Model " + model + " artifactId: " + model.getArtifactId()
- + " does not match the pom file's artifactId: " + parts.artifactId );
+ "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 );
@@ -304,10 +303,20 @@
return false;
}
+ String constructedFilename;
+
+ if( parts.classifier != null )
+ {
+ constructedFilename = model.getArtifactId() + "-" + model.getVersion() + "-" +
+ parts.classifier.trim() + ".pom";
+ }
+ else
+ {
+ constructedFilename = model.getArtifactId() + "-" + model.getVersion() + ".pom";
+ }
+
//check if the file name matches the values indicated in the pom
- if ( !artifactFile.getName().equalsIgnoreCase(
- model.getArtifactId() + "-" + model.getVersion() + "-"
- + parts.classifier ) )
+ if ( !artifactFile.getName().equalsIgnoreCase( constructedFilename ) )
{
getLogger().warn(
"Artifact " + artifact + " does not match the artifactId and/or version "