From 3f9a45cda0c94ffa0c38ddfb74ccfab38796f33f Mon Sep 17 00:00:00 2001 From: Thomas Collignon Date: Mon, 25 Jun 2018 09:41:28 +0200 Subject: [PATCH] [MASSEMBLY-617] add ability to give a fileSuffix to an AbstractFileSet --- .../codehaus/plexus/archiver/AbstractArchiver.java | 1 + .../org/codehaus/plexus/archiver/BaseFileSet.java | 7 ++++++- .../plexus/archiver/util/AbstractFileSet.java | 13 +++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java index 3fab3dd2a..5cdfdef4d 100755 --- a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java @@ -346,6 +346,7 @@ public void addFileSet( @Nonnull final FileSet fileSet ) collection.setCaseSensitive( fileSet.isCaseSensitive() ); collection.setUsingDefaultExcludes( fileSet.isUsingDefaultExcludes() ); collection.setStreamTransformer( fileSet.getStreamTransformer() ); + collection.setFileSuffix( fileSet.getFileSuffix() ); if ( getOverrideDirectoryMode() > -1 || getOverrideFileMode() > -1 ) { diff --git a/src/main/java/org/codehaus/plexus/archiver/BaseFileSet.java b/src/main/java/org/codehaus/plexus/archiver/BaseFileSet.java index a3cc2f892..6d6e62f31 100644 --- a/src/main/java/org/codehaus/plexus/archiver/BaseFileSet.java +++ b/src/main/java/org/codehaus/plexus/archiver/BaseFileSet.java @@ -64,5 +64,10 @@ public interface BaseFileSet * @return The transformers. */ InputStreamTransformer getStreamTransformer(); - + + /** + * Returns the suffix + */ + String getFileSuffix(); + } diff --git a/src/main/java/org/codehaus/plexus/archiver/util/AbstractFileSet.java b/src/main/java/org/codehaus/plexus/archiver/util/AbstractFileSet.java index 73dbb2357..785af26cc 100644 --- a/src/main/java/org/codehaus/plexus/archiver/util/AbstractFileSet.java +++ b/src/main/java/org/codehaus/plexus/archiver/util/AbstractFileSet.java @@ -44,6 +44,8 @@ public abstract class AbstractFileSet private boolean includingEmptyDirectories = true; private InputStreamTransformer streamTransformer = null; + + private String fileSuffix; /** * Sets a string of patterns, which excluded files @@ -189,5 +191,16 @@ public InputStreamTransformer getStreamTransformer() { return streamTransformer; } + + public void setFileSuffix(String fileSuffix) + { + this.fileSuffix = fileSuffix; + } + + @Override + public String getFileSuffix() + { + return fileSuffix; + } }