             [immutant.internal.util      :as u]
             [immutant.util               :as pu]
             [immutant.messaging.internal :refer [broker]])
-  (:import org.projectodd.wunderboss.messaging.Destination
+  (:import (org.projectodd.wunderboss.messaging Destination Queue)
            org.hornetq.api.core.SimpleString))
 
-(defn hornetq-server
-  "Retrieves the local HornetQ server instance."
+(defn server-manager
+  "Retrieves the local JMS server mananger instance."
   []
   (when-let [broker (broker nil)]
     (.jmsServerManager broker)))

  (if (instance? Destination dest)
    (.jmsName dest)
    dest))

(def ^:private address-settings-coercions
  {:address-full-message-policy (fn [addr]

  (u/when-import 'org.hornetq.core.settings.impl.AddressSettings
    (when (seq settings)
      (.addAddressSettings
        (server-manager)
        (normalize-destination-match match)
        (reduce
          (fn [s [k v]]
