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/06/14 19:42:41 UTC
cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/project AbstractProjectTestCase.java ProjectBaseDirectoryAlignmentTest.java
jvanzyl 2004/06/14 10:42:41
Modified: maven-core/src/main/java/org/apache/maven/project
MavenProject.java
maven-core/src/main/resources/META-INF/plexus components.xml
maven-core/src/main/resources/org/apache/maven plexus.xml
maven-core/src/test/java/org/apache/maven
MavenPlexusComponentTestBase.java
maven-core/src/test/java/org/apache/maven/project
AbstractProjectTestCase.java
ProjectBaseDirectoryAlignmentTest.java
Log:
Revision Changes Path
1.2 +1 -2 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 11 Jun 2004 15:11:54 -0000 1.1
+++ MavenProject.java 14 Jun 2004 17:42:41 -0000 1.2
@@ -882,7 +882,6 @@
properties.put( "maven.repo.local", path );
}
-
public List getRepositories()
{
return model.getRepositories();
1.2 +0 -73 maven-components/maven-core/src/main/resources/META-INF/plexus/components.xml
Index: components.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/META-INF/plexus/components.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- components.xml 11 Jun 2004 15:11:54 -0000 1.1
+++ components.xml 14 Jun 2004 17:42:41 -0000 1.2
@@ -1,75 +1,2 @@
<component-set>
- <components>
- <component>
- <role>org.apache.maven.project.MavenProjectBuilder</role>
- <implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.project.ModelInheritanceAssembler</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.collector.ArtifactCollector</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.MavenArtifactFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.wagon.manager.WagonManager</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.artifact.factory.MavenArtifactFactory</role>
- <implementation>org.apache.maven.artifact.factory.DefaultMavenArtifactFactory</implementation>
- </component>
- <component>
- <role>org.apache.maven.artifact.collector.ArtifactCollector</role>
- <implementation>org.apache.maven.artifact.collector.DefaultArtifactCollector</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <implementation>org.apache.maven.artifact.resolver.DefaultArtifactResolver</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.factory.MavenArtifactFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.downloader.ArtifactDownloader</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.snapshot.SnapshotResolver</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.artifact.downloader.ArtifactDownloader</role>
- <implementation>org.apache.maven.artifact.downloader.DefaultArtifactDownloader</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.wagon.manager.WagonManager</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.project.ModelInheritanceAssembler</role>
- <implementation>org.apache.maven.project.DefaultModelInheritanceAssembler</implementation>
- </component>
- <component>
- <role>org.apache.maven.artifact.snapshot.SnapshotResolver</role>
- <implementation>org.apache.maven.artifact.snapshot.DefaultSnapshotResolver</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.wagon.manager.WagonManager</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.downloader.ArtifactDownloader</role>
- </requirement>
- </requirements>
- </component>
- </components>
</component-set>
1.2 +73 -0 maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml
Index: plexus.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plexus.xml 11 Jun 2004 15:11:55 -0000 1.1
+++ plexus.xml 14 Jun 2004 17:42:41 -0000 1.2
@@ -59,5 +59,78 @@
</lifecycle-phases>
</configuration>
</component>
+ <component>
+ <role>org.apache.maven.project.MavenProjectBuilder</role>
+ <implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.project.ModelInheritanceAssembler</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.collector.ArtifactCollector</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.factory.MavenArtifactFactory</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.wagon.manager.WagonManager</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.factory.MavenArtifactFactory</role>
+ <implementation>org.apache.maven.artifact.factory.DefaultMavenArtifactFactory</implementation>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.collector.ArtifactCollector</role>
+ <implementation>org.apache.maven.artifact.collector.DefaultArtifactCollector</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+ <implementation>org.apache.maven.artifact.resolver.DefaultArtifactResolver</implementation>
+ <requirements>
+ <!--
+ <requirement>
+ <role>org.apache.maven.artifact.factory.MavenArtifactFactory</role>
+ </requirement>
+ -->
+ <requirement>
+ <role>org.apache.maven.artifact.downloader.ArtifactDownloader</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.snapshot.SnapshotResolver</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.downloader.ArtifactDownloader</role>
+ <implementation>org.apache.maven.artifact.downloader.DefaultArtifactDownloader</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.wagon.manager.WagonManager</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.project.ModelInheritanceAssembler</role>
+ <implementation>org.apache.maven.project.DefaultModelInheritanceAssembler</implementation>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.snapshot.SnapshotResolver</role>
+ <implementation>org.apache.maven.artifact.snapshot.DefaultSnapshotResolver</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.wagon.manager.WagonManager</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.downloader.ArtifactDownloader</role>
+ </requirement>
+ </requirements>
+ </component>
</components>
</configuration>
1.2 +2 -2 maven-components/maven-core/src/test/java/org/apache/maven/MavenPlexusComponentTestBase.java
Index: MavenPlexusComponentTestBase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/MavenPlexusComponentTestBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenPlexusComponentTestBase.java 11 Jun 2004 15:11:55 -0000 1.1
+++ MavenPlexusComponentTestBase.java 14 Jun 2004 17:42:41 -0000 1.2
@@ -33,7 +33,7 @@
public class MavenPlexusComponentTestBase
extends PlexusTestCase
{
- private String basedir = System.getProperty( "basedir" );
+ //private String basedir = System.getProperty( "basedir" );
public MavenPlexusComponentTestBase( String name )
{
1.2 +9 -1 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 11 Jun 2004 15:11:55 -0000 1.1
+++ AbstractProjectTestCase.java 14 Jun 2004 17:42:41 -0000 1.2
@@ -1,12 +1,14 @@
package org.apache.maven.project;
import java.io.File;
+import java.io.InputStream;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.MavenPlexusComponentTestBase;
public class AbstractProjectTestCase
- extends PlexusTestCase
+ extends MavenPlexusComponentTestBase
{
protected MavenProjectBuilder projectBuilder;
@@ -15,6 +17,12 @@
public AbstractProjectTestCase( String testName )
{
super( testName );
+ }
+
+ public InputStream getCustomConfiguration()
+ throws Exception
+ {
+ return getClassLoader().getResourceAsStream( "org/apache/maven/plexus.xml" );
}
public void setUp()
1.2 +1 -4 maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
Index: ProjectBaseDirectoryAlignmentTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectBaseDirectoryAlignmentTest.java 11 Jun 2004 15:11:55 -0000 1.1
+++ ProjectBaseDirectoryAlignmentTest.java 14 Jun 2004 17:42:41 -0000 1.2
@@ -7,10 +7,7 @@
public class ProjectBaseDirectoryAlignmentTest
extends AbstractProjectTestCase
-{
-
-
-
+{
private String dir = "src/test/resources/projects/base-directory-alignment/";
public ProjectBaseDirectoryAlignmentTest( String testName )