Merge branch 'master' into upython

resources/AADLv2/components/processors/leon.aadl

 package ocarina_processors_leon
-
 public
 
 with Deployment;
-with Cheddar_Properties;
 
 processor leon
 end leon;
@@ -12,8 +10,8 @@ processor implementation leon.rtems
 properties
    Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
    Priority_Range => 0 .. 255;
-   Cheddar_Properties::Scheduler_Quantum => 0 Ms;
-   Cheddar_Properties::Preemptive_Scheduler => true;
+   Scheduler_Quantum => 0 Ms;
+   Preemptive_Scheduler => true;
    Deployment::Execution_Platform => LEON_RTEMS;
 end leon.rtems;
 
@@ -21,8 +19,8 @@ processor implementation leon.rtems_posix
 properties
    Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
    Priority_Range => 0 .. 255;
-   Cheddar_Properties::Scheduler_Quantum => 0 Ms;
-   Cheddar_Properties::Preemptive_Scheduler => true;
+   Scheduler_Quantum => 0 Ms;
+   Preemptive_Scheduler => true;
    Deployment::Execution_Platform => LEON_RTEMS_POSIX;
 end leon.rtems_posix;
 

resources/ocarina_config.aadl

@@ -26,9 +26,9 @@ property set Ocarina_Config is
   AADL_Files : list of aadlstring applies to (system);
   --  List of the AADL source files used by the current application
 
+  Cheddar_Properties  : constant aadlstring => "Cheddar_Properties";
   Data_Model          : constant aadlstring => "Data_Model";
   Deployment          : constant aadlstring => "Deployment";
-  Cheddar_Properties  : constant aadlstring => "Cheddar_Properties";
   POK_Properties      : constant aadlstring => "pok_properties";
   ARINC653_Properties : constant aadlstring => "arinc653";
   ASSERT_Properties   : constant aadlstring => "ASSERT_Properties";

tests/real-annexes-parsing/test_real_parse_01.aadl.out

@@ -245,9 +245,9 @@ property set Ocarina_Config is
   AADL_Files : list of aadlstring
     applies to (system);
 
+  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   Data_Model : constant aadlstring => "Data_Model";
   Deployment : constant aadlstring => "Deployment";
-  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   POK_Properties : constant aadlstring => "pok_properties";
   ARINC653_Properties : constant aadlstring => "arinc653";
   ASSERT_Properties : constant aadlstring => "ASSERT_Properties";

tests/real-annexes-parsing/test_real_parse_02.aadl.out

@@ -245,9 +245,9 @@ property set Ocarina_Config is
   AADL_Files : list of aadlstring
     applies to (system);
 
+  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   Data_Model : constant aadlstring => "Data_Model";
   Deployment : constant aadlstring => "Deployment";
-  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   POK_Properties : constant aadlstring => "pok_properties";
   ARINC653_Properties : constant aadlstring => "arinc653";
   ASSERT_Properties : constant aadlstring => "ASSERT_Properties";

tests/real-annexes-parsing/test_real_parse_03.aadl.out

@@ -245,9 +245,9 @@ property set Ocarina_Config is
   AADL_Files : list of aadlstring
     applies to (system);
 
+  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   Data_Model : constant aadlstring => "Data_Model";
   Deployment : constant aadlstring => "Deployment";
-  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   POK_Properties : constant aadlstring => "pok_properties";
   ARINC653_Properties : constant aadlstring => "arinc653";
   ASSERT_Properties : constant aadlstring => "ASSERT_Properties";

tests/real-annexes-parsing/test_real_parse_04.aadl.out

@@ -245,9 +245,9 @@ property set Ocarina_Config is
   AADL_Files : list of aadlstring
     applies to (system);
 
+  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   Data_Model : constant aadlstring => "Data_Model";
   Deployment : constant aadlstring => "Deployment";
-  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   POK_Properties : constant aadlstring => "pok_properties";
   ARINC653_Properties : constant aadlstring => "arinc653";
   ASSERT_Properties : constant aadlstring => "ASSERT_Properties";

tests/real-annexes-parsing/test_real_parse_05.aadl.out

@@ -245,9 +245,9 @@ property set Ocarina_Config is
   AADL_Files : list of aadlstring
     applies to (system);
 
+  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   Data_Model : constant aadlstring => "Data_Model";
   Deployment : constant aadlstring => "Deployment";
-  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   POK_Properties : constant aadlstring => "pok_properties";
   ARINC653_Properties : constant aadlstring => "arinc653";
   ASSERT_Properties : constant aadlstring => "ASSERT_Properties";

tests/test042/test.aadl.out

@@ -241,9 +241,9 @@ property set Ocarina_Config is
   AADL_Files : list of aadlstring
     applies to (system);
 
+  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   Data_Model : constant aadlstring => "Data_Model";
   Deployment : constant aadlstring => "Deployment";
-  Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
   POK_Properties : constant aadlstring => "pok_properties";
   ARINC653_Properties : constant aadlstring => "arinc653";
   ASSERT_Properties : constant aadlstring => "ASSERT_Properties";