Zorba

Merge lp:~zorba-coders/zorba/bug-1210410-csv into lp:zorba/csv-module

  1. bug-1210410-csv
  2. Merge into csv-module
Proposed by Chris Hillery
Status: Merged
Merged at revision: 92
Proposed branch: lp:~zorba-coders/zorba/bug-1210410-csv
Merge into: lp:zorba/csv-module
Diff against target: 38 lines (+3/-3)
3 files modified
src/csv.xq (+1/-1)
test/Queries/converters/base64/binaryReadWrite.xq (+1/-1)
test/Queries/converters/base64/common.xqlib (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1210410-csv
Reviewer Review Type Date Requested Status
Sorin Marian Nasoi Approve
Chris Hillery Approve
Review via email: mp+179405@code.launchpad.net

Commit message

Updated options and annotations URIs to zorba.io.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1210410-csv/+merge/179405

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1210410-csv/+merge/179405

Stage "TestZorbaUbuntu" failed.
34 tests failed (8402 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/199/testReport/ to view the results.

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/csv.xq'
2--- src/csv.xq 2013-06-15 19:33:17 +0000
3+++ src/csv.xq 2013-08-09 10:11:25 +0000
4@@ -35,7 +35,7 @@
5 :)
6 import schema namespace csv-options = "http://www.zorba-xquery.com/modules/converters/csv-options";
7
8-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
9+declare namespace ver = "http://zorba.io/options/versioning";
10 declare option ver:module-version "1.0";
11
12 (:~
13
14=== modified file 'test/Queries/converters/base64/binaryReadWrite.xq'
15--- test/Queries/converters/base64/binaryReadWrite.xq 2013-07-17 07:06:44 +0000
16+++ test/Queries/converters/base64/binaryReadWrite.xq 2013-08-09 10:11:25 +0000
17@@ -5,7 +5,7 @@
18
19 import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
20
21-declare namespace an = "http://www.zorba-xquery.com/annotations";
22+declare namespace an = "http://zorba.io/annotations";
23
24 declare variable $inFile as xs:string := fn:concat(file:dir-name(fn:static-base-uri()), "/../image/images/bird.gif");
25 declare variable $testDir as xs:string := fn:concat(file:dir-name(fn:static-base-uri()),"/tmpBinaryReadWrite");
26
27=== modified file 'test/Queries/converters/base64/common.xqlib'
28--- test/Queries/converters/base64/common.xqlib 2013-08-06 14:36:42 +0000
29+++ test/Queries/converters/base64/common.xqlib 2013-08-09 10:11:25 +0000
30@@ -4,7 +4,7 @@
31
32 import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
33
34-declare namespace an = "http://www.zorba-xquery.com/annotations";
35+declare namespace an = "http://zorba.io/annotations";
36
37 declare function commons:error($messages as xs:string*) as xs:string* {
38 "

Subscribers

People subscribed via source and target branches

to all changes: