Merge remote-tracking branch 'origin/newgen' into newgen-keznikl

d3scomp · Nov 5, 2013 · a8c763d · a8c763d
2 parents 67b8d05 + c7e6f7f
commit a8c763d
Show file tree

Hide file tree

Showing 62 changed files with 11,805 additions and 1,058 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@
 /dist
 /target
 /jdeeco-core/test-output
+/jdeeco-core/test-temp
 /bin
 doc.zip
 *.ispace

diff --git a/jdeeco-architecture/architecture-04.11.2013.emx b/jdeeco-architecture/architecture-04.11.2013.emx
diff --git a/jdeeco-architecture/architecture-26.10.2013.emx b/jdeeco-architecture/architecture-26.10.2013.emx
@@ -4144,8 +4144,8 @@
         <message xmi:id="_pAtd9D7oEeO2QcBZHbiySQ" name="executionCompleted" messageSort="reply" receiveEvent="_pAuFAD7oEeO2QcBZHbiySQ" sendEvent="_pAtd8z7oEeO2QcBZHbiySQ" connector="_pAuFAT7oEeO2QcBZHbiySQ"/>
         <message xmi:id="_4vd10D7oEeO2QcBZHbiySQ" name="triggered" receiveEvent="_4vec4T7oEeO2QcBZHbiySQ" sendEvent="_4vec4D7oEeO2QcBZHbiySQ" connector="_4vfD8T7oEeO2QcBZHbiySQ"/>
         <message xmi:id="_4vec5D7oEeO2QcBZHbiySQ" name="triggered" messageSort="reply" receiveEvent="_4vfD8D7oEeO2QcBZHbiySQ" sendEvent="_4vec4z7oEeO2QcBZHbiySQ" connector="_4vfD8T7oEeO2QcBZHbiySQ"/>
-        <message xmi:id="_DBL9QD7pEeO2QcBZHbiySQ" name="\Unspecified\" receiveEvent="_DBMkUT7pEeO2QcBZHbiySQ" sendEvent="_DBMkUD7pEeO2QcBZHbiySQ" connector="_DBNLYj7pEeO2QcBZHbiySQ"/>
-        <message xmi:id="_DBNLYD7pEeO2QcBZHbiySQ" name="\Unspecified\" messageSort="reply" receiveEvent="_DBNLYT7pEeO2QcBZHbiySQ" sendEvent="_DBMkUz7pEeO2QcBZHbiySQ" connector="_DBNLYj7pEeO2QcBZHbiySQ"/>
+        <message xmi:id="_DBL9QD7pEeO2QcBZHbiySQ" name="triggered" receiveEvent="_DBMkUT7pEeO2QcBZHbiySQ" sendEvent="_DBMkUD7pEeO2QcBZHbiySQ" connector="_DBNLYj7pEeO2QcBZHbiySQ"/>
+        <message xmi:id="_DBNLYD7pEeO2QcBZHbiySQ" name="triggered" messageSort="reply" receiveEvent="_DBNLYT7pEeO2QcBZHbiySQ" sendEvent="_DBMkUz7pEeO2QcBZHbiySQ" connector="_DBNLYj7pEeO2QcBZHbiySQ"/>
         <message xmi:id="_FwqbQD7pEeO2QcBZHbiySQ" name="execute(triggeringTask)" receiveEvent="_FwrCUT7pEeO2QcBZHbiySQ" sendEvent="_FwrCUD7pEeO2QcBZHbiySQ" connector="_FwrpYj7pEeO2QcBZHbiySQ"/>
         <message xmi:id="_FwrpYD7pEeO2QcBZHbiySQ" name="execute" messageSort="reply" receiveEvent="_FwrpYT7pEeO2QcBZHbiySQ" sendEvent="_FwrCUz7pEeO2QcBZHbiySQ" connector="_FwrpYj7pEeO2QcBZHbiySQ"/>
         <message xmi:id="_RJOO8D7pEeO2QcBZHbiySQ" name="invoke" receiveEvent="_RJJWcD7pEeO2QcBZHbiySQ" sendEvent="_RJIvYD7pEeO2QcBZHbiySQ" connector="_b7UVAz7oEeO2QcBZHbiySQ"/>

