Major renaming, adopt the WSF_ prefix for all classes under "wsf", and simplify some class names

Removed in WGI_INPUT_STREAM, the assertion "same_last_string_reference" Copyright updates
2012-03-16 09:49:41 +01:00
parent 25218996e0
commit 46eb92ac37
109 changed files with 517 additions and 236 deletions
--- a/library/server/wsf/router/default/wsf_routed_service.e
+++ b/library/server/wsf/router/default/wsf_routed_service.e
@@ -5,13 +5,13 @@ note
 	revision: "$Revision$"

 deferred class
-	ROUTED_SERVICE
+	WSF_ROUTED_SERVICE

 inherit
-	ROUTED_SERVICE_I [REQUEST_HANDLER [REQUEST_HANDLER_CONTEXT], REQUEST_HANDLER_CONTEXT]
+	WSF_ROUTED_SERVICE_I [WSF_HANDLER [WSF_HANDLER_CONTEXT], WSF_HANDLER_CONTEXT]

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/misc/request_format_utility.e
+++ b/library/server/wsf/router/misc/request_format_utility.e
@@ -1,11 +1,11 @@
 note
-	description: "Summary description for {REQUEST_FORMAT_UTILITY}."
+	description: "Summary description for {WSF_FORMAT_UTILITY }."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 class
-	REQUEST_FORMAT_UTILITY
+	WSF_FORMAT_UTILITY

 feature -- Access

@@ -75,7 +75,7 @@ feature {NONE} -- Implementation
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/misc/routed_service_helper.e
+++ b/library/server/wsf/router/misc/routed_service_helper.e
@@ -1,11 +1,12 @@
 note
-	description: "Summary description for {ROUTED_SERVICE_HELPER}."
-	author: ""
+	description: "[
+				Provides a few helpful feature to respond predefined message to the client
+		]"
 	date: "$Date$"
 	revision: "$Revision$"

 class
-	ROUTED_SERVICE_HELPER
+	WSF_HANDLER_HELPER

 inherit
 	ANY
@@ -83,7 +84,7 @@ feature -- Helper
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/misc/request_handler_routes_recorder.e
+++ b/library/server/wsf/router/misc/request_handler_routes_recorder.e
@@ -1,8 +1,8 @@
 note
 	description: "[
-			Summary description for REQUEST_HANDLER_ROUTES_RECORDER.
+			Summary description for WSF_HANDLER_ROUTES_RECORDER.
 			
-			You can inherit from this class from any REQUEST_HANDLER and redefine `on_handler_mapped'
+			You can inherit from this class from any WSF_HANDLER and redefine `on_handler_mapped'
 			to record the available routes if your handler needs it.
 		]"
 	author: ""
@@ -10,14 +10,14 @@ note
 	revision: "$Revision$"

 deferred class
-	REQUEST_HANDLER_ROUTES_RECORDER
+	WSF_HANDLER_ROUTES_RECORDER

-feature {REQUEST_HANDLER} -- Routes access
+feature {WSF_HANDLER} -- Routes access

 	available_routes: detachable LIST [TUPLE [resource: READABLE_STRING_8; rqst_methods: detachable ARRAY [READABLE_STRING_8]]]
 			-- Available routes

-feature {REQUEST_ROUTER} -- Routes change
+feature {WSF_ROUTER} -- Routes change

 	on_handler_mapped (a_resource: READABLE_STRING_8; a_rqst_methods: detachable ARRAY [READABLE_STRING_8])
 		local
@@ -32,7 +32,7 @@ feature {REQUEST_ROUTER} -- Routes change
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/misc/request_resource_handler_helper.e
+++ b/library/server/wsf/router/misc/request_resource_handler_helper.e
@@ -5,7 +5,7 @@ note
 	revision: "$Revision$"

 class
-	REQUEST_RESOURCE_HANDLER_HELPER [C -> REQUEST_HANDLER_CONTEXT]
+	WSF_RESOURCE_HANDLER_HELPER [C -> WSF_HANDLER_CONTEXT]

 feature -- Execute template

