svn commit: r691094 - /maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

[sisbell]

Author: sisbell
Date: Mon Sep  1 19:27:29 2008
New Revision: 691094

URL: http://svn.apache.org/viewvc?rev=691094&view=rev
Log:
Improved error message on invalid pom.

Modified:
    
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Modified: 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=691094&r1=691093&r2=691094&view=diff
==============================================================================
--- 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Mon Sep  1 19:27:29 2008
@@ -31,6 +31,7 @@
 import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.model.*;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
 import org.apache.maven.profiles.MavenProfilesBuilder;
 import org.apache.maven.profiles.ProfileManager;
 import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
@@ -55,6 +56,7 @@
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.WriterFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.*;
@@ -179,7 +181,7 @@
                     true
             );
             
-            Build build = project.getBuild();
+           Build build = project.getBuild();
             // NOTE: setting this script-source root before path translation, 
because
             // the plugin tools compose basedir and scriptSourceRoot into a 
single file.
             project.addScriptSourceRoot(build.getScriptSourceDirectory());
@@ -306,8 +308,6 @@
                     e);
         }
 
-     //   project.setOriginalModel(superModel);
-
         project.setExecutionRoot(true);
 
         return project;
@@ -629,8 +629,16 @@
             {
                 System.out.println(s);
             }
+            try {
+                Writer out = WriterFactory.newXmlWriter( System.out );
+                MavenXpp3Writer writer = new MavenXpp3Writer();
+                writer.write( out, model);
+                out.close();
+            } catch (IOException e) {
+
+            }
             throw new InvalidProjectModelException(projectId, "Failed to 
validate POM", pomFile,
-                    validationResult);
+                    validationResult );
         }
     }