From 39f01e95fd8e53f744739cbd6f957da40e4bd6c0 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <github@djoce.net>
Date: Thu, 26 Oct 2017 10:19:56 +0200
Subject: [PATCH] Use single ecf file.

---
 library/server/wsf/wsf_compression-safe.ecf | 22 ++-------------------
 library/server/wsf/wsf_compression.ecf      |  7 +++----
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/library/server/wsf/wsf_compression-safe.ecf b/library/server/wsf/wsf_compression-safe.ecf
index d4a3ec62..963c506b 100644
--- a/library/server/wsf/wsf_compression-safe.ecf
+++ b/library/server/wsf/wsf_compression-safe.ecf
@@ -1,21 +1,3 @@
 <?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="wsf_compression" uuid="C558E537-1259-4C94-8C49-117D7E821820" library_target="wsf_compression">
-	<target name="wsf_compression">
-		<root all_classes="true"/>
-		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
-			<exclude>/EIFGENs$</exclude>
-		</file_rule>
-		<option warning="true" void_safety="all">
-		</option>
-		<setting name="concurrency" value="scoop"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="conneg" location="..\..\network\protocol\content_negotiation\conneg-safe.ecf"/>
-		<library name="http" location="..\..\network\protocol\http\http-safe.ecf"/>
-		<library name="wsf" location="wsf-safe.ecf" readonly="false"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<library name="zlib" location="$ISE_LIBRARY\unstable\library\compression\zlib\zlib-safe.ecf" readonly="false"/>
-		<cluster name="compression" location=".\compression\" recursive="true"/>
-	</target>
-</system>
+<redirection xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" uuid="C558E537-1259-4C94-8C49-117D7E821820" message="Obsolete: use wsf_compression.ecf !" location="wsf_compression.ecf">
+</redirection>
diff --git a/library/server/wsf/wsf_compression.ecf b/library/server/wsf/wsf_compression.ecf
index bd773cb9..862e0001 100644
--- a/library/server/wsf/wsf_compression.ecf
+++ b/library/server/wsf/wsf_compression.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="wsf_compression" uuid="C558E537-1259-4C94-8C49-117D7E821820" library_target="wsf_compression">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="wsf_compression" uuid="C558E537-1259-4C94-8C49-117D7E821820" library_target="wsf_compression">
 	<target name="wsf_compression">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,14 +7,13 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" void_safety="none">
+		<option warning="true">
 		</option>
-		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="conneg" location="..\..\network\protocol\content_negotiation\conneg.ecf"/>
 		<library name="http" location="..\..\network\protocol\http\http.ecf"/>
-		<library name="wsf" location="wsf.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<library name="wsf" location="wsf.ecf" readonly="false"/>
 		<library name="zlib" location="$ISE_LIBRARY\unstable\library\compression\zlib\zlib.ecf" readonly="false"/>
 		<cluster name="compression" location=".\compression\" recursive="true"/>
 	</target>