diff --git a/README.md b/README.md index 87bf7c95..0fad2db1 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,7 @@ An alternative to the last 2 instructions is to use the script from tools folder * connectors: various web server connectors for EWSGI * libfcgi: Wrapper for libfcgi SDK * __wsf__: Web Server Framework [read more](library/server/wsf) -* request - * __router__: URL dispatching/routing based on uri, uri_template, or custom [read more](library/server/request/router) + * __router__: URL dispatching/routing based on uri, uri_template, or custom [read more](library/server/wsf/router) ### protocol * __http__: HTTP related classes, constants for status code, content types, ... [read more](library/protocol/http) diff --git a/draft/library/server/request/rest/rest-safe.ecf b/draft/library/server/request/rest/rest-safe.ecf index cafb7181..d1d70b10 100644 --- a/draft/library/server/request/rest/rest-safe.ecf +++ b/draft/library/server/request/rest/rest-safe.ecf @@ -12,8 +12,6 @@ - - /html$ diff --git a/draft/library/server/request/rest/rest.ecf b/draft/library/server/request/rest/rest.ecf index 8c99499a..78cf6b0b 100644 --- a/draft/library/server/request/rest/rest.ecf +++ b/draft/library/server/request/rest/rest.ecf @@ -11,8 +11,6 @@ - - /html$ diff --git a/examples/restbucksCRUD/restbucks-safe.ecf b/examples/restbucksCRUD/restbucks-safe.ecf index e5b2b10c..6c34c629 100644 --- a/examples/restbucksCRUD/restbucks-safe.ecf +++ b/examples/restbucksCRUD/restbucks-safe.ecf @@ -13,13 +13,16 @@ - + + + - diff --git a/library/library.index b/library/library.index index 81d9a4f3..5b8807f3 100644 --- a/library/library.index +++ b/library/library.index @@ -3,8 +3,14 @@ http_client-safe : c:\_dev\Dev-Process\web-framework\library\client\http_client\http_client-safe.ecf http_client : c:\_dev\Dev-Process\web-framework\library\client\http_client\http_client.ecf +eapml-safe : c:\_dev\Dev-Process\web-framework\library\crypto\eapml\eapml-safe.ecf +eapml : c:\_dev\Dev-Process\web-framework\library\crypto\eapml\eapml.ecf +eel-safe : c:\_dev\Dev-Process\web-framework\library\crypto\eel\eel-safe.ecf +eel : c:\_dev\Dev-Process\web-framework\library\crypto\eel\eel.ecf error-safe : c:\_dev\Dev-Process\web-framework\library\error\error-safe.ecf error : c:\_dev\Dev-Process\web-framework\library\error\error.ecf +conneg-safe : c:\_dev\Dev-Process\web-framework\library\protocol\CONNEG\conneg-safe.ecf +conneg : c:\_dev\Dev-Process\web-framework\library\protocol\CONNEG\conneg.ecf http-safe : c:\_dev\Dev-Process\web-framework\library\protocol\http\http-safe.ecf http : c:\_dev\Dev-Process\web-framework\library\protocol\http\http.ecf http_authorization-safe : c:\_dev\Dev-Process\web-framework\library\server\authentication\http_authorization\http_authorization-safe.ecf @@ -13,8 +19,6 @@ ewsgi-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\ewsgi-safe.e ewsgi : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\ewsgi.ecf ewsgi_spec-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\ewsgi_spec-safe.ecf ewsgi_spec : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\ewsgi_spec.ecf -connector-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\connector-safe.ecf -connector : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\connector.ecf cgi-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\cgi\cgi-safe.ecf cgi : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\cgi\cgi.ecf libfcgi-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf @@ -25,14 +29,12 @@ fcgi-safe : c:\_dev\Dev-Process\web-framework\library\server\libfcgi\fcgi-safe.e fcgi : c:\_dev\Dev-Process\web-framework\library\server\libfcgi\fcgi.ecf libfcgi-safe : c:\_dev\Dev-Process\web-framework\library\server\libfcgi\libfcgi-safe.ecf libfcgi : c:\_dev\Dev-Process\web-framework\library\server\libfcgi\libfcgi.ecf -rest-safe : c:\_dev\Dev-Process\web-framework\library\server\request\rest\rest-safe.ecf -rest : c:\_dev\Dev-Process\web-framework\library\server\request\rest\rest.ecf -router-safe : c:\_dev\Dev-Process\web-framework\library\server\request\router\router-safe.ecf -router : c:\_dev\Dev-Process\web-framework\library\server\request\router\router.ecf wsf-safe : c:\_dev\Dev-Process\web-framework\library\server\wsf\wsf-safe.ecf wsf : c:\_dev\Dev-Process\web-framework\library\server\wsf\wsf.ecf cgi-safe : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\cgi-safe.ecf cgi : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\cgi.ecf +libfcgi-safe : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\libfcgi-safe.ecf +libfcgi : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\libfcgi.ecf nino-safe : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\nino-safe.ecf nino : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\nino.ecf encoder-safe : c:\_dev\Dev-Process\web-framework\library\text\encoder\encoder-safe.ecf diff --git a/library/server/request/router/router-safe.ecf b/library/server/request/router/router-safe.ecf index bd9b1012..3af161c9 100644 --- a/library/server/request/router/router-safe.ecf +++ b/library/server/request/router/router-safe.ecf @@ -11,10 +11,6 @@ - - - - diff --git a/library/server/request/router/router.ecf b/library/server/request/router/router.ecf index 664d0879..3ffd7d4c 100644 --- a/library/server/request/router/router.ecf +++ b/library/server/request/router/router.ecf @@ -11,27 +11,6 @@ - - - - - - - - - /.git$ - /EIFGENs$ - /.svn$ - - - - - - - - diff --git a/library/server/wsf/README.md b/library/server/wsf/README.md index b9dcc180..7307fbc2 100644 --- a/library/server/wsf/README.md +++ b/library/server/wsf/README.md @@ -6,6 +6,11 @@ It is built on top of [EWSGI](../ewsgi/) to benefit from the various EWSGI conne ## Requirements * [EWSGI](../ewsgi) * [HTTP](../../protocol/http) +* [URI template](../../protocol/uri_template) + +## Content +* Core classes for the Web Server Framework +* [Router](router) library ## Overview diff --git a/library/server/request/router/doc/README.txt b/library/server/wsf/doc/router.txt similarity index 76% rename from library/server/request/router/doc/README.txt rename to library/server/wsf/doc/router.txt index 78339059..94f0352e 100644 --- a/library/server/request/router/doc/README.txt +++ b/library/server/wsf/doc/router.txt @@ -1,4 +1,4 @@ -This library introduce the notion of router and handler +This library introduce the notion of router and handler in the folder "router" The Router manages the association between URI,URI template and Handler The Router is in charge to route/dispatch a request to one of the Handler according to the URI and how the Handler is mapped in the Router. @@ -11,4 +11,4 @@ create {REQUEST_URI_TEMPLATE_ROUTER} router.make create {REQUEST_AGENT_HANDLER} hello_handler.make (agent handle_hello) router.map ("/hello/{name}", hello_handler) -router.map_agent ("/hello/{name}", agent handle_hello) \ No newline at end of file +router.map_agent ("/hello/{name}", agent handle_hello) diff --git a/library/server/request/router/README.md b/library/server/wsf/router/README.md similarity index 62% rename from library/server/request/router/README.md rename to library/server/wsf/router/README.md index 53acff10..80233fc4 100644 --- a/library/server/request/router/README.md +++ b/library/server/wsf/router/README.md @@ -1,7 +1,6 @@ -# Router library +# Router ## Requirements -* [Web Server Framework](../../wsf) * [URI Template](../../../protocol/rui_template) ## Overview diff --git a/library/server/request/router/src/default/routed_service.e b/library/server/wsf/router/default/routed_service.e similarity index 100% rename from library/server/request/router/src/default/routed_service.e rename to library/server/wsf/router/default/routed_service.e diff --git a/library/server/request/router/src/misc/request_format_utility.e b/library/server/wsf/router/misc/request_format_utility.e similarity index 100% rename from library/server/request/router/src/misc/request_format_utility.e rename to library/server/wsf/router/misc/request_format_utility.e diff --git a/library/server/request/router/src/misc/request_handler_routes_recorder.e b/library/server/wsf/router/misc/request_handler_routes_recorder.e similarity index 100% rename from library/server/request/router/src/misc/request_handler_routes_recorder.e rename to library/server/wsf/router/misc/request_handler_routes_recorder.e diff --git a/library/server/request/router/src/misc/request_resource_handler_helper.e b/library/server/wsf/router/misc/request_resource_handler_helper.e similarity index 100% rename from library/server/request/router/src/misc/request_resource_handler_helper.e rename to library/server/wsf/router/misc/request_resource_handler_helper.e diff --git a/library/server/request/router/src/misc/routed_service_helper.e b/library/server/wsf/router/misc/routed_service_helper.e similarity index 100% rename from library/server/request/router/src/misc/routed_service_helper.e rename to library/server/wsf/router/misc/routed_service_helper.e diff --git a/library/server/request/router/src/request_agent_handler.e b/library/server/wsf/router/request_agent_handler.e similarity index 100% rename from library/server/request/router/src/request_agent_handler.e rename to library/server/wsf/router/request_agent_handler.e diff --git a/library/server/request/router/src/request_file_system_handler.e b/library/server/wsf/router/request_file_system_handler.e similarity index 100% rename from library/server/request/router/src/request_file_system_handler.e rename to library/server/wsf/router/request_file_system_handler.e diff --git a/library/server/request/router/src/request_handler.e b/library/server/wsf/router/request_handler.e similarity index 100% rename from library/server/request/router/src/request_handler.e rename to library/server/wsf/router/request_handler.e diff --git a/library/server/request/router/src/request_handler_context.e b/library/server/wsf/router/request_handler_context.e similarity index 100% rename from library/server/request/router/src/request_handler_context.e rename to library/server/wsf/router/request_handler_context.e diff --git a/library/server/request/router/src/request_router.e b/library/server/wsf/router/request_router.e similarity index 100% rename from library/server/request/router/src/request_router.e rename to library/server/wsf/router/request_router.e diff --git a/library/server/request/router/src/request_routing_handler.e b/library/server/wsf/router/request_routing_handler.e similarity index 100% rename from library/server/request/router/src/request_routing_handler.e rename to library/server/wsf/router/request_routing_handler.e diff --git a/library/server/request/router/src/routed_service_i.e b/library/server/wsf/router/routed_service_i.e similarity index 100% rename from library/server/request/router/src/routed_service_i.e rename to library/server/wsf/router/routed_service_i.e diff --git a/library/server/request/router/src/uri/default/request_uri_router.e b/library/server/wsf/router/uri/default/request_uri_router.e similarity index 100% rename from library/server/request/router/src/uri/default/request_uri_router.e rename to library/server/wsf/router/uri/default/request_uri_router.e diff --git a/library/server/request/router/src/uri/default/request_uri_routing_handler.e b/library/server/wsf/router/uri/default/request_uri_routing_handler.e similarity index 100% rename from library/server/request/router/src/uri/default/request_uri_routing_handler.e rename to library/server/wsf/router/uri/default/request_uri_routing_handler.e diff --git a/library/server/request/router/src/uri/default/uri_routed_service.e b/library/server/wsf/router/uri/default/uri_routed_service.e similarity index 100% rename from library/server/request/router/src/uri/default/uri_routed_service.e rename to library/server/wsf/router/uri/default/uri_routed_service.e diff --git a/library/server/request/router/src/uri/request_uri_handler_context.e b/library/server/wsf/router/uri/request_uri_handler_context.e similarity index 100% rename from library/server/request/router/src/uri/request_uri_handler_context.e rename to library/server/wsf/router/uri/request_uri_handler_context.e diff --git a/library/server/request/router/src/uri/request_uri_router_i.e b/library/server/wsf/router/uri/request_uri_router_i.e similarity index 100% rename from library/server/request/router/src/uri/request_uri_router_i.e rename to library/server/wsf/router/uri/request_uri_router_i.e diff --git a/library/server/request/router/src/uri/request_uri_routing_handler_i.e b/library/server/wsf/router/uri/request_uri_routing_handler_i.e similarity index 100% rename from library/server/request/router/src/uri/request_uri_routing_handler_i.e rename to library/server/wsf/router/uri/request_uri_routing_handler_i.e diff --git a/library/server/request/router/src/uri_template/default/request_uri_template_router.e b/library/server/wsf/router/uri_template/default/request_uri_template_router.e similarity index 100% rename from library/server/request/router/src/uri_template/default/request_uri_template_router.e rename to library/server/wsf/router/uri_template/default/request_uri_template_router.e diff --git a/library/server/request/router/src/uri_template/default/request_uri_template_routing_handler.e b/library/server/wsf/router/uri_template/default/request_uri_template_routing_handler.e similarity index 100% rename from library/server/request/router/src/uri_template/default/request_uri_template_routing_handler.e rename to library/server/wsf/router/uri_template/default/request_uri_template_routing_handler.e diff --git a/library/server/request/router/src/uri_template/default/uri_template_routed_service.e b/library/server/wsf/router/uri_template/default/uri_template_routed_service.e similarity index 100% rename from library/server/request/router/src/uri_template/default/uri_template_routed_service.e rename to library/server/wsf/router/uri_template/default/uri_template_routed_service.e diff --git a/library/server/request/router/src/uri_template/request_uri_template_handler_context.e b/library/server/wsf/router/uri_template/request_uri_template_handler_context.e similarity index 100% rename from library/server/request/router/src/uri_template/request_uri_template_handler_context.e rename to library/server/wsf/router/uri_template/request_uri_template_handler_context.e diff --git a/library/server/request/router/src/uri_template/request_uri_template_router_i.e b/library/server/wsf/router/uri_template/request_uri_template_router_i.e similarity index 100% rename from library/server/request/router/src/uri_template/request_uri_template_router_i.e rename to library/server/wsf/router/uri_template/request_uri_template_router_i.e diff --git a/library/server/request/router/src/uri_template/request_uri_template_routing_handler_i.e b/library/server/wsf/router/uri_template/request_uri_template_routing_handler_i.e similarity index 100% rename from library/server/request/router/src/uri_template/request_uri_template_routing_handler_i.e rename to library/server/wsf/router/uri_template/request_uri_template_routing_handler_i.e diff --git a/library/server/wsf/wsf-safe.ecf b/library/server/wsf/wsf-safe.ecf index ac1ee700..7adabe5d 100644 --- a/library/server/wsf/wsf-safe.ecf +++ b/library/server/wsf/wsf-safe.ecf @@ -10,11 +10,14 @@ + + + diff --git a/library/server/wsf/wsf.ecf b/library/server/wsf/wsf.ecf index 98a028c9..f26d1693 100644 --- a/library/server/wsf/wsf.ecf +++ b/library/server/wsf/wsf.ecf @@ -10,11 +10,14 @@ + + + diff --git a/examples/hello_routed_world/hello-safe.ecf b/tests/dev/hello-safe.ecf similarity index 87% rename from examples/hello_routed_world/hello-safe.ecf rename to tests/dev/hello-safe.ecf index 87f0ed36..79bc29f3 100644 --- a/examples/hello_routed_world/hello-safe.ecf +++ b/tests/dev/hello-safe.ecf @@ -1,6 +1,6 @@ - - + + /EIFGENs$ @@ -14,7 +14,6 @@ - @@ -22,8 +21,9 @@ - + + diff --git a/examples/hello_routed_world/htdocs/dft/index.html b/tests/dev/htdocs/dft/index.html similarity index 100% rename from examples/hello_routed_world/htdocs/dft/index.html rename to tests/dev/htdocs/dft/index.html diff --git a/examples/hello_routed_world/htdocs/home.html b/tests/dev/htdocs/home.html similarity index 100% rename from examples/hello_routed_world/htdocs/home.html rename to tests/dev/htdocs/home.html diff --git a/examples/hello_routed_world/htdocs/htdocs.zip b/tests/dev/htdocs/htdocs.zip similarity index 100% rename from examples/hello_routed_world/htdocs/htdocs.zip rename to tests/dev/htdocs/htdocs.zip diff --git a/examples/hello_routed_world/htdocs/style.css b/tests/dev/htdocs/style.css similarity index 100% rename from examples/hello_routed_world/htdocs/style.css rename to tests/dev/htdocs/style.css diff --git a/examples/hello_routed_world/license.lic b/tests/dev/license.lic similarity index 100% rename from examples/hello_routed_world/license.lic rename to tests/dev/license.lic diff --git a/examples/hello_routed_world/mime.types b/tests/dev/mime.types similarity index 100% rename from examples/hello_routed_world/mime.types rename to tests/dev/mime.types diff --git a/examples/hello_routed_world/src/hello_routed_world.e b/tests/dev/src/hello_routed_world.e similarity index 100% rename from examples/hello_routed_world/src/hello_routed_world.e rename to tests/dev/src/hello_routed_world.e