inherit repos configs using defaulting mechanism (such that sigil projects can take advantage of changes introduced by FELIX-1355)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@992273 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/bldcommon/ivysettings.xml b/sigil/bldcommon/ivysettings.xml
index 69a6bc2..57aadad 100644
--- a/sigil/bldcommon/ivysettings.xml
+++ b/sigil/bldcommon/ivysettings.xml
@@ -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"/>
diff --git a/sigil/sigil-defaults.properties b/sigil/bldcommon/sigil-defaults.properties
similarity index 81%
rename from sigil/sigil-defaults.properties
rename to sigil/bldcommon/sigil-defaults.properties
index ce655b3..6fd2359 100644
--- a/sigil/sigil-defaults.properties
+++ b/sigil/bldcommon/sigil-defaults.properties
@@ -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}
diff --git a/sigil/bldcommon/sigil-repos.properties b/sigil/bldcommon/sigil-repos.properties
deleted file mode 100644
index db142d4..0000000
--- a/sigil/bldcommon/sigil-repos.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# sigil repository config
-
-# 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
-
-# end
diff --git a/sigil/common/sigil-defaults.properties b/sigil/common/sigil-defaults.properties
index e69de29..bfc9d0d 100644
--- a/sigil/common/sigil-defaults.properties
+++ b/sigil/common/sigil-defaults.properties
@@ -0,0 +1,2 @@
+# sigil common default properties
+-defaults: ${BLDCOMMON:-../bldcommon}/sigil-defaults.properties
diff --git a/sigil/eclipse/sigil-defaults.properties b/sigil/eclipse/sigil-defaults.properties
index e69de29..bfc9d0d 100644
--- a/sigil/eclipse/sigil-defaults.properties
+++ b/sigil/eclipse/sigil-defaults.properties
@@ -0,0 +1,2 @@
+# sigil common default properties
+-defaults: ${BLDCOMMON:-../bldcommon}/sigil-defaults.properties
diff --git a/sigil/gogo/sigil-defaults.properties b/sigil/gogo/sigil-defaults.properties
index e69de29..bfc9d0d 100644
--- a/sigil/gogo/sigil-defaults.properties
+++ b/sigil/gogo/sigil-defaults.properties
@@ -0,0 +1,2 @@
+# sigil common default properties
+-defaults: ${BLDCOMMON:-../bldcommon}/sigil-defaults.properties
diff --git a/sigil/ivy/sigil-defaults.properties b/sigil/ivy/sigil-defaults.properties
index e69de29..bfc9d0d 100644
--- a/sigil/ivy/sigil-defaults.properties
+++ b/sigil/ivy/sigil-defaults.properties
@@ -0,0 +1,2 @@
+# sigil common default properties
+-defaults: ${BLDCOMMON:-../bldcommon}/sigil-defaults.properties