svn commit: r992273 - in /felix/trunk/sigil: ./ bldcommon/ common/ eclipse/ gogo/ ivy/

[ds...@apache.org]

Author: dsavage
Date: Fri Sep  3 12:11:42 2010
New Revision: 992273

URL: http://svn.apache.org/viewvc?rev=992273&view=rev
Log:
inherit repos configs using defaulting mechanism (such that sigil projects can take advantage of changes introduced by FELIX-1355)

Added:
    felix/trunk/sigil/bldcommon/sigil-defaults.properties
      - copied, changed from r992162, felix/trunk/sigil/sigil-defaults.properties
Removed:
    felix/trunk/sigil/bldcommon/sigil-repos.properties
    felix/trunk/sigil/sigil-defaults.properties
Modified:
    felix/trunk/sigil/bldcommon/ivysettings.xml
    felix/trunk/sigil/common/sigil-defaults.properties
    felix/trunk/sigil/eclipse/sigil-defaults.properties
    felix/trunk/sigil/gogo/sigil-defaults.properties
    felix/trunk/sigil/ivy/sigil-defaults.properties

Modified: felix/trunk/sigil/bldcommon/ivysettings.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/ivysettings.xml?rev=992273&r1=992272&r2=992273&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/ivysettings.xml (original)
+++ felix/trunk/sigil/bldcommon/ivysettings.xml Fri Sep  3 12:11:42 2010
@@ -38,13 +38,13 @@
   <typedef name="sigil" classname="org.apache.felix.sigil.ivy.SigilResolver" />
 
   <parsers>
-    <sigil-parser config="${ivy.settings.dir}/sigil-repos.properties"
+    <sigil-parser config="${ivy.settings.dir}/sigil-defaults.properties"
     		quiet="true"/>
   </parsers>
 
   <resolvers>
     <sigil name="sigil"
-	   config="${ivy.settings.dir}/sigil-repos.properties"
+	   config="${ivy.settings.dir}/sigil-defaults.properties"
 	   extractBCP="true"
            cache="sigil"/>
 

Copied: felix/trunk/sigil/bldcommon/sigil-defaults.properties (from r992162, felix/trunk/sigil/sigil-defaults.properties)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/sigil-defaults.properties?p2=felix/trunk/sigil/bldcommon/sigil-defaults.properties&p1=felix/trunk/sigil/sigil-defaults.properties&r1=992162&r2=992273&rev=992273&view=diff
==============================================================================
--- felix/trunk/sigil/sigil-defaults.properties (original)
+++ felix/trunk/sigil/bldcommon/sigil-defaults.properties Fri Sep  3 12:11:42 2010
@@ -1,5 +1,33 @@
 # sigil-defaults.properties
 
+# repository config
+-repositories:  system, project, bld-common, felix, spring, bld-ant
+
+system;provider:        system
+
+project;provider:       project
+project;pattern:        \
+        ${..}/common/**/[sigilproject] \
+        ${..}/eclipse/**/[sigilproject] \
+
+bld-ant;provider:       filesystem
+bld-ant;recurse:        true
+bld-ant;dir:            ${cache.dir:-${..}/cache}/ant/lib
+
+bld-common;provider:    filesystem
+bld-common;recurse:     true
+bld-common;dir:         ${cache.dir:-${..}/cache}/all
+
+felix;provider: obr
+felix;url:              http://felix.apache.org/obr/releases.xml 
+felix;index:            ${..}/build/felix.obr
+felix;cache:            ${..}/build/obr-cache
+
+spring;provider:        obr
+spring;url:             http://sigil.codecauldron.org/spring-external.obr
+spring;index:           ${..}/build/spring-external.obr
+spring;cache:           ${..}/build/obr-cache
+
 # Default version of all Sigil projects
 version: 0.9.0.${buildQualifier:-SNAPSHOT}
 

Modified: felix/trunk/sigil/common/sigil-defaults.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/sigil-defaults.properties?rev=992273&r1=992272&r2=992273&view=diff
==============================================================================
--- felix/trunk/sigil/common/sigil-defaults.properties (original)
+++ felix/trunk/sigil/common/sigil-defaults.properties Fri Sep  3 12:11:42 2010
@@ -0,0 +1,2 @@
+# sigil common default properties
+-defaults: ${BLDCOMMON:-../bldcommon}/sigil-defaults.properties

Modified: felix/trunk/sigil/eclipse/sigil-defaults.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/sigil-defaults.properties?rev=992273&r1=992272&r2=992273&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/sigil-defaults.properties (original)
+++ felix/trunk/sigil/eclipse/sigil-defaults.properties Fri Sep  3 12:11:42 2010
@@ -0,0 +1,2 @@
+# sigil common default properties
+-defaults: ${BLDCOMMON:-../bldcommon}/sigil-defaults.properties

Modified: felix/trunk/sigil/gogo/sigil-defaults.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/gogo/sigil-defaults.properties?rev=992273&r1=992272&r2=992273&view=diff
==============================================================================
--- felix/trunk/sigil/gogo/sigil-defaults.properties (original)
+++ felix/trunk/sigil/gogo/sigil-defaults.properties Fri Sep  3 12:11:42 2010
@@ -0,0 +1,2 @@
+# sigil common default properties
+-defaults: ${BLDCOMMON:-../bldcommon}/sigil-defaults.properties

Modified: felix/trunk/sigil/ivy/sigil-defaults.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/sigil-defaults.properties?rev=992273&r1=992272&r2=992273&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/sigil-defaults.properties (original)
+++ felix/trunk/sigil/ivy/sigil-defaults.properties Fri Sep  3 12:11:42 2010
@@ -0,0 +1,2 @@
+# sigil common default properties
+-defaults: ${BLDCOMMON:-../bldcommon}/sigil-defaults.properties