Permalink
Browse files

EWTS corrected, Yaws 1.85 ported

  • Loading branch information...
1 parent 65efeb5 commit 0349757b1ec04ed8fd823129f8e42e966f90cf7d Michal Ptaszek committed Oct 28, 2009
Showing with 90 additions and 272 deletions.
  1. +8 −3 Emakefile
  2. +2 −2 INSTALL
  3. +1 −1 bin/start.erl
  4. +3 −1 bin/test.erl
  5. +1 −1 lib/eptic-1.4/Emakefile
  6. +2 −2 lib/eptic-1.4/priv/inets_https.conf
  7. +2 −2 lib/eptic-1.4/priv/yaws.conf
  8. +5 −5 lib/erlydtl-0.5.3/ebin/erlydtl.app
  9. +1 −1 lib/ewts-1.0/ebin/ewts.app
  10. +5 −2 lib/ewts-1.0/src/ewts.erl
  11. BIN lib/yaws-1.80/ebin/authmod_gssapi.beam
  12. BIN lib/yaws-1.80/ebin/mime_type_c.beam
  13. BIN lib/yaws-1.80/ebin/mime_types.beam
  14. BIN lib/yaws-1.80/ebin/yaws.beam
  15. BIN lib/yaws-1.80/ebin/yaws_404.beam
  16. BIN lib/yaws-1.80/ebin/yaws_api.beam
  17. BIN lib/yaws-1.80/ebin/yaws_appmod_cgi.beam
  18. BIN lib/yaws-1.80/ebin/yaws_cgi.beam
  19. BIN lib/yaws-1.80/ebin/yaws_config.beam
  20. BIN lib/yaws-1.80/ebin/yaws_ctl.beam
  21. BIN lib/yaws-1.80/ebin/yaws_generated.beam
  22. BIN lib/yaws-1.80/ebin/yaws_rpc.beam
  23. BIN lib/yaws-1.80/ebin/yaws_rss.beam
  24. BIN lib/yaws-1.80/ebin/yaws_sendfile.beam
  25. BIN lib/yaws-1.80/ebin/yaws_sendfile_compat.beam
  26. BIN lib/yaws-1.80/ebin/yaws_server.beam
  27. BIN lib/yaws-1.80/ebin/yaws_session_server.beam
  28. BIN lib/yaws-1.80/ebin/yaws_soap_lib.beam
  29. BIN lib/yaws-1.80/ebin/yaws_soap_srv.beam
  30. BIN lib/yaws-1.80/ebin/yaws_ticker.beam
  31. +0 −99 lib/yaws-1.80/priv/mime.types
  32. +0 −128 lib/yaws-1.80/priv/yaws.conf
  33. 0 lib/{yaws-1.80 → yaws-1.85}/LICENSE
  34. 0 lib/{yaws-1.80 → yaws-1.85}/ebin/.empty
  35. BIN lib/yaws-1.85/ebin/authmod_gssapi.beam
  36. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/haxe.beam
  37. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/json.beam
  38. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/jsonrpc.beam
  39. BIN lib/yaws-1.85/ebin/mime_type_c.beam
  40. BIN lib/yaws-1.85/ebin/mime_types.beam
  41. +2 −2 lib/{yaws-1.80 → yaws-1.85}/ebin/yaws.app
  42. BIN lib/yaws-1.85/ebin/yaws.beam
  43. BIN lib/yaws-1.85/ebin/yaws_api.beam
  44. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_app.beam
  45. BIN lib/yaws-1.85/ebin/yaws_appmod_cgi.beam
  46. BIN lib/yaws-1.85/ebin/yaws_appmod_fcgi.beam
  47. BIN lib/yaws-1.85/ebin/yaws_cgi.beam
  48. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_compile.beam
  49. BIN lib/yaws-1.85/ebin/yaws_config.beam
  50. BIN lib/yaws-1.85/ebin/yaws_ctl.beam
  51. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_dav.beam
  52. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_debug.beam
  53. BIN lib/yaws-1.85/ebin/yaws_generated.beam
  54. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_html.beam
  55. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_jsonrpc.beam
  56. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_log.beam
  57. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_log_file_h.beam
  58. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_ls.beam
  59. BIN lib/yaws-1.85/ebin/yaws_multipart.beam
  60. BIN lib/yaws-1.85/ebin/yaws_outmod.beam
  61. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_pam.beam
  62. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_revproxy.beam
  63. BIN lib/yaws-1.85/ebin/yaws_rpc.beam
  64. BIN lib/yaws-1.85/ebin/yaws_rss.beam
  65. BIN lib/yaws-1.85/ebin/yaws_sendfile.beam
  66. BIN lib/yaws-1.85/ebin/yaws_sendfile_compat.beam
  67. BIN lib/yaws-1.85/ebin/yaws_server.beam
  68. BIN lib/yaws-1.85/ebin/yaws_session_server.beam
  69. BIN lib/yaws-1.85/ebin/yaws_soap_lib.beam
  70. BIN lib/yaws-1.85/ebin/yaws_soap_srv.beam
  71. BIN lib/yaws-1.85/ebin/yaws_stats.beam
  72. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_sup.beam
  73. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_sup_restarts.beam
  74. BIN lib/yaws-1.85/ebin/yaws_ticker.beam
  75. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_xmlrpc.beam
  76. BIN lib/{yaws-1.80 → yaws-1.85}/ebin/yaws_zlib.beam
  77. +6 −0 lib/{yaws-1.80 → yaws-1.85}/include/erlsom.hrl
  78. 0 lib/{yaws-1.80 → yaws-1.85}/include/soap.hrl
  79. +49 −20 lib/{yaws-1.80 → yaws-1.85}/include/yaws.hrl
  80. +3 −3 lib/{yaws-1.80 → yaws-1.85}/include/yaws_api.hrl
  81. 0 lib/{yaws-1.80 → yaws-1.85}/include/yaws_dav.hrl
  82. 0 lib/{yaws-1.80 → yaws-1.85}/priv/envelope.xsd
  83. BIN lib/yaws-1.85/priv/lib/setuid_drv.so
  84. BIN lib/yaws-1.85/priv/lib/yaws_sendfile_drv.so
  85. 0 lib/{yaws-1.80 → yaws-1.85}/priv/soap.xsd
  86. 0 lib/{yaws-1.80 → yaws-1.85}/priv/wsdl.xsd
