From 4e205df9bdb7768bf8dd83d9856b52e2ea0d4094 Mon Sep 17 00:00:00 2001 From: Scott Ostler Date: Wed, 16 Jun 2010 01:12:29 -0400 Subject: Update jetty to 6.1.24, add nio support to compojure --- compojure-3.2/src/compojure/server/jetty.clj | 5 ++++- lib/compojure-3.2v3.jar | Bin 402143 -> 402245 bytes lib/jetty-6.1.24.jar | Bin 0 -> 538053 bytes lib/jetty-util-6.1.24.jar | Bin 0 -> 177172 bytes 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 lib/jetty-6.1.24.jar create mode 100644 lib/jetty-util-6.1.24.jar 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 Binary files a/lib/compojure-3.2v3.jar and b/lib/compojure-3.2v3.jar differ diff --git a/lib/jetty-6.1.24.jar b/lib/jetty-6.1.24.jar new file mode 100644 index 0000000..133cf36 Binary files /dev/null and b/lib/jetty-6.1.24.jar differ 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 Binary files /dev/null and b/lib/jetty-util-6.1.24.jar differ -- cgit v1.2.3-70-g09d2