Merge pull request #161 from cimug-org/release-2.2.0

Release 2.2.0
cimug-org · Oct 2, 2024 · 07f638b · 07f638b
2 parents c5fab63 + 593019c
commit 07f638b
Show file tree

Hide file tree

Showing 55 changed files with 4,352 additions and 1,984 deletions.
diff --git a/CIMToolFeature/feature.xml b/CIMToolFeature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="au.com.langdale.cimtoole.feature"
       label="CIMTool"
-      version="2.1.0"
+      version="2.2.0"
       provider-name="Langdale Consultants">
 
    <description url="https://cimtool.ucaiug.io">
@@ -69,7 +69,7 @@ info@healthmarketscience redistributed under the LGPL version 2.1.
       <import plugin="org.eclipse.jface" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.workbench" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="au.com.langdale.cimutil" version="1.8.2" match="greaterOrEqual"/>
-      <import plugin="au.com.langdale.rcputil" version="2.1.0" match="greaterOrEqual"/>
+      <import plugin="au.com.langdale.rcputil" version="2.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf" version="2.5.0" match="greaterOrEqual"/>

diff --git a/CIMToolHelp/META-INF/MANIFEST.MF b/CIMToolHelp/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Automatic-Module-Name: au.com.langdale.cimtoole.help
 Bundle-Name: CIMTool Help Plug-in
 Bundle-SymbolicName: au.com.langdale.cimtoole.help;singleton:=true
-Bundle-Version: 2.1.0
+Bundle-Version: 2.2.0
 Bundle-ClassPath: CIMToolHelp
 Bundle-Vendor: Langdale Consultants
 Bundle-RequiredExecutionEnvironment: JavaSE-20
diff --git a/CIMToolPlugin/META-INF/MANIFEST.MF b/CIMToolPlugin/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Automatic-Module-Name: au.com.langdale.cimtoole
 Bundle-Name: CIMTool Plug-in
 Bundle-SymbolicName: au.com.langdale.cimtoole;singleton:=true
-Bundle-Version: 2.1.0
+Bundle-Version: 2.2.0
 Bundle-RequiredExecutionEnvironment: JavaSE-20
 Bundle-ClassPath: cimtoole.jar,
  lib/commons-logging-1.1.1.jar,

diff --git a/CIMToolPlugin/builders/builders.json b/CIMToolPlugin/builders/builders.json
@@ -56,13 +56,13 @@
     "rdfs-augmented-cimcontextor": {
         "type": "TRANSFORM",
         "style": "rdfs-augmented-cimcontextor",
-        "datetime": "2024-01-29T00:00:00Z",
+        "datetime": "2024-10-01T00:00:00Z",
         "ext": "augmented-cimcontextor.rdfs"
     },
     "rdfs-2020": {
         "type": "TRANSFORM",
         "style": "rdfs-2020",
-        "datetime": "2024-01-30T00:00:00Z",
+        "datetime": "2024-10-01T00:00:00Z",
         "ext": "rdfs-2020.rdfs"
     },
     "linkml": {
@@ -82,5 +82,23 @@
         "style": "cimantic-graphs-init",
         "datetime": "2024-08-07T00:00:00Z",
         "ext": "__init__.py"
+    },
+    "rdfs-501ed2-beta": {
+        "type": "TRANSFORM",
+        "style": "rdfs-501ed2-beta",
+        "datetime": "2024-09-20T00:00:00Z",
+        "ext": "rdfs-501ed2-beta.rdfs"
+    },
+    "puml-t2b": {
+        "type": "TEXT",
+        "style": "puml-t2b",
+        "datetime": "2024-09-30T00:00:00Z",
+        "ext": "t2b.puml"
+    },
+    "puml-l2r": {
+        "type": "TEXT",
+        "style": "puml-l2r",
+        "datetime": "2024-09-30T00:00:00Z",
+        "ext": "l2r.puml"
     }
 }
diff --git a/CIMToolPlugin/builders/json-schema-draft-07-lite.xsl b/CIMToolPlugin/builders/json-schema-draft-07-lite.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:a="http://langdale.com.au/2005/Message#" xmlns:sawsdl="http://www.w3.org/ns/sawsdl" xmlns="http://langdale.com.au/2009/Indent">
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:a="http://langdale.com.au/2005/Message#" xmlns:sawsdl="http://www.w3.org/ns/sawsdl" xmlns="http://langdale.com.au/2009/Indent">
 	<xsl:output indent="yes" encoding="utf-8"/>
     <xsl:param name="copyright-single-line" />
 	<xsl:param name="version"/>
