[bknr-cvs] r2531 - branches/trunk-reorg/projects/lisp-ecoop/src

[hhubner at common-lisp.net]

Author: hhubner
Date: Mon Feb 18 05:39:20 2008
New Revision: 2531

Modified:
   branches/trunk-reorg/projects/lisp-ecoop/src/config.lisp
   branches/trunk-reorg/projects/lisp-ecoop/src/init.lisp
   branches/trunk-reorg/projects/lisp-ecoop/src/participant.lisp
   branches/trunk-reorg/projects/lisp-ecoop/src/tags.lisp
   branches/trunk-reorg/projects/lisp-ecoop/src/webserver.lisp
Log:
port to trunk-reorg

Modified: branches/trunk-reorg/projects/lisp-ecoop/src/config.lisp
==============================================================================
--- branches/trunk-reorg/projects/lisp-ecoop/src/config.lisp	(original)
+++ branches/trunk-reorg/projects/lisp-ecoop/src/config.lisp	Mon Feb 18 05:39:20 2008
@@ -7,7 +7,11 @@
   (when (probe-file "site.lisp")
     (load "site.lisp")))
 
-(defparameter *root-directory* (merge-pathnames #P"../" *load-pathname*))
+(defparameter *root-directory* (merge-pathnames #P"../"
+                                                (make-pathname :name nil
+                                                               :type nil
+                                                               :version nil
+                                                               :defaults *load-pathname*)))
 
 (defparameter *store-directory* (merge-pathnames #p"datastore/" *root-directory*))
 

Modified: branches/trunk-reorg/projects/lisp-ecoop/src/init.lisp
==============================================================================
--- branches/trunk-reorg/projects/lisp-ecoop/src/init.lisp	(original)
+++ branches/trunk-reorg/projects/lisp-ecoop/src/init.lisp	Mon Feb 18 05:39:20 2008
@@ -11,7 +11,7 @@
   (unless (find-user "anonymous")
     (make-user "anonymous")		; used for all anonymous sessions
     (make-user "admin" :password "wispleb" :full-name "Administrator" :flags '(:admin))
-    (import-image "bknr-logo.png" :keywords '(:banner :bknr)))
+    (import-image (probe-file #P"bknr-logo.png") :keywords '(:banner :bknr)))
 
   #+(or)
   (bknr.cron:start-cron)

Modified: branches/trunk-reorg/projects/lisp-ecoop/src/participant.lisp
==============================================================================
--- branches/trunk-reorg/projects/lisp-ecoop/src/participant.lisp	(original)
+++ branches/trunk-reorg/projects/lisp-ecoop/src/participant.lisp	Mon Feb 18 05:39:20 2008
@@ -16,7 +16,7 @@
     (with-slots (documents) submission
       (setf documents (remove document documents)))))
 
-y(define-lisp-ecoop-class submission ()
+(define-lisp-ecoop-class submission ()
   ((title :update :documentation "Title of the submission" :initform nil :attribute t)
    (abstract :update :documentation "Abstract or short description" :initform nil :element t)
    (submitters :update :documentation "List of participants who submitted this" :initform nil :element t :containment :+)

Modified: branches/trunk-reorg/projects/lisp-ecoop/src/tags.lisp
==============================================================================
--- branches/trunk-reorg/projects/lisp-ecoop/src/tags.lisp	(original)
+++ branches/trunk-reorg/projects/lisp-ecoop/src/tags.lisp	Mon Feb 18 05:39:20 2008
@@ -393,4 +393,4 @@
          (pathname (find-template-pathname expander "toplevel"))
          (toplevel (bknr.web::get-cached-template pathname expander))
          (bknr.web::*toplevel-children* bknr.web::*tag-children*))
-    (emit-template-node toplevel)))
\ No newline at end of file
+    (emit-template-node expander toplevel)))
\ No newline at end of file

Modified: branches/trunk-reorg/projects/lisp-ecoop/src/webserver.lisp
==============================================================================
--- branches/trunk-reorg/projects/lisp-ecoop/src/webserver.lisp	(original)
+++ branches/trunk-reorg/projects/lisp-ecoop/src/webserver.lisp	Mon Feb 18 05:39:20 2008
@@ -19,9 +19,9 @@
 		 :name "LISP ECOOP CMS"
                  :base-href base-href
                  :template-base-directory (namestring (merge-pathnames #p"templates/" *website-directory*))
-                 :template-command-packages '((:lisp-ecoop . :lisp-ecoop.tags)
-                                              (:bknr . :bknr.web)
-                                              (:menu . :bknr.site-menu))
+                 :template-command-packages '(("http://lisp-ecoop07.bknr.net" . :lisp-ecoop.tags)
+                                              ("http://bknr.net" . :bknr.web)
+                                              ("http://bknr.net/menu" . :bknr.site-menu))
 		 :handler-definitions `(user images
 					#+(or) stats
 					#+(or) mailinglist
@@ -41,4 +41,5 @@
   (when (and (boundp '*server*) *server*)
     (stop-server *server*))
   (publish-lisp-ecoop)
+  (setf *hunchentoot-default-external-format* (flex:make-external-format :utf-8 :eol-style :lf))
   (setq *server* (start-server :port port)))
\ No newline at end of file