You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/06/07 10:33:00 UTC
svn commit: r412325 - in
/maven/repository-manager/trunk/maven-repository-converter/src/main:
java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties
Author: brett
Date: Wed Jun 7 01:33:00 2006
New Revision: 412325
URL: http://svn.apache.org/viewvc?rev=412325&view=rev
Log:
be more specific with i18n keys
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
maven/repository-manager/trunk/maven-repository-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties
Modified: maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java?rev=412325&r1=412324&r2=412325&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java (original)
+++ maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java Wed Jun 7 01:33:00 2006
@@ -264,33 +264,41 @@
private boolean validateMetadata( Metadata metadata, RepositoryMetadata repositoryMetadata, Artifact artifact,
ArtifactReporter reporter )
{
- String key = "failure.incorrect.";
-
+ String groupIdKey;
+ String artifactIdKey = null;
+ String snapshotKey = null;
+ String versionKey = null;
+ String versionsKey = null;
if ( repositoryMetadata.storedInGroupDirectory() )
{
- key += "groupMetadata.";
+ groupIdKey = "failure.incorrect.groupMetadata.groupId";
}
else if ( repositoryMetadata.storedInArtifactVersionDirectory() )
{
- key += "snapshotMetadata.";
+ groupIdKey = "failure.incorrect.snapshotMetadata.groupId";
+ artifactIdKey = "failure.incorrect.snapshotMetadata.artifactId";
+ versionKey = "failure.incorrect.snapshotMetadata.version";
+ snapshotKey = "failure.incorrect.snapshotMetadata.snapshot";
}
else
{
- key += "artifactMetadata.";
+ groupIdKey = "failure.incorrect.artifactMetadata.groupId";
+ artifactIdKey = "failure.incorrect.artifactMetadata.artifactId";
+ versionsKey = "failure.incorrect.artifactMetadata.versions";
}
boolean result = true;
if ( !metadata.getGroupId().equals( artifact.getGroupId() ) )
{
- reporter.addFailure( artifact, getI18NString( key + "groupId" ) );
+ reporter.addFailure( artifact, getI18NString( groupIdKey ) );
result = false;
}
if ( !repositoryMetadata.storedInGroupDirectory() )
{
if ( !metadata.getArtifactId().equals( artifact.getArtifactId() ) )
{
- reporter.addFailure( artifact, getI18NString( key + "artifactId" ) );
+ reporter.addFailure( artifact, getI18NString( artifactIdKey ) );
result = false;
}
if ( !repositoryMetadata.storedInArtifactVersionDirectory() )
@@ -313,7 +321,7 @@
if ( !foundVersion )
{
- reporter.addFailure( artifact, getI18NString( key + "versions" ) );
+ reporter.addFailure( artifact, getI18NString( versionsKey ) );
result = false;
}
}
@@ -322,7 +330,7 @@
// snapshot metadata
if ( !artifact.getBaseVersion().equals( metadata.getVersion() ) )
{
- reporter.addFailure( artifact, getI18NString( key + "version" ) );
+ reporter.addFailure( artifact, getI18NString( versionKey ) );
result = false;
}
@@ -345,7 +353,7 @@
if ( !correct )
{
- reporter.addFailure( artifact, getI18NString( key + "snapshot" ) );
+ reporter.addFailure( artifact, getI18NString( snapshotKey ) );
result = false;
}
}
Modified: maven/repository-manager/trunk/maven-repository-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties?rev=412325&r1=412324&r2=412325&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties (original)
+++ maven/repository-manager/trunk/maven-repository-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties Wed Jun 7 01:33:00 2006
@@ -23,7 +23,6 @@
exception.repositories.match=Source and target repositories are identical.
-# TODO! update definitions
failure.incorrect.groupMetadata.groupId=The group ID in the source group metadata is incorrect.
failure.incorrect.artifactMetadata.artifactId=The artifact ID in the source artifact metadata is incorrect.