Moved all static exports into the package definition, in conformance …

…to convention, and renamed the file containing the package declaration, also in conformance to convention.
hargettp · Jun 17, 2012 · da25392 · da25392
1 parent 84e86df
commit da25392
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 116 deletions.
diff --git a/cache.lisp b/cache.lisp
@@ -20,19 +20,6 @@
 
 (in-package :hh-web)
 
-(export
- (list
-
-  'get-cached-item
-  'make-fs-cache
-  'make-package-fs-cache
-  'create-file-cache-dispatcher-and-handler
-  'create-file-cache-dispatcher-and-handler-for-root
-  'create-package-file-cache-dispatcher-and-handler
-
-  )
-)
-
 ;;;------------------------------------------------------------------------------------
 ;;; Dynamic variables
 ;;;------------------------------------------------------------------------------------

diff --git a/cookies.lisp b/cookies.lisp
@@ -20,15 +20,6 @@
 
 (in-package :hh-web)
 
-(export
- (list
-
-  'defcookie
-  'with-cookies
-
-  )
- )
-
 (defgeneric cookie-key (cookie)
   (:documentation
     "

diff --git a/hh-web.asd b/hh-web.asd
@@ -26,7 +26,7 @@
     :name "hh-web" 
     :version "0.01" 
     :serial t 
-    :components ((:file "package-hh-web")
+    :components ((:file "package")
 		 (:file "utils") 
 		 (:module "l10n"
 			:serial t

diff --git a/l10n/i18n.lisp b/l10n/i18n.lisp
@@ -20,19 +20,6 @@
 
 (in-package :hh-web)
 
-(export `( _ 
-	   set-locale
-	   gettext
-	   deflocale
-	   get-localizable-strings
-	   get-localization-contexts
-	   get-available-locales
-	   get-localizable-string-notes
-	   get-string-localization
-	   get-string-localization-notes
-	   init-localization
-	   *locale-package*))
-
 ;; -----------------------------------------------------------------------------
 ;;
 ;; Classes + types

diff --git a/logs/categories.lisp b/logs/categories.lisp
@@ -20,9 +20,6 @@
 
 (in-package :hh-web)
 
-(export 
- (list 'stack-trace))
-
 ;;;------------------------------------------------------------------------------------
 ;;; Categories
 ;;;------------------------------------------------------------------------------------

diff --git a/logs/hunchentoot.lisp b/logs/hunchentoot.lisp
@@ -20,17 +20,6 @@
 
 (in-package :hh-web)
 
-(export 
- (list
-
-  'http-access 
-  'http-message
-
-  'log-http-access
-  'log-http-message
-
-  ))
-
 ;;;------------------------------------------------------------------------------------
 ;;; Categories
 ;;;------------------------------------------------------------------------------------

diff --git a/logs/misc.lisp b/logs/misc.lisp
@@ -20,9 +20,6 @@
 
 (in-package :hh-web)
 
-(export 
- (list 'use-backtrace-logging))
-
 ;;;------------------------------------------------------------------------------------
 ;;; Macros for standardized logging
 ;;;------------------------------------------------------------------------------------

diff --git a/logs/outputs.lisp b/logs/outputs.lisp
@@ -20,13 +20,6 @@
 
 (in-package :hh-web)
 
-(export
- (list
-
-  'msg-timestamp
-
-  ))
-
 (log5:defoutput msg-timestamp 
     ;; 10/Oct/2000:13:55:36 -0700 
     (format-timestring nil (now) :format +rfc-1123-format+))
diff --git a/logs/rotating.lisp b/logs/rotating.lisp
@@ -20,13 +20,6 @@
 
 (in-package :hh-web)
 
-(export 
- (list
-
-  'rotating-log-sender
-
-  ))
-
 ;;;------------------------------------------------------------------------------------
 ;;; Log rotation
 ;;;------------------------------------------------------------------------------------

diff --git a/meta/localeservices.lisp b/meta/localeservices.lisp
@@ -20,8 +20,6 @@
 
 (in-package :hh-web)
 
-(export `( locale-service ))
-
 (defservice locale-service (:documentation "Service for editing locales usable by the application")
   (:method create-locale 
     :documentation ""
@@ -43,4 +41,4 @@
 		  (string-name "string")
 		  (string-localization "localization")
 		  (string-description "description")
-		  (string-notes "notes"))))
+		  (string-notes "notes"))))
diff --git a/package-hh-web.lisp → package.lisp b/package-hh-web.lisp → package.lisp
@@ -37,4 +37,76 @@
 	:wt) 
   (:export 
    ;; Exported symbols go here
+
+   ;; Caching
+   #:get-cached-item
+   #:make-fs-cache
+   #:make-package-fs-cache
+   #:create-file-cache-dispatcher-and-handler
+   #:create-file-cache-dispatcher-and-handler-for-root
+   #:create-package-file-cache-dispatcher-and-handler
+
+   ;; Cookies
+   #:defcookie
+   #:with-cookies
+
+   ;; Locales
+   #:_ 
+   #:set-locale
+   #:gettext
+   #:deflocale
+   #:get-localizable-strings
+   #:get-localization-contexts
+   #:get-available-locales
+   #:get-localizable-string-notes
+   #:get-string-localization
+   #:get-string-localization-notes
+   #:init-localization
+   #:*locale-package*
+   #:locale-service
+
+   ;; Logging
+   #:stack-trace
+   #:http-access 
+   #:http-message
+   #:log-http-access
+   #:log-http-message
+   #:use-backtrace-logging
+   #:msg-timestamp
+   #:rotating-log-sender
+
+   ;; Server
+   #:create-web-server
+   #:run-web-server
+
+   ;; Services
+   #:with-http-parameters
+   #:meta-service-request-p
+   #:http-get-p
+   #:http-post-p
+   #:http-put-p
+   #:http-delete-p
+   #:defservice
+   #:defservice-client
+   #:defservice-handler
+   #:service-url
+   #:service-client
+
+   ;; Skeleton
+   #:make-skeleton
+
+   ;; URLs
+   #:defurl
+   #:defurls
+   #:create-package-folder-dispatcher-and-handler
+   #:reset-urls
+   #:flush-url-category
+   #:dispatch-url-cache
+
+   ;; User-agents
+   #:*user-agent-strings* 
+   #:*enabled-user-agents* 
+   #:*user-agent* 
+   #:enabled-user-agents
+
    ))
