Zorba

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

  1. bug-1210410-image
  2. Merge into image-module
Proposed by Chris Hillery
Status: Merged
Merged at revision: 59
Proposed branch: lp:~zorba-coders/zorba/bug-1210410-image
Merge into: lp:zorba/image-module
Diff against target: 220 lines (+17/-17)
17 files modified
src/com/zorba-xquery/www/modules/image/animation.xq (+1/-1)
src/com/zorba-xquery/www/modules/image/basic.xq (+1/-1)
src/com/zorba-xquery/www/modules/image/manipulation.xq (+1/-1)
src/com/zorba-xquery/www/modules/image/paint.xq (+1/-1)
test/Queries/image/animation.xq (+1/-1)
test/Queries/image/basic.xq (+1/-1)
test/Queries/image/manipulation_1.xq (+1/-1)
test/Queries/image/manipulation_2.xq (+1/-1)
test/Queries/image/manipulation_3.xq (+1/-1)
test/Queries/image/manipulation_4.xq (+1/-1)
test/Queries/image/manipulation_5.xq (+1/-1)
test/Queries/image/paint_1.xq (+1/-1)
test/Queries/image/paint_2.xq (+1/-1)
test/Queries/image/paint_3.xq (+1/-1)
test/Queries/image/paint_4.xq (+1/-1)
test/Queries/image/paint_5.xq (+1/-1)
test/Queries/image/paint_6.xq (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1210410-image
Reviewer Review Type Date Requested Status
Sorin Marian Nasoi Approve
Chris Hillery Approve
Review via email: mp+179377@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 succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/zorba-xquery/www/modules/image/animation.xq'
2--- src/com/zorba-xquery/www/modules/image/animation.xq 2013-06-15 19:41:03 +0000
3+++ src/com/zorba-xquery/www/modules/image/animation.xq 2013-08-09 09:47:46 +0000
4@@ -26,7 +26,7 @@
5 module namespace anim = 'http://www.zorba-xquery.com/modules/image/animation';
6
7 declare namespace ierr = "http://www.zorba-xquery.com/modules/image/error";
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 'src/com/zorba-xquery/www/modules/image/basic.xq'
15--- src/com/zorba-xquery/www/modules/image/basic.xq 2013-06-15 19:41:03 +0000
16+++ src/com/zorba-xquery/www/modules/image/basic.xq 2013-08-09 09:47:46 +0000
17@@ -49,7 +49,7 @@
18
19 declare namespace err = "http://www.w3.org/2005/xqt-errors";
20 declare namespace ierr = "http://www.zorba-xquery.com/modules/image/error";
21-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
22+declare namespace ver = "http://zorba.io/options/versioning";
23 declare namespace svg = "http://www.w3.org/2000/svg";
24 declare option ver:module-version "2.0";
25
26
27=== modified file 'src/com/zorba-xquery/www/modules/image/manipulation.xq'
28--- src/com/zorba-xquery/www/modules/image/manipulation.xq 2013-06-15 19:41:03 +0000
29+++ src/com/zorba-xquery/www/modules/image/manipulation.xq 2013-08-09 09:47:46 +0000
30@@ -50,7 +50,7 @@
31
32 declare namespace err = "http://www.w3.org/2005/xqt-errors";
33 declare namespace ierr = "http://www.zorba-xquery.com/modules/image/error";
34-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
35+declare namespace ver = "http://zorba.io/options/versioning";
36 declare option ver:module-version "1.0";
37
38 (:~
39
40=== modified file 'src/com/zorba-xquery/www/modules/image/paint.xq'
41--- src/com/zorba-xquery/www/modules/image/paint.xq 2013-06-15 19:41:03 +0000
42+++ src/com/zorba-xquery/www/modules/image/paint.xq 2013-08-09 09:47:46 +0000
43@@ -42,7 +42,7 @@
44
45 declare namespace err = "http://www.w3.org/2005/xqt-errors";
46 declare namespace ierr = "http://www.zorba-xquery.com/modules/image/error";
47-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
48+declare namespace ver = "http://zorba.io/options/versioning";
49 declare option ver:module-version "1.0";
50
51
52
53=== modified file 'test/Queries/image/animation.xq'
54--- test/Queries/image/animation.xq 2012-04-11 09:50:23 +0000
55+++ test/Queries/image/animation.xq 2013-08-09 09:47:46 +0000
56@@ -8,7 +8,7 @@
57 import module namespace ani = 'http://www.zorba-xquery.com/modules/image/animation';
58 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
59
60-declare namespace an = "http://www.zorba-xquery.com/annotations";
61+declare namespace an = "http://zorba.io/annotations";
62
63 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
64
65
66=== modified file 'test/Queries/image/basic.xq'
67--- test/Queries/image/basic.xq 2012-04-11 09:50:23 +0000
68+++ test/Queries/image/basic.xq 2013-08-09 09:47:46 +0000
69@@ -6,7 +6,7 @@
70 import module namespace basic = 'http://www.zorba-xquery.com/modules/image/basic';
71 import module namespace file = 'http://expath.org/ns/file';
72
73-declare namespace an = "http://www.zorba-xquery.com/annotations";
74+declare namespace an = "http://zorba.io/annotations";
75
76 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
77
78
79=== modified file 'test/Queries/image/manipulation_1.xq'
80--- test/Queries/image/manipulation_1.xq 2012-04-11 09:50:23 +0000
81+++ test/Queries/image/manipulation_1.xq 2013-08-09 09:47:46 +0000
82@@ -8,7 +8,7 @@
83 import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
84 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
85
86-declare namespace an = "http://www.zorba-xquery.com/annotations";
87+declare namespace an = "http://zorba.io/annotations";
88
89 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
90
91
92=== modified file 'test/Queries/image/manipulation_2.xq'
93--- test/Queries/image/manipulation_2.xq 2012-04-11 09:50:23 +0000
94+++ test/Queries/image/manipulation_2.xq 2013-08-09 09:47:46 +0000
95@@ -8,7 +8,7 @@
96 import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
97 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
98
99-declare namespace an = "http://www.zorba-xquery.com/annotations";
100+declare namespace an = "http://zorba.io/annotations";
101
102 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
103
104
105=== modified file 'test/Queries/image/manipulation_3.xq'
106--- test/Queries/image/manipulation_3.xq 2012-04-11 09:50:23 +0000
107+++ test/Queries/image/manipulation_3.xq 2013-08-09 09:47:46 +0000
108@@ -8,7 +8,7 @@
109 import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
110 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
111
112-declare namespace an = "http://www.zorba-xquery.com/annotations";
113+declare namespace an = "http://zorba.io/annotations";
114
115 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
116
117
118=== modified file 'test/Queries/image/manipulation_4.xq'
119--- test/Queries/image/manipulation_4.xq 2012-04-11 09:50:23 +0000
120+++ test/Queries/image/manipulation_4.xq 2013-08-09 09:47:46 +0000
121@@ -8,7 +8,7 @@
122 import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
123 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
124
125-declare namespace an = "http://www.zorba-xquery.com/annotations";
126+declare namespace an = "http://zorba.io/annotations";
127
128 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
129
130
131=== modified file 'test/Queries/image/manipulation_5.xq'
132--- test/Queries/image/manipulation_5.xq 2012-04-11 09:50:23 +0000
133+++ test/Queries/image/manipulation_5.xq 2013-08-09 09:47:46 +0000
134@@ -8,7 +8,7 @@
135 import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
136 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
137
138-declare namespace an = "http://www.zorba-xquery.com/annotations";
139+declare namespace an = "http://zorba.io/annotations";
140
141 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
142
143
144=== modified file 'test/Queries/image/paint_1.xq'
145--- test/Queries/image/paint_1.xq 2012-04-11 09:50:23 +0000
146+++ test/Queries/image/paint_1.xq 2013-08-09 09:47:46 +0000
147@@ -8,7 +8,7 @@
148 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
149 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
150
151-declare namespace an = "http://www.zorba-xquery.com/annotations";
152+declare namespace an = "http://zorba.io/annotations";
153
154 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
155
156
157=== modified file 'test/Queries/image/paint_2.xq'
158--- test/Queries/image/paint_2.xq 2012-04-11 09:50:23 +0000
159+++ test/Queries/image/paint_2.xq 2013-08-09 09:47:46 +0000
160@@ -8,7 +8,7 @@
161 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
162 import schema namespace img = 'http://www.zorba-xquery.com/modules/image/image';
163
164-declare namespace an = "http://www.zorba-xquery.com/annotations";
165+declare namespace an = "http://zorba.io/annotations";
166
167 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
168
169
170=== modified file 'test/Queries/image/paint_3.xq'
171--- test/Queries/image/paint_3.xq 2012-04-11 09:50:23 +0000
172+++ test/Queries/image/paint_3.xq 2013-08-09 09:47:46 +0000
173@@ -8,7 +8,7 @@
174 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
175 import schema namespace img = 'http://www.zorba-xquery.com/modules/image/image';
176
177-declare namespace an = "http://www.zorba-xquery.com/annotations";
178+declare namespace an = "http://zorba.io/annotations";
179
180 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
181
182
183=== modified file 'test/Queries/image/paint_4.xq'
184--- test/Queries/image/paint_4.xq 2012-04-11 09:50:23 +0000
185+++ test/Queries/image/paint_4.xq 2013-08-09 09:47:46 +0000
186@@ -8,7 +8,7 @@
187 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
188 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
189
190-declare namespace an = "http://www.zorba-xquery.com/annotations";
191+declare namespace an = "http://zorba.io/annotations";
192
193 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
194
195
196=== modified file 'test/Queries/image/paint_5.xq'
197--- test/Queries/image/paint_5.xq 2012-04-11 09:50:23 +0000
198+++ test/Queries/image/paint_5.xq 2013-08-09 09:47:46 +0000
199@@ -8,7 +8,7 @@
200 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
201 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
202
203-declare namespace an = "http://www.zorba-xquery.com/annotations";
204+declare namespace an = "http://zorba.io/annotations";
205
206 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
207
208
209=== modified file 'test/Queries/image/paint_6.xq'
210--- test/Queries/image/paint_6.xq 2012-04-11 09:50:23 +0000
211+++ test/Queries/image/paint_6.xq 2013-08-09 09:47:46 +0000
212@@ -8,7 +8,7 @@
213 import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
214 import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
215
216-declare namespace an = "http://www.zorba-xquery.com/annotations";
217+declare namespace an = "http://zorba.io/annotations";
218
219 declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
220 declare variable $local:jpg as xs:base64Binary := basic:create(xs:unsignedInt(100), xs:unsignedInt(100), image:imageFormat("JPEG"));

Subscribers

People subscribed via source and target branches

to all changes: