moving extension schemas out of /extension directory into same directory as prov.xsd and prov-core.xsd
authorStephan Zednik <zednis@rpi.edu>
Fri, 08 Mar 2013 13:36:42 -0700
changeset 5938 9a1985ebd1c2
parent 5937 1f2c928b169b
child 5939 a7620fc95e52
moving extension schemas out of /extension directory into same directory as prov.xsd and prov-core.xsd
xml/schema/extensions/prov-dictionary.xsd
xml/schema/extensions/prov-links.xsd
xml/schema/prov-dictionary.xsd
xml/schema/prov-links.xsd
xml/schema/prov.xsd
--- a/xml/schema/extensions/prov-dictionary.xsd	Fri Mar 08 19:22:48 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://www.w3.org/ns/prov#" xmlns:prov="http://www.w3.org/ns/prov#"
-	elementFormDefault="qualified">
-	
-	<xs:include schemaLocation="../prov-core.xsd" />	
-		
-	<!-- Dictionary -->
-	<xs:complexType name="Dictionary">
-		<xs:complexContent>
-			<xs:extension base="prov:Collection">
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	
-	<xs:element name="dictionary" type="prov:Dictionary" substitutionGroup="prov:internalElement" />
-	
-	<!-- Empty Dictionary -->
-	<xs:complexType name="EmptyDictionary">
-		<xs:complexContent>
-			<xs:extension base="prov:Dictionary">
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	
-	<xs:element name="emptyDictionary" type="prov:EmptyDictionary" substitutionGroup="prov:internalElement" />
-		
-	<!-- Key-Value Pair -->
-	<xs:complexType name="KeyValuePair">
-        <xs:sequence>
-    	  <xs:element name="entity" type="prov:IDRef" />
-    	  <xs:element name="key" type="xs:anySimpleType" />
-        </xs:sequence>
-	</xs:complexType>
-	
-	<!-- do we need to have this use the substitutionGroup? -->
-	<xs:element name="keyValuePair" type="prov:KeyValuePair" substitutionGroup="prov:internalElement"/>
-
-	<!-- Dictionary Membership -->
-	<xs:complexType name="DictionaryMembership">
-	  <xs:sequence>
-		<xs:element name="dictionary" type="prov:IDRef"/>
-		<xs:element name="keyValuePair" type="prov:KeyValuePair" maxOccurs="unbounded"/>
-	  </xs:sequence>
-	</xs:complexType>
-	
-	<xs:element name="hadDictionaryMember" type="prov:DictionaryMembership" substitutionGroup="prov:internalElement"/>
-
-	<!-- Insertion -->
-	<xs:complexType name="Insertion">
-	  <xs:sequence>
-		<xs:element name="newDictionary" type="prov:IDRef"/>
-		<xs:element name="oldDictionary" type="prov:IDRef"/>
-		<xs:element name="keyValuePair" type="prov:KeyValuePair" maxOccurs="unbounded"/>
-	  </xs:sequence>
-	</xs:complexType>
-	
-	<xs:element name="derivedByInsertionFrom" type="prov:Insertion" substitutionGroup="prov:internalElement"/>
-
-	<!-- Removal -->
-	<xs:complexType name="Removal">
-	  <xs:sequence>
-		<xs:element name="newDictionary" type="prov:IDRef"/>
-		<xs:element name="oldDictionary" type="prov:IDRef"/>
-		<xs:element name="key" type="xs:anySimpleType" maxOccurs="unbounded" />
-	  </xs:sequence>
-	</xs:complexType>
-	
-	<xs:element name="derivedByRemovalFrom" type="prov:Removal" substitutionGroup="prov:internalElement"/>
-
-</xs:schema>
--- a/xml/schema/extensions/prov-links.xsd	Fri Mar 08 19:22:48 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://www.w3.org/ns/prov#" xmlns:prov="http://www.w3.org/ns/prov#"
-	elementFormDefault="qualified">
-	
-	<xs:include schemaLocation="../prov-core.xsd" />
-	
-	<xs:complexType name="Mention">
-		<xs:sequence>
-			<xs:element name="specificEntity" type="prov:IDRef" />
-			<xs:element name="generalEntity" type="prov:IDRef" />
-			<xs:element name="bundle" type="prov:IDRef" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:element name="mentionOf" type="prov:Mention" substitutionGroup="prov:internalElement" />
-	
-</xs:schema>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml/schema/prov-dictionary.xsd	Fri Mar 08 13:36:42 2013 -0700
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.w3.org/ns/prov#" xmlns:prov="http://www.w3.org/ns/prov#"
+	elementFormDefault="qualified">
+	
+	<xs:include schemaLocation="../prov-core.xsd" />	
+		
+	<!-- Dictionary -->
+	<xs:complexType name="Dictionary">
+		<xs:complexContent>
+			<xs:extension base="prov:Collection">
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	
+	<xs:element name="dictionary" type="prov:Dictionary" substitutionGroup="prov:internalElement" />
+	
+	<!-- Empty Dictionary -->
+	<xs:complexType name="EmptyDictionary">
+		<xs:complexContent>
+			<xs:extension base="prov:Dictionary">
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	
+	<xs:element name="emptyDictionary" type="prov:EmptyDictionary" substitutionGroup="prov:internalElement" />
+		
+	<!-- Key-Value Pair -->
+	<xs:complexType name="KeyValuePair">
+        <xs:sequence>
+    	  <xs:element name="entity" type="prov:IDRef" />
+    	  <xs:element name="key" type="xs:anySimpleType" />
+        </xs:sequence>
+	</xs:complexType>
+	
+	<!-- do we need to have this use the substitutionGroup? -->
+	<xs:element name="keyValuePair" type="prov:KeyValuePair" substitutionGroup="prov:internalElement"/>
+
+	<!-- Dictionary Membership -->
+	<xs:complexType name="DictionaryMembership">
+	  <xs:sequence>
+		<xs:element name="dictionary" type="prov:IDRef"/>
+		<xs:element name="keyValuePair" type="prov:KeyValuePair" maxOccurs="unbounded"/>
+	  </xs:sequence>
+	</xs:complexType>
+	
+	<xs:element name="hadDictionaryMember" type="prov:DictionaryMembership" substitutionGroup="prov:internalElement"/>
+
+	<!-- Insertion -->
+	<xs:complexType name="Insertion">
+	  <xs:sequence>
+		<xs:element name="newDictionary" type="prov:IDRef"/>
+		<xs:element name="oldDictionary" type="prov:IDRef"/>
+		<xs:element name="keyValuePair" type="prov:KeyValuePair" maxOccurs="unbounded"/>
+	  </xs:sequence>
+	</xs:complexType>
+	
+	<xs:element name="derivedByInsertionFrom" type="prov:Insertion" substitutionGroup="prov:internalElement"/>
+
+	<!-- Removal -->
+	<xs:complexType name="Removal">
+	  <xs:sequence>
+		<xs:element name="newDictionary" type="prov:IDRef"/>
+		<xs:element name="oldDictionary" type="prov:IDRef"/>
+		<xs:element name="key" type="xs:anySimpleType" maxOccurs="unbounded" />
+	  </xs:sequence>
+	</xs:complexType>
+	
+	<xs:element name="derivedByRemovalFrom" type="prov:Removal" substitutionGroup="prov:internalElement"/>
+
+</xs:schema>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml/schema/prov-links.xsd	Fri Mar 08 13:36:42 2013 -0700
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.w3.org/ns/prov#" xmlns:prov="http://www.w3.org/ns/prov#"
+	elementFormDefault="qualified">
+	
+	<xs:include schemaLocation="../prov-core.xsd" />
+	
+	<xs:complexType name="Mention">
+		<xs:sequence>
+			<xs:element name="specificEntity" type="prov:IDRef" />
+			<xs:element name="generalEntity" type="prov:IDRef" />
+			<xs:element name="bundle" type="prov:IDRef" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<xs:element name="mentionOf" type="prov:Mention" substitutionGroup="prov:internalElement" />
+	
+</xs:schema>
\ No newline at end of file
--- a/xml/schema/prov.xsd	Fri Mar 08 19:22:48 2013 +0100
+++ b/xml/schema/prov.xsd	Fri Mar 08 13:36:42 2013 -0700
@@ -6,7 +6,7 @@
            attributeFormDefault="unqualified">
 
 	<xs:include schemaLocation="prov-core.xsd"/>
-	<xs:include schemaLocation="extensions/prov-dictionary.xsd"/>
-	<xs:include schemaLocation="extensions/prov-links.xsd"/>
+	<xs:include schemaLocation="prov-dictionary.xsd"/>
+	<xs:include schemaLocation="prov-links.xsd"/>
 
 </xs:schema>