lancet/step_3.clj lib/commons-codec-1.3.jar lib/commons-fileupload-1.2.1.jar lib/commons-io-1.4.jar @@ -1 +1 @@ -java -cp .;lib/jline-0.9.94.jar;lib/clojure.jar;lib/clojure-contrib.jar;lib/ant.jar;lib/ant-launcher.jar;lib/compojure.jar;lib/hsqldb.jar;lib/jetty-6.1.14.jar;lib/jetty-util-6.1.14.jar;lib/servlet-api-2.5-6.1.14.jar;classes jline.ConsoleRunner clojure.lang.Repl \ No newline at end of file +java -cp .;lib/commons-io-1.4.jar;lib/commons-fileupload-1.2.1.jar;lib/commons-codec-1.3.jar;lib/jline-0.9.94.jar;lib/clojure.jar;lib/clojure-contrib.jar;lib/ant.jar;lib/ant-launcher.jar;lib/compojure.jar;lib/hsqldb.jar;lib/jetty-6.1.14.jar;lib/jetty-util-6.1.14.jar;lib/servlet-api-2.5-6.1.14.jar;classes jline.ConsoleRunner clojure.lang.Repl \ No newline at end of file bin/repl.bat @@ -1 +1 @@ -java -cp .:lib/jline-0.9.94.jar:lib/clojure.jar:lib/clojure-contrib.jar:lib/ant.jar:lib/ant-launcher.jar:lib/compojure.jar:lib/hsqldb.jar:lib/jetty-6.1.14.jar:lib/jetty-util-6.1.14.jar:lib/servlet-api-2.5-6.1.14.jar:classes jline.ConsoleRunner clojure.lang.Repl \ No newline at end of file +java -cp .:lib/commons-io-1.4.jar:lib/commons-fileupload-1.2.1.jar:lib/commons-codec-1.3.jar:lib/jline-0.9.94.jar:lib/clojure.jar:lib/clojure-contrib.jar:lib/ant.jar:lib/ant-launcher.jar:lib/compojure.jar:lib/hsqldb.jar:lib/jetty-6.1.14.jar:lib/jetty-util-6.1.14.jar:lib/servlet-api-2.5-6.1.14.jar:classes jline.ConsoleRunner clojure.lang.Repl \ No newline at end of file bin/repl.sh @@ -1 +1 @@ -java -cp .;lib/jline-0.9.94.jar;lib/clojure.jar;lib/clojure-contrib.jar;lib/compojure.jar;lib/hsqldb.jar;lib/jetty-6.1.14.jar;lib/jetty-util-6.1.14.jar;lib/servlet-api-2.5-6.1.14.jar jline.ConsoleRunner clojure.lang.Repl examples/server/complete.clj \ No newline at end of file +java -cp .;lib/commons-io-1.4.jar;lib/commons-fileupload-1.2.1.jar;lib/commons-codec-1.3.jar;lib/jline-0.9.94.jar;lib/clojure.jar;lib/clojure-contrib.jar;lib/compojure.jar;lib/hsqldb.jar;lib/jetty-6.1.14.jar;lib/jetty-util-6.1.14.jar;lib/servlet-api-2.5-6.1.14.jar jline.ConsoleRunner clojure.lang.Repl examples/server/complete.clj \ No newline at end of file bin/snippet-solution.bat @@ -1 +1 @@ -java -cp .:lib/jline-0.9.94.jar:lib/clojure.jar:lib/clojure-contrib.jar:lib/compojure.jar:lib/hsqldb.jar:lib/jetty-6.1.14.jar:lib/jetty-util-6.1.14.jar:lib/servlet-api-2.5-6.1.14.jar jline.ConsoleRunner clojure.lang.Repl examples/server/complete.clj \ No newline at end of file +java -cp .:lib/commons-io-1.4.jar:lib/commons-fileupload-1.2.1.jar:lib/commons-codec-1.3.jar:lib/jline-0.9.94.jar:lib/clojure.jar:lib/clojure-contrib.jar:lib/compojure.jar:lib/hsqldb.jar:lib/jetty-6.1.14.jar:lib/jetty-util-6.1.14.jar:lib/servlet-api-2.5-6.1.14.jar jline.ConsoleRunner clojure.lang.Repl examples/server/complete.clj \ No newline at end of file bin/snippet-solution.sh @@ -1 +1 @@ -java -cp .;lib/jline-0.9.94.jar;lib/clojure.jar;lib/clojure-contrib.jar;lib/compojure.jar;lib/hsqldb.jar;lib/jetty-6.1.14.jar;lib/jetty-util-6.1.14.jar;lib/servlet-api-2.5-6.1.14.jar jline.ConsoleRunner clojure.lang.Repl reader/snippet_server.clj \ No newline at end of file +java -cp .;lib/commons-io-1.4.jar;lib/commons-fileupload-1.2.1.jar;lib/commons-codec-1.3.jar;lib/jline-0.9.94.jar;lib/clojure.jar;lib/clojure-contrib.jar;lib/compojure.jar;lib/hsqldb.jar;lib/jetty-6.1.14.jar;lib/jetty-util-6.1.14.jar;lib/servlet-api-2.5-6.1.14.jar jline.ConsoleRunner clojure.lang.Repl reader/snippet_server.clj \ No newline at end of file bin/snippet.bat @@ -1 +1 @@ -java -cp .:lib/jline-0.9.94.jar:lib/clojure.jar:lib/clojure-contrib.jar:lib/compojure.jar:lib/hsqldb.jar:lib/jetty-6.1.14.jar:lib/jetty-util-6.1.14.jar:lib/servlet-api-2.5-6.1.14.jar jline.ConsoleRunner clojure.lang.Repl reader/snippet_server.clj \ No newline at end of file +java -cp .:lib/commons-io-1.4.jar:lib/commons-fileupload-1.2.1.jar:lib/commons-codec-1.3.jar:lib/jline-0.9.94.jar:lib/clojure.jar:lib/clojure-contrib.jar:lib/compojure.jar:lib/hsqldb.jar:lib/jetty-6.1.14.jar:lib/jetty-util-6.1.14.jar:lib/servlet-api-2.5-6.1.14.jar jline.ConsoleRunner clojure.lang.Repl reader/snippet_server.clj \ No newline at end of file bin/snippet.sh @@ -7,7 +7,7 @@ (= n 0) 0 ; <label id="code.stack-consuming-fibo.0"/> (= n 1) 1 ; <label id="code.stack-consuming-fibo.1"/> :else (+ (stack-consuming-fibo (- n 1)) ; <label id="code.stack-consuming-fibo.n"/> - (stack-consuming-fibo (- n 2))))) + (stack-consuming-fibo (- n 2))))) ; <label id="code.stack-consuming-fibo.n2"/> ; END: stack-consuming-fibo ; START: tail-fibo examples/functional.clj @@ -1,10 +1,5 @@ (ns examples.server.complete - (:use [compojure.http helpers routes servlet] - [compojure.html form-helpers page-helpers] - compojure.html - compojure.server.jetty - compojure.file-utils - examples.snippet)) + (:use compojure examples.snippet)) (defn layout [title & body] (html @@ -18,7 +13,7 @@ (defn new-snippet [] (layout "Create a Snippet" - (form-to [POST "/"] + (form-to [:post "/"] (text-area {:rows 20 :cols 73} "body") [:br] (submit-button "Save")))) @@ -35,7 +30,7 @@ [:div [:pre [:code.clojure (:body snippet)]]] [:div.date (:created_at snippet)])))) -(defservlet snippet-servlet +(defroutes snippet-app "Create and view snippets." (GET "/ping" "Pong") @@ -43,20 +38,18 @@ (new-snippet)) (GET "/:id" - (show-snippet (route :id))) + (show-snippet (params :id))) (POST "/" (create-snippet (:body params))) (GET "/public/*" - (or (serve-file (route :*)) :next)) + (or (serve-file (params :*)) :next)) (ANY "*" (page-not-found))) -(defserver snippet-server - {:port 8080} - "/*" snippet-servlet) - (ensure-snippets-table-exists) -(start snippet-server) \ No newline at end of file +(run-server {:port 8080} + "/*" (servlet snippet-app)) + examples/server/complete.clj @@ -1,20 +1,18 @@ (ns examples.server.step-1) -; START: defservlet -(use '[compojure.http servlet routes helpers]) -(defservlet snippet-servlet +; START: defroutes +(use 'compojure) +(defroutes snippet-app "Create and view snippets." (GET "/ping" "pong") (ANY "*" (page-not-found))) -; END: defservlet +; END: defroutes -; START: defserver -(use 'compojure.server.jetty) -(defserver snippet-server - {:port 8080} - "/*" snippet-servlet) -; END: defserver +; START: run-server +(run-server {:port 8080} + "/*" (servlet snippet-app)) +; END: run-server examples/server/step_1.clj @@ -1,15 +1,10 @@ (ns examples.server.step-2 - (:use [compojure.http helpers routes servlet] - [compojure.html form-helpers page-helpers] - compojure.html - compojure.server.jetty - compojure.file-utils - examples.snippet)) + (:use compojure examples.snippet)) ; START: new-snippet (defn new-snippet [] (html - (form-to [POST "/"] + (form-to [:post "/"] (text-area {:rows 20 :cols 73} "body") [:br] (submit-button "Save")))) @@ -30,7 +25,7 @@ [:div (:created_at snippet)]))) ; END: show-snippet -(defservlet snippet-servlet +(defroutes snippet-app "Create and view snippets." (GET "/ping" "Pong") @@ -39,7 +34,7 @@ (new-snippet)) (GET "/:id" - (show-snippet (route :id))) + (show-snippet (params :id))) (POST "/" (create-snippet (:body params))) @@ -48,9 +43,8 @@ (ANY "*" (page-not-found))) -(defserver snippet-server - {:port 8080} - "/*" snippet-servlet) +(run-server {:port 8080} + "/*" (servlet snippet-app)) examples/server/step_2.clj @@ -1,10 +1,5 @@ (ns examples.server.step-3 - (:use [compojure.http helpers routes servlet] - [compojure.html form-helpers page-helpers] - compojure.html - compojure.server.jetty - compojure.file-utils - examples.snippet)) + (:use compojure examples.snippet)) ; START: layout (defn layout [title & body] @@ -22,7 +17,7 @@ ; START: new-snippet (defn new-snippet [] (layout "Create a Snippet" - (form-to [POST "/"] + (form-to [:post "/"] (text-area {:rows 20 :cols 73} "body") [:br] (submit-button "Save")))) @@ -42,7 +37,7 @@ [:div (:created_at snippet)])))) ; END: show-snippet -(defservlet snippet-servlet +(defroutes snippet-app "Create and view snippets." (GET "/ping" "Pong") @@ -50,20 +45,19 @@ (new-snippet)) (GET "/:id" - (show-snippet (route :id))) + (show-snippet (params :id))) (POST "/" (create-snippet (:body params))) ; START: public (GET "/public/*" - (or (serve-file (route :*)) :next)) + (or (serve-file (params :*)) :next)) ; END: public (ANY "*" (page-not-found))) -(defserver snippet-server - {:port 8080} - "/*" snippet-servlet) +(run-server {:port 8080} + "/*" (servlet snippet-app)) examples/server/step_3.clj @@ -8,7 +8,7 @@ [function] (let [sentinel (Object.) result (atom sentinel) - reset-fn (fn [] (reset! result sentinel)) ; <label id="concurrency.lancet.reset-fn"/> + reset-fn (fn [] (reset! result sentinel) nil) ; <label id="concurrency.lancet.reset-fn"/> has-run? #(not= @result sentinel)] ; <label id="concurrency.lancet.has-run"/> [has-run? reset-fn lancet/step_3_complete.clj lib/clojure-contrib.jar lib/clojure.jar lib/compojure.jar @@ -1,11 +1,4 @@ -(ns examples.server.complete - (:use [compojure.http helpers routes servlet] - [compojure.html form-helpers page-helpers] - compojure.html - compojure.server.jetty - compojure.file-utils - examples.snippet)) +(ns reader.snippet-server + (:use compojure examples.snippet)) (println "TODO: implement reader/snippet_server.clj!") - - reader/snippet_server.clj 6edc127e67ef1ddf16b8b0ecd4a1b40b5facb21f Stuart Halloway stu@thinkrelevance.com http://github.com/stuarthalloway/programming-clojure/commit/5c668309459f088826774f66d9e286bd2571fad6 5c668309459f088826774f66d9e286bd2571fad6 2009-05-01T09:00:11-07:00 2009-05-01T09:00:11-07:00 RC0 testing spike 1b272e96b1e4a9860803df1cdcc0b467880635ec Stuart Halloway stu@thinkrelevance.com