Part 2 of changes to mcp versions -

1.4 is now default, delineate 1.5 as 1.5-experimental
geonetwork · Aug 29, 2012 · 0945681 · 0945681
1 parent fc0ca42
commit 0945681
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 36 deletions.
diff --git a/...p-1.4/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-ISO19119_ISO19139.xsl b/...p-1.4/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-ISO19119_ISO19139.xsl
@@ -89,11 +89,11 @@
 			<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 			<metadataStandardName>
-				<gco:CharacterString>BlueNet version of the Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
+				<gco:CharacterString>Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
 			</metadataStandardName>
 
 			<metadataStandardVersion>
-				<gco:CharacterString>MCP:BlueNet V1.4</gco:CharacterString>
+				<gco:CharacterString>1.4</gco:CharacterString>
 			</metadataStandardVersion>
 
 			<!-- spatRepInfo-->

diff --git a/...9139.mcp-1.4/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilitiesLayer-to-19139.xsl b/...9139.mcp-1.4/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilitiesLayer-to-19139.xsl
@@ -97,11 +97,11 @@
 			<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 			<metadataStandardName>
-				<gco:CharacterString>BlueNet version of the Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
+				<gco:CharacterString>Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
 			</metadataStandardName>
 
 			<metadataStandardVersion>
-				<gco:CharacterString>MCP:BlueNet V1.4</gco:CharacterString>
+				<gco:CharacterString>1.4</gco:CharacterString>
 			</metadataStandardVersion>
 
 			<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

diff --git a/iso19139.mcp-1.4/convert/ThreddsDIFToISO/DIFToISO.xsl b/iso19139.mcp-1.4/convert/ThreddsDIFToISO/DIFToISO.xsl
@@ -219,7 +219,7 @@
 				</gmd:metadataStandardName>
 
 				<gmd:metadataStandardVersion>
-					<gco:CharacterString>1.3-19139</gco:CharacterString>
+					<gco:CharacterString>1.4</gco:CharacterString>
 				</gmd:metadataStandardVersion>		
 
 				<gmd:identificationInfo>

diff --git a/iso19139.mcp-1.4/schema-ident.xml b/iso19139.mcp-1.4/schema-ident.xml
@@ -7,13 +7,10 @@
 	<depends>iso19139.mcp</depends>
 	<schemaLocation>http://bluenet3.antcrc.utas.edu.au/mcp http://bluenet3.antcrc.utas.edu.au/mcp-1.4/schema.xsd http://www.isotc211.org/2005/gmd http://www.isotc211.org/2005/gmd/gmd.xsd http://www.isotc211.org/2005/srv http://schemas.opengis.net/iso/19139/20060504/srv/srv.xsd</schemaLocation>
 	<autodetect xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gco="http://www.isotc211.org/2005/gco">
-		<elements>
-			<gmd:metadataStandardName>
-				<gco:CharacterString>Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
-			</gmd:metadataStandardName>
-			<gmd:metadataStandardVersion>
-				<gco:CharacterString>1.4</gco:CharacterString>
-			</gmd:metadataStandardVersion>
+		<!-- catch all MCP records as 1.4 since all versions since 1.3 are
+		     backwards compatible -->
+		<elements type="root">
+			<mcp:MD_Metadata/>
 		</elements>
 	</autodetect>
 </schema>
diff --git a/iso19139.mcp-1.4/templates/thredds-harvester-unidata-data-discovery.xml b/iso19139.mcp-1.4/templates/thredds-harvester-unidata-data-discovery.xml
@@ -9,7 +9,7 @@
                  gco:isoType="gmd:MD_Metadata"
                  xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://www.isotc211.org/2005/gmd/gmd.xsd  http://bluenet3.antcrc.utas.edu.au/mcp http://bluenet3.antcrc.utas.edu.au/mcp-1.4/schema.xsd">
   <gmd:fileIdentifier>
-      <gco:CharacterString xmlns:srv="http://www.isotc211.org/2005/srv">4294e6ae-9c7c-462f-a7c5-6cbe0a7c8b90</gco:CharacterString>
+      <gco:CharacterString xmlns:srv="http://www.isotc211.org/2005/srv">cecca436-5c27-4169-a39b-239fc18588b8</gco:CharacterString>
   </gmd:fileIdentifier>
   <gmd:language>
       <gco:CharacterString xmlns:srv="http://www.isotc211.org/2005/srv">eng</gco:CharacterString>
