From 83e7f95425736a32e8e257718ce41c0a9e8cbd65 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Fri, 3 Jul 2015 09:33:41 +0200
Subject: [PATCH] Fixed location of .ecf file related to ROC CMS.

---
 cms-safe.ecf                          |  2 +-
 cms.ecf                               |  2 +-
 modules/node/node-safe.ecf            |  4 ++--
 modules/openid/openid-safe.ecf        | 10 +++++-----
 src/configuration/cms_default_setup.e | 16 ++++++++++++++++
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/cms-safe.ecf b/cms-safe.ecf
index eb6ea20..e6424f7 100644
--- a/cms-safe.ecf
+++ b/cms-safe.ecf
@@ -14,7 +14,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="cms_app_env" location=".\library\app_env\app_env-safe.ecf"/>
 		<library name="cms_model" location=".\library\model\cms_model-safe.ecf" readonly="false"/>
-		<library name="config" location=".\library\configuration\config-safe.ecf"/>
+		<library name="cms_config" location=".\library\configuration\config-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" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
diff --git a/cms.ecf b/cms.ecf
index e587406..9260f23 100644
--- a/cms.ecf
+++ b/cms.ecf
@@ -15,7 +15,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms_app_env" location=".\library\app_env\app_env.ecf"/>
 		<library name="cms_model" location=".\library\model\cms_model.ecf" readonly="false"/>
-		<library name="config" location=".\library\configuration\config.ecf"/>
+		<library name="cms_config" location=".\library\configuration\config.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" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
diff --git a/modules/node/node-safe.ecf b/modules/node/node-safe.ecf
index 8a829de..bd3c460 100644
--- a/modules/node/node-safe.ecf
+++ b/modules/node/node-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="node" uuid="C7114DD4-FA92-4AE5-A209-0FFC45E44257" library_target="node">
+<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="node" uuid="C7114DD4-FA92-4AE5-A209-0FFC45E44257" library_target="node">
 	<target name="node">
 		<root all_classes="true"/>
 		<file_rule>
@@ -15,7 +15,7 @@
 		<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
-		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\network\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
+		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\web\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
diff --git a/modules/openid/openid-safe.ecf b/modules/openid/openid-safe.ecf
index d0a33fb..9bbfb18 100644
--- a/modules/openid/openid-safe.ecf
+++ b/modules/openid/openid-safe.ecf
@@ -10,12 +10,12 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="cms" location="$ISE_LIBRARY\unstable\library\web\cms\cms-safe.ecf" readonly="false"/>
-		<library name="cms_app_env" location="$ISE_LIBRARY\unstable\library\web\cms\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="cms" location="..\..\cms-safe.ecf" readonly="false"/>
+		<library name="cms_app_env" location="..\..\library\app_env\app_env-safe.ecf" readonly="false"/>
 		<library name="cms_auth_module" location="..\auth\auth-safe.ecf" readonly="false"/>
-		<library name="cms_model" location="$ISE_LIBRARY\unstable\library\web\cms\library\model\cms_model-safe.ecf" readonly="false"/>
-		<library name="config" location="$ISE_LIBRARY\unstable\library\web\cms\library\configuration\config-safe.ecf"/>
-		<library name="email_service" location="..\..\library\email\email-safe.ecf"/>
+		<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
+		<library name="cms_config" location="..\..\library\configuration\config-safe.ecf"/>
+		<library name="cms_email_service" location="..\..\library\email\email-safe.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
diff --git a/src/configuration/cms_default_setup.e b/src/configuration/cms_default_setup.e
index 7e44a26..28718a1 100644
--- a/src/configuration/cms_default_setup.e
+++ b/src/configuration/cms_default_setup.e
@@ -204,6 +204,22 @@ feature -- Element change
 	register_module (m: CMS_MODULE)
 			-- <Precursor>
 		do
+			debug ("roc")
+				if module_registered (m) or module_with_same_type_registered (m) then
+						-- FIXME: report error
+						-- The assertions specify this is bad,
+						-- but here we still handle the case
+						--| Ignored.
+					if attached (create {DEVELOPER_EXCEPTION}) as e then
+						if module_registered (m) then
+							e.set_description ("Module '" + m.name + "' is already registered.")
+						else
+							e.set_description ("A module of type '" + m.name + "' is already registered.")
+						end
+						e.raise
+					end
+				end
+			end
 			modules.extend (m)
 		end