included file_uploader in demo-cms

modules/file_upload/cms_file_upload.e

@@ -18,7 +18,7 @@ inherit
 
 	CMS_HOOK_MENU_SYSTEM_ALTER
 
-	WSF_ROUTED_URI_TEMPLATE_HELPER
+	-- WSF_ROUTED_URI_TEMPLATE_HELPER
 
 	SHARED_EXECUTION_ENVIRONMENT
 
@@ -47,7 +47,7 @@ feature {CMS_API} -- Module Initialization
 			Precursor (api)
 		end
 
-feature -- Module management
+feature {CMS_API }-- Module management
 
 	install (api: CMS_API)
 			-- install the module
@@ -76,16 +76,18 @@ CREATE TABLE file_upload_table(
 
 feature -- Access: router
 
+
 	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
 			-- <Precursor>
 		local
 			www: WSF_FILE_SYSTEM_HANDLER
 		do
-			map_uri_template_agent ("/upload{?nb}", agent execute_upload_handler, void)
+
+			map_uri_template_agent (a_router, "/upload{?nb}", agent execute_upload_handler, void)
 
 			create www.make_with_path (document_root)
 			www.set_directory_index (<<"index.html">>)
-			www.set_not_found_handler (agent execute_not_found)
+			www.set_not_found_handler (agent execute_not_found_handler)
 			a_router.handle("", www, a_router.methods_get)
 		end
 
@@ -93,12 +95,13 @@ feature -- Hooks
 
 	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 		do
-
+			a_hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_hooks.subscribe_to_block_hook (Current)
 		end
 
 	block_list: ITERABLE [like {CMS_BLOCK}.name]
 		do
-
+			Result := <<"Uploader info TODO">>
 		end
 
 	get_block_view (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
@@ -107,8 +110,11 @@ feature -- Hooks
 		end
 
 	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
+		local
+			link: CMS_LOCAL_LINK
 		do
-
+			create link.make ("Upload", "/upload")
+			a_menu_system.primary_menu.extend (link)
 		end
 
 feature -- Configuration		
@@ -132,6 +138,7 @@ feature -- Handler
 		do
 			res.redirect_now_with_content (req.script_url ("/"), uri + ": not found. %N Redirectioin to" + req.script_url ("/"), "text/html")
 		end
+
 	execute_upload_handler(req: WSF_REQUEST; res: WSF_RESPONSE; a_api: CMS_API)
 		local
 			body: STRING_8
@@ -203,11 +210,11 @@ feature -- Handler
 
 feature {NONE} -- Encoder
 
-		url_encode (s: READABLE_STRING_32): STRING_8
-			-- URL Encode `s' as Result
-		do
-			Result := url_encoder.encoded_string (s)
-		end
+	url_encode (s: READABLE_STRING_32): STRING_8
+		-- URL Encode `s' as Result
+	do
+		Result := url_encoder.encoded_string (s)
+	end
 
 	url_encoder: URL_ENCODER
 		once
@@ -224,4 +231,24 @@ feature {NONE} -- Encoder
 		once
 			create Result
 		end
+
+feature -- Mapping helper: uri template agent
+
+	map_uri_template (a_router: WSF_ROUTER; a_tpl: STRING; h: WSF_URI_TEMPLATE_HANDLER; rqst_methods: detachable WSF_REQUEST_METHODS)
+			-- Map `h' as handler for `a_tpl', according to `rqst_methods'.
+		require
+			a_tpl_attached: a_tpl /= Void
+			h_attached: h /= Void
+		do
+			a_router.map (create {WSF_URI_TEMPLATE_MAPPING}.make (a_tpl, h), rqst_methods)
+		end
+
+	map_uri_template_agent (a_router: WSF_ROUTER; a_tpl: READABLE_STRING_8; proc: PROCEDURE [TUPLE [req: WSF_REQUEST; res: WSF_RESPONSE]]; rqst_methods: detachable WSF_REQUEST_METHODS)
+			-- Map `proc' as handler for `a_tpl', according to `rqst_methods'.
+		require
+			a_tpl_attached: a_tpl /= Void
+			proc_attached: proc /= Void
+		do
+			map_uri_template (a_router, a_tpl, create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (proc), rqst_methods)
+		end
 end

modules/file_upload/file_uploader.ecf

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<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="file_uploader" uuid="795C88E5-9218-4F35-A985-5501340E2D9D">
+<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="file_uploader" uuid="795C88E5-9218-4F35-A985-5501340E2D9D" library_target="file_uploader">
 	<target name="file_uploader">
 		<root class="CMS_FILE_UPLOAD" feature="make"/>
 		<option warning="true">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
-		<precompile name="base_pre" location="$ISE_PRECOMP\base-safe.ecf"/>
+		<!-- <precompile name="base_pre" location="$ISE_PRECOMP\base-safe.ecf"/> -->
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="cms" location="\home\fmurer\Documents\EWF_ROC\ROC\cms-safe.ecf"/>
 		<library name="cms_model" location="\home\fmurer\Documents\EWF_ROC\ROC\library\model\cms_model-safe.ecf"/>

modules/file_upload/file_uploader.ecf~

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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="file_uploader" uuid="795C88E5-9218-4F35-A985-5501340E2D9D" library_target="file_uploader">
+	<target name="file_uploader">
+		<root class="CMS_FILE_UPLOAD" feature="make"/>
+		<option warning="true">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<precompile name="base_pre" location="$ISE_PRECOMP\base-safe.ecf"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="\home\fmurer\Documents\EWF_ROC\ROC\cms-safe.ecf"/>
+		<library name="cms_model" location="\home\fmurer\Documents\EWF_ROC\ROC\library\model\cms_model-safe.ecf"/>
+		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-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"/>
+		<library name="wsf_encoder" location="\home\fmurer\Documents\EWF_ROC\eiffelstudio-src\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
+		<cluster name="file_uploader" location=".\" recursive="true">
+			<file_rule>
+				<exclude>/.svn$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/EIFGENs$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>