You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by db...@apache.org on 2010/03/24 20:41:07 UTC

svn commit: r927163 - in /felix/trunk/sigil: common/core/src/org/apache/felix/sigil/config/BldProject.java ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java

Author: dbaum
Date: Wed Mar 24 19:41:07 2010
New Revision: 927163

URL: http://svn.apache.org/viewvc?rev=927163&view=rev
Log:
add ability to disable repository entry by setting disabled=true

Modified:
    felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
    felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java

Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java?rev=927163&r1=927162&r2=927163&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java Wed Mar 24 19:41:07 2010
@@ -337,7 +337,7 @@ public class BldProject implements IBldP
 
     /**
      * set internal OSGiImport and isDependency flags, based on external
-     * resolution= attribute.
+     * resolve= attribute.
      * 
      * OSGiImport: AUTO ALWAYS NEVER dependency: default - compile !dependency:
      * auto runtime ignore

Modified: felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java?rev=927163&r1=927162&r2=927163&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java (original)
+++ felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java Wed Mar 24 19:41:07 2010
@@ -56,6 +56,11 @@ public class BldRepositoryManager extend
         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());