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 2016/01/13 13:41:06 UTC

karaf git commit: [KARAF-4255] Only include conditional dependencies in assembly if condition is met

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 5c2bb8718 -> 84b90910d


[KARAF-4255] Only include conditional dependencies in assembly if condition is met


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/84b90910
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/84b90910
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/84b90910

Branch: refs/heads/karaf-4.0.x
Commit: 84b90910d955dbbf1d4752acb06ee126e341c669
Parents: 5c2bb87
Author: Fabian Lange <la...@gmail.com>
Authored: Sun Jan 10 13:26:26 2016 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jan 13 13:40:55 2016 +0100

----------------------------------------------------------------------
 .../apache/karaf/profile/assembly/Builder.java  | 35 +++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/84b90910/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index 71e62ab..3076375 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -751,10 +751,12 @@ public class Builder {
                 }
             }
             for (Conditional cond : feature.getConditional()) {
-                for (Bundle bundle : cond.getBundle()) {
-                    if (!ignoreDependencyFlag || !bundle.isDependency()) {
-                        installArtifact(downloader, bundle.getLocation().trim());
-                    }
+                if (isConditionalMet(cond, installedFeatures)) {
+                  for (Bundle bundle : cond.getBundle()) {
+                      if (!ignoreDependencyFlag || !bundle.isDependency()) {
+                          installArtifact(downloader, bundle.getLocation().trim());
+                      }
+                  }
                 }
             }
         }
@@ -820,9 +822,11 @@ public class Builder {
                 }
             }
             for (Conditional cond : feature.getConditional()) {
-                for (Bundle bundle : cond.getBundle()) {
-                    if (!ignoreDependencyFlag || !bundle.isDependency()) {
-                        locations.add(bundle.getLocation().trim());
+                if (isConditionalMet(cond, bootFeatures)) {
+                    for (Bundle bundle : cond.getBundle()) {
+                        if (!ignoreDependencyFlag || !bundle.isDependency()) {
+                            locations.add(bundle.getLocation().trim());
+                        }
                     }
                 }
             }
@@ -855,8 +859,10 @@ public class Builder {
                 installArtifact(downloader, configFile.getLocation().trim());
             }
             for (Conditional cond : feature.getConditional()) {
-                for (ConfigFile configFile : cond.getConfigfile()) {
-                    installArtifact(downloader, configFile.getLocation().trim());
+                if (isConditionalMet(cond, bootFeatures)) {
+                    for (ConfigFile configFile : cond.getConfigfile()) {
+                        installArtifact(downloader, configFile.getLocation().trim());
+                    }
                 }
             }
             // Install libraries
@@ -927,6 +933,17 @@ public class Builder {
         return allBootFeatures;
     }
 
+    private boolean isConditionalMet(Conditional cond, Set<Feature> bootFeatures) {
+        for (String condition : cond.getCondition()) {
+            for (Feature feature : bootFeatures) {
+                if (feature.getName().equals(condition)) {
+                  return true;
+                }
+            }
+        }
+        return false;
+    }
+
     private String getRepos(Features rep) {
         StringBuilder repos = new StringBuilder();
         for (String repo : new HashSet<>(rep.getRepository())) {