Merged back list of available modules in CMS_SETUP.

cms/src/configuration/cms_custom_setup.e

@@ -11,4 +11,5 @@ inherit
 
 create
 	make
+	
 end

cms/src/configuration/cms_default_setup.e

@@ -25,8 +25,11 @@ feature {NONE} -- Initialization
 	initialize
 		do
 			configure
+			create modules.make (3)
 			build_api_service
 			build_mailer
+
+			initialize_modules
 		end
 
 	configure
@@ -45,8 +48,34 @@ feature {NONE} -- Initialization
 			compute_theme_resource_location
 		end
 
+	initialize_modules
+		local
+			m: CMS_MODULE
+		do
+--			-- Core
+--			create {USER_MODULE} m.make (Current)
+--			m.enable
+--			modules.extend (m)
+
+--			create {ADMIN_MODULE} m.make (Current)
+--			m.enable
+--			modules.extend (m)
+
+
+			create {BASIC_AUTH_MODULE} m.make (Current)
+			m.enable
+			modules.extend (m)
+
+			create {NODE_MODULE} m.make (Current)
+			m.enable
+			modules.extend (m)
+		end
+
 feature -- Access
 
+	modules: CMS_MODULE_COLLECTION
+			-- <Precursor>
+
 	is_html: BOOLEAN
 			-- <Precursor>
 		do

cms/src/configuration/cms_setup.e

@@ -27,6 +27,11 @@ feature -- Access
 		deferred
 		end
 
+	modules: CMS_MODULE_COLLECTION
+			-- List of available modules.
+		deferred
+		end
+
 feature -- Access: Site
 
 	site_id: READABLE_STRING_8

cms/src/modules/default/cms_default_module_collection.e

@@ -1,54 +0,0 @@
-note
-	description: "Summary description for {CMS_DEFAULT_MODULE_COLLECTION}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_DEFAULT_MODULE_COLLECTION
-
-inherit
-	CMS_MODULE_COLLECTION
-		rename
-			make as make_with_capacity
-		end
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make (a_setup: CMS_SETUP)
-		do
-			make_with_capacity (3)
-			build_modules (a_setup)
-		end
-
-feature -- Configuration
-
-	build_modules (a_setup: CMS_SETUP)
-			-- Core modules. (User, Admin, Node)
-			-- At the moment only node is supported.
-		local
-			m: CMS_MODULE
-		do
---			-- Core
---			create {USER_MODULE} m.make (a_setup)
---			m.enable
---			extend (m)
-
---			create {ADMIN_MODULE} m.make (a_setup)
---			m.enable
---			extend (m)
-
-
-			create {BASIC_AUTH_MODULE} m.make (a_setup)
-			m.enable
-			extend (m)
-
-			create {NODE_MODULE} m.make (a_setup)
-			m.enable
-			extend (m)
-		end
-
-end

cms/src/modules/node/node_module.e

@@ -1,5 +1,5 @@
 note
-	description: "Summary description for {CMS_MODULE}."
+	description: "CMS module that bring support for NODE management."
 	date: "$Date$"
 	revision: "$Revision$"
 

cms/src/service/cms_service.e

@@ -41,12 +41,11 @@ create
 
 feature {NONE} -- Initialization
 
-	make (a_setup: CMS_SETUP; a_modules: CMS_MODULE_COLLECTION)
+	make (a_setup: CMS_SETUP)
-			-- Build a a default service with a custom list of modules `a_modules'
+			-- Build a CMS service with `a_setup' configuration.
 		do
 			setup := a_setup
 			configuration := a_setup.configuration
-			modules := a_modules
 			initialize
 		end
 
@@ -65,19 +64,19 @@ feature {NONE} -- Initialization
 			-- Intialize modules and keep only enabled modules.
 		local
 			l_module: CMS_MODULE
-			coll: CMS_MODULE_COLLECTION
+			l_available_modules: CMS_MODULE_COLLECTION
 		do
 			log.write_debug (generator + ".initialize_modules")
-			create coll.make (modules.count)
+			l_available_modules := setup.modules
+			create modules.make (l_available_modules.count)
 			across
-				modules as ic
+				l_available_modules as ic
 			loop
 				l_module := ic.item
 				if l_module.is_enabled then
-					coll.extend (l_module)
+					modules.extend (l_module)
 				end
 			end
-			modules := coll
 		ensure
 			only_enabled_modules: across modules as ic all ic.item.is_enabled end
 		end

examples/roc_api/src/ewf_roc_server.e

@@ -121,23 +121,22 @@ feature -- CMS Initialization
 		do
 			log.write_debug (generator + ".initialize_cms")
 
-			create {CMS_DEFAULT_MODULE_COLLECTION} l_modules.make (a_setup)
+			setup_modules (a_setup)
-			setup_modules (l_modules, a_setup)
 
-			create cms.make (a_setup, l_modules)
+			create cms.make (a_setup)
 			cms_service := cms
 		end
 
 feature -- CMS setup
 
-	setup_modules (a_modules: CMS_MODULE_COLLECTION; a_setup: CMS_SETUP)
+	setup_modules (a_setup: CMS_SETUP)
-			-- Setup modules to be added to the available modules.
+			-- Setup additional modules.
 		local
 			m: CMS_MODULE
 		do
 			create {NODE_MODULE} m.make (a_setup)
 			m.enable
-			a_modules.extend (m)
+			a_setup.modules.extend (m)
 		end
 
 	setup_storage (a_setup: CMS_SETUP)