You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/10/14 20:44:55 UTC
svn commit: r1631833 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugin/assembly/
main/java/org/apache/maven/plugin/assembly/format/
main/java/org/apache/maven/plugin/assembly/mojos/
test/java/org/apache/maven/plugin...
Author: khmarbaise
Date: Tue Oct 14 18:44:53 2014
New Revision: 1631833
URL: http://svn.apache.org/r1631833
Log:
[MASSEMBLY-673]
- Changed the implementation to avoid need for useDefaultDelimiters
cause this implicit given by defining delimiters.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileSetFormatterTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java?rev=1631833&r1=1631832&r2=1631833&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java Tue Oct 14 18:44:53 2014
@@ -97,13 +97,11 @@ public interface AssemblerConfigurationS
boolean isUseJvmChmod();
boolean isIgnorePermissions();
-
+
String getEncoding();
String getEscapeString();
-
- List<String> getDelimiters();
- boolean isUseDefaultDelimiters();
+ List<String> getDelimiters();
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java?rev=1631833&r1=1631832&r2=1631833&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java Tue Oct 14 18:44:53 2014
@@ -80,7 +80,8 @@ public class FileFormatter
if ( filter )
{
- result = doFileFilter( source, tempRoot, encoding, configSource.getEscapeString(), configSource.getDelimiters(), configSource.isUseDefaultDelimiters());
+ result =
+ doFileFilter( source, tempRoot, encoding, configSource.getEscapeString(), configSource.getDelimiters() );
}
LineEndings lineEnding = LineEndingsUtils.getLineEnding( lineEndingCharacters );
@@ -92,7 +93,8 @@ public class FileFormatter
return result;
}
- private File doFileFilter( @Nonnull File source, @Nullable File tempRoot, String encoding, String escapeString, List<String> delimiters, boolean useDefaultDelimiters)
+ private File doFileFilter( @Nonnull File source, @Nullable File tempRoot, String encoding, String escapeString,
+ List<String> delimiters )
throws AssemblyFormattingException
{
try
@@ -106,16 +108,11 @@ public class FileFormatter
new MavenFileFilterRequest( source, target, true, configSource.getProject(), configSource.getFilters(),
isPropertiesFile, encoding, configSource.getMavenSession(), null );
filterRequest.setEscapeString( escapeString );
-
+
// if these are NOT set, just use the defaults, which are '${*}' and '@'.
if ( delimiters != null && !delimiters.isEmpty() )
{
LinkedHashSet<String> delims = new LinkedHashSet<String>();
- if ( useDefaultDelimiters )
- {
- delims.addAll( filterRequest.getDelimiters() );
- }
-
for ( String delim : delimiters )
{
if ( delim == null )
@@ -131,7 +128,11 @@ public class FileFormatter
filterRequest.setDelimiters( delims );
}
-
+ else
+ {
+ filterRequest.setDelimiters( filterRequest.getDelimiters());
+ }
+
filterRequest.setInjectProjectBuildFilters( configSource.isIncludeProjectBuildFilters() );
configSource.getMavenFileFilter().copyFile( filterRequest );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1631833&r1=1631832&r2=1631833&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Tue Oct 14 18:44:53 2014
@@ -130,7 +130,8 @@ public abstract class AbstractAssemblyMo
/**
* Specifies the formats of the assembly.
* Multiple formats can be supplied and the Assembly Plugin will generate an archive for each desired formats.
- * When deploying your project, all file formats specified will also be deployed. A format is specified by supplying one of the following
+ * When deploying your project, all file formats specified will also be deployed. A format is specified by supplying
+ * one of the following
* values in a <format> subelement:
* <ul>
* <li><em>dir</em> - Creates a directory</li>
@@ -161,8 +162,7 @@ public abstract class AbstractAssemblyMo
/**
* A list of references to assembly descriptors available on the plugin's classpath. The default classpath
- * includes these built-in descriptors: <code>bin</code>,
- * <code>jar-with-dependencies</code>, <code>src</code>, and
+ * includes these built-in descriptors: <code>bin</code>, <code>jar-with-dependencies</code>, <code>src</code>, and
* <code>project</code>. You can add others by adding dependencies
* to the plugin.
*/
@@ -275,8 +275,7 @@ public abstract class AbstractAssemblyMo
/**
* The list of extra filter properties files to be used along with System properties, project
* properties, and filter properties files specified in the POM build/filters section, which
- * should be used for the filtering during the current mojo execution.
- * <br/>
+ * should be used for the filtering during the current mojo execution. <br/>
* Normally, these will be configured from a plugin's execution section, to provide a different
* set of filters for a particular execution.
*/
@@ -284,11 +283,12 @@ public abstract class AbstractAssemblyMo
protected List<String> filters;
/**
- * If True (default) then the ${project.build.filters} are also used in addition to any
+ * If True (default) then the ${project.build.filters} are also used in addition to any
* further filters defined for the Assembly.
+ *
* @since 2.4.2
*/
- @Parameter( property = "assembly.includeProjectBuildFilters", defaultValue = "true")
+ @Parameter( property = "assembly.includeProjectBuildFilters", defaultValue = "true" )
protected boolean includeProjectBuildFilters;
/**
@@ -325,6 +325,7 @@ public abstract class AbstractAssemblyMo
* For instance, to direct an assembly with the "ear" format to use a particular deployment descriptor, you should
* specify the following for the archiverConfig value in your plugin configuration: <br/>
* <p/>
+ *
* <pre>
* <appxml>${project.basedir}/somepath/app.xml</appxml>
* </pre>
@@ -346,8 +347,8 @@ public abstract class AbstractAssemblyMo
/**
* This will cause the assembly to only update an existing archive, if it exists.
* <p>
- * <strong>Note:</strong> The property that can be used on the command line
- * was misspelled as "assembly.updatOnly" in versions prior to version 2.4.
+ * <strong>Note:</strong> The property that can be used on the command line was misspelled as "assembly.updatOnly"
+ * in versions prior to version 2.4.
* </p>
*
* @since 2.2
@@ -357,8 +358,8 @@ public abstract class AbstractAssemblyMo
/**
* <p>
- * will use the jvm chmod, this is available for user and all level group level will be ignored
- * As of assembly-plugin 2.5, this flag is ignored for users of java7+
+ * will use the jvm chmod, this is available for user and all level group level will be ignored As of
+ * assembly-plugin 2.5, this flag is ignored for users of java7+
* </p>
*
* @since 2.2
@@ -383,11 +384,13 @@ public abstract class AbstractAssemblyMo
/**
* <p>
- * Set of delimiters for expressions to filter within the resources. These delimiters are specified in the
- * form 'beginToken*endToken'. If no '*' is given, the delimiter is assumed to be the same for start and end.
- * </p><p>
+ * Set of delimiters for expressions to filter within the resources. These delimiters are specified in the form
+ * 'beginToken*endToken'. If no '*' is given, the delimiter is assumed to be the same for start and end.
+ * </p>
+ * <p>
* So, the default filtering delimiters might be specified as:
* </p>
+ *
* <pre>
* <delimiters>
* <delimiter>${*}</delimiter>
@@ -404,17 +407,9 @@ public abstract class AbstractAssemblyMo
private List<String> delimiters;
/**
- * @since 2.4
- */
- @Parameter( defaultValue = "true" )
- private boolean useDefaultDelimiters;
-
-
- /**
* Create the binary distribution.
*
* @throws org.apache.maven.plugin.MojoExecutionException
- *
*/
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -444,79 +439,98 @@ public abstract class AbstractAssemblyMo
catch ( final InvalidAssemblerConfigurationException e )
{
throw new MojoFailureException( assemblyReader, e.getMessage(), "Mojo configuration is invalid: "
- + e.getMessage() );
+ + e.getMessage() );
}
// TODO: include dependencies marked for distribution under certain formats
// TODO: how, might we plug this into an installer, such as NSIS?
boolean warnedAboutMainProjectArtifact = false;
- for (final Assembly assembly : assemblies) {
- try {
- final String fullName = AssemblyFormatUtils.getDistributionName(assembly, this);
+ for ( final Assembly assembly : assemblies )
+ {
+ try
+ {
+ final String fullName = AssemblyFormatUtils.getDistributionName( assembly, this );
List<String> effectiveFormats = formats;
- if (effectiveFormats == null || effectiveFormats.size() == 0) {
+ if ( effectiveFormats == null || effectiveFormats.size() == 0 )
+ {
effectiveFormats = assembly.getFormats();
}
- if (effectiveFormats == null || effectiveFormats.size() == 0) {
- throw new MojoFailureException("No formats specified in the execution parameters or the assembly descriptor.");
+ if ( effectiveFormats == null || effectiveFormats.size() == 0 )
+ {
+ throw new MojoFailureException(
+ "No formats specified in the execution parameters or the assembly descriptor." );
}
- for (final String format : effectiveFormats) {
+ for ( final String format : effectiveFormats )
+ {
final File destFile =
- assemblyArchiver.createArchive(assembly, fullName, format, this, isRecompressZippedFiles());
+ assemblyArchiver.createArchive( assembly, fullName, format, this, isRecompressZippedFiles() );
final MavenProject project = getProject();
final String classifier = getClassifier();
- final String type = project.getArtifact()
- .getType();
+ final String type = project.getArtifact().getType();
- if (attach && destFile.isFile()) {
- if (isAssemblyIdAppended()) {
- projectHelper.attachArtifact(project, format, assembly.getId(), destFile);
- } else if (classifier != null) {
- projectHelper.attachArtifact(project, format, classifier, destFile);
- } else if (!"pom".equals(type) && format.equals(type)) {
- if (!warnedAboutMainProjectArtifact) {
+ if ( attach && destFile.isFile() )
+ {
+ if ( isAssemblyIdAppended() )
+ {
+ projectHelper.attachArtifact( project, format, assembly.getId(), destFile );
+ }
+ else if ( classifier != null )
+ {
+ projectHelper.attachArtifact( project, format, classifier, destFile );
+ }
+ else if ( !"pom".equals( type ) && format.equals( type ) )
+ {
+ if ( !warnedAboutMainProjectArtifact )
+ {
final StringBuilder message = new StringBuilder();
- message.append("Configuration options: 'appendAssemblyId' is set to false, and 'classifier' is missing.");
- message.append("\nInstead of attaching the assembly file: ")
- .append(destFile)
- .append(", it will become the file for main project artifact.");
- message.append("\nNOTE: If multiple descriptors or descriptor-formats are provided for this project, the value of this file will be non-deterministic!");
+ message.append( "Configuration options: 'appendAssemblyId' is set to false, and 'classifier' is missing." );
+ message.append( "\nInstead of attaching the assembly file: " ).append( destFile ).append( ", it will become the file for main project artifact." );
+ message.append( "\nNOTE: If multiple descriptors or descriptor-formats are provided for this project, the value of this file will be non-deterministic!" );
- getLog().warn(message);
+ getLog().warn( message );
warnedAboutMainProjectArtifact = true;
}
- final File existingFile = project.getArtifact()
- .getFile();
- if ((existingFile != null) && existingFile.exists()) {
- getLog().warn("Replacing pre-existing project main-artifact file: " + existingFile
- + "\nwith assembly file: " + destFile);
+ final File existingFile = project.getArtifact().getFile();
+ if ( ( existingFile != null ) && existingFile.exists() )
+ {
+ getLog().warn( "Replacing pre-existing project main-artifact file: " + existingFile
+ + "\nwith assembly file: " + destFile );
}
- project.getArtifact()
- .setFile(destFile);
- } else {
- projectHelper.attachArtifact(project, format, null, destFile);
+ project.getArtifact().setFile( destFile );
+ }
+ else
+ {
+ projectHelper.attachArtifact( project, format, null, destFile );
}
- } else if (attach) {
- getLog().warn("Assembly file: "
- + destFile
- + " is not a regular file (it may be a directory). It cannot be attached to the project build for installation or deployment.");
+ }
+ else if ( attach )
+ {
+ getLog().warn( "Assembly file: "
+ + destFile
+ + " is not a regular file (it may be a directory). It cannot be attached to the project build for installation or deployment." );
}
}
- } catch (final ArchiveCreationException e) {
- throw new MojoExecutionException("Failed to create assembly: " + e.getMessage(), e);
- } catch (final AssemblyFormattingException e) {
- throw new MojoExecutionException("Failed to create assembly: " + e.getMessage(), e);
- } catch (final InvalidAssemblerConfigurationException e) {
- throw new MojoFailureException(assembly, "Assembly is incorrectly configured: " + assembly.getId(),
- "Assembly: " + assembly.getId() + " is not configured correctly: "
- + e.getMessage());
+ }
+ catch ( final ArchiveCreationException e )
+ {
+ throw new MojoExecutionException( "Failed to create assembly: " + e.getMessage(), e );
+ }
+ catch ( final AssemblyFormattingException e )
+ {
+ throw new MojoExecutionException( "Failed to create assembly: " + e.getMessage(), e );
+ }
+ catch ( final InvalidAssemblerConfigurationException e )
+ {
+ throw new MojoFailureException( assembly, "Assembly is incorrectly configured: " + assembly.getId(),
+ "Assembly: " + assembly.getId() + " is not configured correctly: "
+ + e.getMessage() );
}
}
}
@@ -531,8 +545,7 @@ public abstract class AbstractAssemblyMo
final Log log = getLog();
log.debug( "Root Folder:" + mavenSession.getExecutionRootDirectory() );
log.debug( "Current Folder:" + basedir );
- final boolean result = mavenSession.getExecutionRootDirectory()
- .equalsIgnoreCase( basedir.toString() );
+ final boolean result = mavenSession.getExecutionRootDirectory().equalsIgnoreCase( basedir.toString() );
if ( result )
{
log.debug( "This is the execution root." );
@@ -658,8 +671,7 @@ public abstract class AbstractAssemblyMo
{
if ( filters == null )
{
- filters = getProject().getBuild()
- .getFilters();
+ filters = getProject().getBuild().getFilters();
if ( filters == null )
{
filters = Collections.emptyList();
@@ -668,8 +680,9 @@ public abstract class AbstractAssemblyMo
return filters;
}
- public boolean isIncludeProjectBuildFilters() {
- return includeProjectBuildFilters;
+ public boolean isIncludeProjectBuildFilters()
+ {
+ return includeProjectBuildFilters;
}
public List<MavenProject> getReactorProjects()
@@ -869,7 +882,7 @@ public abstract class AbstractAssemblyMo
{
return ignorePermissions;
}
-
+
public String getEncoding()
{
return encoding;
@@ -884,7 +897,7 @@ public abstract class AbstractAssemblyMo
{
return escapeString;
}
-
+
public List<String> getDelimiters()
{
return delimiters;
@@ -895,13 +908,4 @@ public abstract class AbstractAssemblyMo
this.delimiters = delimiters;
}
- public boolean isUseDefaultDelimiters()
- {
- return useDefaultDelimiters;
- }
-
- public void setUseDefaultDelimiters( boolean useDefaultDelimiters )
- {
- this.useDefaultDelimiters = useDefaultDelimiters;
- }
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java?rev=1631833&r1=1631832&r2=1631833&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java Tue Oct 14 18:44:53 2014
@@ -52,7 +52,8 @@ public class FileFormatterTest
private MockControl configSourceControl;
@Override
- public void setUp() throws Exception
+ public void setUp()
+ throws Exception
{
super.setUp();
@@ -63,12 +64,14 @@ public class FileFormatterTest
}
@Override
- public void tearDown() throws IOException
+ public void tearDown()
+ throws IOException
{
fileManager.cleanUp();
}
- public void testTemporaryRootDirectoryNotExist() throws IOException, AssemblyFormattingException
+ public void testTemporaryRootDirectoryNotExist()
+ throws IOException, AssemblyFormattingException
{
final File basedir = fileManager.createTempDir();
final File tempRoot = new File( basedir, "tempdir" );
@@ -86,7 +89,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldNotTransformOneFile() throws IOException, AssemblyFormattingException
+ public void testShouldNotTransformOneFile()
+ throws IOException, AssemblyFormattingException
{
final File basedir = fileManager.createTempDir();
@@ -114,7 +118,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldConvertCRLFLineEndingsInFile() throws IOException, AssemblyFormattingException
+ public void testShouldConvertCRLFLineEndingsInFile()
+ throws IOException, AssemblyFormattingException
{
final File basedir = fileManager.createTempDir();
@@ -132,7 +137,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldConvertLFLineEndingsInFile() throws IOException, AssemblyFormattingException
+ public void testShouldConvertLFLineEndingsInFile()
+ throws IOException, AssemblyFormattingException
{
final File basedir = fileManager.createTempDir();
@@ -150,7 +156,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldFilterProjectExpressionInFile() throws Exception
+ public void testShouldFilterProjectExpressionInFile()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
@@ -168,7 +175,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldFilterExpressionInPropertiesFileWithWindowsEscapes() throws Exception
+ public void testShouldFilterExpressionInPropertiesFileWithWindowsEscapes()
+ throws Exception
{
final File sourceDir = fileManager.createTempDir();
@@ -179,7 +187,7 @@ public class FileFormatterTest
build.setOutputDirectory( "C:\\out\\deeper" );
project.setBuild( build );
- enableBasicFilteringConfiguration( project, sourceDir, true, null);
+ enableBasicFilteringConfiguration( project, sourceDir, true, null );
final File file = fileManager.createFile( sourceDir, "one.properties", "out=${project.build.outputDirectory}" );
@@ -193,7 +201,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldFilterExpressionInPropertiesFileWithoutWindowsEscapes() throws Exception
+ public void testShouldFilterExpressionInPropertiesFileWithoutWindowsEscapes()
+ throws Exception
{
final File sourceDir = fileManager.createTempDir();
@@ -202,7 +211,7 @@ public class FileFormatterTest
build.setOutputDirectory( "C:\\out\\deeper" );
project.setBuild( build );
- enableBasicFilteringConfiguration( project, sourceDir, true, null);
+ enableBasicFilteringConfiguration( project, sourceDir, true, null );
final File file =
fileManager.createFile( sourceDir, "one.txt", "project.basedirA=${project.build.outputDirectory}" );
@@ -216,7 +225,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldFilterExpressionFromFiltersFileInFile() throws Exception
+ public void testShouldFilterExpressionFromFiltersFileInFile()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
@@ -236,7 +246,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldFilterExpressionFromFiltersFileInPropertiesFileWithoutWindowsEscapes() throws Exception
+ public void testShouldFilterExpressionFromFiltersFileInPropertiesFileWithoutWindowsEscapes()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
@@ -255,7 +266,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldFilterExpressionFromFiltersFileInNonPropertiesFileWithoutWindowsEscapes() throws Exception
+ public void testShouldFilterExpressionFromFiltersFileInNonPropertiesFileWithoutWindowsEscapes()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
@@ -275,7 +287,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldNotIgnoreFirstWordInDotNotationExpressions() throws Exception
+ public void testShouldNotIgnoreFirstWordInDotNotationExpressions()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
@@ -293,7 +306,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldFilterExpressionsFromTwoFiltersFilesInFile() throws Exception
+ public void testShouldFilterExpressionsFromTwoFiltersFilesInFile()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
@@ -319,7 +333,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldOverrideOneFilterValueWithAnotherAndFilterFile() throws Exception
+ public void testShouldOverrideOneFilterValueWithAnotherAndFilterFile()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
@@ -343,7 +358,8 @@ public class FileFormatterTest
mockManager.verifyAll();
}
- public void testShouldOverrideProjectValueWithFilterValueAndFilterFile() throws Exception
+ public void testShouldOverrideProjectValueWithFilterValueAndFilterFile()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
@@ -365,13 +381,16 @@ public class FileFormatterTest
mockManager.verifyAll();
}
-
- public void testShouldCombineProjectValueWithFilterValueAndFilterFile() throws Exception
+
+ public void testShouldCombineProjectValueWithFilterValueAndFilterFile()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
- final File buildFilterProps = fileManager.createFile( basedir, "build-filter.properties", "common=build\r\nbuild.test=build\r\n" );
- final File configFilterProps = fileManager.createFile( basedir, "config-filter.properties", "common=config\r\nconfig.test=config\r\n" );
+ final File buildFilterProps =
+ fileManager.createFile( basedir, "build-filter.properties", "common=build\r\nbuild.test=build\r\n" );
+ final File configFilterProps =
+ fileManager.createFile( basedir, "config-filter.properties", "common=config\r\nconfig.test=config\r\n" );
final List<String> buildFilters = new ArrayList<String>();
buildFilters.add( buildFilterProps.getCanonicalPath() );
@@ -379,26 +398,31 @@ public class FileFormatterTest
final List<String> configFilters = new ArrayList<String>();
configFilters.add( configFilterProps.getCanonicalPath() );
- enableFilteringConfiguration( basedir, buildFilters, configFilters, true);
+ enableFilteringConfiguration( basedir, buildFilters, configFilters, true );
final File file =
- fileManager.createFile( basedir, "one.txt", "filtered common=${common} build.test=${build.test} config.test=${config.test}." );
+ fileManager.createFile( basedir, "one.txt",
+ "filtered common=${common} build.test=${build.test} config.test=${config.test}." );
mockManager.replayAll();
final File result = new FileFormatter( configSource, logger ).format( file, true, null, "UTF-8" );
- assertEquals( "filtered common=build build.test=build config.test=config.", fileManager.getFileContents( result ) );
+ assertEquals( "filtered common=build build.test=build config.test=config.",
+ fileManager.getFileContents( result ) );
mockManager.verifyAll();
}
- public void testShouldIgnoreProjectValueWithFilterValueAndFilterFile() throws Exception
+ public void testShouldIgnoreProjectValueWithFilterValueAndFilterFile()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
- final File buildFilterProps = fileManager.createFile( basedir, "build-filter.properties", "common=build\r\nbuild.test=build\r\n" );
- final File configFilterProps = fileManager.createFile( basedir, "config-filter.properties", "common=config\r\nconfig.test=config\r\n" );
+ final File buildFilterProps =
+ fileManager.createFile( basedir, "build-filter.properties", "common=build\r\nbuild.test=build\r\n" );
+ final File configFilterProps =
+ fileManager.createFile( basedir, "config-filter.properties", "common=config\r\nconfig.test=config\r\n" );
final List<String> buildFilters = new ArrayList<String>();
buildFilters.add( buildFilterProps.getCanonicalPath() );
@@ -406,32 +430,37 @@ public class FileFormatterTest
final List<String> configFilters = new ArrayList<String>();
configFilters.add( configFilterProps.getCanonicalPath() );
- enableFilteringConfiguration( basedir, buildFilters, configFilters, false);
-
+ enableFilteringConfiguration( basedir, buildFilters, configFilters, false );
+
final File file =
- fileManager.createFile( basedir, "config.txt", "filtered common=${common} build.test=${build.test} config.test=${config.test}." );
+ fileManager.createFile( basedir, "config.txt",
+ "filtered common=${common} build.test=${build.test} config.test=${config.test}." );
mockManager.replayAll();
final File result = new FileFormatter( configSource, logger ).format( file, true, null, "UTF-8" );
- assertEquals( "filtered common=config build.test=${build.test} config.test=config.", fileManager.getFileContents( result ) );
+ assertEquals( "filtered common=config build.test=${build.test} config.test=config.",
+ fileManager.getFileContents( result ) );
mockManager.verifyAll();
}
- public void testShouldFilterExpressionFromFiltersFileInFileAddCustomDelimiters() throws Exception
+ public void testShouldFilterExpressionFromFiltersFileInFileAddCustomDelimiters()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
final File filterProps = fileManager.createFile( basedir, "filter.properties", "property=Test" );
- final List<String> delimiters = Collections.unmodifiableList(Arrays.asList("#", "(*)"));
-
- enableBasicFilteringConfiguration( basedir, Collections.singletonList( filterProps.getCanonicalPath() ), true, delimiters );
+ final List<String> delimiters = Collections.unmodifiableList( Arrays.asList( "${*}", "@", "#", "(*)" ) );
+
+ enableBasicFilteringConfiguration( basedir, Collections.singletonList( filterProps.getCanonicalPath() ), true,
+ delimiters );
final File file =
- fileManager.createFile( basedir, "one.txt", "This is a test for project: ${property} @property@ #property# (property)." );
+ fileManager.createFile( basedir, "one.txt",
+ "This is a test for project: ${property} @property@ #property# (property)." );
mockManager.replayAll();
@@ -441,30 +470,33 @@ public class FileFormatterTest
mockManager.verifyAll();
}
-
- public void testShouldFilterExpressionFromFiltersFileInFileCustomDelimiters() throws Exception
+
+ public void testShouldFilterExpressionFromFiltersFileInFileCustomDelimiters()
+ throws Exception
{
final File basedir = fileManager.createTempDir();
final File filterProps = fileManager.createFile( basedir, "filter.properties", "property=Test" );
- final List<String> delimiters = Collections.unmodifiableList(Arrays.asList("#", "(*)"));
-
- enableBasicFilteringConfiguration( basedir, Collections.singletonList( filterProps.getCanonicalPath() ), false, delimiters );
+ final List<String> delimiters = Collections.unmodifiableList( Arrays.asList( "#", "(*)" ) );
+
+ enableBasicFilteringConfiguration( basedir, Collections.singletonList( filterProps.getCanonicalPath() ), false,
+ delimiters );
final File file =
- fileManager.createFile( basedir, "one.txt", "This is a test for project: ${property} @property@ #property# (property)." );
+ fileManager.createFile( basedir, "one.txt",
+ "This is a test for project: ${property} @property@ #property# (property)." );
mockManager.replayAll();
final File result = new FileFormatter( configSource, logger ).format( file, true, null, "UTF-8" );
- assertEquals( "This is a test for project: ${property} @property@ Test Test.", fileManager.getFileContents( result ) );
+ assertEquals( "This is a test for project: ${property} @property@ Test Test.",
+ fileManager.getFileContents( result ) );
mockManager.verifyAll();
}
-
private MavenProject createBasicMavenProject()
{
final Model model = new Model();
@@ -475,18 +507,23 @@ public class FileFormatterTest
return new MavenProject( model );
}
- private void enableBasicFilteringConfiguration( final MavenProject project, final File basedir, final boolean useDefault, final List<String> delimiters) throws Exception {
-
- enableFilteringConfiguration(project, basedir, useDefault, delimiters, Collections.<String>emptyList(), true);
+ private void enableBasicFilteringConfiguration( final MavenProject project, final File basedir,
+ final boolean useDefault, final List<String> delimiters )
+ throws Exception
+ {
- }
+ enableFilteringConfiguration( project, basedir, useDefault, delimiters, Collections.<String> emptyList(), true );
- private void enableFilteringConfiguration( final MavenProject project, final File basedir, final boolean useDefault, final List<String> delimiters,
- final List<String> filters, final boolean includeProjectBuildFilters) throws Exception
+ }
+
+ private void enableFilteringConfiguration( final MavenProject project, final File basedir,
+ final boolean useDefault, final List<String> delimiters,
+ final List<String> filters, final boolean includeProjectBuildFilters )
+ throws Exception
{
configSource.getTemporaryRootDirectory();
configSourceControl.setReturnValue( basedir );
-
+
configSource.getEscapeString();
configSourceControl.setReturnValue( null, MockControl.ONE_OR_MORE );
@@ -501,15 +538,13 @@ public class FileFormatterTest
configSource.getFilters();
configSourceControl.setReturnValue( filters );
-
+
configSource.isIncludeProjectBuildFilters();
configSourceControl.setReturnValue( includeProjectBuildFilters );
configSource.getDelimiters();
configSourceControl.setReturnValue( delimiters );
-
- configSource.isUseDefaultDelimiters();
- configSourceControl.setReturnValue( useDefault );
+
}
private void enableBasicFilteringConfiguration( final File basedir, final List<String> buildFilterFilenames )
@@ -518,36 +553,37 @@ public class FileFormatterTest
final MavenProject project = createBasicMavenProject();
if ( buildFilterFilenames != null )
{
- project.getBuild()
- .setFilters( buildFilterFilenames );
+ project.getBuild().setFilters( buildFilterFilenames );
}
enableBasicFilteringConfiguration( project, basedir, true, null );
}
- private void enableFilteringConfiguration( final File basedir, final List<String> buildFilterFilenames, final List<String> configFilterFilenames, boolean includeProjectBuildFilters )
- throws Exception
+ private void enableFilteringConfiguration( final File basedir, final List<String> buildFilterFilenames,
+ final List<String> configFilterFilenames,
+ boolean includeProjectBuildFilters )
+ throws Exception
+ {
+ final MavenProject project = createBasicMavenProject();
+ if ( buildFilterFilenames != null )
{
- final MavenProject project = createBasicMavenProject();
- if ( buildFilterFilenames != null )
- {
- project.getBuild()
- .setFilters( buildFilterFilenames );
- }
-
- enableFilteringConfiguration( project, basedir, true, null, configFilterFilenames, includeProjectBuildFilters );
+ project.getBuild().setFilters( buildFilterFilenames );
}
- private void enableBasicFilteringConfiguration( final File basedir, final List<String> buildFilterFilenames, final boolean useDefault, final List<String> delimiters) throws Exception
+ enableFilteringConfiguration( project, basedir, true, null, configFilterFilenames, includeProjectBuildFilters );
+ }
+
+ private void enableBasicFilteringConfiguration( final File basedir, final List<String> buildFilterFilenames,
+ final boolean useDefault, final List<String> delimiters )
+ throws Exception
{
- final MavenProject project = createBasicMavenProject();
+ final MavenProject project = createBasicMavenProject();
if ( buildFilterFilenames != null )
{
- project.getBuild()
- .setFilters( buildFilterFilenames );
+ project.getBuild().setFilters( buildFilterFilenames );
}
-
- enableBasicFilteringConfiguration( project, basedir, useDefault, delimiters);
+
+ enableBasicFilteringConfiguration( project, basedir, useDefault, delimiters );
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileSetFormatterTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileSetFormatterTest.java?rev=1631833&r1=1631832&r2=1631833&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileSetFormatterTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileSetFormatterTest.java Tue Oct 14 18:44:53 2014
@@ -329,8 +329,6 @@ public class FileSetFormatterTest
FileUtils.deleteDirectory( result );
}
}
-
-
private void enableBasicFilteringConfiguration( final File basedir, final List<String> filterFilenames )
throws Exception
@@ -367,13 +365,10 @@ public class FileSetFormatterTest
configSource.getEscapeString();
configSourceControl.setReturnValue( null, MockControl.ONE_OR_MORE );
-
-
+
configSource.getDelimiters();
configSourceControl.setReturnValue( Collections.EMPTY_LIST, MockControl.ONE_OR_MORE );
-
- configSource.isUseDefaultDelimiters();
- configSourceControl.setReturnValue( true, MockControl.ONE_OR_MORE );
+
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java?rev=1631833&r1=1631832&r2=1631833&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java Tue Oct 14 18:44:53 2014
@@ -218,7 +218,4 @@ public class ConfigSourceStub
return null;
}
- public boolean isUseDefaultDelimiters() {
- return true;
- }
}