Added CMS_RESPONSE.request_url (...)

Update a few callers of CMS_RESPONSE.url (...).
Renamed the demo files using "server" instead of "demo".

Author: jocelyn

examples/demo/demo.crt renamed to examples/demo/server.crt

@@ -5,5 +5,5 @@ socket_timeout=60
 socket_recv_timeout=45
 keep_alive_timeout=25
 ssl_enabled=false
-ssl_ca_key=demo.key
-ssl_ca_crt=demo.crt
+ssl_ca_key=server.key
+ssl_ca_crt=server.crt

examples/demo/demo.ini renamed to examples/demo/server.ini

@@ -10,9 +10,16 @@ class
 
 inherit
 	ROC_CMS_LAUNCHER [DEMO_CMS_EXECUTION]
+		redefine
+			optional_application_name
+		end
 
 create
 	make_and_launch
 
+feature -- Access	
+
+	optional_application_name: STRING_32 = "server"
+
 end
 

examples/demo/demo.key renamed to examples/demo/server.key

@@ -89,7 +89,7 @@ feature -- Widget
 		local
 			but: WSF_FORM_SUBMIT_INPUT
 		do
-			create Result.make (a_response.url (a_response.location, Void), "form_clear_cache")
+			create Result.make (a_response.request_url (Void), "form_clear_cache")
 			create but.make_with_text ("op", text_clear_all_caches)
 			Result.extend (but)
 		end

examples/demo/src/demo_cms_server.e

@@ -105,7 +105,7 @@ feature -- Widget
 			f_name: WSF_FORM_TEXT_INPUT
 			but: WSF_FORM_SUBMIT_INPUT
 		do
-			create Result.make (a_response.url (a_response.location, Void), "export_all_data")
+			create Result.make (a_response.request_url (Void), "export_all_data")
 			Result.extend_raw_text ("Export CMS data to ")
 			create f_name.make_with_text ("folder", (create {DATE_TIME}.make_now_utc).formatted_out ("yyyy-[0]mm-[0]dd---hh24-[0]mi-[0]ss"))
 			f_name.set_label ("Export folder name")

modules/admin/handler/cms_admin_cache_handler.e

@@ -113,7 +113,7 @@ feature -- Widget
 			f_name: WSF_FORM_TEXT_INPUT
 			but: WSF_FORM_SUBMIT_INPUT
 		do
-			create Result.make (a_response.url (a_response.location, Void), "import_all_data")
+			create Result.make (a_response.request_url (Void), "import_all_data")
 			Result.extend_raw_text ("Import CMS data from ")
 			create f_name.make_with_text ("folder", "default")
 			f_name.set_label ("Import folder name")

modules/admin/handler/cms_admin_export_handler.e

@@ -188,7 +188,7 @@ feature -- Execution
 			l_mods_to_install: ARRAYED_LIST [CMS_MODULE]
 			l_extra: STRING
 		do
-			create Result.make (a_response.url (a_response.location, Void), "modules_collection")
+			create Result.make (a_response.request_url (Void), "modules_collection")
 			create w_tb.make
 			w_tb.add_css_class ("modules_table")
 			create w_row.make (5)
@@ -283,7 +283,7 @@ feature -- Execution
 
 			l_mods_to_install: ARRAYED_LIST [CMS_MODULE]
 		do
-			create Result.make (a_response.url (a_response.location, Void), "modules_collection")
+			create Result.make (a_response.request_url (Void), "modules_collection")
 			create l_mods_to_install.make (0)
 			across
 				api.setup.modules as ic

modules/admin/handler/cms_admin_import_handler.e

@@ -63,7 +63,7 @@ feature -- Process Edit
 			fd: detachable WSF_FORM_DATA
 		do
 			create b.make_empty
-			f := new_edit_form (a_role, url (request.percent_encoded_path_info, Void), "edit-user")
+			f := new_edit_form (a_role, request_url (Void), "edit-user")
 			api.hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.validation_actions.extend (agent edit_form_validate(?,a_role, b))
@@ -96,7 +96,7 @@ feature -- Process Delete
 			fd: detachable WSF_FORM_DATA
 		do
 			create b.make_empty
-			f := new_delete_form (a_role, url (request.percent_encoded_path_info, Void), "edit-user")
+			f := new_delete_form (a_role, request_url (Void), "edit-user")
 			api.hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.process (Current)
@@ -128,7 +128,7 @@ feature -- Process New
 			l_role: detachable CMS_USER_ROLE
 		do
 			create b.make_empty
-			f := new_edit_form (l_role, url (request.percent_encoded_path_info, Void), "create-role")
+			f := new_edit_form (l_role, request_url (Void), "create-role")
 			api.hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.validation_actions.extend (agent new_form_validate(?, b))

modules/admin/handler/cms_admin_modules_handler.e

@@ -64,7 +64,7 @@ feature -- Process Edit
 			fd: detachable WSF_FORM_DATA
 		do
 			create b.make_empty
-			f := new_edit_form (a_user, url (location, Void), "edit-user")
+			f := new_edit_form (a_user, request_url (Void), "edit-user")
 			api.hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.submit_actions.extend (agent edit_form_submit (?, a_user, b))
@@ -96,7 +96,7 @@ feature -- Process Delete
 			fd: detachable WSF_FORM_DATA
 		do
 			create b.make_empty
-			f := new_delete_form (a_user, url (location, Void), "edit-user")
+			f := new_delete_form (a_user, request_url (Void), "edit-user")
 			api.hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.process (Current)
@@ -129,7 +129,7 @@ feature -- Process New
 			l_user: detachable CMS_USER
 		do
 			create b.make_empty
-			f := new_edit_form (l_user, url (location, Void), "create-user")
+			f := new_edit_form (l_user, request_url (Void), "create-user")
 			api.hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.validation_actions.extend (agent new_form_validate (?, b))