You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/09/11 19:04:18 UTC
svn commit: r694350 -
/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
Author: jdcasey
Date: Thu Sep 11 10:04:17 2008
New Revision: 694350
URL: http://svn.apache.org/viewvc?rev=694350&view=rev
Log:
cosmetic parameter name change
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java?rev=694350&r1=694349&r2=694350&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java Thu Sep 11 10:04:17 2008
@@ -45,7 +45,7 @@
this.logger = logger;
}
- public File formatFileSetForAssembly( File archiveBaseDir, org.apache.maven.plugin.assembly.model.FileSet set )
+ public File formatFileSetForAssembly( File fileSetDir, org.apache.maven.plugin.assembly.model.FileSet set )
throws AssemblyFormattingException, IOException
{
String lineEndingHint = set.getLineEnding();
@@ -60,7 +60,7 @@
if(set.getDirectory() == null)
{
- fileSet.setDirectory(archiveBaseDir.getAbsolutePath());
+ fileSet.setDirectory(fileSetDir.getAbsolutePath());
}
else
{
@@ -97,7 +97,7 @@
targetFile.getParentFile().mkdirs();
- File sourceFile = new File( archiveBaseDir, file );
+ File sourceFile = new File( fileSetDir, file );
try
{
sourceFile = fileFormatter.format( sourceFile, set.isFiltered(), lineEndingHint, formattedDir );
@@ -118,7 +118,7 @@
}
}
- return archiveBaseDir;
+ return fileSetDir;
}
private static void deleteDirectory( File formattedDir )