From bknr at bknr.net Sun May 3 15:02:07 2009
From: bknr at bknr.net (BKNR Commits)
Date: Sun, 03 May 2009 17:02:07 +0200
Subject: [bknr-cvs] hans changed
deployed/quickhoney/thirdparty/usocket/condition.lisp
Message-ID:
Revision: 4384
Author: hans
URL: http://bknr.net/trac/changeset/4384
Correct errno for ECONNRESET
U deployed/quickhoney/thirdparty/usocket/condition.lisp
Modified: deployed/quickhoney/thirdparty/usocket/condition.lisp
===================================================================
--- deployed/quickhoney/thirdparty/usocket/condition.lisp 2009-04-16 16:42:38 UTC (rev 4383)
+++ deployed/quickhoney/thirdparty/usocket/condition.lisp 2009-05-03 15:02:07 UTC (rev 4384)
@@ -183,7 +183,7 @@
((49 99) . address-not-available-error)
((9) . bad-file-descriptor-error)
((61 111) . connection-refused-error)
- ((64 131) . connection-reset-error)
+ ((54 104) . connection-reset-error)
((53 103) . connection-aborted-error)
((22) . invalid-argument-error)
((55 105) . no-buffers-error)
From bknr at bknr.net Sun May 3 15:12:13 2009
From: bknr at bknr.net (BKNR Commits)
Date: Sun, 03 May 2009 17:12:13 +0200
Subject: [bknr-cvs] hans changed
deployed/bos/thirdparty/usocket/condition.lisp
Message-ID:
Revision: 4385
Author: hans
URL: http://bknr.net/trac/changeset/4385
merge usocket fix
U deployed/bos/thirdparty/usocket/condition.lisp
Modified: deployed/bos/thirdparty/usocket/condition.lisp
===================================================================
--- deployed/bos/thirdparty/usocket/condition.lisp 2009-05-03 15:02:07 UTC (rev 4384)
+++ deployed/bos/thirdparty/usocket/condition.lisp 2009-05-03 15:12:13 UTC (rev 4385)
@@ -183,7 +183,7 @@
((49 99) . address-not-available-error)
((9) . bad-file-descriptor-error)
((61 111) . connection-refused-error)
- ((64 131) . connection-reset-error)
+ ((54 104) . connection-reset-error)
((53 103) . connection-aborted-error)
((22) . invalid-argument-error)
((55 105) . no-buffers-error)
From bknr at bknr.net Fri May 8 09:54:06 2009
From: bknr at bknr.net (BKNR Commits)
Date: Fri, 08 May 2009 11:54:06 +0200
Subject: [bknr-cvs] hans changed
deployed/quickhoney/projects/quickhoney/src/handlers.lisp
Message-ID:
Revision: 4386
Author: hans
URL: http://bknr.net/trac/changeset/4386
remove auto-twitter functionality as requested
U deployed/quickhoney/projects/quickhoney/src/handlers.lisp
Modified: deployed/quickhoney/projects/quickhoney/src/handlers.lisp
===================================================================
--- deployed/quickhoney/projects/quickhoney/src/handlers.lisp 2009-05-03 15:12:13 UTC (rev 4385)
+++ deployed/quickhoney/projects/quickhoney/src/handlers.lisp 2009-05-08 09:54:06 UTC (rev 4386)
@@ -334,13 +334,6 @@
:spider-keywords spider-keywords))))
(with-http-response ()
(with-http-body ()
- (let ((tinyurl (drakma:http-request
- (format nil "http://tinyurl.com/api-create.php?url=~A"
- (hunchentoot:url-encode (format nil "http://quickhoney.com~A/~A"
- (handler-path handler) image-name))))))
- (twitter:update-status (bknr-session-user)
- (format nil "Uploaded new image ~A: ~A"
- image-name tinyurl)))
(html (:html
(:head
(:title "Upload successful")
@@ -405,8 +398,6 @@
(apply #'make-store-image :image uploaded-image args)
(apply #'import-image (upload-pathname uploaded-file) args))))
(declare (ignore item)) ; for now
- (twitter:update-status (bknr-session-user)
- (format nil "Posted news item: http://quickhoney.com/news/~A" name))
(with-http-response ()
(with-http-body ()
(html (:html
From bknr at bknr.net Fri May 8 10:09:10 2009
From: bknr at bknr.net (BKNR Commits)
Date: Fri, 08 May 2009 12:09:10 +0200
Subject: [bknr-cvs] hans changed deployed/quickhoney/projects/quickhoney/src/
Message-ID:
Revision: 4387
Author: hans
URL: http://bknr.net/trac/changeset/4387
hunchentoot 1.0 changes
U deployed/quickhoney/projects/quickhoney/src/handlers.lisp
U deployed/quickhoney/projects/quickhoney/src/init.lisp
Modified: deployed/quickhoney/projects/quickhoney/src/handlers.lisp
===================================================================
--- deployed/quickhoney/projects/quickhoney/src/handlers.lisp 2009-05-08 09:54:06 UTC (rev 4386)
+++ deployed/quickhoney/projects/quickhoney/src/handlers.lisp 2009-05-08 10:09:10 UTC (rev 4387)
@@ -587,6 +587,10 @@
(defclass shutdown-handler (admin-only-handler page-handler)
())
+(defvar *acceptor* nil)
+
(defmethod handle ((handler shutdown-handler))
- (hunchentoot:stop-server hunchentoot:*server*)
+ (when *acceptor*
+ (hunchentoot:stop *acceptor*)
+ (setf *acceptor* nil))
"Shutting down HTTP server")
Modified: deployed/quickhoney/projects/quickhoney/src/init.lisp
===================================================================
--- deployed/quickhoney/projects/quickhoney/src/init.lisp 2009-05-08 09:54:06 UTC (rev 4386)
+++ deployed/quickhoney/projects/quickhoney/src/init.lisp 2009-05-08 10:09:10 UTC (rev 4387)
@@ -36,8 +36,9 @@
(format t "; loading site configuration file~%")
(let ((*package* (find-package :quickhoney.config)))
(load "site-config.lisp")))
- (bt:make-thread (curry #'hunchentoot:start-server
- :port *webserver-port*
- :threaded nil
- :persistent-connections-p nil)
+ (setf *acceptor* (make-instance 'hunchentoot:acceptor
+ :port *webserver-port*
+ :taskmaster 'hunchentoot:single-threaded-taskmaster
+ :persistent-connections-p nil))
+ (bt:make-thread (curry #'hunchentoot:start *acceptor*)
:name (format nil "HTTP server on port ~A" *webserver-port*)))
From bknr at bknr.net Fri May 8 10:13:51 2009
From: bknr at bknr.net (BKNR Commits)
Date: Fri, 08 May 2009 12:13:51 +0200
Subject: [bknr-cvs] hans changed
deployed/quickhoney/projects/quickhoney/src/init.lisp
Message-ID:
Revision: 4388
Author: hans
URL: http://bknr.net/trac/changeset/4388
another hunchentoot 1.0 change
U deployed/quickhoney/projects/quickhoney/src/init.lisp
Modified: deployed/quickhoney/projects/quickhoney/src/init.lisp
===================================================================
--- deployed/quickhoney/projects/quickhoney/src/init.lisp 2009-05-08 10:09:10 UTC (rev 4387)
+++ deployed/quickhoney/projects/quickhoney/src/init.lisp 2009-05-08 10:13:51 UTC (rev 4388)
@@ -38,7 +38,7 @@
(load "site-config.lisp")))
(setf *acceptor* (make-instance 'hunchentoot:acceptor
:port *webserver-port*
- :taskmaster 'hunchentoot:single-threaded-taskmaster
+ :taskmaster (make-instance 'hunchentoot:single-threaded-taskmaster)
:persistent-connections-p nil))
(bt:make-thread (curry #'hunchentoot:start *acceptor*)
:name (format nil "HTTP server on port ~A" *webserver-port*)))
From bknr at bknr.net Fri May 8 10:22:08 2009
From: bknr at bknr.net (BKNR Commits)
Date: Fri, 08 May 2009 12:22:08 +0200
Subject: [bknr-cvs] hans changed
deployed/quickhoney/projects/quickhoney/src/init.lisp
Message-ID:
Revision: 4389
Author: hans
URL: http://bknr.net/trac/changeset/4389
Another Hunchentoot 1.0 fix
U deployed/quickhoney/projects/quickhoney/src/init.lisp
Modified: deployed/quickhoney/projects/quickhoney/src/init.lisp
===================================================================
--- deployed/quickhoney/projects/quickhoney/src/init.lisp 2009-05-08 10:13:51 UTC (rev 4388)
+++ deployed/quickhoney/projects/quickhoney/src/init.lisp 2009-05-08 10:22:08 UTC (rev 4389)
@@ -39,6 +39,7 @@
(setf *acceptor* (make-instance 'hunchentoot:acceptor
:port *webserver-port*
:taskmaster (make-instance 'hunchentoot:single-threaded-taskmaster)
- :persistent-connections-p nil))
+ :persistent-connections-p nil
+ :request-dispatcher 'bknr.web:bknr-dispatch))
(bt:make-thread (curry #'hunchentoot:start *acceptor*)
:name (format nil "HTTP server on port ~A" *webserver-port*)))
From bknr at bknr.net Fri May 8 10:27:30 2009
From: bknr at bknr.net (BKNR Commits)
Date: Fri, 08 May 2009 12:27:30 +0200
Subject: [bknr-cvs] hans changed deployed/quickhoney/
Message-ID:
Revision: 4390
Author: hans
URL: http://bknr.net/trac/changeset/4390
move to trunk
D deployed/quickhoney/
From bknr at bknr.net Fri May 8 10:28:02 2009
From: bknr at bknr.net (BKNR Commits)
Date: Fri, 08 May 2009 12:28:02 +0200
Subject: [bknr-cvs] hans changed deployed/quickhoney/
Message-ID:
Revision: 4391
Author: hans
URL: http://bknr.net/trac/changeset/4391
copy from trunk
A deployed/quickhoney/
Copied: deployed/quickhoney (from rev 4390, trunk)
From bknr at bknr.net Tue May 12 15:58:07 2009
From: bknr at bknr.net (BKNR Commits)
Date: Tue, 12 May 2009 17:58:07 +0200
Subject: [bknr-cvs] dverna changed
trunk/projects/lisp-ecoop/website/templates/
Message-ID:
Revision: 4392
Author: dverna
URL: http://bknr.net/trac/changeset/4392
Improve contact page
U trunk/projects/lisp-ecoop/website/templates/contact.xml
U trunk/projects/lisp-ecoop/website/templates/menu.xml
Modified: trunk/projects/lisp-ecoop/website/templates/contact.xml
===================================================================
--- trunk/projects/lisp-ecoop/website/templates/contact.xml 2009-05-08 10:28:02 UTC (rev 4391)
+++ trunk/projects/lisp-ecoop/website/templates/contact.xml 2009-05-12 15:58:06 UTC (rev 4392)
@@ -3,10 +3,15 @@
-Organizing Committee
+Organization
+
+ Workshop:
+ Didier Verna
+
+ Website: Hans H??bner
-The organizing comitee consists of the following people:
+Programme Committee
-
Didier Verna,
@@ -28,11 +33,4 @@
- Hans H??bner, Software Developer, Berlin, Germany
-Contact
-
- Workshop related:
- Didier Verna
-
- Website related: Hans H??bner
-
Modified: trunk/projects/lisp-ecoop/website/templates/menu.xml
===================================================================
--- trunk/projects/lisp-ecoop/website/templates/menu.xml 2009-05-08 10:28:02 UTC (rev 4391)
+++ trunk/projects/lisp-ecoop/website/templates/menu.xml 2009-05-12 15:58:06 UTC (rev 4392)
@@ -6,5 +6,5 @@
-
+
From bknr at bknr.net Tue May 12 16:01:32 2009
From: bknr at bknr.net (BKNR Commits)
Date: Tue, 12 May 2009 18:01:32 +0200
Subject: [bknr-cvs] dverna changed
trunk/projects/lisp-ecoop/website/templates/contact.xml
Message-ID:
Revision: 4393
Author: dverna
URL: http://bknr.net/trac/changeset/4393
Improve contact page even more
U trunk/projects/lisp-ecoop/website/templates/contact.xml
Modified: trunk/projects/lisp-ecoop/website/templates/contact.xml
===================================================================
--- trunk/projects/lisp-ecoop/website/templates/contact.xml 2009-05-12 15:58:06 UTC (rev 4392)
+++ trunk/projects/lisp-ecoop/website/templates/contact.xml 2009-05-12 16:01:32 UTC (rev 4393)
@@ -4,13 +4,11 @@
xmlns:lisp-ecoop="http://elw.bknr.net/">
Organization
-
- Workshop:
- Didier Verna
-
- Website: Hans H??bner
+
-
Programme Committee
-
From bknr at bknr.net Wed May 13 07:52:48 2009
From: bknr at bknr.net (BKNR Commits)
Date: Wed, 13 May 2009 09:52:48 +0200
Subject: [bknr-cvs] dverna changed
trunk/projects/lisp-ecoop/website/templates/create-submission.xml
Message-ID:
Revision: 4394
Author: dverna
URL: http://bknr.net/trac/changeset/4394
Changed Breakout Group to Tutorial
U trunk/projects/lisp-ecoop/website/templates/create-submission.xml
Modified: trunk/projects/lisp-ecoop/website/templates/create-submission.xml
===================================================================
--- trunk/projects/lisp-ecoop/website/templates/create-submission.xml 2009-05-12 16:01:32 UTC (rev 4393)
+++ trunk/projects/lisp-ecoop/website/templates/create-submission.xml 2009-05-13 07:52:47 UTC (rev 4394)
@@ -18,9 +18,12 @@
--->
+
Important News
- The submission deadline has been extended to April 22nd
From bknr at bknr.net Mon May 18 08:54:39 2009
From: bknr at bknr.net (BKNR Commits)
Date: Mon, 18 May 2009 10:54:39 +0200
Subject: [bknr-cvs] dverna changed
trunk/projects/lisp-ecoop/website/templates/home.xml
Message-ID:
Revision: 4404
Author: dverna
URL: http://bknr.net/trac/changeset/4404
Reverse important dates order
U trunk/projects/lisp-ecoop/website/templates/home.xml
Modified: trunk/projects/lisp-ecoop/website/templates/home.xml
===================================================================
--- trunk/projects/lisp-ecoop/website/templates/home.xml 2009-05-18 08:30:54 UTC (rev 4403)
+++ trunk/projects/lisp-ecoop/website/templates/home.xml 2009-05-18 08:54:39 UTC (rev 4404)
@@ -83,12 +83,12 @@
Important Dates
+- ECOOP early registration deadline: May 20, 2009
+- Notification of acceptance: May 08, 2009
+ Submission deadline
-
- Submission deadline
EXTENDED: April 22, 2009
-- Notification of acceptance: May 08, 2009
-- ECOOP early registration deadline: May 20, 2009
Overview
From bknr at bknr.net Mon May 18 08:55:03 2009
From: bknr at bknr.net (BKNR Commits)
Date: Mon, 18 May 2009 10:55:03 +0200
Subject: [bknr-cvs] dverna changed
trunk/projects/lisp-ecoop/website/templates/home.xml
Message-ID:
Revision: 4405
Author: dverna
URL: http://bknr.net/trac/changeset/4405
Reverse important dates order (take 2)
U trunk/projects/lisp-ecoop/website/templates/home.xml
Modified: trunk/projects/lisp-ecoop/website/templates/home.xml
===================================================================
--- trunk/projects/lisp-ecoop/website/templates/home.xml 2009-05-18 08:54:39 UTC (rev 4404)
+++ trunk/projects/lisp-ecoop/website/templates/home.xml 2009-05-18 08:55:03 UTC (rev 4405)
@@ -85,8 +85,8 @@
- ECOOP early registration deadline: May 20, 2009
- Notification of acceptance: May 08, 2009
+-
Submission deadline
-
-
EXTENDED: April 22, 2009
From bknr at bknr.net Mon May 18 09:00:42 2009
From: bknr at bknr.net (BKNR Commits)
Date: Mon, 18 May 2009 11:00:42 +0200
Subject: [bknr-cvs] dverna changed
trunk/projects/lisp-ecoop/website/templates/
Message-ID:
Revision: 4406
Author: dverna
URL: http://bknr.net/trac/changeset/4406
Advertise Edi's keynote
U trunk/projects/lisp-ecoop/website/templates/home.xml
U trunk/projects/lisp-ecoop/website/templates/news.xml
Modified: trunk/projects/lisp-ecoop/website/templates/home.xml
===================================================================
--- trunk/projects/lisp-ecoop/website/templates/home.xml 2009-05-18 08:55:03 UTC (rev 4405)
+++ trunk/projects/lisp-ecoop/website/templates/home.xml 2009-05-18 09:00:41 UTC (rev 4406)
@@ -40,44 +40,19 @@
Important News
- - The submission deadline has been extended to April 22nd
+
-
+ Edi Weitz will give a keynote entitled
+ "Lisp in the Real World[TM]" in which he will talk about commercial /
+ industrial use of his open source libraries.
+
+ -
This year, and for the first time, the workshop proceedings will be
published in the ACM Digital Library.
-
Also, the workshop will feature interactive tutorial/demo/coding sessions.
-
-
Modified: trunk/projects/lisp-ecoop/website/templates/news.xml
===================================================================
--- trunk/projects/lisp-ecoop/website/templates/news.xml 2009-05-18 08:55:03 UTC (rev 4405)
+++ trunk/projects/lisp-ecoop/website/templates/news.xml 2009-05-18 09:00:41 UTC (rev 4406)
@@ -11,30 +11,16 @@
- The workshop programme is now online.
-->
-
+
April 8th, 2009
-
From bknr at bknr.net Wed May 20 11:07:48 2009
From: bknr at bknr.net (BKNR Commits)
Date: Wed, 20 May 2009 13:07:48 +0200
Subject: [bknr-cvs] hans changed trunk/libraries/yason/
Message-ID:
Revision: 4407
Author: hans
URL: http://bknr.net/trac/changeset/4407
Patch by Sean Ross to make YASON optionally parse objects as alists.
U trunk/libraries/yason/doc.xml
U trunk/libraries/yason/package.lisp
U trunk/libraries/yason/parse.lisp
Modified: trunk/libraries/yason/doc.xml
===================================================================
--- trunk/libraries/yason/doc.xml 2009-05-18 09:00:41 UTC (rev 4406)
+++ trunk/libraries/yason/doc.xml 2009-05-20 11:07:47 UTC (rev 4407)
@@ -87,7 +87,9 @@
hash-table :test #'equal |
Keys are strings by default,
- see *parse-object-key-fn*
+ see *parse-object-key-fn*.
+ Set *parse-object-as-alist* to a true
+ value in order to have YASON parse objects as alists.
|
@@ -196,6 +198,13 @@
+
+
+ If set to a true value, JSON objects will be parsed as
+ alists instead of hash tables.
+
+
+
If set to a true value, JSON booleans will be read as the
@@ -209,6 +218,7 @@
key in the CL hash produced.
+
Modified: trunk/libraries/yason/package.lisp
===================================================================
--- trunk/libraries/yason/package.lisp 2009-05-18 09:00:41 UTC (rev 4406)
+++ trunk/libraries/yason/package.lisp 2009-05-20 11:07:47 UTC (rev 4407)
@@ -15,6 +15,7 @@
;; Parser
#:parse
#:*parse-object-key-fn*
+ #:*parse-object-as-alist*
#:*parse-json-arrays-as-vectors*
#:*parse-json-booleans-as-symbols*
Modified: trunk/libraries/yason/parse.lisp
===================================================================
--- trunk/libraries/yason/parse.lisp 2009-05-18 09:00:41 UTC (rev 4406)
+++ trunk/libraries/yason/parse.lisp 2009-05-20 11:07:47 UTC (rev 4407)
@@ -102,24 +102,40 @@
(format stream "cannot convert key ~S used in JSON object to hash table key"
(key-string c)))))
+(defvar *parse-object-as-alist* nil
+ "If set to a true value, JSON objects will be parsed as association lists and not hash tables.")
+
+(defun create-container ()
+ (if *parse-object-as-alist*
+ '()
+ (make-hash-table :test #'equal)))
+
+(defgeneric add-attribute (to key value)
+ (:method ((to hash-table) key value)
+ (setf (gethash key to) value)
+ to)
+ (:method ((to list) key value)
+ (acons key value to)))
+
(defun parse-object (input)
- (let ((return-value (make-hash-table :test #'equal)))
+ (let ((return-value (create-container)))
(read-char input)
(loop
(when (eql (peek-char-skipping-whitespace input)
#\})
(return))
(skip-whitespace input)
- (setf (gethash (prog1
- (let ((key-string (parse-string input)))
- (or (funcall *parse-object-key-fn* key-string)
- (error 'cannot-convert-key :key-string key-string)))
- (skip-whitespace input)
- (unless (eql #\: (read-char input))
- (error 'expected-colon))
- (skip-whitespace input))
- return-value)
- (parse input))
+ (setf return-value
+ (add-attribute return-value
+ (prog1
+ (let ((key-string (parse-string input)))
+ (or (funcall *parse-object-key-fn* key-string)
+ (error 'cannot-convert-key :key-string key-string)))
+ (skip-whitespace input)
+ (unless (eql #\: (read-char input))
+ (error 'expected-colon))
+ (skip-whitespace input))
+ (parse input)))
(ecase (peek-char-skipping-whitespace input)
(#\, (read-char input))
(#\} nil)))
@@ -171,6 +187,9 @@
(parse-array input))
((#\t #\f #\n)
(parse-constant input))))
+ (:method ((input pathname))
+ (with-open-file (stream input)
+ (parse stream)))
(:method ((input string))
(parse (make-string-input-stream input))))
From bknr at bknr.net Wed May 20 13:56:06 2009
From: bknr at bknr.net (BKNR Commits)
Date: Wed, 20 May 2009 15:56:06 +0200
Subject: [bknr-cvs] hans changed
deployed/bos/thirdparty/hunchentoot/server.lisp
Message-ID:
Revision: 4408
Author: hans
URL: http://bknr.net/trac/changeset/4408
guard against ECONNABORTED in accept calls
U deployed/bos/thirdparty/hunchentoot/server.lisp
Modified: deployed/bos/thirdparty/hunchentoot/server.lisp
===================================================================
--- deployed/bos/thirdparty/hunchentoot/server.lisp 2009-05-20 11:07:47 UTC (rev 4407)
+++ deployed/bos/thirdparty/hunchentoot/server.lisp 2009-05-20 13:56:06 UTC (rev 4408)
@@ -399,7 +399,11 @@
(usocket:wait-for-input listener :timeout +new-connection-wait-time+)))
((server-shutdown-p server))
(when new-connection-p
- (let ((client-connection (usocket:socket-accept listener)))
+ (let ((client-connection
+ (handler-case
+ (usocket:socket-accept listener)
+ ;; ignore condition
+ (usocket:connection-aborted-error () nil))))
(when client-connection
(set-timeouts client-connection
(server-read-timeout server)
From bknr at bknr.net Wed May 20 13:57:58 2009
From: bknr at bknr.net (BKNR Commits)
Date: Wed, 20 May 2009 15:57:58 +0200
Subject: [bknr-cvs] hans changed trunk/thirdparty/hunchentoot/acceptor.lisp
Message-ID:
Revision: 4409
Author: hans
URL: http://bknr.net/trac/changeset/4409
Put handler-case for usocket:connection-aborted-error around the right
function call.
U trunk/thirdparty/hunchentoot/acceptor.lisp
Modified: trunk/thirdparty/hunchentoot/acceptor.lisp
===================================================================
--- trunk/thirdparty/hunchentoot/acceptor.lisp 2009-05-20 13:56:06 UTC (rev 4408)
+++ trunk/thirdparty/hunchentoot/acceptor.lisp 2009-05-20 13:57:58 UTC (rev 4409)
@@ -368,15 +368,17 @@
(when (acceptor-shutdown-p acceptor)
(return))
(when (usocket:wait-for-input listener :ready-only t :timeout +new-connection-wait-time+)
- (handler-case
- (when-let (client-connection (usocket:socket-accept listener))
- (set-timeouts client-connection
- (acceptor-read-timeout acceptor)
- (acceptor-write-timeout acceptor))
- (handle-incoming-connection (acceptor-taskmaster acceptor)
- client-connection))
- ;; ignore condition
- (usocket:connection-aborted-error ()))))))
+ (when-let (client-connection
+ (handler-case
+ (usocket:socket-accept listener)
+
+ ;; ignore condition
+ (usocket:connection-aborted-error ())))
+ (set-timeouts client-connection
+ (acceptor-read-timeout acceptor)
+ (acceptor-write-timeout acceptor))
+ (handle-incoming-connection (acceptor-taskmaster acceptor)
+ client-connection))))))
;; LispWorks implementation