diff --git a/jdeeco-architecture/reverse-jdeeco-core.tc b/jdeeco-architecture/reverse-jdeeco-core.tc
@@ -14,7 +14,7 @@
 <Property id="com.ibm.xtools.transform.java.uml.GenerateVizAssociations" value="@45,=@com.ibm.xtools.transform.core.metatype.stringtrue"/>
 <Property id="com.ibm.xtools.transform.uml2.java5.FileDeleteChoice" value="@45,=@com.ibm.xtools.transform.core.metatype.string0"/>
 <Property id="com.ibm.xtools.transform.uml2.java5.internal.Bag" value="@45,=@com.ibm.xtools.transform.core.metatype.stringjava.util.Collection"/>
-<Property id="com.ibm.xtools.transform.uml2.java5.internal.GenerateAccessors" value="@45,=@com.ibm.xtools.transform.core.metatype.stringtrue"/>
+<Property id="com.ibm.xtools.transform.uml2.java5.internal.GenerateAccessors" value="@45,=@com.ibm.xtools.transform.core.metatype.stringfalse"/>
 <Property id="com.ibm.xtools.transform.uml2.java5.internal.GenerateFlatPackages" value="@45,=@com.ibm.xtools.transform.core.metatype.stringtrue"/>
 <Property id="com.ibm.xtools.transform.uml2.java5.internal.OrderedSet" value="@45,=@com.ibm.xtools.transform.core.metatype.stringjava.util.SortedSet"/>
 <Property id="com.ibm.xtools.transform.uml2.java5.internal.Sequence" value="@45,=@com.ibm.xtools.transform.core.metatype.stringjava.util.List"/>

