Skip to content

Commit

Permalink
Meta-model updated based on our last meeting
Browse files Browse the repository at this point in the history
- removed SchedulingSpecification
- added PeriodicTrigger
  • Loading branch information
bures committed Nov 6, 2013
1 parent bfce93d commit 4315957
Show file tree
Hide file tree
Showing 52 changed files with 8,598 additions and 8,964 deletions.
388 changes: 196 additions & 192 deletions jdeeco-architecture/architecture-04.11.2013.emx

Large diffs are not rendered by default.

184 changes: 91 additions & 93 deletions jdeeco-core/model/RuntimeModel.ecore
Original file line number Diff line number Diff line change
@@ -1,93 +1,91 @@
<?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>
<?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="PeriodicTrigger" eSuperTypes="#//Trigger">
<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="triggers" upperBound="-1"
eType="#//Trigger" 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="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"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="triggers" upperBound="-1"
eType="#//Trigger" containment="true"/>
</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>
Loading

0 comments on commit 4315957

Please sign in to comment.