From 46eb92ac37bb58671237ccd938542256b67ecfbc Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Fri, 16 Mar 2012 09:49:41 +0100 Subject: [PATCH] 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 --- .../rest/src/rest_request_agent_handler.e | 2 +- .../request/rest/src/rest_request_handler.e | 2 +- .../rest/src/rest_request_handler_context.e | 2 +- .../request/rest/src/rest_request_router.e | 2 +- .../server/request/rest/src/rest_service_i.e | 2 +- .../uri/rest_request_uri_handler_context.e | 4 +-- .../rest/src/uri/rest_request_uri_router_i.e | 2 +- .../uri/rest_request_uri_routing_handler_i.e | 6 ++-- ...est_request_uri_template_handler_context.e | 4 +-- .../rest_request_uri_template_router_i.e | 2 +- ...t_request_uri_template_routing_handler_i.e | 6 ++-- .../src/resource/order_handler.e | 6 ++-- examples/restbucksCRUD/src/restbucks_server.e | 8 ++--- examples/simple/application.e | 2 +- examples/simple_file/service_file.e | 2 +- examples/upload_image/src/image_uploader.e | 12 ++++---- library/client/http_client/license.lic | 10 +++++++ library/client/http_client/src/http_client.e | 10 +++++++ .../http_client/src/http_client_constants.e | 10 +++++++ .../http_client/src/http_client_request.e | 10 +++++++ .../src/http_client_request_context.e | 10 +++++++ .../http_client/src/http_client_response.e | 10 +++++++ .../http_client/src/http_client_session.e | 10 +++++++ .../spec/libcurl/libcurl_default_function.e | 4 +-- .../src/spec/libcurl/libcurl_http_client.e | 10 +++++++ .../libcurl/libcurl_http_client_request.e | 10 +++++++ .../libcurl/libcurl_http_client_session.e | 10 +++++++ library/error/license.lic | 2 +- library/protocol/CONNEG/license.lic | 2 +- library/protocol/http/license.lic | 2 +- library/protocol/http/src/http_status_code.e | 2 +- .../http/src/http_status_code_messages.e | 2 +- library/protocol/uri_template/license.lic | 2 +- .../protocol/uri_template/src/uri_template.e | 9 +++++- .../src/uri_template_match_result.e | 2 +- .../libfcgi/src/wgi_libfcgi_input_stream.e | 1 + .../server/ewsgi/connectors/nino/license.lic | 2 +- .../nino/src/wgi_nino_input_stream.e | 22 +++++++++----- library/server/ewsgi/license.lic | 2 +- .../specification/connector/wgi_connector.e | 2 +- .../specification/request/wgi_meta_names.e | 2 +- .../ewsgi/specification/request/wgi_request.e | 2 +- .../specification/response/wgi_response.e | 2 +- .../implementation/wgi_request_from_table.e | 2 +- .../src/implementation/wgi_response_stream.e | 2 +- library/server/ewsgi/src/wgi_agent_service.e | 2 +- .../ewsgi/src/wgi_chunked_input_stream.e | 2 +- library/server/ewsgi/src/wgi_input_stream.e | 17 +++++------ library/server/ewsgi/src/wgi_output_stream.e | 2 +- library/server/ewsgi/src/wgi_service.e | 2 +- library/server/request/router/license.lic | 2 +- ...ncher.e => wsf_default_service_launcher.e} | 6 ++-- ...ncher.e => wsf_default_service_launcher.e} | 6 ++-- ...ncher.e => wsf_default_service_launcher.e} | 6 ++-- library/server/wsf/license.lic | 10 +++++++ ...{routed_service.e => wsf_routed_service.e} | 6 ++-- ..._format_utility.e => wsf_format_utility.e} | 6 ++-- ..._service_helper.e => wsf_handler_helper.e} | 9 +++--- ...corder.e => wsf_handler_routes_recorder.e} | 12 ++++---- ...helper.e => wsf_resource_handler_helper.e} | 4 +-- ...ted_service.e => wsf_uri_routed_service.e} | 10 +++---- ...{request_uri_router.e => wsf_uri_router.e} | 10 +++---- ...ng_handler.e => wsf_uri_routing_handler.e} | 8 ++--- ...er_context.e => wsf_uri_handler_context.e} | 8 ++--- ...uest_uri_router_i.e => wsf_uri_router_i.e} | 8 ++--- ...andler_i.e => wsf_uri_routing_handler_i.e} | 12 ++++---- ...ce.e => wsf_uri_template_routed_service.e} | 8 ++--- ...ate_router.e => wsf_uri_template_router.e} | 10 +++---- ...r.e => wsf_uri_template_routing_handler.e} | 8 ++--- ...t.e => wsf_uri_template_handler_context.e} | 8 ++--- ...router_i.e => wsf_uri_template_router_i.e} | 12 ++++---- ...e => wsf_uri_template_routing_handler_i.e} | 12 ++++---- ...st_agent_handler.e => wsf_agent_handler.e} | 8 ++--- ...em_handler.e => wsf_file_system_handler.e} | 6 ++-- .../{request_handler.e => wsf_handler.e} | 18 +++++++---- ...andler_context.e => wsf_handler_context.e} | 10 ++++--- ...ted_service_i.e => wsf_routed_service_i.e} | 8 ++--- .../router/{request_router.e => wsf_router.e} | 12 ++++---- ...outing_handler.e => wsf_routing_handler.e} | 12 ++++---- library/server/wsf/src/cgi_meta_names.e | 13 -------- ...r_i.e => wsf_default_service_launcher_i.e} | 6 ++-- .../value/visitor/wsf_value_agent_iterator.e | 2 +- .../value/visitor/wsf_value_iterator.e | 2 +- .../value/visitor/wsf_value_null_visitor.e | 2 +- .../request/value/visitor/wsf_value_visitor.e | 2 +- .../server/wsf/src/request/value/wsf_any.e | 2 +- .../src/request/value/wsf_multiple_string.e | 2 +- .../server/wsf/src/request/value/wsf_string.e | 2 +- .../server/wsf/src/request/value/wsf_table.e | 10 +++++++ .../wsf/src/request/value/wsf_uploaded_file.e | 10 +++++++ library/server/wsf/src/request/wsf_value.e | 2 +- .../wsf/src/response/wsf_download_response.e | 10 +++++++ .../wsf/src/response/wsf_file_response.e | 10 +++++++ .../response/wsf_force_download_response.e | 10 +++++++ .../wsf/src/response/wsf_html_page_response.e | 10 +++++++ .../wsf/src/response/wsf_page_response.e | 10 +++++++ library/server/wsf/src/support/wsf_error.e | 2 +- library/server/wsf/src/support/wsf_header.e | 2 +- .../wsf/src/support/wsf_mime_handler_helper.e | 10 +++++++ ...pplication_x_www_form_urlencoded_handler.e | 10 +++++++ library/server/wsf/src/wsf_meta_names.e | 22 ++++++++++++++ library/server/wsf/src/wsf_mime_handler.e | 10 +++++++ .../wsf/src/wsf_multipart_form_data_handler.e | 10 +++++++ library/server/wsf/src/wsf_request.e | 18 ++++++++--- library/server/wsf/src/wsf_response.e | 2 +- library/server/wsf/src/wsf_response_message.e | 10 +++++++ library/server/wsf/src/wsf_service.e | 10 +++++++ .../server/wsf/tests/echo/src/echo_server.e | 2 +- tests/dev/src/hello_routed_world.e | 30 +++++++++---------- 109 files changed, 517 insertions(+), 236 deletions(-) create mode 100644 library/client/http_client/license.lic rename library/server/wsf/default/cgi/{default_service_launcher.e => wsf_default_service_launcher.e} (91%) rename library/server/wsf/default/libfcgi/{default_service_launcher.e => wsf_default_service_launcher.e} (91%) rename library/server/wsf/default/nino/{default_service_launcher.e => wsf_default_service_launcher.e} (96%) create mode 100644 library/server/wsf/license.lic rename library/server/wsf/router/default/{routed_service.e => wsf_routed_service.e} (71%) rename library/server/wsf/router/misc/{request_format_utility.e => wsf_format_utility.e} (91%) rename library/server/wsf/router/misc/{routed_service_helper.e => wsf_handler_helper.e} (91%) rename library/server/wsf/router/misc/{request_handler_routes_recorder.e => wsf_handler_routes_recorder.e} (74%) rename library/server/wsf/router/misc/{request_resource_handler_helper.e => wsf_resource_handler_helper.e} (98%) rename library/server/wsf/router/uri/default/{uri_routed_service.e => wsf_uri_routed_service.e} (60%) rename library/server/wsf/router/uri/default/{request_uri_router.e => wsf_uri_router.e} (69%) rename library/server/wsf/router/uri/default/{request_uri_routing_handler.e => wsf_uri_routing_handler.e} (69%) rename library/server/wsf/router/uri/{request_uri_handler_context.e => wsf_uri_handler_context.e} (78%) rename library/server/wsf/router/uri/{request_uri_router_i.e => wsf_uri_router_i.e} (95%) rename library/server/wsf/router/uri/{request_uri_routing_handler_i.e => wsf_uri_routing_handler_i.e} (61%) rename library/server/wsf/router/uri_template/default/{uri_template_routed_service.e => wsf_uri_template_routed_service.e} (66%) rename library/server/wsf/router/uri_template/default/{request_uri_template_router.e => wsf_uri_template_router.e} (66%) rename library/server/wsf/router/uri_template/default/{request_uri_template_routing_handler.e => wsf_uri_template_routing_handler.e} (66%) rename library/server/wsf/router/uri_template/{request_uri_template_handler_context.e => wsf_uri_template_handler_context.e} (85%) rename library/server/wsf/router/uri_template/{request_uri_template_router_i.e => wsf_uri_template_router_i.e} (93%) rename library/server/wsf/router/uri_template/{request_uri_template_routing_handler_i.e => wsf_uri_template_routing_handler_i.e} (68%) rename library/server/wsf/router/{request_agent_handler.e => wsf_agent_handler.e} (77%) rename library/server/wsf/router/{request_file_system_handler.e => wsf_file_system_handler.e} (98%) rename library/server/wsf/router/{request_handler.e => wsf_handler.e} (79%) rename library/server/wsf/router/{request_handler_context.e => wsf_handler_context.e} (97%) rename library/server/wsf/router/{routed_service_i.e => wsf_routed_service_i.e} (80%) rename library/server/wsf/router/{request_router.e => wsf_router.e} (94%) rename library/server/wsf/router/{request_routing_handler.e => wsf_routing_handler.e} (89%) delete mode 100644 library/server/wsf/src/cgi_meta_names.e rename library/server/wsf/src/default/{default_service_launcher_i.e => wsf_default_service_launcher_i.e} (95%) create mode 100644 library/server/wsf/src/wsf_meta_names.e diff --git a/draft/library/server/request/rest/src/rest_request_agent_handler.e b/draft/library/server/request/rest/src/rest_request_agent_handler.e index d503f507..f0a43944 100644 --- a/draft/library/server/request/rest/src/rest_request_agent_handler.e +++ b/draft/library/server/request/rest/src/rest_request_agent_handler.e @@ -8,7 +8,7 @@ class REST_REQUEST_AGENT_HANDLER [C -> REST_REQUEST_HANDLER_CONTEXT] inherit - REQUEST_AGENT_HANDLER [C] + WSF_AGENT_HANDLER [C] rename execute as execute_application end diff --git a/draft/library/server/request/rest/src/rest_request_handler.e b/draft/library/server/request/rest/src/rest_request_handler.e index 9d39cefa..9226f108 100644 --- a/draft/library/server/request/rest/src/rest_request_handler.e +++ b/draft/library/server/request/rest/src/rest_request_handler.e @@ -8,7 +8,7 @@ deferred class REST_REQUEST_HANDLER [C -> REST_REQUEST_HANDLER_CONTEXT] inherit - REQUEST_HANDLER [C] + WSF_HANDLER [C] feature -- Access diff --git a/draft/library/server/request/rest/src/rest_request_handler_context.e b/draft/library/server/request/rest/src/rest_request_handler_context.e index 320150ca..27af8247 100644 --- a/draft/library/server/request/rest/src/rest_request_handler_context.e +++ b/draft/library/server/request/rest/src/rest_request_handler_context.e @@ -8,7 +8,7 @@ deferred class REST_REQUEST_HANDLER_CONTEXT inherit - REQUEST_HANDLER_CONTEXT + WSF_HANDLER_CONTEXT feature -- Accept: Content-Type diff --git a/draft/library/server/request/rest/src/rest_request_router.e b/draft/library/server/request/rest/src/rest_request_router.e index f6755362..80a74f21 100644 --- a/draft/library/server/request/rest/src/rest_request_router.e +++ b/draft/library/server/request/rest/src/rest_request_router.e @@ -8,7 +8,7 @@ deferred class REST_REQUEST_ROUTER [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_HANDLER_CONTEXT] inherit - REQUEST_ROUTER [H, C] + WSF_ROUTER [H, C] ;note copyright: "Copyright (c) 1984-2011, Eiffel Software and others" diff --git a/draft/library/server/request/rest/src/rest_service_i.e b/draft/library/server/request/rest/src/rest_service_i.e index 8c9ec1de..198b1d3f 100644 --- a/draft/library/server/request/rest/src/rest_service_i.e +++ b/draft/library/server/request/rest/src/rest_service_i.e @@ -8,7 +8,7 @@ deferred class REST_SERVICE_I [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_HANDLER_CONTEXT] inherit - ROUTED_SERVICE_I [H, C] + WSF_ROUTED_SERVICE_I [H, C] redefine router end diff --git a/draft/library/server/request/rest/src/uri/rest_request_uri_handler_context.e b/draft/library/server/request/rest/src/uri/rest_request_uri_handler_context.e index 52566f06..c70a132a 100644 --- a/draft/library/server/request/rest/src/uri/rest_request_uri_handler_context.e +++ b/draft/library/server/request/rest/src/uri/rest_request_uri_handler_context.e @@ -1,5 +1,5 @@ note - description: "Summary description for {REQUEST_URI_HANDLER_CONTEXT}." + description: "Summary description for {WSF_URI_HANDLER_CONTEXT}." author: "" date: "$Date$" revision: "$Revision$" @@ -8,7 +8,7 @@ class REST_REQUEST_URI_HANDLER_CONTEXT inherit - REQUEST_URI_HANDLER_CONTEXT + WSF_URI_HANDLER_CONTEXT REST_REQUEST_HANDLER_CONTEXT diff --git a/draft/library/server/request/rest/src/uri/rest_request_uri_router_i.e b/draft/library/server/request/rest/src/uri/rest_request_uri_router_i.e index 2d27de34..07fc0bbb 100644 --- a/draft/library/server/request/rest/src/uri/rest_request_uri_router_i.e +++ b/draft/library/server/request/rest/src/uri/rest_request_uri_router_i.e @@ -8,7 +8,7 @@ class REST_REQUEST_URI_ROUTER_I [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_URI_HANDLER_CONTEXT create make end] inherit - REQUEST_URI_ROUTER_I [H, C] + WSF_URI_ROUTER_I [H, C] REST_REQUEST_ROUTER [H, C] diff --git a/draft/library/server/request/rest/src/uri/rest_request_uri_routing_handler_i.e b/draft/library/server/request/rest/src/uri/rest_request_uri_routing_handler_i.e index 7099d145..b05571ba 100644 --- a/draft/library/server/request/rest/src/uri/rest_request_uri_routing_handler_i.e +++ b/draft/library/server/request/rest/src/uri/rest_request_uri_routing_handler_i.e @@ -1,5 +1,5 @@ note - description: "Summary description for {REQUEST_ROUTING_HANDLER}." + description: "Summary description for {WSF_ROUTING_HANDLER }." author: "" date: "$Date$" revision: "$Revision$" @@ -9,7 +9,7 @@ class C -> REST_REQUEST_URI_HANDLER_CONTEXT create make end] inherit - REQUEST_URI_ROUTING_HANDLER_I [H, C] + WSF_URI_ROUTING_HANDLER_I [H, C] redefine router, execute @@ -38,7 +38,7 @@ feature -- Execution execute (ctx: C; req: WSF_REQUEST; res: WSF_RESPONSE) do - Precursor {REQUEST_URI_ROUTING_HANDLER_I} (ctx, req, res) + Precursor {WSF_URI_ROUTING_HANDLER_I} (ctx, req, res) end execute_application (ctx: C; req: WSF_REQUEST; res: WSF_RESPONSE) diff --git a/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_handler_context.e b/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_handler_context.e index fd1c829f..4a5bff65 100644 --- a/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_handler_context.e +++ b/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_handler_context.e @@ -1,5 +1,5 @@ note - description: "Summary description for {REQUEST_URI_TEMPLATE_HANDLER_CONTEXT}." + description: "Summary description for {WSF_URI_TEMPLATE_HANDLER_CONTEXT}." author: "" date: "$Date$" revision: "$Revision$" @@ -8,7 +8,7 @@ class REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT inherit - REQUEST_URI_TEMPLATE_HANDLER_CONTEXT + WSF_URI_TEMPLATE_HANDLER_CONTEXT REST_REQUEST_HANDLER_CONTEXT diff --git a/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_router_i.e b/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_router_i.e index 9f3a87e3..f8daf292 100644 --- a/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_router_i.e +++ b/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_router_i.e @@ -8,7 +8,7 @@ class 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_I [H, C] + WSF_URI_TEMPLATE_ROUTER_I [H, C] REST_REQUEST_ROUTER [H, C] diff --git a/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler_i.e b/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler_i.e index fa1e6d36..43bd5ea9 100644 --- a/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler_i.e +++ b/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler_i.e @@ -1,5 +1,5 @@ note - description: "Summary description for {REQUEST_ROUTING_HANDLER}." + description: "Summary description for {WSF_ROUTING_HANDLER }." author: "" date: "$Date$" revision: "$Revision$" @@ -9,7 +9,7 @@ class C -> REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end] inherit - REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [H, C] + WSF_URI_TEMPLATE_ROUTING_HANDLER_I [H, C] redefine router, execute @@ -40,7 +40,7 @@ feature -- Execution execute (ctx: C; req: WSF_REQUEST; res: WSF_RESPONSE) do pre_execute (ctx, req, res) - Precursor {REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I} (ctx, req, res) + Precursor {WSF_URI_TEMPLATE_ROUTING_HANDLER_I} (ctx, req, res) post_execute (ctx, req, res) end diff --git a/examples/restbucksCRUD/src/resource/order_handler.e b/examples/restbucksCRUD/src/resource/order_handler.e index dba573fe..d8f5eb84 100644 --- a/examples/restbucksCRUD/src/resource/order_handler.e +++ b/examples/restbucksCRUD/src/resource/order_handler.e @@ -5,10 +5,10 @@ note revision: "$Revision$" class - ORDER_HANDLER [C -> REQUEST_HANDLER_CONTEXT] + ORDER_HANDLER [C -> WSF_HANDLER_CONTEXT] inherit - REQUEST_HANDLER [C] - REQUEST_RESOURCE_HANDLER_HELPER [C] + WSF_HANDLER [C] + WSF_RESOURCE_HANDLER_HELPER [C] redefine do_get, do_post, diff --git a/examples/restbucksCRUD/src/restbucks_server.e b/examples/restbucksCRUD/src/restbucks_server.e index 754a9b11..a8d5a519 100644 --- a/examples/restbucksCRUD/src/restbucks_server.e +++ b/examples/restbucksCRUD/src/restbucks_server.e @@ -10,9 +10,9 @@ class inherit ANY - URI_TEMPLATE_ROUTED_SERVICE + WSF_URI_TEMPLATE_ROUTED_SERVICE - ROUTED_SERVICE_HELPER + WSF_HANDLER_HELPER create make @@ -21,7 +21,7 @@ feature {NONE} -- Initialization make local - s: DEFAULT_SERVICE_LAUNCHER + s: WSF_DEFAULT_SERVICE_LAUNCHER do initialize_router create s.make_and_launch_with_options (agent execute, <<["port", 9090]>>) @@ -34,7 +34,7 @@ feature {NONE} -- Initialization setup_router local - order_handler: ORDER_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] + order_handler: ORDER_HANDLER [WSF_URI_TEMPLATE_HANDLER_CONTEXT] do create order_handler router.map_with_request_methods ("/order", order_handler, <<"POST">>) diff --git a/examples/simple/application.e b/examples/simple/application.e index f9d1e00d..b98e9562 100644 --- a/examples/simple/application.e +++ b/examples/simple/application.e @@ -14,7 +14,7 @@ feature {NONE} -- Initialization make -- Run application. local - s: DEFAULT_SERVICE_LAUNCHER + s: WSF_DEFAULT_SERVICE_LAUNCHER do create s.make_and_launch (agent execute) end diff --git a/examples/simple_file/service_file.e b/examples/simple_file/service_file.e index 65d585b3..95fd2c43 100644 --- a/examples/simple_file/service_file.e +++ b/examples/simple_file/service_file.e @@ -14,7 +14,7 @@ feature {NONE} -- Initialization make -- Run application. local - s: DEFAULT_SERVICE_LAUNCHER + s: WSF_DEFAULT_SERVICE_LAUNCHER do create s.make_and_launch (agent execute) end diff --git a/examples/upload_image/src/image_uploader.e b/examples/upload_image/src/image_uploader.e index fcf3fce1..f5ac8b64 100644 --- a/examples/upload_image/src/image_uploader.e +++ b/examples/upload_image/src/image_uploader.e @@ -10,9 +10,9 @@ class inherit ANY - URI_TEMPLATE_ROUTED_SERVICE + WSF_URI_TEMPLATE_ROUTED_SERVICE - ROUTED_SERVICE_HELPER + WSF_HANDLER_HELPER create make @@ -22,7 +22,7 @@ feature {NONE} -- Initialization make -- Initialize Current local - s: DEFAULT_SERVICE_LAUNCHER + s: WSF_DEFAULT_SERVICE_LAUNCHER do initialize_router create s.make_and_launch (agent execute) @@ -39,7 +39,7 @@ feature {NONE} -- Initialization setup_router -- Setup router local - www: REQUEST_FILE_SYSTEM_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] + www: WSF_FILE_SYSTEM_HANDLER [WSF_URI_TEMPLATE_HANDLER_CONTEXT] do router.map_agent ("/upload{?nb}", agent execute_upload) @@ -84,13 +84,13 @@ feature -- Execution res.redirect_now_with_content (req.script_url ("/"), "Redirection to " + req.script_url ("/"), "text/html") end - execute_not_found (uri: READABLE_STRING_8; ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) + execute_not_found (uri: READABLE_STRING_8; ctx: WSF_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) -- `uri' is not found, redirect to default page do res.redirect_now_with_content (req.script_url ("/"), uri + ": not found.%NRedirection to " + req.script_url ("/"), "text/html") end - execute_upload (ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) + execute_upload (ctx: WSF_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) -- Upload page is requested, either GET or POST -- On GET display the web form to upload file, by passing ?nb=5 you can upload 5 images -- On POST display the uploaded files diff --git a/library/client/http_client/license.lic b/library/client/http_client/license.lic new file mode 100644 index 00000000..d4d72876 --- /dev/null +++ b/library/client/http_client/license.lic @@ -0,0 +1,10 @@ +${NOTE_KEYWORD} + copyright: "2011-${YEAR}, Jocelyn Fiat, Javier Velilla, 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 + ]" diff --git a/library/client/http_client/src/http_client.e b/library/client/http_client/src/http_client.e index f415811f..08d8e5ed 100644 --- a/library/client/http_client/src/http_client.e +++ b/library/client/http_client/src/http_client.e @@ -13,4 +13,14 @@ feature -- Status deferred end +note + 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 + 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 diff --git a/library/client/http_client/src/http_client_constants.e b/library/client/http_client/src/http_client_constants.e index 7586451c..c0a16c99 100644 --- a/library/client/http_client/src/http_client_constants.e +++ b/library/client/http_client/src/http_client_constants.e @@ -34,4 +34,14 @@ feature -- Auth type Auth_type_any: INTEGER = 3 Auth_type_anysafe: INTEGER = 4 +note + 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 + 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 diff --git a/library/client/http_client/src/http_client_request.e b/library/client/http_client/src/http_client_request.e index 8749640c..ab331fd0 100644 --- a/library/client/http_client/src/http_client_request.e +++ b/library/client/http_client/src/http_client_request.e @@ -198,4 +198,14 @@ feature {NONE} -- Utilities: encoding Result.replace_substring_all ("\\", "\") end +note + 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 + 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 diff --git a/library/client/http_client/src/http_client_request_context.e b/library/client/http_client/src/http_client_request_context.e index 55774d54..5057f81e 100644 --- a/library/client/http_client/src/http_client_request_context.e +++ b/library/client/http_client/src/http_client_request_context.e @@ -101,4 +101,14 @@ feature -- Element change end end +note + 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 + 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 diff --git a/library/client/http_client/src/http_client_response.e b/library/client/http_client/src/http_client_response.e index 6c723da1..f84605ef 100644 --- a/library/client/http_client/src/http_client_response.e +++ b/library/client/http_client/src/http_client_response.e @@ -164,4 +164,14 @@ feature {NONE} -- Implementation internal_headers: detachable ARRAYED_LIST [TUPLE [key: READABLE_STRING_8; value: READABLE_STRING_8]] -- Internal cached value for the headers +;note + 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 + 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 diff --git a/library/client/http_client/src/http_client_session.e b/library/client/http_client/src/http_client_session.e index d8245b9d..24e17b32 100644 --- a/library/client/http_client/src/http_client_session.e +++ b/library/client/http_client/src/http_client_session.e @@ -203,4 +203,14 @@ feature -- Change max_redirects := n end +note + 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 + 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 diff --git a/library/client/http_client/src/spec/libcurl/libcurl_default_function.e b/library/client/http_client/src/spec/libcurl/libcurl_default_function.e index 036b5c1c..33200efa 100644 --- a/library/client/http_client/src/spec/libcurl/libcurl_default_function.e +++ b/library/client/http_client/src/spec/libcurl/libcurl_default_function.e @@ -81,11 +81,11 @@ feature {NONE} -- Implementation note library: "cURL: Library of reusable components for Eiffel." - copyright: "Copyright (c) 1984-2006, 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 - 356 Storke Road, Goleta, CA 93117 USA + 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 diff --git a/library/client/http_client/src/spec/libcurl/libcurl_http_client.e b/library/client/http_client/src/spec/libcurl/libcurl_http_client.e index 560fdf40..bf4e3fcd 100644 --- a/library/client/http_client/src/spec/libcurl/libcurl_http_client.e +++ b/library/client/http_client/src/spec/libcurl/libcurl_http_client.e @@ -27,4 +27,14 @@ feature -- Status create Result.make (a_base_url) end +note + 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 + 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 diff --git a/library/client/http_client/src/spec/libcurl/libcurl_http_client_request.e b/library/client/http_client/src/spec/libcurl/libcurl_http_client_request.e index a990914e..52d7602f 100644 --- a/library/client/http_client/src/spec/libcurl/libcurl_http_client_request.e +++ b/library/client/http_client/src/spec/libcurl/libcurl_http_client_request.e @@ -253,4 +253,14 @@ feature {NONE} -- Implementation end end end +note + 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 + 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 diff --git a/library/client/http_client/src/spec/libcurl/libcurl_http_client_session.e b/library/client/http_client/src/spec/libcurl/libcurl_http_client_session.e index d239573e..2cdbf721 100644 --- a/library/client/http_client/src/spec/libcurl/libcurl_http_client_session.e +++ b/library/client/http_client/src/spec/libcurl/libcurl_http_client_session.e @@ -121,4 +121,14 @@ feature {LIBCURL_HTTP_CLIENT_REQUEST} -- Curl implementation -- cURL easy externals +;note + 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 + 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 diff --git a/library/error/license.lic b/library/error/license.lic index cf2d1ed9..8ad712aa 100644 --- a/library/error/license.lic +++ b/library/error/license.lic @@ -1,5 +1,5 @@ ${NOTE_KEYWORD} - copyright: "2011-${YEAR}, Eiffel Software and others" + copyright: "2011-${YEAR}, Jocelyn Fiat, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/protocol/CONNEG/license.lic b/library/protocol/CONNEG/license.lic index 42cd9b4e..9424d4ca 100644 --- a/library/protocol/CONNEG/license.lic +++ b/library/protocol/CONNEG/license.lic @@ -1,4 +1,4 @@ ${NOTE_KEYWORD} - copyright: "2011-${YEAR}, Javier Velilla, Jocelyn Fiat and others" + copyright: "2011-${YEAR}, Javier Velilla, Jocelyn Fiat, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" diff --git a/library/protocol/http/license.lic b/library/protocol/http/license.lic index cf2d1ed9..8ad712aa 100644 --- a/library/protocol/http/license.lic +++ b/library/protocol/http/license.lic @@ -1,5 +1,5 @@ ${NOTE_KEYWORD} - copyright: "2011-${YEAR}, Eiffel Software and others" + copyright: "2011-${YEAR}, Jocelyn Fiat, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/protocol/http/src/http_status_code.e b/library/protocol/http/src/http_status_code.e index 43375c1f..8f1b89b2 100644 --- a/library/protocol/http/src/http_status_code.e +++ b/library/protocol/http/src/http_status_code.e @@ -94,7 +94,7 @@ feature -- 5xx : Server Error user_access_denied: INTEGER = 530 note - copyright: "Copyright (c) 1984-2011, Eiffel Software and others" + copyright: "2011-2012, Jocelyn Fiat, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/protocol/http/src/http_status_code_messages.e b/library/protocol/http/src/http_status_code_messages.e index 27b4274b..8fa0331b 100644 --- a/library/protocol/http/src/http_status_code_messages.e +++ b/library/protocol/http/src/http_status_code_messages.e @@ -148,7 +148,7 @@ feature -- Status messages end note - copyright: "Copyright (c) 1984-2011, Eiffel Software and others" + copyright: "2011-2012, Jocelyn Fiat, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/protocol/uri_template/license.lic b/library/protocol/uri_template/license.lic index cf2d1ed9..8ad712aa 100644 --- a/library/protocol/uri_template/license.lic +++ b/library/protocol/uri_template/license.lic @@ -1,5 +1,5 @@ ${NOTE_KEYWORD} - copyright: "2011-${YEAR}, Eiffel Software and others" + copyright: "2011-${YEAR}, Jocelyn Fiat, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/protocol/uri_template/src/uri_template.e b/library/protocol/uri_template/src/uri_template.e index 8f93a009..be085f76 100644 --- a/library/protocol/uri_template/src/uri_template.e +++ b/library/protocol/uri_template/src/uri_template.e @@ -176,6 +176,13 @@ feature -- Builder end end + expanded_string_with_base_url (a_base_url: READABLE_STRING_8; a_ht: HASH_TABLE [detachable ANY, STRING]): STRING + -- Expanded template using variable from `a_ht' + -- with based url + do + Result := a_base_url + expanded_string (a_ht) + end + feature -- Match match (a_uri: READABLE_STRING_8): detachable URI_TEMPLATE_MATCH_RESULT @@ -506,7 +513,7 @@ feature {NONE} -- Implementation end note - copyright: "2011-2011, Eiffel Software and others" + copyright: "2011-2012, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/protocol/uri_template/src/uri_template_match_result.e b/library/protocol/uri_template/src/uri_template_match_result.e index 7feb8d0e..de475bfd 100644 --- a/library/protocol/uri_template/src/uri_template_match_result.e +++ b/library/protocol/uri_template/src/uri_template_match_result.e @@ -94,7 +94,7 @@ feature {NONE} -- Implementation end ;note - copyright: "2011-2011, Eiffel Software and others" + copyright: "2011-2012, 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/ewsgi/connectors/libfcgi/src/wgi_libfcgi_input_stream.e b/library/server/ewsgi/connectors/libfcgi/src/wgi_libfcgi_input_stream.e index 3ae08d2b..cdb4d1c3 100644 --- a/library/server/ewsgi/connectors/libfcgi/src/wgi_libfcgi_input_stream.e +++ b/library/server/ewsgi/connectors/libfcgi/src/wgi_libfcgi_input_stream.e @@ -75,6 +75,7 @@ feature -- Access last_string: STRING -- Last string read + -- last_character: CHARACTER_8 -- Last item read diff --git a/library/server/ewsgi/connectors/nino/license.lic b/library/server/ewsgi/connectors/nino/license.lic index cf2d1ed9..d4d72876 100644 --- a/library/server/ewsgi/connectors/nino/license.lic +++ b/library/server/ewsgi/connectors/nino/license.lic @@ -1,5 +1,5 @@ ${NOTE_KEYWORD} - copyright: "2011-${YEAR}, Eiffel Software and others" + copyright: "2011-${YEAR}, Jocelyn Fiat, Javier Velilla, 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/ewsgi/connectors/nino/src/wgi_nino_input_stream.e b/library/server/ewsgi/connectors/nino/src/wgi_nino_input_stream.e index d11d2f7c..55c83afe 100644 --- a/library/server/ewsgi/connectors/nino/src/wgi_nino_input_stream.e +++ b/library/server/ewsgi/connectors/nino/src/wgi_nino_input_stream.e @@ -36,21 +36,27 @@ feature -- Input read_character -- Read the next character in input stream. -- Make the result available in `last_character'. + local + src: like source do - if source.socket_ok then - source.read_character - last_character := source.last_character + src := source + if src.socket_ok then + src.read_character + last_character := src.last_character else last_character := '%U' end end read_string (nb: INTEGER) + local + src: like source do + src := source last_string.wipe_out - if source.socket_ok then - source.read_stream_thread_aware (nb) - last_string.append_string (source.last_string) + if src.socket_ok then + src.read_stream_thread_aware (nb) + last_string.append_string (src.last_string) end end @@ -58,7 +64,7 @@ feature -- Access last_string: STRING_8 -- Last string read - -- (Note: this query always return the same object. + -- (Note: this query *might* return the same object. -- Therefore a clone should be used if the result -- is to be kept beyond the next call to this feature. -- However `last_string' is not shared between input objects.) @@ -81,7 +87,7 @@ feature -- Status report end ;note - copyright: "2011-2012, 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 diff --git a/library/server/ewsgi/license.lic b/library/server/ewsgi/license.lic index cf2d1ed9..d4d72876 100644 --- a/library/server/ewsgi/license.lic +++ b/library/server/ewsgi/license.lic @@ -1,5 +1,5 @@ ${NOTE_KEYWORD} - copyright: "2011-${YEAR}, Eiffel Software and others" + copyright: "2011-${YEAR}, Jocelyn Fiat, Javier Velilla, 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/ewsgi/specification/connector/wgi_connector.e b/library/server/ewsgi/specification/connector/wgi_connector.e index 1249a45a..07614609 100644 --- a/library/server/ewsgi/specification/connector/wgi_connector.e +++ b/library/server/ewsgi/specification/connector/wgi_connector.e @@ -20,7 +20,7 @@ feature -- Access 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 diff --git a/library/server/ewsgi/specification/request/wgi_meta_names.e b/library/server/ewsgi/specification/request/wgi_meta_names.e index 41e4026d..8fe13fa9 100644 --- a/library/server/ewsgi/specification/request/wgi_meta_names.e +++ b/library/server/ewsgi/specification/request/wgi_meta_names.e @@ -79,7 +79,7 @@ feature -- Extra names orig_path_info: STRING = "ORIG_PATH_INFO" note - copyright: "2011-2012, 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 diff --git a/library/server/ewsgi/specification/request/wgi_request.e b/library/server/ewsgi/specification/request/wgi_request.e index 7929d318..1beecf6c 100644 --- a/library/server/ewsgi/specification/request/wgi_request.e +++ b/library/server/ewsgi/specification/request/wgi_request.e @@ -626,7 +626,7 @@ invariant path_info_identical: path_info ~ meta_string_variable ({WGI_META_NAMES}.path_info) note - copyright: "2011-2012, 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 diff --git a/library/server/ewsgi/specification/response/wgi_response.e b/library/server/ewsgi/specification/response/wgi_response.e index ba00703a..4a03779c 100644 --- a/library/server/ewsgi/specification/response/wgi_response.e +++ b/library/server/ewsgi/specification/response/wgi_response.e @@ -124,7 +124,7 @@ feature -- Output operation end note - copyright: "2011-2012, 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 diff --git a/library/server/ewsgi/src/implementation/wgi_request_from_table.e b/library/server/ewsgi/src/implementation/wgi_request_from_table.e index f3926bd2..ab4adc51 100644 --- a/library/server/ewsgi/src/implementation/wgi_request_from_table.e +++ b/library/server/ewsgi/src/implementation/wgi_request_from_table.e @@ -411,7 +411,7 @@ invariant empty_string_unchanged: empty_string.is_empty note - copyright: "2011-2012, 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 diff --git a/library/server/ewsgi/src/implementation/wgi_response_stream.e b/library/server/ewsgi/src/implementation/wgi_response_stream.e index d2a2cee2..087f8c0a 100644 --- a/library/server/ewsgi/src/implementation/wgi_response_stream.e +++ b/library/server/ewsgi/src/implementation/wgi_response_stream.e @@ -133,7 +133,7 @@ feature {NONE} -- Implementation: Access -- Server output channel ;note - copyright: "2011-2012, 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 diff --git a/library/server/ewsgi/src/wgi_agent_service.e b/library/server/ewsgi/src/wgi_agent_service.e index 3abdbeb0..579e5bcf 100644 --- a/library/server/ewsgi/src/wgi_agent_service.e +++ b/library/server/ewsgi/src/wgi_agent_service.e @@ -36,7 +36,7 @@ invariant callback_attached: callback /= Void 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 diff --git a/library/server/ewsgi/src/wgi_chunked_input_stream.e b/library/server/ewsgi/src/wgi_chunked_input_stream.e index 90db6692..ab21d4f9 100644 --- a/library/server/ewsgi/src/wgi_chunked_input_stream.e +++ b/library/server/ewsgi/src/wgi_chunked_input_stream.e @@ -198,7 +198,7 @@ feature {NONE} -- Implementation -- Input Stream ;note - copyright: "2011-2012, 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 diff --git a/library/server/ewsgi/src/wgi_input_stream.e b/library/server/ewsgi/src/wgi_input_stream.e index 91a2a988..2e5cf2ac 100644 --- a/library/server/ewsgi/src/wgi_input_stream.e +++ b/library/server/ewsgi/src/wgi_input_stream.e @@ -15,16 +15,16 @@ feature -- Input read_character -- Read the next character in input stream. - -- Make the result available in `last_character'. + -- Make the result available in `last_character' require is_open_read: is_open_read not_end_of_input: not end_of_input deferred - ensure - same_last_string_reference: last_string = old last_string end read_string (nb: INTEGER) + -- Read the next `nb' characters and + -- make the string result available in `last_string' require is_open_read: is_open_read not_end_of_input: not end_of_input @@ -33,7 +33,6 @@ feature -- Input ensure last_string_count_small_enough: not end_of_input implies last_string.count <= nb character_read: not end_of_input implies last_string.count > 0 - same_last_string_reference: last_string = old last_string end read_to_string (a_string: STRING; pos, nb: INTEGER): INTEGER @@ -74,14 +73,14 @@ feature -- Input nb_char_read_large_enough: Result >= 0 nb_char_read_small_enough: Result <= nb character_read: not end_of_input implies Result > 0 - same_last_string_reference: last_string = old last_string end feature -- Access last_string: STRING_8 - -- Last string read - -- (Note: this query always return the same object. + -- Last string read. + -- + -- Note: this query *might* return the same object. -- Therefore a clone should be used if the result -- is to be kept beyond the next call to this feature. -- However `last_string' is not shared between file objects.) @@ -94,7 +93,7 @@ feature -- Access end last_character: CHARACTER_8 - -- Last item read + -- Last item read. require is_open_read: is_open_read not_end_of_input: not end_of_input @@ -116,7 +115,7 @@ feature -- Status report 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 diff --git a/library/server/ewsgi/src/wgi_output_stream.e b/library/server/ewsgi/src/wgi_output_stream.e index 7620e4e2..bfa74b09 100644 --- a/library/server/ewsgi/src/wgi_output_stream.e +++ b/library/server/ewsgi/src/wgi_output_stream.e @@ -81,7 +81,7 @@ feature -- Basic operations 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 diff --git a/library/server/ewsgi/src/wgi_service.e b/library/server/ewsgi/src/wgi_service.e index fe81383d..910bbc42 100644 --- a/library/server/ewsgi/src/wgi_service.e +++ b/library/server/ewsgi/src/wgi_service.e @@ -26,7 +26,7 @@ feature {WGI_CONNECTOR} -- Execution end note - copyright: "2011-2012, 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 diff --git a/library/server/request/router/license.lic b/library/server/request/router/license.lic index cf2d1ed9..d4d72876 100644 --- a/library/server/request/router/license.lic +++ b/library/server/request/router/license.lic @@ -1,5 +1,5 @@ ${NOTE_KEYWORD} - copyright: "2011-${YEAR}, Eiffel Software and others" + copyright: "2011-${YEAR}, Jocelyn Fiat, Javier Velilla, 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/wsf/default/cgi/default_service_launcher.e b/library/server/wsf/default/cgi/wsf_default_service_launcher.e similarity index 91% rename from library/server/wsf/default/cgi/default_service_launcher.e rename to library/server/wsf/default/cgi/wsf_default_service_launcher.e index d7f86a0b..f32fe160 100644 --- a/library/server/wsf/default/cgi/default_service_launcher.e +++ b/library/server/wsf/default/cgi/wsf_default_service_launcher.e @@ -6,7 +6,7 @@ note How-to: - s: DEFAULT_SERVICE_LAUNCHER + s: WSF_DEFAULT_SERVICE_LAUNCHER create s.make_and_launch (agent execute) execute (req: WSF_REQUEST; res: WSF_RESPONSE) @@ -18,10 +18,10 @@ note revision: "$Revision$" class - DEFAULT_SERVICE_LAUNCHER + WSF_DEFAULT_SERVICE_LAUNCHER inherit - DEFAULT_SERVICE_LAUNCHER_I + WSF_DEFAULT_SERVICE_LAUNCHER_I create make, diff --git a/library/server/wsf/default/libfcgi/default_service_launcher.e b/library/server/wsf/default/libfcgi/wsf_default_service_launcher.e similarity index 91% rename from library/server/wsf/default/libfcgi/default_service_launcher.e rename to library/server/wsf/default/libfcgi/wsf_default_service_launcher.e index ffbe17e4..e3b3b40a 100644 --- a/library/server/wsf/default/libfcgi/default_service_launcher.e +++ b/library/server/wsf/default/libfcgi/wsf_default_service_launcher.e @@ -6,7 +6,7 @@ note How-to: - s: DEFAULT_SERVICE_LAUNCHER + s: WSF_DEFAULT_SERVICE_LAUNCHER create s.make_and_launch (agent execute) execute (req: WSF_REQUEST; res: WSF_RESPONSE) @@ -18,10 +18,10 @@ note revision: "$Revision$" class - DEFAULT_SERVICE_LAUNCHER + WSF_DEFAULT_SERVICE_LAUNCHER inherit - DEFAULT_SERVICE_LAUNCHER_I + WSF_DEFAULT_SERVICE_LAUNCHER_I create make, diff --git a/library/server/wsf/default/nino/default_service_launcher.e b/library/server/wsf/default/nino/wsf_default_service_launcher.e similarity index 96% rename from library/server/wsf/default/nino/default_service_launcher.e rename to library/server/wsf/default/nino/wsf_default_service_launcher.e index 252f84a7..3aee46e9 100644 --- a/library/server/wsf/default/nino/default_service_launcher.e +++ b/library/server/wsf/default/nino/wsf_default_service_launcher.e @@ -11,16 +11,16 @@ note verbose: to display verbose output, useful for Nino force_single_threaded: use only one thread, useful for Nino - check DEFAULT_SERVICE_LAUNCHER_I for more documentation + check WSF_DEFAULT_SERVICE_LAUNCHER_I for more documentation ]" date: "$Date$" revision: "$Revision$" class - DEFAULT_SERVICE_LAUNCHER + WSF_DEFAULT_SERVICE_LAUNCHER inherit - DEFAULT_SERVICE_LAUNCHER_I + WSF_DEFAULT_SERVICE_LAUNCHER_I redefine launchable end diff --git a/library/server/wsf/license.lic b/library/server/wsf/license.lic new file mode 100644 index 00000000..d4d72876 --- /dev/null +++ b/library/server/wsf/license.lic @@ -0,0 +1,10 @@ +${NOTE_KEYWORD} + copyright: "2011-${YEAR}, Jocelyn Fiat, Javier Velilla, 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 + ]" diff --git a/library/server/wsf/router/default/routed_service.e b/library/server/wsf/router/default/wsf_routed_service.e similarity index 71% rename from library/server/wsf/router/default/routed_service.e rename to library/server/wsf/router/default/wsf_routed_service.e index bbf289e1..b2634211 100644 --- a/library/server/wsf/router/default/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 diff --git a/library/server/wsf/router/misc/request_format_utility.e b/library/server/wsf/router/misc/wsf_format_utility.e similarity index 91% rename from library/server/wsf/router/misc/request_format_utility.e rename to library/server/wsf/router/misc/wsf_format_utility.e index ca0dd7ab..d3188c9f 100644 --- a/library/server/wsf/router/misc/request_format_utility.e +++ b/library/server/wsf/router/misc/wsf_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 diff --git a/library/server/wsf/router/misc/routed_service_helper.e b/library/server/wsf/router/misc/wsf_handler_helper.e similarity index 91% rename from library/server/wsf/router/misc/routed_service_helper.e rename to library/server/wsf/router/misc/wsf_handler_helper.e index c946f1a4..be88daff 100644 --- a/library/server/wsf/router/misc/routed_service_helper.e +++ b/library/server/wsf/router/misc/wsf_handler_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 diff --git a/library/server/wsf/router/misc/request_handler_routes_recorder.e b/library/server/wsf/router/misc/wsf_handler_routes_recorder.e similarity index 74% rename from library/server/wsf/router/misc/request_handler_routes_recorder.e rename to library/server/wsf/router/misc/wsf_handler_routes_recorder.e index 80e8be62..f61df0ec 100644 --- a/library/server/wsf/router/misc/request_handler_routes_recorder.e +++ b/library/server/wsf/router/misc/wsf_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 diff --git a/library/server/wsf/router/misc/request_resource_handler_helper.e b/library/server/wsf/router/misc/wsf_resource_handler_helper.e similarity index 98% rename from library/server/wsf/router/misc/request_resource_handler_helper.e rename to library/server/wsf/router/misc/wsf_resource_handler_helper.e index ed1edee1..2b5ef8a3 100644 --- a/library/server/wsf/router/misc/request_resource_handler_helper.e +++ b/library/server/wsf/router/misc/wsf_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 diff --git a/library/server/wsf/router/uri/default/uri_routed_service.e b/library/server/wsf/router/uri/default/wsf_uri_routed_service.e similarity index 60% rename from library/server/wsf/router/uri/default/uri_routed_service.e rename to library/server/wsf/router/uri/default/wsf_uri_routed_service.e index 69b9bf11..105421a6 100644 --- a/library/server/wsf/router/uri/default/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 diff --git a/library/server/wsf/router/uri/default/request_uri_router.e b/library/server/wsf/router/uri/default/wsf_uri_router.e similarity index 69% rename from library/server/wsf/router/uri/default/request_uri_router.e rename to library/server/wsf/router/uri/default/wsf_uri_router.e index 0cd35d9f..a9e5cbd6 100644 --- a/library/server/wsf/router/uri/default/request_uri_router.e +++ b/library/server/wsf/router/uri/default/wsf_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 diff --git a/library/server/wsf/router/uri/default/request_uri_routing_handler.e b/library/server/wsf/router/uri/default/wsf_uri_routing_handler.e similarity index 69% rename from library/server/wsf/router/uri/default/request_uri_routing_handler.e rename to library/server/wsf/router/uri/default/wsf_uri_routing_handler.e index 7492a92d..f0c107f2 100644 --- a/library/server/wsf/router/uri/default/request_uri_routing_handler.e +++ b/library/server/wsf/router/uri/default/wsf_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 diff --git a/library/server/wsf/router/uri/request_uri_handler_context.e b/library/server/wsf/router/uri/wsf_uri_handler_context.e similarity index 78% rename from library/server/wsf/router/uri/request_uri_handler_context.e rename to library/server/wsf/router/uri/wsf_uri_handler_context.e index ec7077c8..c4ec29ec 100644 --- a/library/server/wsf/router/uri/request_uri_handler_context.e +++ b/library/server/wsf/router/uri/wsf_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 diff --git a/library/server/wsf/router/uri/request_uri_router_i.e b/library/server/wsf/router/uri/wsf_uri_router_i.e similarity index 95% rename from library/server/wsf/router/uri/request_uri_router_i.e rename to library/server/wsf/router/uri/wsf_uri_router_i.e index 7ba1c3bf..8bcf4eb1 100644 --- a/library/server/wsf/router/uri/request_uri_router_i.e +++ b/library/server/wsf/router/uri/wsf_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 diff --git a/library/server/wsf/router/uri/request_uri_routing_handler_i.e b/library/server/wsf/router/uri/wsf_uri_routing_handler_i.e similarity index 61% rename from library/server/wsf/router/uri/request_uri_routing_handler_i.e rename to library/server/wsf/router/uri/wsf_uri_routing_handler_i.e index 9a05d72e..180561a8 100644 --- a/library/server/wsf/router/uri/request_uri_routing_handler_i.e +++ b/library/server/wsf/router/uri/wsf_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 diff --git a/library/server/wsf/router/uri_template/default/uri_template_routed_service.e b/library/server/wsf/router/uri_template/default/wsf_uri_template_routed_service.e similarity index 66% rename from library/server/wsf/router/uri_template/default/uri_template_routed_service.e rename to library/server/wsf/router/uri_template/default/wsf_uri_template_routed_service.e index 1307d77b..bfc06ec3 100644 --- a/library/server/wsf/router/uri_template/default/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 diff --git a/library/server/wsf/router/uri_template/default/request_uri_template_router.e b/library/server/wsf/router/uri_template/default/wsf_uri_template_router.e similarity index 66% rename from library/server/wsf/router/uri_template/default/request_uri_template_router.e rename to library/server/wsf/router/uri_template/default/wsf_uri_template_router.e index b6718ca7..e9ad2f06 100644 --- a/library/server/wsf/router/uri_template/default/request_uri_template_router.e +++ b/library/server/wsf/router/uri_template/default/wsf_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 diff --git a/library/server/wsf/router/uri_template/default/request_uri_template_routing_handler.e b/library/server/wsf/router/uri_template/default/wsf_uri_template_routing_handler.e similarity index 66% rename from library/server/wsf/router/uri_template/default/request_uri_template_routing_handler.e rename to library/server/wsf/router/uri_template/default/wsf_uri_template_routing_handler.e index 2e4a5aa4..2606c521 100644 --- a/library/server/wsf/router/uri_template/default/request_uri_template_routing_handler.e +++ b/library/server/wsf/router/uri_template/default/wsf_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 diff --git a/library/server/wsf/router/uri_template/request_uri_template_handler_context.e b/library/server/wsf/router/uri_template/wsf_uri_template_handler_context.e similarity index 85% rename from library/server/wsf/router/uri_template/request_uri_template_handler_context.e rename to library/server/wsf/router/uri_template/wsf_uri_template_handler_context.e index 835b1a85..aba09392 100644 --- a/library/server/wsf/router/uri_template/request_uri_template_handler_context.e +++ b/library/server/wsf/router/uri_template/wsf_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 diff --git a/library/server/wsf/router/uri_template/request_uri_template_router_i.e b/library/server/wsf/router/uri_template/wsf_uri_template_router_i.e similarity index 93% rename from library/server/wsf/router/uri_template/request_uri_template_router_i.e rename to library/server/wsf/router/uri_template/wsf_uri_template_router_i.e index 261c4194..b76fbbb0 100644 --- a/library/server/wsf/router/uri_template/request_uri_template_router_i.e +++ b/library/server/wsf/router/uri_template/wsf_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 diff --git a/library/server/wsf/router/uri_template/request_uri_template_routing_handler_i.e b/library/server/wsf/router/uri_template/wsf_uri_template_routing_handler_i.e similarity index 68% rename from library/server/wsf/router/uri_template/request_uri_template_routing_handler_i.e rename to library/server/wsf/router/uri_template/wsf_uri_template_routing_handler_i.e index 02764a68..6f8396d7 100644 --- a/library/server/wsf/router/uri_template/request_uri_template_routing_handler_i.e +++ b/library/server/wsf/router/uri_template/wsf_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 diff --git a/library/server/wsf/router/request_agent_handler.e b/library/server/wsf/router/wsf_agent_handler.e similarity index 77% rename from library/server/wsf/router/request_agent_handler.e rename to library/server/wsf/router/wsf_agent_handler.e index 87365d7e..c300c65d 100644 --- a/library/server/wsf/router/request_agent_handler.e +++ b/library/server/wsf/router/wsf_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 diff --git a/library/server/wsf/router/request_file_system_handler.e b/library/server/wsf/router/wsf_file_system_handler.e similarity index 98% rename from library/server/wsf/router/request_file_system_handler.e rename to library/server/wsf/router/wsf_file_system_handler.e index b9002556..88b9ee72 100644 --- a/library/server/wsf/router/request_file_system_handler.e +++ b/library/server/wsf/router/wsf_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 diff --git a/library/server/wsf/router/request_handler.e b/library/server/wsf/router/wsf_handler.e similarity index 79% rename from library/server/wsf/router/request_handler.e rename to library/server/wsf/router/wsf_handler.e index e3cc7fa2..2251adb7 100644 --- a/library/server/wsf/router/request_handler.e +++ b/library/server/wsf/router/wsf_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 diff --git a/library/server/wsf/router/request_handler_context.e b/library/server/wsf/router/wsf_handler_context.e similarity index 97% rename from library/server/wsf/router/request_handler_context.e rename to library/server/wsf/router/wsf_handler_context.e index 82799173..044ac895 100644 --- a/library/server/wsf/router/request_handler_context.e +++ b/library/server/wsf/router/wsf_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 diff --git a/library/server/wsf/router/routed_service_i.e b/library/server/wsf/router/wsf_routed_service_i.e similarity index 80% rename from library/server/wsf/router/routed_service_i.e rename to library/server/wsf/router/wsf_routed_service_i.e index 55daeaf7..7170cd04 100644 --- a/library/server/wsf/router/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 diff --git a/library/server/wsf/router/request_router.e b/library/server/wsf/router/wsf_router.e similarity index 94% rename from library/server/wsf/router/request_router.e rename to library/server/wsf/router/wsf_router.e index 7ce4fa09..4da20d2b 100644 --- a/library/server/wsf/router/request_router.e +++ b/library/server/wsf/router/wsf_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 diff --git a/library/server/wsf/router/request_routing_handler.e b/library/server/wsf/router/wsf_routing_handler.e similarity index 89% rename from library/server/wsf/router/request_routing_handler.e rename to library/server/wsf/router/wsf_routing_handler.e index 4cac847c..919d2671 100644 --- a/library/server/wsf/router/request_routing_handler.e +++ b/library/server/wsf/router/wsf_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 diff --git a/library/server/wsf/src/cgi_meta_names.e b/library/server/wsf/src/cgi_meta_names.e deleted file mode 100644 index 2d4621a7..00000000 --- a/library/server/wsf/src/cgi_meta_names.e +++ /dev/null @@ -1,13 +0,0 @@ -note - description: "Summary description for {WSF_META_NAMES}." - author: "" - date: "$Date$" - revision: "$Revision$" - -class - CGI_META_NAMES - -inherit - WGI_META_NAMES - -end diff --git a/library/server/wsf/src/default/default_service_launcher_i.e b/library/server/wsf/src/default/wsf_default_service_launcher_i.e similarity index 95% rename from library/server/wsf/src/default/default_service_launcher_i.e rename to library/server/wsf/src/default/wsf_default_service_launcher_i.e index ab5c5418..0345b003 100644 --- a/library/server/wsf/src/default/default_service_launcher_i.e +++ b/library/server/wsf/src/default/wsf_default_service_launcher_i.e @@ -4,7 +4,7 @@ note How-to: - s: DEFAULT_SERVICE_LAUNCHER + s: WSF_DEFAULT_SERVICE_LAUNCHER create s.make_and_launch (agent execute) execute (req: WSF_REQUEST; res: WSF_RESPONSE) @@ -29,7 +29,7 @@ note revision: "$Revision$" deferred class - DEFAULT_SERVICE_LAUNCHER_I + WSF_DEFAULT_SERVICE_LAUNCHER_I inherit WSF_SERVICE @@ -126,7 +126,7 @@ invariant connector_attached: connector /= Void 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 diff --git a/library/server/wsf/src/request/value/visitor/wsf_value_agent_iterator.e b/library/server/wsf/src/request/value/visitor/wsf_value_agent_iterator.e index be887be7..fdb29f84 100644 --- a/library/server/wsf/src/request/value/visitor/wsf_value_agent_iterator.e +++ b/library/server/wsf/src/request/value/visitor/wsf_value_agent_iterator.e @@ -56,7 +56,7 @@ feature -- Visitor 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 diff --git a/library/server/wsf/src/request/value/visitor/wsf_value_iterator.e b/library/server/wsf/src/request/value/visitor/wsf_value_iterator.e index d66fad73..61d8e87b 100644 --- a/library/server/wsf/src/request/value/visitor/wsf_value_iterator.e +++ b/library/server/wsf/src/request/value/visitor/wsf_value_iterator.e @@ -47,7 +47,7 @@ feature -- Visitor 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 diff --git a/library/server/wsf/src/request/value/visitor/wsf_value_null_visitor.e b/library/server/wsf/src/request/value/visitor/wsf_value_null_visitor.e index 6e801e23..1ed19561 100644 --- a/library/server/wsf/src/request/value/visitor/wsf_value_null_visitor.e +++ b/library/server/wsf/src/request/value/visitor/wsf_value_null_visitor.e @@ -34,7 +34,7 @@ feature -- Visitor 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 diff --git a/library/server/wsf/src/request/value/visitor/wsf_value_visitor.e b/library/server/wsf/src/request/value/visitor/wsf_value_visitor.e index 58ad3fbc..9404e3bb 100644 --- a/library/server/wsf/src/request/value/visitor/wsf_value_visitor.e +++ b/library/server/wsf/src/request/value/visitor/wsf_value_visitor.e @@ -48,7 +48,7 @@ feature -- Visitor 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 diff --git a/library/server/wsf/src/request/value/wsf_any.e b/library/server/wsf/src/request/value/wsf_any.e index 92664d21..a5f22d8c 100644 --- a/library/server/wsf/src/request/value/wsf_any.e +++ b/library/server/wsf/src/request/value/wsf_any.e @@ -65,7 +65,7 @@ feature -- Visitor 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 diff --git a/library/server/wsf/src/request/value/wsf_multiple_string.e b/library/server/wsf/src/request/value/wsf_multiple_string.e index 8ee57398..8f46af03 100644 --- a/library/server/wsf/src/request/value/wsf_multiple_string.e +++ b/library/server/wsf/src/request/value/wsf_multiple_string.e @@ -153,7 +153,7 @@ invariant string_values_not_empty: string_values.count >= 1 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 diff --git a/library/server/wsf/src/request/value/wsf_string.e b/library/server/wsf/src/request/value/wsf_string.e index a0abe2c3..cd945d66 100644 --- a/library/server/wsf/src/request/value/wsf_string.e +++ b/library/server/wsf/src/request/value/wsf_string.e @@ -92,7 +92,7 @@ feature -- Visitor 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 diff --git a/library/server/wsf/src/request/value/wsf_table.e b/library/server/wsf/src/request/value/wsf_table.e index 5533415f..ee531144 100644 --- a/library/server/wsf/src/request/value/wsf_table.e +++ b/library/server/wsf/src/request/value/wsf_table.e @@ -150,4 +150,14 @@ feature -- Visitor vis.process_table (Current) end +note + 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 + 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 diff --git a/library/server/wsf/src/request/value/wsf_uploaded_file.e b/library/server/wsf/src/request/value/wsf_uploaded_file.e index 43b21729..84ac6fc6 100644 --- a/library/server/wsf/src/request/value/wsf_uploaded_file.e +++ b/library/server/wsf/src/request/value/wsf_uploaded_file.e @@ -214,4 +214,14 @@ feature -- Element change tmp_basename := n end +note + 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 + 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 diff --git a/library/server/wsf/src/request/wsf_value.e b/library/server/wsf/src/request/wsf_value.e index 7296f8fd..e25cf544 100644 --- a/library/server/wsf/src/request/wsf_value.e +++ b/library/server/wsf/src/request/wsf_value.e @@ -101,7 +101,7 @@ feature -- Visitor 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 diff --git a/library/server/wsf/src/response/wsf_download_response.e b/library/server/wsf/src/response/wsf_download_response.e index 7cccb074..5879a06f 100644 --- a/library/server/wsf/src/response/wsf_download_response.e +++ b/library/server/wsf/src/response/wsf_download_response.e @@ -207,4 +207,14 @@ feature {NONE} -- Implementation: output f.close end +note + 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 + 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 diff --git a/library/server/wsf/src/response/wsf_file_response.e b/library/server/wsf/src/response/wsf_file_response.e index 102391e9..f01e7cbb 100644 --- a/library/server/wsf/src/response/wsf_file_response.e +++ b/library/server/wsf/src/response/wsf_file_response.e @@ -248,4 +248,14 @@ feature {NONE} -- Implementation: output f.close end +note + 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 + 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 diff --git a/library/server/wsf/src/response/wsf_force_download_response.e b/library/server/wsf/src/response/wsf_force_download_response.e index 150de390..6f9609fe 100644 --- a/library/server/wsf/src/response/wsf_force_download_response.e +++ b/library/server/wsf/src/response/wsf_force_download_response.e @@ -23,4 +23,14 @@ feature {NONE} -- Implementation content_type := {HTTP_MIME_TYPES}.application_force_download end +note + 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 + 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 diff --git a/library/server/wsf/src/response/wsf_html_page_response.e b/library/server/wsf/src/response/wsf_html_page_response.e index 07be5263..0f7de3a1 100644 --- a/library/server/wsf/src/response/wsf_html_page_response.e +++ b/library/server/wsf/src/response/wsf_html_page_response.e @@ -168,4 +168,14 @@ feature -- Output res.put_string (s) end +note + 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 + 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 diff --git a/library/server/wsf/src/response/wsf_page_response.e b/library/server/wsf/src/response/wsf_page_response.e index efd8cbe6..a6938ca6 100644 --- a/library/server/wsf/src/response/wsf_page_response.e +++ b/library/server/wsf/src/response/wsf_page_response.e @@ -102,4 +102,14 @@ feature -- Output end end +note + 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 + 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 diff --git a/library/server/wsf/src/support/wsf_error.e b/library/server/wsf/src/support/wsf_error.e index d4f9eb47..6551a03b 100644 --- a/library/server/wsf/src/support/wsf_error.e +++ b/library/server/wsf/src/support/wsf_error.e @@ -54,7 +54,7 @@ feature -- Visitor 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 diff --git a/library/server/wsf/src/support/wsf_header.e b/library/server/wsf/src/support/wsf_header.e index 6ad59a0d..d7336deb 100644 --- a/library/server/wsf/src/support/wsf_header.e +++ b/library/server/wsf/src/support/wsf_header.e @@ -33,7 +33,7 @@ create 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 diff --git a/library/server/wsf/src/support/wsf_mime_handler_helper.e b/library/server/wsf/src/support/wsf_mime_handler_helper.e index bc057d4b..ae5e146e 100644 --- a/library/server/wsf/src/support/wsf_mime_handler_helper.e +++ b/library/server/wsf/src/support/wsf_mime_handler_helper.e @@ -160,4 +160,14 @@ feature {NONE} -- Implementation create {UTF8_URL_ENCODER} Result end +note + 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 + 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 diff --git a/library/server/wsf/src/wsf_application_x_www_form_urlencoded_handler.e b/library/server/wsf/src/wsf_application_x_www_form_urlencoded_handler.e index 308debde..d8d9bcb8 100644 --- a/library/server/wsf/src/wsf_application_x_www_form_urlencoded_handler.e +++ b/library/server/wsf/src/wsf_application_x_www_form_urlencoded_handler.e @@ -61,4 +61,14 @@ feature -- Execution end end +note + 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 + 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 diff --git a/library/server/wsf/src/wsf_meta_names.e b/library/server/wsf/src/wsf_meta_names.e new file mode 100644 index 00000000..cdaa3d0b --- /dev/null +++ b/library/server/wsf/src/wsf_meta_names.e @@ -0,0 +1,22 @@ +note + description: "Summary description for {WSF_META_NAMES}." + date: "$Date$" + revision: "$Revision$" + +class + WSF_META_NAMES + +inherit + WGI_META_NAMES + +note + 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 + 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 diff --git a/library/server/wsf/src/wsf_mime_handler.e b/library/server/wsf/src/wsf_mime_handler.e index 8b94630a..c1125f4a 100644 --- a/library/server/wsf/src/wsf_mime_handler.e +++ b/library/server/wsf/src/wsf_mime_handler.e @@ -24,4 +24,14 @@ feature -- Execution deferred end +note + 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 + 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 diff --git a/library/server/wsf/src/wsf_multipart_form_data_handler.e b/library/server/wsf/src/wsf_multipart_form_data_handler.e index fc20b675..21a18dac 100644 --- a/library/server/wsf/src/wsf_multipart_form_data_handler.e +++ b/library/server/wsf/src/wsf_multipart_form_data_handler.e @@ -246,4 +246,14 @@ feature {NONE} -- Implementation: Form analyzer -- Default content type +note + 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 + 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 diff --git a/library/server/wsf/src/wsf_request.e b/library/server/wsf/src/wsf_request.e index 3684d9a2..b36ed375 100644 --- a/library/server/wsf/src/wsf_request.e +++ b/library/server/wsf/src/wsf_request.e @@ -87,8 +87,8 @@ feature {NONE} -- Initialization end --| Here one can set its own environment entries if needed - if meta_variable ({CGI_META_NAMES}.request_time) = Void then - set_meta_string_variable ({CGI_META_NAMES}.request_time, date_time_utilities.unix_time_stamp (Void).out) + if meta_variable ({WSF_META_NAMES}.request_time) = Void then + set_meta_string_variable ({WSF_META_NAMES}.request_time, date_time_utilities.unix_time_stamp (Void).out) end end @@ -834,7 +834,7 @@ feature -- Extra CGI environment variables -- Request time (UTC) do if - attached {WSF_STRING} meta_variable ({CGI_META_NAMES}.request_time) as t and then + attached {WSF_STRING} meta_variable ({WSF_META_NAMES}.request_time) as t and then t.string.is_integer_64 then Result := date_time_utilities.unix_time_stamp_to_date_time (t.string.to_integer_64) @@ -865,7 +865,7 @@ feature {NONE} -- Cookies do l_cookies := internal_cookies_table if l_cookies = Void then - if attached {WSF_STRING} meta_variable ({CGI_META_NAMES}.http_cookie) as val then + if attached {WSF_STRING} meta_variable ({WSF_META_NAMES}.http_cookie) as val then s := val.string create l_cookies.make (5) l_cookies.compare_objects @@ -1570,4 +1570,14 @@ invariant empty_string_unchanged: empty_string.is_empty +note + 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 + 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 diff --git a/library/server/wsf/src/wsf_response.e b/library/server/wsf/src/wsf_response.e index be214460..320ab09c 100644 --- a/library/server/wsf/src/wsf_response.e +++ b/library/server/wsf/src/wsf_response.e @@ -249,7 +249,7 @@ feature -- Redirect 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 diff --git a/library/server/wsf/src/wsf_response_message.e b/library/server/wsf/src/wsf_response_message.e index 4e65eebf..f2f600d2 100644 --- a/library/server/wsf/src/wsf_response_message.e +++ b/library/server/wsf/src/wsf_response_message.e @@ -13,4 +13,14 @@ feature -- Output deferred end +note + 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 + 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 diff --git a/library/server/wsf/src/wsf_service.e b/library/server/wsf/src/wsf_service.e index 2a48df75..9b6cb67f 100644 --- a/library/server/wsf/src/wsf_service.e +++ b/library/server/wsf/src/wsf_service.e @@ -46,4 +46,14 @@ feature {WGI_CONNECTOR} -- WGI Execution end end +note + 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 + 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 diff --git a/library/server/wsf/tests/echo/src/echo_server.e b/library/server/wsf/tests/echo/src/echo_server.e index 3b42c80f..5bd2d79c 100644 --- a/library/server/wsf/tests/echo/src/echo_server.e +++ b/library/server/wsf/tests/echo/src/echo_server.e @@ -18,7 +18,7 @@ feature {NONE} -- Initialization make -- Initialize `Current'. local - launcher: DEFAULT_SERVICE_LAUNCHER + launcher: WSF_DEFAULT_SERVICE_LAUNCHER do create launcher.make_and_launch_with_options (agent execute, <<["port", 9091]>>) end diff --git a/tests/dev/src/hello_routed_world.e b/tests/dev/src/hello_routed_world.e index 3a33e1fd..a9ee1600 100644 --- a/tests/dev/src/hello_routed_world.e +++ b/tests/dev/src/hello_routed_world.e @@ -8,9 +8,9 @@ class HELLO_ROUTED_WORLD inherit - URI_TEMPLATE_ROUTED_SERVICE + WSF_URI_TEMPLATE_ROUTED_SERVICE - ROUTED_SERVICE_HELPER + WSF_HANDLER_HELPER create make @@ -19,7 +19,7 @@ feature {NONE} -- Initialization make local - s: DEFAULT_SERVICE_LAUNCHER + s: WSF_DEFAULT_SERVICE_LAUNCHER do initialize_router create s.make_and_launch_with_options (agent execute, <<["port", 8099]>>) @@ -32,9 +32,9 @@ feature {NONE} -- Initialization setup_router local - ra: REQUEST_AGENT_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] - hello: REQUEST_URI_TEMPLATE_ROUTING_HANDLER - www: REQUEST_FILE_SYSTEM_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT] + ra: WSF_AGENT_HANDLER [WSF_URI_TEMPLATE_HANDLER_CONTEXT] + hello: WSF_URI_TEMPLATE_ROUTING_HANDLER + www: WSF_FILE_SYSTEM_HANDLER [WSF_URI_TEMPLATE_HANDLER_CONTEXT] do router.map_agent ("/refresh", agent execute_refresh) router.map_agent ("/home", agent execute_home) @@ -89,7 +89,7 @@ feature -- Execution res.redirect_now_with_content (l_url, "You are now being redirected to " + l_url, {HTTP_MIME_TYPES}.text_html) end - execute_refresh (ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) + execute_refresh (ctx: WSF_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) local h: HTTP_HEADER l_url: STRING @@ -145,7 +145,7 @@ feature -- Execution res.write_chunk (Void) end - execute_home (ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) + execute_home (ctx: WSF_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) local l_body: STRING_8 do @@ -170,7 +170,7 @@ feature -- Execution res.write_string (l_body) end - execute_hello (req: WSF_REQUEST; res: WSF_RESPONSE; a_name: detachable READABLE_STRING_32; ctx: REQUEST_HANDLER_CONTEXT) + execute_hello (req: WSF_REQUEST; res: WSF_RESPONSE; a_name: detachable READABLE_STRING_32; ctx: WSF_HANDLER_CONTEXT) local l_response_content_type: detachable STRING h: HTTP_HEADER @@ -209,33 +209,33 @@ feature -- Execution end end - handle_hello (ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) + handle_hello (ctx: WSF_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) do execute_hello (req, res, ctx.string_parameter ("name"), ctx) end - handle_anonymous_hello (ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) + handle_anonymous_hello (ctx: WSF_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) do execute_hello (req, res, ctx.string_parameter ("name"), ctx) end - handle_method_any (ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) + handle_method_any (ctx: WSF_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) do execute_hello (req, res, req.request_method, ctx) end - handle_method_get (ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) + handle_method_get (ctx: WSF_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) do execute_hello (req, res, "GET", ctx) end - handle_method_post (ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) + handle_method_post (ctx: WSF_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) do execute_hello (req, res, "POST", ctx) end - handle_method_get_or_post (ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) + handle_method_get_or_post (ctx: WSF_URI_TEMPLATE_HANDLER_CONTEXT; req: WSF_REQUEST; res: WSF_RESPONSE) do execute_hello (req, res, "GET or POST", ctx) end