@@ -309,7 +309,7 @@ feature -- Handle responses
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri/default/wsf_uri_routed_service.e
+++ b/library/server/wsf/router/uri/default/wsf_uri_routed_service.e
@@ -1,24 +1,24 @@
 note
-	description: "Summary description for {DEFAULT_URI_ROUTED_SERVICE}."
+	description: "Summary description for WSF_URI_ROUTED_SERVICE."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 deferred class
-	URI_ROUTED_SERVICE
+	WSF_URI_ROUTED_SERVICE

 inherit
-	ROUTED_SERVICE_I [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT], REQUEST_URI_HANDLER_CONTEXT]
+	WSF_ROUTED_SERVICE_I [WSF_HANDLER [WSF_URI_HANDLER_CONTEXT], WSF_URI_HANDLER_CONTEXT]
 		redefine
 			router
 		end

 feature -- Router

-	router: REQUEST_URI_ROUTER
+	router: WSF_URI_ROUTER

 ;note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri/default/request_uri_router.e
+++ b/library/server/wsf/router/uri/default/request_uri_router.e
@@ -5,10 +5,10 @@ note
 	revision: "$Revision$"

 class
-	REQUEST_URI_ROUTER
+	WSF_URI_ROUTER

 inherit
-	REQUEST_URI_ROUTER_I [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT], REQUEST_URI_HANDLER_CONTEXT]
+	WSF_URI_ROUTER_I [WSF_HANDLER [WSF_URI_HANDLER_CONTEXT], WSF_URI_HANDLER_CONTEXT]
 		redefine
 			map_agent_with_request_methods
 		end
@@ -17,17 +17,17 @@ create

 feature -- Mapping

-	map_agent_with_request_methods (a_id: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: REQUEST_URI_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE]];
+	map_agent_with_request_methods (a_id: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: WSF_URI_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE]];
 			 rqst_methods: detachable ARRAY [READABLE_STRING_8])
 		local
-			h: REQUEST_AGENT_HANDLER [REQUEST_URI_HANDLER_CONTEXT]
+			h: WSF_AGENT_HANDLER [WSF_URI_HANDLER_CONTEXT]
 		do
 			create h.make (a_action)
 			map_with_request_methods (a_id, h, rqst_methods)
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri/default/request_uri_routing_handler.e
+++ b/library/server/wsf/router/uri/default/request_uri_routing_handler.e
@@ -5,10 +5,10 @@ note
 	revision: "$Revision$"

 class
-	REQUEST_URI_ROUTING_HANDLER
+	WSF_URI_ROUTING_HANDLER

 inherit
-	REQUEST_URI_ROUTING_HANDLER_I [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT], REQUEST_URI_HANDLER_CONTEXT]
+	WSF_URI_ROUTING_HANDLER_I [WSF_HANDLER [WSF_URI_HANDLER_CONTEXT], WSF_URI_HANDLER_CONTEXT]
 		redefine
 			router
 		end
@@ -18,10 +18,10 @@ create

 feature {NONE} -- Routing

-	router: REQUEST_URI_ROUTER
+	router: WSF_URI_ROUTER

 ;note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri/request_uri_handler_context.e
+++ b/library/server/wsf/router/uri/request_uri_handler_context.e
@@ -1,14 +1,14 @@
 note
-	description: "Summary description for {REQUEST_URI_HANDLER_CONTEXT}."
+	description: "Summary description for {WSF_URI_HANDLER_CONTEXT}."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 class
-	REQUEST_URI_HANDLER_CONTEXT
+	WSF_URI_HANDLER_CONTEXT

 inherit
-	REQUEST_HANDLER_CONTEXT
+	WSF_HANDLER_CONTEXT

 create
 	make
