Merge branch 'BRANCH_EML_2_2' of https://github.com/NCEAS/eml into BR…

…ANCH_EML_2_2
NCEAS · Jul 3, 2018 · 675b5be · 675b5be
2 parents 394bb94 + c494365
commit 675b5be
Show file tree

Hide file tree

Showing 27 changed files with 413 additions and 261 deletions.
diff --git a/src/test/resources/citation-sbclter-bibliography.201.xml b/src/test/resources/citation-sbclter-bibliography.201.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.201.1"
          system="knb"
          scope="system">
@@ -37,4 +37,4 @@
          <pageRange>2029-2043</pageRange>
       </article>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.202.xml b/src/test/resources/citation-sbclter-bibliography.202.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.202.1"
          system="knb"
          scope="system">
@@ -43,4 +43,4 @@
          <pageRange>1995-2002</pageRange>
       </article>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.203.xml b/src/test/resources/citation-sbclter-bibliography.203.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.203.1"
          system="knb"
          scope="system">
@@ -43,4 +43,4 @@
          <pageRange>46-52</pageRange>
       </article>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.211.xml b/src/test/resources/citation-sbclter-bibliography.211.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.211.1"
          system="knb"
          scope="system">
@@ -83,4 +83,4 @@
          <totalPages>22</totalPages>
       </report>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.231.xml b/src/test/resources/citation-sbclter-bibliography.231.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.231.1"
          system="knb"
          scope="system">
@@ -25,4 +25,4 @@
          </conferenceLocation>
       </presentation>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.232.xml b/src/test/resources/citation-sbclter-bibliography.232.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.232.1"
          system="knb"
          scope="system">
@@ -32,4 +32,4 @@
          </conferenceLocation>
       </presentation>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.233.xml b/src/test/resources/citation-sbclter-bibliography.233.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.233.1"
          system="knb"
          scope="system">
@@ -24,4 +24,4 @@
          </conferenceLocation>
       </presentation>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.279.xml b/src/test/resources/citation-sbclter-bibliography.279.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.279.1"
          system="knb"
          scope="system">
@@ -37,4 +37,4 @@
          <totalPages>480</totalPages>
       </book>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.280.xml b/src/test/resources/citation-sbclter-bibliography.280.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.280.1"
          system="knb"
          scope="system">
@@ -27,4 +27,4 @@
          </institution>
       </thesis>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.284.xml b/src/test/resources/citation-sbclter-bibliography.284.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.284.1"
          system="knb"
          scope="system">
@@ -81,4 +81,4 @@
          </conferenceLocation>
       </conferenceProceedings>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.285.xml b/src/test/resources/citation-sbclter-bibliography.285.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.285.1"
          system="knb"
          scope="system">
@@ -76,4 +76,4 @@
          </conferenceLocation>
       </conferenceProceedings>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.289.xml b/src/test/resources/citation-sbclter-bibliography.289.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.289.1"
          system="knb"
          scope="system">
@@ -50,4 +50,4 @@
          <pageRange>LI2604</pageRange>
       </article>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.296.xml b/src/test/resources/citation-sbclter-bibliography.296.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.296.1"
          system="knb"
          scope="system">
@@ -78,4 +78,4 @@
                        lterAcknowledged="no"/>
       </metadata>
    </additionalMetadata>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.297.xml b/src/test/resources/citation-sbclter-bibliography.297.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.297.1"
          system="knb"
          scope="system">
@@ -37,4 +37,4 @@
          <totalPages>143</totalPages>
       </report>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.50.xml b/src/test/resources/citation-sbclter-bibliography.50.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.50.1"
          system="knb"
          scope="system">
@@ -37,4 +37,4 @@
          <publicationPlace>Tampa, FL </publicationPlace>
       </audioVisual>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/citation-sbclter-bibliography.51.xml b/src/test/resources/citation-sbclter-bibliography.51.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eml:eml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
-         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+         xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
+         xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
          packageId="sbclter-bibliography.51.1"
          system="knb"
          scope="system">
@@ -30,4 +30,4 @@
          <publicationPlace>Carpinteria, CA</publicationPlace>
       </audioVisual>
    </citation>
-</eml:eml>
+</eml:eml>
diff --git a/src/test/resources/eml-data-paper.xml b/src/test/resources/eml-data-paper.xml
@@ -149,10 +149,8 @@
       </temporalCoverage>
     </coverage>
     <annotation>
-        <propertyURI>http://purl.org/dc/elements/1.1/subject</propertyURI>
-        <propertyLabel>Subject</propertyLabel>
-        <valueURI>http://purl.obolibrary.org/obo/ENVO_01000177</valueURI>
-        <valueLabel>grassland biome</valueLabel>
+        <propertyURI label="Subject">http://purl.org/dc/elements/1.1/subject</propertyURI>
+        <valueURI label="grassland biome">http://purl.obolibrary.org/obo/ENVO_01000177</valueURI>
     </annotation>
     <purpose>
         <markdown>

diff --git a/src/test/resources/eml-sample.xml b/src/test/resources/eml-sample.xml
@@ -48,6 +48,13 @@
     <phone>208-236-2933</phone>
     <electronicMailAddress>inouye@lter.umn.edu</electronicMailAddress>
   </creator>
