From 5a9ccce558498f8cb8ad884015bb1fa226d19d15 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Tue, 1 Nov 2016 14:30:19 +0100
Subject: [PATCH] Made library ecf compilable in scoop concurrency mode by
 default. Except nino related projects that depends on EiffelThread.

---
 .../protocol/syndication/atom/atom-safe.ecf   |  3 +-
 .../protocol/syndication/atom/atom.ecf        |  3 +-
 .../protocol/syndication/rss/rss-safe.ecf     |  3 +-
 .../library/protocol/syndication/rss/rss.ecf  |  3 +-
 draft/library/security/oauth/oauth-safe.ecf   |  3 +-
 draft/library/security/oauth/oauth.ecf        |  3 +-
 examples/restbucksCRUD/client/client-safe.ecf |  3 +-
 examples/restbucksCRUD/client/client.ecf      |  7 +-
 examples/restbucksCRUD/restbucks-safe.ecf     |  8 +-
 examples/upload_image/upload_image-safe.ecf   |  2 +-
 .../network/http_client/http_client-safe.ecf  |  1 +
 library/network/http_client/http_client.ecf   |  1 +
 .../http_client/libcurl_http_client-safe.ecf  |  1 +
 .../http_client/libcurl_http_client.ecf       |  1 +
 .../http_client/net_http_client-safe.ecf      |  1 +
 .../network/http_client/net_http_client.ecf   |  1 +
 .../content_negotiation/conneg-safe.ecf       |  1 +
 .../protocol/content_negotiation/conneg.ecf   |  1 +
 library/network/protocol/http/http-safe.ecf   |  1 +
 library/network/protocol/http/http.ecf        |  1 +
 .../client/web_socket_client-safe.ecf         |  2 +-
 .../websocket/client/web_socket_client.ecf    |  2 +-
 .../protocol/web_socket_protocol-safe.ecf     |  1 +
 .../protocol/web_socket_protocol.ecf          |  1 +
 .../server/websocket_server-safe.ecf          |  2 +-
 .../websocket/server/websocket_server.ecf     |  2 +-
 .../security/openid/consumer/openid-safe.ecf  |  1 +
 library/security/openid/consumer/openid.ecf   |  1 +
 .../http_authorization-safe.ecf               |  1 +
 .../http_authorization/http_authorization.ecf |  1 +
 .../server/ewsgi/connectors/cgi/cgi-safe.ecf  |  1 +
 library/server/ewsgi/connectors/cgi/cgi.ecf   |  1 +
 .../ewsgi/connectors/libfcgi/libfcgi-safe.ecf |  1 +
 .../ewsgi/connectors/libfcgi/libfcgi.ecf      |  5 +-
 .../ewsgi/connectors/nino/nino-safe.ecf       |  1 +
 library/server/ewsgi/connectors/nino/nino.ecf |  1 +
 .../ewsgi/connectors/null/null-safe.ecf       |  1 +
 library/server/ewsgi/connectors/null/null.ecf |  1 +
 library/server/ewsgi/ewsgi-safe.ecf           |  1 +
 library/server/ewsgi/ewsgi.ecf                |  1 +
 library/server/ewsgi/ewsgi_spec-safe.ecf      |  1 +
 library/server/ewsgi/ewsgi_spec.ecf           |  1 +
 .../ewsgi/examples/hello_world/hello-safe.ecf |  2 +-
 library/server/httpd/httpd-safe.ecf           |  2 +-
 library/server/httpd/httpd.ecf                |  4 +-
 library/server/libfcgi/libfcgi-safe.ecf       |  3 +-
 library/server/libfcgi/libfcgi.ecf            |  5 +-
 library/server/wsf/connector/all-safe.ecf     |  2 +-
 library/server/wsf/connector/all.ecf          | 27 +++++++
 library/server/wsf/connector/cgi-safe.ecf     |  1 +
 library/server/wsf/connector/cgi.ecf          |  1 +
 library/server/wsf/connector/libfcgi-safe.ecf |  1 +
 library/server/wsf/connector/libfcgi.ecf      |  1 +
 library/server/wsf/connector/nino-safe.ecf    |  1 +
 library/server/wsf/connector/nino.ecf         |  1 +
 .../server/wsf/connector/openshift-safe.ecf   |  1 +
 library/server/wsf/connector/openshift.ecf    | 19 +++++
 library/server/wsf/connector/standalone.ecf   |  1 +
 .../connector/standalone_websocket-safe.ecf   |  1 +
 .../wsf/connector/standalone_websocket.ecf    |  1 +
 library/server/wsf/default/cgi-safe.ecf       |  1 +
 library/server/wsf/default/cgi.ecf            |  1 +
 library/server/wsf/default/libfcgi-safe.ecf   |  1 +
 library/server/wsf/default/libfcgi.ecf        |  1 +
 library/server/wsf/default/nino-safe.ecf      |  1 +
 library/server/wsf/default/nino.ecf           |  1 +
 library/server/wsf/default/openshift-safe.ecf |  1 +
 library/server/wsf/default/openshift.ecf      | 18 +++++
 library/server/wsf/wsf-safe.ecf               |  1 +
 library/server/wsf/wsf.ecf                    |  1 +
 library/server/wsf/wsf_extension-safe.ecf     |  1 +
 library/server/wsf/wsf_extension.ecf          |  1 +
 library/server/wsf/wsf_policy_driven-safe.ecf |  1 +
 library/server/wsf/wsf_policy_driven.ecf      |  1 +
 .../server/wsf/wsf_router_context-safe.ecf    |  1 +
 library/server/wsf/wsf_router_context.ecf     |  1 +
 library/server/wsf/wsf_session-safe.ecf       |  1 +
 library/server/wsf/wsf_session.ecf            |  1 +
 library/server/wsf_html/wsf_html-safe.ecf     |  1 +
 library/server/wsf_html/wsf_html.ecf          |  1 +
 library/server/wsf_proxy/wsf_proxy-safe.ecf   |  1 +
 library/server/wsf_proxy/wsf_proxy.ecf        |  1 +
 library/text/encoder/encoder-safe.ecf         |  1 +
 library/text/encoder/encoder.ecf              |  1 +
 library/text/parser/feed/feed-safe.ecf        |  1 +
 library/text/parser/feed/feed.ecf             |  1 +
 .../parser/uri_template/uri_template-safe.ecf |  1 +
 .../text/parser/uri_template/uri_template.ecf |  1 +
 library/utility/general/error/error-safe.ecf  |  1 +
 library/utility/general/error/error.ecf       |  1 +
 tests/all-safe.ecf                            | 11 +--
 tests/all-stable-safe.ecf                     |  9 +--
 tests/all-stable.ecf                          | 60 +++++++++++++++
 tests/all.ecf                                 | 75 +++++++++++++++++++
 94 files changed, 305 insertions(+), 49 deletions(-)
 create mode 100644 library/server/wsf/connector/all.ecf
 create mode 100644 library/server/wsf/connector/openshift.ecf
 create mode 100644 library/server/wsf/default/openshift.ecf
 create mode 100644 tests/all-stable.ecf
 create mode 100644 tests/all.ecf

diff --git a/draft/library/protocol/syndication/atom/atom-safe.ecf b/draft/library/protocol/syndication/atom/atom-safe.ecf
index d6e0e800..2f5ec5aa 100644
--- a/draft/library/protocol/syndication/atom/atom-safe.ecf
+++ b/draft/library/protocol/syndication/atom/atom-safe.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="atom" uuid="076DEABB-20DA-43E9-A4C7-F3FAEDF5B1FC" library_target="atom">
+<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="atom" uuid="076DEABB-20DA-43E9-A4C7-F3FAEDF5B1FC" library_target="atom">
 	<target name="atom">
 		<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"/>
 		<cluster name="src" location="./src" recursive="true"/>
 	</target>
diff --git a/draft/library/protocol/syndication/atom/atom.ecf b/draft/library/protocol/syndication/atom/atom.ecf
index 6662aac3..fb5d98c3 100644
--- a/draft/library/protocol/syndication/atom/atom.ecf
+++ b/draft/library/protocol/syndication/atom/atom.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="atom" uuid="076DEABB-20DA-43E9-A4C7-F3FAEDF5B1FC" library_target="atom">
+<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="atom" uuid="076DEABB-20DA-43E9-A4C7-F3FAEDF5B1FC" library_target="atom">
 	<target name="atom">
 		<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"/>
 		<cluster name="src" location="./src" recursive="true"/>
 	</target>
