You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/09/08 22:42:20 UTC

svn commit: r693262 - in /maven/components/branches/sisbell-maven-2.1-profile: maven-core/src/main/java/org/apache/maven/errors/ maven-core/src/main/java/org/apache/maven/extension/ maven-core/src/main/java/org/apache/maven/extension/lineage/ maven-cor...

Author: sisbell
Date: Mon Sep  8 13:42:18 2008
New Revision: 693262

URL: http://svn.apache.org/viewvc?rev=693262&view=rev
Log:
Moved over the error reporter and lineage code to maven-core, as they have nothing to do with building of a project and are only used by maven-core. Had to remove the error report aspects and tests since the refactor of packages caused the aspects to break.

Added:
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/DefaultProjectErrorReporter.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectErrorReporter.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectErrorTips.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectReporterManager.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectReporterManager.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineage.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineage.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineage.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineage.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageBuilder.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageIterator.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageIterator.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/AbstractModelLineageTest.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/AbstractModelLineageTest.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageTest.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageTest.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ModelAndFile.java   (contents, props changed)
      - copied, changed from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelAndFile.java
Removed:
    maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/error/
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/aspect/
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineage.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelAndFile.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineage.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageIterator.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/DefaultProjectErrorReporter.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectErrorReporter.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectErrorTips.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectReporterManager.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/AbstractModelLineageTest.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageTest.java
Modified:
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/CoreReporterManager.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/resources/META-INF/plexus/components.xml
    maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml
    maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml
    maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/ProjectWorkspace.java
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java Mon Sep  8 13:42:18 2008
@@ -36,7 +36,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.error.ProjectErrorReporter;
+import org.apache.maven.errors.ProjectErrorReporter;
 import org.apache.maven.project.interpolation.ModelInterpolationException;
 import org.apache.maven.project.path.PathTranslator;
 import org.apache.maven.reactor.MavenExecutionException;

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/CoreReporterManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/CoreReporterManager.java?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/CoreReporterManager.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/CoreReporterManager.java Mon Sep  8 13:42:18 2008
@@ -1,6 +1,6 @@
 package org.apache.maven.errors;
 
