Update to a newer wunderboss with separate WildFly modules

WunderBoss' WildFly support has been broken in to individual modules based on function, which will allow us to only bring in the parts needed, and work with wildfly-swarm when the time comes. This requires updating lein-immutant, deploy-tools, and fntest to newer versions (currently SNAPSHOTS) that understand that new structure.
immutant · Nov 2, 2015 · bb381a8 · bb381a8
1 parent bead199
commit bb381a8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/integration-tests/project.clj b/integration-tests/project.clj
@@ -19,7 +19,7 @@
                  [org.immutant/wildfly _]]
   :aliases {"all" ^:replace ["do" "clean," "test"]}
   :modules {:parent nil}
-  :profiles {:integ-base {:plugins [[lein-immutant "2.0.0"]]
+  :profiles {:integ-base {:plugins [[lein-immutant "2.1.0-SNAPSHOT"]]
                           :aliases {"test" ^:displace ["immutant" "test"]}
                           :modules {:parent ".."}}
              :integ-messaging {:test-paths ["../messaging/test"]}

diff --git a/project.clj b/project.clj
@@ -93,11 +93,11 @@
                         environ                    "1.0.0"
 
                         ;; org.projectodd.wunderboss  "0.9.0"
-                        org.projectodd.wunderboss  "1.x.incremental.292"
+                        org.projectodd.wunderboss  "1.x.incremental.295"
                         ;; org.projectodd.wunderboss  "0.9.1-SNAPSHOT"
 
                         org.immutant               :version
-                        fntest                     "2.0.7"}}
+                        fntest                     "2.0.8-SNAPSHOT"}}
 
   :release-tasks  [["vcs" "assert-committed"]
 

diff --git a/wildfly/project.clj b/wildfly/project.clj
@@ -19,6 +19,6 @@
 
   :dependencies [[org.immutant/core _]
                  [org.clojure/tools.nrepl "_"]
-                 [org.projectodd.wunderboss/wunderboss-wildfly _]]
+                 [org.projectodd.wunderboss/wunderboss-wildfly-core _]]
 
   :profiles {:base {:dependencies []}})
diff --git a/wildfly/src/immutant/wildfly.clj b/wildfly/src/immutant/wildfly.clj
@@ -150,12 +150,7 @@
   ([host protocol]
      (format "%s://%s:%s%s" protocol host (http-port) (context-path))))
 
-(let [in-cluster (delay
-                   (boolean
-                     (ignore-load-failures
-                       (-> ^Class (u/try-import 'org.projectodd.wunderboss.as.ClusterUtils)
-                         (.getMethod "inCluster" nil)
-                         (.invoke nil nil)))))]
+(let [in-cluster (delay (invoke-as-util-method "inCluster"))]
   (defn in-cluster?
   "Returns true if running inside a cluster"
   []