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/09/26 07:33:46 UTC
[1/2] karaf git commit: Fix for issue KARAF-4020
Repository: karaf
Updated Branches:
refs/heads/master 6d6d39f61 -> 0c8b14091
Fix for issue KARAF-4020
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cd3448df
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cd3448df
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cd3448df
Branch: refs/heads/master
Commit: cd3448df56c71945030893f75d5d677871c0c4cf
Parents: edd063b
Author: Lukas Roedl <lu...@ait.ac.at>
Authored: Fri Sep 25 21:12:23 2015 +0200
Committer: Lukas Roedl <lu...@ait.ac.at>
Committed: Fri Sep 25 21:12:23 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/tooling/ArchiveMojo.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/cd3448df/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
index f102507..b86295c 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
@@ -67,6 +67,12 @@ public class ArchiveMojo extends MojoSupport {
private String pathPrefix;
/**
+ * Use a path prefix of files in the created archive
+ */
+ @Parameter
+ private boolean usePathPrefix = true;
+
+ /**
* The target file to set as the project's artifact.
*/
@Parameter(defaultValue="${project.artifactId}-${project.version}")
@@ -128,9 +134,12 @@ public class ArchiveMojo extends MojoSupport {
}
dest = new File(dest, serverName + "." + artifact.getType());
- String prefix = pathPrefix.trim();
- if( prefix.length() > 0 && !prefix.endsWith("/") ) {
- prefix += "/";
+ String prefix = "";
+ if (usePathPrefix) {
+ prefix = pathPrefix.trim();
+ if( prefix.length() > 0 && !prefix.endsWith("/") ) {
+ prefix += "/";
+ }
}
if ("tar.gz".equals(artifact.getType())) {
[2/2] karaf git commit: Merge branch 'karaf-4020' of
https://github.com/roedll/karaf
Posted by jb...@apache.org.
Merge branch 'karaf-4020' of https://github.com/roedll/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0c8b1409
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0c8b1409
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0c8b1409
Branch: refs/heads/master
Commit: 0c8b1409152d26a7ae9fc2a9201a583b839ace3a
Parents: 6d6d39f cd3448d
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Sep 26 07:11:21 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Sep 26 07:11:21 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/tooling/ArchiveMojo.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------