@@ -33,7 +33,7 @@ feature -- Query
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri/request_uri_router_i.e
+++ b/library/server/wsf/router/uri/request_uri_router_i.e
@@ -1,14 +1,14 @@
 note
-	description: "Summary description for {REQUEST_URI_ROUTER}."
+	description: "Summary description for {WSF_URI_ROUTER}."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 class
-	REQUEST_URI_ROUTER_I [H -> REQUEST_HANDLER [C], C -> REQUEST_URI_HANDLER_CONTEXT create make end]
+	WSF_URI_ROUTER_I [H -> WSF_HANDLER [C], C -> WSF_URI_HANDLER_CONTEXT create make end]

 inherit
-	REQUEST_ROUTER [H, C]
+	WSF_ROUTER [H, C]

 create
 	make,
@@ -234,7 +234,7 @@ feature {NONE} -- Default: implementation
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri/request_uri_routing_handler_i.e
+++ b/library/server/wsf/router/uri/request_uri_routing_handler_i.e
@@ -1,15 +1,15 @@
 note
-	description: "Summary description for {REQUEST_ROUTING_HANDLER}."
+	description: "Summary description for {WSF_ROUTING_HANDLER }."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 class
-	REQUEST_URI_ROUTING_HANDLER_I [H -> REQUEST_HANDLER [C],
-							 C -> REQUEST_URI_HANDLER_CONTEXT create make end]
+	WSF_URI_ROUTING_HANDLER_I [H -> WSF_HANDLER [C],
+							 C -> WSF_URI_HANDLER_CONTEXT create make end]

 inherit
-	REQUEST_ROUTING_HANDLER [H, C]
+	WSF_ROUTING_HANDLER  [H, C]

 create
 	make
@@ -23,10 +23,10 @@ feature {NONE} -- Initialization

 feature {NONE} -- Routing

-	router: REQUEST_URI_ROUTER_I [H, C]
+	router: WSF_URI_ROUTER_I [H, C]

 ;note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri_template/default/wsf_uri_template_routed_service.e
+++ b/library/server/wsf/router/uri_template/default/wsf_uri_template_routed_service.e
@@ -5,20 +5,20 @@ note
 	revision: "$Revision$"

 deferred class
-	URI_TEMPLATE_ROUTED_SERVICE
+	WSF_URI_TEMPLATE_ROUTED_SERVICE

 inherit
-	ROUTED_SERVICE_I [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
+	WSF_ROUTED_SERVICE_I [WSF_HANDLER [WSF_URI_TEMPLATE_HANDLER_CONTEXT], WSF_URI_TEMPLATE_HANDLER_CONTEXT]
 		redefine
 			router
 		end

 feature -- Router

-	router: REQUEST_URI_TEMPLATE_ROUTER
+	router: WSF_URI_TEMPLATE_ROUTER

 ;note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri_template/default/request_uri_template_router.e
+++ b/library/server/wsf/router/uri_template/default/request_uri_template_router.e
@@ -5,10 +5,10 @@ note
 	revision: "$Revision$"

 class
-	REQUEST_URI_TEMPLATE_ROUTER
+	WSF_URI_TEMPLATE_ROUTER

 inherit
-	REQUEST_URI_TEMPLATE_ROUTER_I [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
+	WSF_URI_TEMPLATE_ROUTER_I [WSF_HANDLER [WSF_URI_TEMPLATE_HANDLER_CONTEXT], WSF_URI_TEMPLATE_HANDLER_CONTEXT]
 		redefine
 			map_agent_with_request_methods
 		end
@@ -19,17 +19,17 @@ create

 feature -- Mapping

-	map_agent_with_request_methods (a_id: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE]];
+	map_agent_with_request_methods (a_id: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: WSF_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE]];
 			 rqst_methods: detachable ARRAY [READABLE_STRING_8])
 		local
