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/28 11:57:20 UTC
svn commit: r292155 - in
/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact:
manager/ metadata/ transform/
Author: brett
Date: Wed Sep 28 02:57:10 2005
New Revision: 292155
URL: http://svn.apache.org/viewcvs?rev=292155&view=rev
Log:
remove legacy metadata handling
Removed:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/AbstractVersionArtifactMetadata.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/LatestArtifactMetadata.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/LegacyArtifactMetadata.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/ReleaseArtifactMetadata.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/SnapshotArtifactMetadata.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.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
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=292155&r1=292154&r2=292155&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Wed Sep 28 02:57:10 2005
@@ -69,7 +69,7 @@
private Map mirrors = new HashMap();
private TransferListener downloadMonitor;
-
+
private boolean online = true;
public Wagon getWagon( String protocol )
@@ -108,7 +108,7 @@
throws TransferFailedException
{
failIfNotOnline();
-
+
String protocol = repository.getProtocol();
Wagon wagon;
@@ -281,9 +281,9 @@
throws TransferFailedException, ResourceDoesNotExistException, ChecksumFailedException
{
// TODO: better excetpions - transfer failed is not enough?
-
+
failIfNotOnline();
-
+
Wagon wagon;
ArtifactRepository mirror = getMirror( repository.getId() );
@@ -329,7 +329,6 @@
try
{
-
wagon.connect( new Repository( repository.getId(), repository.getUrl() ),
getAuthenticationInfo( repository.getId() ), getProxy( protocol ) );
@@ -460,7 +459,8 @@
}
}
- private void failIfNotOnline() throws TransferFailedException
+ private void failIfNotOnline()
+ throws TransferFailedException
{
if ( !isOnline() )
{
@@ -659,7 +659,7 @@
{
this.online = online;
}
-
+
public boolean isOnline()
{
return online;
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=292155&r1=292154&r2=292155&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java Wed Sep 28 02:57:10 2005
@@ -19,24 +19,16 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.artifact.metadata.LegacyArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
-import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
-import java.util.Set;
/**
* Describes a version transformation during artifact resolution.
@@ -53,11 +45,6 @@
protected WagonManager wagonManager;
- /**
- * @todo remove in beta-2 - used for legacy handling
- */
- private static Set resolvedArtifactCache = new HashSet();
-
protected String resolveVersion( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories )
throws ArtifactMetadataRetrievalException
{
@@ -83,11 +70,8 @@
if ( version == null )
{
- version = resolveLegacyVersion( artifact, localRepository, remoteRepositories );
- if ( version == null )
- {
- version = artifact.getBaseVersion();
- }
+ // use the local copy, or if it doesn't exist - go to the remote repo for it
+ version = artifact.getBaseVersion();
}
// TODO: also do this logging for other metadata?
@@ -117,145 +101,4 @@
}
protected abstract String constructVersion( Versioning versioning, String baseVersion );
-
- /**
- * @todo remove in beta-2 - used for legacy handling
- */
- private String resolveLegacyVersion( Artifact artifact, ArtifactRepository localRepository,
- List remoteRepositories )
- throws ArtifactMetadataRetrievalException
- {
- LegacyArtifactMetadata localMetadata = createLegacyMetadata( artifact );
- File f = new File( localRepository.getBasedir(),
- localRepository.pathOfLocalRepositoryMetadata( localMetadata, null ) );
- if ( f.exists() )
- {
- try
- {
- localMetadata.readFromFile( f );
- }
- catch ( IOException e )
- {
- throw new ArtifactMetadataRetrievalException( "Error reading local metadata", e );
- }
- }
- else
- {
- localMetadata = null;
- }
-
- boolean alreadyResolved = alreadyResolved( artifact );
- if ( !alreadyResolved )
- {
- if ( !wagonManager.isOnline() )
- {
- LegacyArtifactMetadata metadata = createLegacyMetadata( artifact );
- getLogger().debug(
- "System is offline. Cannot resolve metadata:\n" + metadata.extendedToString() + "\n\n" );
-
- return null;
- }
-
- boolean checkedUpdates = false;
- for ( Iterator i = remoteRepositories.iterator(); i.hasNext(); )
- {
- ArtifactRepository repository = (ArtifactRepository) i.next();
-
- ArtifactRepositoryPolicy policy = artifact.isSnapshot() ? repository.getSnapshots()
- : repository.getReleases();
-
- if ( !policy.isEnabled() )
- {
- getLogger().debug( "Legacy metadata: " + artifact.getId() + ": Skipping disabled repository " +
- repository.getId() + " (" + repository.getUrl() + ")" );
- }
- else
- {
- boolean checkForUpdates = localMetadata == null ||
- policy.checkOutOfDate( localMetadata.getLastModified() );
-
- if ( checkForUpdates )
- {
- checkedUpdates = true;
-
- LegacyArtifactMetadata remoteMetadata;
-
- try
- {
- remoteMetadata = createLegacyMetadata( artifact );
-
- remoteMetadata.retrieveFromRemoteRepository( repository, wagonManager,
- policy.getChecksumPolicy() );
-
- getLogger().warn( "Using old-style versioning metadata from remote repo for " + artifact );
-
- if ( localMetadata == null || remoteMetadata.compareTo( localMetadata ) > 0 )
- {
- // remote is newer
- artifact.setRepository( repository );
- localMetadata = remoteMetadata;
- getLogger().debug( "Found repository for the artifact." );
- }
- }
- catch ( ResourceDoesNotExistException e )
- {
- getLogger().debug( "Legacy metadata for: " + artifact.getId() +
- " could not be found on repository: " + repository.getId() );
- }
- catch ( ArtifactMetadataRetrievalException e )
- {
- getLogger().warn( "Legacy metadata for: " + artifact.getId() +
- " could not be found on repository: " + repository.getId(), e );
- }
- }
- else
- {
- getLogger().debug( "resolveMetaData: " + artifact.getId() + ": NOT checking for updates from " +
- repository.getId() + " (" + repository.getUrl() + ")" );
- }
- }
- }
-
- // touch the file if it was checked for updates, but don't create it if it did't exist to avoid
- // storing SNAPSHOT as the actual version which doesn't exist remotely.
- if ( checkedUpdates && localMetadata != null && localMetadata.getLastModified().getTime() > 0 )
- {
- localMetadata.storeInLocalRepository( localRepository );
- }
-
- resolvedArtifactCache.add( getCacheKey( artifact ) );
- }
-
- if ( localMetadata != null && artifact.getFile().exists() &&
- !localMetadata.newerThanFile( artifact.getFile() ) )
- {
- if ( getLogger().isDebugEnabled() && !alreadyResolved )
- {
- // Locally installed file is newer, don't use the resolved version
- getLogger().debug( artifact.getArtifactId() + ": using locally installed snapshot" );
- }
- localMetadata = null;
- }
-
- return localMetadata != null ? localMetadata.constructVersion() : null;
- }
-
- protected abstract LegacyArtifactMetadata createLegacyMetadata( Artifact artifact );
-
- /**
- * @todo remove in beta-2 - used for legacy handling
- */
- private boolean alreadyResolved( Artifact artifact )
- {
- return resolvedArtifactCache.contains( getCacheKey( artifact ) );
- }
-
- /**
- * @todo remove in beta-2 - used for legacy handling
- */
- private static String getCacheKey( Artifact artifact )
- {
- // No type - one per POM
- return artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getBaseVersion();
- }
}
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=292155&r1=292154&r2=292155&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 Wed Sep 28 02:57:10 2005
@@ -18,8 +18,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.artifact.metadata.LatestArtifactMetadata;
-import org.apache.maven.artifact.metadata.LegacyArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.Versioning;
@@ -53,11 +51,6 @@
throws ArtifactMetadataRetrievalException
{
// metadata is added via addPluginArtifactMetadata
- }
-
- protected LegacyArtifactMetadata createLegacyMetadata( Artifact artifact )
- {
- return new LatestArtifactMetadata( artifact );
}
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=292155&r1=292154&r2=292155&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 Wed Sep 28 02:57:10 2005
@@ -19,8 +19,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.LegacyArtifactMetadata;
-import org.apache.maven.artifact.metadata.ReleaseArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
@@ -82,11 +80,6 @@
}
return new ArtifactRepositoryMetadata( artifact, versioning );
- }
-
- protected LegacyArtifactMetadata createLegacyMetadata( Artifact artifact )
- {
- return new ReleaseArtifactMetadata( artifact );
}
protected String constructVersion( Versioning versioning, String baseVersion )
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=292155&r1=292154&r2=292155&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java Wed Sep 28 02:57:10 2005
@@ -18,20 +18,19 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.artifact.metadata.LegacyArtifactMetadata;
-import org.apache.maven.artifact.metadata.SnapshotArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Snapshot;
import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
-import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.codehaus.plexus.util.StringUtils;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.TimeZone;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
@@ -44,6 +43,10 @@
{
private String deploymentTimestamp;
+ private static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone( "UTC" );
+
+ private static final String UTC_TIMESTAMP_PATTERN = "yyyyMMdd.HHmmss";
+
public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
throws ArtifactMetadataRetrievalException
{
@@ -93,16 +96,11 @@
{
if ( deploymentTimestamp == null )
{
- deploymentTimestamp = SnapshotArtifactMetadata.getUtcDateFormatter().format( new Date() );
+ deploymentTimestamp = getUtcDateFormatter().format( new Date() );
}
return deploymentTimestamp;
}
- protected LegacyArtifactMetadata createLegacyMetadata( Artifact artifact )
- {
- return new SnapshotArtifactMetadata( artifact );
- }
-
protected String constructVersion( Versioning versioning, String baseVersion )
{
String version = null;
@@ -150,24 +148,13 @@
buildNumber = repoMetadata.getVersioning().getSnapshot().getBuildNumber();
}
}
- else
- {
- try
- {
- SnapshotArtifactMetadata snapshotMetadata = new SnapshotArtifactMetadata( artifact );
- snapshotMetadata.retrieveFromRemoteRepository( remoteRepository, wagonManager,
- ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
- getLogger().warn( "Using old-style versioning metadata from remote repo for " + artifact );
-
- buildNumber = snapshotMetadata.getBuildNumber();
- }
- catch ( ResourceDoesNotExistException e1 )
- {
- // safe to ignore, use default snapshot data
- getLogger().debug( "Unable to find legacy metadata - ignoring" );
- }
- }
return buildNumber;
}
+ public static DateFormat getUtcDateFormatter()
+ {
+ DateFormat utcDateFormatter = new SimpleDateFormat( UTC_TIMESTAMP_PATTERN );
+ utcDateFormatter.setTimeZone( UTC_TIME_ZONE );
+ return utcDateFormatter;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org