move to leiningen build

CHANGES.md

@@ -1,8 +1,9 @@
 # Changes and TODO
 
 - Move to Github (from Bitbucket)
-- [TODO] Move to Leiningen builds (from Maven)
-- [TODO] Move to Liquibase 2.0.5 (from 2.0.2)
+- Move to Leiningen builds (from Maven)
+- Move to Liquibase 2.0.5 (from 2.0.2)
+- [TODO] Force user to specify _logical file-name_ (logical schema name)
 - [TODO] Expose Liquibase 2.0.5 features
 - [TODO] Improve documentation
 - [TODO] Liquibase Functionality (commands)

src/main/java/org/bituf/clj_liquibase/CustomDBDocVisitor.java → java-src/clj_liquibase/CustomDBDocVisitor.java

@@ -1,4 +1,4 @@
-package org.bituf.clj_liquibase;
+package clj_liquibase;
 
 import java.io.File;
 import java.io.FileOutputStream;

project.clj

@@ -0,0 +1,27 @@
+(defproject clj-liquibase "0.4.0-SNAPSHOT"
+  :description "Clojure wrapper for Liquibase"
+  :url "https://github.com/kumarshantanu/clj-liquibase"
+  :license {:name "Eclipse Public License"
+            :url "http://www.eclipse.org/legal/epl-v10.html"}
+  :mailing-list {:name "Bitumen Framework discussion group"
+                 :archive "https://groups.google.com/group/bitumenframework"
+                 :other-archives ["https://groups.google.com/group/clojure"]
+                 :post "bitumenframework@googlegroups.com"}
+  :java-source-paths ["java-src"]
+  :javac-options {:destdir "target/classes/"
+                  :source  "1.5"
+                  :target  "1.5"}
+  :dependencies [[org.liquibase/liquibase-core "2.0.5"]
+                 [org.bituf/clj-miscutil "0.3"]
+                 [org.bituf/clj-dbspec   "0.3"]]
+  :profiles {:dev {:dependencies [[oss-jdbc "0.8.0"] ; "0.8.0"
+                                  [org.bituf/clj-dbcp "0.5"]]}
+             :1.2 {:dependencies [[org.clojure/clojure "1.2.1"]]}
+             :1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
+             :1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]}
+             :1.5 {:dependencies [[org.clojure/clojure "1.5.0-alpha5"]]}}
+  :aliases {"dev" ["with-profile" "dev,1.4"]
+            "all" ["with-profile" "dev,1.2:dev,1.3:dev,1.4:dev,1.5"]}
+  :warn-on-reflection true
+  :min-lein-version "2.0.0"
+  :jvm-opts ["-Xmx1g"])

src/main/clj/org/bituf/clj_liquibase/change.clj → src/clj_liquibase/change.clj

@@ -1,4 +1,4 @@
-(ns org.bituf.clj-liquibase.change
+(ns clj-liquibase.change
   "Clojure wrappers for liquibase.change.Change implementations.
   See also:
     http://www.liquibase.org/manual/home (Available Database Refactorings)"
@@ -30,7 +30,7 @@
   (:require
     [org.bituf.clj-dbspec   :as sp]
     [org.bituf.clj-miscutil :as mu]
-    [org.bituf.clj-liquibase.internal :as in]))
+    [clj-liquibase.internal :as in]))
 
 
 ;; ===== schema =====

src/main/clj/org/bituf/clj_liquibase.clj → src/clj_liquibase/core.clj

