Merge branch 'master' of https://github.com/ErikMoll/JIRA-Spec-Artifacts

Author: ErikMoll

OTHER-rccmh.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<specification defaultWorkgroup="mh" defaultVersion="1.0-ballot" url="http://www.hl7.org/documentcenter/public/ballots/2025MAY/downloads/HL7_RCC-MH_E1_S1_2025MAY.pdf" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schemas/specification.xsd">
+  <version code="1.0-ballot" deprecated="false"/>
+  <page name="Foreward" key="foreword"/>
+  <page name="Introduction" key="introduction"/>
+  <page name="Scope" key="scope"/>
+  <page name="Normative references" key="normref"/>
+  <page name="Terms and definitions" key="termsdef"/>
+  <page name="Abbreviations" key="abbrev"/>
+  <page name="RCC-MH care locations and evolution" key="careloc"/>
+  <page name="RCC-MH relevant care delivery modes and use cases" key="caredelivery"/>
+  <page name="RCC-MH challenges and gaps" key="gaps"/>
+  <page name="RCC-MH recommendations" key="recommendations"/>
+  <page name="Conclusions and path forward" key="conclusions"/>
+  <page name="Annex A" key="annexa"/>
+  <page name="Annex B" key="annexb"/>
+  <page name="Annex C" key="annexc"/>
+  <page name="Annex D" key="annexd"/>
+  <page name="Annex E" key="annexe"/>
+  <page name="Annex F" key="annexf"/>
+  <page name="Annex G" key="annexg"/>
+  <page name="Annex H" key="annexh"/>
+  <page name="Annex I" key="annexi"/>
+  <page name="Annex J" key="annexj"/>
+  <page name="Annex K" key="annexk"/>
+  <page name="Annex L" key="annexl"/>
+  <page name="Bibliography" key="bibliography"/>
+</specification>

README.md

@@ -18,7 +18,7 @@ Source content is found in the `xml` folder:
     * For some specifications, alignment will be checked as part of the specification publication process.
     * Specification files are maintained independently (rather than as part of the SPECS files) to allow independent maintenance.
 
