From e3dcba6c3741f272e3a61c7c94e92229faaaeddf Mon Sep 17 00:00:00 2001
From: didier amyot <didier.amyot@behavox.com>
Date: Sat, 12 Sep 2020 11:06:12 -0400
Subject: [PATCH] cleaned up shit.

---
 env/dev/clj/skirmish/wui/repl.clj | 33 -------------------------------
 project.clj                       | 20 ++++++++-----------
 src/clj/skirmish/wui/server.clj   |  4 ++--
 3 files changed, 10 insertions(+), 47 deletions(-)
 delete mode 100644 env/dev/clj/skirmish/wui/repl.clj

diff --git a/env/dev/clj/skirmish/wui/repl.clj b/env/dev/clj/skirmish/wui/repl.clj
deleted file mode 100644
index f4ae8f8..0000000
--- a/env/dev/clj/skirmish/wui/repl.clj
+++ /dev/null
@@ -1,33 +0,0 @@
-(ns skirmish.wui.repl
-  (:use skirmish.wui.handler
-        figwheel-sidecar.repl-api
-        ring.server.standalone
-        [ring.middleware file-info file]))
-
-(defonce server (atom nil))
-
-(defn get-handler []
-  ;; #'app expands to (var app) so that when we reload our code,
-  ;; the server is forced to re-resolve the symbol in the var
-  ;; rather than having its own copy. When the root binding
-  ;; changes, the server picks it up without having to restart.
-  (-> #'app
-      ; Makes static assets in $PROJECT_DIR/resources/public/ available.
-      (wrap-file "resources")
-      ; Content-Type, Content-Length, and Last Modified headers for files in body
-      (wrap-file-info)))
-
-(defn start-server
-  "used for starting the server in development mode from REPL"
-  [& [port]]
-  (let [port (if port (Integer/parseInt port) 3000)]
-    (reset! server
-            (serve (get-handler)
-                   {:port port
-                    :auto-reload? true
-                    :join? false}))
-    (println (str "You can view the site at http://localhost:" port))))
-
-(defn stop-server []
-  (.stop @server)
-  (reset! server nil))
diff --git a/project.clj b/project.clj
index 81817ca..44536e4 100644
--- a/project.clj
+++ b/project.clj
@@ -12,17 +12,18 @@
                  [org.clojure/math.combinatorics "0.1.6"]
                  [com.datomic/datomic-free "0.9.5697"]
                  [com.google.guava/guava "22.0"]
-                 [javax.xml.bind/jaxb-api "2.2.11"]
+                 ;[javax.xml.bind/jaxb-api "2.2.11"]
 
                  ;; server
-                 [aero "1.1.3"]
-                 [ring/ring-jetty-adapter "1.8.1"]
-                 [com.taoensso/timbre "4.10.0"]
-                 [http-kit "2.5.0-RC1"]
-                 [compojure "1.6.2"]
-                 [com.taoensso/nippy "3.0.0-RC1"]
                  [ring-cors "0.1.13"]
+                 [ring/ring-defaults "0.3.2"]
+                 ;[ring/ring-jetty-adapter "1.8.0"]
                  [javax.servlet/javax.servlet-api "3.1.0"]
+                 [aero "1.1.3"]
+                 [com.taoensso/timbre "4.10.0"]
+                 [org.clojure/tools.reader "1.3.3"]
+                 [http-kit "2.4.0"]
+                 [compojure "1.6.2"]
 
                  ;; backends
                  [spootnik/kinsky "0.1.25"]
@@ -35,11 +36,8 @@
                  [rm-hull/infix "0.3.3"]
 
                  ;; wui
-                 [ring-server "0.5.0"]
                  [reagent "0.8.1"]
                  [reagent-utils "0.3.1"]
-                 [ring "1.8.1"]
-                 [ring/ring-defaults "0.3.2"]
                  [hiccup "1.0.5"]
 
                  ;; cljs
@@ -127,8 +125,6 @@
          :target-path "resources/public/css"}
 
   :profiles {:dev {
-                   :java-source-paths ["src/java"]
-
                    :dependencies [[midje "1.9.9"]
                                   [stylefruits/gniazdo "1.0.1"] ;; only used in benchmark
                                   [clj-http "3.9.0"]  ;; only used in benchmark
diff --git a/src/clj/skirmish/wui/server.clj b/src/clj/skirmish/wui/server.clj
index 15e6e5f..fe9fdf8 100644
--- a/src/clj/skirmish/wui/server.clj
+++ b/src/clj/skirmish/wui/server.clj
@@ -1,8 +1,8 @@
 (ns skirmish.wui.server
   (:require [skirmish.wui.handler :refer [app]]
-            [ring.adapter.jetty :refer [run-jetty]])
+            [org.httpkit.server :refer [run-server]])
   (:gen-class))
 
 (defn -main [config securities-api exchange-apis]
   (let [port 3000]
-    (run-jetty app {:port port :join? false})))
+    (run-server app {:port port :join? false})))