@@ -1,4 +1,4 @@
-(ns org.bituf.clj-liquibase
+(ns clj-liquibase.core
   "Expose functions from the Liquibase library.
   See also:
     http://www.liquibase.org/manual/home"
@@ -8,7 +8,7 @@
     (java.text                         DateFormat)
     (java.util                         Date List)
     (javax.sql                         DataSource)
-    (org.bituf.clj_liquibase           CustomDBDocVisitor)
+    (clj_liquibase                     CustomDBDocVisitor)
     (liquibase.changelog               ChangeLogIterator ChangeSet ChangeLogParameters
                                        DatabaseChangeLog)
     (liquibase.change                  Change)
@@ -36,10 +36,10 @@
     [clojure.string         :as sr]
     [org.bituf.clj-dbspec   :as sp]
     [org.bituf.clj-miscutil :as mu]
-    [org.bituf.clj-liquibase.internal     :as in]
-    [org.bituf.clj-liquibase.change       :as ch]
-    [org.bituf.clj-liquibase.precondition :as pc]
-    [org.bituf.clj-liquibase.sql-visitor  :as vis]))
+    [clj-liquibase.internal     :as in]
+    [clj-liquibase.change       :as ch]
+    [clj-liquibase.precondition :as pc]
+    [clj-liquibase.sql-visitor  :as vis]))
 
 
 (def ^{:doc "Clj-Liquibase version (only major and minor)"}

src/main/clj/org/bituf/clj_liquibase/internal.clj → src/clj_liquibase/internal.clj

@@ -1,4 +1,4 @@
-(ns org.bituf.clj-liquibase.internal
+(ns clj-liquibase.internal
   (:import
     (liquibase.database.structure Column)
     (liquibase.change      ColumnConfig ConstraintsConfig)

src/main/clj/org/bituf/clj_liquibase/precondition.clj → src/clj_liquibase/precondition.clj

@@ -1,4 +1,4 @@
-(ns org.bituf.clj-liquibase.precondition
+(ns clj-liquibase.precondition
   "Clojure wrappers for liquibase.change.Change implementations.
   See also:
     http://www.liquibase.org/manual/home (Available Database Refactorings)"
@@ -24,7 +24,7 @@
   (:require
     [org.bituf.clj-dbspec   :as sp]
     [org.bituf.clj-miscutil :as mu]
-    [org.bituf.clj-liquibase.internal :as in]))
+    [clj-liquibase.internal :as in]))
 
 
 (defn pre-cond?

src/main/clj/org/bituf/clj_liquibase/sql_visitor.clj → src/clj_liquibase/sql_visitor.clj

@@ -1,4 +1,4 @@
-(ns org.bituf.clj-liquibase.sql-visitor
+(ns clj-liquibase.sql-visitor
   (:import
     (java.util.regex       Pattern)
     (liquibase.sql.visitor SqlVisitor

src/test/clj/org/bituf/clj_liquibase/test_change.clj → test/clj_liquibase/test_change.clj

@@ -1,4 +1,4 @@
-(ns org.bituf.clj-liquibase.test-change
+(ns clj-liquibase.test-change
   (:import
     (java.util Date)
     (liquibase.change.core
@@ -24,8 +24,8 @@
     (liquibase.statement DatabaseFunction)
     (liquibase.util      ISODateFormat))
   (:require
-    [org.bituf.clj-liquibase.change :as change])
-  (:use org.bituf.test-util)
+    [clj-liquibase.change :as change])
+  (:use test-util)
   (:use clojure.test))
 
 

src/test/clj/org/bituf/clj_liquibase/test_internal.clj → test/clj_liquibase/test_internal.clj

@@ -1,4 +1,4 @@
-(ns org.bituf.clj-liquibase.test-internal
+(ns clj-liquibase.test-internal
   (:import
     (liquibase.database.structure Column)
     (liquibase.change      ColumnConfig ConstraintsConfig)
@@ -7,8 +7,8 @@
     (liquibase.util        ISODateFormat)
     (java.util Date))
   (:require
-    [org.bituf.clj-liquibase.internal :as in]
-    [org.bituf.clj-liquibase.change   :as ch])
+    [clj-liquibase.internal :as in]
+    [clj-liquibase.change   :as ch])
   (:use clojure.test))
 
 

src/test/clj/org/bituf/clj_liquibase/test_precondition.clj → test/clj_liquibase/test_precondition.clj

@@ -1,15 +1,15 @@
-(ns org.bituf.clj-liquibase.test-precondition
+(ns clj-liquibase.test-precondition
   (:import
     (java.util Date)
     (liquibase.exception MigrationFailedException PreconditionFailedException))
   (:require
-    [org.bituf.clj-miscutil               :as mu]
-    [org.bituf.clj-dbspec                 :as sp]
-    [org.bituf.clj-liquibase              :as lb]
-    [org.bituf.clj-liquibase.change       :as ch]
-    [org.bituf.clj-liquibase.precondition :as pc]
-    [org.bituf.test-clj-liquibase         :as tl])
-  (:use org.bituf.test-util)
+    [org.bituf.clj-miscutil     :as mu]
+    [org.bituf.clj-dbspec       :as sp]
+    [clj-liquibase.core         :as lb]
+    [clj-liquibase.change       :as ch]
+    [clj-liquibase.precondition :as pc]
+    [test-clj-liquibase         :as tl])
+  (:use test-util)
   (:use clojure.test))
 
 

src/test/clj/org/bituf/clj_liquibase/test_sql_visitor.clj → test/clj_liquibase/test_sql_visitor.clj

@@ -1,10 +1,10 @@
-(ns org.bituf.clj-liquibase.test-sql-visitor
+(ns clj-liquibase.test-sql-visitor
   (:import
     (liquibase.sql.visitor SqlVisitor
                            AppendSqlVisitor PrependSqlVisitor
                            RegExpReplaceSqlVisitor ReplaceSqlVisitor))
-  (:require [org.bituf.clj-liquibase.sql-visitor :as vis])
-  (:use org.bituf.test-util)
+  (:require [clj-liquibase.sql-visitor :as vis])
+  (:use test-util)
   (:use clojure.test))
 
 

src/test/clj/org/bituf/test.clj → test/test.clj

@@ -1,11 +1,11 @@
-(ns org.bituf.test
+(ns test
   (:require
-    [clojure.pprint                 :as pp]
-    [org.bituf.clj-miscutil         :as mu]
-    [org.bituf.clj-liquibase        :as lb]
-    [org.bituf.clj-liquibase.change :as ch]
-    [org.bituf.clj-dbcp             :as dbcp]
-    [org.bituf.clj-dbspec           :as spec]))
+    [clojure.pprint         :as pp]
+    [org.bituf.clj-miscutil :as mu]
+    [clj-liquibase.core     :as lb]
+    [clj-liquibase.change   :as ch]
+    [org.bituf.clj-dbcp     :as dbcp]
+    [org.bituf.clj-dbspec   :as spec]))
 
 
 (def ds (dbcp/h2-memory-datasource))

src/test/clj/org/bituf/test_clj_liquibase.clj → test/test_clj_liquibase.clj

@@ -1,19 +1,19 @@
-(ns org.bituf.test-clj-liquibase
+(ns test-clj-liquibase
   (:import
     (java.io              File)
     (java.sql             Connection SQLException)
     (javax.sql            DataSource)
     (org.bituf.clj_dbspec IRow)
     (org.bituf.clj_dbspec Row))
   (:require
-    [clojure.string                 :as sr]
-    [clojure.pprint                 :as pp]
-    [org.bituf.clj-miscutil         :as mu]
-    [org.bituf.clj-liquibase        :as lb]
-    [org.bituf.clj-liquibase.change :as ch]
-    [org.bituf.clj-dbcp             :as dbcp]
-    [org.bituf.clj-dbspec           :as spec])
-  (:use org.bituf.test-util)
+    [clojure.string         :as sr]
+    [clojure.pprint         :as pp]
+    [org.bituf.clj-miscutil :as mu]
+    [clj-liquibase.core     :as lb]
+    [clj-liquibase.change   :as ch]
+    [org.bituf.clj-dbcp     :as dbcp]
+    [org.bituf.clj-dbspec   :as spec])
+  (:use test-util)
   (:use clojure.test))
 
 

src/test/clj/org/bituf/test_util.clj → test/test_util.clj

@@ -1,4 +1,4 @@
-(ns org.bituf.test-util
+(ns test-util
   (:import
     (java.util List)
     (java.sql Connection Statement))