Merge pull request #43 from CIMug-org/master

Merge 1.10.1 patch release back into the current 1.11.0 RC1 branch.

CIMCheck/CIMCheck.xml

@@ -8,14 +8,14 @@
         <jar destfile="../CIMCheck/build/cimcheck.jar">
             <manifest>
                 <attribute name="Main-Class" value="au.com.langdale.cimcheck.CIMCheck"/>
-                <attribute name="Class-Path" value=". scala-library.jar icu4j_3_4.jar iri.jar jena.jar log4j-1.2.12.jar slf4j-api-1.5.6.jar slf4j-log4j12-1.5.6.jar xercesImpl.jar"/>
+                <attribute name="Class-Path" value=". scala-library.jar icu4j-71.1.jar iri.jar jena.jar log4j-1.2.12.jar slf4j-api-1.5.6.jar slf4j-log4j12-1.5.6.jar xercesImpl.jar"/>
             </manifest>
             <fileset dir="../CIMCheck/bin"/>
             <fileset dir="../Kena/bin"/>
             <fileset dir="../CIMUtil/bin"/>
         </jar>
         <copy file="../CIMCheck/lib/scala-library.jar" todir="../CIMCheck/build"/>
-        <copy file="../Kena/lib/icu4j_3_4.jar" todir="../CIMCheck/build"/>
+        <copy file="../Kena/lib/icu4j-71.1.jar" todir="../CIMCheck/build"/>
         <copy file="../Kena/lib/iri.jar" todir="../CIMCheck/build"/>
         <copy file="../Kena/lib/jena.jar" todir="../CIMCheck/build"/>
         <copy file="../Kena/lib/log4j-1.2.12.jar" todir="../CIMCheck/build"/>

CIMCheck/html/CIMCheck_API.html

@@ -15,7 +15,7 @@
           <h1>CIMCheck API</h1>
         </div>
         <div id="main">
-          <div id="content"><p>A simple API for embedding <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> into a Java program. The API allows a series of CIM/XML files to be validated against a CIM profile and, optionally, a set of rules.</p><p>To use this API, the jar files found in the <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> distribution must be on the classpath.  That is, the classpath should include:</p><p><a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a>.jar<br />scala-library.jar <br />icu4j_3_4.jar <br />iri.jar <br />jena.jar <br />log4j-1.2.12.jar <br />slf4j-api-1.5.6.jar <br />slf4j-log4j12-1.5.6.jar <br />xercesImpl.jar</p><p>The <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a>.jar archive contains code derived from CIMTool. The remaining jar files are third party software on which the software depends.</p><h2>package au.com.langdale<br />class <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a></h2><p>This class provides the entry point for the <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> API through two public static methods. Then main() method is the entry point for the <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> command line tool. The createChecker() method is an internal entry point that gives finer control over the validation process.</p><h3>public static Checker createChecker( String profileName, String rulesName)  </h3><p>Creates a <code>Checker</code> object which can be used to validate a number of CIM/XML files.  </p><p>The <code>profileName</code> is the pathname of a  <code>.simple-owl</code> file containing the CIM profile to be used in validation.  This file can be created by CIMTool and copied from the Profile directory of a CIMTool project.</p><p>The <code>rulesName</code> is the pathname of a <code>.rules</code> files containing the interpretation of the profile and the validation process.  This file can be created by CIMTool and copied from the Profile directory of a CIMTool project.</p><p>The <code>rulesName</code> can be <code>null</code> in which case a built in set of rules is applied.</p><h3>public static void main( String[] args )</h3><p>This is the entry point for the <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> command line tool.  The args are interpreted as per the <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> manual page.</p><h2>package au.com.langdale<br />class Checker</h2><p>An instance of this class contains the result of parsing and preprocessing a profile and a rules file. It can be used to validate a number of CIM/XML files. </p><h3>public int check( String modelName, String workArea, java.io.OutputStream output )</h3><p>Validates one CIM/XML file.</p><p>The <code>modelName</code> is the pathname of the CIM/XML file to be validated.</p><p>The <code>workArea</code> is the pathname of a temporary storage directory used during validation. The directory is created if it does not exist. </p><p>The <code>output</code> is a stream to which validation messages are written.</p><p>The return value is the number of validation errors detected.</p></div>
+          <div id="content"><p>A simple API for embedding <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> into a Java program. The API allows a series of CIM/XML files to be validated against a CIM profile and, optionally, a set of rules.</p><p>To use this API, the jar files found in the <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> distribution must be on the classpath.  That is, the classpath should include:</p><p><a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a>.jar<br />scala-library.jar <br />icu4j-71.1.jar <br />iri.jar <br />jena.jar <br />log4j-1.2.12.jar <br />slf4j-api-1.5.6.jar <br />slf4j-log4j12-1.5.6.jar <br />xercesImpl.jar</p><p>The <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a>.jar archive contains code derived from CIMTool. The remaining jar files are third party software on which the software depends.</p><h2>package au.com.langdale<br />class <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a></h2><p>This class provides the entry point for the <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> API through two public static methods. Then main() method is the entry point for the <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> command line tool. The createChecker() method is an internal entry point that gives finer control over the validation process.</p><h3>public static Checker createChecker( String profileName, String rulesName)  </h3><p>Creates a <code>Checker</code> object which can be used to validate a number of CIM/XML files.  </p><p>The <code>profileName</code> is the pathname of a  <code>.simple-owl</code> file containing the CIM profile to be used in validation.  This file can be created by CIMTool and copied from the Profile directory of a CIMTool project.</p><p>The <code>rulesName</code> is the pathname of a <code>.rules</code> files containing the interpretation of the profile and the validation process.  This file can be created by CIMTool and copied from the Profile directory of a CIMTool project.</p><p>The <code>rulesName</code> can be <code>null</code> in which case a built in set of rules is applied.</p><h3>public static void main( String[] args )</h3><p>This is the entry point for the <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> command line tool.  The args are interpreted as per the <a href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html" class="internal">CIMCheck</a> manual page.</p><h2>package au.com.langdale<br />class Checker</h2><p>An instance of this class contains the result of parsing and preprocessing a profile and a rules file. It can be used to validate a number of CIM/XML files. </p><h3>public int check( String modelName, String workArea, java.io.OutputStream output )</h3><p>Validates one CIM/XML file.</p><p>The <code>modelName</code> is the pathname of the CIM/XML file to be validated.</p><p>The <code>workArea</code> is the pathname of a temporary storage directory used during validation. The directory is created if it does not exist. </p><p>The <code>output</code> is a stream to which validation messages are written.</p><p>The return value is the number of validation errors detected.</p></div>
 
           <div id="menu"><ul>
 

