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/28 10:34:20 UTC
svn commit: r417698 - in
/maven/repository-manager/trunk/maven-repository-converter/src:
main/java/org/apache/maven/repository/converter/ test/expected-files/
test/java/org/apache/maven/repository/converter/
test/source-modern-repository/test/correctAr...
Author: brett
Date: Wed Jun 28 01:34:20 2006
New Revision: 417698
URL: http://svn.apache.org/viewvc?rev=417698&view=rev
Log:
revert r412961 - it wasn't working as designed and the test failed in a clean environment. The TODO is meant to indicate to replace the parsing of the filename to obtain snapshot metadata with retrieving it from the source metadata file instead of attempting to merge all. The tests did not test snapshot metadata at all.
Removed:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4artifact-source-merging-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/source-modern-repository/test/correctArtifactMetadata/
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/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
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=417698&r1=417697&r2=417698&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 28 01:34:20 2006
@@ -96,11 +96,6 @@
private boolean dryrun;
/**
- * @plexus.configuration default-value="true"
- */
- private boolean mergeWithSourceMetadata;
-
- /**
* @plexus.requirement
*/
private I18N i18n;
@@ -125,8 +120,8 @@
Versioning versioning = new Versioning();
versioning.addVersion( artifact.getBaseVersion() );
metadata.setVersioning( versioning );
- updateMetadata( new ArtifactRepositoryMetadata( artifact ), artifact.getRepository(),
- targetRepository, metadata, transaction );
+ updateMetadata( new ArtifactRepositoryMetadata( artifact ), targetRepository, metadata,
+ transaction );
metadata = createBaseMetadata( artifact );
metadata.setVersion( artifact.getBaseVersion() );
@@ -141,9 +136,10 @@
versioning.setSnapshot( snapshot );
}
+ // TODO: merge latest/release/snapshot from source instead
metadata.setVersioning( versioning );
- updateMetadata( new SnapshotArtifactRepositoryMetadata( artifact ), artifact.getRepository(),
- targetRepository, metadata, transaction );
+ updateMetadata( new SnapshotArtifactRepositoryMetadata( artifact ), targetRepository, metadata,
+ transaction );
if ( !dryrun )
{
@@ -163,17 +159,16 @@
return metadata;
}
- private void updateMetadata( RepositoryMetadata artifactMetadata, ArtifactRepository sourceRepository,
- ArtifactRepository targetRepository, Metadata newMetadata,
- FileTransaction transaction )
+ private void updateMetadata( RepositoryMetadata artifactMetadata, ArtifactRepository targetRepository,
+ Metadata newMetadata, FileTransaction transaction )
throws RepositoryConversionException
{
+ File file = new File( targetRepository.getBasedir(),
+ targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
+
Metadata metadata;
boolean changed;
- //merge with target repository metadata
- File file = new File( targetRepository.getBasedir(),
- targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
if ( file.exists() )
{
metadata = readMetadata( file );
@@ -183,19 +178,6 @@
{
changed = true;
metadata = newMetadata;
- }
-
- //merge with source repository metadata
- if ( mergeWithSourceMetadata )
- {
- File srcfile = new File( sourceRepository.getBasedir(),
- sourceRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-
- if ( srcfile.exists() )
- {
- Metadata sourceMetadata = readMetadata( srcfile );
- changed = changed || metadata.merge( sourceMetadata );
- }
}
if ( changed )
Modified: maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java?rev=417698&r1=417697&r2=417698&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java Wed Jun 28 01:34:20 2006
@@ -732,39 +732,6 @@
assertFalse( "Check metadata not created", metadataFile.exists() );
}
- public void testSourceArtifactMetadataMerging()
- throws Exception
- {
- // test metadata in target repository is merged with the metadata in the source repository
-
- createModernSourceRepository();
-
- Artifact artifact = createArtifact( "test", "correctArtifactMetadata", "1.0.0" );
-
- repositoryConverter.convert( artifact, targetRepository, reporter );
- checkSuccess();
-
- File artifactFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
- assertTrue( "Check artifact created", artifactFile.exists() );
- assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile, artifact.getFile() ) );
-
- artifact = createPomArtifact( artifact );
- File pomFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
- File sourcePomFile = new File( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) );
- assertTrue( "Check POM created", pomFile.exists() );
-
- compareFiles( sourcePomFile, pomFile );
-
- ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata( artifact );
- File artifactMetadataFile = new File( targetRepository.getBasedir(),
- targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
- assertTrue( "Check artifact metadata created", artifactMetadataFile.exists() );
-
- File expectedMetadataFile = getTestFile( "src/test/expected-files/v4artifact-source-merging-metadata.xml" );
-
- compareFiles( expectedMetadataFile, artifactMetadataFile );
- }
-
public void testInvalidSourceSnapshotMetadata()
throws Exception, MalformedURLException
{