CSPACE-12,CSPACE-13: Renamed collectionObjects to collectionObjectsList, per Richard...

diff --git a/sandbox/aron/schema/collectionObjects.rng b/sandbox/aron/schema/collectionObjectList.rng
similarity index 97%
rename from sandbox/aron/schema/collectionObjects.rng
rename to sandbox/aron/schema/collectionObjectList.rng
index 2df8c8a2316a87882222143417085cdce4e7bbfb..a9491766ad5c75845849c13937e01172e051b4f6 100644 (file)
--- a/sandbox/aron/schema/collectionObjects.rng
+++ b/sandbox/aron/schema/collectionObjectList.rng
@@ -2,7 +2,7 @@
 
 <!--
 
-  collectionObjects.rng
+  collectionObjectList.rng
   
   A schema defining the structure of an CollectionObject collection
   (list of multiple CollectionObjects).
@@ -29,7 +29,7 @@
 -->
 
 <element
-  name="collectionObjects"
+  name="collectionObjectList"
   ns="http://collectionspace.org/hello"
   xmlns="http://relaxng.org/ns/structure/1.0"
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">

diff --git a/sandbox/aron/schema/collectionObjects.xml b/sandbox/aron/schema/collectionObjectList.xml
similarity index 76%
rename from sandbox/aron/schema/collectionObjects.xml
rename to sandbox/aron/schema/collectionObjectList.xml
index 3c77ddca0cb1a548a33dd850ce97cd0bbd5157e6..a006b5ba8b8fedf33c1710653852997564068fd2 100644 (file)
--- a/sandbox/aron/schema/collectionObjects.xml
+++ b/sandbox/aron/schema/collectionObjectList.xml
@@ -2,13 +2,13 @@
 
 <!--
 
-  collectionObjects.xml
+  collectionObjectList.xml
 
   A hypothetical, skeletal instance of an CollectionObjects list payload,
   represented as an XML document, in a rudimentary root namespace,
   scoped for the Release 0.1 "Hello World" demo.
   
-  This is  created for the CollectionSpace system, http://www.collectionspace.org/
+  This was created for the CollectionSpace system, http://www.collectionspace.org/
 
   $Author: aron $
   $Revision: 509 $
@@ -16,21 +16,21 @@
 
 -->
 
-<collectionObjects
+<collectionObjectList
   xmlns="http://collectionspace.org/hello">
 
   <collectionObjectListItem>
-    <collectionSpaceId>org.collectionspace.797220effa5fa160</collectionSpaceId>
+    <collectionSpaceId>org.collectionspace:797220effa5fa160</collectionSpaceId>
     <objectNumber>1984.021.0049</objectNumber>
     <objectName>Radio News, vol. 10, no. 2, August 1928</objectName>
     <uri>/collectionObjects/1984.021.0049</uri>
   </collectionObjectListItem>
 
   <collectionObjectListItem>
-    <collectionSpaceId>org.collectionspace.68ac7dc8f9e743</collectionSpaceId>
+    <collectionSpaceId>org.collectionspace:68ac7dc8f9e743</collectionSpaceId>
     <objectNumber>1997.005.0437</objectNumber>
     <objectName>Toy, Gotham City Police Helicopter, 1992</objectName>
     <uri>/collectionObjects/1997.005.0437</uri>
   </collectionObjectListItem>
   
-</collectionObjects>
+</collectionObjectList>

diff --git a/sandbox/aron/schema/collectionObjectList.xsd b/sandbox/aron/schema/collectionObjectList.xsd
new file mode 100644 (file)
index 0000000..5034a91
--- /dev/null
+++ b/sandbox/aron/schema/collectionObjectList.xsd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://collectionspace.org/hello" xmlns:hello="http://collectionspace.org/hello">
+  <xs:element name="collectionObjectList">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="hello:collectionObjectListItem"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="collectionObjectListItem">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="hello:collectionSpaceId"/>
+        <xs:element ref="hello:objectNumber"/>
+        <xs:element ref="hello:objectName"/>
+        <xs:element ref="hello:uri"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="collectionSpaceId" type="xs:string"/>
+  <xs:element name="objectNumber">
+    <xs:simpleType>
+      <xs:restriction base="xs:normalizedString">
+        <xs:minLength value="1"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+  <xs:element name="objectName">
+    <xs:simpleType>
+      <xs:union memberTypes="xs:string">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:length value="0"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:union>
+    </xs:simpleType>
+  </xs:element>
+  <xs:element name="uri" type="xs:anyURI"/>
+</xs:schema>

diff --git a/sandbox/aron/schema/hello.xsd b/sandbox/aron/schema/hello.xsd
index f25188f447801342083182077663c2adca59c5e2..0e213c86ab680ab81e04c9357b6171127b47cf24 100644 (file)
--- a/sandbox/aron/schema/hello.xsd
+++ b/sandbox/aron/schema/hello.xsd
@@ -188,7 +188,7 @@
     </xs:simpleType>
   </xs:element>
 
-  <xs:element name="collectionObjects">
+  <xs:element name="collectionObjectList">
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" maxOccurs="unbounded" ref="collectionObjectListItem"/>