david: doc/kolab-formats/validation/tests event1.xml, 1.1, 1.2 event2.xml, 1.1, 1.2 event3.xml, 1.1, 1.2 event4.xml, 1.1, 1.2 event5.xml, 1.1, 1.2 event6.xml, 1.1, 1.2 event7.xml, 1.1, 1.2 journal1.xml, 1.1, 1.2 task1.xml, 1.1, 1.2

cvs at intevation.de cvs at intevation.de
Wed Jun 16 14:41:44 CEST 2004


Author: david

Update of /kolabrepository/doc/kolab-formats/validation/tests
In directory doto:/tmp/cvs-serv8459/tests

Modified Files:
	event1.xml event2.xml event3.xml event4.xml event5.xml 
	event6.xml event7.xml journal1.xml task1.xml 
Log Message:
Updated RelaxNG specification from Bo's mail. In particular, I made version and uid
mandatory, and used <smtp-address> (with a regexp) instead of <email>.


Index: event1.xml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/validation/tests/event1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- event1.xml	15 Jun 2004 21:11:29 -0000	1.1
+++ event1.xml	16 Jun 2004 12:41:41 -0000	1.2
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
-<event>
+<event version="1.1">
 	<body>My event</body>
 	<uid>someuid</uid>
 	<categories>foobar,barfoo</categories>
 	<organizer>
 		<display-name>David Faure</display-name>
+		<smtp-address>faure at kde.org</smtp-address>
 	</organizer>
 	<start-date>2004-06-15T14:45:00</start-date>
 	<creation-date>2004-06-15T14:45:00</creation-date>

Index: event2.xml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/validation/tests/event2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- event2.xml	15 Jun 2004 21:11:29 -0000	1.1
+++ event2.xml	16 Jun 2004 12:41:41 -0000	1.2
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<event>
+<event version="3.14">
+	<uid>uid</uid>
 	<start-date>2004-06-15T14:45:00</start-date>
 	<creation-date>2004-06-15T14:45:00</creation-date>
 	<last-modification-date>2004-06-15T14:45:00</last-modification-date>

Index: event3.xml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/validation/tests/event3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- event3.xml	15 Jun 2004 21:11:29 -0000	1.1
+++ event3.xml	16 Jun 2004 12:41:41 -0000	1.2
@@ -1,13 +1,14 @@
 <?xml version="1.0"?>
-<event>
+<event version="1.2">
 	<start-date>2004-06-15T14:45:00</start-date>
 	<creation-date>2004-06-15T14:45:00</creation-date>
+	<uid>asodfuasfd</uid>
 	<last-modification-date>2004-06-15T14:45:00</last-modification-date>
         <recurrence cycle="weekly">
           <interval>3</interval>
           <day>monday</day>
           <day>thursday</day>
           <range type="number">5</range>
-          <exception>2005-05-04</exception>
+          <exclusion>2005-05-04</exclusion>
         </recurrence>
 </event>

Index: event4.xml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/validation/tests/event4.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- event4.xml	15 Jun 2004 21:11:29 -0000	1.1
+++ event4.xml	16 Jun 2004 12:41:41 -0000	1.2
@@ -1,11 +1,17 @@
 <?xml version="1.0"?>
-<event>
-	<start-date>2004-06-15T14:45:00</start-date>
-	<creation-date>2004-06-15T14:45:00</creation-date>
-	<last-modification-date>2004-06-15T14:45:00</last-modification-date>
+<event version="1.4">
+        <start-date>2004-06-15T14:45:00</start-date>
+        <creation-date>2004-06-15T14:45:00</creation-date>
+        <uid>asodufaosdf</uid>
+	<organizer>
+		<smtp-address>faure123 at kde.org</smtp-address>
+	</organizer>
+        <last-modification-date>2004-06-15T14:45:00</last-modification-date>
         <recurrence cycle="monthly" type="daynumber">
           <interval>2</interval>
           <date>3</date>
           <range type="date">2006-06-01</range>
         </recurrence>
+	<attachment>foobar</attachment>
+	<attachment>.</attachment>
 </event>

Index: event5.xml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/validation/tests/event5.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- event5.xml	15 Jun 2004 21:11:29 -0000	1.1
+++ event5.xml	16 Jun 2004 12:41:41 -0000	1.2
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<event>
+<event version="3.3">
+	<uid>102934</uid>
 	<start-date>2004-06-15T14:45:00</start-date>
 	<creation-date>2004-06-15T14:45:00</creation-date>
 	<last-modification-date>2004-06-15T14:45:00</last-modification-date>
@@ -8,8 +9,8 @@
           <daynumber>2</daynumber>
           <day>thursday</day>
           <range type="none"/>
-          <exception>2005-12-12</exception>
-          <exception>2006-06-15</exception>
+          <exclusion>2005-12-12</exclusion>
+          <exclusion>2006-06-15</exclusion>
         </recurrence>
 </event>
 

Index: event6.xml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/validation/tests/event6.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- event6.xml	15 Jun 2004 21:11:29 -0000	1.1
+++ event6.xml	16 Jun 2004 12:41:41 -0000	1.2
@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
-<event>
+<event version="2.3">
 	<start-date>2004-06-15T14:45:00</start-date>
 	<creation-date>2004-06-15T14:45:00</creation-date>
+	<uid>208sf"P£(*$</uid>
 	<last-modification-date>2004-06-15T14:45:00</last-modification-date>
         <recurrence cycle="yearly" type="monthday">
           <interval>1</interval>
           <date>4</date>
-	  <month>6</month> <!---OK?-->
+          <month>june</month>
           <range type="date">2005-12-31</range>
         </recurrence>
 </event>

Index: event7.xml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/validation/tests/event7.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- event7.xml	15 Jun 2004 21:11:29 -0000	1.1
+++ event7.xml	16 Jun 2004 12:41:41 -0000	1.2
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
-<event>
+<event version="1.0">
 	<start-date>2004-06-15T14:45:00</start-date>
+	<uid>ASDFUOASIUDF</uid>
 	<creation-date>2004-06-15T14:45:00</creation-date>
 	<last-modification-date>2004-06-15T14:45:00</last-modification-date>
         <recurrence cycle="yearly" type="yearday">

Index: journal1.xml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/validation/tests/journal1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- journal1.xml	15 Jun 2004 21:11:29 -0000	1.1
+++ journal1.xml	16 Jun 2004 12:41:41 -0000	1.2
@@ -5,7 +5,7 @@
 	<last-modification-date>2004-06-15T14:45:00</last-modification-date>
 	<contact>
 		<display-name>dn</display-name>
-		<email>email</email>
+		<smtp-address>email at email1234.org</smtp-address>
 	</contact>
 	<sensitivity>private</sensitivity>
 	<creation-date>2004-06-15T14:45:00</creation-date>

Index: task1.xml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/validation/tests/task1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- task1.xml	15 Jun 2004 21:11:29 -0000	1.1
+++ task1.xml	16 Jun 2004 12:41:41 -0000	1.2
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
-<task>
+<task version="33">
 	<start-date>2004-06-15T14:45:00</start-date>
 	<creation-date>2004-06-15T14:45:00</creation-date>
+	<uid>task</uid>
 	<last-modification-date>2004-06-15T14:45:00</last-modification-date>
 	<priority>5</priority>
 	<completed>100</completed>





More information about the commits mailing list