diff --git a/draft/library/protocol/syndication/rss/rss-safe.ecf b/draft/library/protocol/syndication/rss/rss-safe.ecf
index aab55dda..e089ed35 100644
--- a/draft/library/protocol/syndication/rss/rss-safe.ecf
+++ b/draft/library/protocol/syndication/rss/rss-safe.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="rss" uuid="8D8E3E5A-2685-40AF-9EF9-E3113B3C62AA" library_target="rss">
+<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="rss" uuid="8D8E3E5A-2685-40AF-9EF9-E3113B3C62AA" library_target="rss">
 	<target name="rss">
 		<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"/>
 		<cluster name="src" location="./src" recursive="true"/>
 	</target>
diff --git a/draft/library/protocol/syndication/rss/rss.ecf b/draft/library/protocol/syndication/rss/rss.ecf
index 7a473bfb..43c1f6f2 100644
--- a/draft/library/protocol/syndication/rss/rss.ecf
+++ b/draft/library/protocol/syndication/rss/rss.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="rss" uuid="8D8E3E5A-2685-40AF-9EF9-E3113B3C62AA" library_target="rss">
+<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="rss" uuid="8D8E3E5A-2685-40AF-9EF9-E3113B3C62AA" library_target="rss">
 	<target name="rss">
 		<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"/>
 		<cluster name="src" location="./src" recursive="true"/>
 	</target>
diff --git a/draft/library/security/oauth/oauth-safe.ecf b/draft/library/security/oauth/oauth-safe.ecf
index ab8706f5..8810b9dc 100644
--- a/draft/library/security/oauth/oauth-safe.ecf
+++ b/draft/library/security/oauth/oauth-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="oauth" uuid="F8B4DF74-C71B-45A3-9B9A-F6141C4D3C56" library_target="oauth">
+<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="oauth" uuid="F8B4DF74-C71B-45A3-9B9A-F6141C4D3C56" library_target="oauth">
 	<target name="oauth">
 		<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"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
diff --git a/draft/library/security/oauth/oauth.ecf b/draft/library/security/oauth/oauth.ecf
index 721bcf01..d1de7c54 100644
--- a/draft/library/security/oauth/oauth.ecf
+++ b/draft/library/security/oauth/oauth.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="oauth" uuid="F8B4DF74-C71B-45A3-9B9A-F6141C4D3C56" library_target="oauth">
+<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="oauth" uuid="F8B4DF74-C71B-45A3-9B9A-F6141C4D3C56" library_target="oauth">
 	<target name="oauth">
 		<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"/>
 		<cluster name="src" location="./src" recursive="true"/>
 	</target>
diff --git a/examples/restbucksCRUD/client/client-safe.ecf b/examples/restbucksCRUD/client/client-safe.ecf
index c06b6358..dfd98d91 100644
--- a/examples/restbucksCRUD/client/client-safe.ecf
+++ b/examples/restbucksCRUD/client/client-safe.ecf
@@ -9,11 +9,10 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http_client" location="..\..\..\library\network\http_client\http_client-safe.ecf" readonly="false"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf"/>
-		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/examples/restbucksCRUD/client/client.ecf b/examples/restbucksCRUD/client/client.ecf
index 6e82e4e1..31ba34f5 100644
--- a/examples/restbucksCRUD/client/client.ecf
+++ b/examples/restbucksCRUD/client/client.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="client" uuid="D0059CEB-5F5C-4D21-8C71-842BD0F88468">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="client" uuid="D0059CEB-5F5C-4D21-8C71-842BD0F88468" library_target="client">
 	<target name="client">
 		<root class="RESTBUCK_CLIENT" feature="make"/>
 		<file_rule>
@@ -9,11 +9,10 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
+		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
 		<library name="http_client" location="../../../library/network/http_client/http_client.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf"/>
-		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<library name="thread" location="$ISE_LIBRARY/library/thread/thread.ecf"/>
 		<cluster name="src" location="./src" recursive="true"/>
 	</target>
 </system>
diff --git a/examples/restbucksCRUD/restbucks-safe.ecf b/examples/restbucksCRUD/restbucks-safe.ecf
index d01d3d96..c5a7644f 100644
--- a/examples/restbucksCRUD/restbucks-safe.ecf
+++ b/examples/restbucksCRUD/restbucks-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="restbucks" uuid="2773FEAA-448F-410E-BEDE-9298C4749066" library_target="restbucks">
+<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="restbucks" uuid="2773FEAA-448F-410E-BEDE-9298C4749066" library_target="restbucks">
 	<target name="restbucks_common">
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
@@ -8,7 +8,7 @@
 		</file_rule>
 		<option full_class_checking="false" void_safety="all">
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="conneg" location="..\..\library\network\protocol\content_negotiation\conneg-safe.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf" readonly="false"/>
@@ -24,7 +24,7 @@
 	</target>
 	<target name="restbucks" extends="restbucks_common">
 		<root class="RESTBUCKS_SERVER" feature="make"/>
-		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="provisional">
+		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 			<debug name="standalone" enabled="true"/>
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
@@ -36,7 +36,7 @@
 	</target>
 	<target name="policy_driven_restbucks" extends="restbucks_common">
 		<root class="RESTBUCKS_SERVER" feature="make"/>
-		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="provisional">
+		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 			<debug name="standalone" enabled="true"/>
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
diff --git a/examples/upload_image/upload_image-safe.ecf b/examples/upload_image/upload_image-safe.ecf
index 873825f6..e71d93ba 100644
--- a/examples/upload_image/upload_image-safe.ecf
+++ b/examples/upload_image/upload_image-safe.ecf
@@ -14,7 +14,6 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="encoder" location="..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf" readonly="false"/>
-		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
 		<library name="uri_template" location="..\..\library\text\parser\uri_template\uri_template-safe.ecf" readonly="false"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf" readonly="false" use_application_options="true"/>
 	</target>
@@ -34,5 +33,6 @@
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
 	<target name="upload_image" extends="upload_image_standalone">
+		<setting name="concurrency" value="scoop"/>
 	</target>
 </system>
diff --git a/library/network/http_client/http_client-safe.ecf b/library/network/http_client/http_client-safe.ecf
index d69c9884..e031b229 100644
--- a/library/network/http_client/http_client-safe.ecf
+++ b/library/network/http_client/http_client-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option debug="false" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL-safe.ecf">
 			<condition>
diff --git a/library/network/http_client/http_client.ecf b/library/network/http_client/http_client.ecf
index 7010008d..d632e151 100644
--- a/library/network/http_client/http_client.ecf
+++ b/library/network/http_client/http_client.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL.ecf">
 			<condition>
diff --git a/library/network/http_client/libcurl_http_client-safe.ecf b/library/network/http_client/libcurl_http_client-safe.ecf
index cf3821d6..61042413 100644
--- a/library/network/http_client/libcurl_http_client-safe.ecf
+++ b/library/network/http_client/libcurl_http_client-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option debug="false" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL-safe.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
diff --git a/library/network/http_client/libcurl_http_client.ecf b/library/network/http_client/libcurl_http_client.ecf
index ff910944..e210501d 100644
--- a/library/network/http_client/libcurl_http_client.ecf
+++ b/library/network/http_client/libcurl_http_client.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option debug="false" warning="true" full_class_checking="true" void_safety="none" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
diff --git a/library/network/http_client/net_http_client-safe.ecf b/library/network/http_client/net_http_client-safe.ecf
index e50ac5a0..f06684e9 100644
--- a/library/network/http_client/net_http_client-safe.ecf
+++ b/library/network/http_client/net_http_client-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option debug="false" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
 		<library name="http" location="..\protocol\http\http-safe.ecf"/>
diff --git a/library/network/http_client/net_http_client.ecf b/library/network/http_client/net_http_client.ecf
index 75ab7574..2f76e28f 100644
--- a/library/network/http_client/net_http_client.ecf
+++ b/library/network/http_client/net_http_client.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option debug="false" warning="true" full_class_checking="true" void_safety="none" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
 		<library name="http" location="..\protocol\http\http.ecf"/>
diff --git a/library/network/protocol/content_negotiation/conneg-safe.ecf b/library/network/protocol/content_negotiation/conneg-safe.ecf
index af7edc59..4da807b7 100644
--- a/library/network/protocol/content_negotiation/conneg-safe.ecf
+++ b/library/network/protocol/content_negotiation/conneg-safe.ecf
@@ -11,6 +11,7 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
 			<assertions precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http" location="..\http\http-safe.ecf" readonly="false"/>
 		<cluster name="conneg" location=".\src\" recursive="true">
diff --git a/library/network/protocol/content_negotiation/conneg.ecf b/library/network/protocol/content_negotiation/conneg.ecf
index 6677144a..4a74d382 100644
--- a/library/network/protocol/content_negotiation/conneg.ecf
+++ b/library/network/protocol/content_negotiation/conneg.ecf
@@ -11,6 +11,7 @@
 		<option warning="true" full_class_checking="true">
 			<assertions precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="http" location="../http/http.ecf"/>
 		<cluster name="conneg" location=".\src\" recursive="true">
