Refactor build to switch to 2.2.0 version.

This includes fixes to docbook generation for the new xsd and img directory structures, and updatting the eml-spatialReferenceDictionary.xml to use the 2.2.0 namespace (partial fix for issu #264).

README.md

@@ -1,17 +1,17 @@
 # EML: Ecological Metadata Language
 
-[![EML](https://img.shields.io/badge/eml-2.1.1-blue.svg?style=plastic)](http://github.com/NCEAS/eml)
+[![EML](https://img.shields.io/badge/eml-2.2.0-blue.svg?style=plastic)](http://github.com/NCEAS/eml)
 
 - **Contributors**: Matthew B. Jones (jones@nceas.ucsb.edu), Chad Berkley (berkley@nceas.ucsb.edu), Jivka Bojilova (bojilova@nceas.ucsb.edu), Dan Higgins (higgins@nceas.ucsb.edu), Chris Jones (cjones@lifesci.ucsb.edu), Corinna Gries (corinna@asu.edu), Peter McCartney (peter.mccartney@asu.edu), James Brunt (jbrunt@lternet.edu), David Blankman (dblankman@lternet.edu), Owen Eddins (oeddins@lternet.edu), Mark Schildhauer (schild@nceas.ucsb.edu), John Harris (harris@nceas.ucsb.edu), Matthew Brooke (brooke@nceas.ucsb.edu), Scott Chapal (scott.chapal@jonesctr.org), Tim Bergsma (tbergsma@kbs.msu.edu), Ken Ramsey (kramsey@jornada.nmsu.edu), Saurabh Garg (sgarg@nceas.ucsb.edu), Margaret O'Brien (mob@msi.ucsb.edu), Mark Servilla (servilla@lternet.edu), James Brunt (brunt@lternet.edu)
-- **Version**: 2.1.1
+- **Version**: 2.2.0
 - **Feedback**: [eml-dev@ecoinformatics.org](mailto:eml-dev@ecoinformatics.org)
 - **Bug reports**: http://github.com/NCEAS/eml/issues
 - **Web site**: http://knb.ecoinformatics.org/software/eml
 - **Source code**: http://github.com/NCEAS/eml
 - **Validation service**: https://knb.ecoinformatics.org/emlparser/
 
-- **EML 2.1.1 Specification**
-    - [Read it online](https://knb.ecoinformatics.org/#external//emlparser/docs/eml-2.1.1/index.html)
+- **EML 2.2.0 Specification**
+    - [Read it online](https://knb.ecoinformatics.org/#external//emlparser/docs/eml-2.2.0/index.html)
     - [Download EML](https://knb.ecoinformatics.org/software/dist) - The download consists of the 
       EML modules, described in the [XML Schema](http://www.w3.org/XML/Schema) language. 
       In addition, the full documentation on the modules is provided in HTML format.
@@ -63,6 +63,12 @@ for checking document validity under JUnit (see http://junit.org).
 ## RELEASE NOTES
 - (see also http://github.com/NCEAS/eml/issues)
 
+### 2.2.0
+
+#### Major New Features
+
+#### Schema changes:
+
 ### 2.1.1 
 
 #### Internationalization in EML 2.1.1

build.xml

@@ -87,7 +87,7 @@
         <property name="servletdir" value="emlparser"/>
         <!-- the path to the servlet from the servletdir -->
         <property name="servletpath" value="/emlparser"/>
-        <property name="version" value="2.1.1"/>
+        <property name="version" value="2.2.0"/>
         <!-- namespaces that the servlet should auto resolve -->
 
     <!-- LOCAL TEST VALUES -->    
@@ -114,6 +114,7 @@
         <property name="eml2_0_1-tag" value="RELEASE_EML_2_0_1"/>
         <property name="eml2_1_0-tag" value="RELEASE_EML_2_1_0"/>
         <property name="eml2_1_1-tag" value="RELEASE_EML_2_1_1"/>
+        <property name="eml2_2_0-tag" value="RELEASE_EML_2_2_0"/>
     </target>
 
     <target name="init" depends="config">
@@ -198,7 +199,7 @@
         your CLASSPATH in order for this to work -->
     <target name="docs" depends="init,docbookhtml,faqhtml,tablehtml,eml210infohtml,eml211infohtml">
         <style basedir="." destdir="${build.docs}/eml-${version}" style="eml-documentation.xsl"
-           includes="*.xsd" excludes="eml-documentation.xsd" classpath="${cpath}" processor="trax"/>
+            includes="xsd/*.xsd" excludes="eml-documentation.xsd" classpath="${cpath}" processor="trax"/>
         <style basedir="." destdir="${build.docs}" style="members.xsl" classpath="${cpath}" 
            includes="members.xml" processor="trax"/>
         <copy todir="${build.docs}" filtering="yes">
@@ -209,7 +210,7 @@
         </copy>
         <copy todir="${build.docs}/eml-${version}" filtering="no">
             <fileset dir=".">
-                <include name="*.png"/>
+                <include name="img/*.png"/>
                 <include name="eml-dublinCore.html"/>
             </fileset>
         </copy>
@@ -287,7 +288,7 @@
 
     <target name="docbook" depends="init">
         <style basedir="." style="buildDocBook.xsl"
-           in="eml.xsd" out="${build.dir}/eml-docbook-nosort.xml"
+            in="xsd/eml.xsd" out="${build.dir}/eml-docbook-nosort.xml"
            classpath="${cpath}" processor="trax"/>
         <style basedir="." style="sortDocBook.xsl"
            in="${build.dir}/eml-docbook-nosort.xml"
@@ -388,7 +389,7 @@
     <target name="tablehtml" depends="init">
         <copy file="default.css" todir="${build.docs}"/>
         <style basedir="." style="buildDependencyTable.xsl"
-           in="eml.xsd"
+            in="xsd/eml.xsd"
            out="${build.docs}/eml-${version}/eml-dependencies.html"
            classpath="${cpath}" processor="trax"/>
         <echo>

buildDependencyTable.xsl

@@ -34,7 +34,7 @@
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:doc="eml://ecoinformatics.org/documentation-2.1.1"
+                xmlns:doc="eml://ecoinformatics.org/documentation-2.2.0"
                 version="1.0">
 <xsl:output method="html" indent="yes"/>
 

buildDocBook.xsl

@@ -34,7 +34,7 @@
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:doc="eml://ecoinformatics.org/documentation-2.1.1"
+                xmlns:doc="eml://ecoinformatics.org/documentation-2.2.0"
                 version="1.0">
 <xsl:output method="xml" indent="yes"/>
 <xsl:output doctype-public="-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -188,11 +188,11 @@
       </title>
       <!-- Get the eml module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-resource module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-resource.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-resource.xsd')//doc:moduleDescription/*"
         mode="copy"/>
     </section>
     <section>
@@ -211,19 +211,19 @@
         </para>
       <!-- Get the eml-dataset module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-dataset.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-dataset.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-literature module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-literature.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-literature.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-software module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-software.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-software.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-protocol module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-protocol.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-protocol.xsd')//doc:moduleDescription/*"
         mode="copy"/>
     </section>
     <section>
@@ -245,27 +245,27 @@
           </para>
       <!-- Get the eml-access module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-access.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-access.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-physical module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-physical.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-physical.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-party module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-party.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-party.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-coverage module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-coverage.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-coverage.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-project module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-project.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-project.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-methods module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-methods.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-methods.xsd')//doc:moduleDescription/*"
         mode="copy"/>
     </section>
     <section>
@@ -292,15 +292,15 @@
           </para>
       <!-- Get the eml-entity module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-entity.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-entity.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-attribute module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-attribute.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-attribute.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-constraint module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-constraint.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-constraint.xsd')//doc:moduleDescription/*"
         mode="copy"/>
         <!--section>
           <title>
@@ -328,27 +328,27 @@
           </para>
       <!-- Get the eml-dataTable module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-dataTable.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-dataTable.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-spatialRaster module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-spatialRaster.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-spatialRaster.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-spatialVector module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-spatialVector.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-spatialVector.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-spatialReference module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-spatialReference.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-spatialReference.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-storedProcedure module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-storedProcedure.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-storedProcedure.xsd')//doc:moduleDescription/*"
         mode="copy"/>
       <!-- Get the eml-view module description from the xsd file -->
       <xsl:apply-templates
-        select="document('eml-view.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-view.xsd')//doc:moduleDescription/*"
         mode="copy"/>
     </section>
     <section>
@@ -363,7 +363,7 @@
             paragraphs, lists, subscript, superscript, emphasis, etc.)
           </para>
       <xsl:apply-templates
-           select="document('eml-text.xsd')//doc:moduleDescription/*"
+          select="document('xsd/eml-text.xsd')//doc:moduleDescription/*"
            mode="copy"/>
       <section>
           <title>Dependency Chart</title>
@@ -440,9 +440,9 @@
 &lt;eml:eml
     packageId="eml.1.1" system="knb" 
     xml:lang="pt_BR"
-    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"&gt;
+    xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 eml.xsd"&gt;
 
   &lt;dataset id="ds.1"&gt;
 
@@ -606,9 +606,9 @@
 &lt;?xml version="1.0"?&gt;
 &lt;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"&gt;
+    xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 eml.xsd"&gt;
 
   &lt;dataset id="ds.1"&gt;
     &lt;title&gt;Sample Dataset Description&lt;/title&gt;
@@ -639,9 +639,9 @@
 &lt;?xml version="1.0"?&gt;
 &lt;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"&gt;
+    xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 eml.xsd"&gt;
 
   &lt;dataset id="ds.1"&gt;
     &lt;title&gt;Sample Dataset Description&lt;/title&gt;
@@ -675,9 +675,9 @@
 &lt;?xml version="1.0"?&gt;
 &lt;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"&gt;
+    xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 eml.xsd"&gt;
 
   &lt;dataset id="ds.1"&gt;
     &lt;title&gt;Sample Dataset Description&lt;/title&gt;
@@ -711,9 +711,9 @@
 &lt;?xml version="1.0"?&gt;
 &lt;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"&gt;
+    xsi:schemaLocation="eml://ecoinformatics.org/eml-2.2.0 eml.xsd"&gt;
 
   &lt;dataset id="ds.1"&gt;
     &lt;title&gt;Sample Dataset Description&lt;/title&gt;
@@ -1063,7 +1063,7 @@
   <title><xsl:value-of select="./doc:moduleName"/></title>
   <para>Normative technical docs for
   <ulink>
-    <xsl:attribute name="url">./<xsl:value-of select="./doc:moduleName"/>.html</xsl:attribute>
+      <xsl:attribute name="url">./xsd/<xsl:value-of select="./doc:moduleName"/>.html</xsl:attribute>
     <xsl:value-of select="./doc:moduleName"/>
   </ulink>
   </para>
@@ -1113,7 +1113,7 @@
   <indexentry>
     <primaryie>
       <ulink>
-        <xsl:attribute name="url">./<xsl:value-of select="//doc:moduleName"/>.html#<xsl:value-of select="@name"/></xsl:attribute>
+          <xsl:attribute name="url">./xsd/<xsl:value-of select="//doc:moduleName"/>.html#<xsl:value-of select="@name"/></xsl:attribute>
         <xsl:value-of select="@name"/></ulink>-<xsl:value-of select="//doc:moduleName"/>
     </primaryie>
   </indexentry>

eml-documentation.xsl

@@ -35,7 +35,7 @@
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:doc="eml://ecoinformatics.org/documentation-2.1.1" version="1.0">
+  xmlns:doc="eml://ecoinformatics.org/documentation-2.2.0" version="1.0">
   <xsl:output method="html"></xsl:output>
   <xsl:template match="/">
     <html>
@@ -225,7 +225,7 @@
         <td class="tablepanel"> View an image of the schema: </td>
         <td class="tablepanel">
           <a>
-            <xsl:attribute name="href">
+              <xsl:attribute name="href"><xsl:text>../img/</xsl:text>
               <xsl:value-of select="//doc:moduleName"></xsl:value-of>.png</xsl:attribute>
             <xsl:attribute name="target">offline</xsl:attribute>
             <xsl:value-of select="//doc:moduleName"></xsl:value-of> image</a>

eml-spatialReferenceDictionary.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sp:projectionList xmlns:sp="eml://ecoinformatics.org/spatialReference-2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="eml://ecoinformatics.org/spatialReference-2.0.0 eml-spatialReference.xsd">
+<sp:projectionList xmlns:sp="eml://ecoinformatics.org/spatialReference-2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="eml://ecoinformatics.org/spatialReference-2.2.0 eml-spatialReference.xsd">
   <horizCoordSysDef name="GCS_Abidjan_1987">
     <geogCoordSys name="GCS_Abidjan_1987">
       <datum name="D_Abidjan_1987"/>

style/eml/eml.xsl

@@ -29,7 +29,7 @@
   * module of the Ecological Metadata Language (EML) into an HTML format
   * suitable for rendering with modern web browsers.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fn="http://www.w3.org/2005/02/xpath-function" xmlns:eml="eml://ecoinformatics.org/eml-2.1.1" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fn="http://www.w3.org/2005/02/xpath-function" xmlns:eml="eml://ecoinformatics.org/eml-2.2.0" version="1.0">
   <xsl:import href="emlroot.xsl"/>
 
   <xsl:output method="html" encoding="UTF-8"

xsd/eml-access.xsd

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-  xmlns:doc="eml://ecoinformatics.org/documentation-2.1.1" 
-  xmlns:res="eml://ecoinformatics.org/resource-2.1.1" 
-  xmlns="eml://ecoinformatics.org/access-2.1.1" 
-  targetNamespace="eml://ecoinformatics.org/access-2.1.1">
-  <xs:import namespace="eml://ecoinformatics.org/documentation-2.1.1" 
+  xmlns:doc="eml://ecoinformatics.org/documentation-2.2.0" 
+  xmlns:res="eml://ecoinformatics.org/resource-2.2.0" 
+  xmlns="eml://ecoinformatics.org/access-2.2.0" 
+  targetNamespace="eml://ecoinformatics.org/access-2.2.0">
+  <xs:import namespace="eml://ecoinformatics.org/documentation-2.2.0" 
              schemaLocation="eml-documentation.xsd"/>
-  <xs:import namespace="eml://ecoinformatics.org/resource-2.1.1" 
+  <xs:import namespace="eml://ecoinformatics.org/resource-2.2.0" 
              schemaLocation="eml-resource.xsd"/>
   <xs:annotation>
     <xs:documentation>