mirrors/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed content_negotation' as content_negotiation' (fixed typo)

Browse Source 
Updated .ecf and Eiffel code depending on previous CONNEG
This commit is contained in:
Jocelyn FIAT
2013-09-20 15:18:56 +02:00
parent f31ed103d0
commit dd31970b01
33 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/restbucksCRUD/restbucks-safe.ecf
View File

@@ -13,7 +13,7 @@
<debug name="nino" enabled="true"/> <debug name="nino" enabled="true"/>
</option> </option>
</library> </library>
<library name="conneg" location="..\..\library\network\protocol\CONNEG\conneg-safe.ecf"/> <library name="conneg" location="..\..\library\network\protocol\content_negotiation\conneg-safe.ecf"/>
<library name="default_nino" location="..\..\library\server\wsf\default\nino-safe.ecf" readonly="false"/> <library name="default_nino" location="..\..\library\server\wsf\default\nino-safe.ecf" readonly="false"/>
<library name="eel" location="$ISE_LIBRARY\contrib\library\text\encryption\eel\eel-safe.ecf" readonly="false"/> <library name="eel" location="$ISE_LIBRARY\contrib\library\text\encryption\eel\eel-safe.ecf" readonly="false"/>
<library name="encoder" location="..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/> <library name="encoder" location="..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>

0
library/network/protocol/content_negotation/.gitignore → library/network/protocol/content_negotiation/.gitignore vendored
View File

0
library/network/protocol/content_negotation/README.md → library/network/protocol/content_negotiation/README.md
View File

0
library/network/protocol/content_negotation/conneg-safe.ecf → library/network/protocol/content_negotiation/conneg-safe.ecf
View File

0
library/network/protocol/content_negotation/conneg.ecf → library/network/protocol/content_negotiation/conneg.ecf
View File

0
library/network/protocol/content_negotation/license.lic → library/network/protocol/content_negotiation/license.lic
View File

0
library/network/protocol/content_negotation/src/.gitignore → library/network/protocol/content_negotiation/src/.gitignore vendored
View File

0
library/network/protocol/content_negotation/src/conneg_server_side.e → library/network/protocol/content_negotiation/src/conneg_server_side.e
View File

0
library/network/protocol/content_negotation/src/parsers/common_accept_header_parser.e → library/network/protocol/content_negotiation/src/parsers/common_accept_header_parser.e
View File

0
library/network/protocol/content_negotation/src/parsers/fitness_and_quality.e → library/network/protocol/content_negotiation/src/parsers/fitness_and_quality.e
View File

0
library/network/protocol/content_negotation/src/parsers/language_parse.e → library/network/protocol/content_negotiation/src/parsers/language_parse.e
View File

0
library/network/protocol/content_negotation/src/parsers/mime_parse.e → library/network/protocol/content_negotiation/src/parsers/mime_parse.e
View File

0
library/network/protocol/content_negotation/src/parsers/mime_type_parser_utilities.e → library/network/protocol/content_negotiation/src/parsers/mime_type_parser_utilities.e
View File

0
library/network/protocol/content_negotation/src/results/common_results.e → library/network/protocol/content_negotiation/src/results/common_results.e
View File

0
library/network/protocol/content_negotation/src/results/language_results.e → library/network/protocol/content_negotiation/src/results/language_results.e
View File

0
library/network/protocol/content_negotation/src/results/parse_results.e → library/network/protocol/content_negotiation/src/results/parse_results.e
View File

0
library/network/protocol/content_negotation/src/shared_conneg.e → library/network/protocol/content_negotiation/src/shared_conneg.e
View File

0
library/network/protocol/content_negotation/src/variants/character_encoding_variant_results.e → library/network/protocol/content_negotiation/src/variants/character_encoding_variant_results.e
View File

0
library/network/protocol/content_negotation/src/variants/compression_variant_results.e → library/network/protocol/content_negotiation/src/variants/compression_variant_results.e
View File