-import org.apache.maven.project.error.ProjectReporterManager;
+import org.apache.maven.errors.ProjectReporterManager;
 
 public final class CoreReporterManager
 {

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java Mon Sep  8 13:42:18 2008
@@ -41,9 +41,9 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.error.DefaultProjectErrorReporter;
-import org.apache.maven.project.error.ProjectErrorReporter;
-import org.apache.maven.project.error.ProjectReporterManager;
+import org.apache.maven.errors.DefaultProjectErrorReporter;
+import org.apache.maven.errors.ProjectErrorReporter;
+import org.apache.maven.errors.ProjectReporterManager;
 import org.apache.maven.project.interpolation.ModelInterpolationException;
 import org.apache.maven.project.path.PathTranslator;
 import org.apache.maven.reactor.MavenExecutionException;

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/DefaultProjectErrorReporter.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/DefaultProjectErrorReporter.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/DefaultProjectErrorReporter.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.error;
+package org.apache.maven.errors;
 
 import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -20,7 +20,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuilderConfiguration;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.build.model.ModelAndFile;
+import org.apache.maven.project.ModelAndFile;
 import org.apache.maven.project.interpolation.ModelInterpolationException;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -62,7 +62,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.error.ProjectErrorReporter#clearErrors()
+     * @see ProjectErrorReporter#clearErrors()
      */
     public void clearErrors()
     {
@@ -76,7 +76,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.error.ProjectErrorReporter#hasInformationFor(java.lang.Throwable)
+     * @see ProjectErrorReporter#hasInformationFor(java.lang.Throwable)
      */
     public Throwable findReportedException( Throwable error )
     {
@@ -93,7 +93,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.error.ProjectErrorReporter#getFormattedMessage(java.lang.Throwable)
+     * @see ProjectErrorReporter#getFormattedMessage(java.lang.Throwable)
      */
     public String getFormattedMessage( Throwable error )
     {
@@ -101,7 +101,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.error.ProjectErrorReporter#getRealCause(java.lang.Throwable)
+     * @see ProjectErrorReporter#getRealCause(java.lang.Throwable)
      */
     public Throwable getRealCause( Throwable error )
     {
@@ -140,7 +140,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.error.ProjectErrorReporter#reportActivatorErrorWhileApplyingProfiles(org.apache.maven.profiles.activation.ProfileActivator, org.apache.maven.model.Model, java.io.File, org.apache.maven.model.Profile, org.apache.maven.profiles.activation.ProfileActivationContext, org.apache.maven.profiles.activation.ProfileActivationException)
+     * @see ProjectErrorReporter#reportActivatorErrorWhileApplyingProfiles(org.apache.maven.profiles.activation.ProfileActivator, org.apache.maven.model.Model, java.io.File, org.apache.maven.model.Profile, org.apache.maven.profiles.activation.ProfileActivationContext, org.apache.maven.profiles.activation.ProfileActivationException)
      */
     public void reportActivatorError( ProfileActivator activator,
                                       Model model,
@@ -179,7 +179,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.error.ProjectErrorReporter#reportActivatorLookupError(java.lang.String, java.io.File, org.apache.maven.model.Profile, org.codehaus.plexus.component.repository.exception.ComponentLookupException)
+     * @see ProjectErrorReporter#reportActivatorLookupError(java.lang.String, java.io.File, org.apache.maven.model.Profile, org.codehaus.plexus.component.repository.exception.ComponentLookupException)
      */
     public void reportActivatorLookupError( Model model,
                                             File pomFile,
@@ -213,7 +213,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.error.ProjectErrorReporter#reportErrorLoadingExternalProfilesFromFile(org.apache.maven.model.Model, java.io.File, java.io.File, java.io.IOException)
+     * @see ProjectErrorReporter#reportErrorLoadingExternalProfilesFromFile(org.apache.maven.model.Model, java.io.File, java.io.File, java.io.IOException)
      */
     public void reportErrorLoadingExternalProfilesFromFile( Model model,
                                                             File pomFile,
@@ -242,7 +242,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.error.ProjectErrorReporter#reportErrorLoadingExternalProfilesFromFile(org.apache.maven.model.Model, java.io.File, java.io.File, org.codehaus.plexus.util.xml.pull.XmlPullParserException)
+     * @see ProjectErrorReporter#reportErrorLoadingExternalProfilesFromFile(org.apache.maven.model.Model, java.io.File, java.io.File, org.codehaus.plexus.util.xml.pull.XmlPullParserException)
      */
     public void reportErrorLoadingExternalProfilesFromFile( Model model,
                                                             File pomFile,
@@ -278,7 +278,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.error.ProjectErrorReporter#reportInvalidRepositoryWhileGettingRepositoriesFromProfiles(org.apache.maven.model.Repository, java.lang.String, java.io.File, org.apache.maven.artifact.InvalidRepositoryException)
+     * @see ProjectErrorReporter#reportInvalidRepositoryWhileGettingRepositoriesFromProfiles(org.apache.maven.model.Repository, java.lang.String, java.io.File, org.apache.maven.artifact.InvalidRepositoryException)
      */
     public void reportInvalidRepositoryWhileGettingRepositoriesFromProfiles( Repository repo,
                                                                              Model model,

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectErrorReporter.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectErrorReporter.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectErrorReporter.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.error;
+package org.apache.maven.errors;
 
 import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
@@ -17,7 +17,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuilderConfiguration;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.build.model.ModelAndFile;
+import org.apache.maven.project.ModelAndFile;
 import org.apache.maven.project.interpolation.ModelInterpolationException;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectErrorTips.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectErrorTips.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectErrorTips.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.error;
+package org.apache.maven.errors;
 
 import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.model.Dependency;

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectReporterManager.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectReporterManager.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectReporterManager.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectReporterManager.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectReporterManager.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/ProjectReporterManager.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectReporterManager.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.error;
+package org.apache.maven.errors;
 
 public final class ProjectReporterManager
 {

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectReporterManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/errors/ProjectReporterManager.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java Mon Sep  8 13:42:18 2008
@@ -35,9 +35,9 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuilderConfiguration;
 import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.project.build.model.ModelLineage;
-import org.apache.maven.project.build.model.ModelLineageBuilder;
-import org.apache.maven.project.build.model.ModelLineageIterator;
+import org.apache.maven.extension.lineage.ModelLineage;
+import org.apache.maven.extension.lineage.ModelLineageBuilder;
+import org.apache.maven.extension.lineage.ModelLineageIterator;
 import org.apache.maven.project.interpolation.ModelInterpolationException;
 import org.apache.maven.project.interpolation.ModelInterpolator;
 import org.apache.maven.reactor.MissingModuleException;

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineage.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineage.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineage.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineage.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineage.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineage.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineage.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.build.model;
+package org.apache.maven.extension.lineage;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +28,7 @@
 import java.util.List;
 
 /**
- * @see org.apache.maven.project.build.model.ModelLineage
+ * @see ModelLineage
  */
 public class DefaultModelLineage
     implements ModelLineage
@@ -37,7 +37,7 @@
     private List tuples = new ArrayList();
 
     /**
-     * @see org.apache.maven.project.build.model.ModelLineage#addParent(org.apache.maven.model.Model, java.io.File, java.util.List)
+     * @see ModelLineage#addParent(org.apache.maven.model.Model, java.io.File, java.util.List)
      */
     public void addParent( Model model, File pomFile, List artifactRepositories, boolean validProfilesXmlLocation )
     {
@@ -50,7 +50,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.build.model.ModelLineage#artifactRepositoryListIterator()
+     * @see ModelLineage#artifactRepositoryListIterator()
      */
     public Iterator artifactRepositoryListIterator()
     {
@@ -78,7 +78,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.build.model.ModelLineage#fileIterator()
+     * @see ModelLineage#fileIterator()
      */
     public Iterator fileIterator()
     {
@@ -106,7 +106,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.build.model.ModelLineage#getArtifactRepositories(org.apache.maven.model.Model)
+     * @see ModelLineage#getArtifactRepositories(org.apache.maven.model.Model)
      */
     public List getArtifactRepositories( Model model )
     {
@@ -139,7 +139,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.build.model.ModelLineage#getFile(org.apache.maven.model.Model)
+     * @see ModelLineage#getFile(org.apache.maven.model.Model)
      */
     public File getFile( Model model )
     {
@@ -277,7 +277,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.build.model.ModelLineage#modelIterator()
+     * @see ModelLineage#modelIterator()
      */
     public Iterator modelIterator()
     {
@@ -315,7 +315,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.build.model.ModelLineage#size()
+     * @see ModelLineage#size()
      */
     public int size()
     {

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineage.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.build.model;
+package org.apache.maven.extension.lineage;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -34,6 +34,7 @@
 import org.apache.maven.profiles.build.ProfileAdvisor;
 import org.apache.maven.project.ProjectBuilderConfiguration;
 import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.ModelAndFile;
 import org.apache.maven.project.workspace.ProjectWorkspace;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
@@ -52,7 +53,7 @@
 import java.util.Set;
 
 /**
- * @see org.apache.maven.project.build.model.ModelLineageBuilder
+ * @see ModelLineageBuilder
  */
 public class DefaultModelLineageBuilder
     implements ModelLineageBuilder, LogEnabled
@@ -84,7 +85,7 @@
     }
 
     /**
-     * @see org.apache.maven.project.build.model.ModelLineageBuilder#buildModelLineage(java.io.File, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List)
+     * @see ModelLineageBuilder#buildModelLineage(java.io.File, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List)
      */
     public ModelLineage buildModelLineage( File pom,
                                            ProjectBuilderConfiguration config,

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineage.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineage.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineage.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineage.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineage.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineage.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineage.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.build.model;
+package org.apache.maven.extension.lineage;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineage.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageBuilder.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageBuilder.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageBuilder.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageBuilder.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.build.model;
+package org.apache.maven.extension.lineage;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageIterator.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageIterator.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageIterator.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageIterator.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageIterator.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageIterator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageIterator.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.build.model;
+package org.apache.maven.extension.lineage;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/extension/lineage/ModelLineageIterator.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/resources/META-INF/plexus/components.xml Mon Sep  8 13:42:18 2008
@@ -195,7 +195,7 @@
           <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
+          <role>org.apache.maven.extension.lineage.ModelLineageBuilder</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
@@ -205,6 +205,30 @@
     </component>
 
     <component>
+      <role>org.apache.maven.extension.lineage.ModelLineageBuilder</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.extension.lineage.DefaultModelLineageBuilder</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
+          <role-hint>default</role-hint>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.MavenTools</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
       <role>org.apache.maven.ArtifactFilterManager</role>
       <implementation>org.apache.maven.DefaultArtifactFilterManager</implementation>
     </component>

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java Mon Sep  8 13:42:18 2008
@@ -11,14 +11,14 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.project.build.model.DefaultModelLineage;
-import org.apache.maven.project.build.model.ModelLineage;
-import org.apache.maven.project.build.model.ModelLineageBuilder;
+import org.apache.maven.extension.lineage.ModelLineageBuilder;
 import org.apache.maven.project.interpolation.ModelInterpolationException;
 import org.apache.maven.project.interpolation.ModelInterpolator;
 import org.apache.maven.reactor.MissingModuleException;
 import org.apache.maven.shared.tools.easymock.MockManager;
 import org.apache.maven.shared.tools.easymock.TestFileManager;
+import org.apache.maven.extension.lineage.DefaultModelLineage;
+import org.apache.maven.extension.lineage.ModelLineage;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.easymock.ArgumentsMatcher;

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/AbstractModelLineageTest.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/AbstractModelLineageTest.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/AbstractModelLineageTest.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/AbstractModelLineageTest.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/AbstractModelLineageTest.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/AbstractModelLineageTest.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/AbstractModelLineageTest.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.build.model;
+package org.apache.maven.extension.lineage;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/AbstractModelLineageTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/AbstractModelLineageTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.build.model;
+package org.apache.maven.extension.lineage;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -34,8 +34,8 @@
 import org.apache.maven.profiles.activation.ProfileActivationContext;
 import org.apache.maven.project.DefaultProjectBuilderConfiguration;
 import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.project.error.ProjectErrorReporter;
-import org.apache.maven.project.error.ProjectReporterManager;
+import org.apache.maven.errors.ProjectErrorReporter;
+import org.apache.maven.errors.ProjectReporterManager;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.FileUtils;
@@ -577,91 +577,4 @@
         return model;
     }
 
-    public void testReadPOMWithParentMissingFromRepository()
-        throws IOException
-    {
-        File localRepoDirectory = File.createTempFile( "DefaultModelLineageBuilder.localRepository.",
-                                                       "" );
-
-        localRepoDirectory.delete();
-        localRepoDirectory.mkdirs();
-
-        deleteDirOnExit( localRepoDirectory );
-
-        Model current = createModel( "group", "current", "1" );
-
-        Parent currentParent = new Parent();
-        currentParent.setGroupId( "group" );
-        currentParent.setArtifactId( "parent" );
-        currentParent.setVersion( "1" );
-
-        current.setParent( currentParent );
-
-        File currentPOM = File.createTempFile( "DefaultModelLineageBuilder.test.", ".pom" );
-        currentPOM.deleteOnExit();
-
-        writeModel( current, currentPOM );
-
-        ArtifactRepository localRepository = new DefaultArtifactRepository(
-                                                                            "local",
-                                                                            localRepoDirectory.toURL()
-                                                                                              .toExternalForm(),
-                                                                            defaultLayout );
-
-        try
-        {
-            modelLineageBuilder.buildModelLineage( currentPOM,
-                                                   new DefaultProjectBuilderConfiguration().setLocalRepository( localRepository ),
-                                                   Collections.EMPTY_LIST,
-                                                   false,
-                                                   true );
-
-            fail( "should have thrown an ArtifactNotFoundException" );
-        }
-        catch ( ProjectBuildingException e )
-        {
-            assertTrue( ( e.getCause() instanceof ArtifactNotFoundException ) );
-
-            ProjectErrorReporter reporter = ProjectReporterManager.getReporter();
-            Throwable reportedCause = reporter.findReportedException( e );
-            assertNotNull( reportedCause );
-            System.out.println( reporter.getFormattedMessage( reportedCause ) );
-        }
-
-    }
-
-    public void testReadPOM_HandleErrorWhenFileDoesntExist()
-        throws IOException
-    {
-        File localRepoDirectory = new File( "localRepo" ).getAbsoluteFile();
-        File currentPOM = new File( "pom/pom/pom/pom.xml" );
-
-        ArtifactRepository localRepository = new DefaultArtifactRepository(
-                                                                            "local",
-                                                                            localRepoDirectory.toURL()
-                                                                                              .toExternalForm(),
-                                                                            defaultLayout );
-
-        try
-        {
-            modelLineageBuilder.buildModelLineage( currentPOM,
-                                                   new DefaultProjectBuilderConfiguration().setLocalRepository( localRepository ),
-                                                   Collections.EMPTY_LIST,
-                                                   false,
-                                                   true );
-
-            fail( "should have thrown an IOException" );
-        }
-        catch ( ProjectBuildingException e )
-        {
-            assertTrue( ( e.getCause() instanceof IOException ) );
-
-            ProjectErrorReporter reporter = ProjectReporterManager.getReporter();
-            Throwable reportedCause = reporter.findReportedException( e );
-            assertNotNull( reportedCause );
-            System.out.println( reporter.getFormattedMessage( reportedCause ) );
-        }
-
-    }
-
 }

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilderTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageTest.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageTest.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageTest.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageTest.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageTest.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageTest.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageTest.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.build.model;
+package org.apache.maven.extension.lineage;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/extension/lineage/DefaultModelLineageTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml Mon Sep  8 13:42:18 2008
@@ -31,7 +31,7 @@
           <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
+          <role>org.apache.maven.extension.lineage.ModelLineageBuilder</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
@@ -45,6 +45,30 @@
     </component>
 
     <component>
+      <role>org.apache.maven.extension.lineage.ModelLineageBuilder</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.extension.lineage.DefaultModelLineageBuilder</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
+          <role-hint>default</role-hint>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.MavenTools</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+        </requirement>
+      </requirements>
+    </component>
+      
+    <component>
       <role>org.apache.maven.ArtifactFilterManager</role>
       <implementation>org.apache.maven.DefaultArtifactFilterManager</implementation>
     </component>

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml Mon Sep  8 13:42:18 2008
@@ -73,9 +73,9 @@
     
     
     <component>
-      <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
+      <role>org.apache.maven.extension.lineage.ModelLineageBuilder</role>
       <role-hint>default</role-hint>
-      <implementation>org.apache.maven.project.build.model.DefaultModelLineageBuilder</implementation>
+      <implementation>org.apache.maven.extension.lineage.DefaultModelLineageBuilder</implementation>
       <requirements>
         <requirement>
           <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
@@ -97,6 +97,30 @@
         </requirement>
       </requirements>
     </component>
+
+    <component>
+      <role>org.apache.maven.extension.lineage.ModelLineageBuilder</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.extension.lineage.DefaultModelLineageBuilder</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
+          <role-hint>default</role-hint>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.MavenTools</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+        </requirement>
+      </requirements>
+    </component>      
 <!--
      |
      |

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml Mon Sep  8 13:42:18 2008
@@ -81,7 +81,7 @@
       <implementation>org.apache.maven.project.TestProjectBuilder</implementation>
       <requirements>
         <requirement>
-          <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
+          <role>org.apache.maven.extension.lineage.ModelLineageBuilder</role>
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
@@ -118,5 +118,28 @@
         </requirement>
       </requirements>
     </component>
+    <component>
+      <role>org.apache.maven.extension.lineage.ModelLineageBuilder</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.extension.lineage.DefaultModelLineageBuilder</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
+          <role-hint>default</role-hint>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.MavenTools</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+        </requirement>
+      </requirements>
+    </component>      
   </components>
 </plexus>

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml Mon Sep  8 13:42:18 2008
@@ -78,21 +78,4 @@
       <artifactId>maven-shared-model</artifactId>
     </dependency> 
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>aspectj-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>compile-aspects</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>

Copied: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ModelAndFile.java (from r693161, maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelAndFile.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ModelAndFile.java?p2=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ModelAndFile.java&p1=maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelAndFile.java&r1=693161&r2=693262&rev=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/ModelAndFile.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ModelAndFile.java Mon Sep  8 13:42:18 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.build.model;
+package org.apache.maven.project;
 
 import org.apache.maven.model.Model;
 

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ModelAndFile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ModelAndFile.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java Mon Sep  8 13:42:18 2008
@@ -3,7 +3,7 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Parent;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.build.model.ModelAndFile;
+import org.apache.maven.project.ModelAndFile;
 import org.apache.maven.workspace.MavenWorkspaceStore;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/ProjectWorkspace.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/ProjectWorkspace.java?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/ProjectWorkspace.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/ProjectWorkspace.java Mon Sep  8 13:42:18 2008
@@ -1,7 +1,7 @@
 package org.apache.maven.project.workspace;
 
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.build.model.ModelAndFile;
+import org.apache.maven.project.ModelAndFile;
 
 import java.io.File;
 

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=693262&r1=693261&r2=693262&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml Mon Sep  8 13:42:18 2008
@@ -36,29 +36,6 @@
       </requirements>
     </component>
     
-    <component>
-      <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
-      <role-hint>default</role-hint>
-      <implementation>org.apache.maven.project.build.model.DefaultModelLineageBuilder</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
-          <role-hint>default</role-hint>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.MavenTools</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-        </requirement>
-      </requirements>
-    </component>
 <!--
      |
      |