- claw-cvs@common-lisp.net - mailman3.common-lisp.net

[claw-cvs] r145 - trunk/main/claw-as/src
by Andrea Chiumenti 14 Nov '08

14 Nov '08

Author: achiumenti Date: Fri Nov 14 12:25:31 2008 New Revision: 145 Log: fixinig welcome page redirection Modified: trunk/main/claw-as/src/lisplet.lisp Modified: trunk/main/claw-as/src/lisplet.lisp ============================================================================== --- trunk/main/claw-as/src/lisplet.lisp (original) +++ trunk/main/claw-as/src/lisplet.lisp Fri Nov 14 12:25:31 2008 @@ -215,8 +215,8 @@ (clawserver-proxy-https-port *clawserver*) (claw-server-port))))) (claw-redirect (if (ends-with-subseq "/" uri) - (format nil "~aindex.html" uri) - (format nil "~a/index.html" uri)) + (format nil "~a~a" uri (subseq welcome-page 1)) + (format nil "~a/~a" uri (subseq welcome-page 1))) :protocol protocol :port port))) (lisplet-dispatch-request lisplet uri)))))

1 0

[claw-cvs] r144 - trunk/main/claw-as/src
by Andrea Chiumenti 14 Nov '08

14 Nov '08

Author: achiumenti Date: Fri Nov 14 12:20:46 2008 New Revision: 144 Log: fixed welcome page redirection Modified: trunk/main/claw-as/src/lisplet.lisp Modified: trunk/main/claw-as/src/lisplet.lisp ============================================================================== --- trunk/main/claw-as/src/lisplet.lisp (original) +++ trunk/main/claw-as/src/lisplet.lisp Fri Nov 14 12:20:46 2008 @@ -203,7 +203,22 @@ (lisplet-check-authorization lisplet) (when (= (claw-return-code) +http-ok+) (if (and welcome-page (or (string= uri base-path) (string= uri (concatenate 'string base-path "/")))) - (funcall (cdr (assoc welcome-page (lisplet-pages lisplet)))) + (let* ((protocol (if (= (claw-server-port) + (connector-port (clawserver-connector *clawserver*))) + :http + :https)) + (port (if (equal protocol :http) + (if (claw-proxified-p) + (clawserver-proxy-http-port *clawserver*) + (claw-server-port)) + (if (claw-proxified-p) + (clawserver-proxy-https-port *clawserver*) + (claw-server-port))))) + (claw-redirect (if (ends-with-subseq "/" uri) + (format nil "~aindex.html" uri) + (format nil "~a/index.html" uri)) + :protocol protocol + :port port))) (lisplet-dispatch-request lisplet uri))))) (defmethod lisplet-protect ((lisplet lisplet) location roles)

1 0

[claw-cvs] r143 - trunk/main/claw-as/src
by Andrea Chiumenti 13 Nov '08

13 Nov '08

Author: achiumenti Date: Thu Nov 13 07:27:04 2008 New Revision: 143 Log: chancged default connector http and https ports to 4080 and 4443 Modified: trunk/main/claw-as/src/connector.lisp Modified: trunk/main/claw-as/src/connector.lisp ============================================================================== --- trunk/main/claw-as/src/connector.lisp (original) +++ trunk/main/claw-as/src/connector.lisp Thu Nov 13 07:27:04 2008 @@ -216,7 +216,7 @@ (address :initarg :address :accessor connector-address :documentation "The address whe the connector is bound to")) - (:default-initargs :port 80 :sslport 443 + (:default-initargs :port 4080 :sslport 4443 :address *claw-default-server-address* :name 'connector) (:documentation "CONNECTOR is an interface, so you cannot directly use it.

1 0

[claw-cvs] r142 - trunk/main/connectors/hunchentoot
by Andrea Chiumenti 12 Nov '08

12 Nov '08

Author: achiumenti Date: Wed Nov 12 07:54:27 2008 New Revision: 142 Log: deletin old package, the package has moved to claw-as Removed: trunk/main/connectors/hunchentoot/

1 0

[claw-cvs] r141 - trunk/main/claw
by Andrea Chiumenti 12 Nov '08

12 Nov '08

Author: achiumenti Date: Wed Nov 12 07:53:15 2008 New Revision: 141 Log: deletin old package, the package has moved to claw-as Removed: trunk/main/claw/

1 0

[claw-cvs] r140 - in trunk/main/claw.i18n: . src
by Andrea Chiumenti 12 Nov '08

12 Nov '08

Author: achiumenti Date: Wed Nov 12 07:50:49 2008 New Revision: 140 Log: dependencies update Modified: trunk/main/claw.i18n/claw.i18n.asd trunk/main/claw.i18n/src/packages.lisp Modified: trunk/main/claw.i18n/claw.i18n.asd ============================================================================== --- trunk/main/claw.i18n/claw.i18n.asd (original) +++ trunk/main/claw.i18n/claw.i18n.asd Wed Nov 12 07:50:49 2008 @@ -30,8 +30,8 @@ (asdf:defsystem :claw.i18n :name "claw.i18n" :author "Andrea Chiumenti" - :description "Localization library." - :depends-on (:closer-mop :alexandria :cl-ppcre :cl-fad :local-time :split-sequence :parenscript :bordeaux-threads :flexi-streams :md5) + :description "Localization service for CLAW application server." + :depends-on (:claw-as :local-time) :components ((:module src :components ((:file "packages") (:file "i18n" :depends-on ("packages")) Modified: trunk/main/claw.i18n/src/packages.lisp ============================================================================== --- trunk/main/claw.i18n/src/packages.lisp (original) +++ trunk/main/claw.i18n/src/packages.lisp Wed Nov 12 07:50:49 2008 @@ -31,7 +31,7 @@ (defpackage :claw.i18n - (:use :cl :claw :local-time) + (:use :cl :claw-as :local-time) (:shadow :flatten) (:documentation "A service for CLAW application server, that performs internationalization \(i18n)") (:export #:number-format-grouping-separator

1 0

[claw-cvs] r139 - in trunk/main/claw-html.dojo: . src
by Andrea Chiumenti 12 Nov '08

12 Nov '08

Author: achiumenti Date: Wed Nov 12 07:47:21 2008 New Revision: 139 Log: dependencies update Modified: trunk/main/claw-html.dojo/claw-html.dojo.asd trunk/main/claw-html.dojo/src/packages.lisp Modified: trunk/main/claw-html.dojo/claw-html.dojo.asd ============================================================================== --- trunk/main/claw-html.dojo/claw-html.dojo.asd (original) +++ trunk/main/claw-html.dojo/claw-html.dojo.asd Wed Nov 12 07:47:21 2008 @@ -31,7 +31,7 @@ :name "claw-html.dojo" :author "Andrea Chiumenti" :description "claw dojo-1.1.0 integration" - :depends-on (:claw :claw-html :parenscript) + :depends-on (:claw-as :claw-html :parenscript) :components ((:module src :components ((:file "packages") (:file "misc" :depends-on ("packages")) Modified: trunk/main/claw-html.dojo/src/packages.lisp ============================================================================== --- trunk/main/claw-html.dojo/src/packages.lisp (original) +++ trunk/main/claw-html.dojo/src/packages.lisp Wed Nov 12 07:47:21 2008 @@ -31,7 +31,7 @@ (defpackage :claw-html.dojo (:nicknames :dojo) - (:use :cl :claw :claw-html :parenscript) + (:use :cl :claw-as :claw-html :parenscript) (:export :*dojo-directory-name* :djuser-locale :djwidget-dojo-type

1 0

[claw-cvs] r138 - trunk/main/claw-demo
by Andrea Chiumenti 12 Nov '08

12 Nov '08

Author: achiumenti Date: Wed Nov 12 07:46:43 2008 New Revision: 138 Log: dependencies update Modified: trunk/main/claw-demo/claw-demo.asd Modified: trunk/main/claw-demo/claw-demo.asd ============================================================================== --- trunk/main/claw-demo/claw-demo.asd (original) +++ trunk/main/claw-demo/claw-demo.asd Wed Nov 12 07:46:43 2008 @@ -97,7 +97,7 @@ :perform (test-op :after (op c) (describe (funcall (find-symbol "RUN-TESTS" "LIFT") :suite (find-symbol "CLAW-DEMO-BACKEND-TESTSUITE" "CLAW-DEMO-BACKEND")))) - :depends-on (:clsql :clsql-postgresql :local-time :claw :closer-mop :claw-demo-backend :claw-demo-frontend) + :depends-on (:claw-demo-backend :claw-demo-frontend) :components ((:module src :components ((:file "packages") (:file "main" :depends-on ("packages"))))))

1 0

[claw-cvs] r137 - trunk/main/claw-demo/src/frontend/components
by Andrea Chiumenti 12 Nov '08

12 Nov '08

Author: achiumenti Date: Wed Nov 12 07:46:02 2008 New Revision: 137 Log: corrected wrong link Modified: trunk/main/claw-demo/src/frontend/components/site-template.lisp Modified: trunk/main/claw-demo/src/frontend/components/site-template.lisp ============================================================================== --- trunk/main/claw-demo/src/frontend/components/site-template.lisp (original) +++ trunk/main/claw-demo/src/frontend/components/site-template.lisp Wed Nov 12 07:46:02 2008 @@ -57,7 +57,7 @@ (djdrop-down-button> (span> "File") (djmenu> (djmenu-item> :id "homeMenu" - :on-click (ps:ps* `(location.replace ,(format nil "~a/home.html" *root-path*))) + :on-click (ps:ps* `(location.replace ,(format nil "~a/index.html" *root-path*))) "Home") (djmenu-item> :id "loginMenu" :render-condition #'(lambda () (null principal))

1 0

[claw-cvs] r136 - in trunk/main/claw-demo: . src/backend src/frontend src/frontend/components
by Andrea Chiumenti 12 Nov '08

12 Nov '08

Author: achiumenti Date: Wed Nov 12 07:10:55 2008 New Revision: 136 Log: demo update for recent package renaming Modified: trunk/main/claw-demo/claw-demo.asd trunk/main/claw-demo/src/backend/packages.lisp trunk/main/claw-demo/src/frontend/components/edit-user.lisp trunk/main/claw-demo/src/frontend/main.lisp trunk/main/claw-demo/src/frontend/packages.lisp Modified: trunk/main/claw-demo/claw-demo.asd ============================================================================== --- trunk/main/claw-demo/claw-demo.asd (original) +++ trunk/main/claw-demo/claw-demo.asd Wed Nov 12 07:10:55 2008 @@ -36,8 +36,8 @@ (asdf:defsystem :claw-demo-backend :name "claw-demo-backend" :author "Andrea Chiumenti" - :description "Demo application for claw, backend part." - :depends-on (:clsql :clsql-postgresql :local-time :claw :closer-mop :split-sequence) + :description "Demo application for CLAW, backend part." + :depends-on (:clsql :clsql-postgresql :local-time :claw-as :closer-mop :split-sequence) :components ((:module src :components ((:module backend :components ((:file "packages") @@ -49,8 +49,8 @@ (asdf:defsystem :claw-demo-frontend :name "claw-demo-frontend" :author "Andrea Chiumenti" - :description "Demo application for claw, frontend part." - :depends-on (:local-time :claw :hunchentoot-connector :claw-html :claw-html.dojo :claw-demo-backend :split-sequence) + :description "Demo application for CLAW, frontend part." + :depends-on (:local-time :claw-as :claw-hunchentoot-connector :claw-html :claw-html.dojo :claw-demo-backend :split-sequence) :components ((:module src :components ((:module frontend :components ((:file "packages") Modified: trunk/main/claw-demo/src/backend/packages.lisp ============================================================================== --- trunk/main/claw-demo/src/backend/packages.lisp (original) +++ trunk/main/claw-demo/src/backend/packages.lisp Wed Nov 12 07:10:55 2008 @@ -31,7 +31,7 @@ (defpackage :claw-demo-backend - (:use :cl :clsql :clsql-sys :clsql-postgresql :local-time :claw :closer-mop :split-sequence) + (:use :cl :clsql :clsql-sys :clsql-postgresql :local-time :claw-as :closer-mop :split-sequence) (:shadowing-import-from :local-time :timezone :decode-duration Modified: trunk/main/claw-demo/src/frontend/components/edit-user.lisp ============================================================================== --- trunk/main/claw-demo/src/frontend/components/edit-user.lisp (original) +++ trunk/main/claw-demo/src/frontend/components/edit-user.lisp Wed Nov 12 07:10:55 2008 @@ -123,6 +123,7 @@ :accessor 'user-active)) (djxpassword-validator> :id "password" :class "label password" + :required nil :visit-object obj :label "Password" :type "password" @@ -183,12 +184,13 @@ (defmethod edit-user-save ((obj edit-user)) (let ((id (htcomponent-client-id obj)) (user (edit-user-user obj)) - (roles (find-roles-by-ids :ids (edit-user-assigned-roles obj)))) + (roles (find-roles-by-ids :ids (edit-user-assigned-roles obj))) + (password (edit-user-password obj))) (handler-case (progn - (log-message :info "password ~a" (edit-user-password obj)) - (setf (user-roles user) roles - (user-password user) (edit-user-password obj)) + (setf (user-roles user) roles) + (when password + (setf (user-password user) password)) (update-db-item user) (setf (edit-user-password obj) nil)) (clsql-sys:sql-database-error (cond) Modified: trunk/main/claw-demo/src/frontend/main.lisp ============================================================================== --- trunk/main/claw-demo/src/frontend/main.lisp (original) +++ trunk/main/claw-demo/src/frontend/main.lisp Wed Nov 12 07:10:55 2008 @@ -43,8 +43,10 @@ :address "localhost" :port 4242 :sslport 4343 + #| :ssl-certificate-file #P "/etc/apache2/ssl/server.crt" - :ssl-privatekey-file #P "/etc/apache2/ssl/server.key")) + :ssl-privatekey-file #P "/etc/apache2/ssl/server.key" +|#)) (defvar *sm* (make-instance 'default-session-manager)) Modified: trunk/main/claw-demo/src/frontend/packages.lisp ============================================================================== --- trunk/main/claw-demo/src/frontend/packages.lisp (original) +++ trunk/main/claw-demo/src/frontend/packages.lisp Wed Nov 12 07:10:55 2008 @@ -31,5 +31,5 @@ (defpackage :claw-demo-frontend - (:use :cl :local-time :claw :hunchentoot-connector :claw-html :claw-html.dojo :claw-demo-backend :split-sequence) + (:use :cl :local-time :claw-as :claw-hunchentoot-connector :claw-html :claw-html.dojo :claw-demo-backend :split-sequence) (:documentation "Frontend layer for demo application for CLAW")) \ No newline at end of file

1 0