svn commit: r164217 - /maven/components/trunk/maven-archiver /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact /maven/components/trunk/maven-core /maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact /maven/components/trunk/maven-core/src/main/java/org/apache/maven/project /maven/components/trunk/maven-core/src/main/resources/META-INF/plexus /maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project /maven/components/trunk/maven-core/src/test/java/org/apache/maven /maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle /maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin /maven/components/trunk/maven-core/src/test/java/org/apache/maven/project /maven/components/trunk/maven-core/src/test/resources /maven/components/trunk/maven-core/src/test/resources/inheritance-repo /maven/components/trunk/maven-core/src/test/resources/local-repo /maven/components/trunk/maven-core/src/test/resources/org/apache/maven/project /maven/components/trunk/maven-core/src/test/resources/projects/base-directory-alignment /maven/components/trunk/maven-core/src/test/resources/projects/scope /maven/components/trunk/maven-core/src/test/resources/validation /maven/components/trunk/maven-mboot2/src/main/java /maven/components/trunk/maven-project /maven/components/trunk/maven-project/src /maven/components/trunk/maven-project/src/main /maven/components/trunk/maven-project/src/main/java /maven/components/trunk/maven-project/src/main/java/org /maven/components/trunk/maven-project/src/main/java/org/apache /maven/components/trunk/maven-project/src/main/java/org/apache/maven /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation /maven/components/trunk/maven-project/src/main/resources /maven/components/trunk/maven-project/src/main/resources/META-INF /maven/components/trunk/maven-project/src/main/resources/META-INF/plexus /maven/components/trunk/maven-project/src/main/resources/org /maven/components/trunk/maven-project/src/main/resources/org/apache /maven/components/trunk/maven-project/src/main/resources/org/apache/maven /maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project /maven/components/trunk/maven-project/src/test /maven/components/trunk/maven-project/src/test/java /maven/components/trunk/maven-project/src/test/java/org /maven/components/trunk/maven-project/src/test/java/org/apache /maven/components/trunk/maven-project/src/test/java/org/apache/maven /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/interpolation /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation /maven/components/trunk/maven-project/src/test/resources /maven/components/trunk/maven-project/src/test/resources/inheritance-repo /maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00 /maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01 /maven/components/trunk/maven-project/src/test/resources/local-repo /maven/components/trunk/maven-project/src/test/resources/local-repo/maven-test /maven/components/trunk/maven-project/src/test/resources/local-repo/snapshot-test /maven/components/trunk/maven-project/src/test/resources/org /maven/components/trunk/maven-project/src/test/resources/org/apache /maven/components/trunk/maven-project/src/test/resources/org/apache/maven /maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project /maven/components/trunk/maven-project/src/test/resources/projects /maven/components/trunk/maven-project/src/test/resources/projects/base-directory-alignment /maven/components/trunk/maven-project/src/test/resources/projects/base-directory-alignment/subproject /maven/components/trunk/maven-project/src/test/resources/projects/scope /maven/components/trunk/maven-project/src/test/resources/validation

Fri, 22 Apr 2005 04:01:43 -0700 

Author: brett
Date: Fri Apr 22 04:01:33 2005
New Revision: 164217

URL: http://svn.apache.org/viewcvs?rev=164217&view=rev
Log:
separate maven-project code

Added:
    
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java
      - copied unchanged from r164178, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java
    maven/components/trunk/maven-project/src/
    maven/components/trunk/maven-project/src/main/
    maven/components/trunk/maven-project/src/main/java/
    maven/components/trunk/maven-project/src/main/java/org/
    maven/components/trunk/maven-project/src/main/java/org/apache/
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/
      - copied from r164178, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
      - copied, changed from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectSorter.java
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/
      - copied from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/inheritance/
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/
      - copied from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/injection/
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/
      - copied from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/
      - copied from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/path/
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/
      - copied from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/validation/
    maven/components/trunk/maven-project/src/main/resources/
    maven/components/trunk/maven-project/src/main/resources/META-INF/
    maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/
    
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
   (with props)
    maven/components/trunk/maven-project/src/main/resources/org/
    maven/components/trunk/maven-project/src/main/resources/org/apache/
    maven/components/trunk/maven-project/src/main/resources/org/apache/maven/
    
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/
      - copied from r164178, 
maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/
    
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
    maven/components/trunk/maven-project/src/test/
    maven/components/trunk/maven-project/src/test/java/
    maven/components/trunk/maven-project/src/test/java/org/
    maven/components/trunk/maven-project/src/test/java/org/apache/
    maven/components/trunk/maven-project/src/test/java/org/apache/maven/
    maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/
      - copied from r164178, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
      - copied, changed from r164205, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/MavenTestCase.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
      - copied, changed from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
      - copied, changed from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
      - copied, changed from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectSorterTest.java
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/
      - copied from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/canonical/
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/
      - copied from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/inheritance/
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/
      - copied from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/injection/
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/interpolation/
      - copied from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/interpolation/
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/
      - copied from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/validation/
    maven/components/trunk/maven-project/src/test/resources/
    maven/components/trunk/maven-project/src/test/resources/canonical-pom.xml
      - copied unchanged from r164178, 
maven/components/trunk/maven-core/src/test/resources/canonical-pom.xml
    maven/components/trunk/maven-project/src/test/resources/inheritance-repo/
      - copied from r164178, 
maven/components/trunk/maven-core/src/test/resources/inheritance-repo/
    
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t00/
      - copied from r164214, 
maven/components/trunk/maven-core/src/test/resources/inheritance-repo/t00/
    
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/
      - copied from r164214, 
maven/components/trunk/maven-core/src/test/resources/inheritance-repo/t01/
    maven/components/trunk/maven-project/src/test/resources/local-repo/
      - copied from r164178, 
maven/components/trunk/maven-core/src/test/resources/local-repo/
    
maven/components/trunk/maven-project/src/test/resources/local-repo/marker.txt
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/local-repo/marker.txt
    
maven/components/trunk/maven-project/src/test/resources/local-repo/maven-test/
      - copied from r164214, 
maven/components/trunk/maven-core/src/test/resources/local-repo/maven-test/
    
maven/components/trunk/maven-project/src/test/resources/local-repo/snapshot-test/
      - copied from r164214, 
maven/components/trunk/maven-core/src/test/resources/local-repo/snapshot-test/
    maven/components/trunk/maven-project/src/test/resources/org/
    maven/components/trunk/maven-project/src/test/resources/org/apache/
    maven/components/trunk/maven-project/src/test/resources/org/apache/maven/
    
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/
      - copied from r164178, 
maven/components/trunk/maven-core/src/test/resources/org/apache/maven/project/
    
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
    maven/components/trunk/maven-project/src/test/resources/projects/
    
maven/components/trunk/maven-project/src/test/resources/projects/base-directory-alignment/
      - copied from r164178, 
maven/components/trunk/maven-core/src/test/resources/projects/base-directory-alignment/
    
maven/components/trunk/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml
    
maven/components/trunk/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml
    
maven/components/trunk/maven-project/src/test/resources/projects/base-directory-alignment/subproject/
      - copied from r164214, 
maven/components/trunk/maven-core/src/test/resources/projects/base-directory-alignment/subproject/
    maven/components/trunk/maven-project/src/test/resources/projects/scope/
      - copied from r164178, 
maven/components/trunk/maven-core/src/test/resources/projects/scope/
    
maven/components/trunk/maven-project/src/test/resources/projects/scope/project-with-scoped-dependencies.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/projects/scope/project-with-scoped-dependencies.xml
    
maven/components/trunk/maven-project/src/test/resources/projects/scope/transitive-compile-dep.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/projects/scope/transitive-compile-dep.xml
    
maven/components/trunk/maven-project/src/test/resources/projects/scope/transitive-default-dep.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/projects/scope/transitive-default-dep.xml
    
maven/components/trunk/maven-project/src/test/resources/projects/scope/transitive-runtime-dep.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/projects/scope/transitive-runtime-dep.xml
    
maven/components/trunk/maven-project/src/test/resources/projects/scope/transitive-test-dep.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/projects/scope/transitive-test-dep.xml
    maven/components/trunk/maven-project/src/test/resources/validation/
      - copied from r164178, 
maven/components/trunk/maven-core/src/test/resources/validation/
    
maven/components/trunk/maven-project/src/test/resources/validation/missing-1-pom.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/validation/missing-1-pom.xml
    
maven/components/trunk/maven-project/src/test/resources/validation/missing-artifactId-pom.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/validation/missing-artifactId-pom.xml
    
