Updated target to APP4MC 2.1.0
diff --git a/framework/examples/app4mc.example.transform.cust.product/input/amalthea_models/democar.amxmi b/framework/examples/app4mc.example.transform.cust.product/input/amalthea_models/democar.amxmi index fb485aa..a910b82 100644 --- a/framework/examples/app4mc.example.transform.cust.product/input/amalthea_models/democar.amxmi +++ b/framework/examples/app4mc.example.transform.cust.product/input/amalthea_models/democar.amxmi
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<am:Amalthea xmlns:am="http://app4mc.eclipse.org/amalthea/1.2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmi:version="2.0"> +<am:Amalthea xmlns:am="http://app4mc.eclipse.org/amalthea/2.1.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmi:version="2.0"> <commonElements> <tags name="SwcEngineController" tagType="SOFTWARE_COMPONENT" /> <tags name="SwcActuators" tagType="SOFTWARE_COMPONENT" /> @@ -760,10 +760,11 @@ </hwModel> <osModel> <operatingSystems name="OperatingSystem"> - <taskSchedulers name="Task_Scheduler_Core_1"> - <schedulingAlgorithm xsi:type="am:OSEK" /> - </taskSchedulers> + <taskSchedulers name="Task_Scheduler_Core_1" definition="OSEK?type=SchedulerDefinition" /> </operatingSystems> + <schedulerDefinitions xmi:id="OSEK?type=SchedulerDefinition" name="OSEK" description="OSEK compliant Scheduling. A fixed priority preemptive scheduling algorithm
with task groups. Tasks belonging to the same task group are scheduled
cooperatively (they do not preempt each other), preemptive otherwise.
Tasks with the same priority also behave cooperatively.

Algorithm parameters:
 -

Process parameters:
 - priority [1] Integer
 The priority of the process (a higher value means a higher priority).
 - taskGroup [1] Integer
 The OSEK task group number (if for two processes the number is equal,
 that means they are in the same task group).

Options:
 -

Reference:
 - OSEK/VDX - Operating System Specification 2.2.3 (2005)
" processParameters="priority?type=SchedulingParameterDefinition taskGroup?type=SchedulingParameterDefinition" hasExactlyOneChild="false" passesParametersUpwards="false" requiresParentScheduler="false" /> + <schedulingParameterDefinitions xmi:id="priority?type=SchedulingParameterDefinition" name="priority" type="Integer" many="false" mandatory="true" /> + <schedulingParameterDefinitions xmi:id="taskGroup?type=SchedulingParameterDefinition" name="taskGroup" type="Integer" many="false" mandatory="true" /> </osModel> <stimuliModel> <stimuli xsi:type="am:PeriodicStimulus" name="Timer_10MS">
diff --git a/framework/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.target b/framework/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.target index 27cb5b4..5af088d 100644 --- a/framework/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.target +++ b/framework/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.target
@@ -20,11 +20,11 @@ <unit id="org.apache.commons.math3" version="3.5.0.v20190611-1023"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <repository location="https://download.eclipse.org/app4mc/updatesites/releases/1.2.0"/> + <repository location="https://download.eclipse.org/app4mc/updatesites/releases/2.1.0"/> <unit id="org.eclipse.app4mc.amalthea.models.feature.group" version="0.0.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <repository location="https://download.eclipse.org/app4mc/components/addon/migration/releases/1.2.0/p2repo/"/> + <repository location="https://download.eclipse.org/app4mc/components/addon/migration/releases/2.1.0/p2repo/"/> <unit id="org.eclipse.app4mc.utils.platform.sdk.feature.group" version="0.0.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
diff --git a/load_generator/releng/org.eclipse.app4mc.slg.target/org.eclipse.app4mc.slg.target.target b/load_generator/releng/org.eclipse.app4mc.slg.target/org.eclipse.app4mc.slg.target.target index 7267c7f..e7b135d 100644 --- a/load_generator/releng/org.eclipse.app4mc.slg.target/org.eclipse.app4mc.slg.target.target +++ b/load_generator/releng/org.eclipse.app4mc.slg.target/org.eclipse.app4mc.slg.target.target
@@ -27,11 +27,11 @@ <unit id="org.apache.commons.math3" version="3.5.0.v20190611-1023"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <repository location="https://download.eclipse.org/app4mc/updatesites/releases/1.2.0"/> + <repository location="https://download.eclipse.org/app4mc/updatesites/releases/2.1.0"/> <unit id="org.eclipse.app4mc.amalthea.models.sdk.feature.group" version="0.0.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <repository location="https://download.eclipse.org/app4mc/components/addon/migration/releases/1.2.0/p2repo/"/> + <repository location="https://download.eclipse.org/app4mc/components/addon/migration/releases/2.1.0/p2repo/"/> <unit id="org.eclipse.app4mc.utils.platform.sdk.feature.group" version="0.0.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
diff --git a/simulation_generator/app4mc.sim/releng/org.eclipse.app4mc.amlt2systemc.target/org.eclipse.app4mc.amlt2systemc.target.target b/simulation_generator/app4mc.sim/releng/org.eclipse.app4mc.amlt2systemc.target/org.eclipse.app4mc.amlt2systemc.target.target index bdd0519..068dc29 100644 --- a/simulation_generator/app4mc.sim/releng/org.eclipse.app4mc.amlt2systemc.target/org.eclipse.app4mc.amlt2systemc.target.target +++ b/simulation_generator/app4mc.sim/releng/org.eclipse.app4mc.amlt2systemc.target/org.eclipse.app4mc.amlt2systemc.target.target
@@ -27,11 +27,11 @@ <unit id="org.apache.commons.math3" version="3.5.0.v20190611-1023"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <repository location="https://download.eclipse.org/app4mc/updatesites/releases/2.0.0"/> + <repository location="https://download.eclipse.org/app4mc/updatesites/releases/2.1.0"/> <unit id="org.eclipse.app4mc.amalthea.models.feature.group" version="0.0.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <repository location="https://download.eclipse.org/app4mc/components/addon/migration/releases/2.0.0/p2repo/"/> + <repository location="https://download.eclipse.org/app4mc/components/addon/migration/releases/2.1.0/p2repo/"/> <unit id="org.eclipse.app4mc.utils.platform.sdk.feature.group" version="0.0.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">