From 31d1a78ee915ae4db7c042b7e5cb1ab7b5a73448 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Tue, 17 Sep 2002 17:16:43 +0000
Subject: [PATCH] r2741: Start migration to pathname-less asd files, remove
 .system files

---
 {clsql-base => base}/.cvsignore      |  0
 {clsql-base => base}/Makefile        |  0
 {clsql-base => base}/classes.cl      |  2 +-
 {clsql-base => base}/cmucl-compat.cl |  2 +-
 {clsql-base => base}/conditions.cl   |  2 +-
 {clsql-base => base}/db-interface.cl |  2 +-
 {clsql-base => base}/initialize.cl   |  2 +-
 {clsql-base => base}/package.cl      |  2 +-
 {clsql-base => base}/utils.cl        |  2 +-
 clsql-aodbc.asd                      | 16 +++--
 clsql-aodbc.system                   | 32 ----------
 clsql-base.asd                       | 39 ++++--------
 clsql-base.system                    | 50 ----------------
 clsql-mysql.asd                      | 26 ++++----
 clsql-mysql.system                   | 40 -------------
 clsql-oracle.asd                     | 23 ++++---
 clsql-oracle.system                  | 27 ---------
 clsql-postgresql-socket.asd          | 20 +++----
 clsql-postgresql-socket.system       | 34 -----------
 clsql-postgresql.asd                 | 23 ++++---
 clsql-postgresql.system              | 33 ----------
 clsql-uffi.asd                       | 17 +++---
 clsql-uffi.system                    | 34 -----------
 clsql.asd                            | 34 ++++-------
 clsql.system                         | 45 --------------
 set-logical.cl                       | 90 ----------------------------
 {clsql => sql}/.cvsignore            |  0
 {clsql => sql}/Makefile              |  0
 {clsql => sql}/functional.cl         |  2 +-
 {clsql => sql}/loop-extension.cl     |  2 +-
 {clsql => sql}/package.cl            |  2 +-
 {clsql => sql}/pool.cl               |  2 +-
 {clsql => sql}/sql.cl                |  2 +-
 {clsql => sql}/transactions.cl       |  2 +-
 {clsql => sql}/usql.cl               |  2 +-
 35 files changed, 94 insertions(+), 517 deletions(-)
 rename {clsql-base => base}/.cvsignore (100%)
 rename {clsql-base => base}/Makefile (100%)
 rename {clsql-base => base}/classes.cl (97%)
 rename {clsql-base => base}/cmucl-compat.cl (98%)
 rename {clsql-base => base}/conditions.cl (99%)
 rename {clsql-base => base}/db-interface.cl (99%)
 rename {clsql-base => base}/initialize.cl (96%)
 rename {clsql-base => base}/package.cl (98%)
 rename {clsql-base => base}/utils.cl (97%)
 delete mode 100644 clsql-aodbc.system
 delete mode 100644 clsql-base.system
 delete mode 100644 clsql-mysql.system
 delete mode 100644 clsql-oracle.system
 delete mode 100644 clsql-postgresql-socket.system
 delete mode 100644 clsql-postgresql.system
 delete mode 100644 clsql-uffi.system
 delete mode 100644 clsql.system
 delete mode 100644 set-logical.cl
 rename {clsql => sql}/.cvsignore (100%)
 rename {clsql => sql}/Makefile (100%)
 rename {clsql => sql}/functional.cl (98%)
 rename {clsql => sql}/loop-extension.cl (98%)
 rename {clsql => sql}/package.cl (98%)
 rename {clsql => sql}/pool.cl (98%)
 rename {clsql => sql}/sql.cl (99%)
 rename {clsql => sql}/transactions.cl (98%)
 rename {clsql => sql}/usql.cl (97%)

diff --git a/clsql-base/.cvsignore b/base/.cvsignore
similarity index 100%
rename from clsql-base/.cvsignore
rename to base/.cvsignore
diff --git a/clsql-base/Makefile b/base/Makefile
similarity index 100%
rename from clsql-base/Makefile
rename to base/Makefile
diff --git a/clsql-base/classes.cl b/base/classes.cl
similarity index 97%
rename from clsql-base/classes.cl
rename to base/classes.cl
index 315fae9..26dbf71 100644
--- a/clsql-base/classes.cl
+++ b/base/classes.cl
@@ -8,7 +8,7 @@
 ;;;;                 original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: classes.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: classes.cl,v 1.4 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql-base/cmucl-compat.cl b/base/cmucl-compat.cl
