* Update scenario files to use AADLv2

        For openaadl/ocarina#154

examples/Makefile.common

@@ -11,7 +11,7 @@ all-local:
 	@echo "TO BUILD THE EXAMPLE, YOU SHOULD ISSUE '$(MAKE) build-all'"
 
 build-all:
-	if test ! "$(SCENARIO_FILES)" = "";  then \
+	@if test ! "$(SCENARIO_FILES)" = "";  then \
 	   $(MAKE) scenarios; \
 	elif test ! "$(SCENARIO_FILE)" = ""; then \
 	   $(MAKE) scenario; \
@@ -20,13 +20,13 @@ build-all:
 	fi
 
 check-all:
-	if test ! "$(SCENARIO_FILES)" = "";  then \
-           $(MAKE) scenarios-check; \
-        elif test ! "$(SCENARIO_FILE)" = ""; then \
-           $(MAKE) scenario-check; \
-        else \
-           echo "No scenario files, nothing to be done"; \
-        fi
+	@if test ! "$(SCENARIO_FILES)" = "";  then \
+	   $(MAKE) scenarios-check; \
+	elif test ! "$(SCENARIO_FILE)" = ""; then \
+	   $(MAKE) scenario-check; \
+	else \
+	   echo "No scenario files, nothing to be done"; \
+	fi
 
 
 ############################################################################
@@ -34,14 +34,14 @@ check-all:
 #
 
 scenarios:
-	@echo "********* SCENARIO_FILES = $(SCENARIO_FILES) *********";
-	for sc in $(SCENARIO_FILES); do \
+	@echo " * Processing scenario from $(shell pwd)";
+	@for sc in $(SCENARIO_FILES); do \
 	  $(MAKE) SCENARIO_FILE=$${sc} SCENARIO_FILES="" build-all || exit 1; \
 	done;
 
 scenario:
-	@echo "*********  SCENARIO_FILE = $(SCENARIO_FILE)  *********";
-	ocarina$(EXEEXT) -b -x '${shell $(CYGPATH_W) $(SCENARIO_FILE)}';
+	@echo "  * $(SCENARIO_FILE) $(shell pwd)";
+	ocarina$(EXEEXT) -aadlv2 -b -x '${shell $(CYGPATH_W) $(SCENARIO_FILE)}';
 
 ############################################################################
 # Code generation and execution from AADL
@@ -49,9 +49,9 @@ scenario:
 
 scenarios-check:
 	@echo "********* SCENARIO_FILES = $(SCENARIO_FILES) *********";
-	for sc in $(SCENARIO_FILES); do \
-          $(MAKE) SCENARIO_FILE=$${sc} SCENARIO_FILES="" check-all || exit 1; \
-        done;
+	@for sc in $(SCENARIO_FILES); do \
+	  $(MAKE) SCENARIO_FILE=$${sc} SCENARIO_FILES="" check-all || exit 1; \
+	done;
 
 scenario-check:
 	@echo "*********  SCENARIO_FILE = $(SCENARIO_FILE)  *********";

examples/aadlv1/d3.1.3-1/scenario_local.aadl

---  This is a scenario file describing the AADL 
---  application d3_1_3_1
+package Scenario
+public
+  with Ocarina_Config;
 
---  $Id: scenario_local.aadl 407 2007-06-19 15:24:28Z delange $
-
-system d3_1_3_1
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+  system d3_1_3_1
+  properties
+    Ocarina_Config::Timeout_Property     => 4000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("gnc_tmtc_pos", "gnc_tmtc_pos.ref");
-  Ocarina_Config::AADL_Files           => 
+    Ocarina_Config::AADL_Files           =>
     ("toy_example.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets => 
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv1;
-end d3_1_3_1;
+    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         => AADLv1;
+  end d3_1_3_1;
 
-system implementation d3_1_3_1.Impl
-end  d3_1_3_1.Impl;
+  system implementation d3_1_3_1.Impl
+  end  d3_1_3_1.Impl;
 
+end scenario;

examples/aadlv1/flight-mgmt/scenario_local.aadl

---  This is a scenario file describing the AADL application Flight
---  Management
+package Scenario
+public
+  with Ocarina_Config;
 
---  $Id: scenario_local.aadl 424 2007-07-10 13:46:33Z zalila $
-
-system Flight_Management
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+  system Flight_Management
+  properties
+    Ocarina_Config::Timeout_Property     => 4000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("mgmt", "mgmt.ref");
-  Ocarina_Config::AADL_Files           => 
+    Ocarina_Config::AADL_Files           =>
     ("flt_mgmt.aadl", "software.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets => 
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment));
-  Ocarina_Config::AADL_Version         => AADLv1;
-end Flight_Management;
+    Ocarina_Config::Generator            => polyorb_hi_c;
+    Ocarina_Config::Needed_Property_Sets =>
+    (Ocarina_Config::Data_Model,
+     Ocarina_Config::Deployment);
+    Ocarina_Config::AADL_Version         => AADLv1;
+  end Flight_Management;
 