CIMToolFeature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="au.com.langdale.cimtoole.feature"
       label="CIMTool"
-      version="1.10.0"
+      version="1.10.1"
       provider-name="Langdale Consultants">
 
    <description url="http://cimtool.org">

CIMToolHelp/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CIMTool Help Plug-in
 Bundle-SymbolicName: au.com.langdale.cimtoole.help;singleton:=true
-Bundle-Version: 1.10.0
+Bundle-Version: 1.10.1
 Bundle-ClassPath: CIMToolHelp
 Bundle-Vendor: Langdale Consultants
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

CIMToolHelp/html/CIMCheck_API.html

@@ -15,7 +15,7 @@
           <h1>CIMCheck API</h1>
         </div>
         <div id="main">
-          <div id="content"><p>A simple API for embedding <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> into a Java program. The API allows a series of CIM/XML files to be validated against a CIM profile and, optionally, a set of rules.</p><p>To use this API, the jar files found in the <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> distribution must be on the classpath.  That is, the classpath should include:</p><p><a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a>.jar<br />scala-library.jar <br />icu4j_3_4.jar <br />iri.jar <br />jena.jar <br />log4j-1.2.12.jar <br />slf4j-api-1.5.6.jar <br />slf4j-log4j12-1.5.6.jar <br />xercesImpl.jar</p><p>The <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a>.jar archive contains code derived from CIMTool. The remaining jar files are third party software on which the software depends.</p><h2>package au.com.langdale<br />class <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a></h2><p>This class provides the entry point for the <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> API through two public static methods. Then main() method is the entry point for the <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> command line tool. The createChecker() method is an internal entry point that gives finer control over the validation process.</p><h3>public static Checker createChecker( String profileName, String rulesName)  </h3><p>Creates a <code>Checker</code> object which can be used to validate a number of CIM/XML files.  </p><p>The <code>profileName</code> is the pathname of a  <code>.simple-owl</code> file containing the CIM profile to be used in validation.  This file can be created by CIMTool and copied from the Profile directory of a CIMTool project.</p><p>The <code>rulesName</code> is the pathname of a <code>.rules</code> files containing the interpretation of the profile and the validation process.  This file can be created by CIMTool and copied from the Profile directory of a CIMTool project.</p><p>The <code>rulesName</code> can be <code>null</code> in which case a built in set of rules is applied.</p><h3>public static void main( String[] args )</h3><p>This is the entry point for the <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> command line tool.  The args are interpreted as per the <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> manual page.</p><h2>package au.com.langdale<br />class Checker</h2><p>An instance of this class contains the result of parsing and preprocessing a profile and a rules file. It can be used to validate a number of CIM/XML files. </p><h3>public int check( String modelName, String workArea, java.io.OutputStream output )</h3><p>Validates one CIM/XML file.</p><p>The <code>modelName</code> is the pathname of the CIM/XML file to be validated.</p><p>The <code>workArea</code> is the pathname of a temporary storage directory used during validation. The directory is created if it does not exist. </p><p>The <code>output</code> is a stream to which validation messages are written.</p><p>The return value is the number of validation errors detected.</p></div>
+          <div id="content"><p>A simple API for embedding <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> into a Java program. The API allows a series of CIM/XML files to be validated against a CIM profile and, optionally, a set of rules.</p><p>To use this API, the jar files found in the <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> distribution must be on the classpath.  That is, the classpath should include:</p><p><a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a>.jar<br />scala-library.jar <br />icu4j-71.1.jar <br />iri.jar <br />jena.jar <br />log4j-1.2.12.jar <br />slf4j-api-1.5.6.jar <br />slf4j-log4j12-1.5.6.jar <br />xercesImpl.jar</p><p>The <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a>.jar archive contains code derived from CIMTool. The remaining jar files are third party software on which the software depends.</p><h2>package au.com.langdale<br />class <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a></h2><p>This class provides the entry point for the <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> API through two public static methods. Then main() method is the entry point for the <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> command line tool. The createChecker() method is an internal entry point that gives finer control over the validation process.</p><h3>public static Checker createChecker( String profileName, String rulesName)  </h3><p>Creates a <code>Checker</code> object which can be used to validate a number of CIM/XML files.  </p><p>The <code>profileName</code> is the pathname of a  <code>.simple-owl</code> file containing the CIM profile to be used in validation.  This file can be created by CIMTool and copied from the Profile directory of a CIMTool project.</p><p>The <code>rulesName</code> is the pathname of a <code>.rules</code> files containing the interpretation of the profile and the validation process.  This file can be created by CIMTool and copied from the Profile directory of a CIMTool project.</p><p>The <code>rulesName</code> can be <code>null</code> in which case a built in set of rules is applied.</p><h3>public static void main( String[] args )</h3><p>This is the entry point for the <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> command line tool.  The args are interpreted as per the <a class="internal" href="PLUGINS_ROOT/au.com.langdale.cimtoole.help/html/CIMCheck.html">CIMCheck</a> manual page.</p><h2>package au.com.langdale<br />class Checker</h2><p>An instance of this class contains the result of parsing and preprocessing a profile and a rules file. It can be used to validate a number of CIM/XML files. </p><h3>public int check( String modelName, String workArea, java.io.OutputStream output )</h3><p>Validates one CIM/XML file.</p><p>The <code>modelName</code> is the pathname of the CIM/XML file to be validated.</p><p>The <code>workArea</code> is the pathname of a temporary storage directory used during validation. The directory is created if it does not exist. </p><p>The <code>output</code> is a stream to which validation messages are written.</p><p>The return value is the number of validation errors detected.</p></div>
 
           <div id="menu"><ul>
 