similarity index 98%
rename from clsql-base/cmucl-compat.cl
rename to base/cmucl-compat.cl
index e18fa0c..4f65794 100644
--- a/clsql-base/cmucl-compat.cl
+++ b/base/cmucl-compat.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: cmucl-compat.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: cmucl-compat.cl,v 1.3 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql-base/conditions.cl b/base/conditions.cl
similarity index 99%
rename from clsql-base/conditions.cl
rename to base/conditions.cl
index 4371ccc..c713f20 100644
--- a/clsql-base/conditions.cl
+++ b/base/conditions.cl
@@ -8,7 +8,7 @@
 ;;;;                 Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: conditions.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: conditions.cl,v 1.4 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql-base/db-interface.cl b/base/db-interface.cl
similarity index 99%
rename from clsql-base/db-interface.cl
rename to base/db-interface.cl
index 479534e..b6c99f4 100644
--- a/clsql-base/db-interface.cl
+++ b/base/db-interface.cl
@@ -9,7 +9,7 @@
 ;;;;                onShoreD to support UncommonSQL front-end 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: db-interface.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: db-interface.cl,v 1.4 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai, and onShoreD
diff --git a/clsql-base/initialize.cl b/base/initialize.cl
similarity index 96%
rename from clsql-base/initialize.cl
rename to base/initialize.cl
index 0380f70..6215376 100644
--- a/clsql-base/initialize.cl
+++ b/base/initialize.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg 
 ;;;; Date Started:  May 2002
 ;;;;
-;;;; $Id: initialize.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: initialize.cl,v 1.4 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql-base/package.cl b/base/package.cl
similarity index 98%
rename from clsql-base/package.cl
rename to base/package.cl
index dfca868..8f8fc4a 100644
--- a/clsql-base/package.cl
+++ b/base/package.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: package.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: package.cl,v 1.8 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql-base/utils.cl b/base/utils.cl
similarity index 97%
rename from clsql-base/utils.cl
rename to base/utils.cl
index b26ee9e..93d5ece 100644
--- a/clsql-base/utils.cl
+++ b/base/utils.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:   Kevin M. Rosenberg
 ;;;; Date Started: Mar 2002
 ;;;;
-;;;; $Id: utils.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: utils.cl,v 1.6 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql-aodbc.asd b/clsql-aodbc.asd
index 7b04627..7e59816 100644
--- a/clsql-aodbc.asd
+++ b/clsql-aodbc.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-aodbc.asd,v 1.5 2002/09/06 10:56:13 kevin Exp $
+;;;; $Id: clsql-aodbc.asd,v 1.6 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,18 +16,16 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :asdf)
 
