diff --git a/buildDocBook.xsl b/buildDocBook.xsl
index 10fa9ecd..78293032 100644
--- a/buildDocBook.xsl
+++ b/buildDocBook.xsl
@@ -36,9 +36,9 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:doc="eml://ecoinformatics.org/documentation-2.2.0"
version="1.0">
-
-
-
+
diff --git a/sortDocBook.xsl b/sortDocBook.xsl
index 470b0393..28ec9eb0 100644
--- a/sortDocBook.xsl
+++ b/sortDocBook.xsl
@@ -35,8 +35,9 @@
-
-
+
diff --git a/src/main/java/org/ecoinformatics/eml/SAXValidate.java b/src/main/java/org/ecoinformatics/eml/SAXValidate.java
index fb2ed076..cf3a3b9f 100644
--- a/src/main/java/org/ecoinformatics/eml/SAXValidate.java
+++ b/src/main/java/org/ecoinformatics/eml/SAXValidate.java
@@ -179,8 +179,8 @@ private void runTest(Reader xml, String parserName, String schemaLocation, Strin
// Parse the document
parser.parse(new InputSource(xml));
}
-
-
+
+
/**
* Main method will be called by the script file rnEML parser
*/
@@ -203,9 +203,9 @@ public static void main(String[] args)
}
String emlfile = "";
- String schemaLocation ="eml://ecoinformatics.org/eml-2.1.1 ../eml.xsd "+
- "http://www.xml-cml.org/schema/stmml-1.1 ../stmml.xsd ";
-
+ String schemaLocation ="eml://ecoinformatics.org/eml-2.1.1 ../xsd/eml.xsd "+
+ "http://www.xml-cml.org/schema/stmml-1.1 ../xsd/stmml.xsd ";
+
if(args.length == 2)
{
emlfile = args[0];
@@ -221,13 +221,13 @@ else if(args.length == 1)
System.out.println("Usage: java org.ecoinformatics.eml.SAXValidate [schema location]");
System.out.println(" = the EML file to parse");
- System.out.println(" = use an alternate schema location. The default one is \"eml://ecoinformatics.org/eml-2.1.1 ../eml.xsd\"");
-
+ System.out.println(" = use an alternate schema location. The default one is \"eml://ecoinformatics.org/eml-2.1.1 ../xsd/eml.xsd\"");
+
System.exit(0);
}
-
+
String namespaceInDoc = null;
-
+
try{
//System.out.println("emlfile: " + emlfile + " schemaLocation: " + schemaLocation);
SAXValidate validator = new SAXValidate(true);
diff --git a/src/test/resources/eml-access.xml b/src/test/resources/eml-access.xml
index d4240196..78e95745 100644
--- a/src/test/resources/eml-access.xml
+++ b/src/test/resources/eml-access.xml
@@ -1,10 +1,9 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/access-2.2.0 xsd/eml-access.xsd">
uid=brooke,o=NCEAS,dc=ecoinformatics,dc=org
all
diff --git a/src/test/resources/eml-attribute.xml b/src/test/resources/eml-attribute.xml
index be652e67..a39b1f4d 100644
--- a/src/test/resources/eml-attribute.xml
+++ b/src/test/resources/eml-attribute.xml
@@ -1,9 +1,9 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/attribute-2.2.0
+ xsd/eml-attribute.xsd">
rain
Surface Rainfall
diff --git a/src/test/resources/eml-citationWithContact.xml b/src/test/resources/eml-citationWithContact.xml
index b24168b3..aad7fb36 100755
--- a/src/test/resources/eml-citationWithContact.xml
+++ b/src/test/resources/eml-citationWithContact.xml
@@ -1,5 +1,5 @@
-
+
289
10.1029/2005GL023017
diff --git a/src/test/resources/eml-citationWithContactReference.xml b/src/test/resources/eml-citationWithContactReference.xml
index 7a7e9f3f..b9400799 100755
--- a/src/test/resources/eml-citationWithContactReference.xml
+++ b/src/test/resources/eml-citationWithContactReference.xml
@@ -1,5 +1,5 @@
-
+
289
10.1029/2005GL023017
diff --git a/src/test/resources/eml-dataTable.xml b/src/test/resources/eml-dataTable.xml
index 88a3dbe3..327828da 100644
--- a/src/test/resources/eml-dataTable.xml
+++ b/src/test/resources/eml-dataTable.xml
@@ -1,10 +1,10 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/dataTable-2.2.0
+ xsd/eml-dataTable.xsd">
TEMPID234
Test Data
This is a test entity that is fake.
diff --git a/src/test/resources/eml-dataset.xml b/src/test/resources/eml-dataset.xml
index 4f7880de..d955f30c 100644
--- a/src/test/resources/eml-dataset.xml
+++ b/src/test/resources/eml-dataset.xml
@@ -1,9 +1,9 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/dataset-2.2.0
+ xsd/eml-dataset.xsd">
Sample datset Description
diff --git a/src/test/resources/eml-datasetGRing.xml b/src/test/resources/eml-datasetGRing.xml
index 8f204497..2ff85b11 100755
--- a/src/test/resources/eml-datasetGRing.xml
+++ b/src/test/resources/eml-datasetGRing.xml
@@ -1,6 +1,6 @@
-
+
A title dataset with bad gringpoints.
diff --git a/src/test/resources/eml-datasetGringpoint.xml b/src/test/resources/eml-datasetGringpoint.xml
index a481865a..a3b66150 100755
--- a/src/test/resources/eml-datasetGringpoint.xml
+++ b/src/test/resources/eml-datasetGringpoint.xml
@@ -1,6 +1,6 @@
-
+
A title dataset with bad gringpoints.
diff --git a/src/test/resources/eml-datasetMultipleDistribution.xml b/src/test/resources/eml-datasetMultipleDistribution.xml
index 71fae326..c674a2c8 100755
--- a/src/test/resources/eml-datasetMultipleDistribution.xml
+++ b/src/test/resources/eml-datasetMultipleDistribution.xml
@@ -1,6 +1,6 @@
-
+
Sample datset Description
diff --git a/src/test/resources/eml-datasetWhitespacePatterns.xml b/src/test/resources/eml-datasetWhitespacePatterns.xml
index 70e2bb4d..31b59590 100755
--- a/src/test/resources/eml-datasetWhitespacePatterns.xml
+++ b/src/test/resources/eml-datasetWhitespacePatterns.xml
@@ -1,6 +1,6 @@
-
+
A title:
diff --git a/src/test/resources/eml-datasetWithAccess.xml b/src/test/resources/eml-datasetWithAccess.xml
index 85862428..bea9a1b5 100755
--- a/src/test/resources/eml-datasetWithAccess.xml
+++ b/src/test/resources/eml-datasetWithAccess.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<eml:eml
packageId="eml.2111.1" system="knb"
- xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
+ xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 ../eml.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd">
<access authSystem="knb" order="allowFirst" id="brooke.124.1" scope="document">
<allow>
diff --git a/src/test/resources/eml-datasetWithAccessOverride.xml b/src/test/resources/eml-datasetWithAccessOverride.xml
index 5582e0e6..dc11210e 100755
--- a/src/test/resources/eml-datasetWithAccessOverride.xml
+++ b/src/test/resources/eml-datasetWithAccessOverride.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<eml:eml packageId="eml.2111.1" system="knb" xmlns:eml="eml://ecoinformatics.org/eml-2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 ../eml.xsd">
+<eml:eml packageId="eml.2111.1" system="knb" xmlns:eml="eml://ecoinformatics.org/eml-2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd">
<access authSystem="knb" order="allowFirst" id="brooke.124.2" scope="document">
<allow>
<principal>uid=brooke,o=NCEAS,dc=ecoinformatics,dc=org</principal>
diff --git a/src/test/resources/eml-datasetWithAccessUnitsLiteralLayout.xml b/src/test/resources/eml-datasetWithAccessUnitsLiteralLayout.xml
index da2b8e88..11b3a3c5 100755
--- a/src/test/resources/eml-datasetWithAccessUnitsLiteralLayout.xml
+++ b/src/test/resources/eml-datasetWithAccessUnitsLiteralLayout.xml
@@ -1,16 +1,16 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="foo.xsl"?>
-<eml:eml xmlns:ds="eml://ecoinformatics.org/dataset-2.1.1"
+<eml:eml xmlns:ds="eml://ecoinformatics.org/dataset-2.2.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
-xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
+xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:res="eml://ecoinformatics.org/resource-2.1.1"
-xmlns:doc="eml://ecoinformatics.org/documentation-2.1.1"
+xmlns:res="eml://ecoinformatics.org/resource-2.2.0"
+xmlns:doc="eml://ecoinformatics.org/documentation-2.2.0"
xmlns:stmml="http://www.xml-cml.org/schema/stmml"
-xmlns:sw="eml://ecoinformatics.org/software-2.1.1"
-xmlns:prot="eml://ecoinformatics.org/protocol-2.1.1"
-xmlns:cit="eml://ecoinformatics.org/literature-2.1.1"
-xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd"
+xmlns:sw="eml://ecoinformatics.org/software-2.2.0"
+xmlns:prot="eml://ecoinformatics.org/protocol-2.2.0"
+xmlns:cit="eml://ecoinformatics.org/literature-2.2.0"
+xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd"
packageId="knb-lter-cdr.958608.1" system="knb" scope="system">
<access scope="document" order="allowFirst" authSystem="knb">
diff --git a/src/test/resources/eml-datasetWithAttributelevelMethods.xml b/src/test/resources/eml-datasetWithAttributelevelMethods.xml
index 91e45d10..01894b4a 100755
--- a/src/test/resources/eml-datasetWithAttributelevelMethods.xml
+++ b/src/test/resources/eml-datasetWithAttributelevelMethods.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<eml:eml packageId="eml.1.1" system="knb" xmlns:eml="eml://ecoinformatics.org/eml-2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:stmml="http://www.xml-cml.org/schema/stmml-1.1" xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd">
+<eml:eml packageId="eml.1.1" system="knb" xmlns:eml="eml://ecoinformatics.org/eml-2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:stmml="http://www.xml-cml.org/schema/stmml-1.1" xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd">
<dataset>
<title>Data from Cedar Creek LTER on productivity and species richness
for use in a workshop titled "An Analysis of the Relationship between
diff --git a/src/test/resources/eml-datasetWithCitation.xml b/src/test/resources/eml-datasetWithCitation.xml
index 1ab27e0e..eac9ef61 100755
--- a/src/test/resources/eml-datasetWithCitation.xml
+++ b/src/test/resources/eml-datasetWithCitation.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<eml:eml packageId="eml.1.1" system="knb" xmlns:eml="eml://ecoinformatics.org/eml-2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:stmml="http://www.xml-cml.org/schema/stmml-1.1" xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd">
+<eml:eml packageId="eml.1.1" system="knb" xmlns:eml="eml://ecoinformatics.org/eml-2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:stmml="http://www.xml-cml.org/schema/stmml-1.1" xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd">
<dataset id="1555" scope="document">
<title>Data from Cedar Creek LTER on productivity and species richness
for use in a workshop titled "An Analysis of the Relationship between
@@ -335,8 +335,8 @@
1555
</describes>
<metadata>
- <cit:citation id="345" scope="document" xmlns:cit="eml://ecoinformatics.org/literature-2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="eml://ecoinformatics.org/literature-2.1.1
- eml-literature.xsd">
+ <cit:citation id="345" scope="document" xmlns:cit="eml://ecoinformatics.org/literature-2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="eml://ecoinformatics.org/literature-2.2.0
+ xsd/eml-literature.xsd">
<title>Measuring the effectiveness of EML in the field.
diff --git a/src/test/resources/eml-datasetWithNonwordCharacters.xml b/src/test/resources/eml-datasetWithNonwordCharacters.xml
index 180968ee..140bee86 100755
--- a/src/test/resources/eml-datasetWithNonwordCharacters.xml
+++ b/src/test/resources/eml-datasetWithNonwordCharacters.xml
@@ -1,5 +1,5 @@
-
+
Testing insert
diff --git a/src/test/resources/eml-datasetWithUnits.xml b/src/test/resources/eml-datasetWithUnits.xml
index 333e828c..410d7fa7 100644
--- a/src/test/resources/eml-datasetWithUnits.xml
+++ b/src/test/resources/eml-datasetWithUnits.xml
@@ -1,5 +1,5 @@
-
+
Data from Cedar Creek LTER on productivity and species richness
for use in a workshop titled "An Analysis of the Relationship between
diff --git a/src/test/resources/eml-entity.xml b/src/test/resources/eml-entity.xml
index 2f0c44e1..5068d4fb 100644
--- a/src/test/resources/eml-entity.xml
+++ b/src/test/resources/eml-entity.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<ent:otherEntity
- xmlns:ent="eml://ecoinformatics.org/entity-2.1.1"
+ xmlns:ent="eml://ecoinformatics.org/entity-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="eml://ecoinformatics.org/entity-2.1.1 eml-entity.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/entity-2.2.0 xsd/eml-entity.xsd">
<alternateIdentifier>TEMPID234</alternateIdentifier>
<entityName>Test Data</entityName>
diff --git a/src/test/resources/eml-i18n.xml b/src/test/resources/eml-i18n.xml
index 4cc2d96b..eff3d60e 100644
--- a/src/test/resources/eml-i18n.xml
+++ b/src/test/resources/eml-i18n.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
-<eml:eml xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
+<eml:eml xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
xmlns:stmml="http://www.xml-cml.org/schema/stmml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ds="eml://ecoinformatics.org/dataset-2.1.1"
+ xmlns:ds="eml://ecoinformatics.org/dataset-2.2.0"
xmlns:xml="http://www.w3.org/XML/1998/namespace"
packageId="knb-lter-sbc.14.9"
- scope="system" system="knb" xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd" xml:lang="en">
+ scope="system" system="knb" xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd" xml:lang="en">
<dataset scope="document">
<shortName>Historical Kelp Database</shortName>
<title xml:lang="es">
@@ -579,4 +579,4 @@
<caseSensitive>no</caseSensitive>
</dataTable>
</dataset>
-</eml:eml>
\ No newline at end of file
+</eml:eml>
diff --git a/src/test/resources/eml-inline.xml b/src/test/resources/eml-inline.xml
index a0bd6c20..eda291a5 100644
--- a/src/test/resources/eml-inline.xml
+++ b/src/test/resources/eml-inline.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<phys:physical
- xmlns:phys="eml://ecoinformatics.org/physical-2.1.1"
+ xmlns:phys="eml://ecoinformatics.org/physical-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="eml://ecoinformatics.org/physical-2.1.1 eml-physical.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/physical-2.2.0 xsd/eml-physical.xsd">
<objectName>inline_xml_data</objectName>
diff --git a/src/test/resources/eml-literature.xml b/src/test/resources/eml-literature.xml
index a2fc57f7..b750ff08 100644
--- a/src/test/resources/eml-literature.xml
+++ b/src/test/resources/eml-literature.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<cit:citation id="345" scope="document"
- xmlns:cit="eml://ecoinformatics.org/literature-2.1.1"
+ xmlns:cit="eml://ecoinformatics.org/literature-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="eml://ecoinformatics.org/literature-2.1.1
- eml-literature.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/literature-2.2.0
+ xsd/eml-literature.xsd">
<title>Measuring the effectiveness of EML in the field.
diff --git a/src/test/resources/eml-literatureInPress.xml b/src/test/resources/eml-literatureInPress.xml
index 3c62a0ae..3637bc03 100644
--- a/src/test/resources/eml-literatureInPress.xml
+++ b/src/test/resources/eml-literatureInPress.xml
@@ -1,9 +1,9 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/literature-2.2.0
+ xsd/eml-literature.xsd">
Measuring the effectiveness of EML in the field.
diff --git a/src/test/resources/eml-method.xml b/src/test/resources/eml-method.xml
index d09b9ec5..b93560a3 100644
--- a/src/test/resources/eml-method.xml
+++ b/src/test/resources/eml-method.xml
@@ -1,8 +1,8 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/methods-2.2.0 xsd/eml-methods.xsd">
some method
diff --git a/src/test/resources/eml-offline.xml b/src/test/resources/eml-offline.xml
index 19e9bca1..ab8752a1 100644
--- a/src/test/resources/eml-offline.xml
+++ b/src/test/resources/eml-offline.xml
@@ -1,8 +1,8 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/physical-2.2.0 xsd/eml-physical.xsd">
offline_data
diff --git a/src/test/resources/eml-party.xml b/src/test/resources/eml-party.xml
index dd5886a7..d438edeb 100644
--- a/src/test/resources/eml-party.xml
+++ b/src/test/resources/eml-party.xml
@@ -1,8 +1,8 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/party-2.2.0 xsd/eml-party.xsd">
University of California
diff --git a/src/test/resources/eml-physical-inline-cdatasection.xml b/src/test/resources/eml-physical-inline-cdatasection.xml
index 383ffda9..cd64bd20 100644
--- a/src/test/resources/eml-physical-inline-cdatasection.xml
+++ b/src/test/resources/eml-physical-inline-cdatasection.xml
@@ -1,8 +1,8 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/physical-2.2.0 xsd/eml-physical.xsd">
data.txt
4096
diff --git a/src/test/resources/eml-physical-inline.xml b/src/test/resources/eml-physical-inline.xml
index 107d609b..2a8c39ef 100644
--- a/src/test/resources/eml-physical-inline.xml
+++ b/src/test/resources/eml-physical-inline.xml
@@ -1,8 +1,8 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/physical-2.2.0 xsd/eml-physical.xsd">
data.txt
4096
diff --git a/src/test/resources/eml-physical.xml b/src/test/resources/eml-physical.xml
index a6722c01..ec8ad196 100644
--- a/src/test/resources/eml-physical.xml
+++ b/src/test/resources/eml-physical.xml
@@ -1,8 +1,8 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/physical-2.2.0 xsd/eml-physical.xsd">
data.txt
22
diff --git a/src/test/resources/eml-project.xml b/src/test/resources/eml-project.xml
index 967d3187..dd8b8535 100644
--- a/src/test/resources/eml-project.xml
+++ b/src/test/resources/eml-project.xml
@@ -1,8 +1,8 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/project-2.2.0 xsd/eml-project.xsd">
fish counting project
diff --git a/src/test/resources/eml-protocol.xml b/src/test/resources/eml-protocol.xml
index baf58902..efe9daba 100644
--- a/src/test/resources/eml-protocol.xml
+++ b/src/test/resources/eml-protocol.xml
@@ -1,8 +1,8 @@
+ xsi:schemaLocation="eml://ecoinformatics.org/protocol-2.2.0 xsd/eml-protocol.xsd">
fish counting
diff --git a/src/test/resources/eml-sample.xml b/src/test/resources/eml-sample.xml
index 10f3c341..38d580b0 100644
--- a/src/test/resources/eml-sample.xml
+++ b/src/test/resources/eml-sample.xml
@@ -4,7 +4,7 @@
xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:stmml="http://www.xml-cml.org/schema/stmml-1.1"
- xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 ../../../xsd/eml.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd">
<dataset>
<title>Data from Cedar Creek LTER on productivity and species richness
diff --git a/src/test/resources/eml-semantics.xml b/src/test/resources/eml-semantics.xml
index 05a45692..7d49771b 100644
--- a/src/test/resources/eml-semantics.xml
+++ b/src/test/resources/eml-semantics.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<dt:dataTable id="knb.345.1" scope="document"
system="http://knb.ecoinformatics.org"
- xmlns:dt="eml://ecoinformatics.org/dataTable-2.1.1"
+ xmlns:dt="eml://ecoinformatics.org/dataTable-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="eml://ecoinformatics.org/dataTable-2.1.1
- eml-dataTable.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/dataTable-2.2.0
+ xsd/eml-dataTable.xsd">
<alternateIdentifier>TEMPID234</alternateIdentifier>
<entityName>Test Data</entityName>
<entityDescription>This is a test entity that is fake.</entityDescription>
diff --git a/src/test/resources/eml-software.xml b/src/test/resources/eml-software.xml
index 167c5e01..865e7d3b 100644
--- a/src/test/resources/eml-software.xml
+++ b/src/test/resources/eml-software.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<sw:software
- xmlns:sw="eml://ecoinformatics.org/software-2.1.1"
+ xmlns:sw="eml://ecoinformatics.org/software-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="eml://ecoinformatics.org/software-2.1.1 eml-software.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/software-2.2.0 xsd/eml-software.xsd">
<title>
fish counting
diff --git a/src/test/resources/eml-softwareWithAcessDistribution.xml b/src/test/resources/eml-softwareWithAcessDistribution.xml
index fddf88d3..4e95936f 100755
--- a/src/test/resources/eml-softwareWithAcessDistribution.xml
+++ b/src/test/resources/eml-softwareWithAcessDistribution.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<eml:eml xmlns:eml="eml://ecoinformatics.org/eml-2.1.1" xmlns:sw="eml://ecoinformatics.org/software-2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd" packageId="software08.1.1" system="knb">
+<eml:eml xmlns:eml="eml://ecoinformatics.org/eml-2.2.0" xmlns:sw="eml://ecoinformatics.org/software-2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd" packageId="software08.1.1" system="knb">
<access scope="document" order="allowFirst" authSystem="knb">
<allow>
<principal>uid=joe,o=lter,dc=ecoinformatics,dc=org</principal>
diff --git a/src/test/resources/eml-spatialVector.xml b/src/test/resources/eml-spatialVector.xml
index 41e0f111..6dda23ba 100644
--- a/src/test/resources/eml-spatialVector.xml
+++ b/src/test/resources/eml-spatialVector.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<spvec:spatialVector
- xmlns:spvec="eml://ecoinformatics.org/spatialVector-2.1.1"
- xmlns:spref="eml://ecoinformatics.org/spatialReference-2.1.1"
+ xmlns:spvec="eml://ecoinformatics.org/spatialVector-2.2.0"
+ xmlns:spref="eml://ecoinformatics.org/spatialReference-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="eml://ecoinformatics.org/spatialVector-2.1.1
- eml-spatialVector.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/spatialVector-2.2.0
+ xsd/eml-spatialVector.xsd">
<entityName>Test Data</entityName>
<entityDescription>This is a test entity that is fake.</entityDescription>
diff --git a/src/test/resources/eml-storedProcedure.xml b/src/test/resources/eml-storedProcedure.xml
index e932ce53..9356bb59 100644
--- a/src/test/resources/eml-storedProcedure.xml
+++ b/src/test/resources/eml-storedProcedure.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<sp:storedProcedure
- xmlns:sp="eml://ecoinformatics.org/storedProcedure-2.1.1"
+ xmlns:sp="eml://ecoinformatics.org/storedProcedure-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="eml://ecoinformatics.org/storedProcedure-2.1.1 eml-storedProcedure.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/storedProcedure-2.2.0 xsd/eml-storedProcedure.xsd">
<alternateIdentifier>TEMPID234</alternateIdentifier>
<entityName>Test Data</entityName>
diff --git a/src/test/resources/eml-text.xml b/src/test/resources/eml-text.xml
index 658191e6..bad3c0d9 100644
--- a/src/test/resources/eml-text.xml
+++ b/src/test/resources/eml-text.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<txt:text xmlns:txt="eml://ecoinformatics.org/text-2.1.1"
+<txt:text xmlns:txt="eml://ecoinformatics.org/text-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="eml://ecoinformatics.org/text-2.1.1
- eml-text.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/text-2.2.0
+ xsd/eml-text.xsd">
<section>
<para>This is some text.</para>
<section>
diff --git a/src/test/resources/eml-unitDictionary.xml b/src/test/resources/eml-unitDictionary.xml
index 860df07f..7883c8df 100644
--- a/src/test/resources/eml-unitDictionary.xml
+++ b/src/test/resources/eml-unitDictionary.xml
@@ -36,7 +36,7 @@
xmlns:sch="http://www.ascc.net/xml/schematron"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://www.xml-cml.org/schema/stmml-1.1"
- xsi:schemaLocation="http://www.xml-cml.org/schema/stmml-1.1 stmml.xsd">
+ xsi:schemaLocation="http://www.xml-cml.org/schema/stmml-1.1 xsd/stmml.xsd">
<!-- ======================================================================= -->
<!-- ========================= fundamental types =========================== -->
<!-- ======================================================================= -->
diff --git a/src/test/resources/eml-view.xml b/src/test/resources/eml-view.xml
index 821eeed5..5dc8c193 100644
--- a/src/test/resources/eml-view.xml
+++ b/src/test/resources/eml-view.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<view:view
- xmlns:view="eml://ecoinformatics.org/view-2.1.1"
+ xmlns:view="eml://ecoinformatics.org/view-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="eml://ecoinformatics.org/view-2.1.1 eml-view.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/view-2.2.0 xsd/eml-view.xsd">
<alternateIdentifier>TEMPID234</alternateIdentifier>
<entityName>Test Data</entityName>
diff --git a/src/test/resources/eml.xml b/src/test/resources/eml.xml
index d7ae7769..63d78734 100644
--- a/src/test/resources/eml.xml
+++ b/src/test/resources/eml.xml
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<eml:eml
packageId="eml.1.1" system="knb"
- xmlns:eml="eml://ecoinformatics.org/eml-2.1.1"
+ xmlns:eml="eml://ecoinformatics.org/eml-2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="eml://ecoinformatics.org/eml-2.1.1 eml.xsd">
+ xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 xsd/eml.xsd">
<!--this document should be valid -->
<dataset>