From c70d3124df98181198d82a99c4182e0fb8e6820d Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Tue, 6 Dec 2016 12:29:17 +0100
Subject: [PATCH] Updated tutorial ecf files to compile with 16.05 and upcoming
 release.

---
 .../hello/alternatives/launcher/hello_with_launcher.ecf       | 1 +
 .../step_2/hello/alternatives/message/hello_with_execute.ecf  | 2 +-
 examples/tutorial/step_2/hello/hello.ecf                      | 1 -
 examples/tutorial/step_4/hello/hello.ecf                      | 2 +-
 precomp/wsf-mt-safe.ecf                                       | 4 ++--
 precomp/wsf-safe.ecf                                          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/tutorial/step_2/hello/alternatives/launcher/hello_with_launcher.ecf b/examples/tutorial/step_2/hello/alternatives/launcher/hello_with_launcher.ecf
index 19719477..4f0039cb 100644
--- a/examples/tutorial/step_2/hello/alternatives/launcher/hello_with_launcher.ecf
+++ b/examples/tutorial/step_2/hello/alternatives/launcher/hello_with_launcher.ecf
@@ -10,6 +10,7 @@
 		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="default_standalone" location="..\..\..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
 		<library name="wsf" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
diff --git a/examples/tutorial/step_2/hello/alternatives/message/hello_with_execute.ecf b/examples/tutorial/step_2/hello/alternatives/message/hello_with_execute.ecf
index dbe09b32..0783b1c5 100644
--- a/examples/tutorial/step_2/hello/alternatives/message/hello_with_execute.ecf
+++ b/examples/tutorial/step_2/hello/alternatives/message/hello_with_execute.ecf
@@ -10,7 +10,7 @@
 		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="default_standalone" location="..\..\..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
 		<library name="wsf" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
diff --git a/examples/tutorial/step_2/hello/hello.ecf b/examples/tutorial/step_2/hello/hello.ecf
index 534a1b8e..f02b5159 100644
--- a/examples/tutorial/step_2/hello/hello.ecf
+++ b/examples/tutorial/step_2/hello/hello.ecf
@@ -28,7 +28,6 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
-		<precompile name="precomp_wsf-mt" location="..\..\..\..\precomp\wsf-mt-safe.ecf"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="default_standalone" location="..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
 		<library name="wsf" location="..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
diff --git a/examples/tutorial/step_4/hello/hello.ecf b/examples/tutorial/step_4/hello/hello.ecf
index ec556136..23b128c7 100644
--- a/examples/tutorial/step_4/hello/hello.ecf
+++ b/examples/tutorial/step_4/hello/hello.ecf
@@ -10,7 +10,7 @@
 		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="default_standalone" location="..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
 		<library name="encoder" location="..\..\..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
diff --git a/precomp/wsf-mt-safe.ecf b/precomp/wsf-mt-safe.ecf
index 81287042..177cec63 100644
--- a/precomp/wsf-mt-safe.ecf
+++ b/precomp/wsf-mt-safe.ecf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="precomp_wsf-mt" uuid="72298F1A-98C7-4BED-8617-11DEFEFB625F" library_target="wsf-mt">
-	<target name="wsf-mt">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="precomp_wsf-mt-safe" uuid="72298F1A-98C7-4BED-8617-11DEFEFB625F" library_target="wsf-mt-safe">
+	<target name="wsf-mt-safe">
 		<root class="ANY"/>
 		<option void_safety="all">
 		</option>
diff --git a/precomp/wsf-safe.ecf b/precomp/wsf-safe.ecf
index 9d78c633..c30b0d5f 100644
--- a/precomp/wsf-safe.ecf
+++ b/precomp/wsf-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="precomp_wsf" uuid="3E534F9D-A25F-4CAF-8AAF-FF95DA8F8B64" library_target="wsf-safe">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="precomp_wsf-safe" uuid="3E534F9D-A25F-4CAF-8AAF-FF95DA8F8B64" library_target="wsf-safe">
 	<target name="wsf-safe">
 		<root class="ANY"/>
 		<option void_safety="all">