+  <creator id="adam.shepherd">
+    <individualName>
+      <salutation>Mr.</salutation>
+      <givenName>Adam</givenName>
+      <surName>Shepherd</surName>
+    </individualName>
+  </creator>
   <keywordSet>
     <keyword>Old field grassland</keyword>
     <keyword>biomass</keyword>
@@ -56,10 +63,8 @@
     <keyword>species richness</keyword>
   </keywordSet>
   <annotation>
-      <propertyURI>http://purl.org/dc/elements/1.1/subject</propertyURI>
-      <propertyLabel>Subject</propertyLabel>
-      <valueURI>http://purl.obolibrary.org/obo/ENVO_01000177</valueURI>
-      <valueLabel>grassland biome</valueLabel>
+      <propertyURI label="Subject">http://purl.org/dc/elements/1.1/subject</propertyURI>
+      <valueURI label="grassland biome">http://purl.obolibrary.org/obo/ENVO_01000177</valueURI>
   </annotation>
   <contact>
     <references>clarence.lehman</references>
@@ -84,7 +89,7 @@
           <awardUrl>https://www.nsf.gov/awardsearch/showAward?AWD_ID=1546024</awardUrl>
       </award>
   </project>
-  <dataTable id="xyz">
+  <dataTable id="CDR-biodiv-table">
     <entityName>CDR LTER-patterns among communities.txt</entityName>
     <entityDescription>patterns amoung communities at CDR</entityDescription>
     <physical>
@@ -301,22 +306,16 @@
           </ratio>
         </measurementScale>
         <annotation>
-            <propertyURI>http://ecoinformatics.org/oboe/oboe.1.2/oboe-core.owl#ofCharacteristic</propertyURI>
-            <propertyLabel>Characteristic</propertyLabel>
-            <valueURI>http://ecoinformatics.org/oboe/oboe.1.2/oboe-characteristics.owl#Mass</valueURI>
-            <valueLabel>Mass</valueLabel>
+            <propertyURI label="of characteristic">http://ecoinformatics.org/oboe/oboe.1.2/oboe-core.owl#ofCharacteristic</propertyURI>
+            <valueURI label="Mass">http://ecoinformatics.org/oboe/oboe.1.2/oboe-characteristics.owl#Mass</valueURI>
         </annotation>
         <annotation>
-            <propertyURI>http://ecoinformatics.org/oboe/oboe.1.2/oboe-core.owl#usesStandard</propertyURI>
-            <propertyLabel>unit</propertyLabel>
-            <valueURI>http://ecoinformatics.org/oboe/oboe.1.2/oboe-standards.owl#Kilogram</valueURI>
-            <valueLabel>Kilogram</valueLabel>
+            <propertyURI label="uses unit">http://ecoinformatics.org/oboe/oboe.1.2/oboe-core.owl#usesStandard</propertyURI>
+            <valueURI label="Kilogram">http://ecoinformatics.org/oboe/oboe.1.2/oboe-standards.owl#Kilogram</valueURI>
         </annotation>
         <annotation>
-            <propertyURI>http://ecoinformatics.org/oboe/oboe.1.2/oboe-core.owl#ofEntity</propertyURI>
-            <propertyLabel>entity</propertyLabel>
-            <valueURI>http://example.com/example-vocab-1.owl#PlantSample</valueURI>
-            <valueLabel>Plant Sample</valueLabel>
+            <propertyURI label="of entity">http://ecoinformatics.org/oboe/oboe.1.2/oboe-core.owl#ofEntity</propertyURI>
+            <valueURI label="Plant Sample">http://example.com/example-vocab-1.owl#PlantSample</valueURI>
         </annotation>
       </attribute>
       <attribute id="att.13">
@@ -362,6 +361,20 @@
     <numberOfRecords>22</numberOfRecords>
   </dataTable>
 </dataset>
+<annotations>
+    <annotation references="CDR-biodiv-table">
+        <propertyURI label="Subject">http://purl.org/dc/elements/1.1/subject</propertyURI>
+        <valueURI label="grassland biome">http://purl.obolibrary.org/obo/ENVO_01000177</valueURI>
+    </annotation>
+    <annotation references="adam.shepherd">
+        <propertyURI label="is a">http://www.w3.org/1999/02/22-rdf-syntax-ns#type</propertyURI>
+        <valueURI label="Person">https://schema.org/Person</valueURI>
+    </annotation>
+    <annotation references="adam.shepherd">
+        <propertyURI label="member of">https://schema.org/memberOf</propertyURI>
+        <valueURI label="BCO-DMO">https://doi.org/10.17616/R37P4C</valueURI>
+    </annotation>
+</annotations>
 <additionalMetadata>
 <metadata>
 <stmml:unitList xmlns:stmml="http://www.xml-cml.org/schema/stmml-1.1"
@@ -372,4 +385,13 @@
   </stmml:unitList>
   </metadata>
 </additionalMetadata>
+<additionalMetadata>
+    <describes>adam.shepherd</describes>
+    <metadata>
+        <annotation>
+            <propertyURI label="member of">https://schema.org/memberOf</propertyURI>
+            <valueURI label="BCO-DMO">https://doi.org/10.17616/R37P4C</valueURI>
+        </annotation>
+    </metadata>
+</additionalMetadata>
 </eml:eml>