Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Sep 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CIMCheck/CIMCheck.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion CIMCheck/html/CIMCheck_API.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion CIMToolFeature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion CIMToolHelp/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion CIMToolHelp/html/CIMCheck_API.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion CIMToolPlugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion CIMToolPlugin/builders/builders.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion CIMToolProduct/CIMTool.product
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion CIMToolProduct/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions CIMToolProduct/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -30,7 +30,7 @@
</property>
<property
name="appName"
value="CIMTool 1.10.0">
value="CIMTool 1.10.1">
</property>
<property
name="startupForegroundColor"
Expand Down
2 changes: 1 addition & 1 deletion CIMUtil/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading