revise xml schema(xsd)

diff --git a/schema/tizen_action_rule.xsd b/schema/tizen_action_rule.xsd
index 62ae242bceadf5ff01dbc60fe6edd7762d0fc60b..ee629c5bb810981a1fc8fde75505d0723267a299 100644 (file)
--- a/schema/tizen_action_rule.xsd
+++ b/schema/tizen_action_rule.xsd
@@ -13,7 +13,7 @@
                     <xs:element minOccurs="0" maxOccurs="unbounded" name="alias">
                       <xs:complexType>
                         <xs:simpleContent>
-                          <xs:extension base="xs:string">
+                          <xs:extension base="o:valueT">
                             <xs:attribute name="name" type="xs:string" use="required" />
                           </xs:extension>
                         </xs:simpleContent>
@@ -21,42 +21,10 @@
                     </xs:element>
                     <xs:element minOccurs="0" name="conflict" type="xs:string" />
                     <xs:element name="desc" type="xs:string" />
-                    <xs:element name="domain">
-                      <xs:simpleType>
-                        <xs:restriction base="xs:string">
-                          <xs:enumeration value="App Framework"/>
-                          <xs:enumeration value="Applications"/>
-                          <xs:enumeration value="Broadcasting"/>
-                          <xs:enumeration value="Documents"/>
-                          <xs:enumeration value="Dotnet"/>
-                          <xs:enumeration value="Graphics System"/>
-                          <xs:enumeration value="Machine Learning"/>
-                          <xs:enumeration value="Multimedia"/>
-                          <xs:enumeration value="Network &amp; Connectivity"/>
-                          <xs:enumeration value="SCM"/>
-                          <xs:enumeration value="SDK"/>
-                          <xs:enumeration value="Security"/>
-                          <xs:enumeration value="Service Framework"/>
-                          <xs:enumeration value="System"/>
-                          <xs:enumeration value="Testing"/>
-                          <xs:enumeration value="TinyAra"/>
-                          <xs:enumeration value="UI Framework"/>
-                          <xs:enumeration value="Web Framework"/>
-                        </xs:restriction>
-                      </xs:simpleType>
-                    </xs:element>
+                    <xs:element name="domain" type="o:domainT" />
                   </xs:sequence>
                   <xs:attribute name="name" type="xs:string" use="required" />
-                  <xs:attribute name="type" use="required">
-                    <xs:simpleType>
-                      <xs:restriction base="xs:string">
-                        <xs:enumeration value="int"/>
-                        <xs:enumeration value="float"/>
-                        <xs:enumeration value="bool"/>
-                        <xs:enumeration value="string"/>
-                      </xs:restriction>
-                    </xs:simpleType>
-                  </xs:attribute>
+                  <xs:attribute name="type" type="o:basicTypeT" use="required" />
                   <xs:attribute name="since" type="o:versionT" use="required" />
                   <xs:attribute name="plugin" type="xs:string" use="required" />
                 </xs:complexType>
@@ -68,4 +36,34 @@
       <xs:attribute name="version" type="o:versionT" use="required" />
     </xs:complexType>
   </xs:element>
+  <xs:simpleType name="domainT">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="App Framework"/>
+      <xs:enumeration value="Applications"/>
+      <xs:enumeration value="Broadcasting"/>
+      <xs:enumeration value="Documents"/>
+      <xs:enumeration value="Dotnet"/>
+      <xs:enumeration value="Graphics System"/>
+      <xs:enumeration value="Machine Learning"/>
+      <xs:enumeration value="Multimedia"/>
+      <xs:enumeration value="Network &amp; Connectivity"/>
+      <xs:enumeration value="SCM"/>
+      <xs:enumeration value="SDK"/>
+      <xs:enumeration value="Security"/>
+      <xs:enumeration value="Service Framework"/>
+      <xs:enumeration value="System"/>
+      <xs:enumeration value="Testing"/>
+      <xs:enumeration value="TinyAra"/>
+      <xs:enumeration value="UI Framework"/>
+      <xs:enumeration value="Web Framework"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="basicTypeT">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="int"/>
+      <xs:enumeration value="float"/>
+      <xs:enumeration value="bool"/>
+      <xs:enumeration value="string"/>
+    </xs:restriction>
+  </xs:simpleType>
 </xs:schema>

diff --git a/schema/tizen_mode.xsd b/schema/tizen_mode.xsd
index 528e93d8d9a02e67a5a13c8c0fdbe6bdd7e1520b..c05f2b0fb4931ff338653fac2ab319916e9be6e4 100644 (file)
--- a/schema/tizen_mode.xsd
+++ b/schema/tizen_mode.xsd
@@ -7,39 +7,12 @@
         <xs:element name="mode">
           <xs:complexType>
             <xs:sequence>
-              <xs:element maxOccurs="unbounded" name="action">
-                <xs:complexType>
-                  <xs:simpleContent>
-                    <xs:extension base="o:actionT"/>
-                  </xs:simpleContent>
-                </xs:complexType>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="unbounded" name="undo">
-                <xs:complexType>
-                  <xs:simpleContent>
-                    <xs:extension base="o:actionT"/>
-                  </xs:simpleContent>
-                </xs:complexType>
-              </xs:element>
+              <xs:element maxOccurs="unbounded" name="action" type="o:actionT" />
+              <xs:element minOccurs="0" maxOccurs="unbounded" name="undo" type="o:actionT" />
             </xs:sequence>
             <xs:attribute name="name" type="xs:string" use="required" />
-            <xs:attribute name="type" use="required">
-              <xs:simpleType>
-                <xs:restriction base="xs:string">
-                  <xs:enumeration value="normal"/>
-                  <xs:enumeration value="oneshot"/>
-                  <xs:enumeration value="exclusive"/>
-                </xs:restriction>
-              </xs:simpleType>
-            </xs:attribute>
-            <xs:attribute name="custom" use="optional" default="no">
-              <xs:simpleType>
-                <xs:restriction base="xs:string">
-                  <xs:enumeration value="yes"/>
-                  <xs:enumeration value="no"/>
-                </xs:restriction>
-              </xs:simpleType>
-            </xs:attribute>
+            <xs:attribute name="type" type="o:modeTypeT" use="required" />
+            <xs:attribute name="custom" type="xs:boolean" use="optional" default="false" />
           </xs:complexType>
         </xs:element>
       </xs:sequence>
@@ -66,9 +39,11 @@
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
-  <xs:simpleType name="valueT">
+  <xs:simpleType name="modeTypeT">
     <xs:restriction base="xs:string">
-      <xs:pattern value="\S*"/>
+      <xs:enumeration value="normal"/>
+      <xs:enumeration value="oneshot"/>
+      <xs:enumeration value="exclusive"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>

diff --git a/schema/tizen_modes_base.xsd b/schema/tizen_modes_base.xsd
index aa18640e9e641ee883ef7f79350d1071be20e19e..b1b1a528760b7ab3bd7859f1ceb440e301ddca37 100644 (file)
--- a/schema/tizen_modes_base.xsd
+++ b/schema/tizen_modes_base.xsd
@@ -6,4 +6,9 @@
       <xs:enumeration value="7.0"/>
     </xs:restriction>
   </xs:simpleType>
+  <xs:simpleType name="valueT">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="\S(.*\S)?"/>
+    </xs:restriction>
+  </xs:simpleType>
 </xs:schema>