-system implementation Flight_Management.Impl
-end  Flight_Management.Impl;
+  system implementation Flight_Management.Impl
+  end  Flight_Management.Impl;
 
+end scenario;

examples/aadlv1/ping/scenario-local.aadl

-system ping
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+package Scenario
+public
+  with Ocarina_Config;
+
+  system ping
+  properties
+    Ocarina_Config::Timeout_Property     => 4000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("node_a", "node_a_local.ref");
-  Ocarina_Config::AADL_Files           => 
+    Ocarina_Config::AADL_Files           =>
     ("ping-local.aadl" , "software.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets => 
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv1;
-end ping;
+    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         => AADLv1;
+  end ping;
 
-system implementation ping.impl
-end  ping.impl;
+  system implementation ping.impl
+  end  ping.impl;
 
+end scenario;

examples/aadlv1/ping/scenario.aadl

-system ping
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+package Scenario
+public
+  with Ocarina_Config;
+
+  system ping
+  properties
+    Ocarina_Config::Timeout_Property     => 4000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("node_a", "node_a_impl.ref",
     "node_b", "node_b_impl.ref");
-  Ocarina_Config::AADL_Files           => 
+    Ocarina_Config::AADL_Files           =>
     ("ping.aadl" , "software.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets => 
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv1;
-end ping;
+    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         => AADLv1;
+  end ping;
 
-system implementation ping.impl
-end  ping.impl;
+  system implementation ping.impl
+  end  ping.impl;
 
+end scenario;

examples/aadlv1/rma/scenario.aadl

---  This is a scenario file describing the AADL 
---  application rma
+package Scenario
+public
+  with Ocarina_Config;
 
---  $Id: scenario.aadl 6714 2009-06-20 21:01:32Z lanarre $
-
-system rma
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+  system rma
+  properties
+    Ocarina_Config::Timeout_Property     => 4000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("node_a", "node_a.ref");
-  Ocarina_Config::AADL_Files           => 
+    Ocarina_Config::AADL_Files           =>
     ("rma.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets => 
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv1;
-end rma;
+    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         => AADLv1;
+  end rma;
 
-system implementation rma.Impl
-end  rma.Impl;
+  system implementation rma.Impl
+  end  rma.Impl;
 
+end scenario;

examples/aadlv1/sunseeker/scenario_dist.aadl

---  This is a scenario file describing the AADL 
---  application sunseeker
+package Scenario
+public
+  with Ocarina_Config;
 
---  $Id: scenario_dist.aadl 394 2007-05-31 18:59:00Z zalila $
-
-system sunseeker
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+  system sunseeker
+  properties
+    Ocarina_Config::Timeout_Property     => 4000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("sunseekercontroller", "sunseekercontroller_native.ref",
     "sunseekerplant", "sunseekerplant_native.ref");
-  Ocarina_Config::AADL_Files           => 
+    Ocarina_Config::AADL_Files           =>
     ("sunseeker.aadl", "sunseeker_dist.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets => 
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv1;
-end sunseeker;
+    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         => AADLv1;
+  end sunseeker;
 
-system implementation sunseeker.Impl
-end  sunseeker.Impl;
+  system implementation sunseeker.Impl
+  end  sunseeker.Impl;
 
+end scenario;
\ No newline at end of file

examples/aadlv1/sunseeker/scenario_local.aadl

---  This is a scenario file describing the AADL 
---  application sunseeker
+package Scenario
+public
+  with Ocarina_Config;
 
---  $Id: scenario_local.aadl 394 2007-05-31 18:59:00Z zalila $
-
-system sunseeker
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+  system sunseeker
+  properties
+    Ocarina_Config::Timeout_Property     => 4000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("sunseeker", "sunseeker.ref");
-  Ocarina_Config::AADL_Files           => 
+    Ocarina_Config::AADL_Files           =>
     ("sunseeker.aadl", "sunseeker_local.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets => 
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv1;
-end sunseeker;
+    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         => AADLv1;
+  end sunseeker;
 
-system implementation sunseeker.Impl
-end  sunseeker.Impl;
+  system implementation sunseeker.Impl
+  end  sunseeker.Impl;
 
+end scenario;

examples/aadlv2/cpp/scenario.aadl

-system cpp
-properties
-  Ocarina_Config::AADL_Files           =>
+package Scenario
+public
+  with Ocarina_Config;
+
+  system cpp
+  properties
+    Ocarina_Config::AADL_Files           =>
     ("cpp_test.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Root_System_Name     => "cpp_test.impl";
-  Ocarina_Config::Needed_Property_Sets =>
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv2;
-end cpp;
+    Ocarina_Config::Generator            => polyorb_hi_c;
+    Ocarina_Config::Root_System_Name     => "cpp_test.impl";
+    Ocarina_Config::Needed_Property_Sets =>
+    (Ocarina_Config::Data_Model,
+    Ocarina_Config::Deployment,
+    Ocarina_Config::Cheddar_Properties);
+    Ocarina_Config::AADL_Version         => AADLv2;
+  end cpp;
+
+  system implementation cpp.Impl
+  end  cpp.Impl;
 
-system implementation cpp.Impl
-end  cpp.Impl;
+end scenario;
\ No newline at end of file

examples/aadlv2/cpp/scenario_rtems.aadl

---  This is a scenario file describing the AADL application Flight
---  Management
+package Scenario
+public
+  with Ocarina_Config;
 
---  $Id: scenario_local.aadl 424 2007-07-10 13:46:33Z zalila $
-
-system cpptest
-properties
-  Ocarina_Config::Timeout_Property     => 1000ms;
-  Ocarina_Config::Referencial_Files    =>
+  system cpptest
+  properties
+    Ocarina_Config::Timeout_Property     => 1000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("cpptest", "cpptest.ref");
-  Ocarina_Config::AADL_Files           =>
-    ("cpp_test.aadl", "devices.aadl",
-    "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
-  Ocarina_Config::Root_System_Name => "cpp_test.RTEMS";
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets =>
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv2;
-end cpptest;
+    Ocarina_Config::AADL_Files           =>
+    ("cpp_test.aadl");
+   Ocarina_Config::Root_System_Name => "cpp_test.RTEMS";
+   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;
+  end cpptest;
+
+  system implementation cpptest.Impl
+  end  cpptest.Impl;
 
-system implementation cpptest.Impl
-end  cpptest.Impl;
+end scenario;
\ No newline at end of file

examples/aadlv2/d3.1.3-1/scenario_local.aadl

---  This is a scenario file describing the AADL
---  application d3_1_3_1
+package scenario
+public
+  with Ocarina_Config;
 
---  $Id: scenario_local.aadl 407 2007-06-19 15:24:28Z delange $
-
-system d3_1_3_1
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+  system d3_1_3_1
+  properties
+    Ocarina_Config::Timeout_Property     => 4000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("gnc_tmtc_pos", "gnc_tmtc_pos.ref");
-  Ocarina_Config::AADL_Files           =>
+    Ocarina_Config::AADL_Files           =>
     ("toy_example.aadl");
-  Ocarina_Config::Root_System_Name => "toy_example.native";
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets =>
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv2;
-end d3_1_3_1;
+    Ocarina_Config::Root_System_Name => "toy_example.native";
+    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;
+  end d3_1_3_1;
+
+  system implementation d3_1_3_1.Impl
+  end  d3_1_3_1.Impl;
 
-system implementation d3_1_3_1.Impl
-end  d3_1_3_1.Impl;
+end scenario;
\ No newline at end of file

examples/aadlv2/d3.1.3-1/scenario_local_xenomai_native.aadl

---  This is a scenario file describing the AADL
---  application d3_1_3_1
+package scenario
+public
+  with Ocarina_Config;
 
---  $Id: scenario_local.aadl 407 2007-06-19 15:24:28Z delange $
-
-system d3_1_3_1
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+  system d3_1_3_1
+  properties
+    Ocarina_Config::Timeout_Property     => 4000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("gnc_tmtc_pos", "gnc_tmtc_pos.ref");
-  Ocarina_Config::AADL_Files           => ("toy_example.aadl");
-  Ocarina_Config::Root_System_Name => "toy_example.xenomai";
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets =>
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::ARINC653_Properties),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv2;
-end d3_1_3_1;
+    Ocarina_Config::AADL_Files           => ("toy_example.aadl");
+    Ocarina_Config::Root_System_Name => "toy_example.xenomai";
+    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;
+  end d3_1_3_1;
+
+  system implementation d3_1_3_1.Impl
+  end  d3_1_3_1.Impl;
 
-system implementation d3_1_3_1.Impl
-end  d3_1_3_1.Impl;
+end scenario;
\ No newline at end of file

examples/aadlv2/d3.1.3-1/scenario_local_xenomai_posix.aadl

---  This is a scenario file describing the AADL
---  application d3_1_3_1
+package scenario
+public
+  with Ocarina_Config;
 
---  $Id: scenario_local.aadl 407 2007-06-19 15:24:28Z delange $
-
-system d3_1_3_1
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+  system d3_1_3_1
+  properties
+    Ocarina_Config::Timeout_Property     => 4000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("gnc_tmtc_pos", "gnc_tmtc_pos.ref");
-  Ocarina_Config::AADL_Files           =>
-  ("toy_example.aadl");
-  Ocarina_Config::Root_System_Name => "toy_example.xenomai_posix";
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets =>
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::ARINC653_Properties),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv2;
-end d3_1_3_1;
+    Ocarina_Config::AADL_Files           =>
+    ("toy_example.aadl");
+    Ocarina_Config::Root_System_Name => "toy_example.xenomai_posix";
+    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;
+  end d3_1_3_1;
+
+  system implementation d3_1_3_1.Impl
+  end  d3_1_3_1.Impl;
 
-system implementation d3_1_3_1.Impl
-end  d3_1_3_1.Impl;
+end scenario;
\ No newline at end of file

examples/aadlv2/d3.1.3-1/scenario_rtems.aadl

---  This is a scenario file describing the AADL
---  application d3_1_3_1
+package scenario
+public
+  with Ocarina_Config;
 
---  $Id: scenario_local.aadl 407 2007-06-19 15:24:28Z delange $
-
-system d3_1_3_1
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+  system d3_1_3_1
+  properties
+    Ocarina_Config::Timeout_Property     => 4000ms;
+    Ocarina_Config::Referencial_Files    =>
     ("gnc_tmtc_pos", "gnc_tmtc_pos.ref");
-  Ocarina_Config::AADL_Files           =>
+    Ocarina_Config::AADL_Files           =>
     ("toy_example.aadl");
-  Ocarina_Config::Root_System_Name => "toy_example.RTEMS";
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets =>
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv2;
-end d3_1_3_1;
+    Ocarina_Config::Root_System_Name => "toy_example.RTEMS";
+    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;
+  end d3_1_3_1;
+
+  system implementation d3_1_3_1.Impl
+  end  d3_1_3_1.Impl;
 
-system implementation d3_1_3_1.Impl
-end  d3_1_3_1.Impl;
+end scenario;
\ No newline at end of file

examples/aadlv2/file-store/scenario.aadl

-system ping
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+package Scenario
+public
+  with Ocarina_Config;
+  with Ocarina_Library;
+
+  system ping extends Ocarina_Library::Default_PolyORB_HI_C_Config
+  properties
+    Ocarina_Config::Referencial_Files    =>
     ("node_a", "node_a.ref",
     "node_b", "node_b.ref");
-  Ocarina_Config::AADL_Files           =>
-    ("ping.aadl" , "software.aadl",
-"devices",  "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
-  Ocarina_Config::Root_System_Name => "PING.impl";
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets =>
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::ARINC653_Properties),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv2;
-end ping;
+    Ocarina_Config::AADL_Files           +=>
+    ("ping.aadl" , "software.aadl");
+    Ocarina_Config::Root_System_Name => "PING.impl";
+  end ping;
+
+  system implementation ping.impl
+  end  ping.impl;
 
-system implementation ping.impl
-end  ping.impl;
+end scenario;
\ No newline at end of file

examples/aadlv2/file-store/scenario_local.aadl

-system ping
-properties
-  Ocarina_Config::Timeout_Property     => 4000ms;
-  Ocarina_Config::Referencial_Files    =>
+package Scenario
+public
+  with Ocarina_Config;
+  with Ocarina_Library;
+
+  system ping extends Ocarina_Library::Default_PolyORB_HI_C_Config
+  properties