@@ -48,7 +48,7 @@
          <gmd:citation>
             <gmd:CI_Citation>
                <gmd:title id="thredds.title">
-                  <gco:CharacterString>HARVESTING TEMPLATE - THREDDS - UNIDATA DISCOVERY</gco:CharacterString>
+                  <gco:CharacterString>MCP 1.4: HARVESTING TEMPLATE - THREDDS - UNIDATA DISCOVERY</gco:CharacterString>
                </gmd:title>
                <gmd:date id="thredds.resource.dates"/>
                <gmd:citedResponsibleParty id="thredds.responsible.parties">

diff --git a/...9.mcp/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-ISO19119_ISO19139.xsl b/...9.mcp/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-ISO19119_ISO19139.xsl
@@ -89,11 +89,11 @@
 			<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 			<metadataStandardName>
-				<gco:CharacterString>BlueNet version of the Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
+				<gco:CharacterString>Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
 			</metadataStandardName>
 
 			<metadataStandardVersion>
-				<gco:CharacterString>MCP:BlueNet V1.4</gco:CharacterString>
+				<gco:CharacterString>1.5-experimental</gco:CharacterString>
 			</metadataStandardVersion>
 
 			<!-- spatRepInfo-->

diff --git a/iso19139.mcp/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilitiesLayer-to-19139.xsl b/iso19139.mcp/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilitiesLayer-to-19139.xsl
@@ -97,11 +97,11 @@
 			<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 			<metadataStandardName>
-				<gco:CharacterString>BlueNet version of the Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
+				<gco:CharacterString>Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
 			</metadataStandardName>
 
 			<metadataStandardVersion>
-				<gco:CharacterString>MCP:BlueNet V1.4</gco:CharacterString>
+				<gco:CharacterString>1.5-experimental</gco:CharacterString>
 			</metadataStandardVersion>
 
 			<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

diff --git a/iso19139.mcp/convert/ThreddsDIFToISO/DIFToISO.xsl b/iso19139.mcp/convert/ThreddsDIFToISO/DIFToISO.xsl
@@ -219,7 +219,7 @@
 				</gmd:metadataStandardName>
 
 				<gmd:metadataStandardVersion>
-					<gco:CharacterString>1.3-19139</gco:CharacterString>
+					<gco:CharacterString>1.5-experimental</gco:CharacterString>
 				</gmd:metadataStandardVersion>		
 
 				<gmd:identificationInfo>

diff --git a/iso19139.mcp/schema-ident.xml b/iso19139.mcp/schema-ident.xml
@@ -2,14 +2,17 @@
 <schema xmlns="http://geonetwork-opensource.org/schemas/schema-ident" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://geonetwork-opensource.org/schemas/schema-ident http://geonetwork-opensource.org/schemas/schema-ident/schema-ident.xsd">
 	<name>iso19139.mcp</name>
 	<id>19c9a2b2-dddb-11df-9df4-001c2346de4c</id>
-	<version>1.5</version>
+	<version>1.5-experimental</version>
 	<depends>iso19139</depends>
 	<schemaLocation>http://bluenet3.antcrc.utas.edu.au/mcp http://bluenet3.antcrc.utas.edu.au/mcp-1.5-experimental/schema.xsd http://www.isotc211.org/2005/gmd http://www.isotc211.org/2005/gmd/gmd.xsd http://www.isotc211.org/2005/srv http://schemas.opengis.net/iso/19139/20060504/srv/srv.xsd</schemaLocation>
 	<autodetect xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gco="http://www.isotc211.org/2005/gco">
-		<!-- catch all MCP records as 1.5 since all versions since 1.3 are
-		     backwards compatible -->
-		<elements type="root">
-			<mcp:MD_Metadata/>
+		<elements>
+			<gmd:metadataStandardName>
+				<gco:CharacterString>Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
+			</gmd:metadataStandardName>
+			<gmd:metadataStandardVersion>
+				<gco:CharacterString>1.5-experimental</gco:CharacterString>
+			</gmd:metadataStandardVersion>
 		</elements>
 	</autodetect>
 </schema>
