You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2017/08/23 14:49:51 UTC
[3/3] karaf git commit: Reuse extracted manifest
Reuse extracted manifest
Obtaining the manifest can cost us some IO. Treat it as an invariant
when determining whether a file is a bundle.
Signed-off-by: Robert Varga <ni...@hq.sk>
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/edcda0b0
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/edcda0b0
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/edcda0b0
Branch: refs/heads/master
Commit: edcda0b0ea4a50ae8e8019af1eaff161507e3ee4
Parents: 9714d76
Author: Robert Varga <ni...@hq.sk>
Authored: Sun Aug 13 20:26:17 2017 +0200
Committer: Robert Varga <ni...@hq.sk>
Committed: Wed Aug 23 14:23:01 2017 +0200
----------------------------------------------------------------------
.../apache/karaf/tooling/features/GenerateDescriptorMojo.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/edcda0b0/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
index e4bcf07..f262ac3 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
@@ -483,8 +483,6 @@ public class GenerateDescriptorMojo extends MojoSupport {
if (!this.dependencyHelper.isArtifactAFeature(artifact)) {
String bundleName = this.dependencyHelper.artifactToMvn(artifact, getVersionOrRange(entry.getParent(), artifact));
- File bundleFile = this.dependencyHelper.resolve(artifact, getLog());
- Manifest manifest = getManifest(bundleFile);
for (ConfigFile cf : feature.getConfigfile()) {
if (bundleName.equals(cf.getLocation().replace('\n', ' ').trim())) {
@@ -493,7 +491,9 @@ public class GenerateDescriptorMojo extends MojoSupport {
}
}
- if (manifest == null || !ManifestUtils.isBundle(getManifest(bundleFile))) {
+ File bundleFile = this.dependencyHelper.resolve(artifact, getLog());
+ Manifest manifest = getManifest(bundleFile);
+ if (manifest == null || !ManifestUtils.isBundle(manifest)) {
bundleName = "wrap:" + bundleName;
needWrap = true;
}