diff --git a/library/network/protocol/http/http-safe.ecf b/library/network/protocol/http/http-safe.ecf
index 4cffe316..e4f13f20 100644
--- a/library/network/protocol/http/http-safe.ecf
+++ b/library/network/protocol/http/http-safe.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 			<assertions precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<cluster name="src" location=".\" recursive="true">
diff --git a/library/network/protocol/http/http.ecf b/library/network/protocol/http/http.ecf
index 003c0708..bb3b45d2 100644
--- a/library/network/protocol/http/http.ecf
+++ b/library/network/protocol/http/http.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true"  syntax="provisional">
 			<assertions precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<cluster name="src" location=".\" recursive="true">
diff --git a/library/network/websocket/client/web_socket_client-safe.ecf b/library/network/websocket/client/web_socket_client-safe.ecf
index 33bf7579..7bc7ed9d 100644
--- a/library/network/websocket/client/web_socket_client-safe.ecf
+++ b/library/network/websocket/client/web_socket_client-safe.ecf
@@ -11,7 +11,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="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
diff --git a/library/network/websocket/client/web_socket_client.ecf b/library/network/websocket/client/web_socket_client.ecf
index 2ff8f1e5..3f8631e7 100644
--- a/library/network/websocket/client/web_socket_client.ecf
+++ b/library/network/websocket/client/web_socket_client.ecf
@@ -11,7 +11,7 @@
 		<option warning="true" void_safety="none">
 			<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.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
diff --git a/library/network/websocket/protocol/web_socket_protocol-safe.ecf b/library/network/websocket/protocol/web_socket_protocol-safe.ecf
index 82a6cec8..0b08d9a0 100644
--- a/library/network/websocket/protocol/web_socket_protocol-safe.ecf
+++ b/library/network/websocket/protocol/web_socket_protocol-safe.ecf
@@ -2,6 +2,7 @@
 <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="protocol" uuid="97582991-7BF3-4F4D-8944-8141ADE34274" library_target="protocol">
 	<target name="protocol">
 		<root all_classes="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<cluster name="src" location=".\" recursive="true"/>
 	</target>
diff --git a/library/network/websocket/protocol/web_socket_protocol.ecf b/library/network/websocket/protocol/web_socket_protocol.ecf
index c159d254..c3d310e4 100644
--- a/library/network/websocket/protocol/web_socket_protocol.ecf
+++ b/library/network/websocket/protocol/web_socket_protocol.ecf
@@ -4,6 +4,7 @@
 		<root all_classes="true"/>
 		<option void_safety="none">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<cluster name="src" location=".\" recursive="true"/>
 	</target>
diff --git a/library/network/websocket/server/websocket_server-safe.ecf b/library/network/websocket/server/websocket_server-safe.ecf
index ffbbe6f4..c0914c3b 100644
--- a/library/network/websocket/server/websocket_server-safe.ecf
+++ b/library/network/websocket/server/websocket_server-safe.ecf
@@ -11,7 +11,7 @@
 		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="standard">
 			<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="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf"/>
diff --git a/library/network/websocket/server/websocket_server.ecf b/library/network/websocket/server/websocket_server.ecf
index 9124a66d..b421917d 100644
--- a/library/network/websocket/server/websocket_server.ecf
+++ b/library/network/websocket/server/websocket_server.ecf
@@ -11,7 +11,7 @@
 		<option warning="true" is_attached_by_default="false" void_safety="none" syntax="standard">
 			<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.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
diff --git a/library/security/openid/consumer/openid-safe.ecf b/library/security/openid/consumer/openid-safe.ecf
index 67c5f936..947d6133 100644
--- a/library/security/openid/consumer/openid-safe.ecf
+++ b/library/security/openid/consumer/openid-safe.ecf
@@ -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="curl" location="$ISE_LIBRARY\library\cURL\cURL-safe.ecf" readonly="false"/>
 		<library name="http_client" location="..\..\..\network\http_client\http_client-safe.ecf"/>
diff --git a/library/security/openid/consumer/openid.ecf b/library/security/openid/consumer/openid.ecf
index d9d3b72f..b0835c54 100644
--- a/library/security/openid/consumer/openid.ecf
+++ b/library/security/openid/consumer/openid.ecf
@@ -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="curl" location="$ISE_LIBRARY\library\cURL\cURL.ecf" readonly="false"/>
 		<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf" readonly="false"/>
diff --git a/library/server/authentication/http_authorization/http_authorization-safe.ecf b/library/server/authentication/http_authorization/http_authorization-safe.ecf
index 4f5f95a9..85470acf 100644
--- a/library/server/authentication/http_authorization/http_authorization-safe.ecf
+++ b/library/server/authentication/http_authorization/http_authorization-safe.ecf
@@ -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="encoder" location="..\..\..\text\encoder\encoder-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
diff --git a/library/server/authentication/http_authorization/http_authorization.ecf b/library/server/authentication/http_authorization/http_authorization.ecf
index 20aa415a..d537bee5 100644
--- a/library/server/authentication/http_authorization/http_authorization.ecf
+++ b/library/server/authentication/http_authorization/http_authorization.ecf
@@ -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="encoder" location="..\..\..\text\encoder\encoder.ecf"/>
 		<cluster name="src" location="./src" recursive="true"/>
diff --git a/library/server/ewsgi/connectors/cgi/cgi-safe.ecf b/library/server/ewsgi/connectors/cgi/cgi-safe.ecf
index cdeca882..33a3eb7d 100644
--- a/library/server/ewsgi/connectors/cgi/cgi-safe.ecf
+++ b/library/server/ewsgi/connectors/cgi/cgi-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\..\network\protocol\http\http-safe.ecf"/>
diff --git a/library/server/ewsgi/connectors/cgi/cgi.ecf b/library/server/ewsgi/connectors/cgi/cgi.ecf
index df9c6f5b..70db681d 100644
--- a/library/server/ewsgi/connectors/cgi/cgi.ecf
+++ b/library/server/ewsgi/connectors/cgi/cgi.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
 		<library name="http" location="../../../../network/protocol/http/http.ecf"/>
diff --git a/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf b/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
index 7cc2a211..7919a56c 100644
--- a/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
+++ b/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf"/>
 		<library name="http" location="..\..\..\..\network\protocol\http\http-safe.ecf"/>
diff --git a/library/server/ewsgi/connectors/libfcgi/libfcgi.ecf b/library/server/ewsgi/connectors/libfcgi/libfcgi.ecf
index 80279ae1..4d3c76e0 100644
--- a/library/server/ewsgi/connectors/libfcgi/libfcgi.ecf
+++ b/library/server/ewsgi/connectors/libfcgi/libfcgi.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="connector_libfcgi" uuid="59C57E56-3EE6-4EF7-873F-7ED084B0EB22" library_target="connector_libfcgi">
+<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="connector_libfcgi" uuid="59C57E56-3EE6-4EF7-873F-7ED084B0EB22" library_target="connector_libfcgi">
 	<target name="connector_libfcgi">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,8 +7,9 @@
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true">
+		<option warning="true" full_class_checking="true" void_safety="none">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
 		<library name="libfcgi" location="..\..\..\libfcgi\libfcgi.ecf" />
diff --git a/library/server/ewsgi/connectors/nino/nino-safe.ecf b/library/server/ewsgi/connectors/nino/nino-safe.ecf
index 433154aa..1c96cda2 100644
--- a/library/server/ewsgi/connectors/nino/nino-safe.ecf
+++ b/library/server/ewsgi/connectors/nino/nino-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
 		</option>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="encoder" location="..\..\..\..\text\encoder\encoder-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
diff --git a/library/server/ewsgi/connectors/nino/nino.ecf b/library/server/ewsgi/connectors/nino/nino.ecf
index 98287438..73b68c8c 100644
--- a/library/server/ewsgi/connectors/nino/nino.ecf
+++ b/library/server/ewsgi/connectors/nino/nino.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true">
 		</option>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="encoder" location="../../../../text/encoder/encoder.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
diff --git a/library/server/ewsgi/connectors/null/null-safe.ecf b/library/server/ewsgi/connectors/null/null-safe.ecf
index 0f7da040..fd48e5e2 100644
--- a/library/server/ewsgi/connectors/null/null-safe.ecf
+++ b/library/server/ewsgi/connectors/null/null-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\..\network\protocol\http\http-safe.ecf"/>
diff --git a/library/server/ewsgi/connectors/null/null.ecf b/library/server/ewsgi/connectors/null/null.ecf
index 5255edb0..c5ec39ee 100644
--- a/library/server/ewsgi/connectors/null/null.ecf
+++ b/library/server/ewsgi/connectors/null/null.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
 		<library name="http" location="../../../../network/protocol/http/http.ecf"/>
