From b61be5ae21a4f65abdce627a3983503ccc110837 Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 8 May 2016 11:56:33 -0400 Subject: [PATCH] some namespace renaming to keep things consistent (nitpicky...) --- chat-demo/src/chat_demo/server.clj | 6 +++--- .../thegeez/browserchannel/immutant_async_adapter.clj} | 4 ++-- .../thegeez/{ => browserchannel}/jetty_async_adapter.clj | 4 ++-- .../src/net/thegeez/{ => browserchannel}/async_adapter.clj | 2 +- .../{browserchannel.clj => browserchannel/server.clj} | 5 +++-- 5 files changed, 11 insertions(+), 10 deletions(-) rename clj-browserchannel-immutant-adapter/src/{clj_browserchannel_immutant_adapter/core.clj => net/thegeez/browserchannel/immutant_async_adapter.clj} (88%) rename clj-browserchannel-jetty-adapter/src/net/thegeez/{ => browserchannel}/jetty_async_adapter.clj (97%) rename clj-browserchannel-server/src/net/thegeez/{ => browserchannel}/async_adapter.clj (84%) rename clj-browserchannel-server/src/net/thegeez/{browserchannel.clj => browserchannel/server.clj} (99%) diff --git a/chat-demo/src/chat_demo/server.clj b/chat-demo/src/chat_demo/server.clj index cff40e9..a6b78e5 100644 --- a/chat-demo/src/chat_demo/server.clj +++ b/chat-demo/src/chat_demo/server.clj @@ -6,9 +6,9 @@ [ring.middleware.defaults :refer [wrap-defaults site-defaults]] [ring.util.response :refer [response]] [clj-pebble.core :as pebble] - [net.thegeez.browserchannel :as browserchannel] - [net.thegeez.jetty-async-adapter :as jetty] - [clj-browserchannel-immutant-adapter.core :as immutant] + [net.thegeez.browserchannel.server :as browserchannel] + [net.thegeez.browserchannel.jetty-async-adapter :as jetty] + [net.thegeez.browserchannel.immutant-async-adapter :as immutant] [environ.core :refer [env]])) (defonce clients (atom #{})) diff --git a/clj-browserchannel-immutant-adapter/src/clj_browserchannel_immutant_adapter/core.clj b/clj-browserchannel-immutant-adapter/src/net/thegeez/browserchannel/immutant_async_adapter.clj similarity index 88% rename from clj-browserchannel-immutant-adapter/src/clj_browserchannel_immutant_adapter/core.clj rename to clj-browserchannel-immutant-adapter/src/net/thegeez/browserchannel/immutant_async_adapter.clj index 8d7e5dd..dfc5278 100644 --- a/clj-browserchannel-immutant-adapter/src/clj_browserchannel_immutant_adapter/core.clj +++ b/clj-browserchannel-immutant-adapter/src/net/thegeez/browserchannel/immutant_async_adapter.clj @@ -1,8 +1,8 @@ -(ns clj-browserchannel-immutant-adapter.core +(ns net.thegeez.browserchannel.immutant-async-adapter (:require [immutant.web :as iweb] [immutant.web.async :as iasync] - [net.thegeez.async-adapter :as bc-async-adapter])) + [net.thegeez.browserchannel.async-adapter :as bc-async-adapter])) (deftype ImmutantResponse [channel] bc-async-adapter/IAsyncAdapter diff --git a/clj-browserchannel-jetty-adapter/src/net/thegeez/jetty_async_adapter.clj b/clj-browserchannel-jetty-adapter/src/net/thegeez/browserchannel/jetty_async_adapter.clj similarity index 97% rename from clj-browserchannel-jetty-adapter/src/net/thegeez/jetty_async_adapter.clj rename to clj-browserchannel-jetty-adapter/src/net/thegeez/browserchannel/jetty_async_adapter.clj index f16ba0a..4430d86 100644 --- a/clj-browserchannel-jetty-adapter/src/net/thegeez/jetty_async_adapter.clj +++ b/clj-browserchannel-jetty-adapter/src/net/thegeez/browserchannel/jetty_async_adapter.clj @@ -1,4 +1,4 @@ -(ns net.thegeez.jetty-async-adapter +(ns net.thegeez.browserchannel.jetty-async-adapter "BrowserChannel adapter for the Jetty webserver, with async HTTP." (:import [org.eclipse.jetty.server.handler AbstractHandler] [org.eclipse.jetty.server Server Request Response] @@ -10,7 +10,7 @@ [javax.servlet.http HttpServletRequest] [java.security KeyStore]) (:require [ring.util.servlet :as servlet] - [net.thegeez.async-adapter :as async-adapter])) + [net.thegeez.browserchannel.async-adapter :as async-adapter])) ;; Based on ring-jetty-async-adapter by Mark McGranaghan ;; (https://github.com/mmcgrana/ring/tree/jetty-async) diff --git a/clj-browserchannel-server/src/net/thegeez/async_adapter.clj b/clj-browserchannel-server/src/net/thegeez/browserchannel/async_adapter.clj similarity index 84% rename from clj-browserchannel-server/src/net/thegeez/async_adapter.clj rename to clj-browserchannel-server/src/net/thegeez/browserchannel/async_adapter.clj index 67e9608..2ef2a80 100644 --- a/clj-browserchannel-server/src/net/thegeez/async_adapter.clj +++ b/clj-browserchannel-server/src/net/thegeez/browserchannel/async_adapter.clj @@ -1,4 +1,4 @@ -(ns net.thegeez.async-adapter) +(ns net.thegeez.browserchannel.async-adapter) (defprotocol IAsyncAdapter (head [this status headers]) diff --git a/clj-browserchannel-server/src/net/thegeez/browserchannel.clj b/clj-browserchannel-server/src/net/thegeez/browserchannel/server.clj similarity index 99% rename from clj-browserchannel-server/src/net/thegeez/browserchannel.clj rename to clj-browserchannel-server/src/net/thegeez/browserchannel/server.clj index 56ef71c..db39cbc 100644 --- a/clj-browserchannel-server/src/net/thegeez/browserchannel.clj +++ b/clj-browserchannel-server/src/net/thegeez/browserchannel/server.clj @@ -1,11 +1,12 @@ -(ns net.thegeez.browserchannel +(ns net.thegeez.browserchannel.server "BrowserChannel server implementation in Clojure." (:require [ring.middleware.params :as params] [ring.util.codec :as codec] [clojure.data.json :as json] [clojure.string :as str] - [net.thegeez.async-adapter :as async-adapter]) + [net.thegeez.browserchannel.async-adapter :as async-adapter]) (:import [java.util.concurrent ScheduledExecutorService Executors TimeUnit Callable ScheduledFuture])) + ;; @todo: out of order acks and maps - AKH the maps at least is taken care of. ;; @todo use a more specific Exception for failing writes, which ;; indicate closed connection