diff --git a/library/server/request/rest/src/application/rest_application.e b/library/server/request/rest/src/application/rest_application_i.e similarity index 88% rename from library/server/request/rest/src/application/rest_application.e rename to library/server/request/rest/src/application/rest_application_i.e index b4536020..4591dee5 100644 --- a/library/server/request/rest/src/application/rest_application.e +++ b/library/server/request/rest/src/application/rest_application_i.e @@ -5,7 +5,7 @@ note revision: "$Revision$" deferred class - REST_APPLICATION [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_HANDLER_CONTEXT] + REST_APPLICATION_I [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_HANDLER_CONTEXT] inherit ROUTED_APPLICATION [H, C] diff --git a/library/server/request/rest/src/context/rest_request_uri_handler_context.e b/library/server/request/rest/src/context/rest_request_uri_handler_context.e index d9f91e76..69224ecd 100644 --- a/library/server/request/rest/src/context/rest_request_uri_handler_context.e +++ b/library/server/request/rest/src/context/rest_request_uri_handler_context.e @@ -8,7 +8,7 @@ class REST_REQUEST_URI_HANDLER_CONTEXT inherit - REQUEST_URI_HANDLER_CONTEXT + REQUEST_URI_HANDLER_CONTEXT_I REST_REQUEST_HANDLER_CONTEXT @@ -16,7 +16,7 @@ create make note - copyright: "2011-2011, Eiffel Software and others" + copyright: "Copyright (c) 1984-2011, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/server/request/rest/src/context/rest_request_uri_template_handler_context.e b/library/server/request/rest/src/context/rest_request_uri_template_handler_context.e index eefa61e7..cbc36a31 100644 --- a/library/server/request/rest/src/context/rest_request_uri_template_handler_context.e +++ b/library/server/request/rest/src/context/rest_request_uri_template_handler_context.e @@ -8,7 +8,7 @@ class REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT inherit - REQUEST_URI_TEMPLATE_HANDLER_CONTEXT + REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I REST_REQUEST_HANDLER_CONTEXT @@ -16,7 +16,7 @@ create make note - copyright: "2011-2011, Eiffel Software and others" + copyright: "Copyright (c) 1984-2011, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/server/request/rest/src/contrib/doc/rest_api_documentation.e b/library/server/request/rest/src/contrib/doc/rest_api_documentation.e index f4364ac1..276b2653 100644 --- a/library/server/request/rest/src/contrib/doc/rest_api_documentation.e +++ b/library/server/request/rest/src/contrib/doc/rest_api_documentation.e @@ -188,7 +188,7 @@ feature -- Execution s.append_string ("") end s.append_string ("
Authentication required: " + rq.authentication_required.out + "
") - if attached {REST_REQUEST_URI_TEMPLATE_ROUTER [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]} router as l_uri_template_router then + if attached {REST_REQUEST_URI_TEMPLATE_ROUTER_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]} router as l_uri_template_router then create l_uri_tpl.make (a_resource) if attached l_uri_tpl.query_variable_names as l_query_variable_names and then not l_query_variable_names.is_empty then s.append_string ("
Query parameters: ") diff --git a/library/server/request/rest/src/default/default_rest_application.e b/library/server/request/rest/src/default/rest_application.e similarity index 80% rename from library/server/request/rest/src/default/default_rest_application.e rename to library/server/request/rest/src/default/rest_application.e index 3c8ee966..4d5bbaa6 100644 --- a/library/server/request/rest/src/default/default_rest_application.e +++ b/library/server/request/rest/src/default/rest_application.e @@ -5,10 +5,10 @@ note revision: "$Revision$" deferred class - DEFAULT_REST_APPLICATION + REST_APPLICATION inherit - REST_APPLICATION [REST_REQUEST_HANDLER [REST_REQUEST_HANDLER_CONTEXT], REST_REQUEST_HANDLER_CONTEXT] + REST_APPLICATION_I [REST_REQUEST_HANDLER [REST_REQUEST_HANDLER_CONTEXT], REST_REQUEST_HANDLER_CONTEXT] note copyright: "Copyright (c) 1984-2011, Eiffel Software and others" diff --git a/library/server/request/rest/src/default/default_rest_request_uri_handler.e b/library/server/request/rest/src/default/rest_request_uri_handler.e similarity index 94% rename from library/server/request/rest/src/default/default_rest_request_uri_handler.e rename to library/server/request/rest/src/default/rest_request_uri_handler.e index efbf0ed7..1d162808 100644 --- a/library/server/request/rest/src/default/default_rest_request_uri_handler.e +++ b/library/server/request/rest/src/default/rest_request_uri_handler.e @@ -5,7 +5,7 @@ note revision: "$Revision$" deferred class - DEFAULT_REST_REQUEST_URI_HANDLER + REST_REQUEST_URI_HANDLER inherit REST_REQUEST_HANDLER [REST_REQUEST_URI_HANDLER_CONTEXT] diff --git a/library/server/request/rest/src/default/default_rest_request_uri_router.e b/library/server/request/rest/src/default/rest_request_uri_router.e similarity index 86% rename from library/server/request/rest/src/default/default_rest_request_uri_router.e rename to library/server/request/rest/src/default/rest_request_uri_router.e index 854f9c68..af2079f0 100644 --- a/library/server/request/rest/src/default/default_rest_request_uri_router.e +++ b/library/server/request/rest/src/default/rest_request_uri_router.e @@ -5,10 +5,10 @@ note revision: "$Revision$" class - DEFAULT_REST_REQUEST_URI_ROUTER + REST_REQUEST_URI_ROUTER inherit - REST_REQUEST_URI_ROUTER [REST_REQUEST_HANDLER [REST_REQUEST_URI_HANDLER_CONTEXT], REST_REQUEST_URI_HANDLER_CONTEXT] + REST_REQUEST_URI_ROUTER_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_HANDLER_CONTEXT], REST_REQUEST_URI_HANDLER_CONTEXT] redefine map_agent_with_request_methods end diff --git a/library/server/request/rest/src/default/default_rest_request_uri_template_handler.e b/library/server/request/rest/src/default/rest_request_uri_template_handler.e similarity index 93% rename from library/server/request/rest/src/default/default_rest_request_uri_template_handler.e rename to library/server/request/rest/src/default/rest_request_uri_template_handler.e index a637ed60..59198577 100644 --- a/library/server/request/rest/src/default/default_rest_request_uri_template_handler.e +++ b/library/server/request/rest/src/default/rest_request_uri_template_handler.e @@ -5,7 +5,7 @@ note revision: "$Revision$" deferred class - DEFAULT_REST_REQUEST_URI_TEMPLATE_HANDLER + REST_REQUEST_URI_TEMPLATE_HANDLER inherit REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] diff --git a/library/server/request/rest/src/default/default_rest_request_uri_template_router.e b/library/server/request/rest/src/default/rest_request_uri_template_router.e similarity index 84% rename from library/server/request/rest/src/default/default_rest_request_uri_template_router.e rename to library/server/request/rest/src/default/rest_request_uri_template_router.e index 2054255b..4ee89e57 100644 --- a/library/server/request/rest/src/default/default_rest_request_uri_template_router.e +++ b/library/server/request/rest/src/default/rest_request_uri_template_router.e @@ -5,10 +5,10 @@ note revision: "$Revision$" class - DEFAULT_REST_REQUEST_URI_TEMPLATE_ROUTER + REST_REQUEST_URI_TEMPLATE_ROUTER inherit - REST_REQUEST_URI_TEMPLATE_ROUTER [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] + REST_REQUEST_URI_TEMPLATE_ROUTER_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] redefine map_agent_with_request_methods end diff --git a/library/server/request/rest/src/default/default_rest_request_uri_template_routing_handler.e b/library/server/request/rest/src/default/rest_request_uri_template_routing_handler.e similarity index 70% rename from library/server/request/rest/src/default/default_rest_request_uri_template_routing_handler.e rename to library/server/request/rest/src/default/rest_request_uri_template_routing_handler.e index 67c37924..f89361ab 100644 --- a/library/server/request/rest/src/default/default_rest_request_uri_template_routing_handler.e +++ b/library/server/request/rest/src/default/rest_request_uri_template_routing_handler.e @@ -5,10 +5,10 @@ note revision: "$Revision$" class - DEFAULT_REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER + REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER inherit - REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] + REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] redefine router end @@ -18,7 +18,7 @@ create feature {NONE} -- Routing - router: DEFAULT_REST_REQUEST_URI_TEMPLATE_ROUTER + router: REST_REQUEST_URI_TEMPLATE_ROUTER ;note copyright: "Copyright (c) 1984-2011, Eiffel Software and others" diff --git a/library/server/request/rest/src/default/default_rest_uri_application.e b/library/server/request/rest/src/default/rest_uri_application.e similarity index 75% rename from library/server/request/rest/src/default/default_rest_uri_application.e rename to library/server/request/rest/src/default/rest_uri_application.e index b6bdd088..7ef6e0ff 100644 --- a/library/server/request/rest/src/default/default_rest_uri_application.e +++ b/library/server/request/rest/src/default/rest_uri_application.e @@ -5,17 +5,17 @@ note revision: "$Revision$" deferred class - DEFAULT_REST_URI_APPLICATION + REST_URI_APPLICATION inherit - REST_APPLICATION [REST_REQUEST_HANDLER [REST_REQUEST_URI_HANDLER_CONTEXT], REST_REQUEST_URI_HANDLER_CONTEXT] + REST_APPLICATION_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_HANDLER_CONTEXT], REST_REQUEST_URI_HANDLER_CONTEXT] redefine router end feature -- Router - router: DEFAULT_REST_REQUEST_URI_ROUTER + router: REST_REQUEST_URI_ROUTER ;note copyright: "Copyright (c) 1984-2011, Eiffel Software and others" diff --git a/library/server/request/rest/src/default/default_rest_uri_template_application.e b/library/server/request/rest/src/default/rest_uri_template_application.e similarity index 72% rename from library/server/request/rest/src/default/default_rest_uri_template_application.e rename to library/server/request/rest/src/default/rest_uri_template_application.e index 0f1e76c6..753d49ea 100644 --- a/library/server/request/rest/src/default/default_rest_uri_template_application.e +++ b/library/server/request/rest/src/default/rest_uri_template_application.e @@ -5,17 +5,17 @@ note revision: "$Revision$" deferred class - DEFAULT_REST_URI_TEMPLATE_APPLICATION + REST_URI_TEMPLATE_APPLICATION inherit - REST_APPLICATION [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] + REST_APPLICATION_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] redefine router end feature -- Router - router: DEFAULT_REST_REQUEST_URI_TEMPLATE_ROUTER + router: REST_REQUEST_URI_TEMPLATE_ROUTER ;note copyright: "Copyright (c) 1984-2011, Eiffel Software and others" diff --git a/library/server/request/rest/src/handler/rest_request_uri_routing_handler.e b/library/server/request/rest/src/handler/rest_request_uri_routing_handler_i.e similarity index 86% rename from library/server/request/rest/src/handler/rest_request_uri_routing_handler.e rename to library/server/request/rest/src/handler/rest_request_uri_routing_handler_i.e index 6d6fb2f1..80365a96 100644 --- a/library/server/request/rest/src/handler/rest_request_uri_routing_handler.e +++ b/library/server/request/rest/src/handler/rest_request_uri_routing_handler_i.e @@ -5,11 +5,11 @@ note revision: "$Revision$" class - REST_REQUEST_URI_ROUTING_HANDLER [H -> REST_REQUEST_HANDLER [C], + REST_REQUEST_URI_ROUTING_HANDLER_I [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_URI_HANDLER_CONTEXT create make end] inherit - REQUEST_URI_ROUTING_HANDLER [H, C] + REQUEST_URI_ROUTING_HANDLER_I [H, C] redefine router, execute @@ -22,7 +22,7 @@ inherit create make - + feature -- Status report authentication_required: BOOLEAN @@ -36,7 +36,7 @@ feature -- Execution feature {NONE} -- Routing - router: REST_REQUEST_URI_ROUTER [H, C] + router: REST_REQUEST_URI_ROUTER_I [H, C] ;note copyright: "Copyright (c) 1984-2011, Eiffel Software and others" diff --git a/library/server/request/rest/src/handler/rest_request_uri_template_routing_handler.e b/library/server/request/rest/src/handler/rest_request_uri_template_routing_handler_i.e similarity index 84% rename from library/server/request/rest/src/handler/rest_request_uri_template_routing_handler.e rename to library/server/request/rest/src/handler/rest_request_uri_template_routing_handler_i.e index 606df5dc..e622203f 100644 --- a/library/server/request/rest/src/handler/rest_request_uri_template_routing_handler.e +++ b/library/server/request/rest/src/handler/rest_request_uri_template_routing_handler_i.e @@ -5,11 +5,11 @@ note revision: "$Revision$" class - REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER [H -> REST_REQUEST_HANDLER [C], + REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end] inherit - REQUEST_URI_TEMPLATE_ROUTING_HANDLER [H, C] + REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [H, C] redefine router, execute @@ -22,7 +22,7 @@ inherit create make - + feature -- Status report authentication_required: BOOLEAN @@ -36,7 +36,7 @@ feature -- Execution feature {NONE} -- Routing - router: REST_REQUEST_URI_TEMPLATE_ROUTER [H, C] + router: REST_REQUEST_URI_TEMPLATE_ROUTER_I [H, C] ;note copyright: "Copyright (c) 1984-2011, Eiffel Software and others" diff --git a/library/server/request/rest/src/router/rest_request_uri_router.e b/library/server/request/rest/src/router/rest_request_uri_router_i.e similarity index 84% rename from library/server/request/rest/src/router/rest_request_uri_router.e rename to library/server/request/rest/src/router/rest_request_uri_router_i.e index 57a0a362..2d27de34 100644 --- a/library/server/request/rest/src/router/rest_request_uri_router.e +++ b/library/server/request/rest/src/router/rest_request_uri_router_i.e @@ -5,10 +5,10 @@ note revision: "$Revision$" class - REST_REQUEST_URI_ROUTER [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_URI_HANDLER_CONTEXT create make end] + REST_REQUEST_URI_ROUTER_I [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_URI_HANDLER_CONTEXT create make end] inherit - REQUEST_URI_ROUTER [H, C] + REQUEST_URI_ROUTER_I [H, C] REST_REQUEST_ROUTER [H, C] diff --git a/library/server/request/rest/src/router/rest_request_uri_template_router.e b/library/server/request/rest/src/router/rest_request_uri_template_router_i.e similarity index 76% rename from library/server/request/rest/src/router/rest_request_uri_template_router.e rename to library/server/request/rest/src/router/rest_request_uri_template_router_i.e index d023dd3e..14987a13 100644 --- a/library/server/request/rest/src/router/rest_request_uri_template_router.e +++ b/library/server/request/rest/src/router/rest_request_uri_template_router_i.e @@ -5,10 +5,10 @@ note revision: "$Revision$" class - REST_REQUEST_URI_TEMPLATE_ROUTER [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end] + REST_REQUEST_URI_TEMPLATE_ROUTER_I [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end] inherit - REQUEST_URI_TEMPLATE_ROUTER [H, C] + REQUEST_URI_TEMPLATE_ROUTER_I [H, C] REST_REQUEST_ROUTER [H, C] diff --git a/library/server/request/router/src/default/default_request_uri_router.e b/library/server/request/router/src/default/request_uri_router.e similarity index 73% rename from library/server/request/router/src/default/default_request_uri_router.e rename to library/server/request/router/src/default/request_uri_router.e index 2c96678f..60a45988 100644 --- a/library/server/request/router/src/default/default_request_uri_router.e +++ b/library/server/request/router/src/default/request_uri_router.e @@ -5,10 +5,10 @@ note revision: "$Revision$" class - DEFAULT_REQUEST_URI_ROUTER + REQUEST_URI_ROUTER inherit - REQUEST_URI_ROUTER [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT], REQUEST_URI_HANDLER_CONTEXT] + REQUEST_URI_ROUTER_I [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT_I], REQUEST_URI_HANDLER_CONTEXT_I] redefine map_agent_with_request_methods end @@ -17,10 +17,10 @@ create feature -- Mapping - map_agent_with_request_methods (a_id: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: REQUEST_URI_HANDLER_CONTEXT; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER]]; + map_agent_with_request_methods (a_id: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: REQUEST_URI_HANDLER_CONTEXT_I; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER]]; rqst_methods: detachable ARRAY [READABLE_STRING_8]) local - h: REQUEST_AGENT_HANDLER [REQUEST_URI_HANDLER_CONTEXT] + h: REQUEST_AGENT_HANDLER [REQUEST_URI_HANDLER_CONTEXT_I] do create h.make (a_action) map_with_request_methods (a_id, h, rqst_methods) diff --git a/library/server/request/router/src/default/default_request_uri_routing_handler.e b/library/server/request/router/src/default/request_uri_routing_handler.e similarity index 76% rename from library/server/request/router/src/default/default_request_uri_routing_handler.e rename to library/server/request/router/src/default/request_uri_routing_handler.e index 32f15bfa..83b6358f 100644 --- a/library/server/request/router/src/default/default_request_uri_routing_handler.e +++ b/library/server/request/router/src/default/request_uri_routing_handler.e @@ -5,10 +5,10 @@ note revision: "$Revision$" class - DEFAULT_REQUEST_URI_ROUTING_HANDLER + REQUEST_URI_ROUTING_HANDLER inherit - REQUEST_URI_ROUTING_HANDLER [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT], REQUEST_URI_HANDLER_CONTEXT] + REQUEST_URI_ROUTING_HANDLER_I [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT_I], REQUEST_URI_HANDLER_CONTEXT_I] redefine router end @@ -18,7 +18,7 @@ create feature {NONE} -- Routing - router: DEFAULT_REQUEST_URI_ROUTER + router: REQUEST_URI_ROUTER ;note copyright: "2011-2011, Eiffel Software and others" diff --git a/library/server/request/router/src/default/default_request_uri_template_router.e b/library/server/request/router/src/default/request_uri_template_router.e similarity index 81% rename from library/server/request/router/src/default/default_request_uri_template_router.e rename to library/server/request/router/src/default/request_uri_template_router.e index 8ed69b4c..f0f9687e 100644 --- a/library/server/request/router/src/default/default_request_uri_template_router.e +++ b/library/server/request/router/src/default/request_uri_template_router.e @@ -5,10 +5,10 @@ note revision: "$Revision$" class - DEFAULT_REQUEST_URI_TEMPLATE_ROUTER + REQUEST_URI_TEMPLATE_ROUTER inherit - REQUEST_URI_TEMPLATE_ROUTER [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] + REQUEST_URI_TEMPLATE_ROUTER_I [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I] redefine map_agent_with_request_methods end @@ -18,10 +18,10 @@ 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: WGI_REQUEST; res: WGI_RESPONSE_BUFFER]]; + map_agent_with_request_methods (a_id: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER]]; rqst_methods: detachable ARRAY [READABLE_STRING_8]) local - h: REQUEST_AGENT_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] + h: REQUEST_AGENT_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I] do create h.make (a_action) map_with_request_methods (a_id, h, rqst_methods) diff --git a/library/server/request/router/src/default/default_request_uri_template_routing_handler.e b/library/server/request/router/src/default/request_uri_template_routing_handler.e similarity index 72% rename from library/server/request/router/src/default/default_request_uri_template_routing_handler.e rename to library/server/request/router/src/default/request_uri_template_routing_handler.e index f042fa00..0df31c5c 100644 --- a/library/server/request/router/src/default/default_request_uri_template_routing_handler.e +++ b/library/server/request/router/src/default/request_uri_template_routing_handler.e @@ -5,10 +5,10 @@ note revision: "$Revision$" class - DEFAULT_REQUEST_URI_TEMPLATE_ROUTING_HANDLER + REQUEST_URI_TEMPLATE_ROUTING_HANDLER inherit - REQUEST_URI_TEMPLATE_ROUTING_HANDLER [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] + REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I] redefine router end @@ -18,7 +18,7 @@ create feature {NONE} -- Routing - router: DEFAULT_REQUEST_URI_TEMPLATE_ROUTER + router: REQUEST_URI_TEMPLATE_ROUTER ;note copyright: "2011-2011, Eiffel Software and others" diff --git a/library/server/request/router/src/default/default_uri_routed_application.e b/library/server/request/router/src/default/uri_routed_application.e similarity index 85% rename from library/server/request/router/src/default/default_uri_routed_application.e rename to library/server/request/router/src/default/uri_routed_application.e index 831f134d..f8410b9a 100644 --- a/library/server/request/router/src/default/default_uri_routed_application.e +++ b/library/server/request/router/src/default/uri_routed_application.e @@ -5,17 +5,17 @@ note revision: "$Revision$" deferred class - DEFAULT_URI_ROUTED_APPLICATION + URI_ROUTED_APPLICATION inherit - ROUTED_APPLICATION [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT], REQUEST_URI_HANDLER_CONTEXT] + ROUTED_APPLICATION [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT_I], REQUEST_URI_HANDLER_CONTEXT_I] redefine router end feature -- Router - router: DEFAULT_REQUEST_URI_ROUTER + router: REQUEST_URI_ROUTER ;note copyright: "2011-2011, Eiffel Software and others" diff --git a/library/server/request/router/src/default/default_uri_template_routed_application.e b/library/server/request/router/src/default/uri_template_routed_application.e similarity index 82% rename from library/server/request/router/src/default/default_uri_template_routed_application.e rename to library/server/request/router/src/default/uri_template_routed_application.e index 155b1aa0..bc174e35 100644 --- a/library/server/request/router/src/default/default_uri_template_routed_application.e +++ b/library/server/request/router/src/default/uri_template_routed_application.e @@ -5,17 +5,17 @@ note revision: "$Revision$" deferred class - DEFAULT_URI_TEMPLATE_ROUTED_APPLICATION + URI_TEMPLATE_ROUTED_APPLICATION inherit - ROUTED_APPLICATION [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] + ROUTED_APPLICATION [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I] redefine router end feature -- Router - router: DEFAULT_REQUEST_URI_TEMPLATE_ROUTER + router: REQUEST_URI_TEMPLATE_ROUTER ;note copyright: "2011-2011, Eiffel Software and others" diff --git a/library/server/request/router/src/uri/request_uri_handler_context.e b/library/server/request/router/src/uri/request_uri_handler_context_i.e similarity index 96% rename from library/server/request/router/src/uri/request_uri_handler_context.e rename to library/server/request/router/src/uri/request_uri_handler_context_i.e index bfb167f1..c5289fe5 100644 --- a/library/server/request/router/src/uri/request_uri_handler_context.e +++ b/library/server/request/router/src/uri/request_uri_handler_context_i.e @@ -5,7 +5,7 @@ note revision: "$Revision$" class - REQUEST_URI_HANDLER_CONTEXT + REQUEST_URI_HANDLER_CONTEXT_I inherit REQUEST_HANDLER_CONTEXT diff --git a/library/server/request/router/src/uri/request_uri_router.e b/library/server/request/router/src/uri/request_uri_router_i.e similarity index 97% rename from library/server/request/router/src/uri/request_uri_router.e rename to library/server/request/router/src/uri/request_uri_router_i.e index eb272ad7..0b927fcb 100644 --- a/library/server/request/router/src/uri/request_uri_router.e +++ b/library/server/request/router/src/uri/request_uri_router_i.e @@ -5,7 +5,7 @@ note revision: "$Revision$" class - REQUEST_URI_ROUTER [H -> REQUEST_HANDLER [C], C -> REQUEST_URI_HANDLER_CONTEXT create make end] + REQUEST_URI_ROUTER_I [H -> REQUEST_HANDLER [C], C -> REQUEST_URI_HANDLER_CONTEXT_I create make end] inherit REQUEST_ROUTER [H, C] diff --git a/library/server/request/router/src/uri/request_uri_routing_handler.e b/library/server/request/router/src/uri/request_uri_routing_handler_i.e similarity index 80% rename from library/server/request/router/src/uri/request_uri_routing_handler.e rename to library/server/request/router/src/uri/request_uri_routing_handler_i.e index ff522762..413cc987 100644 --- a/library/server/request/router/src/uri/request_uri_routing_handler.e +++ b/library/server/request/router/src/uri/request_uri_routing_handler_i.e @@ -5,8 +5,8 @@ note revision: "$Revision$" class - REQUEST_URI_ROUTING_HANDLER [H -> REQUEST_HANDLER [C], - C -> REQUEST_URI_HANDLER_CONTEXT create make end] + REQUEST_URI_ROUTING_HANDLER_I [H -> REQUEST_HANDLER [C], + C -> REQUEST_URI_HANDLER_CONTEXT_I create make end] inherit REQUEST_ROUTING_HANDLER [H, C] @@ -23,7 +23,7 @@ feature {NONE} -- Initialization feature {NONE} -- Routing - router: REQUEST_URI_ROUTER [H, C] + router: REQUEST_URI_ROUTER_I [H, C] ;note copyright: "2011-2011, Eiffel Software and others" diff --git a/library/server/request/router/src/uri_template/request_uri_template_handler_context.e b/library/server/request/router/src/uri_template/request_uri_template_handler_context_i.e similarity index 97% rename from library/server/request/router/src/uri_template/request_uri_template_handler_context.e rename to library/server/request/router/src/uri_template/request_uri_template_handler_context_i.e index 5cf1c7db..312aaaf8 100644 --- a/library/server/request/router/src/uri_template/request_uri_template_handler_context.e +++ b/library/server/request/router/src/uri_template/request_uri_template_handler_context_i.e @@ -5,7 +5,7 @@ note revision: "$Revision$" class - REQUEST_URI_TEMPLATE_HANDLER_CONTEXT + REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I inherit REQUEST_HANDLER_CONTEXT diff --git a/library/server/request/router/src/uri_template/request_uri_template_router.e b/library/server/request/router/src/uri_template/request_uri_template_router_i.e similarity index 97% rename from library/server/request/router/src/uri_template/request_uri_template_router.e rename to library/server/request/router/src/uri_template/request_uri_template_router_i.e index adba8c02..2bfb0b6c 100644 --- a/library/server/request/router/src/uri_template/request_uri_template_router.e +++ b/library/server/request/router/src/uri_template/request_uri_template_router_i.e @@ -5,7 +5,7 @@ note revision: "$Revision$" class - REQUEST_URI_TEMPLATE_ROUTER [H -> REQUEST_HANDLER [C], C -> REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end] + REQUEST_URI_TEMPLATE_ROUTER_I [H -> REQUEST_HANDLER [C], C -> REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I create make end] inherit REQUEST_ROUTER [H, C] diff --git a/library/server/request/router/src/uri_template/request_uri_template_routing_handler.e b/library/server/request/router/src/uri_template/request_uri_template_routing_handler_i.e similarity index 78% rename from library/server/request/router/src/uri_template/request_uri_template_routing_handler.e rename to library/server/request/router/src/uri_template/request_uri_template_routing_handler_i.e index dac329c4..6e2bfc21 100644 --- a/library/server/request/router/src/uri_template/request_uri_template_routing_handler.e +++ b/library/server/request/router/src/uri_template/request_uri_template_routing_handler_i.e @@ -5,8 +5,8 @@ note revision: "$Revision$" class - REQUEST_URI_TEMPLATE_ROUTING_HANDLER [H -> REQUEST_HANDLER [C], - C -> REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end] + REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [H -> REQUEST_HANDLER [C], + C -> REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I create make end] inherit REQUEST_ROUTING_HANDLER [H, C] @@ -23,7 +23,7 @@ feature {NONE} -- Initialization feature {NONE} -- Routing - router: REQUEST_URI_TEMPLATE_ROUTER [H, C] + router: REQUEST_URI_TEMPLATE_ROUTER_I [H, C] ;note copyright: "2011-2011, Eiffel Software and others"