diff --git a/iso19139.mcp/templates/MCPCore.xml b/iso19139.mcp/templates/MCPCore.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<mcp:MD_Metadata xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" gco:isoType="gmd:MD_Metadata"  xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://www.isotc211.org/2005/gmd/gmd.xsd http://bluenet3.antcrc.utas.edu.au/mcp http://bluenet3.antcrc.utas.edu.au/mcp/schema.xsd">
+<mcp:MD_Metadata xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" gco:isoType="gmd:MD_Metadata"  xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://www.isotc211.org/2005/gmd/gmd.xsd http://bluenet3.antcrc.utas.edu.au/mcp http://bluenet3.antcrc.utas.edu.au/mcp-1.5-experimental/schema.xsd">
   <gmd:fileIdentifier>
     <gco:CharacterString>053b7f20-972d-11dc-893b-00188b4c0af8</gco:CharacterString>
   </gmd:fileIdentifier>
@@ -77,7 +77,7 @@
     <gco:CharacterString>Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
   </gmd:metadataStandardName>
   <gmd:metadataStandardVersion>
-    <gco:CharacterString>MCP:BlueNet V1.5</gco:CharacterString>
+    <gco:CharacterString>1.5-experimental</gco:CharacterString>
   </gmd:metadataStandardVersion>
 	<gmd:referenceSystemInfo>
 		<gmd:MD_ReferenceSystem>
@@ -98,7 +98,7 @@
       <gmd:citation>
         <gmd:CI_Citation>
           <gmd:title>
-            <gco:CharacterString>MCP19139 - CORE Metadata for Marine Geographic Datasets (MCP:BlueNet V1.5)</gco:CharacterString>
+            <gco:CharacterString>MCP 1.5-experimental: CORE Metadata for Marine Geographic Datasets</gco:CharacterString>
           </gmd:title>
           <gmd:date>
             <gmd:CI_Date>

diff --git a/iso19139.mcp/templates/MCPCore_with_VerticalExtent.xml b/iso19139.mcp/templates/MCPCore_with_VerticalExtent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<mcp:MD_Metadata xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" gco:isoType="gmd:MD_Metadata" xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://www.isotc211.org/2005/gmd/gmd.xsd http://bluenet3.antcrc.utas.edu.au/mcp http://bluenet3.antcrc.utas.edu.au/mcp/schema.xsd">
+<mcp:MD_Metadata xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" gco:isoType="gmd:MD_Metadata" xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://www.isotc211.org/2005/gmd/gmd.xsd http://bluenet3.antcrc.utas.edu.au/mcp http://bluenet3.antcrc.utas.edu.au/mcp-1.5-experimental/schema.xsd">
   <gmd:fileIdentifier>
     <gco:CharacterString>053b7f20-972d-11dc-893b-00188b4c9af9</gco:CharacterString>
   </gmd:fileIdentifier>
@@ -77,7 +77,7 @@
     <gco:CharacterString>Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
   </gmd:metadataStandardName>
   <gmd:metadataStandardVersion>
-    <gco:CharacterString>MCP:BlueNet V1.5</gco:CharacterString>
+    <gco:CharacterString>1.5-experimental</gco:CharacterString>
   </gmd:metadataStandardVersion>
 	<gmd:referenceSystemInfo>
 		<gmd:MD_ReferenceSystem>
@@ -98,7 +98,7 @@
       <gmd:citation>
         <gmd:CI_Citation>
           <gmd:title>
-            <gco:CharacterString>MCP19139 - CORE (+ Vertical Extent) Metadata for Marine Geographic Datasets (MCP:BlueNet V1.5)</gco:CharacterString>
+            <gco:CharacterString>MCP 1.5-experimental: CORE (+ Vertical Extent) Metadata for Marine Geographic Datasets</gco:CharacterString>
           </gmd:title>
           <gmd:date>
             <gmd:CI_Date>

