Mercurial Hosting > luan
comparison web/src/luan/modules/web/Web_server.luan @ 219:f9e3e64132e1
improve rev 217, allow "java:" paths to include sample files to check in jars
git-svn-id: https://luan-java.googlecode.com/svn/trunk@220 21e917c8-12df-6dd8-5cb6-c86387c605b9
author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
---|---|
date | Wed, 16 Jul 2014 04:53:01 +0000 |
parents | a1b142f9c5c0 |
children | a35417bf493a |
comparison
equal
deleted
inserted
replaced
218:92f5d74697f8 | 219:f9e3e64132e1 |
---|---|
70 function serve(dir) | 70 function serve(dir) |
71 dir = dir.gsub("/$","") -- remove trailing '/' if any | 71 dir = dir.gsub("/$","") -- remove trailing '/' if any |
72 Http.dir = dir | 72 Http.dir = dir |
73 Package.path = dir.."?.luan;java:luan/modules/?.luan" | 73 Package.path = dir.."?.luan;java:luan/modules/?.luan" |
74 authentication_handler.setPassword(private_password) | 74 authentication_handler.setPassword(private_password) |
75 resource_handler.setResourceBase(Io.File(dir.."/").to_string()) | 75 local base = dir |
76 if base.match("^java:") ~= nil then | |
77 base = dir.."#"..welcome_file.."#"..welcome_file..".luan" | |
78 end | |
79 resource_handler.setResourceBase(Io.File(base).to_string()) | |
76 resource_handler.setWelcomeFiles {welcome_file} | 80 resource_handler.setWelcomeFiles {welcome_file} |
77 luan_handler.setWelcomeFile(welcome_file) | 81 luan_handler.setWelcomeFile(welcome_file) |
78 local server = Server.new(port) | 82 local server = Server.new(port) |
79 server.setHandler(hc); | 83 server.setHandler(hc); |
80 server.start() | 84 server.start() |