-			h: REQUEST_AGENT_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
+			h: WSF_AGENT_HANDLER [WSF_URI_TEMPLATE_HANDLER_CONTEXT]
 		do
 			create h.make (a_action)
 			map_with_request_methods (a_id, h, rqst_methods)
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri_template/default/request_uri_template_routing_handler.e
+++ b/library/server/wsf/router/uri_template/default/request_uri_template_routing_handler.e
@@ -5,10 +5,10 @@ note
 	revision: "$Revision$"

 class
-	REQUEST_URI_TEMPLATE_ROUTING_HANDLER
+	WSF_URI_TEMPLATE_ROUTING_HANDLER

 inherit
-	REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
+	WSF_URI_TEMPLATE_ROUTING_HANDLER_I [WSF_HANDLER [WSF_URI_TEMPLATE_HANDLER_CONTEXT], WSF_URI_TEMPLATE_HANDLER_CONTEXT]
 		redefine
 			router
 		end
@@ -18,10 +18,10 @@ create

 feature {NONE} -- Routing

-	router: REQUEST_URI_TEMPLATE_ROUTER
+	router: WSF_URI_TEMPLATE_ROUTER

 ;note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri_template/request_uri_template_handler_context.e
+++ b/library/server/wsf/router/uri_template/request_uri_template_handler_context.e
@@ -1,14 +1,14 @@
 note
-	description: "Summary description for {REQUEST_URI_TEMPLATE_HANDLER_CONTEXT}."
+	description: "Summary description for {WSF_URI_TEMPLATE_HANDLER_CONTEXT}."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 class
-	REQUEST_URI_TEMPLATE_HANDLER_CONTEXT
+	WSF_URI_TEMPLATE_HANDLER_CONTEXT

 inherit
-	REQUEST_HANDLER_CONTEXT
+	WSF_HANDLER_CONTEXT

 create
 	make
@@ -48,7 +48,7 @@ feature -- Query
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri_template/request_uri_template_router_i.e
+++ b/library/server/wsf/router/uri_template/request_uri_template_router_i.e
@@ -1,14 +1,14 @@
 note
-	description: "Summary description for {REQUEST_URI_TEMPLATE_ROUTER}."
+	description: "Summary description for {WSF_URI_TEMPLATE_ROUTER}."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 class
-	REQUEST_URI_TEMPLATE_ROUTER_I [H -> REQUEST_HANDLER [C], C -> REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end]
+	WSF_URI_TEMPLATE_ROUTER_I [H -> WSF_HANDLER [C], C -> WSF_URI_TEMPLATE_HANDLER_CONTEXT create make end]

 inherit
-	REQUEST_ROUTER [H, C]
+	WSF_ROUTER [H, C]

 create
 	make,
@@ -106,7 +106,7 @@ feature {NONE} -- Implementation
 			end
 		end

-feature {ROUTED_SERVICE_I} -- Handler
+feature {WSF_ROUTED_SERVICE_I} -- Handler

 	handler (req: WSF_REQUEST): detachable TUPLE [handler: attached like default_handler; context: like default_handler_context]
 		local
@@ -128,7 +128,7 @@ feature {ROUTED_SERVICE_I} -- Handler
 					if is_matching_request_methods (l_req_method, l_info.request_methods) then
 						t := l_info.resource
 						if
-							attached {REQUEST_ROUTING_HANDLER [H, C]} l_info.handler as rah and then
+							attached {WSF_ROUTING_HANDLER  [H, C]} l_info.handler as rah and then
 							p.starts_with (t)
 						then
 							create l_res.make_empty
@@ -211,7 +211,7 @@ feature {NONE} -- Default: implementation
 		end

 ;note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/uri_template/request_uri_template_routing_handler_i.e
+++ b/library/server/wsf/router/uri_template/request_uri_template_routing_handler_i.e
@@ -1,15 +1,15 @@
 note
