From 294efbaf13e38d3fe1a5f49b4317df451f0ff477 Mon Sep 17 00:00:00 2001
From: Rick Moynihan <rick.m@swirrl.com>
Date: Mon, 29 Jan 2018 15:17:58 +0000
Subject: [PATCH] Fixes to run from uberjar

---
 log-config.edn.example |  6 +++---
 resources/system.edn   | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/log-config.edn.example b/log-config.edn.example
index 5f45252f2..2d170d002 100644
--- a/log-config.edn.example
+++ b/log-config.edn.example
@@ -1,15 +1,15 @@
 (let [log-pattern "%d{ISO8601} %-5p %20.20c{1} %12X{user} %12X{jobId} %12X{reqId} :: %m%n"
       max-backups 7
       sparql-log (doto (org.apache.log4j.RollingFileAppender.
-                        (EnhancedPatternLayout. log-pattern)
+                        (org.apache.log4j.EnhancedPatternLayout. log-pattern)
                         "logs/sparql.log")
                    (.setMaxBackupIndex max-backups))
       drafter-log (doto (org.apache.log4j.RollingFileAppender.
-                         (EnhancedPatternLayout. log-pattern)
+                         (org.apache.log4j.EnhancedPatternLayout. log-pattern)
                          "logs/drafter.log")
                     (.setMaxBackupIndex max-backups))]
 
-  (set-loggers!
+  (clj-logging-config.log4j/set-loggers!
        ["org.openrdf" "drafter" "swirrl-server"]
        {:name "drafter"
         :level :info
diff --git a/resources/system.edn b/resources/system.edn
index 5097049ed..ca1d929e7 100644
--- a/resources/system.edn
+++ b/resources/system.edn
@@ -9,7 +9,7 @@
                          :sparql-update-endpoint #uri #env SPARQL_UPDATE_ENDPOINT}
 
  
- :drafter.stasher/filecache {}
+ :drafter.stasher/filecache {} #_{:dir #or [#env STASHER_CACHE_DIR "stasher-cache"]}
 
  :drafter.stasher/cache-thread-pool {}
 
@@ -52,8 +52,8 @@
  :drafter.routes.sparql/live-sparql-query-route {:repo #ig/ref :drafter.backend.live/endpoint
                                                  :timeout-fn #ig/ref [:drafter.timeouts/timeout-query :drafter/live-timeout]}
 
- :drafter.routes.draftsets-api/get-draftsets-handler {:drafter/backend #ig/ref :drafter/backend
-                                                      :wrap-auth #ig/ref :drafter.middleware/wrap-auth}
+ :drafter.feature.draftset.list/get-draftsets-handler {:drafter/backend #ig/ref :drafter/backend
+                                                       :wrap-auth #ig/ref :drafter.middleware/wrap-auth}
 
  :drafter.routes.draftsets-api/get-draftset-handler {:drafter/backend #ig/ref :drafter/backend
                                                      :wrap-auth #ig/ref :drafter.middleware/wrap-auth}
@@ -107,11 +107,12 @@
  :drafter.routes.draftsets-api/draftset-claim-handler {:wrap-auth #ig/ref :drafter.middleware/wrap-auth
                                                        :drafter/backend #ig/ref :drafter/backend}
 
- :drafter.routes.draftsets-api/get-users-handler {:wrap-auth #ig/ref :drafter.middleware/wrap-auth
+ #_:drafter.routes.draftsets-api/get-users-handler
+ :drafter.feature.users.list/get-users-handler {:wrap-auth #ig/ref :drafter.middleware/wrap-auth
                                                   :drafter.user/repo #ig/ref :drafter.user/repo}
  
- :drafter.routes/draftsets-api {:get-users-handler #ig/ref :drafter.routes.draftsets-api/get-users-handler
-                                :get-draftsets-handler #ig/ref :drafter.routes.draftsets-api/get-draftsets-handler
+ :drafter.routes/draftsets-api {:get-users-handler #ig/ref :drafter.feature.users.list/get-users-handler
+                                :get-draftsets-handler #ig/ref :drafter.feature.draftset.list/get-draftsets-handler
                                 :create-draftsets-handler #ig/ref :drafter.routes.draftsets-api/create-draftsets-handler
                                 :get-draftset-handler #ig/ref :drafter.routes.draftsets-api/get-draftset-handler
                                 :delete-draftset-handler #ig/ref :drafter.routes.draftsets-api/delete-draftset-handler