From 42e619c585de45e5e4e16ae3746efb7db9f90b1e Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 5 Jun 2012 17:34:29 -0400
Subject: re-rationalized service modes to make them more consistent and
 granular

---
 schemas/servicetype.xsd | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'schemas/servicetype.xsd')

diff --git a/schemas/servicetype.xsd b/schemas/servicetype.xsd
index af5bc64a6..4cab3716c 100644
--- a/schemas/servicetype.xsd
+++ b/schemas/servicetype.xsd
@@ -12,6 +12,16 @@
   <xsd:import namespace="http://genshi.edgewall.org/"
               schemaLocation="genshi.xsd"/>
 
+  <xsd:simpleType name='RestartEnum'>
+    <xsd:restriction base='xsd:boolean'>
+      <xsd:enumeration value='true'/>
+      <xsd:enumeration value='false'/>
+      <xsd:enumeration value='1'/>
+      <xsd:enumeration value='0'/>
+      <xsd:enumeration value='interactive'/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
   <xsd:complexType name="ServiceType">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="User">
@@ -24,13 +34,13 @@
     </xsd:choice>
     <xsd:attribute name="name" type="xsd:string" use="required"/>
     <xsd:attribute name="status" type="StatusEnum"/>
+    <xsd:attribute name="restart" type="RestartEnum"/>
+    <xsd:attribute name="install" type="xsd:boolean"/>
     <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"/>
-- 
cgit v1.2.3-1-g7c22