From a617d20058389edc2ea40d670e21e2303226bef5 Mon Sep 17 00:00:00 2001
From: Tim Laszlo <tim.laszlo@gmail.com>
Date: Wed, 4 Aug 2010 14:38:19 +0000
Subject: Packages: Document new knobs and added schema validator

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6000 ce84e21b-d406-0410-9b95-82705330c041
---
 doc/server/plugins/generators/packages.txt | 23 +++++++++++++++++++++++
 schemas/packages.xsd                       | 19 ++++++++++++++-----
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt
index 923dafefb..323fd97c9 100644
--- a/doc/server/plugins/generators/packages.txt
+++ b/doc/server/plugins/generators/packages.txt
@@ -92,6 +92,29 @@ any prerequisites that cannot be satisfied. This facility should largely
 remove the need to use the :ref:`Base <server-plugins-structures-base>`
 plugin.
 
+Disabling dependency resolution
+-------------------------------
+
+.. versionadded:: 1.1.0
+
+Dependency resolution can now be disabled by adding this to Sources in config.xml:
+
+.. code-block:: xml
+
+    <Sources>
+        <Config resolver="disabled" />
+        ...
+    </Sources>
+
+All metadata processing can be disabled as well:
+
+.. code-block:: xml
+
+    <Sources>
+        <Config metadata="disabled" />
+        ...
+    </Sources>
+
 .. _packages-exampleusage:
 
 Example usage
diff --git a/schemas/packages.xsd b/schemas/packages.xsd
index e15fb7f99..1a8469ed6 100644
--- a/schemas/packages.xsd
+++ b/schemas/packages.xsd
@@ -33,11 +33,20 @@
   </xsd:complexType>
 
   <xsd:complexType name='SourcesType'>
-    <xsd:choice minOccurs='1' maxOccurs='unbounded'>
-      <xsd:element name='APTSource' type='SourceType'/>
-      <xsd:element name='YUMSource' type='SourceType'/>
-      <xsd:element name='Sources' type='SourcesType'/>
-    </xsd:choice>
+    <xsd:sequence>
+      <xsd:element name='Config' minOccurs='0' maxOccurs='1'>
+        <xsd:complexType>
+        <xsd:attribute type='xsd:string' name='resolver' />
+        <xsd:attribute type='xsd:string' name='metadata' />
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:choice minOccurs='1' maxOccurs='unbounded'>
+        <xsd:element name='APTSource' type='SourceType'/>
+        <xsd:element name='YUMSource' type='SourceType'/>
+        <xsd:element name='Sources' type='SourcesType'/>
+      </xsd:choice>
+    </xsd:sequence>
   </xsd:complexType>
 
   <xsd:element name='Sources' type='SourcesType'/>
-- 
cgit v1.2.3-1-g7c22