maven/components/trunk/maven-project/src/test/resources/validation/missing-groupId-pom.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/validation/missing-groupId-pom.xml
    
maven/components/trunk/maven-project/src/test/resources/validation/missing-modelVersion-pom.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/validation/missing-modelVersion-pom.xml
    
maven/components/trunk/maven-project/src/test/resources/validation/missing-type-pom.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/validation/missing-type-pom.xml
    
maven/components/trunk/maven-project/src/test/resources/validation/missing-version-pom.xml
      - copied unchanged from r164214, 
maven/components/trunk/maven-core/src/test/resources/validation/missing-version-pom.xml
Removed:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/
    
maven/components/trunk/maven-core/src/main/resources/org/apache/maven/project/
    
maven/components/trunk/maven-core/src/test/java/org/apache/maven/MavenTest.java
    
maven/components/trunk/maven-core/src/test/java/org/apache/maven/MavenTestCase.java
    maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/
    maven/components/trunk/maven-core/src/test/resources/canonical-pom.xml
    maven/components/trunk/maven-core/src/test/resources/inheritance-repo/
    maven/components/trunk/maven-core/src/test/resources/local-repo/
    
maven/components/trunk/maven-core/src/test/resources/org/apache/maven/project/
    
maven/components/trunk/maven-core/src/test/resources/projects/base-directory-alignment/
    maven/components/trunk/maven-core/src/test/resources/projects/scope/
    maven/components/trunk/maven-core/src/test/resources/validation/
Modified:
    maven/components/trunk/maven-archiver/pom.xml
    maven/components/trunk/maven-core/pom.xml
    
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
    
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
    
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
    maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
    maven/components/trunk/maven-project/pom.xml
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java

Modified: maven/components/trunk/maven-archiver/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archiver/pom.xml?rev=164217&r1=164216&r2=164217&view=diff
==============================================================================
--- maven/components/trunk/maven-archiver/pom.xml (original)
+++ maven/components/trunk/maven-archiver/pom.xml Fri Apr 22 04:01:33 2005
@@ -20,7 +20,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
+      <artifactId>maven-project</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>

Modified: maven/components/trunk/maven-core/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/pom.xml?rev=164217&r1=164216&r2=164217&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Fri Apr 22 04:01:33 2005
@@ -26,6 +26,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>

Modified: 
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=164217&r1=164216&r2=164217&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
 (original)
+++ 
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
 Fri Apr 22 04:01:33 2005
@@ -32,82 +32,6 @@
         
<default-bundle-name>org.apache.maven.messages.messages</default-bundle-name>
       </configuration>
     </component>
-    <!--
-     |
-     |
-     |
-     -->
-    <component>
-      <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
-      
<implementation>org.apache.maven.project.interpolation.RegexBasedModelInterpolator</implementation>
-    </component>
-    <!--
-     |
-     |
-     |
-     -->
-    <component>
-      <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
-      
<implementation>org.apache.maven.project.injection.DefaultModelDefaultsInjector</implementation>
-    </component>
-    <!--
-     |
-     |
-     |
-     -->
-    <component>
-      <role>org.apache.maven.project.MavenProjectBuilder</role>
-      
<implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
-        </requirement>
-        <requirement>
-          
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.validation.ModelValidator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.path.PathTranslator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-        </requirement>
-        <requirement>
-          
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-        </requirement>
-      </requirements>
-    </component>
-    <!--
-     |
-     |
-     |
-     -->
-    <component>
-      
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
-      
<implementation>org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler</implementation>
-    </component>
-    <!--
-     |
-     |
-     |
-     -->
-    <component>
-      <role>org.apache.maven.project.validation.ModelValidator</role>
-      
<implementation>org.apache.maven.project.validation.DefaultModelValidator</implementation>
-    </component>
-    <!--
-     |
-     |
-     |
-     -->
 
     <!--
      |
@@ -220,14 +144,6 @@
       </configuration>
     </component>
 
-    <!-- ********************* FIXME 
*******************************************
-     | I realize this is duplicated but allows the project builder to work by 
itself
-     -->
-    <component>
-      <role>org.apache.maven.project.path.PathTranslator</role>
-      
<implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
-    </component>
-    
     <component>
       <role>org.apache.maven.settings.MavenSettingsBuilder</role>
       
<implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>

