added Defaults plugin

5 files changed, 129 insertions, 46 deletions

diff --git a/schemas/defaults.xsd b/schemas/defaults.xsd
new file mode 100644
index 000000000..d449f023a
--- /dev/null
+++ b/schemas/defaults.xsd
@@ -0,0 +1,68 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+  <xsd:annotation>
+    <xsd:documentation>
+      string enumeration definitions for bcfg2
+      Narayan Desai, Argonne National Laboratory
+      $Id$
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="servicetype.xsd"/>
+  <xsd:include schemaLocation="types.xsd"/>
+  <xsd:include schemaLocation="pkgtype.xsd"/>
+
+  <xsd:complexType name="ActionType">
+    <xsd:attribute type="ActionTimingEnum" name="timing"/>
+    <xsd:attribute type="ActionWhenEnum" name="when"/>
+    <xsd:attribute type="ActionStatusEnum" name="status"/>
+    <xsd:attribute type="xsd:string" name="name" use="required"/>
+    <xsd:attribute type="xsd:string" name="command"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="PathType">
+    <xsd:attribute type="PathTypeEnum" name="type"/>
+    <xsd:attribute type="xsd:string" name="name" use="required"/>
+    <xsd:attribute type="xsd:string" name="dev_type"/>
+    <xsd:attribute type="xsd:string" name="major"/>
+    <xsd:attribute type="xsd:string" name="minor"/>
+    <xsd:attribute type="xsd:string" name="mode"/>
+    <xsd:attribute type="xsd:string" name="perms"/>
+    <xsd:attribute type="xsd:string" name="owner"/>
+    <xsd:attribute type="xsd:string" name="group"/>
+    <xsd:attribute type="xsd:string" name="recursive"/>
+    <xsd:attribute type="xsd:string" name="prune"/>
+    <xsd:attribute type="xsd:string" name="to"/>
+    <xsd:attribute type="xsd:string" name="vcstype"/>
+    <xsd:attribute type="xsd:string" name="revision"/>
+    <xsd:attribute type="xsd:string" name="sourceurl"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="DContainerType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="Service" type="ServiceType"/>
+      <xsd:element name="Package" type="PackageType"/>
+      <xsd:element name="Path" type="PathType"/>
+      <xsd:element name="Action" type="ActionType"/>
+      <xsd:element name="Group" type="DContainerType"/>
+      <xsd:element name="Client" type="DContainerType"/>
+    </xsd:choice>
+    <xsd:attribute name="name" type="xsd:string"/>
+    <xsd:attribute name="negate" type="xsd:boolean"/>
+  </xsd:complexType>
+
+  <xsd:element name="Defaults">
+    <xsd:complexType>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element name="Service" type="ServiceType"/>
+        <xsd:element name="Package" type="PackageType"/>
+        <xsd:element name="Path" type="PathType"/>
+        <xsd:element name="Action" type="ActionType"/>
+        <xsd:element name="PostInstall" type="PostInstallType"/>
+        <xsd:element name="Group" type="DContainerType"/>
+        <xsd:element name="Client" type="DContainerType"/>
+      </xsd:choice>
+      <xsd:attribute name="priority" type="xsd:integer" use="required"/>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
diff --git a/schemas/pkgtype.xsd b/schemas/pkgtype.xsd
index 70a466448..6c3821f82 100644
--- a/schemas/pkgtype.xsd
+++ b/schemas/pkgtype.xsd
@@ -13,20 +13,20 @@
   <xsd:import namespace="http://genshi.edgewall.org/"
               schemaLocation="genshi.xsd"/>
 
-  <xsd:complexType name='PackageType'>
-    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-      <xsd:element name='Instance'>
+  <xsd:complexType name="PackageType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="Instance">
         <xsd:complexType>