0
library/network/protocol/content_negotation/src/variants/language_variant_results.e → library/network/protocol/content_negotiation/src/variants/language_variant_results.e
View File

0
library/network/protocol/content_negotation/src/variants/media_type_variant_results.e → library/network/protocol/content_negotiation/src/variants/media_type_variant_results.e
View File

0
library/network/protocol/content_negotation/src/variants/variant_results.e → library/network/protocol/content_negotiation/src/variants/variant_results.e
View File

0
library/network/protocol/content_negotation/test/application.e → library/network/protocol/content_negotiation/test/application.e
View File

0
library/network/protocol/content_negotation/test/common_accept_header_parser_test.e → library/network/protocol/content_negotiation/test/common_accept_header_parser_test.e
View File

0
library/network/protocol/content_negotation/test/conneg_server_side_test.e → library/network/protocol/content_negotiation/test/conneg_server_side_test.e
View File

0
library/network/protocol/content_negotation/test/language_parser_test.e → library/network/protocol/content_negotiation/test/language_parser_test.e
View File

0
library/network/protocol/content_negotation/test/mime_parser_test.e → library/network/protocol/content_negotiation/test/mime_parser_test.e
View File

0
library/network/protocol/content_negotation/test/test-safe.ecf → library/network/protocol/content_negotiation/test/test-safe.ecf
View File

0
library/network/protocol/content_negotation/test/test.ecf → library/network/protocol/content_negotiation/test/test.ecf
View File

8
library/server/wsf/policy_driven/wsf_method_helper.e
View File

@@ -202,7 +202,7 @@ feature -- Content negotiation
if not l_lang.is_acceptable then if not l_lang.is_acceptable then
handle_not_acceptable ("None of the requested languages were acceptable", l_langs, req, res) handle_not_acceptable ("None of the requested languages were acceptable", l_langs, req, res)
else else
if attached l_lang.language_type as l_language_type then if attached l_lang.type as l_language_type then
h.put_content_language (l_language_type) h.put_content_language (l_language_type)
req.set_execution_variable (a_handler.Negotiated_language_execution_variable, l_language_type) req.set_execution_variable (a_handler.Negotiated_language_execution_variable, l_language_type)
end end
@@ -214,8 +214,8 @@ feature -- Content negotiation
if not l_charset.is_acceptable then if not l_charset.is_acceptable then
handle_not_acceptable ("None of the requested character encodings were acceptable", l_charsets, req, res) handle_not_acceptable ("None of the requested character encodings were acceptable", l_charsets, req, res)
else else
if attached l_media.media_type as l_media_type then if attached l_media.type as l_media_type then
if attached l_charset.character_type as l_character_type then if attached l_charset.type as l_character_type then
h.put_content_type (l_media_type + "; charset=" + l_character_type) h.put_content_type (l_media_type + "; charset=" + l_character_type)
req.set_execution_variable (a_handler.Negotiated_charset_execution_variable, l_charset) req.set_execution_variable (a_handler.Negotiated_charset_execution_variable, l_charset)
else else
@@ -231,7 +231,7 @@ feature -- Content negotiation
if not l_encoding.is_acceptable then if not l_encoding.is_acceptable then
handle_not_acceptable ("None of the requested transfer encodings were acceptable", l_encodings, req, res) handle_not_acceptable ("None of the requested transfer encodings were acceptable", l_encodings, req, res)
else else
if attached l_encoding.compression_type as l_compression_type then if attached l_encoding.type as l_compression_type then
h.put_content_encoding (l_compression_type) h.put_content_encoding (l_compression_type)
req.set_execution_variable (a_handler.Negotiated_encoding_execution_variable, l_compression_type) req.set_execution_variable (a_handler.Negotiated_encoding_execution_variable, l_compression_type)
end end

2
library/server/wsf/wsf_policy_driven-safe.ecf
View File

