From ec1d8ca52f891517025cea4d73e5e62512b88ae7 Mon Sep 17 00:00:00 2001 From: jvelilla Date: Wed, 10 Sep 2014 12:57:34 -0300 Subject: [PATCH] Updated WSF_ROUTER, to import an existing router definition. --- library/server/wsf/router/wsf_router.e | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/library/server/wsf/router/wsf_router.e b/library/server/wsf/router/wsf_router.e index efd46a6d..92d2f22a 100644 --- a/library/server/wsf/router/wsf_router.e +++ b/library/server/wsf/router/wsf_router.e @@ -59,6 +59,8 @@ feature {NONE} -- Initialization no_handler_set: count = 0 end +feature {WSF_ROUTER} -- Access + mappings: ARRAYED_LIST [WSF_ROUTER_ITEM] -- Existing mappings @@ -91,6 +93,18 @@ feature -- Mapping a_mapping.handler.on_mapped (a_mapping, rqst_methods) end + import (a_router: WSF_ROUTER) + -- Importing an existing router definition `a_router'. + do + across a_router.mappings as c loop + if attached c.item.request_methods as l_methods then + map_with_request_methods (c.item.mapping, l_methods) + else + map (c.item.mapping) + end + end + end + feature -- Mapping handler handle (a_resource: READABLE_STRING_8; f: WSF_ROUTER_MAPPING_FACTORY) @@ -553,7 +567,7 @@ invariant pre_execution_actions_attached: pre_execution_actions /= Void note - copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others" + copyright: "2011-2014, 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