2006/unicorn/WebContent/WEB-INF/resources/schemas test.xml,1.2,1.3 observer-response2.xsd,1.3,1.4

Update of /sources/public/2006/unicorn/WebContent/WEB-INF/resources/schemas
In directory hutz:/tmp/cvs-serv30370/WebContent/WEB-INF/resources/schemas

Modified Files:
	test.xml observer-response2.xsd 
Log Message:
docUri and date are now attributes of observationresponse 
+ changed namespace

Index: test.xml
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/schemas/test.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test.xml	14 Oct 2009 17:32:05 -0000	1.2
+++ test.xml	15 Oct 2009 11:33:34 -0000	1.3
@@ -1,13 +1,10 @@
 <?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">
-
-	<docURI>http://doc.uri</docURI>
-	<date>2009-10-14</date> <!-- Valeurs: YYYY-MM-DD -->
+      xsi:schemaLocation="http://www.w3.org/unicorn/2009/10/observationresponse ./observer-response2.xsd"
+      ref="http://doc.uri" date="2009-10-14">
 
-	<status>failed</status> <!-- Valeurs: failed|passed|undef -->
-	<rating>50</rating>     <!-- Optional - Valeurs: int 0-100 -->
+	<status value="failed" rating="50"/>
 	
 	<group name="group1">
 		<title>minimal group</title>
@@ -16,7 +13,9 @@
 	<group name="group2" parent="group1">
 		<title>child group</title>
 		<description>
+		    sdf
 			<h1 id="id" class="class">title</h1>
+			dd
 			<h2></h2>
 			<h3></h3>
 			

Index: observer-response2.xsd
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/schemas/observer-response2.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- observer-response2.xsd	14 Oct 2009 17:30:14 -0000	1.3
+++ observer-response2.xsd	15 Oct 2009 11:33:34 -0000	1.4
@@ -1,9 +1,9 @@
 <?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"
 		schemaLocation="http://www.w3.org/2001/xml.xsd"/>
@@ -32,13 +32,19 @@
 			<xs:pattern value="error|warning|info"/>
 		</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>
 			<xs:group ref="description.group" minOccurs="0" maxOccurs="unbounded"/>
@@ -88,22 +94,15 @@
 	<xs:element name="observationresponse">	
 		<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>
 			<xs:element name="list" type="list.type"/>

Received on Thursday, 15 October 2009 11:33:40 UTC