diff --git a/library/server/ewsgi/ewsgi-safe.ecf b/library/server/ewsgi/ewsgi-safe.ecf
index 7b218139..5b58687a 100644
--- a/library/server/ewsgi/ewsgi-safe.ecf
+++ b/library/server/ewsgi/ewsgi-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="error" location="..\..\utility\general\error\error-safe.ecf"/>
diff --git a/library/server/ewsgi/ewsgi.ecf b/library/server/ewsgi/ewsgi.ecf
index 4c3b7d97..bea8612b 100644
--- a/library/server/ewsgi/ewsgi.ecf
+++ b/library/server/ewsgi/ewsgi.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="false" void_safety="none" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder.ecf" readonly="false"/>
 		<library name="error" location="..\..\utility\general\error\error.ecf"/>
diff --git a/library/server/ewsgi/ewsgi_spec-safe.ecf b/library/server/ewsgi/ewsgi_spec-safe.ecf
index 272b2493..20668cfc 100644
--- a/library/server/ewsgi/ewsgi_spec-safe.ecf
+++ b/library/server/ewsgi/ewsgi_spec-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<cluster name="specification" location="specification\" recursive="true"/>
diff --git a/library/server/ewsgi/ewsgi_spec.ecf b/library/server/ewsgi/ewsgi_spec.ecf
index ee7fb674..2052c88f 100644
--- a/library/server/ewsgi/ewsgi_spec.ecf
+++ b/library/server/ewsgi/ewsgi_spec.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="false" void_safety="none" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<cluster name="specification" location="specification\" recursive="true"/>
diff --git a/library/server/ewsgi/examples/hello_world/hello-safe.ecf b/library/server/ewsgi/examples/hello_world/hello-safe.ecf
index 3c3745ed..2ce93998 100644
--- a/library/server/ewsgi/examples/hello_world/hello-safe.ecf
+++ b/library/server/ewsgi/examples/hello_world/hello-safe.ecf
@@ -9,7 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="connector_standalone" location="..\..\connectors\standalone\standalone-safe.ecf" readonly="false"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
diff --git a/library/server/httpd/httpd-safe.ecf b/library/server/httpd/httpd-safe.ecf
index f3e44d75..c2987a54 100644
--- a/library/server/httpd/httpd-safe.ecf
+++ b/library/server/httpd/httpd-safe.ecf
@@ -24,7 +24,7 @@
 		</library>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf">
 			<condition>
-				<concurrency excluded_value="none"/>
+				<concurrency value="thread"/>
 			</condition>
 		</library>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
diff --git a/library/server/httpd/httpd.ecf b/library/server/httpd/httpd.ecf
index edbadb61..52fe0772 100644
--- a/library/server/httpd/httpd.ecf
+++ b/library/server/httpd/httpd.ecf
@@ -9,7 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="http_network" location="..\..\network\http_network\http_network.ecf" readonly="false"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
@@ -23,7 +23,7 @@
 		</library>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf">
 			<condition>
-				<concurrency excluded_value="none"/>
+				<concurrency value="thread"/>
 			</condition>
 		</library>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
diff --git a/library/server/libfcgi/libfcgi-safe.ecf b/library/server/libfcgi/libfcgi-safe.ecf
index 6958b481..3172ff2f 100644
--- a/library/server/libfcgi/libfcgi-safe.ecf
+++ b/library/server/libfcgi/libfcgi-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="libfcgi" uuid="3F4BCF74-3503-4533-9D74-5A65EC4CA3C4" library_target="libfcgi">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="libfcgi" uuid="3F4BCF74-3503-4533-9D74-5A65EC4CA3C4" library_target="libfcgi">
 	<target name="libfcgi">
 		<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="transitional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<external_include location="$ECF_CONFIG_PATH/spec/include/libfcgi">
 			<condition>
 				<platform excluded_value="windows"/>
diff --git a/library/server/libfcgi/libfcgi.ecf b/library/server/libfcgi/libfcgi.ecf
index 9216b61f..93f8e18f 100644
--- a/library/server/libfcgi/libfcgi.ecf
+++ b/library/server/libfcgi/libfcgi.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-6-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-6-0 http://www.eiffel.com/developers/xml/configuration-1-6-0.xsd" name="libfcgi" uuid="3F4BCF74-3503-4533-9D74-5A65EC4CA3C4" library_target="libfcgi">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="libfcgi" uuid="3F4BCF74-3503-4533-9D74-5A65EC4CA3C4" library_target="libfcgi">
 	<target name="libfcgi">
 		<root all_classes="true"/>
 		<file_rule>
@@ -8,8 +8,9 @@
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
 	
-		<option warning="true" full_class_checking="true">
+		<option warning="true" full_class_checking="true" void_safety="none">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<external_include location="$ECF_CONFIG_PATH/spec/include/libfcgi">
 			<condition>
 				<platform excluded_value="windows"/>
diff --git a/library/server/wsf/connector/all-safe.ecf b/library/server/wsf/connector/all-safe.ecf
index 8d259a58..accacfd3 100644
--- a/library/server/wsf/connector/all-safe.ecf
+++ b/library/server/wsf/connector/all-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="connector_cgi" location="..\..\ewsgi\connectors\cgi\cgi-safe.ecf"/>
 		<library name="connector_libfcgi" location="..\..\ewsgi\connectors\libfcgi\libfcgi-safe.ecf"/>
@@ -20,7 +21,6 @@
 		<library name="standalone" location="standalone-safe.ecf" readonly="false"/>
 		<library name="standalone_ws" location="standalone_websocket-safe.ecf" readonly="false"/>
 		<library name="openshift" location="openshift-safe.ecf" readonly="false"/>
-		<library name="nino" location="nino-safe.ecf" readonly="false"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<library name="wsf" location="..\wsf-safe.ecf"/>
 	</target>
diff --git a/library/server/wsf/connector/all.ecf b/library/server/wsf/connector/all.ecf
new file mode 100644
index 00000000..3583734f
--- /dev/null
+++ b/library/server/wsf/connector/all.ecf
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="wsf_all" uuid="223E2E7D-AA90-4ADC-93CB-D304E794E3E6" library_target="wsf_all">
+	<target name="wsf_all">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="none" syntax="provisional">
+		</option>
+		<setting name="concurrency" value="scoop"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="connector_cgi" location="..\..\ewsgi\connectors\cgi\cgi.ecf"/>
+		<library name="connector_libfcgi" location="..\..\ewsgi\connectors\libfcgi\libfcgi.ecf"/>
+		<library name="connector_standalone" location="..\..\ewsgi\connectors\standalone\standalone.ecf"/>
+		<library name="encoder" location="..\..\..\text\encoder\encoder.ecf" readonly="false"/>
+		<library name="error" location="..\..\..\utility\general\error\error.ecf"/>
+		<library name="ewsgi" location="..\..\ewsgi\ewsgi.ecf"/>
+		<library name="http" location="..\..\..\network\protocol\http\http.ecf"/>
+		<library name="standalone" location="standalone.ecf" readonly="false"/>
+		<library name="standalone_ws" location="standalone_websocket.ecf" readonly="false"/>
+		<library name="openshift" location="openshift.ecf" readonly="false"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<library name="wsf" location="..\wsf.ecf"/>
+	</target>
+</system>
diff --git a/library/server/wsf/connector/cgi-safe.ecf b/library/server/wsf/connector/cgi-safe.ecf
index bd1d9f5f..8771e4e2 100644
--- a/library/server/wsf/connector/cgi-safe.ecf
+++ b/library/server/wsf/connector/cgi-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="connector_cgi" location="..\..\ewsgi\connectors\cgi\cgi-safe.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
diff --git a/library/server/wsf/connector/cgi.ecf b/library/server/wsf/connector/cgi.ecf
index cf25584a..24e08f3e 100644
--- a/library/server/wsf/connector/cgi.ecf
+++ b/library/server/wsf/connector/cgi.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="ewsgi" location="../../ewsgi/ewsgi.ecf"/>
diff --git a/library/server/wsf/connector/libfcgi-safe.ecf b/library/server/wsf/connector/libfcgi-safe.ecf
index 63bbc68b..929133ce 100644
--- a/library/server/wsf/connector/libfcgi-safe.ecf
+++ b/library/server/wsf/connector/libfcgi-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="connector_libfcgi" location="..\..\ewsgi\connectors\libfcgi\libfcgi-safe.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
diff --git a/library/server/wsf/connector/libfcgi.ecf b/library/server/wsf/connector/libfcgi.ecf
index 5c87293b..605e923e 100644
--- a/library/server/wsf/connector/libfcgi.ecf
+++ b/library/server/wsf/connector/libfcgi.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="ewsgi" location="../../ewsgi/ewsgi.ecf"/>
diff --git a/library/server/wsf/connector/nino-safe.ecf b/library/server/wsf/connector/nino-safe.ecf
index a6bcb9e1..f231a66a 100644
--- a/library/server/wsf/connector/nino-safe.ecf
+++ b/library/server/wsf/connector/nino-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="connector_nino" location="..\..\ewsgi\connectors\nino\nino-safe.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
diff --git a/library/server/wsf/connector/nino.ecf b/library/server/wsf/connector/nino.ecf
index e1ee7fd6..9bf04993 100644
--- a/library/server/wsf/connector/nino.ecf
+++ b/library/server/wsf/connector/nino.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="ewsgi" location="../../ewsgi/ewsgi.ecf"/>
diff --git a/library/server/wsf/connector/openshift-safe.ecf b/library/server/wsf/connector/openshift-safe.ecf
index 9cdae217..677dc3d5 100644
--- a/library/server/wsf/connector/openshift-safe.ecf
+++ b/library/server/wsf/connector/openshift-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi\ewsgi-safe.ecf"/>
 		<library name="wsf" location="..\wsf-safe.ecf"/>
