You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by GitBox <gi...@apache.org> on 2019/01/01 23:07:45 UTC
[GitHub] olamy closed pull request #4: [MASSEMBLY-617] add ability to give a
fileSuffix to a FileSet
olamy closed pull request #4: [MASSEMBLY-617] add ability to give a fileSuffix to a FileSet
URL: https://github.com/apache/maven-assembly-plugin/pull/4
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
index 73bfb73c..e6ef195b 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
@@ -148,5 +148,10 @@ public InputStreamTransformer getStreamTransformer()
{
return fileSet.getStreamTransformer();
}
+
+ public String getFileSuffix()
+ {
+ return fileSet.getFileSuffix();
+ }
}
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
index 1ceead19..b7f69660 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
@@ -177,4 +177,9 @@ public InputStreamTransformer getStreamTransformer()
{
return fileSet.getStreamTransformer();
}
+
+ public String getFileSuffix()
+ {
+ return fileSet.getFileSuffix();
+ }
}
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java
index 2664ae16..1a5bd618 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java
@@ -51,6 +51,8 @@
private int directoryMode = -1;
private int fileMode = -1;
+
+ private String fileSuffix;
public AddDirectoryTask( final File directory, InputStreamTransformer transformers )
{
@@ -139,6 +141,7 @@ else if ( "..".equals( outputDirectory ) )
fs.setDirectory( directory );
fs.setIncludes( includesArray );
fs.setExcludes( excludesArray );
+ fs.setFileSuffix( fileSuffix );
if ( transformer != null )
{
fs.setStreamTransformer( transformer );
@@ -206,5 +209,9 @@ public void setUseDefaultExcludes( final boolean useDefaultExcludes )
{
this.useDefaultExcludes = useDefaultExcludes;
}
-
+
+ public void setFileSuffix( String fileSuffix )
+ {
+ this.fileSuffix = fileSuffix;
+ }
}
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
index 1b855fa5..b4e8bd8b 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
@@ -165,6 +165,7 @@ void addFileSet( final FileSet fileSet, final Archiver archiver, final Assembler
task.setExcludes( fileSet.getExcludes() );
task.setIncludes( fileSet.getIncludes() );
task.setOutputDirectory( destDirectory );
+ task.setFileSuffix( fileSet.getFileSuffix() );
task.execute( archiver );
}
diff --git a/src/main/mdo/assembly-component.mdo b/src/main/mdo/assembly-component.mdo
index e40933d3..a4f38a26 100644
--- a/src/main/mdo/assembly-component.mdo
+++ b/src/main/mdo/assembly-component.mdo
@@ -283,6 +283,16 @@
<defaultValue>false</defaultValue>
<type>boolean</type>
</field>
+ <field>
+ <name>fileSuffix</name>
+ <version>3.2.0+</version>
+ <type>String</type>
+ <description>
+ <![CDATA[
+ Sets a suffix for copying files in this fileSet. Example : test.xml => testSuffix.xml
+ ]]>
+ </description>
+ </field>
</fields>
</class>
<class>
diff --git a/src/main/mdo/assembly.mdo b/src/main/mdo/assembly.mdo
index 52c9c7e6..c1e0d127 100644
--- a/src/main/mdo/assembly.mdo
+++ b/src/main/mdo/assembly.mdo
@@ -403,6 +403,16 @@
<defaultValue>false</defaultValue>
<type>boolean</type>
</field>
+ <field>
+ <name>fileSuffix</name>
+ <version>3.2.0+</version>
+ <type>String</type>
+ <description>
+ <![CDATA[
+ Sets a suffix for copying files in this fileSet. Example : test.xml => testSuffix.xml
+ ]]>
+ </description>
+ </field>
</fields>
</class>
<class>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services