Upgrade for GN3.6 effort thus far

src/main/java/org/fao/geonet/schema/iso19139mcp14/ISO19139mcp14Namespaces.java

+/*
+ * Copyright (C) 2001-2016 Food and Agriculture Organization of the
+ * United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * and United Nations Environment Programme (UNEP)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * Rome - Italy. email: geonetwork@osgeo.org
+ */
+
+package org.fao.geonet.schema.iso19139mcp14;
+
+import org.jdom.Namespace;
+
+/**
+ * Namespaces for iso19139 metadata standard.
+ * <p/>
+ * Created by francois on 3/26/14.
+ */
+public class ISO19139mcp14Namespaces {
+  public static final Namespace GCO =
+  Namespace.getNamespace("gco", "http://www.isotc211.org/2005/gco");
+  public static final Namespace SRV =
+  Namespace.getNamespace("srv", "http://www.isotc211.org/2005/srv");
+  public static final Namespace GMD =
+  Namespace.getNamespace("gmd", "http://www.isotc211.org/2005/gmd");
+  public static final Namespace GML =
+  Namespace.getNamespace("gml", "http://www.opengis.net/gml");
+  public static final Namespace MCP =
+  Namespace.getNamespace("mcp", "http://bluenet3.antcrc.utas.edu.au/mcp");
+  public static final Namespace XSI =
+  Namespace.getNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
+  public static final Namespace GTS =
+  Namespace.getNamespace("gts", "http://www.isotc211.org/2005/gts");
+  public static final Namespace GMX =
+  Namespace.getNamespace("gmx", "http://www.isotc211.org/2005/gmx");
+  public static final Namespace XLINK =
+  Namespace.getNamespace("xlink", "http://www.w3.org/1999/xlink");
+}

src/main/plugin/iso19139.mcp-1.4/formatter/full_view/view.groovy

@@ -21,9 +21,9 @@
  * Rome - Italy. email: geonetwork@osgeo.org
  */
 
-import iso19139.SummaryFactory
+import iso19139mcp14.SummaryFactory
 
-def isoHandlers = new iso19139.Handlers(handlers, f, env)
+def isoHandlers = new iso19139mcp14.Handlers(handlers, f, env)
 
 SummaryFactory.summaryHandler({it.parent() is it.parent()}, isoHandlers)
 

src/main/plugin/iso19139.mcp-1.4/formatter/groovy/iso19139/Functions.groovy → src/main/plugin/iso19139.mcp-1.4/formatter/groovy/iso19139mcp14/Functions.groovy

@@ -21,7 +21,7 @@
  * Rome - Italy. email: geonetwork@osgeo.org
  */
 
-package iso19139
+package iso19139mcp14
 
 import org.fao.geonet.domain.ISODate
 
@@ -106,4 +106,4 @@ public class Functions {
     def isoUrlEl(node, href, text) {
         return commonHandlers.func.urlEl(f.nodeLabel(node), href, text)
     }
-}
\ No newline at end of file
+}

src/main/plugin/iso19139.mcp-1.4/formatter/groovy/iso19139/Handlers.groovy → src/main/plugin/iso19139.mcp-1.4/formatter/groovy/iso19139mcp14/Handlers.groovy

@@ -21,7 +21,7 @@
  * Rome - Italy. email: geonetwork@osgeo.org
  */
 
-package iso19139
+package iso19139mcp14
 
 import org.fao.geonet.api.records.formatters.groovy.Environment
 import org.fao.geonet.api.records.formatters.groovy.MapConfig