-          <xsd:attribute name='arch' type='xsd:string'/>
-          <xsd:attribute name='epoch' type='xsd:string'/>
-          <xsd:attribute name='version' type='xsd:string'/>
-          <xsd:attribute name='release' type='xsd:string'/>
-          <xsd:attribute name='simplefile' type='xsd:string'/>
-          <xsd:attribute name='pkg_verify' type='xsd:string'/>
-          <xsd:attribute name='verify_flags' type='xsd:string'/>
-          <xsd:attribute name='installed_action' type='xsd:string'/>
-          <xsd:attribute name='version_fail_action' type='xsd:string'/>
-          <xsd:attribute name='verify_fail_action' type='xsd:string'/>
+          <xsd:attribute name="arch" type="xsd:string"/>
+          <xsd:attribute name="epoch" type="xsd:string"/>
+          <xsd:attribute name="version" type="xsd:string"/>
+          <xsd:attribute name="release" type="xsd:string"/>
+          <xsd:attribute name="simplefile" type="xsd:string"/>
+          <xsd:attribute name="pkg_verify" type="xsd:boolean"/>
+          <xsd:attribute name="verify_flags" type="xsd:string"/>
+          <xsd:attribute name="installed_action" type="xsd:string"/>
+          <xsd:attribute name="version_fail_action" type="xsd:string"/>
+          <xsd:attribute name="verify_fail_action" type="xsd:string"/>
           <xsd:attributeGroup ref="py:genshiAttrs"/>
         </xsd:complexType>
       </xsd:element>
@@ -38,17 +38,17 @@
       <xsd:element ref="py:with"/>
       <xsd:element ref="py:replace"/>
     </xsd:choice>
-    <xsd:attribute type='xsd:string' name='name' use="required"/>
-    <xsd:attribute type='xsd:string' name='version'/>
-    <xsd:attribute type='xsd:string' name='file'/>
-    <xsd:attribute type='xsd:string' name='verify'/>
-    <xsd:attribute type='xsd:string' name='simplefile'/>
-    <xsd:attribute type='xsd:string' name='multiarch'/>
-    <xsd:attribute type='xsd:string' name='srcs'/>
-    <xsd:attribute type='xsd:string' name='type'/>
-    <xsd:attribute type='xsd:string' name='bname'/>
-    <xsd:attribute name='pkg_checks' type='xsd:string'/>
-    <xsd:attribute name='verify_flags' type='xsd:string'/>
+    <xsd:attribute type="xsd:string" name="name" use="required"/>
+    <xsd:attribute type="xsd:string" name="version"/>
+    <xsd:attribute type="xsd:string" name="file"/>
+    <xsd:attribute type="xsd:boolean" name="verify"/>
+    <xsd:attribute type="xsd:string" name="simplefile"/>
+    <xsd:attribute type="xsd:string" name="multiarch"/>
+    <xsd:attribute type="xsd:string" name="srcs"/>
+    <xsd:attribute type="PackageTypeEnum" name="type"/>
+    <xsd:attribute type="xsd:string" name="bname"/>
+    <xsd:attribute name="pkg_checks" type="xsd:string"/>
+    <xsd:attribute name="verify_flags" type="xsd:string"/>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 </xsd:schema>
diff --git a/schemas/rules.xsd b/schemas/rules.xsd
index 5446f9a95..3d9870dfb 100644
--- a/schemas/rules.xsd
+++ b/schemas/rules.xsd
@@ -16,11 +16,11 @@
               schemaLocation="genshi.xsd"/>
 
   <xsd:complexType name='ActionType'>