diff --git a/jdeeco-core/model/RuntimeModel.ecore b/jdeeco-core/model/RuntimeModel.ecore
@@ -1,92 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="runtime" nsURI="http://cz.cuni.mff.d3s.deeco.model.runtime/1.0"
-    nsPrefix="cz.cuni.mff.d3s.deeco.model.runtime">
-  <eClassifiers xsi:type="ecore:EClass" name="SchedulingSpecification">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="triggers" upperBound="-1"
-        eType="#//Trigger" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="period" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Trigger" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="KnowledgeChangeTrigger" eSuperTypes="#//Trigger">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="knowledgePath" lowerBound="1"
-        eType="#//KnowledgePath" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="KnowledgePath">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" lowerBound="1" upperBound="-1"
-        eType="#//PathNode" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PathNode" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Method" instanceClassName="java.lang.reflect.Method"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PathNodeField" eSuperTypes="#//PathNode">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PathNodeMapKey" eSuperTypes="#//PathNode">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="keyPath" lowerBound="1"
-        eType="#//KnowledgePath" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RuntimeMetadata">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ensembleDefinitions" upperBound="-1"
-        eType="#//EnsembleDefinition" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstances" upperBound="-1"
-        eType="#//ComponentInstance" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="KnowledgeManager" instanceClassName="cz.cuni.mff.d3s.deeco.knowledge.KnowledgeManager"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentInstance">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentProcesses" upperBound="-1"
-        eType="#//ComponentProcess" containment="true" eOpposite="#//ComponentProcess/componentInstance"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="knowledgeManager" lowerBound="1"
-        eType="#//KnowledgeManager"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="otherKnowledgeManagersAccess"
-        lowerBound="1" eType="#//KnowledgeManagersView"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ensembleControllers" upperBound="-1"
-        eType="#//EnsembleController" containment="true" eOpposite="#//EnsembleController/componentInstance"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EnsembleDefinition">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="membership" lowerBound="1"
-        eType="#//Condition" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="knowledgeExchange" lowerBound="1"
-        eType="#//Exchange" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="schedulingSpecification"
-        lowerBound="1" eType="#//SchedulingSpecification" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Condition" eSuperTypes="#//Invocable"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Exchange" eSuperTypes="#//Invocable"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentProcess" eSuperTypes="#//Invocable">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="schedulingSpecification"
-        lowerBound="1" eType="#//SchedulingSpecification" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" lowerBound="1"
-        eType="#//ComponentInstance" eOpposite="#//ComponentInstance/componentProcesses"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isActive" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ParameterDirection">
-    <eLiterals name="IN"/>
-    <eLiterals name="OUT" value="1"/>
-    <eLiterals name="INOUT" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Parameter">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" lowerBound="1"
-        eType="#//ParameterDirection"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="knowledgePath" eType="#//KnowledgePath"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Invocable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
-        eType="#//Parameter" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="method" lowerBound="1"
-        eType="#//Method"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="KnowledgeManagersView" instanceClassName="cz.cuni.mff.d3s.deeco.knowledge.KnowledgeManagersView"/>
-  <eClassifiers xsi:type="ecore:EClass" name="EnsembleController">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" lowerBound="1"
-        eType="#//ComponentInstance" eOpposite="#//ComponentInstance/ensembleControllers"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ensembleDefinition" lowerBound="1"
-        eType="#//EnsembleDefinition"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PathNodeCoordinator" eSuperTypes="#//PathNode"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PathNodeMember" eSuperTypes="#//PathNode"/>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="runtime" nsURI="http://cz.cuni.mff.d3s.deeco.model.runtime/1.0"
+    nsPrefix="cz.cuni.mff.d3s.deeco.model.runtime">
+  <eClassifiers xsi:type="ecore:EClass" name="SchedulingSpecification">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="triggers" upperBound="-1"
+        eType="#//Trigger" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="period" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Trigger" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="KnowledgeChangeTrigger" eSuperTypes="#//Trigger">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="knowledgePath" lowerBound="1"
+        eType="#//KnowledgePath" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="KnowledgePath">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" lowerBound="1" upperBound="-1"
+        eType="#//PathNode" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PathNode" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="Method" instanceClassName="java.lang.reflect.Method"/>
+  <eClassifiers xsi:type="ecore:EClass" name="PathNodeField" eSuperTypes="#//PathNode">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PathNodeMapKey" eSuperTypes="#//PathNode">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="keyPath" lowerBound="1"
+        eType="#//KnowledgePath" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RuntimeMetadata">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ensembleDefinitions" upperBound="-1"
+        eType="#//EnsembleDefinition" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstances" upperBound="-1"
+        eType="#//ComponentInstance" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="KnowledgeManager" instanceClassName="cz.cuni.mff.d3s.deeco.knowledge.KnowledgeManager"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ComponentInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentProcesses" upperBound="-1"
+        eType="#//ComponentProcess" containment="true" eOpposite="#//ComponentProcess/componentInstance"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="knowledgeManager" lowerBound="1"
+        eType="#//KnowledgeManager"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="otherKnowledgeManagersAccess"
+        lowerBound="1" eType="#//KnowledgeManagersView"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ensembleControllers" upperBound="-1"
+        eType="#//EnsembleController" containment="true" eOpposite="#//EnsembleController/componentInstance"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EnsembleDefinition">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="membership" lowerBound="1"
+        eType="#//Condition" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="knowledgeExchange" lowerBound="1"
+        eType="#//Exchange" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="schedulingSpecification"
+        lowerBound="1" eType="#//SchedulingSpecification" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Condition" eSuperTypes="#//Invocable"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Exchange" eSuperTypes="#//Invocable"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ComponentProcess" eSuperTypes="#//Invocable">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="schedulingSpecification"
+        lowerBound="1" eType="#//SchedulingSpecification" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" lowerBound="1"
+        eType="#//ComponentInstance" eOpposite="#//ComponentInstance/componentProcesses"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isActive" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="ParameterDirection">
+    <eLiterals name="IN"/>
+    <eLiterals name="OUT" value="1"/>
+    <eLiterals name="INOUT" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Parameter">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" lowerBound="1"
+        eType="#//ParameterDirection" defaultValueLiteral="" unsettable="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="knowledgePath" eType="#//KnowledgePath"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Invocable">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
+        eType="#//Parameter" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="method" lowerBound="1"
+        eType="#//Method"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="KnowledgeManagersView" instanceClassName="cz.cuni.mff.d3s.deeco.knowledge.KnowledgeManagersView"/>
+  <eClassifiers xsi:type="ecore:EClass" name="EnsembleController">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" lowerBound="1"
+        eType="#//ComponentInstance" eOpposite="#//ComponentInstance/ensembleControllers"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ensembleDefinition" lowerBound="1"
+        eType="#//EnsembleDefinition"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PathNodeCoordinator" eSuperTypes="#//PathNode"/>
+  <eClassifiers xsi:type="ecore:EClass" name="PathNodeMember" eSuperTypes="#//PathNode"/>
+</ecore:EPackage>