# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1285633378 14400
# Node ID 5b0753c6f34dffa4b13a6d36b6b53d7531b399a2
# Parent  3c398dd94f17297d52bd584fc20557b6751ae4da
updated to newest compojure and a simpler syntax

diff -r 3c398dd94f17 -r 5b0753c6f34d buy_temp.clj
--- a/buy_temp.clj	Mon Sep 27 17:47:08 2010 -0400
+++ b/buy_temp.clj	Mon Sep 27 20:22:58 2010 -0400
@@ -1,9 +1,7 @@
 (ns laserkard.buy-temp
 
-  (:use (compojure.http request servlet session routes)
-	(compojure.server jetty)
-	(compojure control)
-	(clojure.contrib def prxml str-utils duck-streams)
+  (:use (clojure.contrib def prxml
+			 [str-utils :only [re-gsub]] )
 	(laserkard common)
 ))
 
diff -r 3c398dd94f17 -r 5b0753c6f34d common.clj
--- a/common.clj	Mon Sep 27 17:47:08 2010 -0400
+++ b/common.clj	Mon Sep 27 20:22:58 2010 -0400
@@ -1,8 +1,5 @@
 (ns laserkard.common
-    (:use (compojure.http request servlet session routes)
-	(compojure.server jetty)
-	(compojure control)
-	(clojure.contrib prxml str-utils duck-streams)))
+    (:use (clojure.contrib prxml)))
 
 
 (defn pxml [ & args] 
diff -r 3c398dd94f17 -r 5b0753c6f34d faq.clj
--- a/faq.clj	Mon Sep 27 17:47:08 2010 -0400
+++ b/faq.clj	Mon Sep 27 20:22:58 2010 -0400
@@ -1,8 +1,5 @@
 (ns laserkard.faq
-  (:use (compojure.http request servlet session routes)
-	(compojure.server jetty)
-	(compojure control)
-	(clojure.contrib prxml str-utils duck-streams seq-utils)
+  (:use (clojure.contrib prxml [str-utils :only [re-gsub]] [seq-utils :only [indexed]] )
 	(laserkard common)))
 
 (def faqs 
diff -r 3c398dd94f17 -r 5b0753c6f34d server.clj
--- a/server.clj	Mon Sep 27 17:47:08 2010 -0400
+++ b/server.clj	Mon Sep 27 20:22:58 2010 -0400
@@ -1,22 +1,24 @@
 (ns laserkard.server
-  (:use (compojure.http request servlet session routes)
-	(compojure.server jetty)
-	(compojure control)
-	(laserkard buy-temp faq)
+  (:use
+   [compojure core]
+   [ring.adapter jetty]
+   [laserkard buy-temp faq])
+  )
 
-))
-
-(defroutes example
+(defroutes laserkard
   (GET "/index.clj" [] "<h1> hello, connie, good to meet you</h1>")
   (GET "/buy-temp.clj" [] (buy-gen))
   (GET "/faq.clj" [] (faq))
 )
 
+(defn serve []
+  (future
+   (run-jetty (var laserkard.server/laserkard) {:port 9000 :host "localhost"})))
 
 
-(defserver laserkard-server
-  {:port 9000 :host "localhost"}
-  "/*" (servlet example))
+;(defserver laserkard-server
+;  {:port 9000 :host "localhost"}
+;  "/*" (servlet example))