Skip to content

Commit

Permalink
Merge pull request #138 from cimug-org/release-2.1.0
Browse files Browse the repository at this point in the history
Release 2.1.0
  • Loading branch information
admin-cimug authored Aug 9, 2024
2 parents 3e98fd5 + 62a29b9 commit 2aa1f31
Show file tree
Hide file tree
Showing 72 changed files with 2,786 additions and 292 deletions.
6 changes: 3 additions & 3 deletions CIMToolFeature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<feature
id="au.com.langdale.cimtoole.feature"
label="CIMTool"
version="2.0.1"
version="2.1.0"
provider-name="Langdale Consultants">

<description url="http://cimtool.org">
<description url="https://cimtool.ucaiug.io">
CIMTool is an open source tool for supporting the IEC Common Information Model (CIM) standards used in the electric power industry.
</description>

Expand Down Expand Up @@ -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.0.1" match="greaterOrEqual"/>
<import plugin="au.com.langdale.rcputil" version="2.1.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"/>
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 @@ -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.0.1
Bundle-Version: 2.1.0
Bundle-ClassPath: CIMToolHelp
Bundle-Vendor: Langdale Consultants
Bundle-RequiredExecutionEnvironment: JavaSE-20
2 changes: 1 addition & 1 deletion CIMToolHelp/html/CIMToolNamespaceSupport.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h3 id="AnnotationFile">Annotation File</h3>
<p>
The file can be edited with the eclipse text editor. (If an external text editor is used,
the workspace must be manually refreshed afterwards.)
An example file to that can be used as a template is found here: <a class="external" href="http://files.cimtool.org/example.annotation.txt">http://files.cimtool.org/example.annotation.txt</a>
An example file to that can be used as a template is found here: <a class="external" href="https://cimtool.ucaiug.io/how-to/example.annotation.txt">https://cimtool.ucaiug.io/how-to/example.annotation.txt</a>
</p>
<p>
The file contains <code>baseuri</code> statements in the RDF TURTLE language. For example, the line:
Expand Down
1 change: 1 addition & 0 deletions CIMToolPlugin/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="native"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 1 addition & 1 deletion CIMToolPlugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.1
Bundle-Version: 2.1.0
Bundle-RequiredExecutionEnvironment: JavaSE-20
Bundle-ClassPath: cimtoole.jar,
lib/commons-logging-1.1.1.jar,
Expand Down
3 changes: 2 additions & 1 deletion CIMToolPlugin/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ bin.includes = builders/,\
lib/commons-io-2.5.jar,\
lib/commons-logging-1.1.1.jar,\
lib/joda-time-2.10.6.jar,\
lib/gson-2.8.6.jar
lib/gson-2.8.6.jar,\
native/
source.cimtoole.jar = src/
jars.compile.order = cimtoole.jar
output.cimtoole.jar = bin/
18 changes: 18 additions & 0 deletions CIMToolPlugin/builders/builders.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,23 @@
"style": "rdfs-2020",
"datetime": "2024-01-30T00:00:00Z",
"ext": "rdfs-2020.rdfs"
},
"linkml": {
"type": "TRANSFORM",
"style": "linkml",
"datetime": "2024-07-29T00:00:00Z",
"ext": "linkml.yaml"
},
"cimantic-graphs": {
"type": "TEXT",
"style": "cimantic-graphs",
"datetime": "2024-08-07T00:00:00Z",
"ext": "cimantic-graphs.py"
},
"cimantic-graphs-init": {
"type": "TEXT",
"style": "cimantic-graphs-init",
"datetime": "2024-08-07T00:00:00Z",
"ext": "__init__.py"
}
}
68 changes: 68 additions & 0 deletions CIMToolPlugin/builders/cimantic-graphs-init.xsl
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This builder is released under a BSD-3 license as part of the CIMantic Graphs library developed by PNNL.
This software was created under a project sponsored by the U.S. Department of Energy’s Office of Electricity,
an agency of the United States Government. Neither the United States Government nor the United States Department
of Energy, nor Battelle, nor any of their employees, nor any jurisdiction or organization that has cooperated
in the development of these materials, makes any warranty, express or implied, or assumes any legal liability
or responsibility for the accuracy, completeness, or usefulness or any information, apparatus, product, software,
or process disclosed, or represents that its use would not infringe privately owned rights.
Reference herein to any specific commercial product, process, or service by trade name, trademark, manufacturer,
or otherwise does not necessarily constitute or imply its endorsement, recommendation, or favoring by the United
States Government or any agency thereof, or Battelle Memorial Institute. The views and opinions of authors expressed
herein do not necessarily state or reflect those of the United States Government or any agency thereof.
PACIFIC NORTHWEST NATIONAL LABORATORY operated by BATTELLE for the UNITED STATES DEPARTMENT OF ENERGY
under Contract DE-AC05-76RL01830
-->
<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:output indent="yes" method="xml" encoding="utf-8" />
<xsl:param name="version"/>
<xsl:param name="baseURI"/>
<xsl:param name="ontologyURI"/>
<xsl:param name="envelope">Profile</xsl:param>
<xsl:param name="package">au.com.langdale.cimtool.generated</xsl:param>

<!-- Template for __init__.py file -->
<xsl:template match="a:Catalog">
<document>
<!-- Header text with library imports -->
<list begin="'''" indent=" " end="'''">
<item>Annotated CIMantic Graphs data profile init file for
<xsl:value-of select="$envelope" />
</item>
<item>Generated by CIMTool https://cimtool.ucaiug.io</item>
</list>
<!-- Import objects using profile name -->
<item> from cimgraph.data_profile.<xsl:value-of select="$envelope" />.<xsl:value-of select="$envelope" /> import ( </item>
<!-- List all CIM classes to be imported, in alphabetical order -->
<xsl:for-each select="a:Root|a:ComplexType|a:EnumeratedType|a:CompoundType|a:SimpleType">
<xsl:sort select="name" data-type="text" order="ascending"/>
<list begin="" indent=" " end="">
<xsl:value-of select="@name" />
<xsl:if test="position()!=last()">, </xsl:if>
</list>
</xsl:for-each>
<item>)</item>

<!-- List all CIM classes to be imported, in alphabetical order -->
<item> __all__ = [ </item>
<xsl:for-each select="a:Root|a:ComplexType|a:EnumeratedType|a:CompoundType|a:SimpleType">
<xsl:sort select="name" data-type="text" order="ascending"/>
<list begin="" indent=" " end="">
<xsl:value-of select="@name" />
<xsl:if test="position()!=last()">, </xsl:if>
</list>
</xsl:for-each>
<item>]</item>
</document>
</xsl:template>
</xsl:stylesheet>
Loading

0 comments on commit 2aa1f31

Please sign in to comment.