diff --git a/iso19139.mcp/templates/MCPMinimum.xml b/iso19139.mcp/templates/MCPMinimum.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<mcp:MD_Metadata xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" gco:isoType="gmd:MD_Metadata"  xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://www.isotc211.org/2005/gmd/gmd.xsd http://bluenet3.antcrc.utas.edu.au/mcp http://bluenet3.antcrc.utas.edu.au/mcp/schema.xsd">
+<mcp:MD_Metadata xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" gco:isoType="gmd:MD_Metadata"  xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://www.isotc211.org/2005/gmd/gmd.xsd http://bluenet3.antcrc.utas.edu.au/mcp http://bluenet3.antcrc.utas.edu.au/mcp-1.5-experimental/schema.xsd">
   <gmd:fileIdentifier>
     <gco:CharacterString>053b7f20-972d-11dc-893b-00188b4c0af9</gco:CharacterString>
   </gmd:fileIdentifier>
@@ -33,7 +33,7 @@
       <gmd:citation>
         <gmd:CI_Citation>
           <gmd:title>
-            <gco:CharacterString>MCP19139 - Minimum Metadata for Marine Geographic Datasets (MCP:BlueNet V1.5)</gco:CharacterString>
+            <gco:CharacterString>MCP 1.5-experimental: Minimum Metadata for Marine Geographic Datasets</gco:CharacterString>
           </gmd:title>
           <gmd:date>
             <gmd:CI_Date>

diff --git a/iso19139.mcp/templates/thredds-harvester-unidata-data-discovery.xml b/iso19139.mcp/templates/thredds-harvester-unidata-data-discovery.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<mcp:MD_Metadata xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:geonet="http://www.fao.org/geonetwork" gco:isoType="gmd:MD_Metadata" xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://www.isotc211.org/2005/gmd/gmd.xsd http://bluenet3.antcrc.utas.edu.au/mcp http://bluenet3.antcrc.utas.edu.au/mcp/schema.xsd">
+<mcp:MD_Metadata xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:geonet="http://www.fao.org/geonetwork" gco:isoType="gmd:MD_Metadata" xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://www.isotc211.org/2005/gmd/gmd.xsd http://bluenet3.antcrc.utas.edu.au/mcp http://bluenet3.antcrc.utas.edu.au/mcp-1.5-experimental/schema.xsd">
   <gmd:fileIdentifier>
       <gco:CharacterString xmlns:srv="http://www.isotc211.org/2005/srv">4294e6ae-9c7c-462f-a7c5-6cbe0a7c8b90</gco:CharacterString>
   </gmd:fileIdentifier>
@@ -33,14 +33,14 @@
 		<gco:CharacterString>Australian Marine Community Profile of ISO 19115:2005/19139</gco:CharacterString>
 	</gmd:metadataStandardName>
 	<gmd:metadataStandardVersion>
-		<gco:CharacterString>MCP:BlueNet V1.5</gco:CharacterString>
+		<gco:CharacterString>1.5-experimental</gco:CharacterString>
 	</gmd:metadataStandardVersion>
   <gmd:identificationInfo>
       <mcp:MD_DataIdentification gco:isoType="gmd:MD_DataIdentification">
          <gmd:citation>
             <gmd:CI_Citation>
                <gmd:title id="thredds.title">
-                  <gco:CharacterString>HARVESTING TEMPLATE - THREDDS - UNIDATA DISCOVERY</gco:CharacterString>
+                  <gco:CharacterString>MCP 1.5-experimental: HARVESTING TEMPLATE - THREDDS - UNIDATA DISCOVERY</gco:CharacterString>
                </gmd:title>
                <gmd:date id="thredds.resource.dates"/>
                <gmd:citedResponsibleParty id="thredds.responsible.parties">

diff --git a/iso19139.mcp/update-fixed-info.xsl b/iso19139.mcp/update-fixed-info.xsl
@@ -13,7 +13,7 @@
 	<xsl:include href="../iso19139/convert/functions.xsl"/>
 
 	<xsl:variable name="metadataStandardName" select="'Australian Marine Community Profile of ISO 19115:2005/19139'"/>
-	<xsl:variable name="metadataStandardVersion" select="'MCP:BlueNet V1.5'"/>
+	<xsl:variable name="metadataStandardVersion" select="'1.5-experimental'"/>
 
 	<!-- ================================================================= -->