@@ -1012,7 +1012,7 @@
 	<!-- END SECTION:  ComplexType, Root, & CompoundType(s) attribute/association templates                           -->
 	<!-- ============================================================================================================ -->
 	<xsl:template name="annotate">
-		<xsl:variable name="notes" select="a:Comment|a:Note"/>
+		<xsl:param name="notes" select="a:Comment|a:Note"/>
 		<!-- generate human readable annotation -->
 		<list begin="" indent="" delim=" " end="">
 			<xsl:for-each select="$notes">

diff --git a/CIMToolPlugin/builders/json-schema-draft-07.xsl b/CIMToolPlugin/builders/json-schema-draft-07.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:a="http://langdale.com.au/2005/Message#" xmlns:sawsdl="http://www.w3.org/ns/sawsdl" xmlns="http://langdale.com.au/2009/Indent">
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:a="http://langdale.com.au/2005/Message#" xmlns:sawsdl="http://www.w3.org/ns/sawsdl" xmlns="http://langdale.com.au/2009/Indent">
 	<xsl:output indent="yes" encoding="utf-8"/>
     <xsl:param name="copyright-single-line" />
 	<xsl:param name="version"/>
@@ -1014,7 +1014,7 @@
 	<!-- END SECTION:  ComplexType, Root, & CompoundType(s) attribute/association templates                           -->
 	<!-- ============================================================================================================ -->
 	<xsl:template name="annotate">
-		<xsl:variable name="notes" select="a:Comment|a:Note"/>
+		<xsl:param name="notes" select="a:Comment|a:Note"/>
 		<!-- generate human readable annotation -->
 		<list begin="" indent="" delim=" " end="">
 			<xsl:for-each select="$notes">

diff --git a/CIMToolPlugin/builders/json-schema-draft-2020-12-lite.xsl b/CIMToolPlugin/builders/json-schema-draft-2020-12-lite.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:a="http://langdale.com.au/2005/Message#" xmlns:sawsdl="http://www.w3.org/ns/sawsdl" xmlns="http://langdale.com.au/2009/Indent">
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:a="http://langdale.com.au/2005/Message#" xmlns:sawsdl="http://www.w3.org/ns/sawsdl" xmlns="http://langdale.com.au/2009/Indent">
 	<xsl:output indent="yes" encoding="utf-8"/>
     <xsl:param name="copyright-single-line" />
 	<xsl:param name="version"/>
@@ -1012,7 +1012,7 @@
 	<!-- END SECTION:  ComplexType, Root, & CompoundType(s) attribute/association templates                           -->
 	<!-- ============================================================================================================ -->
 	<xsl:template name="annotate">
-		<xsl:variable name="notes" select="a:Comment|a:Note"/>
+		<xsl:param name="notes" select="a:Comment|a:Note"/>
 		<!-- generate human readable annotation -->
 		<list begin="" indent="" delim=" " end="">
 			<xsl:for-each select="$notes">

diff --git a/CIMToolPlugin/builders/json-schema-draft-2020-12.xsl b/CIMToolPlugin/builders/json-schema-draft-2020-12.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:a="http://langdale.com.au/2005/Message#" xmlns:sawsdl="http://www.w3.org/ns/sawsdl" xmlns="http://langdale.com.au/2009/Indent">
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:a="http://langdale.com.au/2005/Message#" xmlns:sawsdl="http://www.w3.org/ns/sawsdl" xmlns="http://langdale.com.au/2009/Indent">
 	<xsl:output indent="yes" encoding="utf-8"/>
     <xsl:param name="copyright-single-line" />
 	<xsl:param name="version"/>
@@ -1014,7 +1014,7 @@
 	<!-- END SECTION:  ComplexType, Root, & CompoundType(s) attribute/association templates                           -->
 	<!-- ============================================================================================================ -->
 	<xsl:template name="annotate">
-		<xsl:variable name="notes" select="a:Comment|a:Note"/>
+		<xsl:param name="notes" select="a:Comment|a:Note"/>
 		<!-- generate human readable annotation -->
 		<list begin="" indent="" delim=" " end="">
 			<xsl:for-each select="$notes">