From d05c9196686d90ce1dbe68f0ae1189e5f881846d Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Tue, 1 Nov 2016 14:22:48 +0100
Subject: [PATCH] Made the notification_email library compilable with 16.05 and
 upcoming 16.11 .

---
 .../notification_email-safe.ecf                  | 16 ++++++++++++++--
 .../notification_email/notification_email.ecf    | 16 ++++++++++++++--
 .../notification_external_mailer.e               | 11 +++++++----
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/library/runtime/process/notification_email/notification_email-safe.ecf b/library/runtime/process/notification_email/notification_email-safe.ecf
index 177c5441..040ee052 100644
--- a/library/runtime/process/notification_email/notification_email-safe.ecf
+++ b/library/runtime/process/notification_email/notification_email-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="notification_email" uuid="99D9A065-CD45-4E20-9C86-579C8AD42E5E" library_target="notification_email">
+<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="notification_email" uuid="99D9A065-CD45-4E20-9C86-579C8AD42E5E" library_target="notification_email">
 	<target name="notification_email">
 		<root all_classes="true"/>
 		<file_rule>
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http" location="..\..\..\network\protocol\http\http-safe.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf">
@@ -16,7 +17,18 @@
 				<custom name="smtp_notification_email_disabled" excluded_value="true"/>
 			</condition>
 		</library>
-		<library name="process" location="$ISE_LIBRARY\library\process\process-safe.ecf"/>
+		<library name="base_process" location="$ISE_LIBRARY\library\process\base\base_process-safe.ecf">
+			<condition>
+				<version type="compiler" min="16.10.9.9999"/>
+			</condition>
+			<renaming old_name="BASE_PROCESS" new_name="PROCESS"/>
+			<renaming old_name="BASE_PROCESS_FACTORY" new_name="PROCESS_FACTORY"/>
+		</library>
+		<library name="process" location="$ISE_LIBRARY\library\process\process-safe.ecf">
+			<condition>
+				<version type="compiler" max="16.10.9.9999"/>
+			</condition>
+		</library>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<cluster name="src" location=".\" >
 			<cluster name="storage" location="$|storage"/>
diff --git a/library/runtime/process/notification_email/notification_email.ecf b/library/runtime/process/notification_email/notification_email.ecf
index 353b3b42..79f70e54 100644
--- a/library/runtime/process/notification_email/notification_email.ecf
+++ b/library/runtime/process/notification_email/notification_email.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="notification_email" uuid="99D9A065-CD45-4E20-9C86-579C8AD42E5E" library_target="notification_email">
+<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="notification_email" uuid="99D9A065-CD45-4E20-9C86-579C8AD42E5E" library_target="notification_email">
 	<target name="notification_email">
 		<root all_classes="true"/>
 		<file_rule>
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="http" location="..\..\..\network\protocol\http\http.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf">
@@ -16,7 +17,18 @@
 				<custom name="smtp_notification_email_disabled" excluded_value="true"/>
 			</condition>
 		</library>
-		<library name="process" location="$ISE_LIBRARY\library\process\process.ecf"/>
+		<library name="base_process" location="$ISE_LIBRARY\library\process\base\base_process.ecf">
+			<condition>
+				<version type="compiler" min="16.10.9.9999"/>
+			</condition>
+			<renaming old_name="BASE_PROCESS" new_name="PROCESS"/>
+			<renaming old_name="BASE_PROCESS_FACTORY" new_name="PROCESS_FACTORY"/>
+		</library>
+		<library name="process" location="$ISE_LIBRARY\library\process\process.ecf">
+			<condition>
+				<version type="compiler" max="16.10.9.9999"/>
+			</condition>
+		</library>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<cluster name="src" location=".">
 			<cluster name="storage" location="$|storage"/>
diff --git a/library/runtime/process/notification_email/notification_external_mailer.e b/library/runtime/process/notification_email/notification_external_mailer.e
index c07880a1..d65e2d58 100644
--- a/library/runtime/process/notification_email/notification_external_mailer.e
+++ b/library/runtime/process/notification_email/notification_external_mailer.e
@@ -123,11 +123,13 @@ feature -- Basic operation
 					p.launch
 				end
 				if p.launched and not p.has_exited then
-					p.wait_for_exit_with_timeout (1_000_000)
+					execution_environment.sleep (1_000)
+					p.wait_for_exit
 					if not p.has_exited then
 						p.terminate
 						if not p.has_exited then
-							p.wait_for_exit_with_timeout (1_000_000)
+							execution_environment.sleep (1_000)
+							p.wait_for_exit
 						end
 					end
 				end
@@ -135,7 +137,8 @@ feature -- Basic operation
 				if p /= Void and then p.launched and then not p.has_exited then
 					p.terminate
 					if not p.has_exited then
-						p.wait_for_exit_with_timeout (1_000_000)
+						execution_environment.sleep (1_000)
+						p.wait_for_exit
 					end
 				end
 			end
@@ -196,7 +199,7 @@ feature {NONE} -- Implementation
 invariant
 
 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software