Skip to content
This repository
Browse code

Updated all references to clojure tools to the latest snapshot. Also,…

… fixed a reference to the old model base namespace in generated models.
  • Loading branch information...
commit 2c2659f01b062339fae705d15ab1a267360b7394 1 parent 30d42ab
Matt Courtney authored September 12, 2012
2  conjure_config/project.clj
... ...
@@ -1,6 +1,6 @@
1 1
 (defproject org.conjure/conjure-config "0.9.0-SNAPSHOT"
2 2
   :description "FIXME: write description"
3  
-  :dependencies [[clojure-tools "1.1.1-SNAPSHOT"]
  3
+  :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
4 4
                  [clout "1.0.0"]
5 5
                  [org.clojure/clojure "1.3.0"]
6 6
                  [org.conjure/conjure-util "0.9.0-SNAPSHOT"]])
3  conjure_flow/src/conjure/flow/base.clj
... ...
@@ -1,7 +1,6 @@
1 1
 (ns conjure.flow.base
2 2
   (:require [conjure.flow.util :as flow-util]
3  
-            [conjure.util.conjure-utils :as conjure-utils]
4  
-            [helpers.template-helper :as template-helper]))
  3
+            [conjure.util.conjure-utils :as conjure-utils]))
5 4
 
6 5
 (defn
7 6
 #^{ :doc "Redirects to the given url with the given status. If status is not given, 302 (redirect found) is used." }
7  conjure_plugin/project.clj
... ...
@@ -1,11 +1,10 @@
1 1
 (defproject org.conjure/conjure-plugin "0.9.0-SNAPSHOT"
2 2
   :description "Conjure view is a library to render html for conjure."
3 3
 
4  
-  :dependencies [[clojure-tools "1.1.1"]
  4
+  :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
5 5
                  [org.clojure/tools.logging "0.2.0"]
6 6
                  [org.conjure/conjure-config "0.9.0-SNAPSHOT"]]
7 7
 
8  
-  :profiles { :dev { :dependencies [[org.conjure/conjure-flow "0.9.0-SNAPSHOT"]
9  
-                                    [org.conjure/conjure-model "0.9.0-SNAPSHOT"]
10  
-                                    [org.conjure/conjure-server "0.9.0-SNAPSHOT"]
  8
+  :profiles { :dev { :dependencies [[org.conjure/conjure-server "0.9.0-SNAPSHOT"]
  9
+                                    [org.conjure/conjure-scaffold "0.9.0-SNAPSHOT"] 
11 10
                                     [org.drift-db/drift-db-h2 "1.1.2"]] } })
10  conjure_scaffold/src/helpers/template_helper.clj
@@ -3,8 +3,7 @@
3 3
             [conjure.model.util :as model-util]
4 4
             [conjure.util.request :as request]
5 5
             [clojure.tools.string-utils :as string-utils]
6  
-            [drift-db.core :as drift-db]
7  
-            [views.layouts.templates.tabs :as layout-tabs]))
  6
+            [drift-db.core :as drift-db]))
8 7
 
9 8
 (defn
10 9
 #^{ :doc "Returns the metadata for the given model." }
@@ -29,6 +28,11 @@
29 28
   (model-util/load-model model-name)
30 29
   (clj-record-core/get-record model-name id))
31 30
 
  31
+(defn
  32
+#^{ :doc "Gets or generates all of the tab maps for use by template-tabs." }
  33
+  all-tabs []
  34
+  (or (:tabs (request/layout-info)) []))
  35
+
32 36
 (defn-
33 37
   template-tabs [request-map]
34 38
   (map 
@@ -38,7 +42,7 @@
38 42
           (assoc tab-map :is-active true)
39 43
           tab-map)))
40 44
     (request/set-request-map request-map
41  
-      (layout-tabs/all-tabs))))
  45
+      (all-tabs))))
42 46
 
43 47
 (defn
44 48
 #^{ :doc "Creates a request-map from the given request map which points to the templates controller with the given 
2  conjure_script_core/project.clj
... ...
@@ -1,6 +1,6 @@
1 1
 (defproject org.conjure/conjure-script-core "0.9.0-SNAPSHOT"
2 2
   :description "The core namespaces for conjure script."
3  
-  :dependencies [[clojure-tools "1.1.1-SNAPSHOT"]
  3
+  :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
4 4
                  [org.conjure/conjure-plugin "0.9.0-SNAPSHOT"]
5 5
                  [org.conjure/conjure-script-plugin "0.9.0-SNAPSHOT"]
6 6
                  [org.conjure/conjure-server "0.9.0-SNAPSHOT"]]
2  conjure_script_model/src/conjure/script/generators/model_generator.clj
@@ -43,7 +43,7 @@
43 43
   ([model extra-content]
44 44
     (let [model-namespace (util/model-namespace model)]
45 45
       (str "(ns " model-namespace "
46  
-  (:use conjure.core.model.base
  46
+  (:use conjure.model.base
47 47
         clj-record.boot))
48 48
 
49 49
 (clj-record.core/init-model)
2  conjure_script_plugin/project.clj
... ...
@@ -1,7 +1,7 @@
1 1
 (defproject org.conjure/conjure-script-plugin "0.9.0-SNAPSHOT"
2 2
   :description "The generator and destroyers for the plugin files."
3 3
 
4  
-  :dependencies [[clojure-tools "1.1.1"]
  4
+  :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
5 5
                  [org.clojure/tools.logging "0.2.0"]
6 6
                  [org.conjure/conjure-plugin "0.9.0-SNAPSHOT"]
7 7
                  [org.conjure/conjure-test "0.9.0-SNAPSHOT"]]
6  conjure_script_view/project.clj
... ...
@@ -1,7 +1,7 @@
1 1
 (defproject org.conjure/conjure-script-view "0.9.0-SNAPSHOT"
2 2
   :description "The generator and destroyers for the view files."
3  
-  :dependencies [[clojure-tools "1.1.1-SNAPSHOT"]
  3
+  :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
4 4
                  [org.conjure/conjure-view "0.9.0-SNAPSHOT"]
5 5
                  [org.conjure/conjure-test "0.9.0-SNAPSHOT"]]
6  
-  :dev-dependencies [[org.clojure/clojure "1.2.1"]
7  
-                     [org.conjure/conjure-model "0.9.0-SNAPSHOT"]])
  6
+  
  7
+  :profiles { :dev { :dependencies [[org.conjure/conjure-model "0.9.0-SNAPSHOT"]] } })
2  conjure_server/project.clj
... ...
@@ -1,6 +1,6 @@
1 1
 (defproject org.conjure/conjure-server "0.9.0-SNAPSHOT"
2 2
   :description "Conjure view is a library to render html for conjure."
3  
-  :dependencies [[clojure-tools "1.1.1"]
  3
+  :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
4 4
                  [org.clojure/tools.cli "0.2.1"]
5 5
                  [org.clojure/tools.logging "0.2.0"]
6 6
                  [org.conjure/conjure-config "0.9.0-SNAPSHOT"]
2  conjure_test/project.clj
... ...
@@ -1,7 +1,7 @@
1 1
 (defproject org.conjure/conjure-test "0.9.0-SNAPSHOT"
2 2
   :description "A collection of test utilities for conjure."
3 3
 
4  
-  :dependencies [[clojure-tools "1.1.1"]
  4
+  :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
5 5
                  [drift "1.4.3"]
6 6
                  [org.clojure/clojure "1.3.0"]
7 7
                  [org.clojure/tools.logging "0.2.3"]
2  conjure_util/project.clj
... ...
@@ -1,6 +1,6 @@
1 1
 (defproject org.conjure/conjure-util "0.9.0-SNAPSHOT"
2 2
   :description "FIXME: write description"
3  
-  :dependencies [[clojure-tools "1.1.1-SNAPSHOT"]
  3
+  :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
4 4
                  [org.clojure/clojure "1.4.0"]
5 5
                  [org.clojure/tools.namespace "0.1.0"]]
6 6
   
2  conjure_view/project.clj
... ...
@@ -1,6 +1,6 @@
1 1
 (defproject org.conjure/conjure-view "0.9.0-SNAPSHOT"
2 2
   :description "Conjure view is a library to render html for conjure."
3  
-  :dependencies [[clojure-tools "1.1.1-SNAPSHOT"]
  3
+  :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
4 4
                  [hiccup "1.0.0"]
5 5
                  [org.conjure/conjure-config "0.9.0-SNAPSHOT"]
6 6
                  [org.conjure/conjure-html "0.9.0"]

0 notes on commit 2c2659f

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