You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by br...@apache.org on 2005/02/24 06:33:18 UTC
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/artifact MavenMetadataSource.java JarOverrideRequestTransformation.java
brett 2005/02/23 21:33:18
Modified: maven-artifact/src/main/java/org/apache/maven/artifact/manager
DefaultWagonManager.java WagonManager.java
maven-core/src/main/java/org/apache/maven/artifact
MavenMetadataSource.java
Removed: maven-core/src/main/java/org/apache/maven/artifact
JarOverrideRequestTransformation.java
Log:
clean up some artifact related code
Revision Changes Path
1.10 +1 -9 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultWagonManager.java 10 Feb 2005 07:09:57 -0000 1.9
+++ DefaultWagonManager.java 24 Feb 2005 05:33:17 -0000 1.10
@@ -19,16 +19,15 @@
import org.apache.maven.artifact.AbstractArtifactComponent;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.UnsupportedProtocolException;
import org.apache.maven.wagon.Wagon;
-import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authorization.AuthorizationException;
+import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.proxy.ProxyInfo;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
@@ -55,13 +54,6 @@
private TransferListener downloadMonitor;
- public Artifact createArtifact( String groupId, String artifactId, String version, String type )
- {
- Artifact artifact = new DefaultArtifact( groupId, artifactId, version, type );
-
- return artifact;
- }
-
public Wagon getWagon( String protocol )
throws UnsupportedProtocolException
{
1.5 +1 -3 maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
Index: WagonManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WagonManager.java 10 Feb 2005 07:09:57 -0000 1.4
+++ WagonManager.java 24 Feb 2005 05:33:18 -0000 1.5
@@ -51,6 +51,4 @@
void setProxy( String protocol, String host, int port, String username, String password, String nonProxyHosts );
void setDownloadMonitor( TransferListener downloadMonitor );
-
- Artifact createArtifact( String groupId, String artifactId, String version, String type );
}
\ No newline at end of file
1.11 +2 -1 maven-components/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
Index: MavenMetadataSource.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MavenMetadataSource.java 15 Feb 2005 21:39:07 -0000 1.10
+++ MavenMetadataSource.java 24 Feb 2005 05:33:18 -0000 1.11
@@ -113,6 +113,7 @@
public Artifact createArtifact( Dependency dependency, ArtifactRepository localRepository )
{
+ // TODO: duplicated with the ArtifactFactory, localRepository not used (should be used here to resolve path?
Artifact artifact = new DefaultArtifact( dependency.getGroupId(),
dependency.getArtifactId(),
dependency.getVersion(),