svn commit: r751119 - in /maven/components/trunk: maven-project/src/main/java/org/apache/maven/project/ maven-project/src/test/java/org/apache/maven/project/ maven-repository/src/main/java/org/apache/maven/repository/

[jvanzyl]

Author: jvanzyl
Date: Fri Mar  6 22:43:27 2009
New Revision: 751119

URL: http://svn.apache.org/viewvc?rev=751119&view=rev
Log:
o reducing the foot print of the repository interface some more

Removed:
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java
    
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=751119&r1=751118&r2=751119&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
 Fri Mar  6 22:43:27 2009
@@ -1205,7 +1205,7 @@
                     version = ext.getVersion();
                 }
 
-                Artifact artifact = repositorySystem.createExtensionArtifact( 
ext.getGroupId(), ext.getArtifactId(), version );
+                Artifact artifact = repositorySystem.createArtifact( 
ext.getGroupId(), ext.getArtifactId(), version, null, "jar" );
 
                 if ( artifact != null )
                 {

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java?rev=751119&r1=751118&r2=751119&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java
 Fri Mar  6 22:43:27 2009
@@ -28,6 +28,4 @@
 public class TestProjectBuilder 
     extends DefaultMavenProjectBuilder
 {
-    @Requirement(hint="test")
-    private ArtifactResolver artifactResolver;    
 }

Modified: 
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java?rev=751119&r1=751118&r2=751119&view=diff
==============================================================================
--- 
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
 (original)
+++ 
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
 Fri Mar  6 22:43:27 2009
@@ -48,11 +48,7 @@
 
     Artifact createPluginArtifact( String groupId, String artifactId, String 
version );
 
-    Artifact createExtensionArtifact( String groupId, String artifactId, 
String version );
-
     Artifact createDependencyArtifact( String groupId, String artifactId, 
String version, String type, String classifier, String scope, boolean optional 
);
-
-    Artifact createDependencyArtifact( String groupId, String artifactId, 
String version, String type, String classifier, String scope, String 
inheritedScope );
     
     //REMOVE
     // This will disappear when we actually deal with resolving a root 
dependency and its dependencies. This is used everywhere because of that