brett       2005/03/30 23:04:10

  Modified:    maven-artifact/src/main/java/org/apache/maven/artifact/transform
                        ArtifactTransformation.java
                        SnapshotTransformation.java
  Log:
  save a version of the file if it did not exist - this prevents an older 
snapshot blowing an installed one away on a clean repo
  
  Revision  Changes    Path
  1.8       +2 -1      
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
  
  Index: ArtifactTransformation.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ArtifactTransformation.java       29 Mar 2005 16:41:13 -0000      1.7
  +++ ArtifactTransformation.java       31 Mar 2005 07:04:10 -0000      1.8
  @@ -49,7 +49,8 @@
        * @param artifact        Artifact to be transformed.
        * @param localRepository the local repository it will be stored in
        */
  -    void transformForInstall( Artifact artifact, ArtifactRepository 
localRepository );
  +    void transformForInstall( Artifact artifact, ArtifactRepository 
localRepository )
  +        throws ArtifactMetadataRetrievalException;
   
       /**
        * Take in a artifact and return the transformed artifact for 
distributing toa remote repository. If no
  
  
  
  1.17      +20 -2     
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
  
  Index: SnapshotTransformation.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- SnapshotTransformation.java       30 Mar 2005 14:56:32 -0000      1.16
  +++ SnapshotTransformation.java       31 Mar 2005 07:04:10 -0000      1.17
  @@ -144,7 +144,7 @@
               else
               {
                   String version = localMetadata.constructVersion();
  -                
  +
                   if ( getLogger().isInfoEnabled() )
                   {
                       if ( !version.equals( artifact.getBaseVersion() ) && 
!alreadyResolved )
  @@ -197,8 +197,26 @@
       }
   
       public void transformForInstall( Artifact artifact, ArtifactRepository 
localRepository )
  +        throws ArtifactMetadataRetrievalException
       {
  -        // Nothing to do
  +        try
  +        {
  +            SnapshotArtifactMetadata metadata = 
SnapshotArtifactMetadata.readFromLocalRepository( artifact,
  +                                                                             
                     localRepository );
  +            if ( metadata.getLastModified() == 0 )
  +            {
  +                // doesn't exist - create to avoid an old snapshot download 
later
  +                metadata.storeInLocalRepository( localRepository );
  +            }
  +        }
  +        catch ( ArtifactPathFormatException e )
  +        {
  +            throw new ArtifactMetadataRetrievalException( "Error getting 
existing metadata", e );
  +        }
  +        catch ( IOException e )
  +        {
  +            throw new ArtifactMetadataRetrievalException( "Error getting 
existing metadata", e );
  +        }
       }
   
       public void transformForDeployment( Artifact artifact, 
ArtifactRepository remoteRepository )
  
  
  

Reply via email to