-Each type of XML file has a corresponding schema in the [`schemas`](shemas) folder.  The [`xml/_workgroups.xml`](xml/_workgroups.xml) file is also converted to a schema to aid validation.
+Each type of XML file has a corresponding schema in the [`schemas`](schemas) folder.  The [`xml/_workgroups.xml`](xml/_workgroups.xml) file is also converted to a schema to aid validation.
 
 The json files used by the [Jira Elements Connect (formerly nFeed) plugin](https://marketplace.atlassian.com/apps/23337/elements-connect-formerly-nfeed) to manage dropdowns are auto-generated into the json folder.
 There is one file for each product family plus a single "combined" file that covers all specifications and is used by the ballot projects

build.xml

@@ -58,6 +58,7 @@
     <xslt in="xml/_families.xml" out="json/SPECS.json" style="tools/buildSpecJSON.xslt" classpathref="saxon.path">
       <factory name="net.sf.saxon.TransformerFactoryImpl"/>
     </xslt>
+    <copy file="json/SPECS.json" tofile="json/SPECS-copy.json"/>
     <echo file="tools/temp/actualcount.txt" message="CDA-${count.cda}&#x0a;"/>
     <echo file="tools/temp/actualcount.txt" message="FHIR-${count.fhir}&#x0a;" append="true"/>
     <echo file="tools/temp/actualcount.txt" message="OTHER-${count.other}&#x0a;" append="true"/>

schemas/workgroups.xsd

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><!--WARNING: This is a generated file.  It must be kept in sync with _workgroups.xml--><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"><xs:simpleType name="WorkGroup"><xs:restriction base="xs:NMTOKEN"><xs:enumeration value="gas"/><xs:enumeration value="arb"/><xs:enumeration value="as"/><xs:enumeration value="att"/><xs:enumeration value="brr"/><xs:enumeration value="cbcc"/><xs:enumeration value="cdamg"/><xs:enumeration value="cgit"/><xs:enumeration value="cimi"/><xs:enumeration value="cds"/><xs:enumeration value="cic"/><xs:enumeration value="cg"/><xs:enumeration value="cgp"/><xs:enumeration value="cqi"/><xs:enumeration value="dev"/><xs:enumeration value="ec"/><xs:enumeration value="ehr"/><xs:enumeration value="director"/><xs:enumeration value="fgb"/><xs:enumeration value="fhir-i"/><xs:enumeration value="fmg"/><xs:enumeration value="fm"/><xs:enumeration value="hcd"/><xs:enumeration value="hsi"/><xs:enumeration value="hss"/><xs:enumeration value="hta"/><xs:enumeration value="ic"/><xs:enumeration value="project"/><xs:enumeration value="ii"/><xs:enumeration value="its"/><xs:enumeration value="inm"/><xs:enumeration value="lhs"/><xs:enumeration value="mh"/><xs:enumeration value="mnm"/><xs:enumeration value="oo"/><xs:enumeration value="pa"/><xs:enumeration value="pc"/><xs:enumeration value="pe"/><xs:enumeration value="pie"/><xs:enumeration value="pharm"/><xs:enumeration value="pic"/><xs:enumeration value="ps"/><xs:enumeration value="pher"/><xs:enumeration value="pubs"/><xs:enumeration value="security"/><xs:enumeration value="soa"/><xs:enumeration value="sd"/><xs:enumeration value="sgb"/><xs:enumeration value="templates"/><xs:enumeration value="tsc"/><xs:enumeration value="tsmg"/><xs:enumeration value="us-realm"/><xs:enumeration value="vocab"/><xs:enumeration value="v2mg"/><xs:enumeration value="eu"/><xs:enumeration value="au-v2"/><xs:enumeration value="au-fhir"/></xs:restriction></xs:simpleType></xs:schema>
+<?xml version="1.0" encoding="UTF-8"?><!--WARNING: This is a generated file.  It must be kept in sync with _workgroups.xml--><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"><xs:simpleType name="WorkGroup"><xs:restriction base="xs:NMTOKEN"><xs:enumeration value="gas"/><xs:enumeration value="arb"/><xs:enumeration value="as"/><xs:enumeration value="att"/><xs:enumeration value="brr"/><xs:enumeration value="cbcc"/><xs:enumeration value="cdamg"/><xs:enumeration value="cgit"/><xs:enumeration value="cimi"/><xs:enumeration value="cds"/><xs:enumeration value="cic"/><xs:enumeration value="cg"/><xs:enumeration value="cgp"/><xs:enumeration value="cqi"/><xs:enumeration value="dev"/><xs:enumeration value="ec"/><xs:enumeration value="ehr"/><xs:enumeration value="ex"/><xs:enumeration value="director"/><xs:enumeration value="fgb"/><xs:enumeration value="fhir-i"/><xs:enumeration value="fmg"/><xs:enumeration value="fm"/><xs:enumeration value="hcd"/><xs:enumeration value="hsi"/><xs:enumeration value="hss"/><xs:enumeration value="hta"/><xs:enumeration value="ic"/><xs:enumeration value="project"/><xs:enumeration value="ii"/><xs:enumeration value="its"/><xs:enumeration value="inm"/><xs:enumeration value="lhs"/><xs:enumeration value="mh"/><xs:enumeration value="mnm"/><xs:enumeration value="oo"/><xs:enumeration value="pa"/><xs:enumeration value="pc"/><xs:enumeration value="pe"/><xs:enumeration value="pie"/><xs:enumeration value="pharm"/><xs:enumeration value="pic"/><xs:enumeration value="ps"/><xs:enumeration value="pher"/><xs:enumeration value="pubs"/><xs:enumeration value="security"/><xs:enumeration value="soa"/><xs:enumeration value="sd"/><xs:enumeration value="sgb"/><xs:enumeration value="templates"/><xs:enumeration value="tsc"/><xs:enumeration value="tsmg"/><xs:enumeration value="us-realm"/><xs:enumeration value="vocab"/><xs:enumeration value="v2mg"/><xs:enumeration value="eu"/><xs:enumeration value="au-v2"/><xs:enumeration value="au-fhir"/></xs:restriction></xs:simpleType></xs:schema>

tools/buildSpecJSON.xslt

@@ -131,6 +131,9 @@
     <!-- Check cross-specification validation rules -->
     <xsl:for-each select="$ballotSpecs/specification[not(@deprecated='true') and starts-with(@key, 'FHIR-')]">
       <xsl:choose>
+        <xsl:when test="@defaultWorkgroup='uk' and not(starts-with(@gitUrl, 'https://github.com/NHSDigital/'))">
+          <xsl:message terminate="yes" select="concat('ERROR: FHIR HL7 UK specifications that are not deprecated must have a gitUrl attribute that starts with ''https://github.com/NHSDigital/'' ', @key)"/>
+        </xsl:when>
         <xsl:when test="@defaultWorkgroup='eu' and not(starts-with(@gitUrl, 'https://github.com/HL7-eu/'))">
           <xsl:message terminate="yes" select="concat('ERROR: FHIR HL7 EU specifications that are not deprecated must have a gitUrl attribute that starts with ''https://github.com/HL7-eu/'' ', @key)"/>
         </xsl:when>

tools/xmlToJson.xslt

@@ -4,6 +4,7 @@
 	<xsl:template match="workgroups">
     <xsl:call-template name="doArray">
       <xsl:with-param name="name" select="'workgroup'"/>
+      <xsl:with-param name="markDeprecated" select="true()"/>
     </xsl:call-template>
 	</xsl:template>
 	<xsl:template match="accelerators">
@@ -83,11 +84,15 @@
     <xsl:value-of select="concat('&quot;', @value, '&quot;')"/>
 	</xsl:template>
 	<xsl:template match="*">
+    <xsl:param name="markDeprecated"/>
     <xsl:text>{</xsl:text>
-    <xsl:call-template name="doAttributes"/>
+    <xsl:call-template name="doAttributes">
+      <xsl:with-param name="markDeprecated" select="$markDeprecated"/>
+    </xsl:call-template>
     <xsl:text>}</xsl:text>	
 	</xsl:template>
 	<xsl:template name="doAttributes">
+    <xsl:param name="markDeprecated"/>
     <xsl:for-each select="@*[not(contains(name(.), ':'))]">
       <xsl:choose>
         <xsl:when test="local-name(.)=('deprecated')">
@@ -101,6 +106,9 @@
           <xsl:call-template name="escapeText">
             <xsl:with-param name="text" select="."/>
           </xsl:call-template>
+          <xsl:if test="local-name(.)='name' and $markDeprecated and parent::*/@deprecated='true'">
+            <xsl:text> [deprecated]</xsl:text>
+          </xsl:if>
           <xsl:text>"</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
@@ -131,9 +139,12 @@
   </xsl:template>
 	<xsl:template name="doArray">
     <xsl:param name="name"/>
+    <xsl:param name="markDeprecated"/>
     <xsl:text>[</xsl:text>
     <xsl:for-each select="*[local-name(.)=$name]">
-      <xsl:apply-templates select="."/>
+      <xsl:apply-templates select=".">
+        <xsl:with-param name="markDeprecated" select="$markDeprecated"/>
+      </xsl:apply-templates>
       <xsl:if test="position()!=last()">,</xsl:if>
     </xsl:for-each>
     <xsl:text>]</xsl:text>

xml/CDA-ccda-two-one-companion.xml

@@ -6,7 +6,7 @@
  xsi:noNamespaceSchemaLocation="schemas/specification.xsd" defaultVersion="INF1"
  defaultWorkgroup="sd">-->
 	<version code="4.1.1" deprecated="false"/>
-	<version code="4.1.0" deprecated="false"/>
+	<version code="4.1.0" deprecated="true"/>
 	<version code="4.1.0-ballot" deprecated="true"/>
 	<version code="3.1.0" deprecated="true"/>
 	<version code="3.1.0-ballot" deprecated="true"/>