Skip to content
Browse files

Revert service rename for samples. They need more work to upgrade

  • Loading branch information...
1 parent efa8c9b commit 4341213f8cd7f6736f3d5323930e5612449891e1 @rkneufeld rkneufeld committed Feb 21, 2014
View
2 samples/cors/dev/dev.clj
@@ -12,7 +12,7 @@
;; dev mode in repl (can get prod mode by passing prod options to dev-init
(ns dev
- (:require [io.pedestal.http :as bootstrap]
+ (:require [io.pedestal.service.http :as bootstrap]
[cors.service :as service]
[cors.server :as server]))
View
2 samples/cors/src/cors/server.clj
@@ -12,7 +12,7 @@
(ns cors.server
(:require [cors.service :as service]
- [io.pedestal.http :as bootstrap]))
+ [io.pedestal.service.http :as bootstrap]))
(def service-instance
"Global var to hold service instance."
View
18 samples/cors/src/cors/service.clj
@@ -12,14 +12,14 @@
(ns cors.service
(:require [clojure.java.io :as io]
- [io.pedestal.interceptor :refer [defhandler defbefore defafter definterceptor]]
- [io.pedestal.log :as log]
- [io.pedestal.http :as bootstrap]
- [io.pedestal.http.route :as route]
- [io.pedestal.http.body-params :as body-params]
- [io.pedestal.http.route.definition :refer [defroutes]]
- [io.pedestal.http.sse :refer [sse-setup send-event end-event-stream]]
- [io.pedestal.http.impl.servlet-interceptor :as servlet-interceptor]
+ [io.pedestal.service.interceptor :refer [defhandler defbefore defafter definterceptor]]
+ [io.pedestal.service.log :as log]
+ [io.pedestal.service.http :as bootstrap]
+ [io.pedestal.service.http.route :as route]
+ [io.pedestal.service.http.body-params :as body-params]
+ [io.pedestal.service.http.route.definition :refer [defroutes]]
+ [io.pedestal.service.http.sse :refer [sse-setup send-event end-event-stream]]
+ [io.pedestal.service.http.impl.servlet-interceptor :as servlet-interceptor]
[ring.util.response :as ring-response]
[ring.middleware.cors :as cors]))
@@ -52,7 +52,7 @@
["/" {:get thread-id-sender}]]])
-;; You can use this fn or a per-request fn via io.pedestal.http.route/url-for
+;; You can use this fn or a per-request fn via io.pedestal.service.http.route/url-for
(def url-for (route/url-for-routes routes))
;; Consumed by cors.server/create-server
View
4 samples/cors/test/cors/service_test.clj
@@ -12,8 +12,8 @@
(ns cors.service-test
(:require [clojure.test :refer :all]
- [io.pedestal.test :refer :all]
- [io.pedestal.http :as bootstrap]
+ [io.pedestal.service.test :refer :all]
+ [io.pedestal.service.http :as bootstrap]
[cors.service :as service]))
(def service
View
2 samples/jboss/dev/dev.clj
@@ -1,5 +1,5 @@
(ns dev
- (:require [io.pedestal.http :as bootstrap]
+ (:require [io.pedestal.service.http :as bootstrap]
[jboss.service :as service]
[jboss.server :as server]))
View
4 samples/jboss/src/immutant/init.clj
@@ -1,7 +1,7 @@
(ns immutant.init
(:require [immutant.web :as web]
- [io.pedestal.http :as bootstrap]
- [io.pedestal.log :as log]
+ [io.pedestal.service.http :as bootstrap]
+ [io.pedestal.service.log :as log]
[jboss.service :as service]
[jboss.server :as server]))
View
2 samples/jboss/src/jboss/server.clj
@@ -1,7 +1,7 @@
(ns jboss.server
#_(:gen-class) ; for -main method in uberjar
(:require [jboss.service :as service]
- [io.pedestal.http :as bootstrap]))
+ [io.pedestal.service.http :as bootstrap]))
(def service-instance
"Global var to hold service instance."
View
8 samples/jboss/src/jboss/service.clj
@@ -1,8 +1,8 @@
(ns jboss.service
- (:require [io.pedestal.http :as bootstrap]
- [io.pedestal.http.route :as route]
- [io.pedestal.http.body-params :as body-params]
- [io.pedestal.http.route.definition :refer [defroutes]]
+ (:require [io.pedestal.service.http :as bootstrap]
+ [io.pedestal.service.http.route :as route]
+ [io.pedestal.service.http.body-params :as body-params]
+ [io.pedestal.service.http.route.definition :refer [defroutes]]
[ring.util.response :as ring-resp]))
(defn about-page
View
4 samples/jboss/test/jboss/service_test.clj
@@ -1,7 +1,7 @@
(ns jboss.service-test
(:require [clojure.test :refer :all]
- [io.pedestal.test :refer :all]
- [io.pedestal.http :as bootstrap]
+ [io.pedestal.service.test :refer :all]
+ [io.pedestal.service.http :as bootstrap]
[jboss.service :as service]))
(def service
View
4 samples/ring-middleware/README.md
@@ -17,8 +17,8 @@ we'll need in the processing list to store a value in a cookie. From
For further enlightenment, take a look at:
-* The pedestal ring-middlewares package: `pedestal.http.ring-middlewares`
-* The pedestal interceptors functionality: `pedestal.interceptor`
+* The pedestal ring-middlewares package: `pedestal.service.http.ring-middlewares`
+* The pedestal interceptors functionality: `pedestal.service.interceptor`
## See it in Action
View
2 samples/ring-middleware/dev/dev.clj
@@ -14,7 +14,7 @@
(ns dev
(:require [ring-middleware.service :as service]
[ring-middleware.server :as server]
- [io.pedestal.http :as bootstrap]))
+ [io.pedestal.service.http :as bootstrap]))
(def service (-> service/service
(merge {:env :dev
View
2 samples/ring-middleware/src/ring_middleware/server.clj
@@ -12,7 +12,7 @@
(ns ring-middleware.server
(:require [ring-middleware.service :as service]
- [io.pedestal.http :as bootstrap]))
+ [io.pedestal.service.http :as bootstrap]))
(def service-instance
"Global var to hold service instance."
View
14 samples/ring-middleware/src/ring_middleware/service.clj
@@ -12,12 +12,12 @@
(ns ring-middleware.service
(:require [clojure.java.io :as io]
- [io.pedestal.http :as bootstrap]
- [io.pedestal.http.route :as route]
- [io.pedestal.http.body-params :as body-params]
- [io.pedestal.http.route.definition :refer [defroutes]]
- [io.pedestal.http.ring-middlewares :as middlewares]
- [io.pedestal.interceptor :refer [defhandler definterceptor]]
+ [io.pedestal.service.http :as bootstrap]
+ [io.pedestal.service.http.route :as route]
+ [io.pedestal.service.http.body-params :as body-params]
+ [io.pedestal.service.http.route.definition :refer [defroutes]]
+ [io.pedestal.service.http.ring-middlewares :as middlewares]
+ [io.pedestal.service.interceptor :refer [defhandler definterceptor]]
[ring.middleware.session.cookie :as cookie]
[ring.util.response :as ring-resp]))
@@ -88,7 +88,7 @@
["/hello" ^:interceptors [session-interceptor]
{:get hello}]]])
-;; You can use this fn or a per-request fn via io.pedestal.http.route/url-for
+;; You can use this fn or a per-request fn via io.pedestal.service.http.route/url-for
(def url-for (route/url-for-routes routes))
;; Consumed by ring-middleware.server/create-server
View
4 samples/ring-middleware/test/ring_middleware/service_test.clj
@@ -12,8 +12,8 @@
(ns ring-middleware.service-test
(:require [clojure.test :refer :all]
- [io.pedestal.test :refer :all]
- [io.pedestal.http :as bootstrap]
+ [io.pedestal.service.test :refer :all]
+ [io.pedestal.service.http :as bootstrap]
[ring-middleware.service :as service]))
(def service
View
2 samples/server-sent-events/dev/dev.clj
@@ -12,7 +12,7 @@
;; dev mode in repl (can get prod mode by passing prod options to dev-init
(ns dev
- (:require [io.pedestal.http :as bootstrap]
+ (:require [io.pedestal.service.http :as bootstrap]
[server-sent-events.service :as service]
[server-sent-events.server :as server]))
View
2 samples/server-sent-events/src/server_sent_events/server.clj
@@ -13,7 +13,7 @@
(ns server-sent-events.server
(:gen-class) ; for -main method in uberjar
(:require [server-sent-events.service :as service]
- [io.pedestal.http :as bootstrap]))
+ [io.pedestal.service.http :as bootstrap]))
(def service-instance
"Global var to hold service instance."
View
10 samples/server-sent-events/src/server_sent_events/service.clj
@@ -1,8 +1,8 @@
(ns server-sent-events.service
- (:require [io.pedestal.http :as bootstrap]
- [io.pedestal.http.sse :as sse]
- [io.pedestal.http.route :as route]
- [io.pedestal.http.route.definition :refer [defroutes]]
+ (:require [io.pedestal.service.http :as bootstrap]
+ [io.pedestal.service.http.sse :as sse]
+ [io.pedestal.service.http.route :as route]
+ [io.pedestal.service.http.route.definition :refer [defroutes]]
[ring.util.response :as ring-resp]))
(defn send-counter
@@ -25,7 +25,7 @@
(defroutes routes
[[["/" {:get [::send-counter (sse/sse-setup sse-stream-ready)]}]]])
-;; You can use this fn or a per-request fn via io.pedestal.http.route/url-for
+;; You can use this fn or a per-request fn via io.pedestal.service.http.route/url-for
(def url-for (route/url-for-routes routes))
;; Consumed by server-sent-events.server/create-server
View
4 samples/server-sent-events/test/server_sent_events/service_test.clj
@@ -1,7 +1,7 @@
(ns server-sent-events.service-test
(:require [clojure.test :refer :all]
- [io.pedestal.test :refer :all]
- [io.pedestal.http :as bootstrap]
+ [io.pedestal.service.test :refer :all]
+ [io.pedestal.service.http :as bootstrap]
[server-sent-events.service :as service]))
(def service
View
2 samples/server-with-links/dev/dev.clj
@@ -14,7 +14,7 @@
(ns dev
(:require [server-with-links.service :as service]
[server-with-links.server :as server]
- [io.pedestal.http :as bootstrap]))
+ [io.pedestal.service.http :as bootstrap]))
(def service (-> service/service
(merge {:env :dev
View
2 samples/server-with-links/src/server_with_links/server.clj
@@ -12,7 +12,7 @@
(ns server-with-links.server
(:require [server-with-links.service :as service]
- [io.pedestal.http :as bootstrap]))
+ [io.pedestal.service.http :as bootstrap]))
(def service-instance
"Global var to hold service instance."
View
14 samples/server-with-links/src/server_with_links/service.clj
@@ -11,18 +11,18 @@
; You must not remove this notice, or any other, from this software.
(ns server-with-links.service
- (:require [io.pedestal.http :as bootstrap]
- [io.pedestal.http.route :as route]
- [io.pedestal.http.body-params :as body-params]
- [io.pedestal.interceptor :refer [defhandler]]
- [io.pedestal.http.route.definition :refer [defroutes]]
+ (:require [io.pedestal.service.http :as bootstrap]
+ [io.pedestal.service.http.route :as route]
+ [io.pedestal.service.http.body-params :as body-params]
+ [io.pedestal.service.interceptor :refer [defhandler]]
+ [io.pedestal.service.http.route.definition :refer [defroutes]]
[ring.util.response :as ring-resp]))
(defn link-to
- "Uses pedestal.http.route/url-for fn to generate a link to a named route"
+ "Uses pedestal.service.http.route/url-for fn to generate a link to a named route"
[text route]
(format "<a href='%s'>%s</a>"
- (io.pedestal.http.route/url-for route)
+ (io.pedestal.service.http.route/url-for route)
text))
(defhandler this-page
View
4 samples/server-with-links/test/server_with_links/service_test.clj
@@ -12,8 +12,8 @@
(ns server-with-links.service-test
(:require [clojure.test :refer :all]
- [io.pedestal.test :refer :all]
- [io.pedestal.http :as bootstrap]
+ [io.pedestal.service.test :refer :all]
+ [io.pedestal.service.http :as bootstrap]
[server-with-links.service :as service]))
(def service
View
2 samples/template-server/dev/dev.clj
@@ -14,7 +14,7 @@
(ns dev
(:require [template-server.service :as service]
[template-server.server :as server]
- [io.pedestal.http :as bootstrap]))
+ [io.pedestal.service.http :as bootstrap]))
(def service (-> service/service
(merge {:env :dev
View
2 samples/template-server/src/template_server/server.clj
@@ -12,7 +12,7 @@
(ns template-server.server
(:require [template-server.service :as service]
- [io.pedestal.http :as bootstrap]))
+ [io.pedestal.service.http :as bootstrap]))
(def service-instance
"Global var to hold service instance."
View
10 samples/template-server/src/template_server/service.clj
@@ -11,10 +11,10 @@
; You must not remove this notice, or any other, from this software.
(ns template-server.service
- (:require [io.pedestal.http :as bootstrap]
- [io.pedestal.http.route :as route]
- [io.pedestal.http.body-params :as content-type]
- [io.pedestal.http.route.definition :refer [defroutes]]
+ (:require [io.pedestal.service.http :as bootstrap]
+ [io.pedestal.service.http.route :as route]
+ [io.pedestal.service.http.body-params :as content-type]
+ [io.pedestal.service.http.route.definition :refer [defroutes]]
[ring.util.response :as ring-resp]
[clojure.java.io :as io]
[hiccup.page :as page]
@@ -102,7 +102,7 @@
["/stringtemplate" {:get stringtemplate-page}]
["/comb" {:get comb-page}]]]])
-;; You can use this fn or a per-request fn via io.pedestal.http.route/url-for
+;; You can use this fn or a per-request fn via io.pedestal.service.http.route/url-for
(def url-for (route/url-for-routes routes))
;; Consumed by template-server.server/create-server
View
4 samples/template-server/test/template_server/service_test.clj
@@ -12,8 +12,8 @@
(ns template-server.service-test
(:require [clojure.test :refer :all]
- [io.pedestal.test :refer :all]
- [io.pedestal.http :as bootstrap]
+ [io.pedestal.service.test :refer :all]
+ [io.pedestal.service.http :as bootstrap]
[template-server.service :as service]))
(def service

0 comments on commit 4341213

Please sign in to comment.
Something went wrong with that request. Please try again.