diff --git a/examples/restbucksCRUD/restbucks-safe.ecf b/examples/restbucksCRUD/restbucks-safe.ecf
index d25369fa..3f46e7a9 100644
--- a/examples/restbucksCRUD/restbucks-safe.ecf
+++ b/examples/restbucksCRUD/restbucks-safe.ecf
@@ -13,7 +13,7 @@
-
+
diff --git a/library/network/protocol/content_negotation/.gitignore b/library/network/protocol/content_negotiation/.gitignore
similarity index 100%
rename from library/network/protocol/content_negotation/.gitignore
rename to library/network/protocol/content_negotiation/.gitignore
diff --git a/library/network/protocol/content_negotation/README.md b/library/network/protocol/content_negotiation/README.md
similarity index 100%
rename from library/network/protocol/content_negotation/README.md
rename to library/network/protocol/content_negotiation/README.md
diff --git a/library/network/protocol/content_negotation/conneg-safe.ecf b/library/network/protocol/content_negotiation/conneg-safe.ecf
similarity index 100%
rename from library/network/protocol/content_negotation/conneg-safe.ecf
rename to library/network/protocol/content_negotiation/conneg-safe.ecf
diff --git a/library/network/protocol/content_negotation/conneg.ecf b/library/network/protocol/content_negotiation/conneg.ecf
similarity index 100%
rename from library/network/protocol/content_negotation/conneg.ecf
rename to library/network/protocol/content_negotiation/conneg.ecf
diff --git a/library/network/protocol/content_negotation/license.lic b/library/network/protocol/content_negotiation/license.lic
similarity index 100%
rename from library/network/protocol/content_negotation/license.lic
rename to library/network/protocol/content_negotiation/license.lic
diff --git a/library/network/protocol/content_negotation/src/.gitignore b/library/network/protocol/content_negotiation/src/.gitignore
similarity index 100%
rename from library/network/protocol/content_negotation/src/.gitignore
rename to library/network/protocol/content_negotiation/src/.gitignore
diff --git a/library/network/protocol/content_negotation/src/conneg_server_side.e b/library/network/protocol/content_negotiation/src/conneg_server_side.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/conneg_server_side.e
rename to library/network/protocol/content_negotiation/src/conneg_server_side.e
diff --git a/library/network/protocol/content_negotation/src/parsers/common_accept_header_parser.e b/library/network/protocol/content_negotiation/src/parsers/common_accept_header_parser.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/parsers/common_accept_header_parser.e
rename to library/network/protocol/content_negotiation/src/parsers/common_accept_header_parser.e
diff --git a/library/network/protocol/content_negotation/src/parsers/fitness_and_quality.e b/library/network/protocol/content_negotiation/src/parsers/fitness_and_quality.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/parsers/fitness_and_quality.e
rename to library/network/protocol/content_negotiation/src/parsers/fitness_and_quality.e
diff --git a/library/network/protocol/content_negotation/src/parsers/language_parse.e b/library/network/protocol/content_negotiation/src/parsers/language_parse.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/parsers/language_parse.e
rename to library/network/protocol/content_negotiation/src/parsers/language_parse.e
diff --git a/library/network/protocol/content_negotation/src/parsers/mime_parse.e b/library/network/protocol/content_negotiation/src/parsers/mime_parse.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/parsers/mime_parse.e
rename to library/network/protocol/content_negotiation/src/parsers/mime_parse.e
diff --git a/library/network/protocol/content_negotation/src/parsers/mime_type_parser_utilities.e b/library/network/protocol/content_negotiation/src/parsers/mime_type_parser_utilities.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/parsers/mime_type_parser_utilities.e
rename to library/network/protocol/content_negotiation/src/parsers/mime_type_parser_utilities.e
diff --git a/library/network/protocol/content_negotation/src/results/common_results.e b/library/network/protocol/content_negotiation/src/results/common_results.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/results/common_results.e
rename to library/network/protocol/content_negotiation/src/results/common_results.e
diff --git a/library/network/protocol/content_negotation/src/results/language_results.e b/library/network/protocol/content_negotiation/src/results/language_results.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/results/language_results.e
rename to library/network/protocol/content_negotiation/src/results/language_results.e
diff --git a/library/network/protocol/content_negotation/src/results/parse_results.e b/library/network/protocol/content_negotiation/src/results/parse_results.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/results/parse_results.e
rename to library/network/protocol/content_negotiation/src/results/parse_results.e
diff --git a/library/network/protocol/content_negotation/src/shared_conneg.e b/library/network/protocol/content_negotiation/src/shared_conneg.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/shared_conneg.e
rename to library/network/protocol/content_negotiation/src/shared_conneg.e
diff --git a/library/network/protocol/content_negotation/src/variants/character_encoding_variant_results.e b/library/network/protocol/content_negotiation/src/variants/character_encoding_variant_results.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/variants/character_encoding_variant_results.e
rename to library/network/protocol/content_negotiation/src/variants/character_encoding_variant_results.e
diff --git a/library/network/protocol/content_negotation/src/variants/compression_variant_results.e b/library/network/protocol/content_negotiation/src/variants/compression_variant_results.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/variants/compression_variant_results.e
rename to library/network/protocol/content_negotiation/src/variants/compression_variant_results.e
diff --git a/library/network/protocol/content_negotation/src/variants/language_variant_results.e b/library/network/protocol/content_negotiation/src/variants/language_variant_results.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/variants/language_variant_results.e
rename to library/network/protocol/content_negotiation/src/variants/language_variant_results.e
diff --git a/library/network/protocol/content_negotation/src/variants/media_type_variant_results.e b/library/network/protocol/content_negotiation/src/variants/media_type_variant_results.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/variants/media_type_variant_results.e
rename to library/network/protocol/content_negotiation/src/variants/media_type_variant_results.e
diff --git a/library/network/protocol/content_negotation/src/variants/variant_results.e b/library/network/protocol/content_negotiation/src/variants/variant_results.e
similarity index 100%
rename from library/network/protocol/content_negotation/src/variants/variant_results.e
rename to library/network/protocol/content_negotiation/src/variants/variant_results.e
diff --git a/library/network/protocol/content_negotation/test/application.e b/library/network/protocol/content_negotiation/test/application.e
similarity index 100%
rename from library/network/protocol/content_negotation/test/application.e
rename to library/network/protocol/content_negotiation/test/application.e
diff --git a/library/network/protocol/content_negotation/test/common_accept_header_parser_test.e b/library/network/protocol/content_negotiation/test/common_accept_header_parser_test.e
similarity index 100%
rename from library/network/protocol/content_negotation/test/common_accept_header_parser_test.e
rename to library/network/protocol/content_negotiation/test/common_accept_header_parser_test.e
diff --git a/library/network/protocol/content_negotation/test/conneg_server_side_test.e b/library/network/protocol/content_negotiation/test/conneg_server_side_test.e
similarity index 100%
rename from library/network/protocol/content_negotation/test/conneg_server_side_test.e
rename to library/network/protocol/content_negotiation/test/conneg_server_side_test.e
diff --git a/library/network/protocol/content_negotation/test/language_parser_test.e b/library/network/protocol/content_negotiation/test/language_parser_test.e
similarity index 100%
rename from library/network/protocol/content_negotation/test/language_parser_test.e
rename to library/network/protocol/content_negotiation/test/language_parser_test.e
diff --git a/library/network/protocol/content_negotation/test/mime_parser_test.e b/library/network/protocol/content_negotiation/test/mime_parser_test.e
similarity index 100%
rename from library/network/protocol/content_negotation/test/mime_parser_test.e
rename to library/network/protocol/content_negotiation/test/mime_parser_test.e
diff --git a/library/network/protocol/content_negotation/test/test-safe.ecf b/library/network/protocol/content_negotiation/test/test-safe.ecf
similarity index 100%
rename from library/network/protocol/content_negotation/test/test-safe.ecf
rename to library/network/protocol/content_negotiation/test/test-safe.ecf
diff --git a/library/network/protocol/content_negotation/test/test.ecf b/library/network/protocol/content_negotiation/test/test.ecf
similarity index 100%
rename from library/network/protocol/content_negotation/test/test.ecf
rename to library/network/protocol/content_negotiation/test/test.ecf
diff --git a/library/server/wsf/policy_driven/wsf_method_helper.e b/library/server/wsf/policy_driven/wsf_method_helper.e
index 1cc62157..5a28bed9 100644
--- a/library/server/wsf/policy_driven/wsf_method_helper.e
+++ b/library/server/wsf/policy_driven/wsf_method_helper.e
@@ -202,7 +202,7 @@ feature -- Content negotiation
if not l_lang.is_acceptable then
handle_not_acceptable ("None of the requested languages were acceptable", l_langs, req, res)
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)
req.set_execution_variable (a_handler.Negotiated_language_execution_variable, l_language_type)
end
@@ -214,8 +214,8 @@ feature -- Content negotiation
if not l_charset.is_acceptable then
handle_not_acceptable ("None of the requested character encodings were acceptable", l_charsets, req, res)
else
- if attached l_media.media_type as l_media_type then
- if attached l_charset.character_type as l_character_type then
+ if attached l_media.type as l_media_type then
+ if attached l_charset.type as l_character_type then
h.put_content_type (l_media_type + "; charset=" + l_character_type)
req.set_execution_variable (a_handler.Negotiated_charset_execution_variable, l_charset)
else
@@ -231,7 +231,7 @@ feature -- Content negotiation
if not l_encoding.is_acceptable then
handle_not_acceptable ("None of the requested transfer encodings were acceptable", l_encodings, req, res)
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)
req.set_execution_variable (a_handler.Negotiated_encoding_execution_variable, l_compression_type)
end
diff --git a/library/server/wsf/wsf_policy_driven-safe.ecf b/library/server/wsf/wsf_policy_driven-safe.ecf
index f5b81277..189fae62 100644
--- a/library/server/wsf/wsf_policy_driven-safe.ecf
+++ b/library/server/wsf/wsf_policy_driven-safe.ecf
@@ -13,7 +13,7 @@
-
+
diff --git a/library/server/wsf/wsf_policy_driven.ecf b/library/server/wsf/wsf_policy_driven.ecf
index 4e9cd61f..c02a516f 100644
--- a/library/server/wsf/wsf_policy_driven.ecf
+++ b/library/server/wsf/wsf_policy_driven.ecf
@@ -13,7 +13,7 @@
-
+
diff --git a/tests/all-safe.ecf b/tests/all-safe.ecf
index cb24fecd..ac7d4aa9 100644
--- a/tests/all-safe.ecf
+++ b/tests/all-safe.ecf
@@ -10,13 +10,14 @@
+
-
+