Permalink
Browse files

Refactored the directories in conjure view.

  • Loading branch information...
1 parent d1241a5 commit 930c077718031dbb9f3393e4fb820d582639e8b8 @macourtney committed Mar 2, 2012
Showing with 64 additions and 87 deletions.
  1. +0 −24 conjure_view/log/test.log
  2. +4 −4 conjure_view/src/conjure/{core → }/view/ajax.clj
  3. +8 −8 conjure_view/src/conjure/{core → }/view/base.clj
  4. +2 −2 conjure_view/src/conjure/{core → }/view/builder.clj
  5. +6 −5 conjure_view/src/conjure/{core → }/view/form.clj
  6. +4 −4 conjure_view/src/conjure/{core → }/view/link.clj
  7. +2 −2 conjure_view/src/conjure/{core → }/view/select.clj
  8. +5 −5 conjure_view/src/conjure/{core → }/view/util.clj
  9. +1 −1 conjure_view/src/conjure/{core → }/view/xml_base.clj
  10. +1 −1 conjure_view/test/config/db_config.clj
  11. +1 −1 conjure_view/test/config/session_config.clj
  12. +4 −4 conjure_view/test/conjure/{core → }/view/test/test_base.clj
  13. +3 −3 conjure_view/test/conjure/{core → }/view/test/test_builder.clj
  14. +3 −3 conjure_view/test/conjure/{core → }/view/test/test_util.clj
  15. +2 −2 conjure_view/test/conjure/{core → }/view/test/test_xml_base.clj
  16. +1 −1 conjure_view/test/test_helper.clj
  17. +1 −1 conjure_view/test/views/layouts/application.clj
  18. +2 −2 conjure_view/test/views/layouts/templates/breadcrumbs.clj
  19. +1 −1 conjure_view/test/views/layouts/templates/header.clj
  20. +4 −4 conjure_view/test/views/layouts/templates/links.clj
  21. +3 −3 conjure_view/test/views/layouts/templates/links_sidebar.clj
  22. +3 −3 conjure_view/test/views/layouts/templates/tabs.clj
  23. +1 −1 conjure_view/test/views/test/ajax_test.clj
  24. +1 −1 conjure_view/test/views/test/show.clj
  25. +1 −1 conjure_view/test/views/test/view_params_test.clj