CIMToolPlugin/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CIMTool Plug-in
 Bundle-SymbolicName: au.com.langdale.cimtoole;singleton:=true
-Bundle-Version: 1.10.0
+Bundle-Version: 1.10.1
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: cimtoole.jar,
  lib/commons-logging-1.1.1.jar,

CIMToolPlugin/builders/builders.json

@@ -47,7 +47,7 @@
         "datetime": "2022-06-01T00:00:00Z",
         "ext": "draft-2020-12.schema.json"
     },
-    "rtf": {
+    "profile-doc-rtf": {
         "type": "TRANSFORM",
         "style": "profile-doc-rtf",
         "datetime": "2022-08-01T00:00:00Z",

CIMToolProduct/CIMTool.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="CIMTool 1.10.0" uid="au.com.langdale.cimtool.deployment" id="au.com.langdale.cimtool.product.ide" application="org.eclipse.ui.ide.workbench" version="1.10.0" useFeatures="false" includeLaunchers="true">
+<product name="CIMTool 1.10.1" uid="au.com.langdale.cimtool.deployment" id="au.com.langdale.cimtool.product.ide" application="org.eclipse.ui.ide.workbench" version="1.10.1" useFeatures="false" includeLaunchers="true">
 
    <aboutInfo>
       <image path="about.png"/>

CIMToolProduct/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CIMToolEnvironment
 Bundle-SymbolicName: au.com.langdale.cimtool.product;singleton:=true
-Bundle-Version: 1.10.0
+Bundle-Version: 1.10.1
 Bundle-ClassPath: CIMToolProduct
 Bundle-Vendor: Langdale Consultants

CIMToolProduct/plugin.xml

@@ -7,7 +7,7 @@
          point="org.eclipse.core.runtime.products">
       <product
             application="org.eclipse.ui.ide.workbench"
-            name="CIMTool 1.10.0">
+            name="CIMTool 1.10.1">
          <property
                name="windowImages"
                value="icon-16.png,icon-32.png,icon-48.png,icon-64.png">
@@ -30,7 +30,7 @@
          </property>
          <property
                name="appName"
-               value="CIMTool 1.10.0">
+               value="CIMTool 1.10.1">
          </property>
          <property
                name="startupForegroundColor"

CIMUtil/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CIMUtil
 Bundle-SymbolicName: au.com.langdale.cimutil
-Bundle-Version: 1.10.0
+Bundle-Version: 1.10.1
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: au.com.langdale.kena
 Bundle-ClassPath: cimutil.jar,