diff --git a/library/server/wsf/connector/openshift.ecf b/library/server/wsf/connector/openshift.ecf
new file mode 100644
index 00000000..5fff0179
--- /dev/null
+++ b/library/server/wsf/connector/openshift.ecf
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="wsf_openshift" uuid="39488429-3940-4360-9A32-FE53298C2CA2" library_target="wsf_openshift">
+	<target name="wsf_openshift">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="none" syntax="provisional">
+		</option>
+		<setting name="concurrency" value="scoop"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="ewsgi" location="..\..\ewsgi\ewsgi.ecf"/>
+		<library name="wsf" location="..\wsf.ecf"/>
+		<library name="wsf_connector_standalone" location="standalone.ecf"/>
+		<cluster name="wsf_openshift" location=".\openshift\" recursive="true"/>
+	</target>
+</system>
diff --git a/library/server/wsf/connector/standalone.ecf b/library/server/wsf/connector/standalone.ecf
index 63d5cd22..bded9c92 100644
--- a/library/server/wsf/connector/standalone.ecf
+++ b/library/server/wsf/connector/standalone.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="connector_standalone" location="..\..\ewsgi\connectors\standalone\standalone.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder.ecf" readonly="false"/>
diff --git a/library/server/wsf/connector/standalone_websocket-safe.ecf b/library/server/wsf/connector/standalone_websocket-safe.ecf
index 2f1e36d9..f23e0c5b 100644
--- a/library/server/wsf/connector/standalone_websocket-safe.ecf
+++ b/library/server/wsf/connector/standalone_websocket-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="connector_standalone" location="..\..\ewsgi\connectors\standalone\standalone-safe.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
diff --git a/library/server/wsf/connector/standalone_websocket.ecf b/library/server/wsf/connector/standalone_websocket.ecf
index 19a72337..47b4750f 100644
--- a/library/server/wsf/connector/standalone_websocket.ecf
+++ b/library/server/wsf/connector/standalone_websocket.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_obsolete_routine_type="true" void_safety="none" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="connector_standalone" location="..\..\ewsgi\connectors\standalone\standalone.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto.ecf"/>
diff --git a/library/server/wsf/default/cgi-safe.ecf b/library/server/wsf/default/cgi-safe.ecf
index 8a6faae1..6e448e5c 100644
--- a/library/server/wsf/default/cgi-safe.ecf
+++ b/library/server/wsf/default/cgi-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="wsf" location="..\wsf-safe.ecf"/>
 		<library name="wsf_cgi" location="..\connector\cgi-safe.ecf"/>
diff --git a/library/server/wsf/default/cgi.ecf b/library/server/wsf/default/cgi.ecf
index 42f3b093..5814592e 100644
--- a/library/server/wsf/default/cgi.ecf
+++ b/library/server/wsf/default/cgi.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="wsf" location="../wsf.ecf"/>
 		<library name="wsf_cgi" location="../connector/cgi.ecf"/>
diff --git a/library/server/wsf/default/libfcgi-safe.ecf b/library/server/wsf/default/libfcgi-safe.ecf
index 24a3a7fe..04111a0e 100644
--- a/library/server/wsf/default/libfcgi-safe.ecf
+++ b/library/server/wsf/default/libfcgi-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="wsf" location="..\wsf-safe.ecf"/>
 		<library name="wsf_libfcgi" location="..\connector\libfcgi-safe.ecf"/>
diff --git a/library/server/wsf/default/libfcgi.ecf b/library/server/wsf/default/libfcgi.ecf
index 57b00ded..ff2e30dd 100644
--- a/library/server/wsf/default/libfcgi.ecf
+++ b/library/server/wsf/default/libfcgi.ecf
@@ -8,6 +8,7 @@
 			<exclude>/\.svn$</exclude>
 		</file_rule>
 		<option warning="true" full_class_checking="true" syntax="provisional"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="wsf" location="../wsf.ecf"/>
 		<library name="wsf_libfcgi" location="../connector/libfcgi.ecf"/>
diff --git a/library/server/wsf/default/nino-safe.ecf b/library/server/wsf/default/nino-safe.ecf
index f9f0aa19..d991a87d 100644
--- a/library/server/wsf/default/nino-safe.ecf
+++ b/library/server/wsf/default/nino-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="wsf" location="..\wsf-safe.ecf"/>
 		<library name="wsf_nino" location="..\connector\nino-safe.ecf"/>
diff --git a/library/server/wsf/default/nino.ecf b/library/server/wsf/default/nino.ecf
index e75641d1..98ba396c 100644
--- a/library/server/wsf/default/nino.ecf
+++ b/library/server/wsf/default/nino.ecf
@@ -8,6 +8,7 @@
 			<exclude>/\.svn$</exclude>
 		</file_rule>
 		<option warning="true" full_class_checking="true" syntax="provisional"/>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="wsf" location="../wsf.ecf"/>
 		<library name="wsf_nino" location="../connector/nino.ecf"/>
diff --git a/library/server/wsf/default/openshift-safe.ecf b/library/server/wsf/default/openshift-safe.ecf
index 904ad908..9d6b212f 100644
--- a/library/server/wsf/default/openshift-safe.ecf
+++ b/library/server/wsf/default/openshift-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="wsf" location="..\wsf-safe.ecf"/>
 		<library name="wsf_openshift" location="..\connector\openshift-safe.ecf"/>
diff --git a/library/server/wsf/default/openshift.ecf b/library/server/wsf/default/openshift.ecf
new file mode 100644
index 00000000..c31f1f97
--- /dev/null
+++ b/library/server/wsf/default/openshift.ecf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="default_openshift" uuid="9EDB2BD1-9E1B-4931-ADD2-2724E3A25CBF" library_target="default_openshift">
+	<target name="default_openshift">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="none" syntax="provisional">
+		</option>
+		<setting name="concurrency" value="scoop"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="wsf" location="..\wsf.ecf"/>
+		<library name="wsf_openshift" location="..\connector\openshift.ecf"/>
+		<cluster name="default_openshift" location=".\openshift\" recursive="true"/>
+	</target>
+</system>
diff --git a/library/server/wsf/wsf-safe.ecf b/library/server/wsf/wsf-safe.ecf
index c6f070ef..7ffb7a56 100644
--- a/library/server/wsf/wsf-safe.ecf
+++ b/library/server/wsf/wsf-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<mapping old_name="WSF_URI_TEMPLATE_HELPER_FOR_ROUTED_EXECUTION" new_name="WSF_ROUTED_URI_TEMPLATE_HELPER"/>
 		<mapping old_name="WSF_URI_HELPER_FOR_ROUTED_EXECUTION" new_name="WSF_ROUTED_URI_HELPER"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
diff --git a/library/server/wsf/wsf.ecf b/library/server/wsf/wsf.ecf
index 1a0f044e..c588b2c7 100644
--- a/library/server/wsf/wsf.ecf
+++ b/library/server/wsf/wsf.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<mapping old_name="WSF_URI_TEMPLATE_HELPER_FOR_ROUTED_EXECUTION" new_name="WSF_ROUTED_URI_TEMPLATE_HELPER"/>
 		<mapping old_name="WSF_URI_HELPER_FOR_ROUTED_EXECUTION" new_name="WSF_ROUTED_URI_HELPER"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