-    <xsd:attribute type='ActionTimingEnum' name='timing' use='required'/>
-    <xsd:attribute type='ActionWhenEnum' name='when' use='required'/>
-    <xsd:attribute type='ActionStatusEnum' name='status' use='required'/>
-    <xsd:attribute type='xsd:string' name='name' use='required'/>
-    <xsd:attribute type='xsd:string' name='command' use='required'/>
+    <xsd:attribute type='ActionTimingEnum' name='timing'/>
+    <xsd:attribute type='ActionWhenEnum' name='when'/>
+    <xsd:attribute type='ActionStatusEnum' name='status'/>
+    <xsd:attribute type='xsd:string' name='name'/>
+    <xsd:attribute type='xsd:string' name='command'/>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
diff --git a/schemas/servicetype.xsd b/schemas/servicetype.xsd
index 07971a427..f88260c39 100644
--- a/schemas/servicetype.xsd
+++ b/schemas/servicetype.xsd
@@ -9,15 +9,16 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:include schemaLocation="types.xsd"/>
   <xsd:import namespace="http://genshi.edgewall.org/"
               schemaLocation="genshi.xsd"/>
 
-  <xsd:complexType name='ServiceType'>
-    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-      <xsd:element name='User'>
+  <xsd:complexType name="ServiceType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="User">
         <xsd:complexType>
-          <xsd:attribute name='address' type='xsd:string' use='required'/>
-          <xsd:attribute name='mask' type='xsd:string' use='required'/>
+          <xsd:attribute name="address" type="xsd:string" use="required"/>
+          <xsd:attribute name="mask" type="xsd:string" use="required"/>
         </xsd:complexType>
       </xsd:element>
       <xsd:element ref="py:def"/>
@@ -28,18 +29,18 @@
       <xsd:element ref="py:with"/>
       <xsd:element ref="py:replace"/>
     </xsd:choice>
-    <xsd:attribute name='name' type='xsd:string' use='required'/>
-    <xsd:attribute name='status' type='xsd:string' use='required'/>
-    <xsd:attribute name='type' type='xsd:string' use='required'/>
-    <xsd:attribute name='port' type='xsd:string'/>
-    <xsd:attribute name='protocol' type='xsd:string'/>
-    <xsd:attribute name='mode' type='xsd:string'/>
-    <xsd:attribute name='custom' type='xsd:string'/>
-    <xsd:attribute name='FMRI' type='xsd:string'/>
-    <xsd:attribute name='supervised' type='xsd:string'/>
-    <xsd:attribute name='sequence' type='xsd:string'/>
-    <xsd:attribute name='target' type='xsd:string'/>
-    <xsd:attribute name='parameters' type='xsd:string'/>
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="status" type="StatusEnum"/>
+    <xsd:attribute name="type" type="ServiceTypeEnum"/>
+    <xsd:attribute name="port" type="xsd:string"/>
+    <xsd:attribute name="protocol" type="xsd:string"/>
+    <xsd:attribute name="mode" type="xsd:string"/>
+    <xsd:attribute name="custom" type="xsd:string"/>
+    <xsd:attribute name="FMRI" type="xsd:string"/>
+    <xsd:attribute name="supervised" type="xsd:string"/>
+    <xsd:attribute name="sequence" type="xsd:string"/>
+    <xsd:attribute name="target" type="xsd:string"/>
+    <xsd:attribute name="parameters" type="xsd:string"/>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
diff --git a/schemas/types.xsd b/schemas/types.xsd
index 44d2d3df9..dde7a856b 100644
--- a/schemas/types.xsd
+++ b/schemas/types.xsd
@@ -39,6 +39,7 @@
     <xsd:restriction base='xsd:string'>
       <xsd:enumeration value='on'/>
       <xsd:enumeration value='off'/>
+      <xsd:enumeration value="ignore"/>
     </xsd:restriction>
   </xsd:simpleType>
 
@@ -64,4 +65,17 @@
     </xsd:restriction>
   </xsd:simpleType>
 
+  <xsd:simpleType name="ServiceTypeEnum">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="chkconfig"/>
+      <xsd:enumeration value="deb"/>
+      <xsd:enumeration value="rc-update"/>
+      <xsd:enumeration value="smf"/>
+      <xsd:enumeration value="upstart"/>
+      <xsd:enumeration value="systemd"/>
+      <xsd:enumeration value="launchd"/>
+      <xsd:enumeration value="freebsd"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
 </xsd:schema>