diff --git a/server.lisp b/server.lisp
@@ -20,15 +20,6 @@
 
 (in-package :hh-web)
 
-(export
- (list
-
-  'create-web-server
-  'run-web-server
-
-  )
- )
-
 ;;;------------------------------------------------------------------------------------
 ;;; Classes + types
 ;;;------------------------------------------------------------------------------------

diff --git a/services.lisp b/services.lisp
@@ -20,26 +20,6 @@
 
 (in-package :hh-web)
 
-(export
- (list
-
-  'with-http-parameters
-  'meta-service-request-p
-  'http-get-p
-  'http-post-p
-  'http-put-p
-  'http-delete-p
-
-  'defservice
-  'defservice-client
-  'defservice-handler
-
-  'service-url
-
-  'service-client
-
-  ))
-
 ;;;------------------------------------------------------------------------------------
 ;;; Constants
 ;;;------------------------------------------------------------------------------------

diff --git a/skeleton.lisp b/skeleton.lisp
@@ -20,8 +20,6 @@
 
 (in-package :hh-web)
 
-(export `(make-skeleton))
-
 (defclass skeleton ()
   ((location :type (satisfies directory-pathname-p) 
 	     :initarg :location 

diff --git a/urls.lisp b/urls.lisp
@@ -20,19 +20,6 @@
 
 (in-package :hh-web)
 
-(export
- (list
-
-  'defurl
-  'defurls
-  'create-package-folder-dispatcher-and-handler
-  'reset-urls
-  'flush-url-category
-  'dispatch-url-cache
-
-  )
- )
-
 ;;;------------------------------------------------------------------------------------
 ;;; Classes + types
 ;;;------------------------------------------------------------------------------------

diff --git a/useragents.lisp b/useragents.lisp
@@ -20,8 +20,6 @@
 
 (in-package :hh-web)
 
-(export `( *user-agent-strings* *enabled-user-agents* *user-agent* enabled-user-agents ))
-
 (defvar *user-agent-strings* 
   (let ((new-user-agent-strings (make-hash-table)))
     (macrolet ((user-agent-string (key string)