Changeset 784:67c4056bdcba

Timestamp:

10/15/09 11:33:34 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@785

Message:

docUri and date are now attributes of observationresponse
+ changed namespace

Location:

WebContent/WEB-INF/resources/schemas

Files:

• observer-response2.xsd (modified) (3 diffs)
• test.xml (modified) (2 diffs)

WebContent/WEB-INF/resources/schemas/observer-response2.xsd

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema
+        xmlns="http://www.w3.org/unicorn/2009/10/observationresponse"
         xmlns:xs="http://www.w3.org/2001/XMLSchema"
-        elementFormDefault="qualified"
-        targetNamespace="http://www.w3.org/unicorn/observationresponse"
-        xmlns="http://www.w3.org/unicorn/observationresponse">
+        targetNamespace="http://www.w3.org/unicorn/2009/10/observationresponse"
+        elementFormDefault="qualified">
         <xs:import
                 namespace="http://www.w3.org/XML/1998/namespace"
@@ -33 +33 @@
                 </xs:restriction>
         </xs:simpleType>
-        <xs:simpleType name="status.type">
-                <xs:restriction base="xs:token">
-                        <xs:pattern value="passed|failed|undef"/>
-                </xs:restriction>
-        </xs:simpleType>
 
         <!-- Complex Types -->
+        <xs:complexType name="status.type">
+                <xs:attribute name="value">
+                        <xs:simpleType>
+                                <xs:restriction base="xs:token">
+                                        <xs:pattern value="passed|failed|undef"/>
+                                </xs:restriction>
+                        </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="rating" type="percent.type"/>
+        </xs:complexType>
+        
         <xs:complexType mixed="true" name="description.type">
                 <xs:sequence>
@@ -89 +95 @@
                 <xs:complexType>
                         <xs:sequence>
-                                <xs:group ref="meta"/>
+                                <xs:element name="status" type="status.type" minOccurs="0"/>
                                 <xs:group ref="messages" maxOccurs="unbounded"/>
                         </xs:sequence>
+                        <xs:attribute name="ref" use="required"/>
+                        <xs:attribute name="date"/>
                 </xs:complexType>
         </xs:element>
         
         <!-- Groups -->
-        <xs:group name="meta">
-                <xs:sequence>
-                        <xs:element name="docURI" type="xs:anyURI"/>
-                        <xs:element name="date" type="xs:date" minOccurs="0"/>
-                        <xs:element name="status" type="status.type"/>
-                        <xs:element name="rating" type="percent.type" minOccurs="0"/>
-                </xs:sequence>
-        </xs:group>
-        
         <xs:group name="messages">
                 <xs:choice>

WebContent/WEB-INF/resources/schemas/test.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<observationresponse xmlns="http://www.w3.org/unicorn/observationresponse"
+<observationresponse xmlns="http://www.w3.org/unicorn/2009/10/observationresponse"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.w3.org/unicorn/observationresponse ./observer-response2.xsd">
+      xsi:schemaLocation="http://www.w3.org/unicorn/2009/10/observationresponse ./observer-response2.xsd"
+      ref="http://doc.uri" date="2009-10-14">
 
-        <docURI>http://doc.uri</docURI>
-        <date>2009-10-14</date> <!-- Valeurs: YYYY-MM-DD -->
-
-        <status>failed</status> <!-- Valeurs: failed|passed|undef -->
-        <rating>50</rating>     <!-- Optional - Valeurs: int 0-100 -->
+        <status value="failed" rating="50"/>
         
         <group name="group1">
@@ -17 +14 @@
                 <title>child group</title>
                 <description>
+                    sdf
                         <h1 id="id" class="class">title</h1>
+                        dd
                         <h2></h2>
                         <h3></h3>