You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/02/06 08:48:01 UTC
karaf git commit: [KARAF-3493] Support targetFile configuration in
CreateArchiveMojo
Repository: karaf
Updated Branches:
refs/heads/master 2579c8335 -> 4337a9734
[KARAF-3493] Support targetFile configuration in CreateArchiveMojo
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4337a973
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4337a973
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4337a973
Branch: refs/heads/master
Commit: 4337a9734ba65bea2482392391b0a2efe8a9494e
Parents: 2579c83
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Feb 6 08:47:26 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Feb 6 08:47:26 2015 +0100
----------------------------------------------------------------------
.../org/apache/karaf/tooling/instances/CreateArchiveMojo.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/4337a973/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
index ff08037..2a00633 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
@@ -99,7 +99,12 @@ public class CreateArchiveMojo extends MojoSupport {
public File archive(File source, File dest, Artifact artifact) throws //ArchiverException,
IOException {
- String serverName = artifact.getArtifactId() + "-" + artifact.getVersion();
+ String serverName = null;
+ if (targetFile != null && project.getPackaging().equals("karaf-assembly")) {
+ serverName = targetFile.getName();
+ } else {
+ serverName = artifact.getArtifactId() + "-" + artifact.getVersion();
+ }
dest = new File(dest, serverName + "." + artifact.getType());
Project project = new Project();
MatchingTask archiver;