Zorba

Merge lp:~zorba-coders/zorba/bug-1189789 into lp:zorba

  1. bug-1189789
  2. Merge into trunk
Proposed by Luis Rodriguez Gonzalez
Status: Merged
Merged at revision: 11665
Proposed branch: lp:~zorba-coders/zorba/bug-1189789
Merge into: lp:zorba
Diff against target: 602 lines (+56/-56)
39 files modified
doc/zorba/xqdoc/images/modules.svg (+2/-2)
doc/zorba/xqdoc/images/modules_new.svg (+3/-3)
doc/zorba/xqdoc/src/xqdoc-html.xq (+1/-1)
doc/zorba/xqdoc/src/zorba_module_dependencies.xqy (+1/-1)
modules/com/zorba-xquery/www/modules/CMakeLists.txt (+0/-3)
modules/jsound/jsound.jq (+1/-1)
modules/uri/CMakeLists.txt (+2/-0)
modules/uri/fetch.xq (+8/-8)
modules/xqdoc/xqdoc.xq (+1/-1)
src/context/static_context.cpp (+1/-1)
src/diagnostics/diagnostic_en.xml (+1/-1)
src/diagnostics/pregenerated/dict_en.cpp (+1/-1)
src/functions/pregenerated/func_fetch.cpp (+3/-3)
src/runtime/fetch/fetch_impl.cpp (+4/-3)
src/runtime/spec/mappings.xml (+1/-1)
test/api/userdefined_uri_resolution.cpp (+2/-2)
test/rbkt/Queries/zorba/fetch/fetch_bogus1.xq (+1/-1)
test/rbkt/Queries/zorba/fetch/fetch_bogus2.spec (+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/fetch/fetch_seekable.xq (+1/-1)
test/rbkt/Queries/zorba/fetch/fetch_seekable_binary.xq (+1/-1)
test/rbkt/Queries/zorba/fetch/fetch_some_transcode.xq (+1/-1)
test/rbkt/Queries/zorba/flwor/flwor24.xq (+1/-1)
test/rbkt/Queries/zorba/flwor/flwor25.xq (+1/-1)
test/rbkt/Queries/zorba/flwor/flwor26.xq (+1/-1)
test/rbkt/Queries/zorba/flwor/flwor27.xq (+1/-1)
test/rbkt/Queries/zorba/flwor/flwor28.xq (+1/-1)
test/rbkt/Queries/zorba/jsoniq/json_doc_1.xq (+1/-1)
test/rbkt/Queries/zorba/jsound/jsound-missing-schema.spec (+1/-1)
test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-57.xq (+1/-1)
test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-31.xq (+1/-1)
test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-33.xq (+1/-1)
test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm (+1/-1)
test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq (+1/-1)
test/unit/test_static_context.cpp (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1189789
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Luis Rodriguez Gonzalez Approve
Review via email: mp+191513@code.launchpad.net

Commit message

Changes for Zorba 3.0 for Fetch module

To post a comment you must log in.
Revision history for this message
Luis Rodriguez Gonzalez (kuraru) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) :
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-1189789/+merge/191513

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-1189789/+merge/191513

Stage "BuildZorbaUbuntu" failed.

Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/437/parsed_console to view the results.

lp:~zorba-coders/zorba/bug-1189789 updated
11664. By Chris Hillery

Move fetch.xq into uri/ directory.

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-1189789/+merge/191513

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-1189789/+merge/191513

Stage "BuildZorbaUbuntu" failed.

Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/438/parsed_console to view the results.

lp:~zorba-coders/zorba/bug-1189789 updated
11665. By Chris Hillery

Remove fetch subdir.

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-1189789/+merge/191513

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-1189789/+merge/191513

Stage "TestZorbaUbuntu" failed.
2 tests failed (8576 total tests run).

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

lp:~zorba-coders/zorba/bug-1189789 updated
11666. By Chris Hillery

Fix test failures.

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-1189789/+merge/191513

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

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 'doc/zorba/xqdoc/images/modules.svg'
2--- doc/zorba/xqdoc/images/modules.svg 2013-10-16 18:45:10 +0000
3+++ doc/zorba/xqdoc/images/modules.svg 2013-10-16 22:17:59 +0000
4@@ -1776,7 +1776,7 @@
5 </g>
6 <!-- 7 -->
7 <g id="node159" class="node"><title>7</title>
8-<a xlink:href="../www.zorba-xquery.com_modules_fetch.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/fetch">
9+<a xlink:href="../www.zorba-xquery.com_modules_fetch.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/fetch">
10 <ellipse fill="white" stroke="white" cx="5860" cy="-385" rx="28.3955" ry="18"/>
11 <text text-anchor="middle" x="5860" y="-381.3" font-family="Times,serif" font-size="14.00" fill="red">fetch</text>
12 </a>
13@@ -2139,7 +2139,7 @@
14 </g>
15 <!-- 11&#45;&gt;7 -->
16 <g id="edge172" class="edge"><title>11-&gt;7</title>
17-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc, TO: http://www.zorba-xquery.com/modules/fetch">
18+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc, TO: http://zorba.io/modules/fetch">
19 <path fill="none" stroke="black" d="M1218.5,-534.086C1294.83,-527.184 1495.8,-509.973 1664,-504 1678.42,-503.488 5807.16,-504.241 5819,-496 5845.61,-477.48 5854.98,-439.5 5858.26,-413.397"/>
20 <polygon fill="black" stroke="black" points="5861.75,-413.674 5859.3,-403.366 5854.79,-412.953 5861.75,-413.674"/>
21 </a>
22
23=== modified file 'doc/zorba/xqdoc/images/modules_new.svg'
24--- doc/zorba/xqdoc/images/modules_new.svg 2013-10-16 19:15:37 +0000
25+++ doc/zorba/xqdoc/images/modules_new.svg 2013-10-16 22:17:59 +0000
26@@ -1782,7 +1782,7 @@
27 </g>
28 <!-- 5 -->
29 <g id="node159" class="node"><title>5</title>
30-<a xlink:href="../www.zorba-xquery.com_modules_fetch.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/fetch">
31+<a xlink:href="../www.zorba-xquery.com_modules_fetch.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/fetch">
32 <ellipse fill="white" stroke="white" cx="8579" cy="-407" rx="36.0624" ry="18.3848"/>
33 <text text-anchor="middle" x="8579" y="-403.4" font-family="Times Roman,serif" font-size="14.00" fill="red">fetch</text>
34 </a>
35@@ -2152,7 +2152,7 @@
36 </g>
37 <!-- 47&#45;&gt;5 -->
38 <g id="edge217" class="edge"><title>47-&gt;5</title>
39-<a xlink:title="FROM: http://zorba.io/modules/xqdoc, TO: http://www.zorba-xquery.com/modules/fetch">
40+<a xlink:title="FROM: http://zorba.io/modules/xqdoc, TO: http://zorba.io/modules/fetch">
41 <path fill="none" stroke="black" d="M1528.09,-569.535C1682.61,-563.822 2265.76,-543.017 2746,-536 2756.04,-535.853 8522.7,-533.648 8531,-528 8561.16,-507.489 8572.37,-464.752 8576.53,-435.963"/>
42 <polygon fill="black" stroke="black" points="8580.05,-436.043 8577.81,-425.688 8573.11,-435.18 8580.05,-436.043"/>
43 </a>
44@@ -2192,7 +2192,7 @@
45 </g>
46 <!-- 30&#45;&gt;5 -->
47 <g id="edge209" class="edge"><title>30-&gt;5</title>
48-<a xlink:title="FROM: http://jsound.io/modules/validate, TO: http://www.zorba-xquery.com/modules/fetch">
49+<a xlink:title="FROM: http://jsound.io/modules/validate, TO: http://zorba.io/modules/fetch">
50 <path fill="none" stroke="black" d="M9400.37,-567.144C9346.58,-559.55 9221.07,-542.803 9115,-536 9101.47,-535.132 8638.15,-535.708 8627,-528 8597,-507.263 8585.75,-464.585 8581.53,-435.871"/>
51 <polygon fill="black" stroke="black" points="8584.96,-435.105 8580.23,-425.624 8578.02,-435.984 8584.96,-435.105"/>
52 </a>
53
54=== modified file 'doc/zorba/xqdoc/src/xqdoc-html.xq'
55--- doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-07 23:26:13 +0000
56+++ doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-16 22:17:59 +0000
57@@ -17,7 +17,7 @@
58
59 import module namespace xqdoc = "http://zorba.io/modules/xqdoc";
60 import module namespace batch = "http://www.zorba-xquery.com/modules/xqdoc/batch";
61-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
62+import module namespace fetch = "http://zorba.io/modules/fetch";
63 import module namespace xqdoc-html = "http://www.zorba-xquery.com/xqdoc-html" at "xqdoc-html.xqy";
64
65 declare namespace xqd = "http://www.xqdoc.org/1.0";
66
67=== modified file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqy'
68--- doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-10-07 23:26:13 +0000
69+++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-10-16 22:17:59 +0000
70@@ -28,7 +28,7 @@
71
72 import module namespace dot = "http://www.zorba-xquery.com/modules/image/graphviz";
73 import module namespace xqd = "http://zorba.io/modules/xqdoc";
74-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
75+import module namespace fetch = "http://zorba.io/modules/fetch";
76 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
77 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
78 import module namespace menu = "http://www.zorba-xquery.com/modules/xqdoc/menu";
79
80=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
81--- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-16 18:45:10 +0000
82+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-16 22:17:59 +0000
83@@ -12,9 +12,6 @@
84 # See the License for the specific language governing permissions and
85 # limitations under the License.
86
87-DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
88- URI "http://www.zorba-xquery.com/modules/fetch")
89-
90 # Subdirectories
91
92 DECLARE_ZORBA_MODULE(FILE store/documents/dynamic.xq VERSION 2.0
93
94=== modified file 'modules/jsound/jsound.jq'
95--- modules/jsound/jsound.jq 2013-10-05 00:14:23 +0000
96+++ modules/jsound/jsound.jq 2013-10-16 22:17:59 +0000
97@@ -28,7 +28,7 @@
98
99 import module namespace jn = "http://jsoniq.org/functions";
100 import module namespace map = "http://jsound.io/modules/validate/map";
101-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
102+import module namespace fetch = "http://zorba.io/modules/fetch";
103
104 declare namespace an = "http://zorba.io/annotations";
105 declare namespace ver = "http://zorba.io/options/versioning";
106
107=== modified file 'modules/uri/CMakeLists.txt'
108--- modules/uri/CMakeLists.txt 2013-10-15 23:27:57 +0000
109+++ modules/uri/CMakeLists.txt 2013-10-16 22:17:59 +0000
110@@ -14,3 +14,5 @@
111
112 DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0
113 URI "http://zorba.io/modules/uri")
114+DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 1.0
115+ URI "http://zorba.io/modules/fetch")
116
117=== renamed file 'modules/com/zorba-xquery/www/modules/fetch.xq' => 'modules/uri/fetch.xq'
118--- modules/com/zorba-xquery/www/modules/fetch.xq 2013-09-26 23:15:11 +0000
119+++ modules/uri/fetch.xq 2013-10-16 22:17:59 +0000
120@@ -29,14 +29,14 @@
121 :
122 : @project Zorba/Input Output/Fetch
123 :)
124-module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
125+module namespace fetch = "http://zorba.io/modules/fetch";
126
127 declare namespace an = "http://zorba.io/annotations";
128
129 declare namespace zerr = "http://zorba.io/errors";
130
131 declare namespace ver = "http://zorba.io/options/versioning";
132-declare option ver:module-version "2.1";
133+declare option ver:module-version "1.0";
134
135 (:~
136 : <p>Tries to fetch the resource referred to by the given URI.</p>
137@@ -49,7 +49,7 @@
138 : @param $uri the resource to fetch.
139 : @return the resource referred to by the given URI as streamble string.
140 :
141- : @error zerr:ZXQP0025 if the URI could not be resolved
142+ : @error uri:URI_UNRESOLVED_OR_NOSTREAM if the URI could not be resolved
143 : or did not resolve to a <tt>StreamResource</tt>.
144 :
145 : @see <a href="../zorba/uriresolvers.html">URI Resolvers</a>.
146@@ -72,7 +72,7 @@
147 : @param $entity-kind the kind of resource to fetch.
148 : @return the resource referred to by the given URI as streamble string.
149 :
150- : @error zerr:ZXQP0025 if the URI could not be resolved
151+ : @error uri:URI_NOT_RESOLVED_OR_NOSTREAM if the URI could not be resolved
152 : or did not resolve to a <tt>StreamResource</tt>.
153 :
154 : @see <a href="../zorba/uriresolvers.html">URI Resolvers</a>.
155@@ -95,9 +95,9 @@
156 : @param $encoding the encoding of the content
157 : @return the resource referred to by the given URI as streamble string.
158 :
159- : @error zerr:ZXQP0025 if the URI could not be resolved
160+ : @error uri:URI_UNRESOLVED_OR_NOSTREAM if the URI could not be resolved
161 : or did not resolve to a <tt>StreamResource</tt>.
162- : @error zerr:ZXQP0006 if the given encoding is invalid or not supported.
163+ : @error uri:CHARSET_UNKNOWN if the given encoding is invalid or not supported.
164 :
165 : @see <a href="../zorba/uriresolvers.html">URI Resolvers</a>.
166 : @see <a href="../zorba/options_and_annotations.html">Documentation of Zorba's annotations</a>.
167@@ -118,7 +118,7 @@
168 : @param $uri the resource to fetch.
169 : @return the resource referred to by the given URI as streamble base64Binary.
170 :
171- : @error zerr:ZXQP0025 if the URI could not be resolved
172+ : @error uri:URI_UNRESOLVED_OR_NOSTREAM if the URI could not be resolved
173 : or did not resolve to a <tt>StreamResource</tt>.
174 :)
175 declare %an:streamable function fetch:content-binary($uri as xs:string)
176@@ -138,7 +138,7 @@
177 : @param $entity-kind the kind of resource to fetch.
178 : @return the resource referred to by the given URI as streamble base64Binary.
179 :
180- : @error zerr:ZXQP0025 if the URI could not be resolved
181+ : @error uri:URI_UNRESOLVED_OR_NOSTREAM if the URI could not be resolved
182 : or did not resolve to a <tt>StreamResource</tt>.
183 :)
184 declare %an:streamable function fetch:content-binary(
185
186=== modified file 'modules/xqdoc/xqdoc.xq'
187--- modules/xqdoc/xqdoc.xq 2013-10-07 23:26:13 +0000
188+++ modules/xqdoc/xqdoc.xq 2013-10-16 22:17:59 +0000
189@@ -61,7 +61,7 @@
190 :)
191 module namespace xqd = "http://zorba.io/modules/xqdoc";
192
193-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
194+import module namespace fetch = "http://zorba.io/modules/fetch";
195 import module namespace schema = "http://zorba.io/modules/schema";
196
197 import schema namespace opt =
198
199=== modified file 'src/context/static_context.cpp'
200--- src/context/static_context.cpp 2013-10-16 18:45:10 +0000
201+++ src/context/static_context.cpp 2013-10-16 22:17:59 +0000
202@@ -464,7 +464,7 @@
203
204 const char*
205 static_context::ZORBA_FETCH_FN_NS =
206-"http://www.zorba-xquery.com/modules/fetch";
207+"http://zorba.io/modules/fetch";
208
209 const char*
210 static_context::ZORBA_NODE_FN_NS =
211
212=== modified file 'src/diagnostics/diagnostic_en.xml'
213--- src/diagnostics/diagnostic_en.xml 2013-10-15 23:27:57 +0000
214+++ src/diagnostics/diagnostic_en.xml 2013-10-16 22:17:59 +0000
215@@ -3697,7 +3697,7 @@
216
217 <diagnostic code="URI_UNRESOLVED_OR_NOSTREAM">
218 <comment>If the stream is unresolved or is not an stream.</comment>
219- <value>the stream is unresolved or it is not a stream</value>
220+ <value>"$1": stream is unresolved or it is not a stream - "$2"</value>
221 </diagnostic>
222
223 </namespace>
224
225=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
226--- src/diagnostics/pregenerated/dict_en.cpp 2013-10-15 23:27:57 +0000
227+++ src/diagnostics/pregenerated/dict_en.cpp 2013-10-16 22:17:59 +0000
228@@ -152,7 +152,7 @@
229 { "SESU0013", "\"$1\": unsupported $2 version; supported versions are: $3" },
230 { "UNKNOWN_LOCALE", "\"$1\": unknown locale" },
231 { "UNSUPPORTED_LOCALE", "\"$1\": unsupported locale" },
232- { "URI_UNRESOLVED_OR_NOSTREAM", "the stream is unresolved or it is not a stream" },
233+ { "URI_UNRESOLVED_OR_NOSTREAM", "\"$1\": stream is unresolved or it is not a stream - \"$2\"" },
234 { "XPDY0002", "$1" },
235 { "XPDY0050", "\"$1\" cannot be treated as type $2" },
236 { "XPST0001", "${\"1\": }undefined value${: 2}" },
237
238=== modified file 'src/functions/pregenerated/func_fetch.cpp'
239--- src/functions/pregenerated/func_fetch.cpp 2013-03-05 23:11:50 +0000
240+++ src/functions/pregenerated/func_fetch.cpp 2013-10-16 22:17:59 +0000
241@@ -67,7 +67,7 @@
242
243 {
244 DECL_WITH_KIND(sctx, fn_zorba_fetch_content,
245- (createQName("http://www.zorba-xquery.com/modules/fetch","","content"),
246+ (createQName("http://zorba.io/modules/fetch","","content"),
247 GENV_TYPESYSTEM.STRING_TYPE_ONE,
248 GENV_TYPESYSTEM.STRING_TYPE_ONE,
249 GENV_TYPESYSTEM.STRING_TYPE_ONE,
250@@ -81,7 +81,7 @@
251
252 {
253 DECL_WITH_KIND(sctx, fn_zorba_fetch_content_binary,
254- (createQName("http://www.zorba-xquery.com/modules/fetch","","content-binary"),
255+ (createQName("http://zorba.io/modules/fetch","","content-binary"),
256 GENV_TYPESYSTEM.STRING_TYPE_ONE,
257 GENV_TYPESYSTEM.STRING_TYPE_ONE,
258 GENV_TYPESYSTEM.BASE64BINARY_TYPE_ONE),
259@@ -94,7 +94,7 @@
260
261 {
262 DECL_WITH_KIND(sctx, fn_zorba_fetch_content_type,
263- (createQName("http://www.zorba-xquery.com/modules/fetch","","content-type"),
264+ (createQName("http://zorba.io/modules/fetch","","content-type"),
265 GENV_TYPESYSTEM.STRING_TYPE_ONE,
266 GENV_TYPESYSTEM.STRING_TYPE_ONE),
267 FunctionConsts::FN_ZORBA_FETCH_CONTENT_TYPE_1);
268
269=== modified file 'src/runtime/fetch/fetch_impl.cpp'
270--- src/runtime/fetch/fetch_impl.cpp 2013-09-17 21:12:49 +0000
271+++ src/runtime/fetch/fetch_impl.cpp 2013-10-16 22:17:59 +0000
272@@ -17,6 +17,7 @@
273
274 #include <zorba/util/transcode_stream.h>
275 #include <zorba/internal/unique_ptr.h>
276+#include <zorba/diagnostic_list.h>
277
278 #include "diagnostics/assert.h"
279 #include "diagnostics/xquery_diagnostics.h"
280@@ -84,7 +85,7 @@
281 if ( !lStreamRes.get() )
282 {
283 throw XQUERY_EXCEPTION(
284- zerr::ZXQP0025_COULD_NOT_FETCH_RESOURCE,
285+ zuri::URI_UNRESOLVED_OR_NOSTREAM,
286 ERROR_PARAMS(
287 aUri->getStringValue(),
288 ZED(ZXQP0025_RESOURCE_NOT_FOUND)
289@@ -99,7 +100,7 @@
290
291 } catch (ZorbaException const& e) {
292 throw XQUERY_EXCEPTION(
293- zerr::ZXQP0025_COULD_NOT_FETCH_RESOURCE,
294+ zuri::URI_UNRESOLVED_OR_NOSTREAM,
295 ERROR_PARAMS( aUri->getStringValue(), e.what() ),
296 ERROR_LOC( aLoc )
297 );
298@@ -141,7 +142,7 @@
299 if (!transcode::is_supported(lEncodingStr.c_str()))
300 {
301 throw XQUERY_EXCEPTION(
302- zerr::ZXQP0006_UNKNOWN_ENCODING,
303+ zuri::CHARSET_UNKNOWN,
304 ERROR_PARAMS( lEncodingStr.c_str() ),
305 ERROR_LOC( loc )
306 );
307
308=== modified file 'src/runtime/spec/mappings.xml'
309--- src/runtime/spec/mappings.xml 2013-10-16 18:45:10 +0000
310+++ src/runtime/spec/mappings.xml 2013-10-16 22:17:59 +0000
311@@ -122,7 +122,7 @@
312 define="ZORBA_JSON_XML_FN_NS"
313 prefix="fn-zorba-json"/>
314
315- <zorba:namespace uri="http://www.zorba-xquery.com/modules/fetch"
316+ <zorba:namespace uri="http://zorba.io/modules/fetch"
317 define="ZORBA_FETCH_FN_NS"
318 prefix="fn-zorba-fetch"/>
319
320
321=== modified file 'test/api/userdefined_uri_resolution.cpp'
322--- test/api/userdefined_uri_resolution.cpp 2013-08-14 08:46:44 +0000
323+++ test/api/userdefined_uri_resolution.cpp 2013-10-16 22:17:59 +0000
324@@ -84,7 +84,7 @@
325 {
326 // Deny access to an URI that would otherwise work
327 if(aUri == "http://zorbatest.lambda.nu:8080/tutorial/helloworld.xsd" ||
328- aUri == "http://www.zorba-xquery.com/modules/fetch" ||
329+ aUri == "http://zorba.io/modules/fetch" ||
330 aUri == "http://expath.org/ns/file") {
331 oUris.push_back(URIMapper::DENY_ACCESS);
332 }
333@@ -272,7 +272,7 @@
334 try {
335 XQuery_t lQuery = aZorba->compileQuery
336 ("import module namespace fetch = "
337- "'http://www.zorba-xquery.com/modules/fetch'; "
338+ "'http://zorba.io/modules/fetch'; "
339 "1 + 1", lContext);
340 std::cout << lQuery << std::endl;
341 } catch (ZorbaException& e) {
342
343=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_bogus1.xq'
344--- test/rbkt/Queries/zorba/fetch/fetch_bogus1.xq 2013-02-07 17:24:36 +0000
345+++ test/rbkt/Queries/zorba/fetch/fetch_bogus1.xq 2013-10-16 22:17:59 +0000
346@@ -1,4 +1,4 @@
347 (: Fetch with unknown entity kind :)
348-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
349+import module namespace fetch = "http://zorba.io/modules/fetch";
350
351 fetch:content("http://zorba-tests.28msec.us/modules/ext", "NOTHING")
352
353=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_bogus2.spec'
354--- test/rbkt/Queries/zorba/fetch/fetch_bogus2.spec 2013-08-07 05:28:39 +0000
355+++ test/rbkt/Queries/zorba/fetch/fetch_bogus2.spec 2013-10-16 22:17:59 +0000
356@@ -1,1 +1,1 @@
357-Error: http://zorba.io/errors:ZXQP0025
358+Error: http://zorba.io/modules/uri:URI_UNRESOLVED_OR_NOSTREAM
359
360=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq'
361--- test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq 2013-02-07 17:24:36 +0000
362+++ test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq 2013-10-16 22:17:59 +0000
363@@ -1,4 +1,4 @@
364 (: Fetch a valid module URI but as SOME_CONTENT :)
365-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
366+import module namespace fetch = "http://zorba.io/modules/fetch";
367
368 fetch:content("http://zorba-tests.28msec.us/modules/ext", "SOME_CONTENT")
369
370=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_module1.xq'
371--- test/rbkt/Queries/zorba/fetch/fetch_module1.xq 2013-02-07 17:24:36 +0000
372+++ test/rbkt/Queries/zorba/fetch/fetch_module1.xq 2013-10-16 22:17:59 +0000
373@@ -1,4 +1,4 @@
374 (: Fetch a module's content :)
375-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
376+import module namespace fetch = "http://zorba.io/modules/fetch";
377
378 fetch:content("http://zorba-tests.28msec.us/modules/ext", "MODULE")
379
380=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_module2.xq'
381--- test/rbkt/Queries/zorba/fetch/fetch_module2.xq 2013-02-07 17:24:36 +0000
382+++ test/rbkt/Queries/zorba/fetch/fetch_module2.xq 2013-10-16 22:17:59 +0000
383@@ -1,4 +1,4 @@
384 (: Fetch a module's content with versioning :)
385-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
386+import module namespace fetch = "http://zorba.io/modules/fetch";
387
388 fetch:content("http://zorba-tests.28msec.us/modules/ext#1.0", "MODULE")
389
390=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_random_file.xq'
391--- test/rbkt/Queries/zorba/fetch/fetch_random_file.xq 2013-02-07 17:24:36 +0000
392+++ test/rbkt/Queries/zorba/fetch/fetch_random_file.xq 2013-10-16 22:17:59 +0000
393@@ -1,4 +1,4 @@
394 (: Fetch a random file from the filesystem :)
395-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
396+import module namespace fetch = "http://zorba.io/modules/fetch";
397
398 fetch:content("http://zorba-tests.28msec.us/random-file", "SOME_CONTENT")
399
400=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_schema1.xq'
401--- test/rbkt/Queries/zorba/fetch/fetch_schema1.xq 2013-02-07 17:24:36 +0000
402+++ test/rbkt/Queries/zorba/fetch/fetch_schema1.xq 2013-10-16 22:17:59 +0000
403@@ -1,5 +1,5 @@
404 (: Fetch a schemas's content :)
405-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
406+import module namespace fetch = "http://zorba.io/modules/fetch";
407
408 fn:parse-xml(
409 fetch:content("http://zorba-tests.28msec.us/modules/theschema", "SCHEMA")
410
411=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_seekable.xq'
412--- test/rbkt/Queries/zorba/fetch/fetch_seekable.xq 2013-06-25 04:43:41 +0000
413+++ test/rbkt/Queries/zorba/fetch/fetch_seekable.xq 2013-10-16 22:17:59 +0000
414@@ -1,4 +1,4 @@
415-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
416+import module namespace fetch = "http://zorba.io/modules/fetch";
417
418 import module namespace s = "http://zorba.io/modules/string";
419
420
421=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_seekable_binary.xq'
422--- test/rbkt/Queries/zorba/fetch/fetch_seekable_binary.xq 2013-07-17 07:20:31 +0000
423+++ test/rbkt/Queries/zorba/fetch/fetch_seekable_binary.xq 2013-10-16 22:17:59 +0000
424@@ -1,4 +1,4 @@
425-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
426+import module namespace fetch = "http://zorba.io/modules/fetch";
427
428 import module namespace b = "http://zorba.io/modules/base64";
429
430
431=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_some_transcode.xq'
432--- test/rbkt/Queries/zorba/fetch/fetch_some_transcode.xq 2012-05-09 21:48:57 +0000
433+++ test/rbkt/Queries/zorba/fetch/fetch_some_transcode.xq 2013-10-16 22:17:59 +0000
434@@ -1,3 +1,3 @@
435-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
436+import module namespace fetch = "http://zorba.io/modules/fetch";
437
438 fetch:content(resolve-uri("iso-8859-1.txt"), "SOME_CONTENT", "ISO-8859-1")
439
440=== modified file 'test/rbkt/Queries/zorba/flwor/flwor24.xq'
441--- test/rbkt/Queries/zorba/flwor/flwor24.xq 2013-08-14 12:56:35 +0000
442+++ test/rbkt/Queries/zorba/flwor/flwor24.xq 2013-10-16 22:17:59 +0000
443@@ -1,6 +1,6 @@
444 import module namespace parse-xml = "http://zorba.io/modules/xml";
445 import schema namespace opt = "http://zorba.io/modules/xml-options";
446-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
447+import module namespace fetch = "http://zorba.io/modules/fetch";
448
449 declare namespace an = "http://zorba.io/annotations";
450
451
452=== modified file 'test/rbkt/Queries/zorba/flwor/flwor25.xq'
453--- test/rbkt/Queries/zorba/flwor/flwor25.xq 2013-08-14 12:56:35 +0000
454+++ test/rbkt/Queries/zorba/flwor/flwor25.xq 2013-10-16 22:17:59 +0000
455@@ -1,6 +1,6 @@
456 import module namespace parse-xml = "http://zorba.io/modules/xml";
457 import schema namespace opt = "http://zorba.io/modules/xml-options";
458-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
459+import module namespace fetch = "http://zorba.io/modules/fetch";
460
461 declare namespace an = "http://zorba.io/annotations";
462 declare namespace ext = "http://zorba.io/extensions";
463
464=== modified file 'test/rbkt/Queries/zorba/flwor/flwor26.xq'
465--- test/rbkt/Queries/zorba/flwor/flwor26.xq 2013-08-14 12:56:35 +0000
466+++ test/rbkt/Queries/zorba/flwor/flwor26.xq 2013-10-16 22:17:59 +0000
467@@ -1,6 +1,6 @@
468 import module namespace parse-xml = "http://zorba.io/modules/xml";
469 import schema namespace opt = "http://zorba.io/modules/xml-options";
470-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
471+import module namespace fetch = "http://zorba.io/modules/fetch";
472 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
473 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
474
475
476=== modified file 'test/rbkt/Queries/zorba/flwor/flwor27.xq'
477--- test/rbkt/Queries/zorba/flwor/flwor27.xq 2013-08-14 12:56:35 +0000
478+++ test/rbkt/Queries/zorba/flwor/flwor27.xq 2013-10-16 22:17:59 +0000
479@@ -1,6 +1,6 @@
480 import module namespace parse-xml = "http://zorba.io/modules/xml";
481 import schema namespace opt = "http://zorba.io/modules/xml-options";
482-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
483+import module namespace fetch = "http://zorba.io/modules/fetch";
484
485 declare namespace an = "http://zorba.io/annotations";
486 declare namespace ext = "http://zorba.io/extensions";
487
488=== modified file 'test/rbkt/Queries/zorba/flwor/flwor28.xq'
489--- test/rbkt/Queries/zorba/flwor/flwor28.xq 2013-08-14 20:37:19 +0000
490+++ test/rbkt/Queries/zorba/flwor/flwor28.xq 2013-10-16 22:17:59 +0000
491@@ -1,6 +1,6 @@
492 import module namespace parse-xml = "http://zorba.io/modules/xml";
493 import schema namespace opt = "http://zorba.io/modules/xml-options";
494-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
495+import module namespace fetch = "http://zorba.io/modules/fetch";
496 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
497 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
498
499
500=== modified file 'test/rbkt/Queries/zorba/jsoniq/json_doc_1.xq'
501--- test/rbkt/Queries/zorba/jsoniq/json_doc_1.xq 2013-08-14 15:16:42 +0000
502+++ test/rbkt/Queries/zorba/jsoniq/json_doc_1.xq 2013-10-16 22:17:59 +0000
503@@ -1,5 +1,5 @@
504
505-import module namespace fetch="http://www.zorba-xquery.com/modules/fetch";
506+import module namespace fetch="http://zorba.io/modules/fetch";
507
508 import module namespace file="http://expath.org/ns/file";
509
510
511=== modified file 'test/rbkt/Queries/zorba/jsound/jsound-missing-schema.spec'
512--- test/rbkt/Queries/zorba/jsound/jsound-missing-schema.spec 2013-10-02 22:40:32 +0000
513+++ test/rbkt/Queries/zorba/jsound/jsound-missing-schema.spec 2013-10-16 22:17:59 +0000
514@@ -1,1 +1,1 @@
515-Error: http://zorba.io/errors:ZXQP0025
516+Error: http://zorba.io/modules/uri:URI_UNRESOLVED_OR_NOSTREAM
517\ No newline at end of file
518
519=== modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-57.xq'
520--- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-57.xq 2013-07-24 09:06:02 +0000
521+++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-57.xq 2013-10-16 22:17:59 +0000
522@@ -1,6 +1,6 @@
523 import module namespace parse-xml = "http://zorba.io/modules/xml";
524 import schema namespace opt = "http://zorba.io/modules/xml-options";
525-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
526+import module namespace fetch = "http://zorba.io/modules/fetch";
527
528 variable $xmlcontents := fetch:content(resolve-uri("bad.xml"));
529
530
531=== modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-31.xq'
532--- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-31.xq 2013-07-24 09:06:02 +0000
533+++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-31.xq 2013-10-16 22:17:59 +0000
534@@ -2,7 +2,7 @@
535 Test x:parse() with streamable input
536 :)
537
538-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
539+import module namespace fetch = "http://zorba.io/modules/fetch";
540 import module namespace x = "http://zorba.io/modules/xml";
541 import schema namespace opt = "http://zorba.io/modules/xml-options";
542
543
544=== modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-33.xq'
545--- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-33.xq 2013-07-24 09:06:02 +0000
546+++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-33.xq 2013-10-16 22:17:59 +0000
547@@ -1,6 +1,6 @@
548 import module namespace x = "http://zorba.io/modules/xml";
549 import schema namespace opt = "http://zorba.io/modules/xml-options";
550-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
551+import module namespace fetch = "http://zorba.io/modules/fetch";
552
553 variable $xmlcontents := fetch:content(resolve-uri("wiki.xml"));
554
555
556=== modified file 'test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm'
557--- test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2013-10-16 18:45:10 +0000
558+++ test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2013-10-16 22:17:59 +0000
559@@ -391,7 +391,7 @@
560 </sup>
561 </li>
562 <li>
563- <a href="www.zorba-xquery.com_modules_fetch.html" title="http://www.zorba-xquery.com/modules/fetch">fetch</a>
564+ <a href="www.zorba-xquery.com_modules_fetch.html" title="http://zorba.io/modules/fetch">fetch</a>
565 <sup>
566 <a href="http://www.w3.org/TR/xquery-30/#dt-external-function" target="_blank" title="There are external functions (either private or public) declared in this module.">(E)</a>
567 </sup>
568
569=== modified file 'test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq'
570--- test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq 2013-10-07 23:26:13 +0000
571+++ test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq 2013-10-16 22:17:59 +0000
572@@ -2,7 +2,7 @@
573
574 import module namespace file = "http://expath.org/ns/file";
575 import module namespace xqd = "http://zorba.io/modules/xqdoc";
576-import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
577+import module namespace fetch = "http://zorba.io/modules/fetch";
578
579 import schema namespace xqdoc = "http://www.xqdoc.org/1.0";
580
581
582=== modified file 'test/unit/test_static_context.cpp'
583--- test/unit/test_static_context.cpp 2013-06-15 02:57:08 +0000
584+++ test/unit/test_static_context.cpp 2013-10-16 22:17:59 +0000
585@@ -73,7 +73,7 @@
586
587 try
588 {
589- Item lFetched = lSctx->fetch("http://www.zorba-xquery.com/modules/fetch", "MODULE");
590+ Item lFetched = lSctx->fetch("http://zorba.io/modules/fetch", "MODULE");
591
592 return !lFetched.isNull();
593 }
594@@ -128,7 +128,7 @@
595
596 try
597 {
598- Item lFetched = lSctx->fetchBinary("http://www.zorba-xquery.com/modules/fetch", "MODULE");
599+ Item lFetched = lSctx->fetchBinary("http://zorba.io/modules/fetch", "MODULE");
600
601 size_t s;
602 return !lFetched.isNull() && lFetched.getBase64BinaryValue(s);

Subscribers

People subscribed via source and target branches