-(defsystem clsql-aodbc
-    :pathname #.(format nil "~A:clsql-aodbc;"
-			#+common-lisp-controller "cl-library"
-			#-common-lisp-controller "clsql")
-    :components ((:file "aodbc-package")
-		 (:file "aodbc-sql" :depends-on ("aodbc-package")))
+(defsystem :clsql-aodbc
+    :components
+    ((:module :clsql-aodbc
+	      :components
+	      ((:file "aodbc-package")
+	       (:file "aodbc-sql" :depends-on ("aodbc-package")))))
     :depends-on (:clsql-base))
 
-    
 (defmethod source-file-type  ((c cl-source-file)
 			      (s (eql (find-system 'clsql-aodbc)))) 
    "cl")
diff --git a/clsql-aodbc.system b/clsql-aodbc.system
deleted file mode 100644
index 315ea62..0000000
--- a/clsql-aodbc.system
+++ /dev/null
@@ -1,32 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          clsql-aodbc.system
-;;;; Purpose:       Defsystem-3/4 definition file for CLSQL AODBC backend
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Feb 2002
-;;;;
-;;;; $Id: clsql-aodbc.system,v 1.11 2002/09/06 10:56:13 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :make)
-
-(defsystem :clsql-aodbc
-  :source-pathname #.(format nil "~A:clsql-aodbc;"
-			     #+common-lisp-controller "cl-library"
-			     #-common-lisp-controller "clsql")
-
-  :source-extension "cl"
-  :components ((:file "aodbc-package")
-	       (:file "aodbc-sql" :depends-on ("aodbc-package")))
-  :depends-on (:clsql-base))
-
-
diff --git a/clsql-base.asd b/clsql-base.asd
index 888f1f2..c45a806 100644
--- a/clsql-base.asd
+++ b/clsql-base.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-base.asd,v 1.9 2002/09/06 11:08:19 kevin Exp $
+;;;; $Id: clsql-base.asd,v 1.10 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,38 +16,21 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :asdf)
 
-;; For use with non-Common Lisp Controller installations
-#-common-lisp-controller
-(let ((path (make-pathname :name "set-logical" :type "cl"
-				      :defaults *load-truename*)))
-  (when (probe-file path)
-    (load path)
-    (set-logical-host-for-pathname 
-     "clsql" 
-     (make-pathname :host (pathname-host *load-truename*)
-		    :device (pathname-device *load-truename*)
-		    :directory (pathname-directory *load-truename*)))))
-
-
- ;;; System definitions
-
 (defsystem clsql-base
-    :pathname #.(format nil "~A:clsql-base;" 
-      #+common-lisp-controller "cl-library"
-      #-common-lisp-controller "clsql")
     :perform (load-op :after (op clsql-base)
 		      (pushnew :clsql-base cl:*features*))
-    :components ((:file "cmucl-compat")
-		 (:file "package")
-		 (:file "utils" :depends-on ("package"))
-		 (:file "classes" :depends-on ("package"))
-		 (:file "conditions" :depends-on ("classes"))
-		 (:file "db-interface" :depends-on ("conditions"))
-		 (:file "initialize" :depends-on ("db-interface")))
-    )
+    :components
+    ((:module :base
+	      :components
+	      ((:file "cmucl-compat")
+	       (:file "package")
+	       (:file "utils" :depends-on ("package"))
+	       (:file "classes" :depends-on ("package"))
+	       (:file "conditions" :depends-on ("classes"))
+	       (:file "db-interface" :depends-on ("conditions"))
+	       (:file "initialize" :depends-on ("db-interface"))))))
 
 (defmethod source-file-type  ((c cl-source-file)
 			      (s (eql (find-system 'clsql-base)))) 
diff --git a/clsql-base.system b/clsql-base.system
deleted file mode 100644
index fd8e4d2..0000000
--- a/clsql-base.system
+++ /dev/null
@@ -1,50 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          clsql-base.system
-;;;; Purpose:       Defsystem-3/4 for Base CLSQL
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Feb 2002
-;;;;
-;;;; $Id: clsql-base.system,v 1.12 2002/09/06 10:56:13 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :make)
-
-;; For use with non-Common Lisp Controller installations
-#-common-lisp-controller
-(let ((path (make-pathname :name "set-logical" :type "cl"
-				      :defaults *load-truename*)))
-  (when (probe-file path)
-    (load path)
-    (set-logical-host-for-pathname 
-     "clsql" 
-     (make-pathname :host (pathname-host *load-truename*)
-		    :device (pathname-device *load-truename*)
-		    :directory (pathname-directory *load-truename*)))))
-
-;;; System definitions
-
-(defsystem :clsql-base
-  :source-pathname #.(format nil "~A:clsql-base;"
-			     #+common-lisp-controller "cl-library"
-			     #-common-lisp-controller "clsql")
-  :source-extension "cl"
-  :components ((:file "cmucl-compat")
-	       (:file "package")
-	       (:file "utils" :depends-on ("package"))
-	       (:file "classes" :depends-on ("package"))
-	       (:file "conditions" :depends-on ("classes"))
-	       (:file "db-interface" :depends-on ("conditions"))
-	       (:file "initialize" :depends-on ("db-interface")))
-  :finally-do
-  (pushnew :clsql-base cl:*features*)
-  )
diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 9e17055..0af451f 100644
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-mysql.asd,v 1.5 2002/09/06 10:56:13 kevin Exp $
+;;;; $Id: clsql-mysql.asd,v 1.6 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,19 +22,17 @@
 
 ;;; System definition
 
-(defsystem clsql-mysql
-    :pathname #.(format nil "~A:clsql-mysql;"
-			#+common-lisp-controller "cl-library"
-			#-common-lisp-controller "clsql")
-    :components ((:file "mysql-package")
-		 (:file "mysql-loader" :depends-on ("mysql-package"))
-		 (:file "mysql-api" :depends-on ("mysql-loader"))
-		 (:file "mysql-sql" :depends-on ("mysql-api"))
-		 (:file "mysql-usql" :depends-on ("mysql-sql")))
-    :depends-on (:uffi :clsql-base :clsql-uffi))
-
-
+(defsystem :clsql-mysql
+  :components
+  ((:module :mysql
+	    :components
+	    ((:file "mysql-package")
+	     (:file "mysql-loader" :depends-on ("mysql-package"))
+	     (:file "mysql-api" :depends-on ("mysql-loader"))
+	     (:file "mysql-sql" :depends-on ("mysql-api"))
+	     (:file "mysql-usql" :depends-on ("mysql-sql")))))
+  :depends-on (:uffi :clsql-base :clsql-uffi))
+   
 (defmethod source-file-type  ((c cl-source-file)
 			      (s (eql (find-system 'clsql-mysql)))) 
    "cl")
-
diff --git a/clsql-mysql.system b/clsql-mysql.system
deleted file mode 100644
index 5bea359..0000000
--- a/clsql-mysql.system
+++ /dev/null
@@ -1,40 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          clsql-mysql.system
-;;;; Purpose:       Defsystem-3/4 definition file for CLSQL MySQL backend
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Feb 2002
-;;;;
-;;;; $Id: clsql-mysql.system,v 1.18 2002/09/06 10:56:13 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-
-(in-package :make)
-
-;;; System definition
-
-(defsystem :clsql-mysql
-  :source-pathname #.(format nil "~A:clsql-mysql;"
-			     #+common-lisp-controller "cl-library"
-			     #-common-lisp-controller "clsql")
-  :source-extension "cl"
-  :components ((:file "mysql-package")
-	       (:file "mysql-loader" :depends-on ("mysql-package"))
-	       (:file "mysql-api" :depends-on ("mysql-loader"))
-	       (:file "mysql-sql" :depends-on ("mysql-api"))
-	       (:file "mysql-usql" :depends-on ("mysql-sql")))
-  :depends-on (:uffi :clsql-base :clsql-uffi))
-
-
-
-
-
diff --git a/clsql-oracle.asd b/clsql-oracle.asd
index b694792..9227721 100644
--- a/clsql-oracle.asd
+++ b/clsql-oracle.asd
@@ -1,28 +1,25 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
 ;;;; 
-;;;; $Id: clsql-oracle.asd,v 1.5 2002/09/06 10:56:13 kevin Exp $
+;;;; $Id: clsql-oracle.asd,v 1.6 2002/09/17 17:16:43 kevin Exp $
 
 (in-package :asdf)
 
 ;;; System definition
 
 (defsystem :clsql-oracle
-    :pathname #.(format nil "~A:clsql-oracle;"
-			#+common-lisp-controller "cl-library"
-			#-common-lisp-controller "clsql")
-    :pathname "cl-library:clsql-oracle"
     :components
-    ((:file "oracle-package")
-     (:file "oracle-loader" :depends-on ("oracle-package"))
-     (:file "alien-resources" :depends-on ("oracle-package"))
-     (:file "oracle-constants" :depends-on ("oracle-package"))
-     (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
-     (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
-     (:file "oracle-objects" :depends-on ("oracle-sql")))
+    ((:module :clsql-oracle
+	      :components
+	      ((:file "oracle-package")
+	       (:file "oracle-loader" :depends-on ("oracle-package"))
+	       (:file "alien-resources" :depends-on ("oracle-package"))
+	       (:file "oracle-constants" :depends-on ("oracle-package"))
+	       (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
+	       (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
+	       (:file "oracle-objects" :depends-on ("oracle-sql")))))
     :depends-on (:clsql-base))
 
-
 (defmethod source-file-type  ((c cl-source-file)
 			      (s (eql (find-system 'clsql-oracle)))) 
    "cl")
diff --git a/clsql-oracle.system b/clsql-oracle.system
deleted file mode 100644
index c52957f..0000000
--- a/clsql-oracle.system
+++ /dev/null
@@ -1,27 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
-;;;; 
-;;;; $Id: clsql-oracle.system,v 1.5 2002/09/06 10:56:13 kevin Exp $
-
-(in-package :make)
-
-;;; System definition
-
-(defsystem :clsql-oracle
-  :source-pathname #.(format nil "~A:clsql-oracle;"
-			     #+common-lisp-controller "cl-library"
-			     #-common-lisp-controller "clsql")
-  :source-extension "cl"
-  :components
-  ((:file "oracle-package")
-   (:file "oracle-loader" :depends-on ("oracle-package"))
-   (:file "alien-resources" :depends-on ("oracle-package"))
-   (:file "oracle-constants" :depends-on ("oracle-package"))
-     (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
-     (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
-     (:file "oracle-objects" :depends-on ("oracle-sql")))
-  :depends-on (:clsql-base))
-
-
-
-
diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd
index 74b631f..7c80ab2 100644
--- a/clsql-postgresql-socket.asd
+++ b/clsql-postgresql-socket.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-postgresql-socket.asd,v 1.5 2002/09/06 10:56:13 kevin Exp $
+;;;; $Id: clsql-postgresql-socket.asd,v 1.6 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,15 +22,15 @@
 ;;; System definition
 
 (defsystem clsql-postgresql-socket
-    :pathname #.(format nil "~A:clsql-postgresql-socket;"
-			#+common-lisp-controller "cl-library"
-			#-common-lisp-controller "clsql")
-    :components ((:file "postgresql-socket-package")
-		 (:file "postgresql-socket-api"
-			:depends-on ("postgresql-socket-package"))
-		 (:file "postgresql-socket-sql"
-			:depends-on ("postgresql-socket-api")))
-    :depends-on (:clsql-base :uffi))
+  :components
+  ((:module :clsql-postgresql-socket
+	    :components
+	    ((:file "postgresql-socket-package")
+	     (:file "postgresql-socket-api"
+		    :depends-on ("postgresql-socket-package"))
+	     (:file "postgresql-socket-sql"
+		    :depends-on ("postgresql-socket-api")))))
+  :depends-on (:clsql-base :uffi))
 
 (defmethod source-file-type  ((c cl-source-file)
 			      (s (eql (find-system 'clsql-postgresql-socket)))) 
diff --git a/clsql-postgresql-socket.system b/clsql-postgresql-socket.system
deleted file mode 100644
index e4ee7b0..0000000
--- a/clsql-postgresql-socket.system
+++ /dev/null
@@ -1,34 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          clsql-postgresql.system
-;;;; Purpose:       Defsystem-3/4 file for CLSQL PostgresSQL socket backend
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Feb 2002
-;;;;
-;;;; $Id: clsql-postgresql-socket.system,v 1.12 2002/09/06 10:56:13 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :make)
-
-;;; System definition
-
-(defsystem :clsql-postgresql-socket
-  :source-pathname #.(format nil "~A:clsql-postgresql-socket;"
-			     #+common-lisp-controller "cl-library"
-			     #-common-lisp-controller "clsql")
-  :source-extension "cl"
-  :components ((:file "postgresql-socket-package")
-	       (:file "postgresql-socket-api"
-		      :depends-on ("postgresql-socket-package"))
-	       (:file "postgresql-socket-sql"
-		      :depends-on ("postgresql-socket-api")))
-  :depends-on (:clsql-base :uffi))
diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd
index 46b26e6..bc4b2bf 100644
--- a/clsql-postgresql.asd
+++ b/clsql-postgresql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-postgresql.asd,v 1.5 2002/09/06 10:56:13 kevin Exp $
+;;;; $Id: clsql-postgresql.asd,v 1.6 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,17 +19,16 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :asdf)
 
-(defsystem clsql-postgresql
-    :pathname #.(format nil "~A:clsql-postgresql;"
-			#+common-lisp-controller "cl-library"
-			#-common-lisp-controller "clsql")
-    :components ((:file "postgresql-package")
-		 (:file "postgresql-loader" :depends-on ("postgresql-package"))
-		 (:file "postgresql-api" :depends-on ("postgresql-loader"))
-		 (:file "postgresql-sql" :depends-on ("postgresql-api"))
-		 (:file "postgresql-usql" :depends-on ("postgresql-sql")))
-    :depends-on (:uffi :clsql-base :clsql-uffi))
-
+(defsystem :clsql-postgresql
+  :components
+  ((:module :clsql-postgresql
+	    :components
+	    ((:file "postgresql-package")
+	     (:file "postgresql-loader" :depends-on ("postgresql-package"))
+	     (:file "postgresql-api" :depends-on ("postgresql-loader"))
+	     (:file "postgresql-sql" :depends-on ("postgresql-api"))
+	     (:file "postgresql-usql" :depends-on ("postgresql-sql")))))
+  :depends-on (:uffi :clsql-base :clsql-uffi))
 
 (defmethod source-file-type  ((c cl-source-file)
 			      (s (eql (find-system 'clsql-postgresql)))) 
diff --git a/clsql-postgresql.system b/clsql-postgresql.system
deleted file mode 100644
index 5d4ecea..0000000
--- a/clsql-postgresql.system
+++ /dev/null
@@ -1,33 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          clsql-postgresql.system
-;;;; Purpose:       Defsystem-3/4 file for CLSQL PostgresSQL backend
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Feb 2002
-;;;;
-;;;; $Id: clsql-postgresql.system,v 1.12 2002/09/06 10:56:13 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :make)
-
-(defsystem :clsql-postgresql
-  :source-pathname #.(format nil "~A:clsql-postgresql;"
-			     #+common-lisp-controller "cl-library"
-			     #-common-lisp-controller "clsql")
-  :source-extension "cl"
-  :components ((:file "postgresql-package")
-	       (:file "postgresql-loader" :depends-on ("postgresql-package"))
-	       (:file "postgresql-api" :depends-on ("postgresql-loader"))
-	       (:file "postgresql-sql" :depends-on ("postgresql-api"))
-	       (:file "postgresql-usql" :depends-on ("postgresql-sql")))
-  :depends-on (:uffi :clsql-base :clsql-uffi))
-
diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 8ecdc35..c45d31c 100644
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-uffi.asd,v 1.7 2002/09/06 10:56:13 kevin Exp $
+;;;; $Id: clsql-uffi.asd,v 1.8 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,17 +22,16 @@
 
 ;;; System definition
 
-(defsystem clsql-uffi
-  :pathname #.(format nil "~A:clsql-uffi;"
-      #+common-lisp-controller "cl-library"
-      #-common-lisp-controller "clsql")
-  :components ((:file "clsql-uffi-package")
-	       (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
-	       (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))
+(defsystem :clsql-uffi
+  :components
+  ((:module :uffi
+	    :components
+	    ((:file "clsql-uffi-package")
+	     (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
+	     (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))))
   :depends-on (:uffi :clsql-base))
 
 
 (defmethod source-file-type  ((c cl-source-file)
 			      (s (eql (find-system 'clsql-uffi)))) 
    "cl")
-
diff --git a/clsql-uffi.system b/clsql-uffi.system
deleted file mode 100644
index cb820b8..0000000
--- a/clsql-uffi.system
+++ /dev/null
@@ -1,34 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          clsql-uffi.system
-;;;; Purpose:       Defsystem-3/4 definition file for CLSQL UFFI Helper package
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Feb 2002
-;;;;
-;;;; $Id: clsql-uffi.system,v 1.9 2002/09/06 10:56:13 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-
-(in-package :make)
-
-;;; System definition
-
-(defsystem :clsql-uffi
-  :source-pathname #.(format nil "~A:clsql-uffi;"
-			     #+common-lisp-controller "cl-library"
-			     #-common-lisp-controller "clsql")
-  :source-extension "cl"
-  :components ((:file "clsql-uffi-package")
-	       (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))
-	       (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))
-  :depends-on (:uffi :clsql-base))
-
diff --git a/clsql.asd b/clsql.asd
index d588c91..1625200 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.asd,v 1.6 2002/09/06 11:08:19 kevin Exp $
+;;;; $Id: clsql.asd,v 1.7 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,36 +16,24 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-
 (in-package :asdf)
 
-#-clsql-base
-(let ((path (make-pathname :name "clsql-base" :type "system"
-				      :defaults *load-truename*)))
-  (when (probe-file path)
-    (load path)))
-
-;;; System definitions
-
-
 (defsystem clsql
-  :pathname #.(format nil "~A:clsql;"
-		      #+common-lisp-controller "cl-library"
-		      #-common-lisp-controller "clsql")
   :perform (load-op :after (op clsql)
 		    (pushnew :clsql cl:*features*))
-  :components ((:file "package")
-	       (:file "pool" :depends-on ("package"))
-	       (:file "loop-extension")
-	       (:file "sql" :depends-on ("pool"))
-	       (:file "transactions" :depends-on ("sql"))
-	       (:file "functional" :depends-on ("sql"))
-	       (:file "usql" :depends-on ("sql")))
+  :components
+  ((:module :sql
+	    :components
+	    ((:file "package")
+	     (:file "pool" :depends-on ("package"))
+	     (:file "loop-extension")
+	     (:file "sql" :depends-on ("pool"))
+	     (:file "transactions" :depends-on ("sql"))
+	     (:file "functional" :depends-on ("sql"))
+	     (:file "usql" :depends-on ("sql")))))
   :depends-on (:clsql-base)
   )
 
 (defmethod source-file-type  ((c cl-source-file)
 			      (s (eql (find-system 'clsql)))) 
    "cl")
-
diff --git a/clsql.system b/clsql.system
deleted file mode 100644
index ef655b8..0000000
--- a/clsql.system
+++ /dev/null
@@ -1,45 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          clsql.system
-;;;; Purpose:       Defsystem-3/4 for CLSQL
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Feb 2002
-;;;;
-;;;; $Id: clsql.system,v 1.20 2002/09/06 10:56:13 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :make)
-
-#-clsql-base
-(let ((path (make-pathname :name "clsql-base" :type "system"
-				      :defaults *load-truename*)))
-  (when (probe-file path)
-    (load path)))
-
-;;; System definitions
-
-(defsystem :clsql
-  :source-pathname #.(format nil "~A:clsql;"
-			     #+common-lisp-controller "cl-library"
-			     #-common-lisp-controller "clsql")
-  :source-extension "cl"
-  :components ((:file "package")
-	       (:file "pool" :depends-on ("package"))
-	       (:file "loop-extension")
-	       (:file "sql" :depends-on ("pool"))
-	       (:file "transactions" :depends-on ("sql"))
-	       (:file "functional" :depends-on ("sql"))
-	       (:file "usql" :depends-on ("sql")))
-  :depends-on (:clsql-base)
-  :finally-do
-  (pushnew :clsql cl:*features*)
-  )
diff --git a/set-logical.cl b/set-logical.cl
deleted file mode 100644
index e14fa1c..0000000
--- a/set-logical.cl
+++ /dev/null
@@ -1,90 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          set-logical.cl
-;;;; Purpose:       Sets a logical host for src/binaries based on a pathname.
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Feb 2002
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-
-;;; Setup logical pathname translaton with separate binary directories
-;;; for each implementation
-
-;; push allegro case sensitivity on *features*
-#+allegro
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (if (or (eq excl:*current-case-mode* :case-sensitive-lower)
-	  (eq excl:*current-case-mode* :case-sensitive-upper))
-      (pushnew :case-sensitive cl:*features*)
-    (pushnew :case-insensitive cl:*features*)))
-
-(defconstant +set-logical-compiler-name+
-    #+(and allegro ics case-sensitive) "acl-modern"
-    #+(and allegro (not ics) case-sensitive) "acl-modern8"
-    #+(and allegro ics (not case-sensitive)) "acl-ansi"
-    #+(and allegro (not ics) (not case-sensitive)) "acl-ansi8"
-    #+lispworks "lispworks"
-    #+clisp "clisp"
-    #+cmu "cmucl"
-    #+sbcl "sbcl"
-    #+corman "corman"
-    #+mcl "mcl"
-    #+openmcl "openmcl"
-    #-(or allegro lispworks clisp cmu sbcl corman mcl openmcl) "unknown")
-
-(defun set-logical-host-for-pathname (host base-pathname)
-  (setf (logical-pathname-translations host)
-    `(("ROOT;" ,(make-pathname
-		:host (pathname-host base-pathname)
-		:device (pathname-device base-pathname)
-		:directory (pathname-directory base-pathname)))
-      ("**;*.cl.*" ,(merge-pathnames
-		    (make-pathname
-		     :name :wild
-		     :type :wild
-		     :directory '(:relative :wild-inferiors))
-		    base-pathname))
-      ("**;*.lisp.*" ,(merge-pathnames
-		    (make-pathname
-		     :name :wild
-		     :type :wild
-		     :directory '(:relative :wild-inferiors))
-		    base-pathname))
-      ("**;*.c.*" ,(merge-pathnames
-		    (make-pathname
-		     :name :wild
-		     :type :wild
-		     :directory '(:relative :wild-inferiors))
-		    base-pathname))
-      ("**;*.h.*" ,(merge-pathnames
-		    (make-pathname
-		     :name :wild
-		     :type :wild
-		     :directory '(:relative :wild-inferiors))
-		    base-pathname))
-      ("**;bin;*.*.*" ,(merge-pathnames
-			(make-pathname 
-			 :name :wild
-			 :type :wild
-			 :directory 
-			 (append '(:relative :wild-inferiors
-					     ".bin" #.+set-logical-compiler-name+)))
-			base-pathname))
-      ;; default is to place in .bin/<compiler> directory
-      ("**;*.*.*" ,(merge-pathnames
-		    (make-pathname 
-		     :name :wild
-		     :type :wild
-		     :directory 
-		     (append '(:relative :wild-inferiors
-					 ".bin" #.+set-logical-compiler-name+)))
-		    base-pathname)))))
-
diff --git a/clsql/.cvsignore b/sql/.cvsignore
similarity index 100%
rename from clsql/.cvsignore
rename to sql/.cvsignore
diff --git a/clsql/Makefile b/sql/Makefile
similarity index 100%
rename from clsql/Makefile
rename to sql/Makefile
diff --git a/clsql/functional.cl b/sql/functional.cl
similarity index 98%
rename from clsql/functional.cl
rename to sql/functional.cl
index 01d0590..e283e5d 100644
--- a/clsql/functional.cl
+++ b/sql/functional.cl
@@ -8,7 +8,7 @@
 ;;;;
 ;;;; Copyright (c) 1999-2001 Pierre R. Mai
 ;;;;
-;;;; $Id: functional.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: functional.cl,v 1.8 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file is part of CLSQL. 
 ;;;;
diff --git a/clsql/loop-extension.cl b/sql/loop-extension.cl
similarity index 98%
rename from clsql/loop-extension.cl
rename to sql/loop-extension.cl
index a1651b9..6b59250 100644
--- a/clsql/loop-extension.cl
+++ b/sql/loop-extension.cl
@@ -8,7 +8,7 @@
 ;;;;
 ;;;; Copyright (c) 1999-2001 Pierre R. Mai
 ;;;;
-;;;; $Id: loop-extension.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: loop-extension.cl,v 1.3 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; The functions in this file were orignally distributed in the
 ;;;; MaiSQL package in the file sql/sql.cl
diff --git a/clsql/package.cl b/sql/package.cl
similarity index 98%
rename from clsql/package.cl
rename to sql/package.cl
index bf4eb00..2bb0d8e 100644
--- a/clsql/package.cl
+++ b/sql/package.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: package.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: package.cl,v 1.19 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql/pool.cl b/sql/pool.cl
similarity index 98%
rename from clsql/pool.cl
rename to sql/pool.cl
index 3aa8d25..f4d965c 100644
--- a/clsql/pool.cl
+++ b/sql/pool.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg, Marc Battyani
 ;;;; Date Started:  Apr 2002
 ;;;;
-;;;; $Id: pool.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: pool.cl,v 1.8 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql/sql.cl b/sql/sql.cl
similarity index 99%
rename from clsql/sql.cl
rename to sql/sql.cl
index 1adedf7..101d30f 100644
--- a/clsql/sql.cl
+++ b/sql/sql.cl
@@ -8,7 +8,7 @@
 ;;;;                 Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: sql.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: sql.cl,v 1.19 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
diff --git a/clsql/transactions.cl b/sql/transactions.cl
similarity index 98%
rename from clsql/transactions.cl
rename to sql/transactions.cl
index a7776ec..c95e8c3 100644
--- a/clsql/transactions.cl
+++ b/sql/transactions.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Marc Battyani
 ;;;; Date Started:  Apr 2002
 ;;;;
-;;;; $Id: transactions.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: transactions.cl,v 1.7 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
diff --git a/clsql/usql.cl b/sql/usql.cl
similarity index 97%
rename from clsql/usql.cl
rename to sql/usql.cl
index 0ccdece..1141dc0 100644
--- a/clsql/usql.cl
+++ b/sql/usql.cl
@@ -8,7 +8,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg and onShore Development Inc
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: usql.cl,v 1.1 2002/08/01 03:06:26 kevin Exp $
+;;;; $Id: usql.cl,v 1.11 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and onShore Development Inc
-- 
2.34.1