From 9dd1439a2f6354f5f6da04fdd86fbf2e45abe978 Mon Sep 17 00:00:00 2001 From: Javier Velilla Date: Fri, 15 Jul 2011 08:15:31 -0300 Subject: [PATCH] Refactor to use the new library structure convention. --- .../SimpleWebServer}/application.e | 0 .../application_connection_handler.e | 0 .../request/get_request_handler.e | 0 .../request/head_request_handler.e | 0 .../request/post_request_handler.e | 0 example/SimpleWebServer/web_server-safe.ecf | 21 +++ .../SimpleWebServer}/web_server.ecf | 8 +- .../webroot/demo1/img/gradient_light.jpg | Bin .../demo1/jquery.scrollTo-1.4.2/changes.txt | 0 .../jquery.scrollTo-min.js | 0 .../jquery.scrollTo-1.4.2/jquery.scrollTo.js | 0 .../SimpleWebServer}/webroot/demo1/script.js | 0 .../SimpleWebServer}/webroot/demo1/styles.css | 0 .../webroot/demo1/template.html | 0 .../SimpleWebServer}/webroot/demo2/demo.html | 0 .../webroot/demo2/img/background.jpg | Bin .../webroot/demo2/img/button_bg.jpg | Bin .../webroot/demo2/img/dot.png | Bin .../SimpleWebServer}/webroot/demo2/script.js | 0 .../SimpleWebServer}/webroot/demo2/styles.css | 0 .../example/fonts/DINMittelschriftStd.otf | Bin .../example/fonts/MyriadPro-LightCond.otf | Bin .../example/fonts/MyriadPro-SemiboldCond.otf | Bin .../webroot/example/fonts/stan0755.ttf | Bin .../webroot/example/fonts/tahoma.ttf | Bin .../webroot/example/fonts/tahomabd.ttf | Bin .../webroot/example/fonts/trebuc.ttf | Bin .../webroot/example/fonts/trebucbd.ttf | Bin .../webroot/example/html/contentpage.html | 0 .../webroot/example/html/css/styles.css | 0 .../webroot/example/html/images/b_footer.jpg | Bin .../webroot/example/html/images/btn_1.jpg | Bin .../example/html/images/btn_1_over.jpg | Bin .../webroot/example/html/images/btn_2.jpg | Bin .../example/html/images/btn_2_over.jpg | Bin .../webroot/example/html/images/btn_3.jpg | Bin .../example/html/images/btn_3_over.jpg | Bin .../webroot/example/html/images/btn_4.jpg | Bin .../example/html/images/btn_4_over.jpg | Bin .../webroot/example/html/images/btn_5.jpg | Bin .../example/html/images/btn_5_over.jpg | Bin .../webroot/example/html/images/btn_6.jpg | Bin .../example/html/images/btn_6_over.jpg | Bin .../example/html/images/client_login.jpg | Bin .../webroot/example/html/images/lines-07.jpg | Bin .../webroot/example/html/images/lines-09.jpg | Bin .../webroot/example/html/images/lines-11.jpg | Bin .../webroot/example/html/images/lines-13.jpg | Bin .../webroot/example/html/images/lines.jpg | Bin .../webroot/example/html/images/main-03.jpg | Bin .../webroot/example/html/images/main-15.jpg | Bin .../webroot/example/html/images/main.jpg | Bin .../webroot/example/html/images/news-19.jpg | Bin .../webroot/example/html/images/news-20.jpg | Bin .../webroot/example/html/images/news.jpg | Bin .../example/html/images/services-23.jpg | Bin .../example/html/images/services-25.jpg | Bin .../webroot/example/html/images/services.jpg | Bin .../example/html/images/spotlight-24.jpg | Bin .../webroot/example/html/images/spotlight.jpg | Bin .../example/html/images/welcome-18.jpg | Bin .../webroot/example/html/images/welcome.jpg | Bin .../webroot/example/html/index.html | 0 .../webroot/example/jpeg/template276.jpg | Bin .../webroot/example/psd/index.psd | Bin .../webroot/example/readme.html | 0 .../SimpleWebServer}/webroot/html/images.html | 0 .../webroot/html/images/btn_1.jpg | Bin .../webroot/html/images/pulpit.jpg | Bin .../SimpleWebServer}/webroot/html/simple.html | 0 .../webroot/html5/dataset.html | 0 .../SimpleWebServer}/webroot/post/index.html | 0 {src => library}/README | 0 .../configuration/http_server_configuration.e | 0 .../http_server_shared_configuration.e | 0 {src => library}/http_connection_handler.e | 0 {src => library}/http_constants.e | 0 {src => library}/http_encoding_facilities.e | 0 {src => library}/http_handler.e | 0 {src => library}/http_server.e | 0 {src => library}/io/http_input_stream.e | 0 {src => library}/io/http_output_stream.e | 0 .../request/http_request_handler.e | 0 {src => library}/response/http_response.e | 0 {src => library}/shared_uri_contents_types.e | 0 {src => library}/tcp_stream_socket.e | 0 {src => library}/uri_contents_types.e | 0 nino-safe.ecf | 7 +- nino.ecf | 7 +- readme.txt | 24 +-- src/http_protocol_handler.e | 177 ------------------ src/shared_http_request_handlers.e | 13 -- 92 files changed, 40 insertions(+), 217 deletions(-) rename {web_server => example/SimpleWebServer}/application.e (100%) rename web_server/application_handler.e => example/SimpleWebServer/application_connection_handler.e (100%) rename {src => example/SimpleWebServer}/request/get_request_handler.e (100%) rename {src => example/SimpleWebServer}/request/head_request_handler.e (100%) rename {src => example/SimpleWebServer}/request/post_request_handler.e (100%) create mode 100644 example/SimpleWebServer/web_server-safe.ecf rename {web_server => example/SimpleWebServer}/web_server.ecf (80%) rename {web_server => example/SimpleWebServer}/webroot/demo1/img/gradient_light.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/demo1/jquery.scrollTo-1.4.2/changes.txt (100%) rename {web_server => example/SimpleWebServer}/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo-min.js (100%) rename {web_server => example/SimpleWebServer}/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo.js (100%) rename {web_server => example/SimpleWebServer}/webroot/demo1/script.js (100%) rename {web_server => example/SimpleWebServer}/webroot/demo1/styles.css (100%) rename {web_server => example/SimpleWebServer}/webroot/demo1/template.html (100%) rename {web_server => example/SimpleWebServer}/webroot/demo2/demo.html (100%) rename {web_server => example/SimpleWebServer}/webroot/demo2/img/background.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/demo2/img/button_bg.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/demo2/img/dot.png (100%) rename {web_server => example/SimpleWebServer}/webroot/demo2/script.js (100%) rename {web_server => example/SimpleWebServer}/webroot/demo2/styles.css (100%) rename {web_server => example/SimpleWebServer}/webroot/example/fonts/DINMittelschriftStd.otf (100%) rename {web_server => example/SimpleWebServer}/webroot/example/fonts/MyriadPro-LightCond.otf (100%) rename {web_server => example/SimpleWebServer}/webroot/example/fonts/MyriadPro-SemiboldCond.otf (100%) rename {web_server => example/SimpleWebServer}/webroot/example/fonts/stan0755.ttf (100%) rename {web_server => example/SimpleWebServer}/webroot/example/fonts/tahoma.ttf (100%) rename {web_server => example/SimpleWebServer}/webroot/example/fonts/tahomabd.ttf (100%) rename {web_server => example/SimpleWebServer}/webroot/example/fonts/trebuc.ttf (100%) rename {web_server => example/SimpleWebServer}/webroot/example/fonts/trebucbd.ttf (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/contentpage.html (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/css/styles.css (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/b_footer.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_1.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_1_over.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_2.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_2_over.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_3.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_3_over.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_4.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_4_over.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_5.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_5_over.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_6.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/btn_6_over.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/client_login.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/lines-07.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/lines-09.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/lines-11.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/lines-13.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/lines.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/main-03.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/main-15.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/main.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/news-19.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/news-20.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/news.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/services-23.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/services-25.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/services.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/spotlight-24.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/spotlight.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/welcome-18.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/images/welcome.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/html/index.html (100%) rename {web_server => example/SimpleWebServer}/webroot/example/jpeg/template276.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/example/psd/index.psd (100%) rename {web_server => example/SimpleWebServer}/webroot/example/readme.html (100%) rename {web_server => example/SimpleWebServer}/webroot/html/images.html (100%) rename {web_server => example/SimpleWebServer}/webroot/html/images/btn_1.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/html/images/pulpit.jpg (100%) rename {web_server => example/SimpleWebServer}/webroot/html/simple.html (100%) rename {web_server => example/SimpleWebServer}/webroot/html5/dataset.html (100%) rename {web_server => example/SimpleWebServer}/webroot/post/index.html (100%) rename {src => library}/README (100%) rename {src => library}/configuration/http_server_configuration.e (100%) rename {src => library}/configuration/http_server_shared_configuration.e (100%) rename {src => library}/http_connection_handler.e (100%) rename {src => library}/http_constants.e (100%) rename {src => library}/http_encoding_facilities.e (100%) rename {src => library}/http_handler.e (100%) rename {src => library}/http_server.e (100%) rename {src => library}/io/http_input_stream.e (100%) rename {src => library}/io/http_output_stream.e (100%) rename {src => library}/request/http_request_handler.e (100%) rename {src => library}/response/http_response.e (100%) rename {src => library}/shared_uri_contents_types.e (100%) rename {src => library}/tcp_stream_socket.e (100%) rename {src => library}/uri_contents_types.e (100%) delete mode 100644 src/http_protocol_handler.e delete mode 100644 src/shared_http_request_handlers.e diff --git a/web_server/application.e b/example/SimpleWebServer/application.e similarity index 100% rename from web_server/application.e rename to example/SimpleWebServer/application.e diff --git a/web_server/application_handler.e b/example/SimpleWebServer/application_connection_handler.e similarity index 100% rename from web_server/application_handler.e rename to example/SimpleWebServer/application_connection_handler.e diff --git a/src/request/get_request_handler.e b/example/SimpleWebServer/request/get_request_handler.e similarity index 100% rename from src/request/get_request_handler.e rename to example/SimpleWebServer/request/get_request_handler.e diff --git a/src/request/head_request_handler.e b/example/SimpleWebServer/request/head_request_handler.e similarity index 100% rename from src/request/head_request_handler.e rename to example/SimpleWebServer/request/head_request_handler.e diff --git a/src/request/post_request_handler.e b/example/SimpleWebServer/request/post_request_handler.e similarity index 100% rename from src/request/post_request_handler.e rename to example/SimpleWebServer/request/post_request_handler.e diff --git a/example/SimpleWebServer/web_server-safe.ecf b/example/SimpleWebServer/web_server-safe.ecf new file mode 100644 index 00000000..299fd578 --- /dev/null +++ b/example/SimpleWebServer/web_server-safe.ecf @@ -0,0 +1,21 @@ + + + + + + /EIFGENs$ + /CVS$ + /.svn$ + /.git$ + + + + + + + + + + diff --git a/web_server/web_server.ecf b/example/SimpleWebServer/web_server.ecf similarity index 80% rename from web_server/web_server.ecf rename to example/SimpleWebServer/web_server.ecf index 826dfa8b..7a9758a1 100644 --- a/web_server/web_server.ecf +++ b/example/SimpleWebServer/web_server.ecf @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/web_server/webroot/demo1/img/gradient_light.jpg b/example/SimpleWebServer/webroot/demo1/img/gradient_light.jpg similarity index 100% rename from web_server/webroot/demo1/img/gradient_light.jpg rename to example/SimpleWebServer/webroot/demo1/img/gradient_light.jpg diff --git a/web_server/webroot/demo1/jquery.scrollTo-1.4.2/changes.txt b/example/SimpleWebServer/webroot/demo1/jquery.scrollTo-1.4.2/changes.txt similarity index 100% rename from web_server/webroot/demo1/jquery.scrollTo-1.4.2/changes.txt rename to example/SimpleWebServer/webroot/demo1/jquery.scrollTo-1.4.2/changes.txt diff --git a/web_server/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo-min.js b/example/SimpleWebServer/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo-min.js similarity index 100% rename from web_server/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo-min.js rename to example/SimpleWebServer/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo-min.js diff --git a/web_server/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo.js b/example/SimpleWebServer/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo.js similarity index 100% rename from web_server/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo.js rename to example/SimpleWebServer/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo.js diff --git a/web_server/webroot/demo1/script.js b/example/SimpleWebServer/webroot/demo1/script.js similarity index 100% rename from web_server/webroot/demo1/script.js rename to example/SimpleWebServer/webroot/demo1/script.js diff --git a/web_server/webroot/demo1/styles.css b/example/SimpleWebServer/webroot/demo1/styles.css similarity index 100% rename from web_server/webroot/demo1/styles.css rename to example/SimpleWebServer/webroot/demo1/styles.css diff --git a/web_server/webroot/demo1/template.html b/example/SimpleWebServer/webroot/demo1/template.html similarity index 100% rename from web_server/webroot/demo1/template.html rename to example/SimpleWebServer/webroot/demo1/template.html diff --git a/web_server/webroot/demo2/demo.html b/example/SimpleWebServer/webroot/demo2/demo.html similarity index 100% rename from web_server/webroot/demo2/demo.html rename to example/SimpleWebServer/webroot/demo2/demo.html diff --git a/web_server/webroot/demo2/img/background.jpg b/example/SimpleWebServer/webroot/demo2/img/background.jpg similarity index 100% rename from web_server/webroot/demo2/img/background.jpg rename to example/SimpleWebServer/webroot/demo2/img/background.jpg diff --git a/web_server/webroot/demo2/img/button_bg.jpg b/example/SimpleWebServer/webroot/demo2/img/button_bg.jpg similarity index 100% rename from web_server/webroot/demo2/img/button_bg.jpg rename to example/SimpleWebServer/webroot/demo2/img/button_bg.jpg diff --git a/web_server/webroot/demo2/img/dot.png b/example/SimpleWebServer/webroot/demo2/img/dot.png similarity index 100% rename from web_server/webroot/demo2/img/dot.png rename to example/SimpleWebServer/webroot/demo2/img/dot.png diff --git a/web_server/webroot/demo2/script.js b/example/SimpleWebServer/webroot/demo2/script.js similarity index 100% rename from web_server/webroot/demo2/script.js rename to example/SimpleWebServer/webroot/demo2/script.js diff --git a/web_server/webroot/demo2/styles.css b/example/SimpleWebServer/webroot/demo2/styles.css similarity index 100% rename from web_server/webroot/demo2/styles.css rename to example/SimpleWebServer/webroot/demo2/styles.css diff --git a/web_server/webroot/example/fonts/DINMittelschriftStd.otf b/example/SimpleWebServer/webroot/example/fonts/DINMittelschriftStd.otf similarity index 100% rename from web_server/webroot/example/fonts/DINMittelschriftStd.otf rename to example/SimpleWebServer/webroot/example/fonts/DINMittelschriftStd.otf diff --git a/web_server/webroot/example/fonts/MyriadPro-LightCond.otf b/example/SimpleWebServer/webroot/example/fonts/MyriadPro-LightCond.otf similarity index 100% rename from web_server/webroot/example/fonts/MyriadPro-LightCond.otf rename to example/SimpleWebServer/webroot/example/fonts/MyriadPro-LightCond.otf diff --git a/web_server/webroot/example/fonts/MyriadPro-SemiboldCond.otf b/example/SimpleWebServer/webroot/example/fonts/MyriadPro-SemiboldCond.otf similarity index 100% rename from web_server/webroot/example/fonts/MyriadPro-SemiboldCond.otf rename to example/SimpleWebServer/webroot/example/fonts/MyriadPro-SemiboldCond.otf diff --git a/web_server/webroot/example/fonts/stan0755.ttf b/example/SimpleWebServer/webroot/example/fonts/stan0755.ttf similarity index 100% rename from web_server/webroot/example/fonts/stan0755.ttf rename to example/SimpleWebServer/webroot/example/fonts/stan0755.ttf diff --git a/web_server/webroot/example/fonts/tahoma.ttf b/example/SimpleWebServer/webroot/example/fonts/tahoma.ttf similarity index 100% rename from web_server/webroot/example/fonts/tahoma.ttf rename to example/SimpleWebServer/webroot/example/fonts/tahoma.ttf diff --git a/web_server/webroot/example/fonts/tahomabd.ttf b/example/SimpleWebServer/webroot/example/fonts/tahomabd.ttf similarity index 100% rename from web_server/webroot/example/fonts/tahomabd.ttf rename to example/SimpleWebServer/webroot/example/fonts/tahomabd.ttf diff --git a/web_server/webroot/example/fonts/trebuc.ttf b/example/SimpleWebServer/webroot/example/fonts/trebuc.ttf similarity index 100% rename from web_server/webroot/example/fonts/trebuc.ttf rename to example/SimpleWebServer/webroot/example/fonts/trebuc.ttf diff --git a/web_server/webroot/example/fonts/trebucbd.ttf b/example/SimpleWebServer/webroot/example/fonts/trebucbd.ttf similarity index 100% rename from web_server/webroot/example/fonts/trebucbd.ttf rename to example/SimpleWebServer/webroot/example/fonts/trebucbd.ttf diff --git a/web_server/webroot/example/html/contentpage.html b/example/SimpleWebServer/webroot/example/html/contentpage.html similarity index 100% rename from web_server/webroot/example/html/contentpage.html rename to example/SimpleWebServer/webroot/example/html/contentpage.html diff --git a/web_server/webroot/example/html/css/styles.css b/example/SimpleWebServer/webroot/example/html/css/styles.css similarity index 100% rename from web_server/webroot/example/html/css/styles.css rename to example/SimpleWebServer/webroot/example/html/css/styles.css diff --git a/web_server/webroot/example/html/images/b_footer.jpg b/example/SimpleWebServer/webroot/example/html/images/b_footer.jpg similarity index 100% rename from web_server/webroot/example/html/images/b_footer.jpg rename to example/SimpleWebServer/webroot/example/html/images/b_footer.jpg diff --git a/web_server/webroot/example/html/images/btn_1.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_1.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_1.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_1.jpg diff --git a/web_server/webroot/example/html/images/btn_1_over.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_1_over.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_1_over.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_1_over.jpg diff --git a/web_server/webroot/example/html/images/btn_2.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_2.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_2.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_2.jpg diff --git a/web_server/webroot/example/html/images/btn_2_over.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_2_over.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_2_over.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_2_over.jpg diff --git a/web_server/webroot/example/html/images/btn_3.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_3.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_3.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_3.jpg diff --git a/web_server/webroot/example/html/images/btn_3_over.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_3_over.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_3_over.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_3_over.jpg diff --git a/web_server/webroot/example/html/images/btn_4.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_4.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_4.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_4.jpg diff --git a/web_server/webroot/example/html/images/btn_4_over.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_4_over.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_4_over.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_4_over.jpg diff --git a/web_server/webroot/example/html/images/btn_5.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_5.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_5.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_5.jpg diff --git a/web_server/webroot/example/html/images/btn_5_over.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_5_over.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_5_over.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_5_over.jpg diff --git a/web_server/webroot/example/html/images/btn_6.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_6.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_6.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_6.jpg diff --git a/web_server/webroot/example/html/images/btn_6_over.jpg b/example/SimpleWebServer/webroot/example/html/images/btn_6_over.jpg similarity index 100% rename from web_server/webroot/example/html/images/btn_6_over.jpg rename to example/SimpleWebServer/webroot/example/html/images/btn_6_over.jpg diff --git a/web_server/webroot/example/html/images/client_login.jpg b/example/SimpleWebServer/webroot/example/html/images/client_login.jpg similarity index 100% rename from web_server/webroot/example/html/images/client_login.jpg rename to example/SimpleWebServer/webroot/example/html/images/client_login.jpg diff --git a/web_server/webroot/example/html/images/lines-07.jpg b/example/SimpleWebServer/webroot/example/html/images/lines-07.jpg similarity index 100% rename from web_server/webroot/example/html/images/lines-07.jpg rename to example/SimpleWebServer/webroot/example/html/images/lines-07.jpg diff --git a/web_server/webroot/example/html/images/lines-09.jpg b/example/SimpleWebServer/webroot/example/html/images/lines-09.jpg similarity index 100% rename from web_server/webroot/example/html/images/lines-09.jpg rename to example/SimpleWebServer/webroot/example/html/images/lines-09.jpg diff --git a/web_server/webroot/example/html/images/lines-11.jpg b/example/SimpleWebServer/webroot/example/html/images/lines-11.jpg similarity index 100% rename from web_server/webroot/example/html/images/lines-11.jpg rename to example/SimpleWebServer/webroot/example/html/images/lines-11.jpg diff --git a/web_server/webroot/example/html/images/lines-13.jpg b/example/SimpleWebServer/webroot/example/html/images/lines-13.jpg similarity index 100% rename from web_server/webroot/example/html/images/lines-13.jpg rename to example/SimpleWebServer/webroot/example/html/images/lines-13.jpg diff --git a/web_server/webroot/example/html/images/lines.jpg b/example/SimpleWebServer/webroot/example/html/images/lines.jpg similarity index 100% rename from web_server/webroot/example/html/images/lines.jpg rename to example/SimpleWebServer/webroot/example/html/images/lines.jpg diff --git a/web_server/webroot/example/html/images/main-03.jpg b/example/SimpleWebServer/webroot/example/html/images/main-03.jpg similarity index 100% rename from web_server/webroot/example/html/images/main-03.jpg rename to example/SimpleWebServer/webroot/example/html/images/main-03.jpg diff --git a/web_server/webroot/example/html/images/main-15.jpg b/example/SimpleWebServer/webroot/example/html/images/main-15.jpg similarity index 100% rename from web_server/webroot/example/html/images/main-15.jpg rename to example/SimpleWebServer/webroot/example/html/images/main-15.jpg diff --git a/web_server/webroot/example/html/images/main.jpg b/example/SimpleWebServer/webroot/example/html/images/main.jpg similarity index 100% rename from web_server/webroot/example/html/images/main.jpg rename to example/SimpleWebServer/webroot/example/html/images/main.jpg diff --git a/web_server/webroot/example/html/images/news-19.jpg b/example/SimpleWebServer/webroot/example/html/images/news-19.jpg similarity index 100% rename from web_server/webroot/example/html/images/news-19.jpg rename to example/SimpleWebServer/webroot/example/html/images/news-19.jpg diff --git a/web_server/webroot/example/html/images/news-20.jpg b/example/SimpleWebServer/webroot/example/html/images/news-20.jpg similarity index 100% rename from web_server/webroot/example/html/images/news-20.jpg rename to example/SimpleWebServer/webroot/example/html/images/news-20.jpg diff --git a/web_server/webroot/example/html/images/news.jpg b/example/SimpleWebServer/webroot/example/html/images/news.jpg similarity index 100% rename from web_server/webroot/example/html/images/news.jpg rename to example/SimpleWebServer/webroot/example/html/images/news.jpg diff --git a/web_server/webroot/example/html/images/services-23.jpg b/example/SimpleWebServer/webroot/example/html/images/services-23.jpg similarity index 100% rename from web_server/webroot/example/html/images/services-23.jpg rename to example/SimpleWebServer/webroot/example/html/images/services-23.jpg diff --git a/web_server/webroot/example/html/images/services-25.jpg b/example/SimpleWebServer/webroot/example/html/images/services-25.jpg similarity index 100% rename from web_server/webroot/example/html/images/services-25.jpg rename to example/SimpleWebServer/webroot/example/html/images/services-25.jpg diff --git a/web_server/webroot/example/html/images/services.jpg b/example/SimpleWebServer/webroot/example/html/images/services.jpg similarity index 100% rename from web_server/webroot/example/html/images/services.jpg rename to example/SimpleWebServer/webroot/example/html/images/services.jpg diff --git a/web_server/webroot/example/html/images/spotlight-24.jpg b/example/SimpleWebServer/webroot/example/html/images/spotlight-24.jpg similarity index 100% rename from web_server/webroot/example/html/images/spotlight-24.jpg rename to example/SimpleWebServer/webroot/example/html/images/spotlight-24.jpg diff --git a/web_server/webroot/example/html/images/spotlight.jpg b/example/SimpleWebServer/webroot/example/html/images/spotlight.jpg similarity index 100% rename from web_server/webroot/example/html/images/spotlight.jpg rename to example/SimpleWebServer/webroot/example/html/images/spotlight.jpg diff --git a/web_server/webroot/example/html/images/welcome-18.jpg b/example/SimpleWebServer/webroot/example/html/images/welcome-18.jpg similarity index 100% rename from web_server/webroot/example/html/images/welcome-18.jpg rename to example/SimpleWebServer/webroot/example/html/images/welcome-18.jpg diff --git a/web_server/webroot/example/html/images/welcome.jpg b/example/SimpleWebServer/webroot/example/html/images/welcome.jpg similarity index 100% rename from web_server/webroot/example/html/images/welcome.jpg rename to example/SimpleWebServer/webroot/example/html/images/welcome.jpg diff --git a/web_server/webroot/example/html/index.html b/example/SimpleWebServer/webroot/example/html/index.html similarity index 100% rename from web_server/webroot/example/html/index.html rename to example/SimpleWebServer/webroot/example/html/index.html diff --git a/web_server/webroot/example/jpeg/template276.jpg b/example/SimpleWebServer/webroot/example/jpeg/template276.jpg similarity index 100% rename from web_server/webroot/example/jpeg/template276.jpg rename to example/SimpleWebServer/webroot/example/jpeg/template276.jpg diff --git a/web_server/webroot/example/psd/index.psd b/example/SimpleWebServer/webroot/example/psd/index.psd similarity index 100% rename from web_server/webroot/example/psd/index.psd rename to example/SimpleWebServer/webroot/example/psd/index.psd diff --git a/web_server/webroot/example/readme.html b/example/SimpleWebServer/webroot/example/readme.html similarity index 100% rename from web_server/webroot/example/readme.html rename to example/SimpleWebServer/webroot/example/readme.html diff --git a/web_server/webroot/html/images.html b/example/SimpleWebServer/webroot/html/images.html similarity index 100% rename from web_server/webroot/html/images.html rename to example/SimpleWebServer/webroot/html/images.html diff --git a/web_server/webroot/html/images/btn_1.jpg b/example/SimpleWebServer/webroot/html/images/btn_1.jpg similarity index 100% rename from web_server/webroot/html/images/btn_1.jpg rename to example/SimpleWebServer/webroot/html/images/btn_1.jpg diff --git a/web_server/webroot/html/images/pulpit.jpg b/example/SimpleWebServer/webroot/html/images/pulpit.jpg similarity index 100% rename from web_server/webroot/html/images/pulpit.jpg rename to example/SimpleWebServer/webroot/html/images/pulpit.jpg diff --git a/web_server/webroot/html/simple.html b/example/SimpleWebServer/webroot/html/simple.html similarity index 100% rename from web_server/webroot/html/simple.html rename to example/SimpleWebServer/webroot/html/simple.html diff --git a/web_server/webroot/html5/dataset.html b/example/SimpleWebServer/webroot/html5/dataset.html similarity index 100% rename from web_server/webroot/html5/dataset.html rename to example/SimpleWebServer/webroot/html5/dataset.html diff --git a/web_server/webroot/post/index.html b/example/SimpleWebServer/webroot/post/index.html similarity index 100% rename from web_server/webroot/post/index.html rename to example/SimpleWebServer/webroot/post/index.html diff --git a/src/README b/library/README similarity index 100% rename from src/README rename to library/README diff --git a/src/configuration/http_server_configuration.e b/library/configuration/http_server_configuration.e similarity index 100% rename from src/configuration/http_server_configuration.e rename to library/configuration/http_server_configuration.e diff --git a/src/configuration/http_server_shared_configuration.e b/library/configuration/http_server_shared_configuration.e similarity index 100% rename from src/configuration/http_server_shared_configuration.e rename to library/configuration/http_server_shared_configuration.e diff --git a/src/http_connection_handler.e b/library/http_connection_handler.e similarity index 100% rename from src/http_connection_handler.e rename to library/http_connection_handler.e diff --git a/src/http_constants.e b/library/http_constants.e similarity index 100% rename from src/http_constants.e rename to library/http_constants.e diff --git a/src/http_encoding_facilities.e b/library/http_encoding_facilities.e similarity index 100% rename from src/http_encoding_facilities.e rename to library/http_encoding_facilities.e diff --git a/src/http_handler.e b/library/http_handler.e similarity index 100% rename from src/http_handler.e rename to library/http_handler.e diff --git a/src/http_server.e b/library/http_server.e similarity index 100% rename from src/http_server.e rename to library/http_server.e diff --git a/src/io/http_input_stream.e b/library/io/http_input_stream.e similarity index 100% rename from src/io/http_input_stream.e rename to library/io/http_input_stream.e diff --git a/src/io/http_output_stream.e b/library/io/http_output_stream.e similarity index 100% rename from src/io/http_output_stream.e rename to library/io/http_output_stream.e diff --git a/src/request/http_request_handler.e b/library/request/http_request_handler.e similarity index 100% rename from src/request/http_request_handler.e rename to library/request/http_request_handler.e diff --git a/src/response/http_response.e b/library/response/http_response.e similarity index 100% rename from src/response/http_response.e rename to library/response/http_response.e diff --git a/src/shared_uri_contents_types.e b/library/shared_uri_contents_types.e similarity index 100% rename from src/shared_uri_contents_types.e rename to library/shared_uri_contents_types.e diff --git a/src/tcp_stream_socket.e b/library/tcp_stream_socket.e similarity index 100% rename from src/tcp_stream_socket.e rename to library/tcp_stream_socket.e diff --git a/src/uri_contents_types.e b/library/uri_contents_types.e similarity index 100% rename from src/uri_contents_types.e rename to library/uri_contents_types.e diff --git a/nino-safe.ecf b/nino-safe.ecf index 6e01e5da..95fbf5ae 100644 --- a/nino-safe.ecf +++ b/nino-safe.ecf @@ -15,12 +15,7 @@ - - - head_request_handler.e - shared_http_request_handlers.e - http_protocol_handler.e - + diff --git a/nino.ecf b/nino.ecf index 5cb775ee..7ed60bda 100644 --- a/nino.ecf +++ b/nino.ecf @@ -15,12 +15,7 @@ - - - head_request_handler.e - shared_http_request_handlers.e - http_protocol_handler.e - + diff --git a/readme.txt b/readme.txt index 67eb7104..e1033b2f 100644 --- a/readme.txt +++ b/readme.txt @@ -1,21 +1,23 @@ Eiffel Nino HTTPD ================= -The code is based on Xebra and Emu Web Server. - - -Goal -======== -HTTPD server for development. - +Eiffel Nino is and HTTPD server. It's a work in progress, so maybe it will be refactored. +The goal of is to provide a simple web server for development (like Java, Python and Ruby provide) +The code is based on Xebra and Emu Web Server. + + +Goal +======== +HTTPD server for development. + Features -======= - +======= + Testing -======= +======= The server work fine in Windows and Linux. Run the server and point your browser to one of the following URIs @@ -30,7 +32,7 @@ Run the server and point your browser to one of the following URIs 8) http://localhost:9000/html5/dataset.html Known Issues -============ +============ diff --git a/src/http_protocol_handler.e b/src/http_protocol_handler.e deleted file mode 100644 index 6be59b67..00000000 --- a/src/http_protocol_handler.e +++ /dev/null @@ -1,177 +0,0 @@ -class HTTP_PROTOCOL_HANDLER - -inherit - - SHARED_HTTP_REQUEST_HANDLERS - - HTTP_CONSTANTS - -create - make -feature -- Initialization - - make (socket: NETWORK_STREAM_SOCKET) - require - valid_socket: socket /= Void and then socket.is_bound - local - done: BOOLEAN - client_socket: detachable NETWORK_STREAM_SOCKET - do - from - done := False - until - done - loop - socket.accept - client_socket := socket.accepted - if client_socket = Void then - -- Some error occured, perhaps because of the timeout - -- We probably should provide some diagnostics here - io.put_string ("accept result = Void") - io.put_new_line - else - perform_client_communication (client_socket) - end - end - end - - -feature -- Access - method : STRING - uri : STRING - version : STRING - request_header_map : HASH_TABLE [STRING,STRING] - -- Containts key value of the header - -feature -- Implementation - - perform_client_communication (socket: NETWORK_STREAM_SOCKET) - require - socket_attached: socket /= Void - socket_valid: socket.is_open_read and then socket.is_open_write - local - done: BOOLEAN - l_address, l_peer_address: detachable NETWORK_SOCKET_ADDRESS - do - l_address := socket.address - l_peer_address := socket.peer_address - check - l_address_attached: l_address /= Void - l_peer_address_attached: l_peer_address /= Void - end - io.put_string ("Accepted client on the listen socket address = "+ l_address.host_address.host_address + " port = " + l_address.port.out +".") - io.put_new_line - io.put_string ("%T Accepted client address = " + l_peer_address.host_address.host_address + " , port = " + l_peer_address.port.out) - io.put_new_line - create request_header_map.make (20) - from - done := False - until - done - loop - if socket.socket_ok then - done := receive_message_and_send_reply (socket) - request_header_map.wipe_out - else - done := True - end - end - io.put_string ("Finished processing the client, address = "+ l_peer_address.host_address.host_address + " port = " + l_peer_address.port.out + ".") - io.put_new_line - end - - receive_message_and_send_reply (client_socket: NETWORK_STREAM_SOCKET): BOOLEAN - require - socket_attached: client_socket /= Void - socket_valid: client_socket.is_open_read and then client_socket.is_open_write - local - message: detachable STRING - l_http_request : HTTP_REQUEST_HANDLER - do - parse_request_line (client_socket) - message := receive_message_internal (client_socket) - if method.is_equal (Get) then - create {GET_REQUEST_HANDLER} l_http_request - l_http_request.set_uri (uri) - l_http_request.process - send_message (client_socket, l_http_request.answer.reply_header + l_http_request.answer.reply_text) - elseif method.is_equal (Post) then - elseif method.is_equal (Put) then - elseif method.is_equal (Options) then - elseif method.is_equal (Head) then - elseif method.is_equal (Delete) then - elseif method.is_equal (Trace) then - elseif method.is_equal (Connect) then - else - debug - print ("Method not supported") - end - end - end - - - parse_request_line (socket: NETWORK_STREAM_SOCKET) - require - socket: socket /= Void and then not socket.is_closed - do - socket.read_line - parse_request_line_internal (socket.last_string) - end - - receive_message_internal (socket: NETWORK_STREAM_SOCKET) : STRING - require - socket: socket /= Void and then not socket.is_closed - local - end_of_stream : BOOLEAN - pos : INTEGER - line : STRING - do - from - socket.read_line - Result := "" - until - end_of_stream - loop - line := socket.last_string - print ("%N" +line+ "%N") - pos := line.index_of(':',1) - request_header_map.put (line.substring (pos + 1, line.count), line.substring (1,pos-1)) - Result.append(socket.last_string) - if not socket.last_string.is_equal("%R") and socket.socket_ok then - socket.read_line - else - end_of_stream := True - end - end - end - - send_message (client_socket : NETWORK_STREAM_SOCKET ; a_msg: STRING) - local - a_package : PACKET - a_data : MANAGED_POINTER - c_string : C_STRING - do - create c_string.make (a_msg) - create a_data.make_from_pointer (c_string.item, a_msg.count + 1) - create a_package.make_from_managed_pointer (a_data) - client_socket.send (a_package, 0) - end - - - parse_request_line_internal (line: STRING) - require - line /= Void - local - pos, next_pos: INTEGER - do - print ("%N parse request line:%N" + line) - pos := line.index_of (' ', 1) - method := line.substring (1, pos - 1) - next_pos := line.index_of (' ', pos+1) - uri := line.substring (pos+1, next_pos-1) - version := line.substring (next_pos + 1, line.count) - ensure - not_void_method: method /= Void - end - -end diff --git a/src/shared_http_request_handlers.e b/src/shared_http_request_handlers.e deleted file mode 100644 index 851d012c..00000000 --- a/src/shared_http_request_handlers.e +++ /dev/null @@ -1,13 +0,0 @@ -class SHARED_HTTP_REQUEST_HANDLERS - -feature - - http_request_handlers: HASH_TABLE [HTTP_REQUEST_HANDLER, STRING] - local - a_handler: HTTP_REQUEST_HANDLER - once - create Result.make (5) - create {GET_REQUEST_HANDLER} a_handler - Result.put (a_handler, "GET") - end -end