diff --git a/library/server/wsf/wsf_extension-safe.ecf b/library/server/wsf/wsf_extension-safe.ecf
index 1ce079e7..744941ac 100644
--- a/library/server/wsf/wsf_extension-safe.ecf
+++ b/library/server/wsf/wsf_extension-safe.ecf
@@ -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="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi-safe.ecf"/>
diff --git a/library/server/wsf/wsf_extension.ecf b/library/server/wsf/wsf_extension.ecf
index 92c70d7d..c06cec5b 100644
--- a/library/server/wsf/wsf_extension.ecf
+++ b/library/server/wsf/wsf_extension.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="false" void_safety="none" syntax="standard">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi.ecf"/>
diff --git a/library/server/wsf/wsf_policy_driven-safe.ecf b/library/server/wsf/wsf_policy_driven-safe.ecf
index fd1311dc..613516cd 100644
--- a/library/server/wsf/wsf_policy_driven-safe.ecf
+++ b/library/server/wsf/wsf_policy_driven-safe.ecf
@@ -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="conneg" location="..\..\network\protocol\content_negotiation\conneg-safe.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
diff --git a/library/server/wsf/wsf_policy_driven.ecf b/library/server/wsf/wsf_policy_driven.ecf
index 5be96d76..523d7bb0 100644
--- a/library/server/wsf/wsf_policy_driven.ecf
+++ b/library/server/wsf/wsf_policy_driven.ecf
@@ -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="conneg" location="..\..\network\protocol\content_negotiation\conneg.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
diff --git a/library/server/wsf/wsf_router_context-safe.ecf b/library/server/wsf/wsf_router_context-safe.ecf
index d9908c5a..bec0b4b5 100644
--- a/library/server/wsf/wsf_router_context-safe.ecf
+++ b/library/server/wsf/wsf_router_context-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="wsf" location="wsf-safe.ecf"/>
 		<cluster name="router_context" location=".\router_context\" recursive="true"/>
diff --git a/library/server/wsf/wsf_router_context.ecf b/library/server/wsf/wsf_router_context.ecf
index c7927478..02b1be52 100644
--- a/library/server/wsf/wsf_router_context.ecf
+++ b/library/server/wsf/wsf_router_context.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" void_safety="none">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="wsf" location="wsf.ecf"/>
 		<cluster name="router_context" location=".\router_context\" recursive="true"/>
diff --git a/library/server/wsf/wsf_session-safe.ecf b/library/server/wsf/wsf_session-safe.ecf
index d57b5bea..873cec09 100644
--- a/library/server/wsf/wsf_session-safe.ecf
+++ b/library/server/wsf/wsf_session-safe.ecf
@@ -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="ewsgi" location="..\ewsgi\ewsgi-safe.ecf"/>
 		<library name="http" location="..\..\network\protocol\http\http-safe.ecf"/>
diff --git a/library/server/wsf/wsf_session.ecf b/library/server/wsf/wsf_session.ecf
index e89376d7..6f06153b 100644
--- a/library/server/wsf/wsf_session.ecf
+++ b/library/server/wsf/wsf_session.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="false" void_safety="none" syntax="standard">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi.ecf"/>
 		<library name="http" location="..\..\network\protocol\http\http.ecf"/>
diff --git a/library/server/wsf_html/wsf_html-safe.ecf b/library/server/wsf_html/wsf_html-safe.ecf
index 736c0301..59e175d3 100644
--- a/library/server/wsf_html/wsf_html-safe.ecf
+++ b/library/server/wsf_html/wsf_html-safe.ecf
@@ -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="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
 		<library name="uri_template" location="..\..\text\parser\uri_template\uri_template-safe.ecf"/>
diff --git a/library/server/wsf_html/wsf_html.ecf b/library/server/wsf_html/wsf_html.ecf
index a77fb742..db84df18 100644
--- a/library/server/wsf_html/wsf_html.ecf
+++ b/library/server/wsf_html/wsf_html.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="false" void_safety="none" syntax="standard">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
 		<library name="uri_template" location="..\..\text\parser\uri_template\uri_template.ecf"/>
diff --git a/library/server/wsf_proxy/wsf_proxy-safe.ecf b/library/server/wsf_proxy/wsf_proxy-safe.ecf
index 9dd777ce..edcb930b 100644
--- a/library/server/wsf_proxy/wsf_proxy-safe.ecf
+++ b/library/server/wsf_proxy/wsf_proxy-safe.ecf
@@ -2,6 +2,7 @@
 <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_proxy" uuid="A39CCC27-BF63-4959-B881-7D0713F4C84A" library_target="wsf_proxy">
 	<target name="wsf_proxy">
 		<root all_classes="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http" location="..\..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
diff --git a/library/server/wsf_proxy/wsf_proxy.ecf b/library/server/wsf_proxy/wsf_proxy.ecf
index 17ffa573..f9c2afb1 100644
--- a/library/server/wsf_proxy/wsf_proxy.ecf
+++ b/library/server/wsf_proxy/wsf_proxy.ecf
@@ -4,6 +4,7 @@
 		<root all_classes="true"/>
 		<option void_safety="none">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="http" location="..\..\..\library\network\protocol\http\http.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
diff --git a/library/text/encoder/encoder-safe.ecf b/library/text/encoder/encoder-safe.ecf
index e6f73687..2df44f6c 100644
--- a/library/text/encoder/encoder-safe.ecf
+++ b/library/text/encoder/encoder-safe.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 			<assertions precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<cluster name="src" location="src\" recursive="true">
 			<file_rule>
diff --git a/library/text/encoder/encoder.ecf b/library/text/encoder/encoder.ecf
index 781d7fb6..6ffd4bbe 100644
--- a/library/text/encoder/encoder.ecf
+++ b/library/text/encoder/encoder.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true" syntax="provisional">
 			<assertions precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<cluster name="src" location="src\" recursive="true">
 			<file_rule>
diff --git a/library/text/parser/feed/feed-safe.ecf b/library/text/parser/feed/feed-safe.ecf
index 48591ec8..80967046 100644
--- a/library/text/parser/feed/feed-safe.ecf
+++ b/library/text/parser/feed/feed-safe.ecf
@@ -2,6 +2,7 @@
 <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="feed" uuid="71364A69-1549-472E-AF78-FDA4FDA016EB" library_target="feed">
 	<target name="feed">
 		<root all_classes="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
 		<library name="encoders" location="..\..\encoder\encoder-safe.ecf"/>
diff --git a/library/text/parser/feed/feed.ecf b/library/text/parser/feed/feed.ecf
index 9d4031e7..cb4795b0 100644
--- a/library/text/parser/feed/feed.ecf
+++ b/library/text/parser/feed/feed.ecf
@@ -4,6 +4,7 @@
 		<root all_classes="true"/>
 		<option void_safety="none">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="encoders" location="..\..\encoder\encoder.ecf"/>
diff --git a/library/text/parser/uri_template/uri_template-safe.ecf b/library/text/parser/uri_template/uri_template-safe.ecf
index a1949747..d08afdd8 100644
--- a/library/text/parser/uri_template/uri_template-safe.ecf
+++ b/library/text/parser/uri_template/uri_template-safe.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
 			<assertions precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="encoder" location="..\..\encoder\encoder-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
diff --git a/library/text/parser/uri_template/uri_template.ecf b/library/text/parser/uri_template/uri_template.ecf
index a35782c9..236b1649 100644
--- a/library/text/parser/uri_template/uri_template.ecf
+++ b/library/text/parser/uri_template/uri_template.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true">
 			<assertions precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="encoder" location="../../encoder/encoder.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
diff --git a/library/utility/general/error/error-safe.ecf b/library/utility/general/error/error-safe.ecf
index 563455bc..634dc4ab 100644
--- a/library/utility/general/error/error-safe.ecf
+++ b/library/utility/general/error/error-safe.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 			<assertions precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
diff --git a/library/utility/general/error/error.ecf b/library/utility/general/error/error.ecf
index f21ea9b9..5803d15a 100644
--- a/library/utility/general/error/error.ecf
+++ b/library/utility/general/error/error.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true" syntax="provisional">
 			<assertions precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
diff --git a/tests/all-safe.ecf b/tests/all-safe.ecf
index 22204869..20cb0609 100644
--- a/tests/all-safe.ecf
+++ b/tests/all-safe.ecf
@@ -10,18 +10,17 @@
 		</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="all-stable" location="all-stable-safe.ecf" readonly="false"/>
 		<library name="atom" location="..\draft\library\protocol\syndication\atom\atom-safe.ecf" readonly="false"/>
 		<library name="client" location="..\examples\restbucksCRUD\client\client-safe.ecf" readonly="false"/>
 		<library name="connector_cgi" location="..\library\server\ewsgi\connectors\cgi\cgi-safe.ecf" readonly="false"/>
 		<library name="connector_libfcgi" location="..\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf" readonly="false"/>
-		<library name="connector_nino" location="..\library\server\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/>
 		<library name="connector_null" location="..\library\server\ewsgi\connectors\null\null-safe.ecf" readonly="false"/>
 		<library name="connector_standalone" location="..\library\server\ewsgi\connectors\standalone\standalone-safe.ecf" readonly="false"/>
 		<library name="conneg" location="..\library\network\protocol\content_negotiation\conneg-safe.ecf" readonly="false"/>
 		<library name="default_cgi" location="..\library\server\wsf\default\cgi-safe.ecf" readonly="false"/>
 		<library name="default_libfcgi" location="..\library\server\wsf\default\libfcgi-safe.ecf" readonly="false"/>