-	description: "Summary description for {REQUEST_ROUTING_HANDLER}."
+	description: "Summary description for {WSF_ROUTING_HANDLER }."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 class
-	REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [H -> REQUEST_HANDLER [C],
-							 C -> REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end]
+	WSF_URI_TEMPLATE_ROUTING_HANDLER_I [H -> WSF_HANDLER [C],
+							 C -> WSF_URI_TEMPLATE_HANDLER_CONTEXT create make end]

 inherit
-	REQUEST_ROUTING_HANDLER [H, C]
+	WSF_ROUTING_HANDLER  [H, C]

 create
 	make,
@@ -31,10 +31,10 @@ feature {NONE} -- Initialization

 feature {NONE} -- Routing

-	router: REQUEST_URI_TEMPLATE_ROUTER_I [H, C]
+	router: WSF_URI_TEMPLATE_ROUTER_I [H, C]

 ;note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/request_agent_handler.e
+++ b/library/server/wsf/router/request_agent_handler.e
@@ -1,14 +1,14 @@
 note
-	description: "Summary description for REQUEST_AGENT_HANDLER."
+	description: "Summary description for WSF_AGENT_HANDLER."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 class
-	REQUEST_AGENT_HANDLER [C -> REQUEST_HANDLER_CONTEXT]
+	WSF_AGENT_HANDLER [C -> WSF_HANDLER_CONTEXT]

 inherit
-	REQUEST_HANDLER [C]
+	WSF_HANDLER [C]

 create
 	make
@@ -32,7 +32,7 @@ feature -- Execution
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/request_file_system_handler.e
+++ b/library/server/wsf/router/request_file_system_handler.e
@@ -6,10 +6,10 @@ note
 	revision: "$Revision$"

 class
-	REQUEST_FILE_SYSTEM_HANDLER [C -> REQUEST_HANDLER_CONTEXT]
+	WSF_FILE_SYSTEM_HANDLER [C -> WSF_HANDLER_CONTEXT]

 inherit
-	REQUEST_HANDLER [C]
+	WSF_HANDLER [C]

 create
 	make
@@ -336,7 +336,7 @@ feature {NONE} -- Implementation
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/request_handler.e
+++ b/library/server/wsf/router/request_handler.e
@@ -1,16 +1,22 @@
 note
-	description: "Summary description for {REQUEST_HANDLER}."
-	author: ""
+	description: "[
+				Request handler object which is called by a WSF_ROUTER
+				An handler should implement the method
+				
+					execute (ctx, req, res)
+					
+				The class is generic, this way one can use a custom WSF_HANDLER_CONTEXT if needed
+		]"
 	date: "$Date$"
 	revision: "$Revision$"

 deferred class
-	REQUEST_HANDLER [C -> REQUEST_HANDLER_CONTEXT]
+	WSF_HANDLER [C -> WSF_HANDLER_CONTEXT]

 inherit
 	ANY

-	ROUTED_SERVICE_HELPER
+	WSF_HANDLER_HELPER
 		export
 			{NONE} all
 		end
@@ -65,7 +71,7 @@ feature -- Execution: report
 			result_attached: Result /= Void
 		end

-feature {REQUEST_ROUTER} -- Routes change
+feature {WSF_ROUTER} -- Routes change

 	on_handler_mapped (a_resource: READABLE_STRING_8; a_rqst_methods: detachable ARRAY [READABLE_STRING_8])
 			-- Callback called when a router map a route to Current handler
@@ -73,7 +79,7 @@ feature {REQUEST_ROUTER} -- Routes change
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/request_handler_context.e
+++ b/library/server/wsf/router/request_handler_context.e
@@ -1,15 +1,17 @@
 note
-	description: "Summary description for {REQUEST_HANDLER_CONTEXT}."
+	description: "[
+			
+			]"
 	date: "$Date$"
 	revision: "$Revision$"

 deferred class
-	REQUEST_HANDLER_CONTEXT
+	WSF_HANDLER_CONTEXT

 inherit
 	ANY

-	REQUEST_FORMAT_UTILITY
+	WSF_FORMAT_UTILITY
 		export
 			{NONE} all
 		end
