Merge branch 'master' of https://github.com/EiffelWebFramework/EWF

2013-09-06 21:57:43 -03:00
parent 86e942ae0a ed9fac0545
commit 327ecff63a
39 changed files with 651 additions and 34 deletions
--- a/library/server/wsf/extension/filter/wsf_debug_filter.e
+++ b/library/server/wsf/extension/filter/wsf_debug_filter.e
@@ -0,0 +1,117 @@
+note
+	description: "Summary description for {WSF_DEBUG_FILTER}."
+	date: "$Date: 2013-05-23 21:54:29 +0200 (jeu., 23 mai 2013) $"
+	revision: "$Revision: 92585 $"
+
+class
+	WSF_DEBUG_FILTER
+
+inherit
+	WSF_FILTER
+
+create
+	default_create,
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_output: FILE)
+		do
+			output := a_output
+		end
+
+	output: detachable FILE
+
+feature -- Basic operations
+
+	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute the filter
+		local
+			s: STRING_8
+		do
+			create s.make (2048)
+			if attached req.content_type as l_type then
+				s.append ("[length=")
+				s.append_natural_64 (req.content_length_value)
+				s.append_character (']')
+				s.append_character (' ')
+				s.append (l_type.debug_output)
+				s.append_character ('%N')
+			end
+
+			append_iterable_to ("Path parameters", req.path_parameters, s)
+			append_iterable_to ("Query parameters", req.query_parameters, s)
+			append_iterable_to ("Form parameters", req.form_parameters, s)
+
+			if not s.is_empty then
+				s.prepend ("**DEBUG**%N")
+				if attached output as o then
+					o.put_string (s)
+				else
+					res.put_error (s)
+				end
+			end
+			execute_next (req, res)
+		end
+
+	append_iterable_to (a_title: READABLE_STRING_8; it: detachable ITERABLE [WSF_VALUE]; s: STRING_8)
+		local
+			n: INTEGER
+		do
+			if it /= Void then
+				across it as c loop
+					n := n + 1
+				end
+				if n > 0 then
+					s.append (a_title)
+					s.append_character (':')
+					s.append_character ('%N')
+					across
+						it as c
+					loop
+						s.append ("  - ")
+						s.append (c.item.url_encoded_name)
+						s.append_character (' ')
+						s.append_character ('{')
+						s.append (c.item.generating_type)
+						s.append_character ('}')
+						s.append_character ('=')
+						s.append (c.item.debug_output.as_string_8)
+						s.append_character ('%N')
+					end
+				end
+			end
+		end
+
+note
+	copyright: "Copyright (c) 1984-2013, Eiffel Software"
+	license: "GPL version 2 (see http://www.eiffel.com/licensing/gpl.txt)"
+	licensing_options: "http://www.eiffel.com/licensing"
+	copying: "[
+			This file is part of Eiffel Software's Eiffel Development Environment.
+			
+			Eiffel Software's Eiffel Development Environment is free
+			software; you can redistribute it and/or modify it under
+			the terms of the GNU General Public License as published
+			by the Free Software Foundation, version 2 of the License
+			(available at the URL listed under "license" above).
+			
+			Eiffel Software's Eiffel Development Environment is
+			distributed in the hope that it will be useful, but
+			WITHOUT ANY WARRANTY; without even the implied warranty
+			of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+			See the GNU General Public License for more details.
+			
+			You should have received a copy of the GNU General Public
+			License along with Eiffel Software's Eiffel Development
+			Environment; if not, write to the Free Software Foundation,
+			Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+		]"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+end
--- a/library/server/wsf/extension/handler/wsf_debug_handler.e
+++ b/library/server/wsf/extension/handler/wsf_debug_handler.e
@@ -0,0 +1,174 @@
+note
+	description: "Summary description for {WSF_DEBUG_HANDLER}."
+	author: ""
+	date: "$Date: 2013-06-28 16:14:02 +0200 (ven., 28 juin 2013) $"
+	revision: "$Revision: 92754 $"
+
+class
+	WSF_DEBUG_HANDLER
+
+inherit
+	WSF_STARTS_WITH_HANDLER
+		rename
+			execute as execute_starts_with
+		end
+
+	WSF_SELF_DOCUMENTED_HANDLER
+
+	SHARED_HTML_ENCODER
+
+	SHARED_WSF_PERCENT_ENCODER
+		rename
+			percent_encoder as url_encoder
+		export
+			{NONE} all
+		end
+
+	SHARED_EXECUTION_ENVIRONMENT
+		export
+			{NONE} all
+		end
+
+create
+	make,
+	make_hidden
+
+feature {NONE} -- Initialization
+
+	make
+		do
+		end
+
+	make_hidden
+		do
+			make
+			is_hidden := True
+		end
+
+	is_hidden: BOOLEAN
+			-- Current mapped handler should be hidden from self documentation		
+
+feature -- Documentation
+
+	mapping_documentation (m: WSF_ROUTER_MAPPING; a_request_methods: detachable WSF_REQUEST_METHODS): WSF_ROUTER_MAPPING_DOCUMENTATION
+			-- <Precursor>
+		do
+			create Result.make (m)
+			Result.set_is_hidden (is_hidden)
+			Result.add_description ("Debug handler (mainly to return request information)")
+		end
+
+feature -- Access	
+
+	execute_starts_with (a_path: READABLE_STRING_8; req: WSF_REQUEST; res: WSF_RESPONSE)
+		local
+			s: STRING_8
+			p: WSF_PAGE_RESPONSE
+			v: STRING_8
+		do
+			if (create {RT_DEBUGGER}).rt_workbench_wait_for_debugger (1050) then
+			end
+			create s.make (2048)
+			s.append ("**DEBUG**%N")
+			req.set_raw_input_data_recorded (True)
+
+			append_iterable_to ("Meta variables:", req.meta_variables, s)
+			s.append_character ('%N')
+
+			append_iterable_to ("Path parameters", req.path_parameters, s)
+			s.append_character ('%N')
+
+			append_iterable_to ("Query parameters", req.query_parameters, s)
+			s.append_character ('%N')
+
+			append_iterable_to ("Form parameters", req.form_parameters, s)
+			s.append_character ('%N')
+
+			if attached req.content_type as l_type then
+				s.append ("Content: type=" + l_type.debug_output)
+				s.append (" length=")
+				s.append_natural_64 (req.content_length_value)
+				s.append_character ('%N')
+				create v.make (req.content_length_value.to_integer_32)
+				req.read_input_data_into (v)
+				across
+					v.split ('%N') as v_cursor
+				loop
+					s.append ("     |")
+					s.append (v_cursor.item)
+					s.append_character ('%N')
+				end
+			end
+
+			create p.make_with_body (s)
+			p.header.put_content_type_text_plain
+			res.send (p)
+
+		end
+
+feature {NONE} -- Implementation
+
+	append_iterable_to (a_title: READABLE_STRING_8; it: detachable ITERABLE [WSF_VALUE]; s: STRING_8)
+		local
+			n: INTEGER
+			t: READABLE_STRING_8
+			v: READABLE_STRING_8
+		do
+			s.append (a_title)
+			s.append_character (':')
+			if it /= Void then
+				across it as c loop
+					n := n + 1
+				end
+				if n = 0 then
+					s.append (" empty")
+					s.append_character ('%N')
+				else
+					s.append_character ('%N')
+					across
+						it as c
+					loop
+						s.append ("  - ")
+						s.append (c.item.url_encoded_name)
+						t := c.item.generating_type
+						if t.same_string ("WSF_STRING") then
+						else
+							s.append_character (' ')
+							s.append_character ('{')
+							s.append (t)
+							s.append_character ('}')
+						end
+						s.append_character ('=')
+						v := c.item.string_representation.as_string_8
+						if v.has ('%N') then
+							s.append_character ('%N')
+							across
+								v.split ('%N') as v_cursor
+							loop
+								s.append ("     |")
+								s.append (v_cursor.item)
+								s.append_character ('%N')
+							end
+						else
+							s.append (v)
+							s.append_character ('%N')
+						end
+					end
+				end
+			else
+				s.append (" none")
+				s.append_character ('%N')
+			end
+		end
+
+note
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+end
--- a/library/server/wsf/extension/handler/wsf_handler_helper.e
+++ b/library/server/wsf/extension/handler/wsf_handler_helper.e
--- a/library/server/wsf/extension/handler/wsf_handler_routes_recorder.e
+++ b/library/server/wsf/extension/handler/wsf_handler_routes_recorder.e
--- a/library/server/wsf/extension/handler/wsf_method_handler.e
+++ b/library/server/wsf/extension/handler/wsf_method_handler.e
--- a/library/server/wsf/extension/handler/wsf_method_handlers.e
+++ b/library/server/wsf/extension/handler/wsf_method_handlers.e
--- a/library/server/wsf/extension/handler/wsf_resource_context_handler_helper.e
+++ b/library/server/wsf/extension/handler/wsf_resource_context_handler_helper.e
--- a/library/server/wsf/extension/handler/wsf_resource_handler_helper.e
+++ b/library/server/wsf/extension/handler/wsf_resource_handler_helper.e
--- a/library/server/wsf/license.lic
+++ b/library/server/wsf/license.lic
@@ -1,5 +1,5 @@
 ${NOTE_KEYWORD}