View
@@ -1,24 +0,0 @@
-INFO [conjure.core.view.builder]: C:\cygwin\home\mcourtney\Conjure\conjure_view\test\views\test_builder directory already exists.
-INFO [conjure.core.view.builder]: Creating controller directory in views...
-INFO [conjure.core.view.builder]: Creating controller directory in views...
-INFO [conjure.core.view.builder]: Creating view file show.clj...
-INFO [conjure.core.view.builder]: C:\cygwin\home\mcourtney\Conjure\conjure_view\test\views\test_builder directory already exists.
-INFO [conjure.core.config.environment]: Environment Mode: test
-INFO [conjure.core.view.builder]: C:\cygwin\home\mcourtney\Conjure\conjure_view\test\views\test_builder directory already exists.
-INFO [conjure.core.view.builder]: Creating controller directory in views...
-INFO [conjure.core.view.builder]: Creating controller directory in views...
-INFO [conjure.core.view.builder]: Creating view file show.clj...
-INFO [conjure.core.view.builder]: C:\cygwin\home\mcourtney\Conjure\conjure_view\test\views\test_builder directory already exists.
-INFO [conjure.core.config.environment]: Environment Mode: test
-INFO [conjure.core.view.builder]: C:\cygwin\home\mcourtney\Conjure\conjure_view\test\views\test_builder directory already exists.
-INFO [conjure.core.view.builder]: Creating controller directory in views...
-INFO [conjure.core.view.builder]: Creating controller directory in views...
-INFO [conjure.core.view.builder]: Creating view file show.clj...
-INFO [conjure.core.view.builder]: C:\cygwin\home\mcourtney\Conjure\conjure_view\test\views\test_builder directory already exists.
-INFO [conjure.core.config.environment]: Environment Mode: test
-INFO [conjure.core.view.builder]: C:\cygwin\home\mcourtney\Conjure\conjure_view\test\views\test_builder directory already exists.
-INFO [conjure.core.view.builder]: Creating controller directory in views...
-INFO [conjure.core.view.builder]: Creating controller directory in views...
-INFO [conjure.core.view.builder]: Creating view file show.clj...
-INFO [conjure.core.view.builder]: C:\cygwin\home\mcourtney\Conjure\conjure_view\test\views\test_builder directory already exists.
-INFO [conjure.core.config.environment]: Environment Mode: test
@@ -1,11 +1,11 @@
-(ns conjure.core.view.ajax)
+(ns conjure.view.ajax)
-(in-ns 'conjure.core.view.base)
+(in-ns 'conjure.view.base)
(require ['clojure.tools.logging :as 'logging])
(require ['com.reasonr.scriptjure :as 'scriptjure])
-(require ['conjure.core.util.request :as 'request])
-(require ['conjure.core.view.util :as 'view-util])
+(require ['conjure.util.request :as 'request])
+(require ['conjure.view.util :as 'view-util])
(defn-
#^{ :doc "Returns the position function for the given position." }
@@ -1,12 +1,12 @@
-(ns conjure.core.view.base
+(ns conjure.view.base
(:require [clojure.string :as str-utils]
[clojure.tools.html-utils :as html-utils]
[clojure.tools.logging :as logging]
[clojure.tools.servlet-utils :as servlet-utils]
[clojure.tools.string-utils :as conjure-str-utils]
- [conjure.core.config.environment :as environment]
- [conjure.core.util.request :as request]
- [conjure.core.view.util :as view-util]
+ [conjure.config.environment :as environment]
+ [conjure.util.request :as request]
+ [conjure.view.util :as view-util]
[conjure.html.core :as conjure-html]))
(defn default-response-map []
@@ -245,10 +245,10 @@ with the following defaults:
(def nbsp non-breaking-space) ;alias for non-breaking-space
-(require 'conjure.core.view.form)
+(require 'conjure.view.form)
-(require 'conjure.core.view.ajax)
+(require 'conjure.view.ajax)
-(require 'conjure.core.view.link)
+(require 'conjure.view.link)
-(require 'conjure.core.view.select)
+(require 'conjure.view.select)
@@ -1,7 +1,7 @@
-(ns conjure.core.view.builder
+(ns conjure.view.builder
(:import [java.io File])
(:require [clojure.tools.logging :as logging]
- [conjure.core.view.util :as util]
+ [conjure.view.util :as util]
[clojure.tools.loading-utils :as loading-utils]
[clojure.tools.string-utils :as conjure-str-utils]))
@@ -1,12 +1,13 @@
-(ns conjure.core.view.form)
+(ns conjure.view.form)
-(in-ns 'conjure.core.view.base)
+(in-ns 'conjure.view.base)
+
+(require ['conjure.model.util :as 'model-util])
(require ['clojure.tools.logging :as 'logging])
-(require ['conjure.core.model.util :as 'model-util])
-(require ['conjure.core.util.request :as 'request])
(require ['clojure.tools.map-utils :as 'map-utils])
-(require ['conjure.core.view.util :as 'view-utils])
+(require ['conjure.view.util :as 'view-utils])
+(require ['conjure.util.request :as 'request])
(require ['hiccup.core :as 'hiccup])
(defn
@@ -1,9 +1,9 @@
-(ns conjure.core.view.link)
+(ns conjure.view.link)
-(in-ns 'conjure.core.view.base)
+(in-ns 'conjure.view.base)
-(require ['conjure.core.util.request :as 'request])
-(require ['conjure.core.view.util :as 'view-utils])
+(require ['conjure.util.request :as 'request])
+(require ['conjure.view.util :as 'view-utils])
(defn
#^{ :doc "Returns the attributes for the link tag (\"a\" tag) from the request-map." }
@@ -1,6 +1,6 @@
-(ns conjure.core.view.select)
+(ns conjure.view.select)
-(in-ns 'conjure.core.view.base)
+(in-ns 'conjure.view.base)
(require ['hiccup.core :as 'hiccup])
@@ -1,15 +1,15 @@
-(ns conjure.core.view.util
+(ns conjure.view.util
(:require [clojure.tools.logging :as logging]
[clojure.tools.file-utils :as file-utils]
[clojure.tools.html-utils :as html-utils]
[clojure.tools.loading-utils :as loading-utils]
[clojure.tools.servlet-utils :as servlet-utils]
[clojure.tools.string-utils :as conjure-str-utils]
[config.session-config :as session-config]
- [conjure.core.config.environment :as environment]
- [conjure.core.util.request :as request]
- [conjure.core.util.conjure-utils :as conjure-utils]
- [conjure.core.util.session-utils :as session-utils]))
+ [conjure.config.environment :as environment]
+ [conjure.util.request :as request]
+ [conjure.util.conjure-utils :as conjure-utils]
+ [conjure.util.session-utils :as session-utils]))
(def views-dir "views")
@@ -1,4 +1,4 @@
-(ns conjure.core.view.xml-base
+(ns conjure.view.xml-base
(:import [java.io StringWriter])
(:require [conjure.html.core :as conjure-html]))
@@ -1,7 +1,7 @@
;; This file is used to configure the database and connection.
(ns config.db-config
- (:require [conjure.core.config.environment :as environment]
+ (:require [conjure.config.environment :as environment]
[drift-db-h2.flavor :as h2-flavor]))
(defn dbname [environment]
@@ -1,5 +1,5 @@
(ns config.session-config
- (:require [conjure.core.model.memory-session-store :as memory-session-store]))
+ (:require [conjure.model.memory-session-store :as memory-session-store]))
(def ^:dynamic use-session-cookie true) ; Causes Conjure to save session ids as cookies. If this is false, Conjure uses a parameter in html.
@@ -1,10 +1,10 @@
-(ns conjure.core.view.test.test-base
+(ns conjure.view.test.test-base
(:use clojure.test
- conjure.core.view.base)
+ conjure.view.base)
(require [clojure.string :as string]
[com.reasonr.scriptjure :as scriptjure]
- [conjure.core.config.environment :as environment]
- [conjure.core.util.request :as request]
+ [conjure.config.environment :as environment]
+ [conjure.util.request :as request]
[views.test.ajax-test :as ajax-test-view]
[views.test.view-params-test :as view-params-test-view]))
@@ -1,8 +1,8 @@
-(ns conjure.core.view.test.test-builder
+(ns conjure.view.test.test-builder
(:use test-helper
clojure.test
- conjure.core.view.builder)
- (:require [conjure.core.view.util :as util]
+ conjure.view.builder)
+ (:require [conjure.view.util :as util]
[clojure.tools.loading-utils :as loading-utils]))
(def controller "test-builder")
@@ -1,11 +1,11 @@
-(ns conjure.core.view.test.test-util
+(ns conjure.view.test.test-util
(:import [java.io File])
(:use clojure.test
- conjure.core.view.util
+ conjure.view.util
test-helper)
(:require [clojure.tools.logging :as logging]
[config.session-config :as session-config]
- [conjure.core.util.request :as request]))
+ [conjure.util.request :as request]))
(def action-name "show")
(def controller-name "test")
@@ -1,6 +1,6 @@
-(ns conjure.core.view.test.test-xml-base
+(ns conjure.view.test.test-xml-base
(:use clojure.test
- conjure.core.view.xml-base))
+ conjure.view.xml-base))
(def-xml []
[:test])
@@ -3,7 +3,7 @@
(:use clojure.test)
(:require [config.db-config :as db-config]
[config.session-config :as session-config]
- [conjure.core.config.environment :as environment]
+ [conjure.config.environment :as environment]
[drift-db.core :as drift-db]))
(defn
@@ -1,5 +1,5 @@
(ns views.layouts.application
- (:use conjure.core.view.base)
+ (:use conjure.view.base)
(:require [com.reasonr.scriptjure :as scriptjure]
[views.layouts.templates.breadcrumbs :as breadcrumbs]
[views.layouts.templates.header :as header]
@@ -1,6 +1,6 @@
(ns views.layouts.templates.breadcrumbs
- (:use conjure.core.view.base)
- (:require [conjure.core.util.request :as request]
+ (:use conjure.view.base)
+ (:require [conjure.util.request :as request]
[clojure.tools.string-utils :as conjure-str-utils]))
(def-view []
@@ -1,5 +1,5 @@
(ns views.layouts.templates.header
- (:use conjure.core.view.base))
+ (:use conjure.view.base))
(def-view [title]
[:div { :id "header" }
@@ -1,8 +1,8 @@
(ns views.layouts.templates.links
- (:use conjure.core.view.base)
- (:require [conjure.core.util.request :as request]
- [clojure.tools.string-utils :as string-utils]
- [conjure.core.view.util :as view-util]))
+ (:use conjure.view.base)
+ (:require [clojure.tools.string-utils :as string-utils]
+ [conjure.util.request :as request]
+ [conjure.view.util :as view-util]))
(defn
#^{ :doc "Returns the link controller from the given link map." }
@@ -1,7 +1,7 @@
(ns views.layouts.templates.links-sidebar
- (:use conjure.core.view.base)
- (:require [conjure.core.util.request :as request]
- [conjure.core.view.util :as view-util]
+ (:use conjure.view.base)
+ (:require [conjure.util.request :as request]
+ [conjure.view.util :as view-util]
[views.layouts.templates.links :as links]))
(defn
@@ -1,7 +1,7 @@
(ns views.layouts.templates.tabs
- (:use conjure.core.view.base)
- (:require [conjure.core.view.util :as view-util]
- [conjure.core.util.request :as request]
+ (:use conjure.view.base)
+ (:require [conjure.util.request :as request]
+ [conjure.view.util :as view-util]
[clojure.tools.string-utils :as string-utils]))
(defn
@@ -1,5 +1,5 @@
(ns views.test.ajax-test
- (:use conjure.core.view.base))
+ (:use conjure.view.base))
(def-ajax-view []
[:p "You can change this text in app/views/test/ajax_test.clj"])
@@ -1,5 +1,5 @@
(ns views.test.show
- (:use conjure.core.view.base))
+ (:use conjure.view.base))
(def-view []
[:p "You can change this text in app/views/test/show.clj"])
@@ -1,5 +1,5 @@
(ns views.test.view-params-test
- (:use conjure.core.view.base))
+ (:use conjure.view.base))
(def-ajax-view { :response-map { :status 500 } } []
[:p "You can change this text in app/views/test/def_view_params_test.clj"])

0 comments on commit 930c077

Please sign in to comment.