Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MASSEMBLY-617] add ability to give a fileSuffix to a FileSet #4

Closed
wants to merge 1 commit into from
Closed

[MASSEMBLY-617] add ability to give a fileSuffix to a FileSet #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,10 @@ public InputStreamTransformer getStreamTransformer()
{
return fileSet.getStreamTransformer();
}

public String getFileSuffix()
{
return fileSet.getFileSuffix();
}

}
5 changes: 5 additions & 0 deletions src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,9 @@ public InputStreamTransformer getStreamTransformer()
{
return fileSet.getStreamTransformer();
}

public String getFileSuffix()
{
return fileSet.getFileSuffix();
}
}
9 changes: 8 additions & 1 deletion src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public class AddDirectoryTask
private int directoryMode = -1;

private int fileMode = -1;

private String fileSuffix;

public AddDirectoryTask( final File directory, InputStreamTransformer transformers )
{
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -206,5 +209,9 @@ public void setUseDefaultExcludes( final boolean useDefaultExcludes )
{
this.useDefaultExcludes = useDefaultExcludes;
}


public void setFileSuffix( String fileSuffix )
{
this.fileSuffix = fileSuffix;
}
}
1 change: 1 addition & 0 deletions src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
Expand Down
10 changes: 10 additions & 0 deletions src/main/mdo/assembly-component.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions src/main/mdo/assembly.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down