-	copyright: "2011-${YEAR}, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-${YEAR}, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/policy_driven/wsf_delete_helper.e
+++ b/library/server/wsf/policy_driven/wsf_delete_helper.e
@@ -13,7 +13,7 @@ inherit
 	WSF_METHOD_HELPER

 feature {NONE} -- Implementation
-	
+
 	send_response (req: WSF_REQUEST; res: WSF_RESPONSE; a_handler: WSF_SKELETON_HANDLER; a_header: HTTP_HEADER; a_new_resource: BOOLEAN)
 			-- Write response to deletion of resource named by `req' into `res'.
 			-- Upto four execution variables may be set on `req':
@@ -63,4 +63,14 @@ feature {NONE} -- Implementation
 			end
 		end

+note
+	copyright: "2011-2013, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
 end
--- a/library/server/wsf/policy_driven/wsf_get_helper.e
+++ b/library/server/wsf/policy_driven/wsf_get_helper.e
@@ -60,7 +60,7 @@ feature {NONE} -- Implementation
 		end

 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/policy_driven/wsf_method_helper.e
+++ b/library/server/wsf/policy_driven/wsf_method_helper.e
@@ -586,7 +586,7 @@ feature -- Error reporting
 		end

 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/policy_driven/wsf_method_helper_factory.e
+++ b/library/server/wsf/policy_driven/wsf_method_helper_factory.e
@@ -30,7 +30,7 @@ feature -- Factory
 		end

 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/policy_driven/wsf_post_helper.e
+++ b/library/server/wsf/policy_driven/wsf_post_helper.e
@@ -68,7 +68,7 @@ feature {NONE} -- Implementation
 		end

 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/policy_driven/wsf_put_helper.e
+++ b/library/server/wsf/policy_driven/wsf_put_helper.e
@@ -70,7 +70,7 @@ feature {NONE} -- Implementation
 		end

 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/policy_driven/wsf_skeleton_handler.e
+++ b/library/server/wsf/policy_driven/wsf_skeleton_handler.e
@@ -536,9 +536,8 @@ feature {NONE} -- Implementation
 			body_sent: res.message_committed and then res.transfered_content_length > 0
 		end

-
 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/router/filter/wsf_cors_filter.e
+++ b/library/server/wsf/router/filter/wsf_cors_filter.e
@@ -20,7 +20,7 @@ feature -- Basic operations
 		do
 			create l_header.make
 			l_header.put_access_control_allow_all_origin
-			res.put_header_text (l_header.string)
+			res.put_header_lines (l_header)
 			execute_next (req, res)
 		end

--- a/library/server/wsf/router/filter/wsf_custom_header_filter.e
+++ b/library/server/wsf/router/filter/wsf_custom_header_filter.e
@@ -0,0 +1,66 @@
+note
+	description: "Summary description for {WSF_CUSTOM_HEADER_FILTER}."
+	date: "$Date: 2013-05-23 21:54:29 +0200 (jeu., 23 mai 2013) $"
+	revision: "$Revision: 92585 $"
+
+class
+	WSF_CUSTOM_HEADER_FILTER
+
+inherit
+	WSF_FILTER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (n: INTEGER)
+		do
+			create custom_header.make_with_count (n)
+		end
+
+feature -- Access
+
+	custom_header: HTTP_HEADER
+
+feature -- Basic operations
+
+	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute the filter
+		do
+			res.put_header_lines (custom_header)
+			execute_next (req, res)
+		end
+
+note
+	copyright: "Copyright (c) 1984-2013, Eiffel Software"
+	license: "GPL version 2 (see http://www.eiffel.com/licensing/gpl.txt)"
+	licensing_options: "http://www.eiffel.com/licensing"
+	copying: "[
+			This file is part of Eiffel Software's Eiffel Development Environment.
+			
+			Eiffel Software's Eiffel Development Environment is free
+			software; you can redistribute it and/or modify it under
+			the terms of the GNU General Public License as published
+			by the Free Software Foundation, version 2 of the License
+			(available at the URL listed under "license" above).
+			
+			Eiffel Software's Eiffel Development Environment is
+			distributed in the hope that it will be useful, but
+			WITHOUT ANY WARRANTY; without even the implied warranty
+			of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+			See the GNU General Public License for more details.
+			
+			You should have received a copy of the GNU General Public
+			License along with Eiffel Software's Eiffel Development
+			Environment; if not, write to the Free Software Foundation,
+			Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+		]"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+end
--- a/library/server/wsf/router/policy/service/wsf_routed_skeleton_service.e
+++ b/library/server/wsf/router/policy/service/wsf_routed_skeleton_service.e
@@ -275,7 +275,7 @@ invariant
 	unavailability_duration_xor_unavailable_until: unavailability_duration > 0 implies unavailable_until = Void

 ;note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/router/policy/wsf_caching_policy.e
+++ b/library/server/wsf/router/policy/wsf_caching_policy.e
@@ -125,7 +125,7 @@ feature -- Access
 		end

 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/router/policy/wsf_no_proxy_policy.e
+++ b/library/server/wsf/router/policy/wsf_no_proxy_policy.e
@@ -6,7 +6,7 @@ note
 						Users of this policy cannot safely use chunked transfer-encoding, or any
 						HTTP/1.1-specific features. So best used only for examples.
 						]"
-	
+
 	date: "$Date$"
 	revision: "$Revision$"

@@ -18,7 +18,7 @@ inherit
 		redefine
 			requires_proxy
 		end
-	
+
 feature -- Access

 	requires_proxy (req: WSF_REQUEST): BOOLEAN
@@ -33,4 +33,14 @@ feature -- Access
 				-- doesn't meet the postcondition, but the precondition is never true.
 		end

+note
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
 end
--- a/library/server/wsf/router/policy/wsf_options_policy.e
+++ b/library/server/wsf/router/policy/wsf_options_policy.e
@@ -34,4 +34,14 @@ feature -- Basic operations
 			res.put_header_text (h.string)
 		end

+note
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
 end
--- a/library/server/wsf/router/policy/wsf_previous_policy.e
+++ b/library/server/wsf/router/policy/wsf_previous_policy.e
@@ -51,7 +51,7 @@ feature -- Access
 		end

 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/router/policy/wsf_proxy_use_policy.e
+++ b/library/server/wsf/router/policy/wsf_proxy_use_policy.e
@@ -51,7 +51,7 @@ feature -- Access
 		end

 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/router/policy/wsf_system_options_access_policy.e
+++ b/library/server/wsf/router/policy/wsf_system_options_access_policy.e
@@ -15,7 +15,7 @@ note

 	date: "$Date$"
 	revision: "$Revision$"
-	
+
 class	WSF_SYSTEM_OPTIONS_ACCESS_POLICY

 feature -- Access
@@ -23,7 +23,7 @@ feature -- Access
 	is_system_options_forbidden (req: WSF_REQUEST): BOOLEAN
 			-- Should we return 403 Forbidden in response to OPTIONS * requests?
 		require
-			req_attached: req /= Void		
+			req_attached: req /= Void
 		do
 			-- by default, unconditionally no.
 		end
@@ -37,4 +37,14 @@ feature -- Access
 			Result := "OPTIONS * is not permitted"
 		end

+note
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
 end
--- a/library/server/wsf/src/response/wsf_method_not_allowed_response.e
+++ b/library/server/wsf/src/response/wsf_method_not_allowed_response.e
@@ -148,8 +148,10 @@ feature {WSF_RESPONSE} -- Output
 						</style>
 						</head>
 						<body>
-						<div id="header">]" + l_html_error_code_text + "[!!</div>
+						<div id="header">
 					]")
+				s.append (l_html_error_code_text)
+				s.append ("!!</div>")
 				s.append ("<div id=%"logo%">")
 				s.append ("<div class=%"outter%"> ")
 				s.append ("<div class=%"inner1%"></div>")
--- a/library/server/wsf/src/response/wsf_page_response.e
+++ b/library/server/wsf/src/response/wsf_page_response.e
@@ -98,14 +98,14 @@ feature {WSF_RESPONSE} -- Output
 					h.put_content_type_text_plain
 				end
 			end
-			res.put_header_text (h.string)
+			res.put_header_lines (h)
 			if b /= Void then
 				res.put_string (b)
 			end
 		end

 note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/server/wsf/src/service/wsf_service.e
+++ b/library/server/wsf/src/service/wsf_service.e
@@ -20,14 +20,6 @@ feature -- Execution
 		deferred
 		end

-feature -- Conversion
-
-	to_wgi_service: WGI_SERVICE
-			-- Adapt Current WSF Service to plug into WGI component
-		do
-			create {WSF_TO_WGI_SERVICE} Result.make_from_service (Current)
-		end
-
 note
 	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
--- a/library/server/wsf/wsf_extension-safe.ecf
+++ b/library/server/wsf/wsf_extension-safe.ecf
@@ -10,6 +10,7 @@
 		<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="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi-safe.ecf"/>
 		<library name="http" location="..\..\network\protocol\http\http-safe.ecf"/>
 		<library name="wsf" location="wsf-safe.ecf"/>
--- a/library/server/wsf/wsf_extension.ecf
+++ b/library/server/wsf/wsf_extension.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
 		</option>
 		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
+		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
 		<library name="http" location="../../network/protocol/http/http.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi.ecf"/>
 		<library name="wsf" location="wsf.ecf"/>
--- a/library/server/wsf/wsf_policy_driven-safe.lic
+++ b/library/server/wsf/wsf_policy_driven-safe.lic
@@ -0,0 +1,10 @@
+${NOTE_KEYWORD}
+	copyright: "2011-${YEAR}, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
--- a/library/server/wsf/wsf_policy_driven.lic
+++ b/library/server/wsf/wsf_policy_driven.lic
@@ -0,0 +1,10 @@
+${NOTE_KEYWORD}
+	copyright: "2011-${YEAR}, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
--- a/library/server/wsf_html/form/wsf_form_div.e
+++ b/library/server/wsf_html/form/wsf_form_div.e
@@ -32,7 +32,7 @@ feature {NONE} -- Initialization

 	make_with_text (s: READABLE_STRING_8)
 		do
-			make_with_item (create {WSF_FORM_RAW_TEXT}.make (s))
+			make_with_item (create {WSF_WIDGET_TEXT}.make_with_text (s))
 		end

 	make_with_item (i: WSF_WIDGET)
--- a/library/server/wsf_html/form/wsf_form_raw_text.e
+++ b/library/server/wsf_html/form/wsf_form_raw_text.e
@@ -1,12 +1,13 @@
 note
 	description: "Summary description for {WSF_FORM_RAW_TEXT}."
-	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 class
 	WSF_FORM_RAW_TEXT

+obsolete "Use WSF_WIDGET_TEXT 2013-Sept-06"
+
 inherit
 	WSF_WIDGET_TEXT
 		rename
--- a/library/server/wsf_html/widget/wsf_widget_composite.e
+++ b/library/server/wsf_html/widget/wsf_widget_composite.e
@@ -177,11 +177,24 @@ feature -- Change
 			items.put_front (i)
 		end

-	extend_text (t: READABLE_STRING_8)
+	extend_html_text (t: READABLE_STRING_8)
+			-- Extend a widget encapsulating html code `t'
 		do
 			extend (create {WSF_WIDGET_TEXT}.make_with_text (t))
 		end

