* Rework scenario files

examples/aadlv2/latency/scenario.aadl

 package scenario
 public
   with Ocarina_Config;
+  with Ocarina_Library;
 
-system topsystem
-properties
-  Ocarina_Config::AADL_Files           =>
-    ("latency.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets =>
-    (Ocarina_Config::Data_Model,
-     Ocarina_Config::Deployment,
-     Ocarina_Config::Cheddar_Properties);
-  Ocarina_Config::AADL_Version         => AADLv2;
-  Ocarina_Config::Use_Components_Library => true;
-  Ocarina_Config::Root_System_Name
+  system topsystem extends Ocarina_Library::Default_PolyORB_HI_C_Config
+  properties
+    Ocarina_Config::AADL_Files           =>
+      ("latency.aadl");
+
+    Ocarina_Config::Root_System_Name
           => "topsystem.distributedallperiodicdelayed";
-end topsystem;
+  end topsystem;
 
-system implementation topsystem.distributedallperiodicdelayed
-end topsystem.distributedallperiodicdelayed;
+  system implementation topsystem.distributedallperiodicdelayed
+  end topsystem.distributedallperiodicdelayed;
 
 end scenario;
\ No newline at end of file

examples/aadlv2/latency/scenario_local.aadl

 package scenario
 public
   with Ocarina_Config;
+  with Ocarina_Library;
 
-system topsystem
-properties
-  Ocarina_Config::Timeout_Property     => 1000ms;
-  Ocarina_Config::Use_Components_Library => true;
-  Ocarina_Config::AADL_Files           =>
-    ("latency.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
+  system topsystem extends Ocarina_Library::Default_PolyORB_HI_C_Config
+  properties
+    Ocarina_Config::AADL_Files           =>
+      ("latency.aadl");
     Ocarina_Config::Root_System_Name => "topsystem.local";
-  Ocarina_Config::Needed_Property_Sets =>
-    (Ocarina_Config::Data_Model,
-     Ocarina_Config::Deployment,
-     Ocarina_Config::Cheddar_Properties);
-  Ocarina_Config::AADL_Version         => AADLv2;
-end topsystem;
+  end topsystem;
 
-system implementation topsystem.distributedallperiodicdelayed
-end topsystem.distributedallperiodicdelayed;
+  system implementation topsystem.distributedallperiodicdelayed
+  end topsystem.distributedallperiodicdelayed;
 
 end scenario;

examples/aadlv2/latency/scenario_rtems.aadl

@@ -2,22 +2,14 @@ package scenario
 public
   with Ocarina_Config;
 
-system topsystem
-properties
-  Ocarina_Config::Timeout_Property     => 1000ms;
-  Ocarina_Config::Use_Components_Library => true;
-  Ocarina_Config::AADL_Files           =>
-    ("latency.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Root_System_Name => "topsystem.RTEMS";
-  Ocarina_Config::Needed_Property_Sets =>
-    (Ocarina_Config::Data_Model,
-     Ocarina_Config::Deployment,
-     Ocarina_Config::Cheddar_Properties);
-  Ocarina_Config::AADL_Version         => AADLv2;
-end topsystem;
+  system topsystem extends Ocarina_Library::Default_PolyORB_HI_C_Config
+  properties
+    Ocarina_Config::AADL_Files           =>
+      ("latency.aadl");
+    Ocarina_Config::Root_System_Name => "topsystem.RTEMS";
+  end topsystem;
 
-system implementation topsystem.distributedallperiodicdelayed
-end topsystem.distributedallperiodicdelayed;
+  system implementation topsystem.distributedallperiodicdelayed
+  end topsystem.distributedallperiodicdelayed;
 
 end scenario;