View
@@ -1,16 +1,16 @@
{'lib/eptic-1.4/src/*', [
{outdir, "lib/eptic-1.4/ebin"},
{i, "lib/eptic-1.4/include"},
- {i, "lib/yaws-1.80/include"},
+ {i, "lib/yaws-1.85/include"},
debug_info,
strict_record_tests,
netload]}.
{'lib/eptic_fe-1.0/src/*',
[{outdir, "lib/eptic_fe-1.0/ebin"},
- {i, "lib/eptic-1.3/include"},
+ {i, "lib/eptic-1.4/include"},
{i, "lib/eptic_fe-1.0/include"},
- {i, "lib/yaws-1.80/include"},
+ {i, "lib/yaws-1.85/include"},
debug_info,
strict_record_tests,
netload]}.
@@ -50,3 +50,8 @@
strict_record_tests,
netload]}.
+{"lib/myapp-0.1/src/*",
+ [{outdir,"lib/myapp-0.1/ebin"},
+ {i,"lib/myapp-0.1/include"},
+ debug_info,strict_record_tests,netload]}.
+
View
@@ -1,12 +1,12 @@
-ErlangWeb 1.3 Installation Guide
+ErlangWeb 1.4 Installation Guide
================================
1. Requirements
-Erlang/OTP R12B-5 or later
-Yaws 1.80 or later (included in the package)
2. Start
-To start working with ErlangWeb you should compile the three main applications:
+To start working with Erlang Web you should compile the three main applications:
eptic, wpart and wparts. It could be easily done by typing
bin/compile.erl
in the root directory of the framework.
View
@@ -497,7 +497,7 @@ get_apps_for_release(Server) ->
[code:add_path("lib/" ++ D ++ "/ebin") || D <- Dir],
ToLoad = [xmerl, sasl, crypto, eptic, wpart, wparts, mnesia, ssl,
- syntax_tools, compiler, Server],
+ syntax_tools, compiler, runtime_tools, Server],
[application:load(App) || App <- ToLoad],
lists:map(fun({Name, _, Vsn}) ->
View
@@ -34,7 +34,7 @@ run_tests(Dir) ->
start_interactive_mode_node(Dir).
start_interactive_mode_node(ReportDir) ->
- Port = open_port({spawn, "bin/start_interactive inets single_node "
+ Port = open_port({spawn, "bin/start_interactive yaws single_node "
"-sasl sasl_error_logger false -pa lib/*/test "
"-s ewts "
"-run ewts start_tests "
@@ -102,6 +102,8 @@ filter(["ssl-" ++ _ | Rest], Acc) ->
filter(Rest, Acc);
filter(["sasl-" ++ _ | Rest], Acc) ->
filter(Rest, Acc);
+filter(["runtime_tools-" ++ _ | Rest], Acc) ->
+ filter(Rest, Acc);
filter([App | Rest], Acc) ->
filter(Rest, [App | Acc]);
filter([], Acc) ->
View
@@ -1,4 +1,4 @@
{'src/*',[{outdir, "ebin"},
{i, "include"},
- {i, "../yaws-1.80/include"},
+ {i, "../yaws-1.85/include"},
debug_info, strict_record_tests, netload]}.
@@ -4,9 +4,9 @@ DocumentRoot docroot
BindAddress 0.0.0.0
Modules e_mod_inets mod_get mod_head mod_log
Port 8081
-SocketType ssl
+%% SocketType ssl
%% place path to your certificate here
%% SSLCertificateFile /path/to/your/cert/file
%% place path to your key file here
%% SSLCertificateKeyFile /path/to/your/key/file
-SSLVerifyClient 0
+%% SSLVerifyClient 0
@@ -15,13 +15,13 @@ logdir = log
# beam code can be placed. The daemon will add this
# directory to its search path
-ebin_dir = lib/yaws-1.80/ebin
+ebin_dir = lib/yaws-1.85/ebin
# This is a directory where application specific .hrl
# files can be placed. application specifig .yaws code can
# then include these .hrl files
-include_dir = lib/yaws-1.80/include
+include_dir = lib/yaws-1.85/include
# This is a debug variable, possible values are http | traffic | false
# It is also possible to set the trace (possibly to the tty) while
@@ -6,15 +6,15 @@
erlydtl,
erlydtl_compiler,
erlydtl_dateformat,
- erlydtl_dateformat_tests,
+% erlydtl_dateformat_tests,
erlydtl_deps,
- erlydtl_example_variable_storage,
+% erlydtl_example_variable_storage,
erlydtl_filters,
- erlydtl_functional_tests,
+% erlydtl_functional_tests,
erlydtl_parser,
erlydtl_runtime,
- erlydtl_scanner,
- erlydtl_unittests
+ erlydtl_scanner
+% erlydtl_unittests
]},
{applications, [kernel, stdlib, crypto, syntax_tools, compiler]},
{registered, []}
@@ -9,7 +9,7 @@
ewts_app,
ewts]},
{registered, []},
- {applications, [kernel, stdlib, eptic]},
+ {applications, [kernel, stdlib, eptic, wpart, wparts]},
{build_dependencies, []},
{mod, {ewts_app, []}},
{env, []}
@@ -41,9 +41,10 @@ start_tests(Outdir) ->
[]
end
end, get_apps())),
+
TestModules = [list_to_atom(filename:basename(F, ".erl")) ||
- F <- filelib:wildcard("lib/*/test/*.erl")],
- EUnitResult = eunit:test(TestModules),
+ F <- lists:append([filelib:wildcard(filename:join(["lib", App, "test/*erl"])) || App <- get_apps()])],
+ EUnitResult = eunit:test(lists:filter(fun('') -> false; (_) -> true end, TestModules)),
if
EUnitResult == ok ->
@@ -121,6 +122,8 @@ filter(["ssl-" ++ _ | Rest], Acc) ->
filter(Rest, Acc);
filter(["sasl-" ++ _ | Rest], Acc) ->
filter(Rest, Acc);
+filter(["runtime_tools-" ++ _ | Rest], Acc) ->
+ filter(Rest, Acc);
filter([App | Rest], Acc) ->
filter(Rest, [App | Acc]);
filter([], Acc) ->
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,99 +0,0 @@
-# This is a comment. I love comments.
-
-application/activemessage
-application/andrew-inset
-application/applefile
-application/atomicmail
-application/dca-rft
-application/dec-dx
-application/mac-binhex40 hqx
-application/mac-compactpro cpt
-application/macwriteii
-application/msword doc
-application/news-message-id
-application/news-transmission
-application/octet-stream bin dms lha lzh exe class
-application/oda oda
-application/pdf pdf
-application/postscript ai eps ps
-application/powerpoint ppt
-application/remote-printing
-application/rtf rtf
-application/slate
-application/wita
-application/wordperfect5.1
-application/x-bcpio bcpio
-application/x-cdlink vcd
-application/x-compress Z
-application/x-cpio cpio
-application/x-csh csh
-application/x-director dcr dir dxr
-application/x-dvi dvi
-application/x-gtar gtar
-application/x-gzip gz
-application/x-hdf hdf
-application/x-httpd-cgi cgi
-application/x-koan skp skd skt skm
-application/x-latex latex
-application/x-mif mif
-application/x-netcdf nc cdf
-application/x-sh sh
-application/x-shar shar
-application/x-stuffit sit
-application/x-sv4cpio sv4cpio
-application/x-sv4crc sv4crc
-application/x-tar tar
-application/x-tcl tcl
-application/x-tex tex
-application/x-texinfo texinfo texi
-application/x-troff t tr roff
-application/x-troff-man man
-application/x-troff-me me
-application/x-troff-ms ms
-application/x-ustar ustar
-application/x-wais-source src
-application/zip zip
-audio/basic au snd
-audio/mpeg mpga mp2
-audio/x-aiff aif aiff aifc
-audio/x-pn-realaudio ram
-audio/x-pn-realaudio-plugin rpm
-audio/x-realaudio ra
-audio/x-wav wav
-chemical/x-pdb pdb xyz
-image/gif gif
-image/ief ief
-image/jpeg jpeg jpg jpe
-image/png png
-image/tiff tiff tif
-image/x-cmu-raster ras
-image/x-portable-anymap pnm
-image/x-portable-bitmap pbm
-image/x-portable-graymap pgm
-image/x-portable-pixmap ppm
-image/x-rgb rgb
-image/x-xbitmap xbm
-image/x-xpixmap xpm
-image/x-xwindowdump xwd
-message/external-body
-message/news
-message/partial
-message/rfc822
-multipart/alternative
-multipart/appledouble
-multipart/digest
-multipart/mixed
-multipart/parallel
-text/html html htm
-text/x-server-parsed-html shtml
-text/plain txt
-text/richtext rtx
-text/tab-separated-values tsv
-text/x-setext etx
-text/x-sgml sgml sgm
-video/mpeg mpeg mpg mpe
-video/quicktime qt mov
-video/x-msvideo avi
-video/x-sgi-movie movie
-x-conference/x-cooltalk ice
-x-world/x-vrml wrl vrml
@@ -1,128 +0,0 @@
-
-# conf for yaws
-
-
-# first we have a set of globals
-# That apply to all virtual servers
-
-
-# This is the directory where all logfiles for
-# all virtual servers will be written
-
-logdir = log
-
-# This the path to a directory where additional
-# beam code can be placed. The daemon will add this
-# directory to its search path
-
-ebin_dir = lib/yaws-1.73/ebin
-
-# This is a directory where application specific .hrl
-# files can be placed. application specifig .yaws code can
-# then include these .hrl files
-
-include_dir = lib/yaws-1.73/include
-
-# This is a debug variable, possible values are http | traffic | false
-# It is also possible to set the trace (possibly to the tty) while
-# invoking yaws from the shell as in
-# yaws -i -T -x (see man yaws)
-
-trace = false
-
-# it is possible to have yaws start additional
-# application specific code at startup
-#
-# runmod = mymodule
-
-# By default yaws will copy the erlang error_log and
-# end write it to a wrap log called report.log (in the logdir)
-# this feature can be turned off. This would typically
-# be the case when yaws runs within another larger app
-
-copy_error_log = true
-
-# Logs are wrap logs
-
-log_wrap_size = 1000000
-
-# Possibly resolve all hostnames in logfiles so webalizer
-# can produce the nice geography piechart
-
-log_resolve_hostname = false
-
-# fail completely or not if yaws fails
-# to bind a listen socket
-fail_on_bind_err = true
-
-# If yaws is started as root, it can, once it has opened
-# all relevant sockets for listening, change the uid to a
-# user with lower accessrights than root
-
-# username = nobody
-
-# If HTTP auth is used, it is possible to have a specific
-# auth log.
-
-auth_log = true
-
-
-# When we're running multiple yaws systems on the same
-# host, we need to give each yaws system an individual
-# name. Yaws will write a number of runtime files under
-# /tmp/yaws/${id}
-# The default value is "default"
-
-
-# id = myname
-
-# earlier versions of Yaws picked the first virtual host
-# in a list of hosts with the same IP/PORT when the Host:
-# header doesn't match any name on any Host
-# This is often nice in testing environments but not
-# acceptable in real live hosting scenarios
-
-pick_first_virthost_on_nomatch = true
-
-
-# All unices are broken since it's not possible to bind to
-# a privileged port (< 1024) unless uid==0
-# There is a contrib in jungerl which makes it possible by means
-# of an external setuid root programm called fdsrv to listen to
-# to privileged port.
-# If we use this feature, it requires fdsrv to be properly installed.
-# Doesn't yet work with SSL.
-
-use_fdsrv = false
-
-id = erlangweb
-
-
-# end then a set of virtual servers
-# First two virthosted servers on the same IP (0.0.0.0)
-# in this case, but an explicit IP can be given as well
-
-<server localhost>
- port = 8080
- listen = 127.0.0.1
- docroot = docroot
- arg_rewrite_mod = e_mod_yaws
- appmods = <app, e_mod_yaws>
-</server>
-
-# <server localhost>
-# port = 8081
-# listen = 127.0.0.1
-# docroot = docroot
-# arg_rewrite_mod = e_mod_yaws
-# appmods = <app, e_mod_yaws>
-# <ssl>
-# keyfile = "priv/keys/host.key"
-# certfile = "priv/keys/host.cert"
-# password = ""
-# </ssl>
-# </server>
-
-
-
-
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,7 +1,7 @@
{application,yaws,
[{description,"yaws WWW server"},
- {vsn,"1.80"},
- {modules,[yaws, yaws_app, yaws_ticker, yaws_config, yaws_server, yaws_sup, yaws_api, yaws_log, yaws_ls, yaws_debug, yaws_compile, yaws_ctl, yaws_cgi, yaws_zlib, yaws_generated, mime_type_c, mime_types, yaws_session_server, yaws_404, yaws_revproxy, yaws_html, yaws_log_file_h, yaws_rss, yaws_dav, yaws_pam, json, jsonrpc, yaws_jsonrpc, yaws_xmlrpc, haxe, yaws_rpc, yaws_soap_srv, yaws_soap_lib, authmod_gssapi, yaws_appmod_cgi, yaws_sendfile, yaws_sendfile_compat, yaws_sup_restarts]},
+ {vsn,"1.85"},
+ {modules,[yaws, yaws_app, yaws_ticker, yaws_config, yaws_server, yaws_sup, yaws_api, yaws_log, yaws_ls, yaws_debug, yaws_compile, yaws_ctl, yaws_cgi, yaws_zlib, yaws_generated, mime_type_c, mime_types, yaws_session_server, yaws_outmod, yaws_revproxy, yaws_html, yaws_log_file_h, yaws_rss, yaws_dav, yaws_pam, json, jsonrpc, yaws_jsonrpc, yaws_xmlrpc, haxe, yaws_rpc, yaws_soap_srv, yaws_soap_lib, authmod_gssapi, yaws_appmod_cgi, yaws_appmod_fcgi, yaws_sendfile, yaws_sendfile_compat, yaws_sup_restarts, yaws_stats, yaws_multipart]},
{registered, []},
{mod,{yaws_app,[]}},
{env, [
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 0349757

Please sign in to comment.