+	extend_text (t: READABLE_STRING_8)
+		obsolete "Use extend_html_text (..) 2013-Sept-06"
+		do
+			extend_html_text (t)
+		end
+
+	extend_raw_text (t: READABLE_STRING_GENERAL)
+			-- Extend a widget encapsulating html encoded text `t'
+		do
+			extend (create {WSF_WIDGET_RAW_TEXT}.make_with_text (t))
+		end
+
 feature {NONE} -- Implementation: Items

 	items_by_type_from (a_container: ITERABLE [WSF_WIDGET]; a_type: TYPE [detachable ANY]): detachable ARRAYED_LIST [WSF_WIDGET]
--- a/library/server/wsf_html/widget/wsf_widget_raw_text.e
+++ b/library/server/wsf_html/widget/wsf_widget_raw_text.e
@@ -0,0 +1,41 @@
+note
+	description: "Widget embedding raw text, this will be html encoded before being rendered in target html"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	WSF_WIDGET_RAW_TEXT
+
+inherit
+	WSF_WIDGET
+
+create
+	make_with_text
+
+feature {NONE} -- Initialization
+
+	make_with_text (a_text: READABLE_STRING_GENERAL)
+		do
+			text := a_text
+		end
+
+feature -- Access
+
+	text: READABLE_STRING_GENERAL
+			-- Text to be html encoded into html
+
+feature -- Change
+
+	set_text (a_text: like text)
+		do
+			text := a_text
+		end
+
+feature -- Conversion
+
+	append_to_html (a_theme: WSF_THEME; a_html: STRING_8)
+		do
+			a_html.append (a_theme.html_encoded (text))
+		end
+
+end
--- a/library/server/wsf_html/widget/wsf_widget_text.e
+++ b/library/server/wsf_html/widget/wsf_widget_text.e
@@ -1,6 +1,5 @@
 note
-	description: "Summary description for {WSF_WIDGET_TEXT}."
-	author: ""
+	description: "Widget embedding html text/code, this will render as it is in target html"
 	date: "$Date$"
 	revision: "$Revision$"