You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/12 17:24:37 UTC
svn commit: r314945 - in
/maven/components/trunk/maven-plugins/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant:
AntBuildWriter.java AntMojo.java
Author: brett
Date: Wed Oct 12 08:24:33 2005
New Revision: 314945
URL: http://svn.apache.org/viewcvs?rev=314945&view=rev
Log:
clean up ant plugin exception handling
Modified:
maven/components/trunk/maven-plugins/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
maven/components/trunk/maven-plugins/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
Modified: maven/components/trunk/maven-plugins/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java?rev=314945&r1=314944&r2=314945&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java (original)
+++ maven/components/trunk/maven-plugins/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java Wed Oct 12 08:24:33 2005
@@ -20,13 +20,13 @@
import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import org.codehaus.plexus.util.xml.XMLWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import java.io.Writer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -48,15 +48,6 @@
this.localRepository = localRepository;
}
- public void write()
- throws IOException
- {
- writeBuildXml();
-
- System.out.println(
- "Wrote Ant project for " + project.getArtifactId() + " to " + project.getBasedir().getAbsolutePath() );
- }
-
// ----------------------------------------------------------------------
// build.xml
// ----------------------------------------------------------------------
@@ -95,7 +86,7 @@
writer.endElement(); // project
- close( w );
+ IOUtil.close( w );
}
private void writeCompileTestsTarget( XMLWriter writer, List testCompileSourceRoots )
@@ -488,24 +479,6 @@
writer.addAttribute( "value", project.getBuild().getOutput() );
writer.endElement(); // property
*/
- }
-
- private void close( Writer closeable )
- {
- if ( closeable == null )
- {
- return;
- }
-
- try
- {
- closeable.close();
- }
- catch ( Exception e )
- {
- // ignore
- // TODO: warn
- }
}
// TODO: move to plexus-utils or use something appropriate from there (eclipse plugin too)
Modified: maven/components/trunk/maven-plugins/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java?rev=314945&r1=314944&r2=314945&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java Wed Oct 12 08:24:33 2005
@@ -61,11 +61,14 @@
try
{
- antBuildWriter.write();
+ antBuildWriter.writeBuildXml();
}
catch ( IOException e )
{
throw new MojoExecutionException( "Error building Ant script", e );
}
+
+ getLog().info(
+ "Wrote Ant project for " + project.getArtifactId() + " to " + project.getBasedir().getAbsolutePath() );
}
}