You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/15 12:34:34 UTC
svn commit: r794220 - in /maven/plugins/trunk/maven-ant-plugin/src:
main/java/org/apache/maven/plugin/ant/AntBuildWriter.java site/apt/usage.apt
Author: bentmann
Date: Wed Jul 15 10:34:34 2009
New Revision: 794220
URL: http://svn.apache.org/viewvc?rev=794220&view=rev
Log:
o Polished code & site
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt
Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java?rev=794220&r1=794219&r2=794220&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java Wed Jul 15 10:34:34 2009
@@ -554,11 +554,12 @@
* the path with the system property "user.home" in it. If not then just
* return the absolute path to the local repository.
*/
- private String getLocalRepositoryPath() {
+ private String getLocalRepositoryPath()
+ {
String userHome = System.getProperty( "user.home" );
String defaultPath = ( userHome + "/.m2/repository" ).replace( '\\', '/' );
String actualPath = localRepository.getAbsolutePath().replace( '\\', '/' );
- if( actualPath.equals( defaultPath ) )
+ if ( actualPath.equals( defaultPath ) )
{
return "${user.home}/.m2/repository";
}
@@ -703,8 +704,8 @@
writer.addAttribute( "depends", "get-deps" );
writer.addAttribute( "description", "Compile the code" );
- writeCompileTasks( writer, project.getBasedir(), "${maven.build.outputDir}", compileSourceRoots, project
- .getBuild().getResources(), null, false );
+ writeCompileTasks( writer, "${maven.build.outputDir}", compileSourceRoots,
+ project.getBuild().getResources(), null, false );
writer.endElement(); // target
}
@@ -747,7 +748,7 @@
AntBuildWriterUtil.addWrapAttribute( writer, "target", "description", "Compile the test code", 2 );
AntBuildWriterUtil.addWrapAttribute( writer, "target", "unless", "maven.test.skip", 2 );
- writeCompileTasks( writer, project.getBasedir(), "${maven.build.testOutputDir}", testCompileSourceRoots,
+ writeCompileTasks( writer, "${maven.build.testOutputDir}", testCompileSourceRoots,
project.getBuild().getTestResources(), "${maven.build.outputDir}", true );
writer.endElement(); // target
@@ -1084,7 +1085,7 @@
}
}
- private void writeCompileTasks( XMLWriter writer, File basedir, String outputDirectory, List compileSourceRoots,
+ private void writeCompileTasks( XMLWriter writer, String outputDirectory, List compileSourceRoots,
List resources, String additionalClassesDirectory, boolean isTest )
throws IOException
{
Modified: maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt?rev=794220&r1=794219&r2=794220&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt Wed Jul 15 10:34:34 2009
@@ -29,7 +29,7 @@
Usage
The Ant Plugin generates Ant build files from POMs. The following example describe the basic
- usage of the Plugin.
+ usage of the plugin.
* Generate Ant build files