From c20600f2815743bdd86dd320df2f90d3b25ff67a Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Thu, 25 Aug 2011 16:00:18 +0200 Subject: [PATCH] changed prefix GW_ into EWF_ for EiffelWebFramework use READABLE_STRING_GENERAL instead of just STRING --- .../src/framework/routed_application_helper.e | 2 +- .../src/hello_routed_world.e | 4 ++-- .../src/uri_template_match_result.e | 18 +++++++++--------- ...{gw_cgi_connector.e => ewf_cgi_connector.e} | 8 ++++---- ...i_input_stream.e => ewf_cgi_input_stream.e} | 2 +- ...output_stream.e => ewf_cgi_output_stream.e} | 2 +- ...cgi_connector.e => ewf_libfcgi_connector.e} | 8 ++++---- ...put_stream.e => ewf_libfcgi_input_stream.e} | 2 +- ...ut_stream.e => ewf_libfcgi_output_stream.e} | 4 ++-- ...w_nino_connector.e => ewf_nino_connector.e} | 10 +++++----- .../{gw_nino_handler.e => ewf_nino_handler.e} | 4 ++-- ..._input_stream.e => ewf_nino_input_stream.e} | 6 +++--- ...utput_stream.e => ewf_nino_output_stream.e} | 6 +++--- .../ewsgi/default/nino/nino_application.e | 2 +- ...ered_response.e => ewf_buffered_response.e} | 6 +++--- ...ory_response.e => ewf_in_memory_response.e} | 8 ++++---- ....e => ewf_in_memory_response_application.e} | 8 ++++---- .../src/request/ewsgi_request_from_table.e | 2 +- .../response/ewsgi_response_stream_buffer.e | 2 +- .../src/support/{gw_error.e => ewf_error.e} | 4 ++-- .../src/support/{gw_header.e => ewf_header.e} | 4 ++-- .../src/context/request_handler_context.e | 6 +++--- .../src/context/request_uri_handler_context.e | 4 ++-- .../request_uri_template_handler_context.e | 4 ++-- 24 files changed, 63 insertions(+), 63 deletions(-) rename library/server/ewsgi/connectors/cgi/src/{gw_cgi_connector.e => ewf_cgi_connector.e} (77%) rename library/server/ewsgi/connectors/cgi/src/{gw_cgi_input_stream.e => ewf_cgi_input_stream.e} (97%) rename library/server/ewsgi/connectors/cgi/src/{gw_cgi_output_stream.e => ewf_cgi_output_stream.e} (98%) rename library/server/ewsgi/connectors/libfcgi/src/{gw_libfcgi_connector.e => ewf_libfcgi_connector.e} (87%) rename library/server/ewsgi/connectors/libfcgi/src/{gw_libfcgi_input_stream.e => ewf_libfcgi_input_stream.e} (97%) rename library/server/ewsgi/connectors/libfcgi/src/{gw_libfcgi_output_stream.e => ewf_libfcgi_output_stream.e} (93%) rename library/server/ewsgi/connectors/nino/src/{gw_nino_connector.e => ewf_nino_connector.e} (83%) rename library/server/ewsgi/connectors/nino/src/{gw_nino_handler.e => ewf_nino_handler.e} (98%) rename library/server/ewsgi/connectors/nino/src/{gw_nino_input_stream.e => ewf_nino_input_stream.e} (88%) rename library/server/ewsgi/connectors/nino/src/{gw_nino_output_stream.e => ewf_nino_output_stream.e} (91%) rename library/server/ewsgi/src/extra/{gw_buffered_response.e => ewf_buffered_response.e} (97%) rename library/server/ewsgi/src/extra/in_memory/{gw_in_memory_response.e => ewf_in_memory_response.e} (95%) rename library/server/ewsgi/src/extra/in_memory/{gw_in_memory_response_application.e => ewf_in_memory_response_application.e} (86%) rename library/server/ewsgi/src/support/{gw_error.e => ewf_error.e} (94%) rename library/server/ewsgi/src/support/{gw_header.e => ewf_header.e} (99%) diff --git a/examples/hello_routed_world/src/framework/routed_application_helper.e b/examples/hello_routed_world/src/framework/routed_application_helper.e index a0430b11..7eeb38e6 100644 --- a/examples/hello_routed_world/src/framework/routed_application_helper.e +++ b/examples/hello_routed_world/src/framework/routed_application_helper.e @@ -21,7 +21,7 @@ feature -- Helper local s, uri_s: detachable STRING i, n: INTEGER - h: GW_HEADER + h: EWF_HEADER do create h.make h.put_status ({HTTP_STATUS_CODE}.unsupported_media_type) diff --git a/examples/hello_routed_world/src/hello_routed_world.e b/examples/hello_routed_world/src/hello_routed_world.e index 227f487f..48f3d2f1 100644 --- a/examples/hello_routed_world/src/hello_routed_world.e +++ b/examples/hello_routed_world/src/hello_routed_world.e @@ -53,7 +53,7 @@ feature -- Execution execute_default (req: EWSGI_REQUEST; res: EWSGI_RESPONSE_BUFFER) local - h: GW_HEADER + h: EWF_HEADER l_url: STRING e: EXECUTION_ENVIRONMENT n: INTEGER @@ -120,7 +120,7 @@ feature -- Execution local l_response_content_type: detachable STRING msg: STRING - h: GW_HEADER + h: EWF_HEADER content_type_supported: ARRAY [STRING] do if a_name /= Void then 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 5c2e4f59..c536a370 100644 --- a/library/protocol/uri_template/src/uri_template_match_result.e +++ b/library/protocol/uri_template/src/uri_template_match_result.e @@ -27,27 +27,27 @@ feature {NONE} -- Initialization feature -- Access - path_variables: HASH_TABLE [STRING, STRING] + path_variables: HASH_TABLE [STRING, READABLE_STRING_GENERAL] -- Variables being part of the path segments - query_variables: HASH_TABLE [STRING, STRING] + query_variables: HASH_TABLE [STRING, READABLE_STRING_GENERAL] -- Variables being part of the query segments (i.e: after the ?) feature -- Query - path_variable (n: STRING): detachable STRING + path_variable (n: READABLE_STRING_GENERAL): detachable STRING -- Value related to query variable name `n' do Result := path_variables.item (n) end - query_variable (n: STRING): detachable STRING + query_variable (n: READABLE_STRING_GENERAL): detachable STRING -- Value related to path variable name `n' do Result := query_variables.item (n) end - variable (n: STRING): detachable STRING + variable (n: READABLE_STRING_GENERAL): detachable STRING -- Value related to variable name `n' do Result := query_variable (n) @@ -58,7 +58,7 @@ feature -- Query feature -- Query: url-decoded - url_decoded_query_variable (n: STRING): detachable STRING_32 + url_decoded_query_variable (n: READABLE_STRING_GENERAL): detachable STRING_32 -- Unencoded value related to variable name `n' do if attached query_variable (n) as v then @@ -66,15 +66,15 @@ feature -- Query: url-decoded end end - url_decoded_path_variable (n: STRING): detachable STRING_32 + url_decoded_path_variable (n: READABLE_STRING_GENERAL): detachable STRING_32 -- Unencoded value related to variable name `n' do if attached path_variable (n) as v then Result := url_decoded_string (v) end - end + end - url_decoded_variable (n: STRING): detachable STRING_32 + url_decoded_variable (n: READABLE_STRING_GENERAL): detachable STRING_32 -- Unencoded value related to variable name `n' do if attached variable (n) as v then diff --git a/library/server/ewsgi/connectors/cgi/src/gw_cgi_connector.e b/library/server/ewsgi/connectors/cgi/src/ewf_cgi_connector.e similarity index 77% rename from library/server/ewsgi/connectors/cgi/src/gw_cgi_connector.e rename to library/server/ewsgi/connectors/cgi/src/ewf_cgi_connector.e index 5e7993f3..e8150ead 100644 --- a/library/server/ewsgi/connectors/cgi/src/gw_cgi_connector.e +++ b/library/server/ewsgi/connectors/cgi/src/ewf_cgi_connector.e @@ -1,11 +1,11 @@ note - description: "Summary description for {GW_CGI_CONNECTOR}." + description: "Summary description for {EWF_CGI_CONNECTOR}." author: "" date: "$Date$" revision: "$Revision$" class - GW_CGI_CONNECTOR + EWF_CGI_CONNECTOR inherit EWSGI_CONNECTOR @@ -20,8 +20,8 @@ feature -- Execution req: EWSGI_REQUEST_FROM_TABLE res: EWSGI_RESPONSE_STREAM_BUFFER do - create req.make ((create {EXECUTION_ENVIRONMENT}).starting_environment_variables, create {GW_CGI_INPUT_STREAM}.make) - create res.make (create {GW_CGI_OUTPUT_STREAM}.make) + create req.make ((create {EXECUTION_ENVIRONMENT}).starting_environment_variables, create {EWF_CGI_INPUT_STREAM}.make) + create res.make (create {EWF_CGI_OUTPUT_STREAM}.make) application.process (req, res) end diff --git a/library/server/ewsgi/connectors/cgi/src/gw_cgi_input_stream.e b/library/server/ewsgi/connectors/cgi/src/ewf_cgi_input_stream.e similarity index 97% rename from library/server/ewsgi/connectors/cgi/src/gw_cgi_input_stream.e rename to library/server/ewsgi/connectors/cgi/src/ewf_cgi_input_stream.e index 0351cde3..415703e5 100644 --- a/library/server/ewsgi/connectors/cgi/src/gw_cgi_input_stream.e +++ b/library/server/ewsgi/connectors/cgi/src/ewf_cgi_input_stream.e @@ -6,7 +6,7 @@ note revision: "$Revision$" class - GW_CGI_INPUT_STREAM + EWF_CGI_INPUT_STREAM inherit EWSGI_INPUT_STREAM diff --git a/library/server/ewsgi/connectors/cgi/src/gw_cgi_output_stream.e b/library/server/ewsgi/connectors/cgi/src/ewf_cgi_output_stream.e similarity index 98% rename from library/server/ewsgi/connectors/cgi/src/gw_cgi_output_stream.e rename to library/server/ewsgi/connectors/cgi/src/ewf_cgi_output_stream.e index b506736f..6239e9e4 100644 --- a/library/server/ewsgi/connectors/cgi/src/gw_cgi_output_stream.e +++ b/library/server/ewsgi/connectors/cgi/src/ewf_cgi_output_stream.e @@ -6,7 +6,7 @@ note revision: "$Revision$" class - GW_CGI_OUTPUT_STREAM + EWF_CGI_OUTPUT_STREAM inherit EWSGI_OUTPUT_STREAM diff --git a/library/server/ewsgi/connectors/libfcgi/src/gw_libfcgi_connector.e b/library/server/ewsgi/connectors/libfcgi/src/ewf_libfcgi_connector.e similarity index 87% rename from library/server/ewsgi/connectors/libfcgi/src/gw_libfcgi_connector.e rename to library/server/ewsgi/connectors/libfcgi/src/ewf_libfcgi_connector.e index 4167ed8b..f58f5c72 100644 --- a/library/server/ewsgi/connectors/libfcgi/src/gw_libfcgi_connector.e +++ b/library/server/ewsgi/connectors/libfcgi/src/ewf_libfcgi_connector.e @@ -1,12 +1,12 @@ note - description: "Summary description for {GW_LIBFCGI_CONNECTOR}." + description: "Summary description for {EWF_LIBFCGI_CONNECTOR}." legal: "See notice at end of class." status: "See notice at end of class." date: "$Date$" revision: "$Revision$" class - GW_LIBFCGI_CONNECTOR + EWF_LIBFCGI_CONNECTOR inherit EWSGI_CONNECTOR @@ -22,8 +22,8 @@ feature {NONE} -- Initialization initialize do create fcgi.make - create {GW_LIBFCGI_INPUT_STREAM} input.make (fcgi) - create {GW_LIBFCGI_OUTPUT_STREAM} output.make (fcgi) + create {EWF_LIBFCGI_INPUT_STREAM} input.make (fcgi) + create {EWF_LIBFCGI_OUTPUT_STREAM} output.make (fcgi) end feature -- Server diff --git a/library/server/ewsgi/connectors/libfcgi/src/gw_libfcgi_input_stream.e b/library/server/ewsgi/connectors/libfcgi/src/ewf_libfcgi_input_stream.e similarity index 97% rename from library/server/ewsgi/connectors/libfcgi/src/gw_libfcgi_input_stream.e rename to library/server/ewsgi/connectors/libfcgi/src/ewf_libfcgi_input_stream.e index 918b28c6..75eec7ce 100644 --- a/library/server/ewsgi/connectors/libfcgi/src/gw_libfcgi_input_stream.e +++ b/library/server/ewsgi/connectors/libfcgi/src/ewf_libfcgi_input_stream.e @@ -6,7 +6,7 @@ note revision: "$Revision$" class - GW_LIBFCGI_INPUT_STREAM + EWF_LIBFCGI_INPUT_STREAM inherit EWSGI_INPUT_STREAM diff --git a/library/server/ewsgi/connectors/libfcgi/src/gw_libfcgi_output_stream.e b/library/server/ewsgi/connectors/libfcgi/src/ewf_libfcgi_output_stream.e similarity index 93% rename from library/server/ewsgi/connectors/libfcgi/src/gw_libfcgi_output_stream.e rename to library/server/ewsgi/connectors/libfcgi/src/ewf_libfcgi_output_stream.e index 2b9b4a0e..38d6c65a 100644 --- a/library/server/ewsgi/connectors/libfcgi/src/gw_libfcgi_output_stream.e +++ b/library/server/ewsgi/connectors/libfcgi/src/ewf_libfcgi_output_stream.e @@ -1,12 +1,12 @@ note - description: "Summary description for {GW_LIBFCGI_OUTPUT_STREAM}." + description: "Summary description for {EWF_LIBFCGI_OUTPUT_STREAM}." legal: "See notice at end of class." status: "See notice at end of class." date: "$Date$" revision: "$Revision$" class - GW_LIBFCGI_OUTPUT_STREAM + EWF_LIBFCGI_OUTPUT_STREAM inherit EWSGI_OUTPUT_STREAM diff --git a/library/server/ewsgi/connectors/nino/src/gw_nino_connector.e b/library/server/ewsgi/connectors/nino/src/ewf_nino_connector.e similarity index 83% rename from library/server/ewsgi/connectors/nino/src/gw_nino_connector.e rename to library/server/ewsgi/connectors/nino/src/ewf_nino_connector.e index bdb2ca0d..7d2a5218 100644 --- a/library/server/ewsgi/connectors/nino/src/gw_nino_connector.e +++ b/library/server/ewsgi/connectors/nino/src/ewf_nino_connector.e @@ -1,11 +1,11 @@ note - description: "Summary description for {GW_NINO_CONNECTOR}." + description: "Summary description for {EWF_NINO_CONNECTOR}." author: "" date: "$Date$" revision: "$Revision$" class - GW_NINO_CONNECTOR + EWF_NINO_CONNECTOR inherit EWSGI_CONNECTOR @@ -62,7 +62,7 @@ feature -- Server local l_http_handler : HTTP_HANDLER do - create {GW_NINO_HANDLER} l_http_handler.make_with_callback (server, "NINO_HANDLER", Current) + create {EWF_NINO_HANDLER} l_http_handler.make_with_callback (server, "NINO_HANDLER", Current) debug ("nino") if attached base as l_base then print ("Base=" + l_base + "%N") @@ -76,8 +76,8 @@ feature -- Server req: EWSGI_REQUEST_FROM_TABLE res: EWSGI_RESPONSE_STREAM_BUFFER do - create req.make (env, create {GW_NINO_INPUT_STREAM}.make (a_input)) - create res.make (create {GW_NINO_OUTPUT_STREAM}.make (a_output)) + create req.make (env, create {EWF_NINO_INPUT_STREAM}.make (a_input)) + create res.make (create {EWF_NINO_OUTPUT_STREAM}.make (a_output)) req.set_meta_parameter ("RAW_HEADER_DATA", a_headers_text) application.execute (req, res) end diff --git a/library/server/ewsgi/connectors/nino/src/gw_nino_handler.e b/library/server/ewsgi/connectors/nino/src/ewf_nino_handler.e similarity index 98% rename from library/server/ewsgi/connectors/nino/src/gw_nino_handler.e rename to library/server/ewsgi/connectors/nino/src/ewf_nino_handler.e index a230d76d..33bf992e 100644 --- a/library/server/ewsgi/connectors/nino/src/gw_nino_handler.e +++ b/library/server/ewsgi/connectors/nino/src/ewf_nino_handler.e @@ -5,7 +5,7 @@ note revision : "$Revision$" class - GW_NINO_HANDLER + EWF_NINO_HANDLER inherit HTTP_CONNECTION_HANDLER @@ -23,7 +23,7 @@ feature {NONE} -- Initialization callback := a_callback end - callback: GW_NINO_CONNECTOR + callback: EWF_NINO_CONNECTOR feature -- Access diff --git a/library/server/ewsgi/connectors/nino/src/gw_nino_input_stream.e b/library/server/ewsgi/connectors/nino/src/ewf_nino_input_stream.e similarity index 88% rename from library/server/ewsgi/connectors/nino/src/gw_nino_input_stream.e rename to library/server/ewsgi/connectors/nino/src/ewf_nino_input_stream.e index c44723f1..66d71062 100644 --- a/library/server/ewsgi/connectors/nino/src/gw_nino_input_stream.e +++ b/library/server/ewsgi/connectors/nino/src/ewf_nino_input_stream.e @@ -1,12 +1,12 @@ note - description: "Summary description for {GW_NINO_INPUT_STREAM}." + description: "Summary description for {EWF_NINO_INPUT_STREAM}." legal: "See notice at end of class." status: "See notice at end of class." date: "$Date$" revision: "$Revision$" class - GW_NINO_INPUT_STREAM + EWF_NINO_INPUT_STREAM inherit EWSGI_INPUT_STREAM @@ -22,7 +22,7 @@ feature {NONE} -- Initialization set_nino_input (a_nino_input) end -feature {GW_NINO_CONNECTOR, EWSGI_APPLICATION} -- Nino +feature {EWF_NINO_CONNECTOR, EWSGI_APPLICATION} -- Nino set_nino_input (i: like nino_input) do diff --git a/library/server/ewsgi/connectors/nino/src/gw_nino_output_stream.e b/library/server/ewsgi/connectors/nino/src/ewf_nino_output_stream.e similarity index 91% rename from library/server/ewsgi/connectors/nino/src/gw_nino_output_stream.e rename to library/server/ewsgi/connectors/nino/src/ewf_nino_output_stream.e index 792e3db5..d772c514 100644 --- a/library/server/ewsgi/connectors/nino/src/gw_nino_output_stream.e +++ b/library/server/ewsgi/connectors/nino/src/ewf_nino_output_stream.e @@ -1,12 +1,12 @@ note - description: "Summary description for {GW_NINO_OUTPUT_STREAM}." + description: "Summary description for {EWF_NINO_OUTPUT_STREAM}." legal: "See notice at end of class." status: "See notice at end of class." date: "$Date$" revision: "$Revision$" class - GW_NINO_OUTPUT_STREAM + EWF_NINO_OUTPUT_STREAM inherit EWSGI_OUTPUT_STREAM @@ -26,7 +26,7 @@ feature {NONE} -- Initialization set_nino_output (a_nino_output) end -feature {GW_NINO_CONNECTOR, EWSGI_APPLICATION} -- Nino +feature {EWF_NINO_CONNECTOR, EWSGI_APPLICATION} -- Nino set_nino_output (o: like nino_output) do diff --git a/library/server/ewsgi/default/nino/nino_application.e b/library/server/ewsgi/default/nino/nino_application.e index 90ab66b7..a1e63d2f 100644 --- a/library/server/ewsgi/default/nino/nino_application.e +++ b/library/server/ewsgi/default/nino/nino_application.e @@ -27,7 +27,7 @@ feature {NONE} -- Implementation create connector.make_with_base (app, a_base_url) end - connector: GW_NINO_CONNECTOR + connector: EWF_NINO_CONNECTOR -- Web server connector feature -- Status settings diff --git a/library/server/ewsgi/src/extra/gw_buffered_response.e b/library/server/ewsgi/src/extra/ewf_buffered_response.e similarity index 97% rename from library/server/ewsgi/src/extra/gw_buffered_response.e rename to library/server/ewsgi/src/extra/ewf_buffered_response.e index 2c8afee1..62d34562 100644 --- a/library/server/ewsgi/src/extra/gw_buffered_response.e +++ b/library/server/ewsgi/src/extra/ewf_buffered_response.e @@ -1,11 +1,11 @@ note - description: "Summary description for {GW_BUFFERED_RESPONSE}." + description: "Summary description for {EWF_BUFFERED_RESPONSE}." author: "" date: "$Date$" revision: "$Revision$" class - GW_BUFFERED_RESPONSE + EWF_BUFFERED_RESPONSE inherit EWSGI_RESPONSE_BUFFER @@ -130,7 +130,7 @@ feature -- Header output operation write_header (a_status_code: INTEGER; a_headers: detachable ARRAY [TUPLE [key: STRING; value: STRING]]) -- Send headers with status `a_status', and headers from `a_headers' local - h: GW_HEADER + h: EWF_HEADER i,n: INTEGER do set_status_code (a_status_code) diff --git a/library/server/ewsgi/src/extra/in_memory/gw_in_memory_response.e b/library/server/ewsgi/src/extra/in_memory/ewf_in_memory_response.e similarity index 95% rename from library/server/ewsgi/src/extra/in_memory/gw_in_memory_response.e rename to library/server/ewsgi/src/extra/in_memory/ewf_in_memory_response.e index 5e42bffb..eede32e4 100644 --- a/library/server/ewsgi/src/extra/in_memory/gw_in_memory_response.e +++ b/library/server/ewsgi/src/extra/in_memory/ewf_in_memory_response.e @@ -1,10 +1,10 @@ note - description: "Summary description for {GW_IN_MEMORY_RESPONSE}." + description: "Summary description for {EWF_IN_MEMORY_RESPONSE}." date: "$Date$" revision: "$Revision$" class - GW_IN_MEMORY_RESPONSE + EWF_IN_MEMORY_RESPONSE inherit EWSGI_RESPONSE_BUFFER @@ -23,7 +23,7 @@ feature {NONE} -- Initialization response_buffer: EWSGI_RESPONSE_BUFFER - header: GW_HEADER + header: EWF_HEADER body: STRING_8 @@ -93,7 +93,7 @@ feature -- Header output operation write_header (a_status_code: INTEGER; a_headers: detachable ARRAY [TUPLE [key: STRING; value: STRING]]) -- Send headers with status `a_status', and headers from `a_headers' local - h: GW_HEADER + h: EWF_HEADER i,n: INTEGER do set_status_code (a_status_code) diff --git a/library/server/ewsgi/src/extra/in_memory/gw_in_memory_response_application.e b/library/server/ewsgi/src/extra/in_memory/ewf_in_memory_response_application.e similarity index 86% rename from library/server/ewsgi/src/extra/in_memory/gw_in_memory_response_application.e rename to library/server/ewsgi/src/extra/in_memory/ewf_in_memory_response_application.e index 8d2d017c..36adbd4c 100644 --- a/library/server/ewsgi/src/extra/in_memory/gw_in_memory_response_application.e +++ b/library/server/ewsgi/src/extra/in_memory/ewf_in_memory_response_application.e @@ -1,11 +1,11 @@ note - description: "Summary description for {GW_IN_MEMORY_RESPONSE_APPLICATION}." + description: "Summary description for {EWF_IN_MEMORY_RESPONSE_APPLICATION}." author: "" date: "$Date$" revision: "$Revision$" deferred class - GW_IN_MEMORY_RESPONSE_APPLICATION + EWF_IN_MEMORY_RESPONSE_APPLICATION inherit EWSGI_APPLICATION @@ -41,9 +41,9 @@ feature -- Execute feature {NONE} -- Implementation - new_response (req: EWSGI_REQUEST; a_res: EWSGI_RESPONSE_BUFFER): GW_IN_MEMORY_RESPONSE + new_response (req: EWSGI_REQUEST; a_res: EWSGI_RESPONSE_BUFFER): EWF_IN_MEMORY_RESPONSE do - create {GW_IN_MEMORY_RESPONSE} Result.make (a_res) + create {EWF_IN_MEMORY_RESPONSE} Result.make (a_res) end note diff --git a/library/server/ewsgi/src/request/ewsgi_request_from_table.e b/library/server/ewsgi/src/request/ewsgi_request_from_table.e index cb9cf973..2ae52815 100644 --- a/library/server/ewsgi/src/request/ewsgi_request_from_table.e +++ b/library/server/ewsgi/src/request/ewsgi_request_from_table.e @@ -1103,7 +1103,7 @@ feature {NONE} -- Implementation report_bad_request_error (a_message: detachable STRING) -- Report error local - e: GW_ERROR + e: EWF_ERROR do create e.make ({HTTP_STATUS_CODE}.bad_request) if a_message /= Void then diff --git a/library/server/ewsgi/src/response/ewsgi_response_stream_buffer.e b/library/server/ewsgi/src/response/ewsgi_response_stream_buffer.e index 97b95aaa..a5f263e8 100644 --- a/library/server/ewsgi/src/response/ewsgi_response_stream_buffer.e +++ b/library/server/ewsgi/src/response/ewsgi_response_stream_buffer.e @@ -85,7 +85,7 @@ feature -- Header output operation write_header (a_status_code: INTEGER; a_headers: detachable ARRAY [TUPLE [key: STRING; value: STRING]]) -- Send headers with status `a_status', and headers from `a_headers' local - h: GW_HEADER + h: EWF_HEADER i,n: INTEGER do set_status_code (a_status_code) diff --git a/library/server/ewsgi/src/support/gw_error.e b/library/server/ewsgi/src/support/ewf_error.e similarity index 94% rename from library/server/ewsgi/src/support/gw_error.e rename to library/server/ewsgi/src/support/ewf_error.e index 61823e9e..5884d12e 100644 --- a/library/server/ewsgi/src/support/gw_error.e +++ b/library/server/ewsgi/src/support/ewf_error.e @@ -1,12 +1,12 @@ note - description: "Summary description for {GW_ERROR}." + description: "Summary description for {EWF_ERROR}." legal: "See notice at end of class." status: "See notice at end of class." date: "$Date$" revision: "$Revision$" class - GW_ERROR + EWF_ERROR inherit ERROR diff --git a/library/server/ewsgi/src/support/gw_header.e b/library/server/ewsgi/src/support/ewf_header.e similarity index 99% rename from library/server/ewsgi/src/support/gw_header.e rename to library/server/ewsgi/src/support/ewf_header.e index 223367de..7bacd217 100644 --- a/library/server/ewsgi/src/support/gw_header.e +++ b/library/server/ewsgi/src/support/ewf_header.e @@ -1,6 +1,6 @@ note description: "[ - Summary description for {GW_HEADER}. + Summary description for {EWF_HEADER}. Note the return status code is not part of the HTTP header ]" @@ -10,7 +10,7 @@ note revision: "$Revision$" class - GW_HEADER + EWF_HEADER inherit ANY diff --git a/library/server/request/router/src/context/request_handler_context.e b/library/server/request/router/src/context/request_handler_context.e index 4791b690..6cafb3f0 100644 --- a/library/server/request/router/src/context/request_handler_context.e +++ b/library/server/request/router/src/context/request_handler_context.e @@ -61,18 +61,18 @@ feature -- Access feature -- Query - path_parameter (a_name: STRING): detachable READABLE_STRING_32 + path_parameter (a_name: READABLE_STRING_GENERAL): detachable READABLE_STRING_32 -- Parameter value for path variable `a_name' deferred end - query_parameter (a_name: STRING): detachable READABLE_STRING_32 + query_parameter (a_name: READABLE_STRING_GENERAL): detachable READABLE_STRING_32 -- Parameter value for query variable `a_name' --| i.e after the ? character deferred end - parameter (a_name: STRING): detachable READABLE_STRING_32 + parameter (a_name: READABLE_STRING_GENERAL): detachable READABLE_STRING_32 -- Any parameter value for variable `a_name' -- URI template parameter and query parameters do diff --git a/library/server/request/router/src/context/request_uri_handler_context.e b/library/server/request/router/src/context/request_uri_handler_context.e index cd3611d9..32204107 100644 --- a/library/server/request/router/src/context/request_uri_handler_context.e +++ b/library/server/request/router/src/context/request_uri_handler_context.e @@ -23,11 +23,11 @@ feature {NONE} -- Initialization feature -- Query - path_parameter (a_name: STRING): detachable STRING_32 + path_parameter (a_name: READABLE_STRING_GENERAL): detachable STRING_32 do end - query_parameter (a_name: STRING): detachable READABLE_STRING_32 + query_parameter (a_name: READABLE_STRING_GENERAL): detachable READABLE_STRING_32 do Result := request.parameter (a_name) end diff --git a/library/server/request/router/src/context/request_uri_template_handler_context.e b/library/server/request/router/src/context/request_uri_template_handler_context.e index 57c4a855..c7895a2a 100644 --- a/library/server/request/router/src/context/request_uri_template_handler_context.e +++ b/library/server/request/router/src/context/request_uri_template_handler_context.e @@ -31,12 +31,12 @@ feature -- Access feature -- Query - path_parameter (a_name: STRING): detachable READABLE_STRING_32 + path_parameter (a_name: READABLE_STRING_GENERAL): detachable READABLE_STRING_32 do Result := uri_template_match.url_decoded_path_variable (a_name) end - query_parameter (a_name: STRING): detachable READABLE_STRING_32 + query_parameter (a_name: READABLE_STRING_GENERAL): detachable READABLE_STRING_32 do Result := uri_template_match.url_decoded_query_variable (a_name) if Result = Void then