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 jv...@apache.org on 2004/08/12 19:55:48 UTC
cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/project AbstractProjectTestCase.java
jvanzyl 2004/08/12 10:55:48
Modified: maven-core/src/main/java/org/apache/maven/artifact
MavenMetadataSource.java
maven-core/src/main/java/org/apache/maven/project
MavenProject.java
maven-core/src/test/java/org/apache/maven/project
AbstractProjectTestCase.java
Log:
o removing any notions of the local repository from MavenProject, not the
right place for it.
Revision Changes Path
1.3 +1 -5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenMetadataSource.java 10 Aug 2004 00:30:25 -0000 1.2
+++ MavenMetadataSource.java 12 Aug 2004 17:55:47 -0000 1.3
@@ -4,7 +4,6 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -64,8 +63,6 @@
try
{
- // This is using the current format for the metadata
-
Artifact metadataArtifact = new DefaultArtifact( artifact.getGroupId(),
artifact.getArtifactId(),
artifact.getVersion(),
@@ -80,7 +77,6 @@
catch ( Exception e )
{
throw new ArtifactMetadataRetrievalException( "Cannot read artifact source: ", e );
-
}
return artifacts;
1.2 +0 -36 maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Index: MavenProject.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenProject.java 9 Aug 2004 19:02:37 -0000 1.1
+++ MavenProject.java 12 Aug 2004 17:55:48 -0000 1.2
@@ -548,45 +548,9 @@
return false;
}
- /**
- * @return
- * @todo create something like MavenContants class and put "maven.repo.local"
- * @todo In fact I am not sure if this object should be used for accessing the information
- * where maven local repository is. There should be only one local repository and it
- * should be shared between all projects. Probably we can have a component like
- * MavenEnvinromnent which will contain all behavioral settings shared between projects.
- * This component can read on the startup ${user.home}/build.properties file
- * <p/>
- * <p/>
- * there
- */
- public String getLocalRepository()
- {
- return getProperty( "maven.repo.local" );
- }
-
- public void setLocalRepository( String path )
- {
- properties.put( "maven.repo.local", path );
- }
-
public List getRepositories()
{
return model.getRepositories();
- }
-
- public void addRepository( Repository repository )
- {
- model.getRepositories().add( repository );
- }
-
- public void addRepository( String url )
- {
- Repository repository = new Repository();
-
- repository.setUrl( url );
-
- addRepository( repository );
}
}
1.2 +0 -16 maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java
Index: AbstractProjectTestCase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractProjectTestCase.java 9 Aug 2004 19:02:38 -0000 1.1
+++ AbstractProjectTestCase.java 12 Aug 2004 17:55:48 -0000 1.2
@@ -71,20 +71,4 @@
{
return buildProject( f, localRepository, false );
}
-
- protected void initRemoteRepositories( MavenProject project )
- {
- //we will remove ibiblio
- project.getRepositories().clear();
-
- File repo_1 = new File( getBasedir(), "target/test-classes/remote-repo-1" );
-
- File repo_2 = new File( getBasedir(), "target/test-classes/remote-repo-2" );
-
- project.addRepository( "file://" + repo_1.getPath() );
-
- project.addRepository( "file://" + repo_2.getPath() );
-
- assertEquals( 2, project.getRepositories().size() );
- }
}