Modified: 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java?rev=164217&r1=164216&r2=164217&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
 (original)
+++ 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
 Fri Apr 22 04:01:33 2005
@@ -1,30 +1,29 @@
 package org.apache.maven.lifecycle;
 
-import org.apache.maven.MavenTestCase;
-
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
+import org.codehaus.plexus.PlexusTestCase;
+
 /**
  * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
  * @version $Id$
  */
 public class LifecycleExecutorTest
-    extends MavenTestCase
+    extends PlexusTestCase
 {
     public void testLifecycleExecutor()
         throws Exception

Modified: 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=164217&r1=164216&r2=164217&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
 (original)
+++ 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
 Fri Apr 22 04:01:33 2005
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import org.apache.maven.MavenTestCase;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.execution.MavenSession;
@@ -27,6 +26,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.PlexusTestCase;
 import 
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
 
 import java.io.File;
@@ -38,20 +38,8 @@
  *          06:06:21 jdcasey Exp $
  */
 public class PluginParameterExpressionEvaluatorTest
-    extends MavenTestCase
+    extends PlexusTestCase
 {
-    private MavenProject project;
-
-    protected void setUp()
-        throws Exception
-    {
-        super.setUp();
-
-        File f = getFileForClasspathResource( "pom.xml" );
-
-        project = getProject( f );
-    }
-
     public void testValueExtractionWithAPomValueContainingAPath()
         throws Exception
     {

Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=164217&r1=164216&r2=164217&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Fri Apr 22 
04:01:33 2005
@@ -35,7 +35,7 @@
 
 public class MBoot
 {
-    String[] builds = new String[]{"maven-model", "maven-settings", 
"maven-monitor", "maven-plugin-api",
+    String[] builds = new String[]{"maven-model", "maven-project", 
"maven-settings", "maven-monitor", "maven-plugin-api",
                                    "maven-plugin-descriptor", 
"maven-artifact", "maven-script/maven-script-marmalade",
                                    "maven-core", "maven-archiver", 
"maven-plugin-tools/maven-plugin-tools-api",
                                    
"maven-plugin-tools/maven-plugin-tools-java",

Modified: maven/components/trunk/maven-project/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/pom.xml?rev=164217&r1=164216&r2=164217&view=diff
==============================================================================
--- maven/components/trunk/maven-project/pom.xml (original)
+++ maven/components/trunk/maven-project/pom.xml Fri Apr 22 04:01:33 2005
@@ -17,5 +17,21 @@
       <artifactId>maven-model</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </dependency>
+    <!-- TODO: reduce to utils -->
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+      <version>1.0-alpha-3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.0-alpha-3-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </model>

Copied: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
 (from r164214, 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java)
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?p2=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java&r1=164214&r2=164217&rev=164217&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
 Fri Apr 22 04:01:33 2005
@@ -18,12 +18,10 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.MavenMetadataSource;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.settings.Settings;
 
 import java.io.File;
 import java.util.List;

Added: 
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=164217&view=auto
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
 (added)
+++ 
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
 Fri Apr 22 04:01:33 2005
@@ -0,0 +1,83 @@
+<component-set>
+  <components>
+    <!--
+     |
+     |
+     |
+     -->
+    <component>
+      <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
+      
<implementation>org.apache.maven.project.interpolation.RegexBasedModelInterpolator</implementation>
+    </component>
+    <!--
+     |
+     |
+     |
+     -->
+    <component>
+      <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
+      
<implementation>org.apache.maven.project.injection.DefaultModelDefaultsInjector</implementation>
+    </component>
+    <!--
+     |
+     |
+     |
+     -->
+    <component>
+      <role>org.apache.maven.project.MavenProjectBuilder</role>
+      
<implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
+        </requirement>
+        <requirement>
+          
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.validation.ModelValidator</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.path.PathTranslator</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+        </requirement>
+        <requirement>
+          
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+        </requirement>
+      </requirements>
+    </component>
+    <!--
+     |
+     |
+     |
+     -->
+    <component>
+      
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
+      
<implementation>org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler</implementation>
+    </component>
+    <!--
+     |
+     |
+     |
+     -->
+    <component>
+      <role>org.apache.maven.project.validation.ModelValidator</role>
+      
<implementation>org.apache.maven.project.validation.DefaultModelValidator</implementation>
+    </component>
+
+    <!-- ********************* FIXME 
*******************************************
+     | I realize this is duplicated but allows the project builder to work by 
itself
+     -->
+    <component>
+      <role>org.apache.maven.project.path.PathTranslator</role>
+      
<implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
+    </component>
+  </components>
+</component-set>

Propchange: 
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Copied: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
 (from r164205, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/MavenTestCase.java)
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java?p2=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java&p1=maven/components/trunk/maven-core/src/test/java/org/apache/maven/MavenTestCase.java&r1=164205&r2=164217&rev=164217&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/MavenTestCase.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
 Fri Apr 22 04:01:33 2005
@@ -1,7 +1,7 @@
-package org.apache.maven;
+package org.apache.maven.project;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,26 +16,21 @@
  * limitations under the License.
  */
 
-import org.apache.maven.artifact.MavenMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.plugin.PluginManager;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.codehaus.plexus.ArtifactEnabledPlexusTestCase;
+import org.codehaus.plexus.PlexusTestCase;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.net.URL;
 
 /**
  * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl </a>
  * @version $Id$
  */
-public abstract class MavenTestCase
-    extends ArtifactEnabledPlexusTestCase
+public abstract class MavenProjectTestCase
+    extends PlexusTestCase
 {
-    protected PluginManager pluginManager;
-
     protected MavenProjectBuilder projectBuilder;
 
     protected void setUp()
@@ -43,8 +38,6 @@
     {
         super.setUp();
 
-        pluginManager = (PluginManager) lookup( PluginManager.ROLE );
-
         projectBuilder = (MavenProjectBuilder) lookup( 
MavenProjectBuilder.ROLE );
     }
 
@@ -53,6 +46,7 @@
     // ----------------------------------------------------------------------
 
     protected File getLocalRepositoryPath()
+        throws FileNotFoundException
     {
         File markerFile = getFileForClasspathResource( "local-repo/marker.txt" 
);
 
@@ -60,6 +54,7 @@
     }
 
     protected File getFileForClasspathResource( String resource )
+        throws FileNotFoundException
     {
         ClassLoader cloader = Thread.currentThread().getContextClassLoader();
 
@@ -70,6 +65,10 @@
         {
             resourceFile = new File( resourceUrl.getPath() );
         }
+        else
+        {
+            throw new FileNotFoundException( "Unable to find: " + resource );
+        }
 
         return resourceFile;
     }
@@ -94,8 +93,7 @@
         throws Exception
     {
         return projectBuilder.buildWithDependencies( pom, getLocalRepository(),
-                                                     new MavenMetadataSource( 
projectBuilder.getArtifactResolver(),
-                                                                              
projectBuilder ) );
+                                                     new 
ProjectClasspathArtifactResolver.Source() );
     }
 
     protected MavenProject getProject( File pom )
@@ -104,4 +102,4 @@
         return projectBuilder.build( pom, getLocalRepository() );
     }
 
-}
\ No newline at end of file
+}

Copied: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
 (from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java)
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java?p2=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java&p1=maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java&r1=164214&r2=164217&rev=164217&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
 Fri Apr 22 04:01:33 2005
@@ -1,13 +1,12 @@
 package org.apache.maven.project;
 
-import org.apache.maven.MavenTestCase;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Resource;
 
 import java.io.File;
 
 public class ProjectBaseDirectoryAlignmentTest
-    extends MavenTestCase
+    extends MavenProjectTestCase
 {
 
     private String dir = 
"src/test/resources/projects/base-directory-alignment/";

Copied: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
 (from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java)
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java?p2=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java&p1=maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java&r1=164214&r2=164217&rev=164217&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
 Fri Apr 22 04:01:33 2005
@@ -17,7 +17,6 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.MavenMetadataSource;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.factory.DefaultArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
@@ -25,9 +24,9 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.artifact.resolver.DefaultArtifactResolver;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.codehaus.plexus.util.IOUtil;
@@ -36,20 +35,21 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
 public class ProjectClasspathArtifactResolver
     extends DefaultArtifactResolver
 {
-    private static class Source
-        extends MavenMetadataSource
+    public static class Source
+        implements ArtifactMetadataSource
     {
         private ArtifactFactory artifactFactory = new DefaultArtifactFactory();
 
-        public Source( ArtifactResolver artifactResolver )
+        public Source()
         {
-            super( artifactResolver );
         }
 
         public Set retrieve( Artifact artifact, ArtifactRepository 
localRepository, List remoteRepositories )
@@ -79,6 +79,25 @@
             }
             return createArtifacts( model.getDependencies(), 
artifact.getScope() );
         }
+
+        protected Set createArtifacts( List dependencies, String 
inheritedScope )
+        {
+            Set projectArtifacts = new HashSet();
+
+            for ( Iterator i = dependencies.iterator(); i.hasNext(); )
+            {
+                Dependency d = (Dependency) i.next();
+
+                Artifact artifact = artifactFactory.createArtifact( 
d.getGroupId(), d.getArtifactId(), d.getVersion(),
+                                                                    
d.getScope(), d.getType(), inheritedScope );
+                if ( artifact != null )
+                {
+                    projectArtifacts.add( artifact );
+                }
+            }
+
+            return projectArtifacts;
+        }
     }
 
     public void resolve( Artifact artifact, List remoteRepositories, 
ArtifactRepository localRepository )
@@ -92,7 +111,7 @@
                                                          
ArtifactMetadataSource source, ArtifactFilter filter )
         throws ArtifactResolutionException
     {
-        return super.resolveTransitively( artifacts, remoteRepositories, 
localRepository, new Source( this ), filter );
+        return super.resolveTransitively( artifacts, remoteRepositories, 
localRepository, new Source(), filter );
     }
 
     public ArtifactResolutionResult resolveTransitively( Set artifacts, List 
remoteRepositories,
@@ -100,7 +119,7 @@
                                                          
ArtifactMetadataSource source )
         throws ArtifactResolutionException
     {
-        return super.resolveTransitively( artifacts, remoteRepositories, 
localRepository, new Source( this ) );
+        return super.resolveTransitively( artifacts, remoteRepositories, 
localRepository, new Source() );
     }
 
     public ArtifactResolutionResult resolveTransitively( Artifact artifact, 
List remoteRepositories,
@@ -108,6 +127,6 @@
                                                          
ArtifactMetadataSource source )
         throws ArtifactResolutionException
     {
-        return super.resolveTransitively( artifact, remoteRepositories, 
localRepository, new Source( this ) );
+        return super.resolveTransitively( artifact, remoteRepositories, 
localRepository, new Source() );
     }
 }

Copied: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
 (from r164214, 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java)
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java?p2=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java&p1=maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java&r1=164214&r2=164217&rev=164217&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
 Fri Apr 22 04:01:33 2005
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import org.apache.maven.MavenTestCase;
 import org.apache.maven.artifact.Artifact;
 
 import java.io.File;
@@ -27,7 +26,7 @@
  * @todo relocate to maven-artifact in entirety
  */
 public class ProjectClasspathTest
-    extends MavenTestCase
+    extends MavenProjectTestCase
 {
 
     private String dir = "projects/scope/";

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java?rev=164217&r1=164214&r2=164217&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
 Fri Apr 22 04:01:33 2005
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-import org.apache.maven.MavenTestCase;
 import org.apache.maven.model.Goal;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectTestCase;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.io.File;
@@ -30,7 +30,7 @@
  * @version $Id$
  */
 public class CanonicalProjectBuilderTest
-    extends MavenTestCase
+    extends MavenProjectTestCase
 {
     public void testProjectBuilder()
         throws Exception

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java?rev=164217&r1=164214&r2=164217&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
 Fri Apr 22 04:01:33 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.MavenTestCase;
+import org.apache.maven.project.MavenProjectTestCase;
 
 import java.io.File;
 
@@ -25,7 +25,7 @@
  * @version $Id$
  */
 public abstract class ProjectInheritanceTestCase
-    extends MavenTestCase
+    extends MavenProjectTestCase
 {
     protected String getTestSeries()
     {

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java?rev=164217&r1=164214&r2=164217&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
 Fri Apr 22 04:01:33 2005
@@ -1,12 +1,24 @@
 package org.apache.maven.project.validation;
 
 /*
- * LICENSE
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
-import org.apache.maven.MavenTestCase;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.project.MavenProjectTestCase;
 
 import java.io.FileReader;
 import java.io.Reader;
@@ -16,7 +28,7 @@
  * @version $Id$
  */
 public class DefaultModelValidatorTest
-    extends MavenTestCase
+    extends MavenProjectTestCase
 {
     private Model model;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to