[bknr-cvs] r2342 - in branches/bos/projects/bos: m2 web worldpay-test
hhubner at common-lisp.net
hhubner at common-lisp.net
Fri Jan 18 07:54:02 UTC 2008
Author: hhubner
Date: Fri Jan 18 02:53:56 2008
New Revision: 2342
Added:
branches/bos/projects/bos/worldpay-test/bos.web.asd
- copied, changed from r2337, branches/bos/projects/bos/worldpay-test/worldpay-test.asd
branches/bos/projects/bos/worldpay-test/web.lisp
- copied, changed from r2337, branches/bos/projects/bos/web/web.lisp
branches/bos/projects/bos/worldpay-test/webserver.lisp
- copied, changed from r2337, branches/bos/projects/bos/worldpay-test/worldpay-test.lisp
Removed:
branches/bos/projects/bos/web/
branches/bos/projects/bos/worldpay-test/worldpay-test.asd
branches/bos/projects/bos/worldpay-test/worldpay-test.lisp
Modified:
branches/bos/projects/bos/m2/mail-generator.lisp
branches/bos/projects/bos/worldpay-test/allocation-area-handlers.lisp
branches/bos/projects/bos/worldpay-test/boi-handlers.lisp
branches/bos/projects/bos/worldpay-test/cms-links.lisp
branches/bos/projects/bos/worldpay-test/config.lisp
branches/bos/projects/bos/worldpay-test/contract-handlers.lisp
branches/bos/projects/bos/worldpay-test/contract-image-handler.lisp
branches/bos/projects/bos/worldpay-test/contract-rss.lisp
branches/bos/projects/bos/worldpay-test/daily.lisp
branches/bos/projects/bos/worldpay-test/languages-handler.lisp
branches/bos/projects/bos/worldpay-test/map-browser-handler.lisp
branches/bos/projects/bos/worldpay-test/map-handlers.lisp
branches/bos/projects/bos/worldpay-test/news-handlers.lisp
branches/bos/projects/bos/worldpay-test/news-rss.lisp
branches/bos/projects/bos/worldpay-test/news-tags.lisp
branches/bos/projects/bos/worldpay-test/packages.lisp
branches/bos/projects/bos/worldpay-test/poi-handlers.lisp
branches/bos/projects/bos/worldpay-test/reports-xml-handler.lisp
branches/bos/projects/bos/worldpay-test/rss.lisp
branches/bos/projects/bos/worldpay-test/spendenquittung.lisp
branches/bos/projects/bos/worldpay-test/sponsor-handlers.lisp
branches/bos/projects/bos/worldpay-test/tags.lisp
branches/bos/projects/bos/worldpay-test/utils.lisp
branches/bos/projects/bos/worldpay-test/web-macros.lisp
branches/bos/projects/bos/worldpay-test/web-utils.lisp
Log:
rename worldpay-test -> bos.web, step 1
Modified: branches/bos/projects/bos/m2/mail-generator.lisp
==============================================================================
--- branches/bos/projects/bos/m2/mail-generator.lisp (original)
+++ branches/bos/projects/bos/m2/mail-generator.lisp Fri Jan 18 02:53:56 2008
@@ -45,7 +45,7 @@
(defun mail-template-directory (language)
"Return the directory where the mail templates are stored"
(merge-pathnames (make-pathname :directory `(:relative "templates" ,(string-downcase language)))
- (symbol-value (find-symbol "*WEBSITE-DIRECTORY*" "WORLDPAY-TEST"))))
+ (symbol-value (find-symbol "*WEBSITE-DIRECTORY*" "BOS.WEB"))))
(defun rest-of-file (file)
(let ((result (make-array (- (file-length file)
Modified: branches/bos/projects/bos/worldpay-test/allocation-area-handlers.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/allocation-area-handlers.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/allocation-area-handlers.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/boi-handlers.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/boi-handlers.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/boi-handlers.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Copied: branches/bos/projects/bos/worldpay-test/bos.web.asd (from r2337, branches/bos/projects/bos/worldpay-test/worldpay-test.asd)
==============================================================================
--- branches/bos/projects/bos/worldpay-test/worldpay-test.asd (original)
+++ branches/bos/projects/bos/worldpay-test/bos.web.asd Fri Jan 18 02:53:56 2008
@@ -38,7 +38,15 @@
(:file "news-tags" :depends-on ("web-utils"))
(:file "news-rss" :depends-on ("web-utils"))
(:file "contract-rss" :depends-on ("web-utils"))
- (:file "worldpay-test" :depends-on ("news-tags" "tags" "map-handlers" "map-browser-handler" "poi-handlers"
- "boi-handlers" "contract-handlers" "sponsor-handlers" "news-handlers"
- "allocation-area-handlers"))
- (:file "daily" :depends-on ("config" "worldpay-test"))))
+ (:file "webserver" :depends-on ("news-tags"
+ "tags"
+ "map-handlers"
+ "map-browser-handler"
+ "poi-handlers"
+ "boi-handlers"
+ "contract-handlers"
+ "sponsor-handlers"
+ "news-handlers"
+ "allocation-area-handlers"))
+ (:file "daily" :depends-on ("config" "webserver"))
+ (:file "startup" :depends-on ("config" "webserver"))))
Modified: branches/bos/projects/bos/worldpay-test/cms-links.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/cms-links.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/cms-links.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/config.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/config.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/config.lisp Fri Jan 18 02:53:56 2008
@@ -1,4 +1,4 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
;; Worldpay (headcraft inst id ist 102532
(defparameter *worldpay-installation-id* 103530
Modified: branches/bos/projects/bos/worldpay-test/contract-handlers.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/contract-handlers.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/contract-handlers.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/contract-image-handler.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/contract-image-handler.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/contract-image-handler.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/contract-rss.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/contract-rss.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/contract-rss.lisp Fri Jan 18 02:53:56 2008
@@ -7,7 +7,7 @@
(contract-paidp contract))
(defmethod rss-item-title ((contract contract))
- (format nil (case (intern (worldpay-test::current-website-language))
+ (format nil (case (intern (bos.web::current-website-language))
(de "~A Quadratmeter wurden ~@[von ~A ~]gekauft")
(t "~A square meters bought~@[ by ~A~]"))
(length (contract-m2s contract))
@@ -18,11 +18,11 @@
(defmethod rss-item-link ((contract contract))
#+(or)
- (format nil "http://createrainforest.org/~A/news-extern/~A" (worldpay-test::current-website-language) (store-object-id item)))
+ (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::current-website-language) (store-object-id item)))
(defmethod rss-item-guid ((item contract))
#+(or)
- (format nil "http://createrainforest.org/~A/news-extern/~A" (worldpay-test::current-website-language) (store-object-id item)))
+ (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::current-website-language) (store-object-id item)))
(defmethod rss-item-pub-date ((contract contract))
(contract-date contract))
Modified: branches/bos/projects/bos/worldpay-test/daily.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/daily.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/daily.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(defun daily-cleanup ()
(format t "; performing daily cleanup run~%")
Modified: branches/bos/projects/bos/worldpay-test/languages-handler.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/languages-handler.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/languages-handler.lisp Fri Jan 18 02:53:56 2008
@@ -1,4 +1,4 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/map-browser-handler.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/map-browser-handler.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/map-browser-handler.lisp Fri Jan 18 02:53:56 2008
@@ -1,7 +1,7 @@
; please don't read this code, it is not pretty
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/map-handlers.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/map-handlers.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/map-handlers.lisp Fri Jan 18 02:53:56 2008
@@ -1,4 +1,4 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/news-handlers.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/news-handlers.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/news-handlers.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/news-rss.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/news-rss.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/news-rss.lisp Fri Jan 18 02:53:56 2008
@@ -4,19 +4,19 @@
"news")
(defmethod rss-item-published ((item news-item))
- (news-item-published item (worldpay-test::current-website-language)))
+ (news-item-published item (bos.web::current-website-language)))
(defmethod rss-item-title ((item news-item))
- (news-item-title item (worldpay-test::current-website-language)))
+ (news-item-title item (bos.web::current-website-language)))
(defmethod rss-item-description ((item news-item))
- (news-item-text item (worldpay-test::current-website-language)))
+ (news-item-text item (bos.web::current-website-language)))
(defmethod rss-item-link ((item news-item))
- (format nil "http://createrainforest.org/~A/news-extern/~A" (worldpay-test::current-website-language) (store-object-id item)))
+ (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::current-website-language) (store-object-id item)))
(defmethod rss-item-guid ((item news-item))
- (format nil "http://createrainforest.org/~A/news-extern/~A" (worldpay-test::current-website-language) (store-object-id item)))
+ (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::current-website-language) (store-object-id item)))
(defmethod rss-item-pub-date ((item news-item))
(news-item-time item))
Modified: branches/bos/projects/bos/worldpay-test/news-tags.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/news-tags.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/news-tags.lisp Fri Jan 18 02:53:56 2008
@@ -1,4 +1,4 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/packages.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/packages.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/packages.lisp Fri Jan 18 02:53:56 2008
@@ -1,6 +1,6 @@
(in-package :cl-user)
-(defpackage :worldpay-test
+(defpackage :bos.web
(:use :cl
:date-calc
#+cmu :extensions
Modified: branches/bos/projects/bos/worldpay-test/poi-handlers.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/poi-handlers.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/poi-handlers.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/reports-xml-handler.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/reports-xml-handler.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/reports-xml-handler.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
@@ -29,7 +29,7 @@
(not (eql *year* (contract-year contract))))))
(class-instances 'contract))
#'< :key #'contract-date)))
- (setf name (intern (string-upcase name) :worldpay-test))
+ (setf name (intern (string-upcase name) :bos.web))
(apply (or (gethash name *report-generators*)
(error "invalid report name ~A" name))
arguments)))))
Modified: branches/bos/projects/bos/worldpay-test/rss.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/rss.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/rss.lisp Fri Jan 18 02:53:56 2008
@@ -1,6 +1,6 @@
;; 2008-01-15: currently not used in the production core
-(in-package :worldpay-test)
+(in-package :bos.web)
(defmethod rss-item-channel ((item news-item))
"news")
Modified: branches/bos/projects/bos/worldpay-test/spendenquittung.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/spendenquittung.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/spendenquittung.lisp Fri Jan 18 02:53:56 2008
@@ -91,7 +91,7 @@
(with-output-to-string (s)
(pdf:write-document s))))
-(in-package :worldpay-test)
+(in-package :bos.web)
(defvar *mail-sender-name* "BOS Deutschland e.V.")
(defvar *mail-sender-address* "spendenbescheinigung at bos-deutschland.de")
Modified: branches/bos/projects/bos/worldpay-test/sponsor-handlers.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/sponsor-handlers.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/sponsor-handlers.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/tags.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/tags.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/tags.lisp Fri Jan 18 02:53:56 2008
@@ -1,4 +1,4 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/utils.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/utils.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/utils.lisp Fri Jan 18 02:53:56 2008
@@ -1,6 +1,6 @@
;; 2008-01-15: currently not used in the production core
-(in-package :worldpay-test)
+(in-package :bos.web)
;;; date format
Modified: branches/bos/projects/bos/worldpay-test/web-macros.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/web-macros.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/web-macros.lisp Fri Jan 18 02:53:56 2008
@@ -1,4 +1,4 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Modified: branches/bos/projects/bos/worldpay-test/web-utils.lisp
==============================================================================
--- branches/bos/projects/bos/worldpay-test/web-utils.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/web-utils.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
Copied: branches/bos/projects/bos/worldpay-test/web.lisp (from r2337, branches/bos/projects/bos/web/web.lisp)
==============================================================================
--- branches/bos/projects/bos/web/web.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/web.lisp Fri Jan 18 02:53:56 2008
@@ -30,10 +30,10 @@
(defun reinit (&key debug)
(format t "~&; Publishing BOS handlers.~%")
(unpublish :all t)
- (worldpay-test::publish-worldpay-test :website-directory *website-directory*
- :vhosts *vhosts*
- :website-url *website-url*
- :worldpay-test-mode *worldpay-test-mode*)
+ (bos.web::publish-website :website-directory *website-directory*
+ :vhosts *vhosts*
+ :website-url *website-url*
+ :worldpay-test-mode *worldpay-test-mode*)
(format t "~&; Starting aserve~@[ in debug mode~].~%" debug)
(force-output)
(setq *webserver*
Copied: branches/bos/projects/bos/worldpay-test/webserver.lisp (from r2337, branches/bos/projects/bos/worldpay-test/worldpay-test.lisp)
==============================================================================
--- branches/bos/projects/bos/worldpay-test/worldpay-test.lisp (original)
+++ branches/bos/projects/bos/worldpay-test/webserver.lisp Fri Jan 18 02:53:56 2008
@@ -1,5 +1,5 @@
-(in-package :worldpay-test)
+(in-package :bos.web)
(enable-interpol-syntax)
@@ -174,7 +174,7 @@
(find-browser-prefered-language req)
*default-language*)))))
-(defun publish-worldpay-test (&key website-directory website-url (worldpay-test-mode t) (vhosts :wild))
+(defun publish-website (&key website-directory website-url (worldpay-test-mode t) (vhosts :wild))
(setf *website-directory* website-directory)
(when website-url
@@ -219,7 +219,7 @@
("/index" index-handler)
("/" worldpay-template-handler
:destination ,(namestring (merge-pathnames #p"templates/" website-directory))
- :command-packages ((:bos . :worldpay-test)
+ :command-packages ((:bos . :bos.web)
(:bknr . :bknr.web))))
:modules '(user images stats)
:navigation '(("sponsor" . "edit-sponsor/")
More information about the Bknr-cvs
mailing list