May 2009 - bknr-cvs@common-lisp.net - mailman3.common-lisp.net

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/acceptor.lisp
by BKNR Commits 20 May '09

20 May '09

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

1 0

[bknr-cvs] hans changed deployed/bos/thirdparty/hunchentoot/server.lisp
by BKNR Commits 20 May '09

20 May '09

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)

1 0

[bknr-cvs] hans changed trunk/libraries/yason/
by BKNR Commits 20 May '09

20 May '09

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 @@ <td>hash-table<br/>:test #'equal</td> <td> Keys are strings by default, - see <clix:ref>*parse-object-key-fn*</clix:ref> + see <clix:ref>*parse-object-key-fn*</clix:ref>. + Set <clix:ref>*parse-object-as-alist*</clix:ref> to a true + value in order to have YASON parse objects as alists. </td> </tr> <tr> @@ -196,6 +198,13 @@ </clix:description> </clix:special-variable> + <clix:special-variable name="*parse-object-as-alist*"> + <clix:description> + If set to a true value, JSON objects will be parsed as + alists instead of hash tables. + </clix:description> + </clix:special-variable> + <clix:special-variable name="*parse-json-booleans-as-symbols*"> <clix:description> If set to a true value, JSON booleans will be read as the @@ -209,6 +218,7 @@ key in the CL hash produced. </clix:description> </clix:special-variable> + </clix:subchapter> </clix:chapter> 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))))

1 0

[bknr-cvs] dverna changed trunk/projects/lisp-ecoop/website/templates/
by BKNR Commits 18 May '09

18 May '09

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 @@ <h2>Important News</h2> <ul> - <li>The submission deadline has been extended to April 22nd</li> +  <li> + <strong>Edi Weitz</strong> 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. + </li> + <li> This year, and for the first time, the workshop proceedings will be published in the ACM Digital Library. </li> <li> Also, the workshop will feature interactive tutorial/demo/coding sessions. </li> -  -  </ul> 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 @@ <li>The workshop programme is now online.</li> </ul> --> - + <h3>April 8th, 2009</h3> <ul> <li>

1 0

[bknr-cvs] dverna changed trunk/projects/lisp-ecoop/website/templates/home.xml
by BKNR Commits 18 May '09

18 May '09

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 @@ <ul> <li>ECOOP early registration deadline: <b>May 20, 2009</b></li> <li>Notification of acceptance: <b>May 08, 2009</b></li> +<li> Submission deadline -<li> <b><span style="color: red;">EXTENDED</span></b>: <b>April 22, 2009</b> </li> </ul>

1 0

[bknr-cvs] dverna changed trunk/projects/lisp-ecoop/website/templates/home.xml
by BKNR Commits 18 May '09

18 May '09

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 @@ <h2>Important Dates</h2> <ul> +<li>ECOOP early registration deadline: <b>May 20, 2009</b></li> +<li>Notification of acceptance: <b>May 08, 2009</b></li> + Submission deadline <li> - Submission deadline <b><span style="color: red;">EXTENDED</span></b>: <b>April 22, 2009</b> </li> -<li>Notification of acceptance: <b>May 08, 2009</b></li> -<li>ECOOP early registration deadline: <b>May 20, 2009</b></li> </ul> <h2>Overview</h2>

1 0

[bknr-cvs] dverna changed trunk/projects/lisp-ecoop/website/templates/home.xml
by BKNR Commits 18 May '09

18 May '09

Revision: 4403 Author: dverna URL: http://bknr.net/trac/changeset/4403 Fix typo in home.xml 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:21 UTC (rev 4402) +++ trunk/projects/lisp-ecoop/website/templates/home.xml 2009-05-18 08:30:54 UTC (rev 4403) @@ -36,8 +36,8 @@ <a href="http://www.itasoftware.com/" target="_new">ITA Software, Inc.</a> and <a href="http://www.epita.fr/" target="_new">EPITA</a>. </p> ---> + <h2>Important News</h2> <ul> <li>The submission deadline has been extended to April 22nd</li>

1 0

[bknr-cvs] dverna changed trunk/projects/lisp-ecoop/website/
by BKNR Commits 18 May '09

18 May '09

Revision: 4402 Author: dverna URL: http://bknr.net/trac/changeset/4402 Update for sponsors A trunk/projects/lisp-ecoop/website/static/ita-logo.jpg U trunk/projects/lisp-ecoop/website/templates/home.xml Added: trunk/projects/lisp-ecoop/website/static/ita-logo.jpg =================================================================== (Binary files differ) Property changes on: trunk/projects/lisp-ecoop/website/static/ita-logo.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/lisp-ecoop/website/templates/home.xml =================================================================== --- trunk/projects/lisp-ecoop/website/templates/home.xml 2009-05-18 08:25:33 UTC (rev 4401) +++ trunk/projects/lisp-ecoop/website/templates/home.xml 2009-05-18 08:30:21 UTC (rev 4402) @@ -7,8 +7,8 @@ <p>July 06 - Genova, Italy - co-located with ECOOP 2009</p> +<p>  + <a href="http://www.itasoftware.com/" target="_new"> + <img src="../static/ita-logo.jpg" alt="ITA" border="0" /> + </a> <a href="http://www.epita.fr/" target="_new"> <img src="../static/epita-logo.jpg" alt="EPITA" border="0" /> </a> </p> <p> Supported by + + <a href="http://www.itasoftware.com/" target="_new">ITA Software, Inc.</a> and <a href="http://www.epita.fr/" target="_new">EPITA</a>. </p> -->

1 0

[bknr-cvs] hans changed trunk/projects/lisp-ecoop/src/participant.lisp
by BKNR Commits 18 May '09

18 May '09

Revision: 4401 Author: hans URL: http://bknr.net/trac/changeset/4401 make breakout group proposals print "Interactive Tutorial / Demo / Coding Session" U trunk/projects/lisp-ecoop/src/participant.lisp Modified: trunk/projects/lisp-ecoop/src/participant.lisp =================================================================== --- trunk/projects/lisp-ecoop/src/participant.lisp 2009-05-18 08:08:11 UTC (rev 4400) +++ trunk/projects/lisp-ecoop/src/participant.lisp 2009-05-18 08:25:33 UTC (rev 4401) @@ -59,7 +59,7 @@ ()) (defmethod submission-type ((breakout-group-proposal breakout-group-proposal)) - "Breakout group proposal") + "Interactive Tutorial / Demo / Coding Session") (define-lisp-ecoop-class keynote (submission) ())

1 0

[bknr-cvs] dverna changed trunk/projects/lisp-ecoop/website/templates/submissions.xml
by BKNR Commits 18 May '09

18 May '09

Revision: 4400 Author: dverna URL: http://bknr.net/trac/changeset/4400 Update submissions page U trunk/projects/lisp-ecoop/website/templates/submissions.xml Modified: trunk/projects/lisp-ecoop/website/templates/submissions.xml =================================================================== --- trunk/projects/lisp-ecoop/website/templates/submissions.xml 2009-05-18 08:05:34 UTC (rev 4399) +++ trunk/projects/lisp-ecoop/website/templates/submissions.xml 2009-05-18 08:08:11 UTC (rev 4400) @@ -5,12 +5,12 @@ <h1>Submissions</h1> + + <h2>Keynote</h2> <lisp-ecoop:submission-list type="keynote"/> <h2>Papers</h2> -<p>We have accepted the following submissions.</p> - <lisp-ecoop:submission-list type="paper"/> <h2>Interactive Turorial/Demo/Coding Sessions</h2>

1 0