-		<library name="default_nino" location="..\library\server\wsf\default\nino-safe.ecf" readonly="false"/>
 		<library name="default_openshift" location="..\library\server\wsf\default\openshift-safe.ecf" readonly="false"/>
 		<library name="demo-1" location="..\library\security\openid\consumer\demo\demo-safe.ecf" readonly="false"/>
 		<library name="encoder" location="..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
@@ -35,28 +34,20 @@
 		<library name="http_authorization" location="..\library\server\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
 		<library name="http_client" location="..\library\network\http_client\http_client-safe.ecf" readonly="false"/>
 		<library name="libfcgi" location="..\library\server\libfcgi\libfcgi-safe.ecf" readonly="false"/>
-		<library name="nino" location="..\contrib\library\network\server\nino\nino-safe.ecf" readonly="false"/>
 		<library name="notification_email" location="..\library\runtime\process\notification_email\notification_email-safe.ecf" readonly="false"/>
 		<library name="oauth" location="..\draft\library\security\oauth\oauth-safe.ecf" readonly="false"/>
 		<library name="openid" location="..\library\security\openid\consumer\openid-safe.ecf" readonly="false"/>
-		<library name="precomp_wsf" location="..\precomp\wsf-safe.ecf" readonly="false"/>
-		<library name="precomp_wsf-mt" location="..\precomp\wsf-mt-safe.ecf" readonly="false"/>
-		<library name="precomp_wsf-scoop-safe" location="..\precomp\wsf-scoop-safe.ecf" readonly="false"/>
 		<library name="restbucks" location="..\examples\restbucksCRUD\restbucks-safe.ecf" readonly="false"/>
 		<library name="rss" location="..\draft\library\protocol\syndication\rss\rss-safe.ecf" readonly="false"/>
 		<library name="upload_image" location="..\examples\upload_image\upload_image-safe.ecf" readonly="false"/>
 		<library name="uri_template" location="..\library\text\parser\uri_template\uri_template-safe.ecf" readonly="false"/>
-		<library name="wizard" location="..\tools\estudio_wizard\wizard.ecf" readonly="false"/>
-		<library name="console_wizard" location="..\tools\estudio_wizard\console_wizard.ecf" readonly="false"/>
 		<library name="wsf" location="..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
 		<library name="wsf_all" location="..\library\server\wsf\connector\all-safe.ecf" readonly="false"/>
 		<library name="wsf_cgi" location="..\library\server\wsf\connector\cgi-safe.ecf" readonly="false"/>
 		<library name="wsf_extension" location="..\library\server\wsf\wsf_extension-safe.ecf" readonly="false"/>
 		<library name="wsf_html" location="..\library\server\wsf_html\wsf_html-safe.ecf" readonly="false"/>
 		<library name="wsf_js_widget" location="..\draft\library\server\wsf_js_widget\wsf_js_widget-safe.ecf" readonly="false"/>
-		<library name="wsf_js_widget_demo" location="..\draft\library\server\wsf_js_widget\examples\demo\demo.ecf" readonly="false"/>
 		<library name="wsf_libfcgi" location="..\library\server\wsf\connector\libfcgi-safe.ecf" readonly="false"/>
-		<library name="wsf_nino" location="..\library\server\wsf\connector\nino-safe.ecf" readonly="false"/>
 		<library name="wsf_openshift" location="..\library\server\wsf\connector\openshift-safe.ecf" readonly="false"/>
 		<library name="wsf_policy_driven" location="..\library\server\wsf\wsf_policy_driven-safe.ecf" readonly="false"/>
 		<library name="wsf_router_context" location="..\library\server\wsf\wsf_router_context-safe.ecf" readonly="false"/>
diff --git a/tests/all-stable-safe.ecf b/tests/all-stable-safe.ecf
index 3f9afb1d..8c0a7f37 100644
--- a/tests/all-stable-safe.ecf
+++ b/tests/all-stable-safe.ecf
@@ -10,17 +10,16 @@
 		</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="client" location="..\examples\restbucksCRUD\client\client-safe.ecf" readonly="false"/>
 		<library name="connector_cgi" location="..\library\server\ewsgi\connectors\cgi\cgi-safe.ecf" readonly="false"/>
 		<library name="connector_libfcgi" location="..\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf" readonly="false"/>
 		<library name="connector_standalone" location="..\library\server\ewsgi\connectors\standalone\standalone-safe.ecf" readonly="false"/>
-		<library name="connector_nino" location="..\library\server\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/>
 		<library name="connector_null" location="..\library\server\ewsgi\connectors\null\null-safe.ecf" readonly="false"/>
 		<library name="conneg" location="..\library\network\protocol\content_negotiation\conneg-safe.ecf" readonly="false"/>
 		<library name="default_cgi" location="..\library\server\wsf\default\cgi-safe.ecf" readonly="false"/>
 		<library name="default_libfcgi" location="..\library\server\wsf\default\libfcgi-safe.ecf" readonly="false"/>
 		<library name="default_standalone" location="..\library\server\wsf\default\standalone-safe.ecf" readonly="false"/>
-		<library name="default_nino" location="..\library\server\wsf\default\nino-safe.ecf" readonly="false"/>
 		<library name="default_openshift" location="..\library\server\wsf\default\openshift-safe.ecf" readonly="false"/>
 		<library name="demo-1" location="..\library\security\openid\consumer\demo\demo-safe.ecf" readonly="false"/>
 		<library name="encoder" location="..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
@@ -34,14 +33,9 @@
 		<library name="libfcgi" location="..\library\server\libfcgi\libfcgi-safe.ecf" readonly="false"/>
 		<library name="notification_email" location="..\library\runtime\process\notification_email\notification_email-safe.ecf" readonly="false"/>
 		<library name="openid" location="..\library\security\openid\consumer\openid-safe.ecf" readonly="false"/>
-		<library name="precomp_wsf" location="..\precomp\wsf-safe.ecf" readonly="false"/>
-		<library name="precomp_wsf-mt" location="..\precomp\wsf-mt-safe.ecf" readonly="false"/>
-		<library name="precomp_wsf-scoop-safe" location="..\precomp\wsf-scoop-safe.ecf" readonly="false"/>
 		<library name="restbucks" location="..\examples\restbucksCRUD\restbucks-safe.ecf" readonly="false"/>
 		<library name="upload_image" location="..\examples\upload_image\upload_image-safe.ecf" readonly="false"/>
 		<library name="uri_template" location="..\library\text\parser\uri_template\uri_template-safe.ecf" readonly="false"/>
-		<library name="wizard" location="..\tools\estudio_wizard\wizard.ecf" readonly="false"/>
-		<library name="console_wizard" location="..\tools\estudio_wizard\console_wizard.ecf" readonly="false"/>
 		<library name="wsf" location="..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
 		<library name="wsf_all" location="..\library\server\wsf\connector\all-safe.ecf" readonly="false"/>
 		<library name="wsf_cgi" location="..\library\server\wsf\connector\cgi-safe.ecf" readonly="false"/>
@@ -49,7 +43,6 @@
 		<library name="wsf_html" location="..\library\server\wsf_html\wsf_html-safe.ecf" readonly="false"/>
 		<library name="wsf_libfcgi" location="..\library\server\wsf\connector\libfcgi-safe.ecf" readonly="false"/>
 		<library name="wsf_standalone" location="..\library\server\wsf\connector\standalone-safe.ecf" readonly="false"/>
-		<library name="wsf_nino" location="..\library\server\wsf\connector\nino-safe.ecf" readonly="false"/>
 		<library name="wsf_openshift" location="..\library\server\wsf\connector\openshift-safe.ecf" readonly="false"/>
 		<library name="wsf_router_context" location="..\library\server\wsf\wsf_router_context-safe.ecf" readonly="false"/>
 		<library name="wsf_session" location="..\library\server\wsf\wsf_session-safe.ecf" readonly="false"/>
