Skip to content

Commit 175d931

Browse files
seidewitzseidewitz
committed
Merge branch 'v1.1.2-development'
2 parents 1f942be + 3007311 commit 175d931

7 files changed

Lines changed: 3922 additions & 11196 deletions

File tree

‎org.modeldriven.fuml/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<artifactId>fuml</artifactId>
66
<packaging>jar</packaging>
77
<name>FUML Reference Implementation</name>
8-
<version>1.1.1</version>
8+
<version>1.1.2</version>
99
<description>This open source software is a reference implementation, consisting of software and related files, for the OMG specification called the Semantics of a Foundational Subset for Executable UML Models (fUML). The reference implementation is intended to implement the execution semantics of UML activity models, accepting an XMI file from a conformant UML model as its input and providing an execution trace of the selected activity model(s) as its output. The core execution engine, which is directly generated from the normative syntactic and semantic models for fUML, may also be used as a library implementation of fUML in other software.</description>
10-
<url>http://maven.apache.org</url>
10+
<url>http:/fuml.modeldriven.org</url>
1111
<licenses>
1212
<license>
1313
<name>FUML Reference Implementation License</name>

‎org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/config/DefaultFumlConfig.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152

153153
<BehaviorExecutionMapping className="FoundationalModelLibrary.PrimitiveBehaviors.ListFunctions.ListGet" executionClassName="org.modeldriven.fuml.library.listfunctions.ListGetFunctionBehaviorExecution"/>
154154
<BehaviorExecutionMapping className="FoundationalModelLibrary.PrimitiveBehaviors.ListFunctions.ListSize" executionClassName="org.modeldriven.fuml.library.listfunctions.ListSizeFunctionBehaviorExecution"/>
155+
<BehaviorExecutionMapping className="FoundationalModelLibrary.PrimitiveBehaviors.ListFunctions.ListConcat" executionClassName="org.modeldriven.fuml.library.listfunctions.ListConcatFunctionBehaviorExecution"/>
155156

156157
</MappingConfiguration>
157158

