lazr.restful

Merge lp:~gary/lazr.restful/fix-wadl-root-template into lp:lazr.restful

  1. fix-wadl-root-template
  2. Merge into trunk
Proposed by Gary Poster
Status: Merged
Merged at revision: not available
Proposed branch: lp:~gary/lazr.restful/fix-wadl-root-template
Merge into: lp:lazr.restful
Diff against target: 46 lines
4 files modified
buildout.cfg (+2/-0)
src/lazr/restful/NEWS.txt (+6/-0)
src/lazr/restful/templates/wadl-root.pt (+1/-1)
src/lazr/restful/version.txt (+1/-1)
To merge this branch: bzr merge lp:~gary/lazr.restful/fix-wadl-root-template
Reviewer Review Type Date Requested Status
Paul Hummer (community) Approve
Review via email: mp+13429@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

This branch fixes the root WADL template so that hosted files have a unique id for the DELETE methods.

It also prepares for another micro-release.

The test for this problem essentially already existed: we were validating our WADL files with lxml. However, we were using libxml2 2.6.32. Karmic uses 2.7.5 at the moment, which does validate the fact that ids should be unique. To actually test for the problem, I changed lazr.restful's buildout to use the newest versions of libxml2 and libxslt. This causes the existing test to fail without the change, and to pass once the template is fixed.

The fact that the bad template passes with older versions of libxml2 also explains why the Launchpad tests for the generated WADL passed on Hardy, but fail on Karmic.

Revision history for this message
Paul Hummer (rockstar) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout.cfg'
2--- buildout.cfg 2009-04-02 15:44:00 +0000
3+++ buildout.cfg 2009-10-15 16:35:17 +0000
4@@ -35,3 +35,5 @@
5 [lxml]
6 recipe = z3c.recipe.staticlxml
7 egg = lxml
8+libxslt-url = ftp://xmlsoft.org/libxml2/libxslt-1.1.26.tar.gz
9+libxml2-url = ftp://xmlsoft.org/libxml2/libxml2-2.7.6.tar.gz
10
11=== modified file 'src/lazr/restful/NEWS.txt'
12--- src/lazr/restful/NEWS.txt 2009-10-14 20:00:07 +0000
13+++ src/lazr/restful/NEWS.txt 2009-10-15 16:35:17 +0000
14@@ -2,6 +2,12 @@
15 NEWS for lazr.restful
16 =====================
17
18+0.9.13 (2009-10-15)
19+===================
20+
21+Fixed wadl template: HostedFile DELETE method should have an id of
22+HostedFile-delete, not HostedFile-put.
23+
24 0.9.12 (2009-10-14)
25 ===================
26
27
28=== modified file 'src/lazr/restful/templates/wadl-root.pt'
29--- src/lazr/restful/templates/wadl-root.pt 2009-05-04 19:11:00 +0000
30+++ src/lazr/restful/templates/wadl-root.pt 2009-10-15 16:35:17 +0000
31@@ -318,7 +318,7 @@
32 </response>
33 </method>
34 <method name="PUT" id="HostedFile-put" />
35- <method name="DELETE" id="HostedFile-put" />
36+ <method name="DELETE" id="HostedFile-delete" />
37 </resource_type>
38
39 <!--Define a data type for binary data.-->
40
41=== modified file 'src/lazr/restful/version.txt'
42--- src/lazr/restful/version.txt 2009-10-14 16:36:13 +0000
43+++ src/lazr/restful/version.txt 2009-10-15 16:35:17 +0000
44@@ -1,1 +1,1 @@
45-0.9.12
46+0.9.13

Subscribers

People subscribed via source and target branches