diff --git a/tests/all-stable.ecf b/tests/all-stable.ecf
new file mode 100644
index 00000000..74440e75
--- /dev/null
+++ b/tests/all-stable.ecf
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="all" uuid="1172C52C-6979-4293-8F01-80FADA5A2B69" library_target="all_stable">
+	<description>Integration project including many lib</description>
+	<target name="all_stable">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="none" syntax="standard">
+		</option>
+		<setting name="concurrency" value="scoop"/>
+		<library name="connector_cgi" location="..\library\server\ewsgi\connectors\cgi\cgi.ecf" readonly="false"/>
+		<library name="connector_libfcgi" location="..\library\server\ewsgi\connectors\libfcgi\libfcgi.ecf" readonly="false"/>
+		<library name="connector_standalone" location="..\library\server\ewsgi\connectors\standalone\standalone.ecf" readonly="false"/>
+		<library name="connector_null" location="..\library\server\ewsgi\connectors\null\null.ecf" readonly="false"/>
+		<library name="conneg" location="..\library\network\protocol\content_negotiation\conneg.ecf" readonly="false"/>
+		<library name="default_cgi" location="..\library\server\wsf\default\cgi.ecf" readonly="false"/>
+		<library name="default_libfcgi" location="..\library\server\wsf\default\libfcgi.ecf" readonly="false"/>
+		<library name="default_standalone" location="..\library\server\wsf\default\standalone.ecf" readonly="false"/>
+		<library name="default_openshift" location="..\library\server\wsf\default\openshift.ecf" readonly="false"/>
+		<library name="encoder" location="..\library\text\encoder\encoder.ecf" readonly="false"/>
+		<library name="error" location="..\library\utility\general\error\error.ecf" readonly="false"/>
+		<library name="ewsgi" location="..\library\server\ewsgi\ewsgi.ecf" readonly="false"/>
+		<library name="ewsgi_spec" location="..\library\server\ewsgi\ewsgi_spec.ecf" readonly="false"/>
+		<library name="http" location="..\library\network\protocol\http\http.ecf" readonly="false"/>
+		<library name="http_authorization" location="..\library\server\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
+		<library name="http_client" location="..\library\network\http_client\http_client.ecf" readonly="false"/>
+		<library name="libfcgi" location="..\library\server\libfcgi\libfcgi.ecf" readonly="false"/>
+		<library name="notification_email" location="..\library\runtime\process\notification_email\notification_email.ecf" readonly="false"/>
+		<library name="openid" location="..\library\security\openid\consumer\openid.ecf" readonly="false"/>
+		<library name="uri_template" location="..\library\text\parser\uri_template\uri_template.ecf" readonly="false"/>
+		<library name="wsf" location="..\library\server\wsf\wsf.ecf" readonly="false"/>
+		<library name="wsf_all" location="..\library\server\wsf\connector\all.ecf" readonly="false"/>
+		<library name="wsf_cgi" location="..\library\server\wsf\connector\cgi.ecf" readonly="false"/>
+		<library name="wsf_extension" location="..\library\server\wsf\wsf_extension.ecf" readonly="false"/>
+		<library name="wsf_html" location="..\library\server\wsf_html\wsf_html.ecf" readonly="false"/>
+		<library name="wsf_libfcgi" location="..\library\server\wsf\connector\libfcgi.ecf" readonly="false"/>
+		<library name="wsf_standalone" location="..\library\server\wsf\connector\standalone.ecf" readonly="false"/>
+		<library name="wsf_openshift" location="..\library\server\wsf\connector\openshift.ecf" readonly="false"/>
+		<library name="wsf_router_context" location="..\library\server\wsf\wsf_router_context.ecf" readonly="false"/>
+		<library name="wsf_session" location="..\library\server\wsf\wsf_session.ecf" readonly="false"/>
+	</target>
+	<target name="all_stable_windows" extends="all_stable">
+		<description>Compiling as Windows , on other platforms than Windows</description>
+		<root all_classes="true"/>
+		<setting name="platform" value="windows"/>
+	</target>
+	<target name="all_stable_unix" extends="all_stable">
+		<description>Compiling as UNIX , on other platforms than Unix</description>
+		<root all_classes="true"/>
+		<setting name="platform" value="unix"/>
+	</target>
+	<target name="all_stable_with_ssl" extends="all_stable">
+		<description>Compiling with ssl enabled</description>
+		<root all_classes="true"/>
+		<variable name="ssl_enabled" value="true"/>
+	</target>
+</system>
diff --git a/tests/all.ecf b/tests/all.ecf
new file mode 100644
index 00000000..5476451a
--- /dev/null
+++ b/tests/all.ecf
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="all" uuid="0562209B-4C68-4E77-8B57-13CBF53D05BD" library_target="all">
+	<description>Integration project including many lib</description>
+	<target name="all">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
+		</option>
+		<setting name="concurrency" value="scoop"/>
+		<library name="all-stable" location="all-stable.ecf" readonly="false"/>
+		<library name="atom" location="..\draft\library\protocol\syndication\atom\atom.ecf" readonly="false"/>
+		<library name="connector_cgi" location="..\library\server\ewsgi\connectors\cgi\cgi.ecf" readonly="false"/>
+		<library name="connector_libfcgi" location="..\library\server\ewsgi\connectors\libfcgi\libfcgi.ecf" readonly="false"/>
+		<library name="connector_null" location="..\library\server\ewsgi\connectors\null\null.ecf" readonly="false"/>
+		<library name="connector_standalone" location="..\library\server\ewsgi\connectors\standalone\standalone.ecf" readonly="false"/>
+		<library name="conneg" location="..\library\network\protocol\content_negotiation\conneg.ecf" readonly="false"/>
+		<library name="default_cgi" location="..\library\server\wsf\default\cgi.ecf" readonly="false"/>
+		<library name="default_libfcgi" location="..\library\server\wsf\default\libfcgi.ecf" readonly="false"/>
+		<library name="default_openshift" location="..\library\server\wsf\default\openshift.ecf" readonly="false"/>
+		<library name="encoder" location="..\library\text\encoder\encoder.ecf" readonly="false"/>
+		<library name="error" location="..\library\utility\general\error\error.ecf" readonly="false"/>
+		<library name="ewsgi" location="..\library\server\ewsgi\ewsgi.ecf" readonly="false"/>
+		<library name="ewsgi_spec" location="..\library\server\ewsgi\ewsgi_spec.ecf" readonly="false"/>
+		<library name="http" location="..\library\network\protocol\http\http.ecf" readonly="false"/>
+		<library name="httpd" location="..\library\server\httpd\httpd.ecf" readonly="false"/>
+		<library name="http_authorization" location="..\library\server\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
+		<library name="http_client" location="..\library\network\http_client\http_client.ecf" readonly="false"/>
+		<library name="libfcgi" location="..\library\server\libfcgi\libfcgi.ecf" readonly="false"/>
+		<library name="notification_email" location="..\library\runtime\process\notification_email\notification_email.ecf" readonly="false"/>
+		<library name="oauth" location="..\draft\library\security\oauth\oauth.ecf" readonly="false"/>
+		<library name="openid" location="..\library\security\openid\consumer\openid.ecf" readonly="false"/>
+		<library name="rss" location="..\draft\library\protocol\syndication\rss\rss.ecf" readonly="false"/>
+		<library name="uri_template" location="..\library\text\parser\uri_template\uri_template.ecf" readonly="false"/>
+		<library name="wsf" location="..\library\server\wsf\wsf.ecf" readonly="false"/>
+		<library name="wsf_all" location="..\library\server\wsf\connector\all.ecf" readonly="false"/>
+		<library name="wsf_cgi" location="..\library\server\wsf\connector\cgi.ecf" readonly="false"/>
+		<library name="wsf_extension" location="..\library\server\wsf\wsf_extension.ecf" readonly="false"/>
+		<library name="wsf_html" location="..\library\server\wsf_html\wsf_html.ecf" readonly="false"/>
+		<library name="wsf_js_widget" location="..\draft\library\server\wsf_js_widget\wsf_js_widget.ecf" readonly="false"/>
+		<library name="wsf_libfcgi" location="..\library\server\wsf\connector\libfcgi.ecf" readonly="false"/>
+		<library name="wsf_openshift" location="..\library\server\wsf\connector\openshift.ecf" readonly="false"/>
+		<library name="wsf_policy_driven" location="..\library\server\wsf\wsf_policy_driven.ecf" readonly="false"/>
+		<library name="wsf_router_context" location="..\library\server\wsf\wsf_router_context.ecf" readonly="false"/>
+		<library name="wsf_session" location="..\library\server\wsf\wsf_session.ecf" readonly="false"/>
+	</target>
+	<target name="all_none" extends="all">
+		<description>Compiling with None concurrency</description>
+		<root all_classes="true"/>
+		<setting name="concurrency" value="none"/>
+	</target>
+	<target name="all_scoop" extends="all">
+		<description>Compiling with SCOOP concurrency</description>
+		<root all_classes="true"/>
+		<setting name="concurrency" value="scoop"/>
+	</target>
+	<target name="all_mt" extends="all">
+		<description>Compiling with Eiffel Thread concurrency</description>
+		<root all_classes="true"/>
+		<setting name="concurrency" value="thread"/>
+	</target>
+	<target name="all_windows" extends="all">
+		<description>Compiling as Windows , on other platforms than Windows</description>
+		<root all_classes="true"/>
+		<setting name="platform" value="windows"/>
+	</target>
+	<target name="all_unix" extends="all">
+		<description>Compiling as UNIX , on other platforms than Unix</description>
+		<root all_classes="true"/>
+		<setting name="platform" value="unix"/>
+	</target>
+</system>