‎org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/library/fUML_Library.xmi‎

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@
808808
xmi:id="PrimitiveBehaviors-UnlimitedNaturalFunctions-ToInteger-result"
809809
name="result" direction="return">
810810
<type
811-
href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#UnlimitedNatural"/>
811+
href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#Integer"/>
812812
<lowerValue xmi:type="uml:LiteralInteger"
813813
xmi:id="PrimitiveBehaviors-UnlimitedNaturalFunctions-ToInteger-result-_lowerValue"
814814
/>
@@ -1016,7 +1016,8 @@
10161016
xmi:id="PrimitiveBehaviors-ListFunctions-ListSize" name="ListSize"
10171017
isAbstract="true" isReentrant="false">
10181018
<ownedParameter xmi:type="uml:Parameter"
1019-
xmi:id="PrimitiveBehaviors-ListFunctions-ListSize-list" name="list">
1019+
xmi:id="PrimitiveBehaviors-ListFunctions-ListSize-list" name="list"
1020+
isUnique="false">
10201021
<lowerValue xmi:type="uml:LiteralInteger"
10211022
xmi:id="PrimitiveBehaviors-ListFunctions-ListSize-list-_lowerValue"/>
10221023
<upperValue xmi:type="uml:LiteralUnlimitedNatural"
@@ -1034,7 +1035,8 @@
10341035
xmi:id="PrimitiveBehaviors-ListFunctions-ListGet" name="ListGet"
10351036
isAbstract="true" isReentrant="false">
10361037
<ownedParameter xmi:type="uml:Parameter"
1037-
xmi:id="PrimitiveBehaviors-ListFunctions-ListGet-list" name="list">
1038+
xmi:id="PrimitiveBehaviors-ListFunctions-ListGet-list" name="list"
1039+
isOrdered="true" isUnique="false">
10381040
<lowerValue xmi:type="uml:LiteralInteger"
10391041
xmi:id="PrimitiveBehaviors-ListFunctions-ListGet-list-_lowerValue"/>
10401042
<upperValue xmi:type="uml:LiteralUnlimitedNatural"
@@ -1053,6 +1055,37 @@
10531055
/>
10541056
</ownedParameter>
10551057
</packagedElement>
1058+
<packagedElement xmi:type="uml:FunctionBehavior"
1059+
xmi:id="PrimitiveBehaviors-ListFunctions-ListConcat" name="ListConcat"
1060+
isAbstract="true" isReentrant="false">
1061+
<ownedParameter xmi:type="uml:Parameter"
1062+
xmi:id="PrimitiveBehaviors-ListFunctions-ListConcat-list1" name="list1"
1063+
isOrdered = "true" isUnique = "false">
1064+
<lowerValue xmi:type="uml:LiteralInteger"
1065+
xmi:id="PrimitiveBehaviors-ListFunctions-ListConcat-list1-_lowerValue"/>
1066+
<upperValue xmi:type="uml:LiteralUnlimitedNatural"
1067+
xmi:id="PrimitiveBehaviors-ListFunctions-ListConcat-list1-_upperValue"
1068+
value="*"/>
1069+
</ownedParameter>
1070+
<ownedParameter xmi:type="uml:Parameter"
1071+
xmi:id="PrimitiveBehaviors-ListFunctions-ListConcat-list2" name="list2"
1072+
isOrdered = "true" isUnique = "false">
1073+
<lowerValue xmi:type="uml:LiteralInteger"
1074+
xmi:id="PrimitiveBehaviors-ListFunctions-ListConcat-list2-_lowerValue"/>
1075+
<upperValue xmi:type="uml:LiteralUnlimitedNatural"
1076+
xmi:id="PrimitiveBehaviors-ListFunctions-ListConcat-list2-_upperValue"
1077+
value="*"/>
1078+
</ownedParameter>
1079+
<ownedParameter xmi:type="uml:Parameter"
1080+
xmi:id="PrimitiveBehaviors-ListFunctions-ListConcat-result" name="result"
1081+
direction="return" isOrdered = "true" isUnique = "false">
1082+
<lowerValue xmi:type="uml:LiteralInteger"
1083+
xmi:id="PrimitiveBehaviors-ListFunctions-ListConcat-result-_lowerValue"/>
1084+
<upperValue xmi:type="uml:LiteralUnlimitedNatural"
1085+
xmi:id="PrimitiveBehaviors-ListFunctions-ListConcat-result-_upperValue"
1086+
value="*"/>
1087+
</ownedParameter>
1088+
</packagedElement>
10561089
</packagedElement>
10571090
</packagedElement>
10581091
<packagedElement xmi:type="uml:Package" xmi:id="BasicInputOutput" name="BasicInputOutput">
@@ -1403,7 +1436,7 @@
14031436
</ownedParameter>
14041437
<ownedParameter xmi:type="uml:Parameter"
14051438
xmi:id="BasicInputOutput-WriteLine-errorStatus" name="errorStatus"
1406-
direction="out">
1439+
direction="out" type = "Common-Status">
14071440
<lowerValue xmi:type="uml:LiteralInteger"
14081441
xmi:id="BasicInputOutput-WriteLine-errorStatus-_lowerValue"/>
14091442
</ownedParameter>
@@ -1522,12 +1555,12 @@
15221555
name="ReadLine" isReentrant="false">
15231556
<ownedParameter xmi:type="uml:Parameter"
15241557
xmi:id="BasicInputOutput-ReadLine-errorStatus" name="errorStatus"
1525-
direction="out">
1558+
direction="out" type = "Common-Status">
15261559
<lowerValue xmi:type="uml:LiteralInteger"
15271560
xmi:id="BasicInputOutput-ReadLine-errorStatus-_lowerValue"/>
15281561
</ownedParameter>
15291562
<ownedParameter xmi:type="uml:Parameter" xmi:id="BasicInputOutput-ReadLine-result"
1530-
name="result" direction="out">
1563+
name="result" direction="return">
15311564
<type href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
15321565
</ownedParameter>
15331566
<edge xmi:type="uml:ObjectFlow" xmi:id="BasicInputOutput-ReadLine-_edge.0"
@@ -1624,8 +1657,7 @@
16241657
</packagedElement>
16251658
</packagedElement>
16261659
<packagedElement xmi:type="uml:Package" xmi:id="Common" name="Common">
1627-
<packagedElement xmi:type="uml:Signal" xmi:id="Common-Notification" name="Notification"
1628-
visibility="private">
1660+
<packagedElement xmi:type="uml:Signal" xmi:id="Common-Notification" name="Notification">
16291661
<ownedAttribute xmi:type="uml:Property" xmi:id="Common-Notification-content"
16301662
name="content" visibility="public">
16311663
<lowerValue xmi:type="uml:LiteralInteger"
@@ -1634,8 +1666,8 @@
16341666
</packagedElement>
16351667
<packagedElement xmi:type="uml:Class" xmi:id="Common-Listener" name="Listener"
16361668
isAbstract="true" isActive="true">
1637-
<ownedReception xmi:type="uml:Reception" xmi:id="Common-Listener-_ownedReception.0"
1638-
signal="Common-Notification"/>
1669+
<ownedReception xmi:type="uml:Reception" xmi:id="Common-Listener-Notification"
1670+
name = "Notification" signal="Common-Notification"/>
16391671
</packagedElement>
16401672
<packagedElement xmi:type="uml:DataType" xmi:id="Common-Status" name="Status">
16411673
<ownedAttribute xmi:type="uml:Property" xmi:id="Common-Status-context"

‎org.modeldriven.fuml/src/test/resources/TestFumlConfig.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168

169169
<BehaviorExecutionMapping className="FoundationalModelLibrary.PrimitiveBehaviors.ListFunctions.ListGet" executionClassName="org.modeldriven.fuml.library.listfunctions.ListGetFunctionBehaviorExecution"/>
170170
<BehaviorExecutionMapping className="FoundationalModelLibrary.PrimitiveBehaviors.ListFunctions.ListSize" executionClassName="org.modeldriven.fuml.library.listfunctions.ListSizeFunctionBehaviorExecution"/>
171+
<BehaviorExecutionMapping className="FoundationalModelLibrary.PrimitiveBehaviors.ListFunctions.ListConcat" executionClassName="org.modeldriven.fuml.library.listfunctions.ListConcatFunctionBehaviorExecution"/>
171172

172173
</MappingConfiguration>
173174

0 commit comments

Comments
 (0)