@@ -248,7 +250,7 @@ feature -- Parameter
 		end

 ;note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/wsf_routed_service_i.e
+++ b/library/server/wsf/router/wsf_routed_service_i.e
@@ -1,11 +1,11 @@
 note
-	description: "Summary description for {ROUTED_SERVICE}."
+	description: "Summary description for {WSF_ROUTED_SERVICE}."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 deferred class
-	ROUTED_SERVICE_I [H -> REQUEST_HANDLER [C], C -> REQUEST_HANDLER_CONTEXT]
+	WSF_ROUTED_SERVICE_I [H -> WSF_HANDLER [C], C -> WSF_HANDLER_CONTEXT]

 feature -- Setup

@@ -30,7 +30,7 @@ feature -- Setup
 		deferred
 		end

-	router: REQUEST_ROUTER [H, C]
+	router: WSF_ROUTER [H, C]
 			-- Request router

 feature -- Execution
@@ -50,7 +50,7 @@ feature -- Execution
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/request_router.e
+++ b/library/server/wsf/router/request_router.e
@@ -1,11 +1,11 @@
 note
-	description: "Summary description for {REQUEST_ROUTER}."
+	description: "Summary description for {WSF_ROUTER}."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 deferred class
-	REQUEST_ROUTER [H -> REQUEST_HANDLER [C], C -> REQUEST_HANDLER_CONTEXT]
+	WSF_ROUTER [H -> WSF_HANDLER [C], C -> WSF_HANDLER_CONTEXT]

 inherit
 	ITERABLE [TUPLE [handler: H; resource: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
@@ -66,7 +66,7 @@ feature -- Mapping
 	map_agent_with_request_methods (a_resource: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: C; req: WSF_REQUEST; res: WSF_RESPONSE]];
 			 rqst_methods: detachable ARRAY [READABLE_STRING_8])
 		local
-			rah: REQUEST_AGENT_HANDLER [C]
+			rah: WSF_AGENT_HANDLER [C]
 		do
 			create rah.make (a_action)
 			if attached {H} rah as h then
@@ -138,7 +138,7 @@ feature -- status report
 			across
 				Current as curs
 			loop
-				if attached {REQUEST_ROUTING_HANDLER [H, C]} curs.item.handler as rh then
+				if attached {WSF_ROUTING_HANDLER  [H, C]} curs.item.handler as rh then
 					Result := Result + rh.count + 1 --| +1 for the handler itself
 				else
 					Result := Result + 1
@@ -153,7 +153,7 @@ feature -- Traversing
 		deferred
 		end

-feature {ROUTED_SERVICE_I} -- Handler
+feature {WSF_ROUTED_SERVICE_I} -- Handler

 	source_uri (req: WSF_REQUEST): READABLE_STRING_32
 			-- URI to use to find handler.
@@ -236,7 +236,7 @@ feature {NONE} -- Implementation
 		end

 ;note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, 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/request_routing_handler.e
+++ b/library/server/wsf/router/request_routing_handler.e
@@ -1,15 +1,15 @@
 note
-	description: "Summary description for {REQUEST_ROUTING_HANDLER}."
+	description: "Summary description for {WSF_ROUTING_HANDLER }."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"

 deferred class
-	REQUEST_ROUTING_HANDLER [H -> REQUEST_HANDLER [C],
-							 C -> REQUEST_HANDLER_CONTEXT]
+	WSF_ROUTING_HANDLER  [H -> WSF_HANDLER [C],
+							 C -> WSF_HANDLER_CONTEXT]

 inherit
-	REQUEST_HANDLER [C]
+	WSF_HANDLER [C]

 feature -- Access

@@ -50,7 +50,7 @@ feature -- Execution

 feature {NONE} -- Routing

-	router: REQUEST_ROUTER [H, C]
+	router: WSF_ROUTER [H, C]
 		deferred
 		end

@@ -88,7 +88,7 @@ feature -- Mapping
 		end

 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software