| commit | 62d68cb346cf23b0c1d8538230a9b7afbab3a993 | [log] [tgz] |
|---|---|---|
| author | Derek Baum <dbaum@apache.org> | Wed Mar 24 19:41:07 2010 +0000 |
| committer | Derek Baum <dbaum@apache.org> | Wed Mar 24 19:41:07 2010 +0000 |
| tree | ebc2909a7c1a9233ce630caeea5db1568c0eefcb | |
| parent | b6967bd61e361b839902d5b3f4f1b4d4ab3660d5 [diff] |
add ability to disable repository entry by setting disabled=true git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@927163 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java b/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java index 8e5ff65..7ec47a0 100644 --- a/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java +++ b/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
@@ -337,7 +337,7 @@ /** * set internal OSGiImport and isDependency flags, based on external - * resolution= attribute. + * resolve= attribute. * * OSGiImport: AUTO ALWAYS NEVER dependency: default - compile !dependency: * auto runtime ignore
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java index 9f102fc..c1269a2 100644 --- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java +++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
@@ -56,6 +56,11 @@ for (String name : repos.keySet()) { Properties repo = repos.get(name); + if (Boolean.parseBoolean(repo.getProperty("disabled", "false"))) + { + continue; + } + String optStr = repo.getProperty("optional", "false"); boolean optional = Boolean.parseBoolean(optStr.trim());