merge again
authorStian Soiland-Reyes <soiland-reyes@cs.manchester.ac.uk>
Thu, 27 Sep 2012 16:38:48 +0100
changeset 4495 41db26a2bdcf
parent 4494 d394d905b33b (current diff)
parent 4490 cb1e74b9ec29 (diff)
child 4496 02c8db35e04a
merge again
--- a/examples/eg-40-xml-examples-by-term/xml/Invalidation.xml	Thu Sep 27 16:38:02 2012 +0100
+++ b/examples/eg-40-xml-examples-by-term/xml/Invalidation.xml	Thu Sep 27 16:38:48 2012 +0100
@@ -33,10 +33,10 @@
   <prov:entity prov:id="bbc:uk-17595024"/>
 
 
-  <prov:collectionMemberOf>
+  <prov:hadMember>
     <prov:collection prov:ref="bbc:uk-17595024"/>
-    <prov:member prov:ref="ex:bbcNews2012-04-03"/>
-  </prov:collectionMemberOf>
+    <prov:entity prov:ref="ex:bbcNews2012-04-03"/>
+  </prov:hadMember>
 
   <prov:wasGeneratedBy>
     <prov:entity prov:ref="ex:bbcNews2012-04-03"/>
--- a/examples/eg-40-xml-examples-by-term/xml/Membership.xml	Thu Sep 27 16:38:02 2012 +0100
+++ b/examples/eg-40-xml-examples-by-term/xml/Membership.xml	Thu Sep 27 16:38:48 2012 +0100
@@ -13,11 +13,11 @@
     <prov:type>prov:Collection</prov:type>
   </prov:entity>
 
-  <prov:collectionMemberOf>
+  <prov:hadMember>
     <prov:collection prov:ref="c"/>
-    <prov:member prov:ref="e0"/>
-    <prov:member prov:ref="e1"/>
-    <prov:member prov:ref="e2"/>
-  </prov:collectionMemberOf>
+    <prov:entity prov:ref="e0"/>
+    <prov:entity prov:ref="e1"/>
+    <prov:entity prov:ref="e2"/>
+  </prov:hadMember>
 
 </prov:document>
--- a/xml/schema/prov.xsd	Thu Sep 27 16:38:02 2012 +0100
+++ b/xml/schema/prov.xsd	Thu Sep 27 16:38:48 2012 +0100
@@ -271,11 +271,11 @@
   
   <!-- Component 6 -->
 
-  <xs:complexType name="CollectionMemberOf">
+  <xs:complexType name="Membership">
     <xs:sequence>
       <xs:element name="collection"          type="prov:EntityRef"/>
       <xs:element name="complete"        type="xs:boolean" minOccurs="0"/>
-      <xs:element name="member"          type="prov:EntityRef" maxOccurs="unbounded"/>
+      <xs:element name="entity"          type="prov:EntityRef" maxOccurs="unbounded"/>
     </xs:sequence>
     <xs:attribute ref="prov:id"/>
   </xs:complexType>
@@ -351,7 +351,7 @@
         <xs:element name="alternateOf"          type="prov:AlternateOf"/>
         <xs:element name="mentionOf"            type="prov:MentionOf"/>
 
-        <xs:element name="collectionMemberOf"   type="prov:CollectionMemberOf"/>
+        <xs:element name="hadMember"   type="prov:Membership"/>
 
 		<xs:any namespace="##other"/>
       </xs:choice>