@@ -13,7 +13,7 @@
<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/> <library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri-safe.ecf"/> <library name="uri" location="$ISE_LIBRARY\library\text\uri\uri-safe.ecf"/>
<library name="ewsgi" location="..\ewsgi\ewsgi-safe.ecf"/> <library name="ewsgi" location="..\ewsgi\ewsgi-safe.ecf"/>
<library name="conneg" location="../../network/protocol/CONNEG/conneg-safe.ecf"/> <library name="conneg" location="../../network/protocol/content_negotiation/conneg-safe.ecf"/>
<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/> <library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
<library name="http" location="..\..\network\protocol\http\http-safe.ecf"/> <library name="http" location="..\..\network\protocol\http\http-safe.ecf"/>
<library name="wsf" location="wsf-safe.ecf"/> <library name="wsf" location="wsf-safe.ecf"/>

2
library/server/wsf/wsf_policy_driven.ecf
View File

@@ -13,7 +13,7 @@
<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/> <library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/> <library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/>
<library name="ewsgi" location="..\ewsgi\ewsgi.ecf"/> <library name="ewsgi" location="..\ewsgi\ewsgi.ecf"/>
<library name="conneg" location="../../network/protocol/CONNEG/conneg.ecf"/> <library name="conneg" location="../../network/protocol/content_negotiation/conneg.ecf"/>
<library name="encoder" location="..\..\text\encoder\encoder.ecf"/> <library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
<library name="http" location="..\..\network\protocol\http\http.ecf"/> <library name="http" location="..\..\network\protocol\http\http.ecf"/>
<library name="wsf" location="wsf.ecf"/> <library name="wsf" location="wsf.ecf"/>

3
tests/all-safe.ecf
View File

@@ -10,13 +10,14 @@
</file_rule> </file_rule>
<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard"> <option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
</option> </option>
<library name="all-stable" location="all-stable-safe.ecf" readonly="false"/>
<library name="atom" location="..\draft\library\protocol\syndication\atom\atom-safe.ecf" readonly="false"/> <library name="atom" location="..\draft\library\protocol\syndication\atom\atom-safe.ecf" readonly="false"/>
<library name="client" location="..\examples\restbucksCRUD\client\client-safe.ecf" readonly="false"/> <library name="client" location="..\examples\restbucksCRUD\client\client-safe.ecf" readonly="false"/>
<library name="connector_cgi" location="..\library\server\ewsgi\connectors\cgi\cgi-safe.ecf" readonly="false"/> <library name="connector_cgi" location="..\library\server\ewsgi\connectors\cgi\cgi-safe.ecf" readonly="false"/>
<library name="connector_libfcgi" location="..\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf" readonly="false"/> <library name="connector_libfcgi" location="..\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf" readonly="false"/>
<library name="connector_nino" location="..\library\server\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/> <library name="connector_nino" location="..\library\server\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/>
<library name="connector_null" location="..\library\server\ewsgi\connectors\null\null-safe.ecf" readonly="false"/> <library name="connector_null" location="..\library\server\ewsgi\connectors\null\null-safe.ecf" readonly="false"/>
<library name="conneg" location="..\library\network\protocol\CONNEG\conneg-safe.ecf" readonly="false"/> <library name="conneg" location="..\library\network\protocol\content_negotiation\conneg-safe.ecf" readonly="false"/>
<library name="default_cgi" location="..\library\server\wsf\default\cgi-safe.ecf" readonly="false"/> <library name="default_cgi" location="..\library\server\wsf\default\cgi-safe.ecf" readonly="false"/>
<library name="default_libfcgi" location="..\library\server\wsf\default\libfcgi-safe.ecf" readonly="false"/> <library name="default_libfcgi" location="..\library\server\wsf\default\libfcgi-safe.ecf" readonly="false"/>
<library name="default_nino" location="..\library\server\wsf\default\nino-safe.ecf" readonly="false"/> <library name="default_nino" location="..\library\server\wsf\default\nino-safe.ecf" readonly="false"/>