Update jetty to 6.1.24, add nio support to compojure

4 files changed, 4 insertions, 1 deletions

diff --git a/compojure-3.2/src/compojure/server/jetty.clj b/compojure-3.2/src/compojure/server/jetty.clj
index f69d94c..140047a 100755
--- a/compojure-3.2/src/compojure/server/jetty.clj
+++ b/compojure-3.2/src/compojure/server/jetty.clj
@@ -13,6 +13,7 @@
   (:import org.mortbay.jetty.Server
            [org.mortbay.jetty.servlet Context ServletHolder]
            org.mortbay.jetty.bio.SocketConnector
+           org.mortbay.jetty.nio.SelectChannelConnector
            org.mortbay.jetty.security.SslSocketConnector))
 
 (defn servlet-holder
@@ -68,7 +69,9 @@
 (defn- create-server
   "Construct a Jetty Server instance."
   [options servlets]
-  (let [connector (doto (SocketConnector.)
+  (let [connector (doto (if (options :nio)
+                          (SelectChannelConnector.)
+                          (SocketConnector.))
                     (.setPort (options :port 80))
                     (.setHost (options :host)))
         server    (doto (Server.)
diff --git a/lib/compojure-3.2v3.jar b/lib/compojure-3.2v3.jar
index 2ca4f41..b528f43 100644
--- a/lib/compojure-3.2v3.jar
+++ b/lib/compojure-3.2v3.jar
diff --git a/lib/jetty-6.1.24.jar b/lib/jetty-6.1.24.jar
new file mode 100644
index 0000000..133cf36
--- /dev/null
+++ b/lib/jetty-6.1.24.jar
diff --git a/lib/jetty-util-6.1.24.jar b/lib/jetty-util-6.1.24.jar
new file mode 100644
index 0000000..5154f8f
--- /dev/null
+++ b/lib/jetty-util-6.1.24.jar