@@ -31,17 +31,17 @@ public class Handlers {
     protected org.fao.geonet.api.records.formatters.groovy.Functions f
     protected Environment env
     Matchers matchers
-    iso19139.Functions isofunc
+    iso19139mcp14.Functions isofunc
     common.Handlers commonHandlers
     List<String> packageViews
-    String rootEl = 'gmd:MD_Metadata'
+    String rootEl = 'mcp:MD_Metadata'
 
     public Handlers(handlers, f, env) {
         this.handlers = handlers
         this.f = f
         this.env = env
         commonHandlers = new common.Handlers(handlers, f, env)
-        isofunc = new iso19139.Functions(handlers: handlers, f:f, env:env, commonHandlers: commonHandlers)
+        isofunc = new iso19139mcp14.Functions(handlers: handlers, f:f, env:env, commonHandlers: commonHandlers)
         matchers =  new Matchers(handlers: handlers, f:f, env:env)
         packageViews = [
                 'gmd:identificationInfo', 'gmd:metadataMaintenance', 'gmd:metadataConstraints', 'gmd:spatialRepresentationInfo',

src/main/plugin/iso19139.mcp-1.4/formatter/groovy/iso19139/Matchers.groovy → src/main/plugin/iso19139.mcp-1.4/formatter/groovy/iso19139mcp14/Matchers.groovy

@@ -21,7 +21,7 @@
  * Rome - Italy. email: geonetwork@osgeo.org
  */
 
-package iso19139
+package iso19139mcp14
 
 public class Matchers {
     def handlers;

src/main/plugin/iso19139.mcp-1.4/formatter/groovy/iso19139/SummaryFactory.groovy → src/main/plugin/iso19139.mcp-1.4/formatter/groovy/iso19139mcp14/SummaryFactory.groovy

@@ -21,7 +21,7 @@
  * Rome - Italy. email: geonetwork@osgeo.org
  */
 
-package iso19139
+package iso19139mcp14
 import org.fao.geonet.api.records.formatters.FormatType
 import org.fao.geonet.api.records.formatters.groovy.Environment
 import org.fao.geonet.api.records.formatters.groovy.util.*

src/main/plugin/iso19139.mcp-1.4/formatter/xsl-view/view.xsl

@@ -64,7 +64,7 @@
   <!-- Some utility -->
   <xsl:include href="../../layout/evaluate.xsl"/>
   <xsl:include href="../../layout/utility-tpl-multilingual.xsl"/>
-  <xsl:include href="../../../iso19139/layout/utility-fn.xsl"/>
+  <xsl:include href="../../layout/utility-fn.xsl"/>
 
   <!-- The core formatter XSL layout based on the editor configuration -->
   <xsl:include href="sharedFormatterDir/xslt/render-layout.xsl"/>

src/main/plugin/iso19139.mcp-1.4/index-fields/default.xsl

@@ -130,7 +130,7 @@
              index="true"/>
 
 
-      <xsl:apply-templates select="*[name(.)='mcp:MD_Metadata' or @gco:isoType='mcp:MD_Metadata']" mode="metadata"/>
+      <xsl:apply-templates select="*[name(.)='mcp:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']" mode="metadata"/>
 
       <xsl:apply-templates mode="index" select="*"/>
 

src/main/plugin/iso19139.mcp-1.4/index-fields/language-default.xsl

@@ -150,6 +150,15 @@
       <xsl:with-param name="langId" select="$langId"/>
     </xsl:apply-templates>
   </xsl:template>
+       <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->		
+	<xsl:template mode="index" match="mcp:revisionDate/*">
+
+		<Field name="changeDate" string="{string(.)}" store="true" index="true"/>
+
+		<xsl:apply-templates mode="index" select="*"/>
+	</xsl:template>
+		
+	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <!-- ========================================================================================= -->
 
@@ -661,7 +670,7 @@
       </xsl:attribute>
     </Field>
 
-    <xsl:variable name="identification" select="gmd:identificationInfo//gmd:MD_DataIdentification|
+    <xsl:variable name="identification" select="gmd:identificationInfo//mcp:MD_DataIdentification|
                     gmd:identificationInfo//*[contains(@gco:isoType, 'MD_DataIdentification')]|
                     gmd:identificationInfo/srv:SV_ServiceIdentification"/>
 

src/main/plugin/iso19139.mcp-1.4/layout/dispatcher.xsl

 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
+  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
+  ~ and United Nations Environment Programme (UNEP)
+  ~
+  ~ This program is free software; you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation; either version 2 of the License, or (at
+  ~ your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program; if not, write to the Free Software
+  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  ~
+  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+  ~ Rome - Italy. email: geonetwork@osgeo.org
+  -->
+
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gts="http://www.isotc211.org/2005/gts"
   xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmx="http://www.isotc211.org/2005/gmx"
   xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp"
   xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink"
-	xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:gn="http://www.fao.org/geonetwork"
   xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata"
   xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139"
   xmlns:saxon="http://saxon.sf.net/" extension-element-prefixes="saxon"
   exclude-result-prefixes="#all">
-  
+
+  <xsl:include href="evaluate.xsl"/>
   <xsl:include href="layout.xsl"/>
-  
-  
-  <!-- 
+
+
+  <!--
     Load the schema configuration for the editor.
       -->
   <xsl:template name="get-iso19139.mcp-1.4-configuration">
@@ -23,57 +47,17 @@
   </xsl:template>
 
 
-	<!-- The main dispatch point - process in iso19139.mcp mode first,
-	     if we get something then use that otherwise process in iso19139
-			 mode -->
   <xsl:template name="dispatch-iso19139.mcp-1.4">
     <xsl:param name="base" as="node()"/>
     <xsl:param name="overrideLabel" as="xs:string" required="no" select="''"/>
+    <xsl:param name="refToDelete" as="node()?" required="no"/>
+    <xsl:param name="config" as="node()?" required="no"/>
 
-
-		<!-- process in iso19139 mode - but we can override any templates
-		     defined for iso19139 by importing that stylesheet into our
-				 mcp stylesheet - that way the iso19139 templates will have
-				 a lower priority than ours -->
     <xsl:apply-templates mode="mode-iso19139" select="$base">
-     	<xsl:with-param name="overrideLabel" select="$overrideLabel"/>
-      <xsl:with-param name="schema" select="$schema"/>
-      <xsl:with-param name="labels" select="$iso19139.mcp-1.4labels"/>
+      <xsl:with-param name="overrideLabel" select="$overrideLabel"/>
+      <xsl:with-param name="refToDelete" select="$refToDelete"/>
+      <xsl:with-param name="config" select="$config"/>
     </xsl:apply-templates>
-
-  </xsl:template>
-
-
-  <!-- The following templates usually delegates all to iso19139. -->
-  <xsl:template name="evaluate-iso19139.mcp-1.4">
-    <xsl:param name="base" as="node()"/>
-    <xsl:param name="in"/>
-    
-
-    <xsl:variable name="nodeOrAttribute" select="saxon:evaluate(concat('$p1', $in), $base)"/>
-    <xsl:choose>
-      <xsl:when test="$nodeOrAttribute/*">
-        <xsl:copy-of select="$nodeOrAttribute"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$nodeOrAttribute"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <!--<xsl:call-template name="evaluate-iso19139">
-      <xsl:with-param name="base" select="$base"/>
-      <xsl:with-param name="in" select="$in"/>
-    </xsl:call-template>-->
-  </xsl:template>
-
-  <xsl:template name="evaluate-iso19139.mcp-1.4-boolean">
-    <xsl:param name="base" as="node()"/>
-    <xsl:param name="in"/>
-
-    <xsl:call-template name="evaluate-iso19139-boolean">
-      <xsl:with-param name="base" select="$base"/>
-      <xsl:with-param name="in" select="$in"/>
-    </xsl:call-template>
   </xsl:template>
 
-
 </xsl:stylesheet>

src/main/plugin/iso19139.mcp-1.4/layout/evaluate.xsl

@@ -31,9 +31,9 @@
                 xmlns:gco="http://www.isotc211.org/2005/gco"
                 xmlns:gmx="http://www.isotc211.org/2005/gmx"
                 xmlns:srv="http://www.isotc211.org/2005/srv"
-                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:mcp="http://bluenet3.antcrc.utas.edu.au/mcp"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns:gn="http://www.fao.org/geonetwork"
                 xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata"
@@ -43,27 +43,71 @@
                 extension-element-prefixes="saxon"
                 exclude-result-prefixes="#all">
 
+  <xsl:import href="../../iso19139/layout/evaluate.xsl"/>
+  
 
-   <xsl:import href="../../iso19139/layout/evaluate.xsl"/>
+  
+  <!-- <xsl:include href="layout.xsl"/>
+    Load the schema configuration for the editor.
+      -->
+  <!--<xsl:template name="get-iso19139.mcp-1.4-configuration">
+    <xsl:copy-of select="document('config-editor.xml')"/>
+   </xsl:template>Byron - Copied over from dipatch.xsl. Threw errors. Comment out.
+-->
+
+
+	<!-- The main dispatch point - process in iso19139.mcp mode first,
+	     if we get something then use that otherwise process in iso19139
+			 mode -->
+ <!-- <xsl:template name="dispatch-iso19139.mcp-1.4">
+    <xsl:param name="base" as="node()"/>
+    <xsl:param name="overrideLabel" as="xs:string" required="no" select="''"/>
+</xsl:template> Byron - Copied over from dipatch.xsl. Threw errors. Comment out.
+-->
+
+		<!-- process in iso19139 mode - but we can override any templates
+		     defined for iso19139 by importing that stylesheet into our
+				 mcp stylesheet - that way the iso19139 templates will have
+				 a lower priority than ours -->
+ <!--   <xsl:apply-templates mode="mode-iso19139" select="$base">
+     	<xsl:with-param name="overrideLabel" select="$overrideLabel"/>
+      <xsl:with-param name="schema" select="$schema"/>
+      <xsl:with-param name="labels" select="$iso19139.mcp-1.4labels"/>
+    </xsl:apply-templates>
+
+  </xsl:template> Byron - Copied over from dipatch.xsl. Threw errors. Comment out.
+  -->
 
   <!-- The following templates usually delegates all to iso19139. -->
   <xsl:template name="evaluate-iso19139.mcp-1.4">
     <xsl:param name="base" as="node()"/>
     <xsl:param name="in"/>
-    <!--<xsl:copy-of select="saxon:evaluate(concat('$p1', $in), $base)"/>-->
-    <xsl:call-template name="evaluate-iso19139">
+    
+
+    <xsl:variable name="nodeOrAttribute" select="saxon:evaluate(concat('$p1', $in), $base)"/>
+    <xsl:choose>
+      <xsl:when test="$nodeOrAttribute/*">
+        <xsl:copy-of select="$nodeOrAttribute"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$nodeOrAttribute"/>
+      </xsl:otherwise>
+    </xsl:choose>
+    <!--<xsl:call-template name="evaluate-iso19139">
       <xsl:with-param name="base" select="$base"/>
       <xsl:with-param name="in" select="$in"/>
-    </xsl:call-template>
+    </xsl:call-template>-->
   </xsl:template>
 
   <xsl:template name="evaluate-iso19139.mcp-1.4-boolean">
-  <xsl:param name="base" as="node()"/>
-  <xsl:param name="in"/>
-  <!--<xsl:copy-of select="saxon:evaluate(concat('$p1', $in), $base)"/>-->
-  <xsl:call-template name="evaluate-iso19139-boolean">
-    <xsl:with-param name="base" select="$base"/>
-    <xsl:with-param name="in" select="$in"/>
-  </xsl:call-template>
+    <xsl:param name="base" as="node()"/>
+    <xsl:param name="in"/>
+
+    <xsl:call-template name="evaluate-iso19139-boolean">
+      <xsl:with-param name="base" select="$base"/>
+      <xsl:with-param name="in" select="$in"/>
+    </xsl:call-template>
   </xsl:template>
+
+
 </xsl:stylesheet>

src/main/plugin/iso19139.mcp-1.4/layout/utility-fn.xsl

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
+  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
+  ~ and United Nations Environment Programme (UNEP)
+  ~
+  ~ This program is free software; you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation; either version 2 of the License, or (at
+  ~ your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program; if not, write to the Free Software
+  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  ~
+  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+  ~ Rome - Italy. email: geonetwork@osgeo.org
+  -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:gmd="http://www.isotc211.org/2005/gmd"
+                xmlns:gco="http://www.isotc211.org/2005/gco"
+                xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp"
+                xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139"
+                version="2.0"
+                exclude-result-prefixes="#all">
+
+
+  <!-- Get lang #id in metadata PT_Locale section,  deprecated: if not return the 2 first letters
+        of the lang iso3code in uper case.
+
+         if not return the lang iso3code in uper case.
+        -->
+  <xsl:function name="gn-fn-iso19139:getLangId" as="xs:string">
+    <xsl:param name="md"/>
+    <xsl:param name="lang"/>
+
+    <xsl:choose>
+      <xsl:when
+        test="$md/gmd:locale/gmd:PT_Locale[gmd:languageCode/gmd:LanguageCode/@codeListValue = $lang]/@id">
+        <xsl:value-of
+          select="concat('#', $md/gmd:locale/gmd:PT_Locale[gmd:languageCode/gmd:LanguageCode/@codeListValue = $lang]/@id)"
+        />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="concat('#', upper-case($lang))"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:function>
+
+
+  <xsl:function name="gn-fn-iso19139:getCodeListType" as="xs:string">
+    <xsl:param name="name" as="xs:string"/>
+
+    <xsl:variable name="configType" select="$editorConfig/editor/fields/for[@name = $name]/@use"/>
+
+    <xsl:value-of select="if ($configType) then $configType else 'select'"/>
+  </xsl:function>
+
+
+
+
+
+  <xsl:function name="gn-fn-iso19139:isNotMultilingualField" as="xs:boolean">
+    <xsl:param name="element" as="node()"/>
+    <xsl:param name="editorConfig" as="node()"/>
+
+    <xsl:variable name="elementName" select="name($element)"/>
+
+    <xsl:variable name="exclusionMatchesParent" as="xs:boolean">
+      <xsl:variable name="parentName"
+                    select="name($element/..)"/>
+
+      <xsl:value-of select="count($editorConfig/editor/multilingualFields/exclude/
+                                  name[. = $elementName]/@parent[. = $parentName]) > 0"/>
+    </xsl:variable>
+
+
+    <xsl:variable name="exclusionMatchesAncestor" as="xs:boolean">
+      <xsl:variable name="ancestorNames"
+                    select="$element/ancestor::*/name()"/>
+
+      <xsl:value-of select="count($editorConfig/editor/multilingualFields/exclude/
+                                  name[. = $elementName]/@ancestor[. = $ancestorNames]) > 0"/>
+    </xsl:variable>
+
+
+    <xsl:variable name="exclusionMatchesChild" as="xs:boolean">
+      <xsl:variable name="childName"
+                    select="name($element/*[1])"/>
+
+      <xsl:value-of select="count($editorConfig/editor/multilingualFields/exclude/
+                                  name[. = $elementName]/@child[. = $childName]) > 0"/>
+    </xsl:variable>
+
+
+
+    <xsl:variable name="excluded"
+                  as="xs:boolean"
+                  select="
+                    count($editorConfig/editor/multilingualFields/exclude/name[. = $elementName and not(@*)]) > 0 or
+                      $exclusionMatchesAncestor = true() or
+                      $exclusionMatchesParent = true() or
+                      $exclusionMatchesChild = true() or
+                      count($element/gco:Boolean) > 0"/>
+
+   <!--
+    <xsl:message>===== elementName <xsl:copy-of select="$elementName"/></xsl:message>
+    <xsl:message>= <xsl:copy-of select="$exclusionMatchesParent"/></xsl:message>
+    <xsl:message>= <xsl:copy-of select="$exclusionMatchesAncestor"/></xsl:message>
+    <xsl:message>= <xsl:copy-of select="$exclusionMatchesChild"/></xsl:message>
+    <xsl:message>= excluded<xsl:copy-of select="$excluded"/></xsl:message>-->
+
+    <xsl:value-of select="$excluded"/>
+  </xsl:function>
+
+
+</xsl:stylesheet>

src/main/plugin/iso19139.mcp-1.4/present/csw/csw-brief.xsl

@@ -28,7 +28,7 @@ xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp"
 			</xsl:call-template>
 		</xsl:variable>
 		
-		<xsl:variable name="identification" select="gmd:identificationInfo/gmd:MD_DataIdentification|
+		<xsl:variable name="identification" select="gmd:identificationInfo/mcp:MD_DataIdentification|
 			gmd:identificationInfo/*[@gco:isoType='gmd:MD_DataIdentification']|
 			gmd:identificationInfo/srv:SV_ServiceIdentification"/>
 		

src/main/plugin/iso19139.mcp-1.4/present/csw/csw-full.xsl

@@ -31,7 +31,7 @@ xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp"
 			</xsl:call-template>
 		</xsl:variable>
 		
-		<xsl:variable name="identification" select="gmd:identificationInfo/gmd:MD_DataIdentification|
+		<xsl:variable name="identification" select="gmd:identificationInfo/mcp:MD_DataIdentification|
 			gmd:identificationInfo/*[@gco:isoType='gmd:MD_DataIdentification']|
 			gmd:identificationInfo/srv:SV_ServiceIdentification|
 			gmd:identificationInfo/*[@gco:isoType='srv:SV_ServiceIdentification']"/>

src/main/plugin/iso19139.mcp-1.4/present/csw/own-brief.xsl

@@ -30,7 +30,7 @@ xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp"
 
 	<!-- =================================================================== -->
 
-	<xsl:template match="gmd:MD_DataIdentification|
+	<xsl:template match="mcp:MD_DataIdentification|
 		*[@gco:isoType='gmd:MD_DataIdentification']|
 		srv:SV_ServiceIdentification|
 		*[@gco:isoType='srv:SV_ServiceIdentification']

src/main/plugin/iso19139.mcp-1.4/present/csw/own-full.xsl

@@ -13,7 +13,7 @@ xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp"
 	
 	<!-- ============================================================================= -->
 <!--
-	<xsl:template match="gmd:MD_Metadata">
+	<xsl:template match="mcp:MD_Metadata">
 		<csw:IsoRecord>
 			<xsl:apply-templates select="*"/>
 		</csw:IsoRecord>

src/main/plugin/iso19139.mcp-1.4/present/csw/own-summary.xsl

@@ -13,7 +13,7 @@ xmlns:mcp="http://bluenet3.antcrc.utas.edu.au/mcp"
 	
 	<!-- =================================================================== -->
 
-	<xsl:template match="gmd:MD_Metadata|*[@gco:isoType='gmd:MD_Metadata']">
+	<xsl:template match="mcp:MD_Metadata|*[@gco:isoType='gmd:MD_Metadata']">
 		<xsl:variable name="info" select="geonet:info"/>
 		<xsl:copy>
 			<xsl:apply-templates select="gmd:fileIdentifier"/>

src/main/plugin/iso19139.mcp-1.4/present/metadata-fop.xsl

@@ -14,7 +14,7 @@
   <xsl:template name="metadata-fop-iso19139.mcp-1.4">
     <xsl:param name="schema"/>
     
-    <xsl:call-template name="metadata-fop-iso19139.mcp">
+    <xsl:call-template name="metadata-fop-iso19139">
       <xsl:with-param name="schema" select="'iso19139'"/>
     </xsl:call-template>
 

src/main/plugin/iso19139.mcp-1.4/present/metadata-taxonconcepts.xsl

+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0" xmlns:xsl ="http://www.w3.org/1999/XSL/Transform"
+	xmlns:gmd="http://www.isotc211.org/2005/gmd"
+	xmlns:gco="http://www.isotc211.org/2005/gco"
+	xmlns:gmx="http://www.isotc211.org/2005/gmx"
+	xmlns:srv="http://www.isotc211.org/2005/srv"
+	xmlns:gml="http://www.opengis.net/gml"
+	xmlns:mcp="http://schemas.aodn.org.au/mcp-2.0"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	xmlns:geonet="http://www.fao.org/geonetwork"
+	xmlns:ibis="http://biodiversity.org.au/xml/ibis"
+  xmlns:dcterms="http://purl.org/dc/terms/"
+	xmlns:app="http://anbg.gov.au/ibis/applications/repository/xml/content">
+
+	<!-- ==================================================================== -->
+	<!-- taxonConcepts elements -->
+	<!-- ==================================================================== -->
+
+	<xsl:template mode="taxonconcepts" match="mcp:taxonConcepts">
+		<xsl:for-each select="*/ibis:TaxonConcept|*/ibis:TaxonName">
+				<a href="{@ibis:uri}.html">
+					<xsl:value-of select="dcterms:title"/>
+				</a>
+				<xsl:if test="count(ibis:AcceptedFor/ibis:AcceptedForNameRef)>0">
+					<p>Accepted for:</p>
+					<xsl:for-each select="ibis:AcceptedFor/ibis:AcceptedForNameRef">
+						<p><a href="{@ibis:uriRef}.html">
+							<xsl:value-of select="ibis:NameComplete"/>
+						</a></p>
+					</xsl:for-each>
+				</xsl:if>
+		</xsl:for-each>
+	</xsl:template>
+</xsl:stylesheet>

src/main/resources/config-spring-geonetwork.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<beans
-    xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<!--
+ ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
+ ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ ~ and United Nations Environment Programme (UNEP)
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation; either version 2 of the License, or (at
+ ~ your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful, but
+ ~ WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ along with this program; if not, write to the Free Software
+ ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ ~
+ ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ ~ Rome - Italy. email: geonetwork@osgeo.org
+ -->
 
+<beans
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+  http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+  
   <bean id="iso19139.mcp-1.4SchemaPlugin"
-        class="org.fao.geonet.schema.iso19139.ISO19139SchemaPlugin"/>
+    class="org.fao.geonet.schema.iso19139mcp14.ISO19139mcp14SchemaPlugin">
+    <property name="xpathTitle">
+      <util:list value-type="java.lang.String">
+        <value>gmd:identificationInfo/*/gmd:citation/*/gmd:title/gco:CharacterString</value>
+        <value>gmd:identificationInfo/*/gmd:citation/*/gmd:title/*/gmd:textGroup/gmd:LocalisedCharacterString</value>
+      </util:list>
+    </property>
+    <property name="elementsToProcess">
+      <util:list value-type="java.lang.String">
+        <value>gco:CharacterString</value>
+        <value>gmx:Anchor</value>
+        <value>gmd:featureTypes</value>
+      </util:list>
+    </property>
+    <property name="savedQueries">
+      <list>
+        <bean class="org.fao.geonet.kernel.schema.SavedQuery">
+          <property name="id" value="wfs-indexing-config"/>
+          <property name="xpath"
+          value="*//gmd:CI_OnlineResource[contains(gmd:protocol/gco:CharacterString, '{{protocol}}') and gmd:name/gco:CharacterString = '{{name}}' and (gmd:linkage/gmd:URL = '{{url}}' or gmd:linkage/gmd:URL = translate('{{url}}', 'wms', 'wfs'))]/gmd:applicationProfile/gco:CharacterString/text()"/>
+        </bean>
+        <bean class="org.fao.geonet.kernel.schema.SavedQuery">
+          <property name="id" value="doi-get"/>
+          <property name="xpath"
+          value="*//gmd:CI_OnlineResource[gmd:protocol/gco:CharacterString = 'DOI']/gmd:linkage/gmd:URL/text()"/>
+        </bean>
+      </list>
+    </property>
+  </bean>
 </beans>

target/classes/config-spring-geonetwork.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
+ ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ ~ and United Nations Environment Programme (UNEP)
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation; either version 2 of the License, or (at
+ ~ your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful, but
+ ~ WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ along with this program; if not, write to the Free Software
+ ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ ~
+