svn commit: r800460 - in /maven/components/trunk/maven-core/src: main/java/org/apache/maven/project/InvalidProjectModelException.java test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java

[bentmann]

Author: bentmann
Date: Mon Aug  3 16:43:10 2009
New Revision: 800460

URL: http://svn.apache.org/viewvc?rev=800460&view=rev
Log:
o Deprecated unused exception type

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
    
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java?rev=800460&r1=800459&r2=800460&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
 Mon Aug  3 16:43:10 2009
@@ -22,9 +22,10 @@
 import java.io.File;
 
 import org.apache.maven.artifact.InvalidRepositoryException;
-import org.apache.maven.model.validation.ModelValidationResult;
+import org.apache.maven.project.validation.ModelValidationResult;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
+...@deprecated
 public class InvalidProjectModelException
     extends ProjectBuildingException
 {

Modified: 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=800460&r1=800459&r2=800460&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
 (original)
+++ 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
 Mon Aug  3 16:43:10 2009
@@ -25,7 +25,8 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.model.validation.ModelValidationResult;
+import org.apache.maven.model.building.ModelBuildingException;
+import org.apache.maven.model.building.ModelProblem;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.plexus.PlexusTestCase;
 
@@ -135,17 +136,13 @@
         }
         catch ( Exception e )
         {
-            if ( e instanceof InvalidProjectModelException )
+            Throwable cause = e.getCause();
+            if ( cause instanceof ModelBuildingException )
             {
-                ModelValidationResult validationResult = ( 
(InvalidProjectModelException) e ).getValidationResult();
-                String message = "In: " + pom + "(" + ( 
(ProjectBuildingException) e ).getProjectId() + ")\n\n";
-                for ( String error : validationResult.getErrors() )
+                String message = "In: " + pom + "\n\n";
+                for ( ModelProblem problem : ( (ModelBuildingException) cause 
).getProblems() )
                 {
-                    message += "  [ERROR] " + error + "\n";
-                }
-                for ( String warning : validationResult.getWarnings() )
-                {
-                    message += "  [WARNING] " + warning + "\n";
+                    message += problem + "\n";
                 }
                 System.out.println( message );
                 fail( message );