Merge branch 'master' into es_17_01

src/service/cms_module.e

@@ -191,15 +191,6 @@ feature -- Router
 
 feature -- Hooks configuration
 
-	register_hooks (a_response: CMS_RESPONSE)
-		obsolete
-			"!UNSAFE!: it is highly recommended to update this module and use setup_hooks [Dec/2015]."
-		require
-			is_enabled: is_enabled
-		do
-			setup_hooks (a_response.api.hooks)
-		end
-
 	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 			-- Module hooks configuration.
 		require

src/service/response/cms_response.e

@@ -33,7 +33,6 @@ feature {NONE} -- Initialization
 			get_theme
 			create menu_system.make
 			initialize_block_region_settings
-			obsolete_register_hooks
 		end
 
 	initialize_site_url
@@ -65,22 +64,6 @@ feature {NONE} -- Initialization
 			site_url_ends_with_slash: site_url.ends_with_general ("/")
 		end
 
-	obsolete_register_hooks
-			-- Obsolete code to initialize hooks.
-			-- Dangerous, since those hooks would be available only under CMS_RESPONSE context.
-		local
-			l_module: CMS_MODULE
-			l_enabled_modules: CMS_MODULE_COLLECTION
-		do
-			l_enabled_modules := api.enabled_modules
-			across
-				l_enabled_modules as ic
-			loop
-				l_module := ic.item
-				l_module.register_hooks (Current)
-			end
-		end
-
 feature -- Access
 
 	request: WSF_REQUEST
@@ -367,12 +350,6 @@ feature -- Element change
 			main_content := s
 		end
 
-	add_variable (a_element: ANY; a_key:READABLE_STRING_32)
-		obsolete "Use `set_value' [Aug/2015]"
-		do
-			set_value (a_element, a_key)
-		end
-
 	set_value (v: detachable ANY; k: READABLE_STRING_GENERAL)
 			-- Set value `v' associated with name `k'.
 		do