brett 2005/03/23 07:03:39
Modified:
maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager
DefaultArtifactHandlerManager.java
maven-artifact/src/main/java/org/apache/maven/artifact/manager
DefaultWagonManager.java
maven-artifact/src/main/java/org/apache/maven/artifact/transform
ArtifactTransformation.java
SnapshotTransformation.java
Log:
scaffolding for remote transformation
Revision Changes Path
1.11 +1 -2
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
Index: DefaultArtifactHandlerManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultArtifactHandlerManager.java 23 Mar 2005 14:55:15 -0000
1.10
+++ DefaultArtifactHandlerManager.java 23 Mar 2005 15:03:39 -0000
1.11
@@ -66,7 +66,7 @@
for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
{
ArtifactTransformation transform = (ArtifactTransformation)
i.next();
- // TODO: perform transformation
+ artifact = transform.transformRemoteArtifact( artifact,
remoteRepository );
}
return remoteRepository.pathOf( artifact );
@@ -79,7 +79,6 @@
{
ArtifactTransformation transform = (ArtifactTransformation)
i.next();
artifact = transform.transformLocalArtifact( artifact,
localRepository );
- // TODO: perform transformation
}
return localRepository.getBasedir() + "/" + localRepository.pathOf(
artifact );
1.19 +1 -0
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Index: DefaultWagonManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DefaultWagonManager.java 23 Mar 2005 08:42:57 -0000 1.18
+++ DefaultWagonManager.java 23 Mar 2005 15:03:39 -0000 1.19
@@ -158,6 +158,7 @@
wagon.connect( repository, getProxy(
repository.getProtocol() ) );
+ // TODO: should we avoid doing the transforms on this every
time, and instead transform outside the loop?
String remotePath =
artifactHandlerManager.getRemoteRepositoryArtifactPath( artifact, repository );
wagon.get( remotePath, temp );
1.3 +9 -0
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArtifactTransformation.java 23 Mar 2005 08:42:57 -0000 1.2
+++ ArtifactTransformation.java 23 Mar 2005 15:03:39 -0000 1.3
@@ -36,4 +36,13 @@
* @return The transformed Artifact
*/
Artifact transformLocalArtifact( Artifact artifact, ArtifactRepository
localRepository );
+
+ /**
+ * Take in a artifact and return the transformed artifact for locating
in the remote repository. If no
+ * transformation has occured the original artifact is returned.
+ *
+ * @param artifact Artifact to be transformed.
+ * @return The transformed Artifact
+ */
+ Artifact transformRemoteArtifact( Artifact artifact, ArtifactRepository
remoteRepository );
}
\ No newline at end of file
1.4 +16 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SnapshotTransformation.java 23 Mar 2005 14:55:15 -0000 1.3
+++ SnapshotTransformation.java 23 Mar 2005 15:03:39 -0000 1.4
@@ -30,7 +30,7 @@
public class SnapshotTransformation
implements ArtifactTransformation
{
-/*
+/* TODO: use and remove
public Artifact transform( Artifact artifact, ArtifactRepository
localRepository, List repositories,
Map parameters )
throws Exception
@@ -187,7 +187,7 @@
*/
public Artifact transformLocalArtifact( Artifact artifact,
ArtifactRepository localRepository )
{
- if ( isSnapshot( artifact ) && "pom".equals( artifact.getType() ) )
+ if ( shouldProcessArtifact( artifact ) )
{
// only store the snapshot-version-local.txt file for POMs as
every file has an associated POM
ArtifactMetadata metadata =
SnapshotArtifactMetadata.createLocalSnapshotMetadata( artifact );
@@ -196,6 +196,20 @@
return artifact;
}
+ public Artifact transformRemoteArtifact( Artifact artifact,
ArtifactRepository remoteRepository )
+ {
+ if ( shouldProcessArtifact( artifact ) )
+ {
+ // TODO: implement
+ }
+ return artifact;
+ }
+
+ private static boolean shouldProcessArtifact( Artifact artifact )
+ {
+ return isSnapshot( artifact ) && "pom".equals( artifact.getType() );
+ }
+
private static boolean isSnapshot( Artifact artifact )
{
return artifact.getVersion().endsWith( "SNAPSHOT" );
