+ complete renaming SERVLET->SURFLET
+ adjust to recent changes in RFC822 (surflets.scm, packages.scm)
This commit is contained in:
interp
parent
73629e6baa
commit
27f6c5a832
|
|
@ -20,12 +20,12 @@
|
|||
(in 'scsh `(run (string-append
|
||||
(or (getenv "SUNETHOME")
|
||||
,*ASSUMED-SUNET-HOME*)
|
||||
"/httpd/servlets/packages.scm"))))
|
||||
"/httpd/surflets/packages.scm"))))
|
||||
(define *SURFLET-SERVER*
|
||||
(in 'scsh `(run (string-append
|
||||
(or (getenv "SUNETHOME")
|
||||
,*ASSUMED-SUNET-HOME*)
|
||||
"/httpd/servlets/start-servlet-server"))))
|
||||
"/httpd/surflets/start-surflet-server"))))
|
||||
(config `(load ,*SUNET-PACKAGE*))
|
||||
(config `(load ,*SSAX-PACKAGE*))
|
||||
(config `(load ,*SURFLET-PACKAGE*))
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@
|
|||
handle
|
||||
scheme
|
||||
)
|
||||
(files servlet-handler))
|
||||
(files surflet-handler))
|
||||
|
||||
|
||||
(define-interface surflets-interface
|
||||
|
|
@ -190,7 +190,6 @@
|
|||
parse-html-forms
|
||||
sxml-to-html ; SXML->HTML
|
||||
srfi-1 ; FILTER
|
||||
(subset rfc822 (get-header))
|
||||
(subset srfi-13 (string-index))
|
||||
sxml-tree-trans
|
||||
url
|
||||
|
|
@ -201,7 +200,7 @@
|
|||
handle-fatal-error
|
||||
scsh
|
||||
scheme)
|
||||
(files servlets))
|
||||
(files surflets))
|
||||
|
||||
(define-interface surflet-interface
|
||||
(export main)) ; MAIN gets one parameter, the REQUEST
|
||||
|
|
@ -286,4 +285,4 @@
|
|||
(subset srfi-1 (zip filter find make-list))
|
||||
handle-fatal-error
|
||||
)
|
||||
(files simple-servlet-api))
|
||||
(files simple-surflet-api))
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ fullpath=`which $0`
|
|||
sunet=${SUNETHOME:-`dirname $fullpath`/../..}
|
||||
ssax=${SSAXPATH:-$sunet/SSAX} # path to SSAX
|
||||
|
||||
exec scsh -lm $sunet/packages.scm -lm $ssax/lib/packages.scm -lm $sunet/httpd/servlets/packages.scm -dm -o surflet-server -e main -s "$0" "$@"
|
||||
exec scsh -lm $sunet/packages.scm -lm $ssax/lib/packages.scm -lm $sunet/httpd/surflets/packages.scm -dm -o surflet-server -e main -s "$0" "$@"
|
||||
!#
|
||||
|
||||
(define-structure surflet-server
|
||||
|
|
@ -29,13 +29,13 @@ exec scsh -lm $sunet/packages.scm -lm $ssax/lib/packages.scm -lm $sunet/httpd/se
|
|||
|
||||
(define (usage)
|
||||
(format #f
|
||||
"Usage: start-servlet-server [-h htdocs-dir] [-s surflet-dir] [-i images-dir]
|
||||
"Usage: start-surflet-server [-h htdocs-dir] [-s surflet-dir] [-i images-dir]
|
||||
[-p port] [-l log-file-name]
|
||||
[-r requests] [--help]
|
||||
|
||||
with
|
||||
htdocs-dir directory of html files (default: ./web-server/root/htdocs)
|
||||
surflet-dir directory of SUrflet files (default: ./web-server/root/servlets)
|
||||
surflet-dir directory of SUrflet files (default: ./web-server/root/surflets)
|
||||
images-dir directory of images files (default: ./web-server/root/img)
|
||||
port port server is listening to (default: 8080)
|
||||
log-file-name directory where to store the logfile in CLF
|
||||
|
|
@ -63,7 +63,7 @@ exec scsh -lm $sunet/packages.scm -lm $ssax/lib/packages.scm -lm $sunet/httpd/se
|
|||
(set! port "8088")
|
||||
(set! log-file-name "./web-server/httpd.log")
|
||||
(set! root "./web-server/root")
|
||||
(set! surflet-dir "./web-server/root/servlets")
|
||||
(set! surflet-dir "./web-server/root/surflets")
|
||||
(set! simultaneous-requests "5"))
|
||||
|
||||
(define (normalize-options)
|
||||
|
|
|
|||
|
|
@ -87,6 +87,8 @@
|
|||
(loop cache))))))))
|
||||
(release-lock *cache-lock*)
|
||||
result))
|
||||
|
||||
(define get-header assoc)
|
||||
|
||||
;; Will be needed when we handle POST requests.
|
||||
(define (get-content-length headers)
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
<li><a href="surflet/news.scm">News</a></li>
|
||||
<li><a href="surflet/add-raw.scm">Adding (raw HTML version)</a></li>
|
||||
<li><a href="surflet/add-html.scm">Adding (SUrflets version)</a></li>
|
||||
<li><a href="surflet/add-servlet.scm">Adding (input-field
|
||||
<li><a href="surflet/add-surflet.scm">Adding (input-field
|
||||
version)</a></li>
|
||||
<li><a href="surflet/add-simple.scm">Adding (simple SUrflet
|
||||
version)</a></li>
|
||||
<li><a href="surflet/calculate.scm">Simple Calculator</a></li>
|
||||
<li><a href="surflet/byte-input.scm">Byte Input Widget</a></li>
|
||||
<li><a href="surflet/simple-servlet.scm">Simple SUrflet</a></li>
|
||||
<li><a href="surflet/simple-surflet.scm">Simple SUrflet</a></li>
|
||||
<li><a href="surflet/spaceship.scm">Spaceship builder</a></li>
|
||||
<!-- <li><a href=/surflet/test.scm>A test SUrflet</a></li> -->
|
||||
<li><a href="surflet/admin.scm">SUrflet Administration</a></li>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
<hr>
|
||||
<!-- Created: Thu Aug 22 16:44:16 CEST 2002 -->
|
||||
<!-- hhmts start -->
|
||||
Last modified: Sun Jan 19 17:34:31 CET 2003
|
||||
Last modified: Wed Jan 22 12:58:31 MET 2003
|
||||
<!-- hhmts end -->
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
(p
|
||||
(ul
|
||||
(li (URL "admin-handler.scm" "Set handler options..."))
|
||||
(li (URL "admin-servlets.scm" "SUrflets..."))
|
||||
(li (URL "admin-surflets.scm" "SUrflets..."))
|
||||
(li (URL "admin-profiling.scm" "Profiling..."))))
|
||||
(hr)
|
||||
(p (URL "/" "Return to main menu.")))))
|
||||
|
|
|
|||
Loading…
Reference in New Issue