You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/09/12 00:37:37 UTC
svn commit: r280191 - in
/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact:
repository/metadata/ transform/
Author: brett
Date: Sun Sep 11 15:37:26 2005
New Revision: 280191
URL: http://svn.apache.org/viewcvs?rev=280191&view=rev
Log:
PR: MNG-613
fix the location of the metadata update check
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=280191&r1=280190&r2=280191&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Sun Sep 11 15:37:26 2005
@@ -134,12 +134,15 @@
ArtifactRepository deploymentRepository )
throws ArtifactMetadataRetrievalException
{
+ getLogger().info( "Retrieving previous metadata from " + deploymentRepository.getId() );
+ resolveAlways( metadata, localRepository, deploymentRepository );
+
metadata.storeInLocalRepository( localRepository, deploymentRepository );
- // TODO: shouldn't need to calculate this
- File f = new File( localRepository.getBasedir(),
- localRepository.pathOfLocalRepositoryMetadata( metadata, deploymentRepository ) );
+
try
{
+ File f = new File( localRepository.getBasedir(),
+ localRepository.pathOfLocalRepositoryMetadata( metadata, deploymentRepository ) );
wagonManager.putArtifactMetadata( f, metadata, deploymentRepository );
}
catch ( TransferFailedException e )
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java?rev=280191&r1=280190&r2=280191&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java Sun Sep 11 15:37:26 2005
@@ -17,7 +17,6 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.LatestArtifactMetadata;
import org.apache.maven.artifact.metadata.LegacyArtifactMetadata;
@@ -46,26 +45,19 @@
public void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
throws ArtifactMetadataRetrievalException
{
- // metadata is added at install time
+ // metadata is added via addPluginArtifactMetadata
}
public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
ArtifactRepository localRepository )
throws ArtifactMetadataRetrievalException
{
- // metadata is added at deploy time
+ // metadata is added via addPluginArtifactMetadata
}
protected LegacyArtifactMetadata createLegacyMetadata( Artifact artifact )
{
return new LatestArtifactMetadata( artifact );
- }
-
- protected ArtifactMetadata createMetadata( Artifact artifact, Versioning versioning )
- {
- LatestArtifactMetadata metadata = new LatestArtifactMetadata( artifact );
- metadata.setVersion( versioning.getLatest() );
- return metadata;
}
protected String constructVersion( Versioning versioning, String baseVersion )
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java?rev=280191&r1=280190&r2=280191&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java Sun Sep 11 15:37:26 2005
@@ -56,16 +56,7 @@
public void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
throws ArtifactMetadataRetrievalException
{
- Versioning versioning = new Versioning();
- versioning.addVersion( artifact.getVersion() );
-
- if ( artifact.isRelease() )
- {
- versioning.setRelease( artifact.getVersion() );
- }
-
- // TODO: need to create?
- ArtifactMetadata metadata = new ArtifactRepositoryMetadata( artifact, versioning );
+ ArtifactMetadata metadata = createMetadata( artifact );
artifact.addMetadata( metadata );
}
@@ -74,6 +65,13 @@
ArtifactRepository localRepository )
throws ArtifactMetadataRetrievalException
{
+ ArtifactMetadata metadata = createMetadata( artifact );
+
+ artifact.addMetadata( metadata );
+ }
+
+ private ArtifactMetadata createMetadata( Artifact artifact )
+ {
Versioning versioning = new Versioning();
versioning.addVersion( artifact.getVersion() );
@@ -82,14 +80,7 @@
versioning.setRelease( artifact.getVersion() );
}
- // TODO: need to create?
- ArtifactMetadata metadata = new ArtifactRepositoryMetadata( artifact, versioning );
-
- artifact.addMetadata( metadata );
-
- // TODO: this should be in the part that actually merges instead
- getLogger().info( "Retrieving previous metadata from " + remoteRepository.getId() );
- repositoryMetadataManager.resolveAlways( metadata, localRepository, remoteRepository );
+ return new ArtifactRepositoryMetadata( artifact, versioning );
}
protected LegacyArtifactMetadata createLegacyMetadata( Artifact artifact )
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org