Merge lp:~zorba-coders/zorba/bugs-1022495-and-1022494 into lp:zorba

Proposed by Dennis Knochenwefel on 2012-07-10
Status: Merged
Approved by: Chris Hillery on 2012-09-12
Approved revision: 10927
Merged at revision: 11035
Proposed branch: lp:~zorba-coders/zorba/bugs-1022495-and-1022494
Merge into: lp:zorba
Diff against target: 490 lines (+56/-60)
39 files modified
test/rbkt/ExpQueryResults/zorba/fetch/fetch_module1.xml.res (+1/-1)
test/rbkt/ExpQueryResults/zorba/fetch/fetch_module2.xml.res (+1/-1)
test/rbkt/ExpQueryResults/zorba/versioning/schema1.xml.res (+1/-1)
test/rbkt/Queries/CMakeLists.txt (+0/-4)
test/rbkt/Queries/zorba/fetch/fetch_bogus1.xq (+1/-1)
test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq (+1/-1)
test/rbkt/Queries/zorba/fetch/fetch_module1.xq (+1/-1)
test/rbkt/Queries/zorba/fetch/fetch_module2.xq (+1/-1)
test/rbkt/Queries/zorba/fetch/fetch_random_file.xq (+1/-1)
test/rbkt/Queries/zorba/fetch/fetch_schema1.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/external1.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/external2.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import-chain1.xq (+2/-2)
test/rbkt/Queries/zorba/versioning/import-chain2.xq (+2/-2)
test/rbkt/Queries/zorba/versioning/import-chain3.xq (+2/-2)
test/rbkt/Queries/zorba/versioning/import-chain4.xq (+2/-2)
test/rbkt/Queries/zorba/versioning/import1.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import2.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import3.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import4.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import5.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import6.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/import7.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/link1.xq (+1/-1)
test/rbkt/Queries/zorba/versioning/schema1.xq (+1/-1)
test/rbkt/modules/CMakeLists.txt (+11/-11)
test/rbkt/modules/bad-ver.xq (+1/-1)
test/rbkt/modules/ext.xq (+1/-1)
test/rbkt/modules/ext.xq.src/ext.h (+1/-1)
test/rbkt/modules/ext2.xq (+1/-1)
test/rbkt/modules/ext2.xq.src/ext.h (+1/-1)
test/rbkt/modules/link.xq (+1/-1)
test/rbkt/modules/link.xq.src/link.h (+1/-1)
test/rbkt/modules/module-A.xq (+2/-2)
test/rbkt/modules/module-B.xq (+2/-2)
test/rbkt/modules/schema.xq (+2/-2)
test/rbkt/modules/schema.xsd (+2/-2)
test/rbkt/modules/ver.xq (+1/-1)
test/rbkt/modules/ver2.xq (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bugs-1022495-and-1022494
Reviewer Review Type Date Requested Status
Chris Hillery 2012-07-10 Approve on 2012-09-12
Matthias Brantner 2012-07-10 Approve on 2012-07-10
Review via email: mp+114185@code.launchpad.net

Commit message

set up a dedicated domain from which tests can fetch content. fix for bugs #1022495 and #1022494

Description of the change

fixing bugs #1022495 and #1022494

To post a comment you must log in.
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bugs-1022495-and-1022494-2012-07-10T13-16-14.485Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending.

review: Approve
Chris Hillery (ceejatec) wrote :

This doesn't test quite the same thing that it used to. Those tests were previously *valid* module URIs (that is, there actually was a module with that namespace) used in incorrect ways.

The modules in question are declared in test/rbkt/modules. In order to fix this properly, the definition of those modules and every test that makes use of them will need to be updated to the new domain name. It's not hard, but it's tedious, which is why I wanted to wait until we were sure we have an unchanging domain name to do it.

If this zorba-tests.28msec.us domain is guaranteed to be there forever, then I could probably do a global search/replace in perl pretty quickly.

review: Needs Fixing

> This doesn't test quite the same thing that it used to. Those tests were
> previously *valid* module URIs (that is, there actually was a module with that
> namespace) used in incorrect ways.
>
> The modules in question are declared in test/rbkt/modules. In order to fix
> this properly, the definition of those modules and every test that makes use
> of them will need to be updated to the new domain name. It's not hard, but
> it's tedious, which is why I wanted to wait until we were sure we have an
> unchanging domain name to do it.
>
> If this zorba-tests.28msec.us domain is guaranteed to be there forever, then I
> could probably do a global search/replace in perl pretty quickly.

I've set up this domain exclusively for zorba tests. It doesn't have a second purpose that could cause conflicting interests. Nothing is guaranteed to be there forever, but I promise to do everything I can to keep it up and running. And, as it is backed by s3, cloudfront, and route 53, it is the highest availability that can be achieved for this purpose.

10925. By Chris Hillery on 2012-09-12

Merge from trunk.

10926. By Chris Hillery on 2012-09-12

Change all test modules to use zorba-tests.28msec.us domain, which should
consistent return 404 errors for unknown URLs.

Chris Hillery (ceejatec) :
review: Approve
Chris Hillery (ceejatec) wrote :

More modules need changing, coming soon.

review: Needs Fixing
10927. By Chris Hillery on 2012-09-12

Converted the remainder of the test modules (and corresponding tests) to
http://zorba-tests.28msec.us namespaces.

Chris Hillery (ceejatec) wrote :

Should be all done now.

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bugs-1022495-and-1022494-2012-09-12T04-38-44.886Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/rbkt/ExpQueryResults/zorba/fetch/fetch_module1.xml.res'
2--- test/rbkt/ExpQueryResults/zorba/fetch/fetch_module1.xml.res 2012-09-10 22:53:04 +0000
3+++ test/rbkt/ExpQueryResults/zorba/fetch/fetch_module1.xml.res 2012-09-12 04:35:24 +0000
4@@ -1,5 +1,5 @@
5 (: Test module with external functions implemented in C++ :)
6-module namespace ext = "http://www.zorba-xquery.com/modules/ext";
7+module namespace ext = "http://zorba-tests.28msec.us/modules/ext";
8
9 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
10 declare option ver:module-version "2.0";
11
12=== modified file 'test/rbkt/ExpQueryResults/zorba/fetch/fetch_module2.xml.res'
13--- test/rbkt/ExpQueryResults/zorba/fetch/fetch_module2.xml.res 2012-09-10 22:53:04 +0000
14+++ test/rbkt/ExpQueryResults/zorba/fetch/fetch_module2.xml.res 2012-09-12 04:35:24 +0000
15@@ -1,5 +1,5 @@
16 (: Test module with external functions implemented in C++ :)
17-module namespace ext = "http://www.zorba-xquery.com/modules/ext";
18+module namespace ext = "http://zorba-tests.28msec.us/modules/ext";
19
20 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
21 declare option ver:module-version "1.0";
22
23=== modified file 'test/rbkt/ExpQueryResults/zorba/versioning/schema1.xml.res'
24--- test/rbkt/ExpQueryResults/zorba/versioning/schema1.xml.res 2012-09-10 22:53:04 +0000
25+++ test/rbkt/ExpQueryResults/zorba/versioning/schema1.xml.res 2012-09-12 04:35:24 +0000
26@@ -1,1 +1,1 @@
27-<sch:a xmlns:sch="http://www.zorba-xquery.com/modules/theschema">1</sch:a>
28+<sch:a xmlns:sch="http://zorba-tests.28msec.us/modules/theschema">1</sch:a>
29
30=== modified file 'test/rbkt/Queries/CMakeLists.txt'
31--- test/rbkt/Queries/CMakeLists.txt 2012-09-10 22:53:04 +0000
32+++ test/rbkt/Queries/CMakeLists.txt 2012-09-12 04:35:24 +0000
33@@ -558,7 +558,3 @@
34 EXPECTED_FAILURE(test/rbkt/zorba/ext_var/w3c/extvardef-014 923672) # not possible to set context item for rbkt tests
35 EXPECTED_FAILURE(test/rbkt/zorba/ext_var/w3c/extvardef-015 923686)
36 EXPECTED_FAILURE(test/rbkt/zorba/ext_var/w3c/extvardef-016 923686)
37-
38-# Failing due to flworfound.org hosting changes.
39-EXPECTED_FAILURE(test/rbkt/zorba/versioning/import5 1022495)
40-EXPECTED_FAILURE(test/rbkt/zorba/fetch/fetch_bogus2 1022494)
41
42=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_bogus1.xq'
43--- test/rbkt/Queries/zorba/fetch/fetch_bogus1.xq 2012-09-10 22:53:04 +0000
44+++ test/rbkt/Queries/zorba/fetch/fetch_bogus1.xq 2012-09-12 04:35:24 +0000
45@@ -1,4 +1,4 @@
46 (: Fetch with unknown entity kind :)
47 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
48
49-fetch:content("http://www.zorba-xquery.com/modules/ext", "NOTHING")
50+fetch:content("http://zorba-tests.28msec.us/modules/ext", "NOTHING")
51
52=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq'
53--- test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq 2012-09-10 22:53:04 +0000
54+++ test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq 2012-09-12 04:35:24 +0000
55@@ -1,4 +1,4 @@
56 (: Fetch a valid module URI but as SOME_CONTENT :)
57 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
58
59-fetch:content("http://www.flworfound.org/modules/ext", "SOME_CONTENT")
60+fetch:content("http://zorba-tests.28msec.us/modules/ext", "SOME_CONTENT")
61
62=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_module1.xq'
63--- test/rbkt/Queries/zorba/fetch/fetch_module1.xq 2012-09-10 22:53:04 +0000
64+++ test/rbkt/Queries/zorba/fetch/fetch_module1.xq 2012-09-12 04:35:24 +0000
65@@ -1,4 +1,4 @@
66 (: Fetch a module's content :)
67 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
68
69-fetch:content("http://www.zorba-xquery.com/modules/ext", "MODULE")
70+fetch:content("http://zorba-tests.28msec.us/modules/ext", "MODULE")
71
72=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_module2.xq'
73--- test/rbkt/Queries/zorba/fetch/fetch_module2.xq 2012-09-10 22:53:04 +0000
74+++ test/rbkt/Queries/zorba/fetch/fetch_module2.xq 2012-09-12 04:35:24 +0000
75@@ -1,4 +1,4 @@
76 (: Fetch a module's content with versioning :)
77 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
78
79-fetch:content("http://www.zorba-xquery.com/modules/ext#1.0", "MODULE")
80+fetch:content("http://zorba-tests.28msec.us/modules/ext#1.0", "MODULE")
81
82=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_random_file.xq'
83--- test/rbkt/Queries/zorba/fetch/fetch_random_file.xq 2012-09-10 22:53:04 +0000
84+++ test/rbkt/Queries/zorba/fetch/fetch_random_file.xq 2012-09-12 04:35:24 +0000
85@@ -1,4 +1,4 @@
86 (: Fetch a random file from the filesystem :)
87 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
88
89-fetch:content("http://www.zorba-xquery.com/random-file", "SOME_CONTENT")
90+fetch:content("http://zorba-tests.28msec.us/random-file", "SOME_CONTENT")
91
92=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_schema1.xq'
93--- test/rbkt/Queries/zorba/fetch/fetch_schema1.xq 2012-09-10 22:53:04 +0000
94+++ test/rbkt/Queries/zorba/fetch/fetch_schema1.xq 2012-09-12 04:35:24 +0000
95@@ -2,5 +2,5 @@
96 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
97
98 fn:parse-xml(
99- fetch:content("http://www.zorba-xquery.com/modules/theschema", "SCHEMA")
100+ fetch:content("http://zorba-tests.28msec.us/modules/theschema", "SCHEMA")
101 )/*:schema/*:element/@name/data()
102
103=== modified file 'test/rbkt/Queries/zorba/versioning/external1.xq'
104--- test/rbkt/Queries/zorba/versioning/external1.xq 2012-09-10 22:53:04 +0000
105+++ test/rbkt/Queries/zorba/versioning/external1.xq 2012-09-12 04:35:24 +0000
106@@ -1,5 +1,5 @@
107 (: Test for loading a module with external functions :)
108
109-import module namespace ext = "http://www.zorba-xquery.com/modules/ext";
110+import module namespace ext = "http://zorba-tests.28msec.us/modules/ext";
111
112 ext:func()
113
114=== modified file 'test/rbkt/Queries/zorba/versioning/external2.xq'
115--- test/rbkt/Queries/zorba/versioning/external2.xq 2012-09-10 22:53:04 +0000
116+++ test/rbkt/Queries/zorba/versioning/external2.xq 2012-09-12 04:35:24 +0000
117@@ -1,5 +1,5 @@
118 (: Test for loading a versioned module with external functions :)
119
120-import module namespace ext = "http://www.zorba-xquery.com/modules/ext#1.0";
121+import module namespace ext = "http://zorba-tests.28msec.us/modules/ext#1.0";
122
123 ext:func()
124
125=== modified file 'test/rbkt/Queries/zorba/versioning/import-chain1.xq'
126--- test/rbkt/Queries/zorba/versioning/import-chain1.xq 2012-09-10 22:53:04 +0000
127+++ test/rbkt/Queries/zorba/versioning/import-chain1.xq 2012-09-12 04:35:24 +0000
128@@ -1,6 +1,6 @@
129 (: Test that importing a version in the main module and a library module :)
130 (: is OK, so long as the versions don't conflict. :)
131-import module namespace vm = "http://www.flworfound.org/modules/ver#2.3";
132-import module namespace modB = "http://www.zorba-xquery.com/modules/B";
133+import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#2.3";
134+import module namespace modB = "http://zorba-tests.28msec.us/modules/B";
135
136 modB:hello()
137
138=== modified file 'test/rbkt/Queries/zorba/versioning/import-chain2.xq'
139--- test/rbkt/Queries/zorba/versioning/import-chain2.xq 2012-09-10 22:53:04 +0000
140+++ test/rbkt/Queries/zorba/versioning/import-chain2.xq 2012-09-12 04:35:24 +0000
141@@ -1,6 +1,6 @@
142 (: Test that importing a version in the main module and a library module :)
143 (: raises an error when the versions conflict. :)
144-import module namespace modA = "http://www.zorba-xquery.com/modules/A";
145-import module namespace vm = "http://www.flworfound.org/modules/ver#2.3";
146+import module namespace modA = "http://zorba-tests.28msec.us/modules/A";
147+import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#2.3";
148
149 modA:hello()
150
151=== modified file 'test/rbkt/Queries/zorba/versioning/import-chain3.xq'
152--- test/rbkt/Queries/zorba/versioning/import-chain3.xq 2012-09-10 22:53:04 +0000
153+++ test/rbkt/Queries/zorba/versioning/import-chain3.xq 2012-09-12 04:35:24 +0000
154@@ -1,7 +1,7 @@
155 (: Test that importing different versions from inside imported modules :)
156 (: raises an error when the versions conflict. :)
157 (: (At some point in the future we may actually support this case) :)
158-import module namespace modA = "http://www.zorba-xquery.com/modules/A";
159-import module namespace modB = "http://www.zorba-xquery.com/modules/B";
160+import module namespace modA = "http://zorba-tests.28msec.us/modules/A";
161+import module namespace modB = "http://zorba-tests.28msec.us/modules/B";
162
163 modA:hello(),modB:hello()
164
165=== modified file 'test/rbkt/Queries/zorba/versioning/import-chain4.xq'
166--- test/rbkt/Queries/zorba/versioning/import-chain4.xq 2012-09-10 22:53:04 +0000
167+++ test/rbkt/Queries/zorba/versioning/import-chain4.xq 2012-09-12 04:35:24 +0000
168@@ -1,7 +1,7 @@
169 (: Test that importing different versions from inside imported modules :)
170 (: raises an error when the versions conflict. :)
171 (: (At some point in the future we may actually support this case) :)
172-import module namespace modA = "http://www.zorba-xquery.com/modules/A";
173-import module namespace modB = "http://www.zorba-xquery.com/modules/B";
174+import module namespace modA = "http://zorba-tests.28msec.us/modules/A";
175+import module namespace modB = "http://zorba-tests.28msec.us/modules/B";
176
177 modA:value(),modB:value()
178
179=== modified file 'test/rbkt/Queries/zorba/versioning/import1.xq'
180--- test/rbkt/Queries/zorba/versioning/import1.xq 2012-09-10 22:53:04 +0000
181+++ test/rbkt/Queries/zorba/versioning/import1.xq 2012-09-12 04:35:24 +0000
182@@ -1,4 +1,4 @@
183 (: Test that we can import a versioned module. :)
184-import module namespace vm = "http://www.flworfound.org/modules/ver#2.1";
185+import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#2.1";
186
187 vm:hello()
188
189=== modified file 'test/rbkt/Queries/zorba/versioning/import2.xq'
190--- test/rbkt/Queries/zorba/versioning/import2.xq 2012-09-10 22:53:04 +0000
191+++ test/rbkt/Queries/zorba/versioning/import2.xq 2012-09-12 04:35:24 +0000
192@@ -1,4 +1,4 @@
193 (: Test that importing a versioned module gets the right version. :)
194-import module namespace vm = "http://www.flworfound.org/modules/ver#1.3";
195+import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#1.3";
196
197 vm:version()
198
199=== modified file 'test/rbkt/Queries/zorba/versioning/import3.xq'
200--- test/rbkt/Queries/zorba/versioning/import3.xq 2012-09-10 22:53:04 +0000
201+++ test/rbkt/Queries/zorba/versioning/import3.xq 2012-09-12 04:35:24 +0000
202@@ -1,4 +1,4 @@
203 (: Test that importing a range of versions gets the highest available. :)
204-import module namespace vm = "http://www.flworfound.org/modules/ver#1.3-2.0";
205+import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#1.3-2.0";
206
207 vm:version()
208
209=== modified file 'test/rbkt/Queries/zorba/versioning/import4.xq'
210--- test/rbkt/Queries/zorba/versioning/import4.xq 2012-09-10 22:53:04 +0000
211+++ test/rbkt/Queries/zorba/versioning/import4.xq 2012-09-12 04:35:24 +0000
212@@ -1,4 +1,4 @@
213 (: Test that importing an explicit version gets the right version. :)
214-import module namespace vm = "http://www.flworfound.org/modules/ver#2.3!";
215+import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#2.3!";
216
217 vm:version()
218
219=== modified file 'test/rbkt/Queries/zorba/versioning/import5.xq'
220--- test/rbkt/Queries/zorba/versioning/import5.xq 2012-09-10 22:53:04 +0000
221+++ test/rbkt/Queries/zorba/versioning/import5.xq 2012-09-12 04:35:24 +0000
222@@ -1,4 +1,4 @@
223 (: Test that importing a non-existent explicit version gets an error. :)
224-import module namespace vm = "http://www.flworfound.org/modules/ver#2.2!";
225+import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#2.2!";
226
227 vm:version()
228
229=== modified file 'test/rbkt/Queries/zorba/versioning/import6.xq'
230--- test/rbkt/Queries/zorba/versioning/import6.xq 2012-09-10 22:53:04 +0000
231+++ test/rbkt/Queries/zorba/versioning/import6.xq 2012-09-12 04:35:24 +0000
232@@ -1,6 +1,6 @@
233 (: Test that an exact import with non-0 patch level does not match :)
234 (: module with no patch level specified. :)
235-import module namespace vm = "http://www.flworfound.org/modules/ver#2.3.5!";
236+import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#2.3.5!";
237
238 vm:version()
239
240
241=== modified file 'test/rbkt/Queries/zorba/versioning/import7.xq'
242--- test/rbkt/Queries/zorba/versioning/import7.xq 2012-09-10 22:53:04 +0000
243+++ test/rbkt/Queries/zorba/versioning/import7.xq 2012-09-12 04:35:24 +0000
244@@ -1,5 +1,5 @@
245 (: Test importing a module with an invalid version specification :)
246
247-import module namespace bad = "http://www.flworfound.org/modules/bad-ver#1.0";
248+import module namespace bad = "http://zorba-tests.28msec.us/modules/bad-ver#1.0";
249
250 bad:version()
251
252=== modified file 'test/rbkt/Queries/zorba/versioning/link1.xq'
253--- test/rbkt/Queries/zorba/versioning/link1.xq 2012-09-10 22:53:04 +0000
254+++ test/rbkt/Queries/zorba/versioning/link1.xq 2012-09-12 04:35:24 +0000
255@@ -1,5 +1,5 @@
256 (: Test that we can load a module with external functions and link libs :)
257
258-import module namespace link = "http://www.zorba-xquery.com/modules/link#1.0";
259+import module namespace link = "http://zorba-tests.28msec.us/modules/link#1.0";
260
261 link:xerces-func(), link:our-func()
262
263=== modified file 'test/rbkt/Queries/zorba/versioning/schema1.xq'
264--- test/rbkt/Queries/zorba/versioning/schema1.xq 2012-09-10 22:53:04 +0000
265+++ test/rbkt/Queries/zorba/versioning/schema1.xq 2012-09-12 04:35:24 +0000
266@@ -1,5 +1,5 @@
267 (: Test a module that imports a schema (which aren't versioned, yet) :)
268
269-import module namespace qw="http://www.zorba-xquery.com/modules/myschema#1.0";
270+import module namespace qw="http://zorba-tests.28msec.us/modules/myschema#1.0";
271
272 qw:test()
273\ No newline at end of file
274
275=== modified file 'test/rbkt/modules/CMakeLists.txt'
276--- test/rbkt/modules/CMakeLists.txt 2012-09-10 22:53:04 +0000
277+++ test/rbkt/modules/CMakeLists.txt 2012-09-12 04:35:24 +0000
278@@ -15,34 +15,34 @@
279 # Build and install any test modules. (Parameters are scrambled about
280 # as a test for DECLARE_ZORBA_MODULE parsing them.)
281 DECLARE_ZORBA_MODULE(FILE "ver2.xq"
282- URI "http://www.flworfound.org/modules/ver" VERSION 2.3 TEST_ONLY)
283-DECLARE_ZORBA_MODULE(URI "http://www.flworfound.org/modules/ver" VERSION 1.4
284+ URI "http://zorba-tests.28msec.us/modules/ver" VERSION 2.3 TEST_ONLY)
285+DECLARE_ZORBA_MODULE(URI "http://zorba-tests.28msec.us/modules/ver" VERSION 1.4
286 FILE "${CMAKE_CURRENT_SOURCE_DIR}/ver.xq" TEST_ONLY)
287
288-DECLARE_ZORBA_MODULE(URI "http://www.flworfound.org/modules/bad-ver"
289+DECLARE_ZORBA_MODULE(URI "http://zorba-tests.28msec.us/modules/bad-ver"
290 FILE "bad-ver.xq" VERSION 1.4 TEST_ONLY)
291
292-DECLARE_ZORBA_MODULE(URI "http://www.zorba-xquery.com/modules/A" VERSION 1.0
293+DECLARE_ZORBA_MODULE(URI "http://zorba-tests.28msec.us/modules/A" VERSION 1.0
294 FILE "module-A.xq" TEST_ONLY)
295-DECLARE_ZORBA_MODULE(URI "http://www.zorba-xquery.com/modules/B" VERSION 1.0
296+DECLARE_ZORBA_MODULE(URI "http://zorba-tests.28msec.us/modules/B" VERSION 1.0
297 FILE "${CMAKE_CURRENT_SOURCE_DIR}/module-B.xq" TEST_ONLY)
298
299-DECLARE_ZORBA_MODULE(URI "http://www.zorba-xquery.com/modules/ext"
300+DECLARE_ZORBA_MODULE(URI "http://zorba-tests.28msec.us/modules/ext"
301 VERSION 2.0 FILE "ext2.xq" TEST_ONLY)
302-DECLARE_ZORBA_MODULE(URI "http://www.zorba-xquery.com/modules/ext"
303+DECLARE_ZORBA_MODULE(URI "http://zorba-tests.28msec.us/modules/ext"
304 VERSION 1.0 FILE "ext.xq" TEST_ONLY)
305
306 ADD_SUBDIRECTORY(ourlib)
307
308 # For the moment, this test module depends on Xerces
309 IF (NOT ZORBA_NO_XMLSCHEMA)
310- DECLARE_ZORBA_MODULE(URI "http://www.zorba-xquery.com/modules/link"
311+ DECLARE_ZORBA_MODULE(URI "http://zorba-tests.28msec.us/modules/link"
312 VERSION 1.0 LINK_LIBRARIES "ourlib" FILE "link.xq" TEST_ONLY)
313 ENDIF (NOT ZORBA_NO_XMLSCHEMA)
314
315-DECLARE_ZORBA_SCHEMA(URI "http://www.zorba-xquery.com/modules/theschema"
316+DECLARE_ZORBA_SCHEMA(URI "http://zorba-tests.28msec.us/modules/theschema"
317 FILE "schema.xsd" TEST_ONLY)
318-DECLARE_ZORBA_MODULE(URI "http://www.zorba-xquery.com/modules/myschema"
319+DECLARE_ZORBA_MODULE(URI "http://zorba-tests.28msec.us/modules/myschema"
320 VERSION 1.0 FILE "schema.xq" TEST_ONLY)
321
322 DECLARE_ZORBA_SCHEMA(URI "http://www.zorba-xquery.com/manifest"
323@@ -57,6 +57,6 @@
324
325 # This is as good a place as any to test this feature
326 DECLARE_ZORBA_URI_FILE(FILE "random-file.txt"
327- URI "http://www.zorba-xquery.com/random-file" TEST_ONLY)
328+ URI "http://zorba-tests.28msec.us/random-file" TEST_ONLY)
329
330 ADD_SUBDIRECTORY(java)
331
332=== modified file 'test/rbkt/modules/bad-ver.xq'
333--- test/rbkt/modules/bad-ver.xq 2012-09-10 22:53:04 +0000
334+++ test/rbkt/modules/bad-ver.xq 2012-09-12 04:35:24 +0000
335@@ -1,6 +1,6 @@
336 (: This module has an illegal version specification :)
337
338-module namespace vm = "http://www.flworfound.org/modules/bad-ver";
339+module namespace vm = "http://zorba-tests.28msec.us/modules/bad-ver";
340
341 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
342 declare option ver:module-version "1.4.";
343
344=== modified file 'test/rbkt/modules/ext.xq'
345--- test/rbkt/modules/ext.xq 2012-09-10 22:53:04 +0000
346+++ test/rbkt/modules/ext.xq 2012-09-12 04:35:24 +0000
347@@ -1,5 +1,5 @@
348 (: Test module with external functions implemented in C++ :)
349-module namespace ext = "http://www.zorba-xquery.com/modules/ext";
350+module namespace ext = "http://zorba-tests.28msec.us/modules/ext";
351
352 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
353 declare option ver:module-version "1.0";
354
355=== modified file 'test/rbkt/modules/ext.xq.src/ext.h'
356--- test/rbkt/modules/ext.xq.src/ext.h 2012-09-10 22:53:04 +0000
357+++ test/rbkt/modules/ext.xq.src/ext.h 2012-09-12 04:35:24 +0000
358@@ -37,7 +37,7 @@
359 getExternalFunction(const zorba::String& aLocalname);
360
361 virtual zorba::String
362- getURI() const { return "http://www.zorba-xquery.com/modules/ext"; }
363+ getURI() const { return "http://zorba-tests.28msec.us/modules/ext"; }
364
365 private:
366 FuncFunction* theFunc;
367
368=== modified file 'test/rbkt/modules/ext2.xq'
369--- test/rbkt/modules/ext2.xq 2012-09-10 22:53:04 +0000
370+++ test/rbkt/modules/ext2.xq 2012-09-12 04:35:24 +0000
371@@ -1,5 +1,5 @@
372 (: Test module with external functions implemented in C++ :)
373-module namespace ext = "http://www.zorba-xquery.com/modules/ext";
374+module namespace ext = "http://zorba-tests.28msec.us/modules/ext";
375
376 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
377 declare option ver:module-version "2.0";
378
379=== modified file 'test/rbkt/modules/ext2.xq.src/ext.h'
380--- test/rbkt/modules/ext2.xq.src/ext.h 2012-09-10 22:53:04 +0000
381+++ test/rbkt/modules/ext2.xq.src/ext.h 2012-09-12 04:35:24 +0000
382@@ -37,7 +37,7 @@
383 getExternalFunction(const zorba::String& aLocalname);
384
385 virtual zorba::String
386- getURI() const { return "http://www.zorba-xquery.com/modules/ext"; }
387+ getURI() const { return "http://zorba-tests.28msec.us/modules/ext"; }
388
389 private:
390 FuncFunction* theFunc;
391
392=== modified file 'test/rbkt/modules/link.xq'
393--- test/rbkt/modules/link.xq 2012-09-10 22:53:04 +0000
394+++ test/rbkt/modules/link.xq 2012-09-12 04:35:24 +0000
395@@ -1,5 +1,5 @@
396 (: Test module with external functions implemented in C++, with link libs :)
397-module namespace link = "http://www.zorba-xquery.com/modules/link";
398+module namespace link = "http://zorba-tests.28msec.us/modules/link";
399
400 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
401 declare option ver:module-version "1.0";
402
403=== modified file 'test/rbkt/modules/link.xq.src/link.h'
404--- test/rbkt/modules/link.xq.src/link.h 2012-09-10 22:53:04 +0000
405+++ test/rbkt/modules/link.xq.src/link.h 2012-09-12 04:35:24 +0000
406@@ -39,7 +39,7 @@
407 getExternalFunction(const zorba::String& aLocalname);
408
409 virtual zorba::String
410- getURI() const { return "http://www.zorba-xquery.com/modules/link"; }
411+ getURI() const { return "http://zorba-tests.28msec.us/modules/link"; }
412
413 private:
414 XercesFuncFunction* theXercesFunc;
415
416=== modified file 'test/rbkt/modules/module-A.xq'
417--- test/rbkt/modules/module-A.xq 2012-09-10 22:53:04 +0000
418+++ test/rbkt/modules/module-A.xq 2012-09-12 04:35:24 +0000
419@@ -1,8 +1,8 @@
420-module namespace modA = "http://www.zorba-xquery.com/modules/A";
421+module namespace modA = "http://zorba-tests.28msec.us/modules/A";
422
423 (: This module exists only to import a specific version of the "ver" module. :)
424
425-import module namespace vm = "http://www.flworfound.org/modules/ver#1.0";
426+import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#1.0";
427
428 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
429 declare option ver:module-version "1.0";
430
431=== modified file 'test/rbkt/modules/module-B.xq'
432--- test/rbkt/modules/module-B.xq 2012-09-10 22:53:04 +0000
433+++ test/rbkt/modules/module-B.xq 2012-09-12 04:35:24 +0000
434@@ -1,8 +1,8 @@
435-module namespace modB = "http://www.zorba-xquery.com/modules/B";
436+module namespace modB = "http://zorba-tests.28msec.us/modules/B";
437
438 (: This module exists only to import a specific version of the "ver" module. :)
439
440-import module namespace vm = "http://www.flworfound.org/modules/ver#2.0";
441+import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#2.0";
442
443 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
444 declare option ver:module-version "1.0";
445
446=== modified file 'test/rbkt/modules/schema.xq'
447--- test/rbkt/modules/schema.xq 2012-09-10 22:53:04 +0000
448+++ test/rbkt/modules/schema.xq 2012-09-12 04:35:24 +0000
449@@ -1,7 +1,7 @@
450 (: Test module with a schema :)
451-module namespace schema = "http://www.zorba-xquery.com/modules/myschema";
452+module namespace schema = "http://zorba-tests.28msec.us/modules/myschema";
453
454-import schema namespace sch = "http://www.zorba-xquery.com/modules/theschema";
455+import schema namespace sch = "http://zorba-tests.28msec.us/modules/theschema";
456
457 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
458 declare option ver:module-version "1.0";
459
460=== modified file 'test/rbkt/modules/schema.xsd'
461--- test/rbkt/modules/schema.xsd 2012-09-10 22:53:04 +0000
462+++ test/rbkt/modules/schema.xsd 2012-09-12 04:35:24 +0000
463@@ -1,5 +1,5 @@
464-<xs:schema targetNamespace="http://www.zorba-xquery.com/modules/theschema"
465- xmlns:t = "http://www.zorba-xquery.com/modules/theschema"
466+<xs:schema targetNamespace="http://zorba-tests.28msec.us/modules/theschema"
467+ xmlns:t = "http://zorba-tests.28msec.us/modules/theschema"
468 xmlns:xs="http://www.w3.org/2001/XMLSchema"
469 elementFormDefault="qualified">
470
471
472=== modified file 'test/rbkt/modules/ver.xq'
473--- test/rbkt/modules/ver.xq 2012-09-10 22:53:04 +0000
474+++ test/rbkt/modules/ver.xq 2012-09-12 04:35:24 +0000
475@@ -1,4 +1,4 @@
476-module namespace vm = "http://www.flworfound.org/modules/ver";
477+module namespace vm = "http://zorba-tests.28msec.us/modules/ver";
478
479 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
480 declare option ver:module-version "1.4.5";
481
482=== modified file 'test/rbkt/modules/ver2.xq'
483--- test/rbkt/modules/ver2.xq 2012-09-10 22:53:04 +0000
484+++ test/rbkt/modules/ver2.xq 2012-09-12 04:35:24 +0000
485@@ -1,4 +1,4 @@
486-module namespace vm = "http://www.flworfound.org/modules/ver";
487+module namespace vm = "http://zorba-tests.28msec.us/modules/ver";
488
489 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
490 declare option ver:module-version "2.3";

Subscribers

People subscribed via source and target branches