Permalink
Browse files

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...
1 parent 30d42ab commit 2c2659f01b062339fae705d15ab1a267360b7394 @macourtney committed Sep 12, 2012
@@ -1,6 +1,6 @@
(defproject org.conjure/conjure-config "0.9.0-SNAPSHOT"
:description "FIXME: write description"
- :dependencies [[clojure-tools "1.1.1-SNAPSHOT"]
+ :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
[clout "1.0.0"]
[org.clojure/clojure "1.3.0"]
[org.conjure/conjure-util "0.9.0-SNAPSHOT"]])
@@ -1,7 +1,6 @@
(ns conjure.flow.base
(:require [conjure.flow.util :as flow-util]
- [conjure.util.conjure-utils :as conjure-utils]
- [helpers.template-helper :as template-helper]))
+ [conjure.util.conjure-utils :as conjure-utils]))
(defn
#^{ :doc "Redirects to the given url with the given status. If status is not given, 302 (redirect found) is used." }
@@ -1,11 +1,10 @@
(defproject org.conjure/conjure-plugin "0.9.0-SNAPSHOT"
:description "Conjure view is a library to render html for conjure."
- :dependencies [[clojure-tools "1.1.1"]
+ :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
[org.clojure/tools.logging "0.2.0"]
[org.conjure/conjure-config "0.9.0-SNAPSHOT"]]
- :profiles { :dev { :dependencies [[org.conjure/conjure-flow "0.9.0-SNAPSHOT"]
- [org.conjure/conjure-model "0.9.0-SNAPSHOT"]
- [org.conjure/conjure-server "0.9.0-SNAPSHOT"]
+ :profiles { :dev { :dependencies [[org.conjure/conjure-server "0.9.0-SNAPSHOT"]
+ [org.conjure/conjure-scaffold "0.9.0-SNAPSHOT"]
[org.drift-db/drift-db-h2 "1.1.2"]] } })
@@ -3,8 +3,7 @@
[conjure.model.util :as model-util]
[conjure.util.request :as request]
[clojure.tools.string-utils :as string-utils]
- [drift-db.core :as drift-db]
- [views.layouts.templates.tabs :as layout-tabs]))
+ [drift-db.core :as drift-db]))
(defn
#^{ :doc "Returns the metadata for the given model." }
@@ -29,6 +28,11 @@
(model-util/load-model model-name)
(clj-record-core/get-record model-name id))
+(defn
+#^{ :doc "Gets or generates all of the tab maps for use by template-tabs." }
+ all-tabs []
+ (or (:tabs (request/layout-info)) []))
+
(defn-
template-tabs [request-map]
(map
@@ -38,7 +42,7 @@
(assoc tab-map :is-active true)
tab-map)))
(request/set-request-map request-map
- (layout-tabs/all-tabs))))
+ (all-tabs))))
(defn
#^{ :doc "Creates a request-map from the given request map which points to the templates controller with the given
@@ -1,6 +1,6 @@
(defproject org.conjure/conjure-script-core "0.9.0-SNAPSHOT"
:description "The core namespaces for conjure script."
- :dependencies [[clojure-tools "1.1.1-SNAPSHOT"]
+ :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
[org.conjure/conjure-plugin "0.9.0-SNAPSHOT"]
[org.conjure/conjure-script-plugin "0.9.0-SNAPSHOT"]
[org.conjure/conjure-server "0.9.0-SNAPSHOT"]]
@@ -43,7 +43,7 @@
([model extra-content]
(let [model-namespace (util/model-namespace model)]
(str "(ns " model-namespace "
- (:use conjure.core.model.base
+ (:use conjure.model.base
clj-record.boot))
(clj-record.core/init-model)
@@ -1,7 +1,7 @@
(defproject org.conjure/conjure-script-plugin "0.9.0-SNAPSHOT"
:description "The generator and destroyers for the plugin files."
- :dependencies [[clojure-tools "1.1.1"]
+ :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
[org.clojure/tools.logging "0.2.0"]
[org.conjure/conjure-plugin "0.9.0-SNAPSHOT"]
[org.conjure/conjure-test "0.9.0-SNAPSHOT"]]
@@ -1,7 +1,7 @@
(defproject org.conjure/conjure-script-view "0.9.0-SNAPSHOT"
:description "The generator and destroyers for the view files."
- :dependencies [[clojure-tools "1.1.1-SNAPSHOT"]
+ :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
[org.conjure/conjure-view "0.9.0-SNAPSHOT"]
[org.conjure/conjure-test "0.9.0-SNAPSHOT"]]
- :dev-dependencies [[org.clojure/clojure "1.2.1"]
- [org.conjure/conjure-model "0.9.0-SNAPSHOT"]])
+
+ :profiles { :dev { :dependencies [[org.conjure/conjure-model "0.9.0-SNAPSHOT"]] } })
@@ -1,6 +1,6 @@
(defproject org.conjure/conjure-server "0.9.0-SNAPSHOT"
:description "Conjure view is a library to render html for conjure."
- :dependencies [[clojure-tools "1.1.1"]
+ :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
[org.clojure/tools.cli "0.2.1"]
[org.clojure/tools.logging "0.2.0"]
[org.conjure/conjure-config "0.9.0-SNAPSHOT"]
@@ -1,7 +1,7 @@
(defproject org.conjure/conjure-test "0.9.0-SNAPSHOT"
:description "A collection of test utilities for conjure."
- :dependencies [[clojure-tools "1.1.1"]
+ :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
[drift "1.4.3"]
[org.clojure/clojure "1.3.0"]
[org.clojure/tools.logging "0.2.3"]
@@ -1,6 +1,6 @@
(defproject org.conjure/conjure-util "0.9.0-SNAPSHOT"
:description "FIXME: write description"
- :dependencies [[clojure-tools "1.1.1-SNAPSHOT"]
+ :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
[org.clojure/clojure "1.4.0"]
[org.clojure/tools.namespace "0.1.0"]]
@@ -1,6 +1,6 @@
(defproject org.conjure/conjure-view "0.9.0-SNAPSHOT"
:description "Conjure view is a library to render html for conjure."
- :dependencies [[clojure-tools "1.1.1-SNAPSHOT"]
+ :dependencies [[clojure-tools "1.1.2-SNAPSHOT"]
[hiccup "1.0.0"]
[org.conjure/conjure-config "0.9.0-SNAPSHOT"]
[org.conjure/conjure-html "0.9.0"]

0 comments on commit 2c2659f

Please sign in to comment.