Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1189789 into lp:zorba.
Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189789/+merge/191513 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189789/+merge/191513 Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'doc/zorba/xqdoc/images/modules.svg' --- doc/zorba/xqdoc/images/modules.svg 2013-10-16 18:45:10 +0000 +++ doc/zorba/xqdoc/images/modules.svg 2013-10-16 21:50:22 +0000 @@ -1776,7 +1776,7 @@ </g> <!-- 7 --> <g id="node159" class="node"><title>7</title> -<a xlink:href="../www.zorba-xquery.com_modules_fetch.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/fetch";> +<a xlink:href="../www.zorba-xquery.com_modules_fetch.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/fetch";> <ellipse fill="white" stroke="white" cx="5860" cy="-385" rx="28.3955" ry="18"/> <text text-anchor="middle" x="5860" y="-381.3" font-family="Times,serif" font-size="14.00" fill="red">fetch</text> </a> @@ -2139,7 +2139,7 @@ </g> <!-- 11->7 --> <g id="edge172" class="edge"><title>11->7</title> -<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc, TO: http://www.zorba-xquery.com/modules/fetch";> +<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc, TO: http://zorba.io/modules/fetch";> <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"/> <polygon fill="black" stroke="black" points="5861.75,-413.674 5859.3,-403.366 5854.79,-412.953 5861.75,-413.674"/> </a> === modified file 'doc/zorba/xqdoc/images/modules_new.svg' --- doc/zorba/xqdoc/images/modules_new.svg 2013-10-16 19:15:37 +0000 +++ doc/zorba/xqdoc/images/modules_new.svg 2013-10-16 21:50:22 +0000 @@ -1782,7 +1782,7 @@ </g> <!-- 5 --> <g id="node159" class="node"><title>5</title> -<a xlink:href="../www.zorba-xquery.com_modules_fetch.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/fetch";> +<a xlink:href="../www.zorba-xquery.com_modules_fetch.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/fetch";> <ellipse fill="white" stroke="white" cx="8579" cy="-407" rx="36.0624" ry="18.3848"/> <text text-anchor="middle" x="8579" y="-403.4" font-family="Times Roman,serif" font-size="14.00" fill="red">fetch</text> </a> @@ -2152,7 +2152,7 @@ </g> <!-- 47->5 --> <g id="edge217" class="edge"><title>47->5</title> -<a xlink:title="FROM: http://zorba.io/modules/xqdoc, TO: http://www.zorba-xquery.com/modules/fetch";> +<a xlink:title="FROM: http://zorba.io/modules/xqdoc, TO: http://zorba.io/modules/fetch";> <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"/> <polygon fill="black" stroke="black" points="8580.05,-436.043 8577.81,-425.688 8573.11,-435.18 8580.05,-436.043"/> </a> @@ -2192,7 +2192,7 @@ </g> <!-- 30->5 --> <g id="edge209" class="edge"><title>30->5</title> -<a xlink:title="FROM: http://jsound.io/modules/validate, TO: http://www.zorba-xquery.com/modules/fetch";> +<a xlink:title="FROM: http://jsound.io/modules/validate, TO: http://zorba.io/modules/fetch";> <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"/> <polygon fill="black" stroke="black" points="8584.96,-435.105 8580.23,-425.624 8578.02,-435.984 8584.96,-435.105"/> </a> === modified file 'doc/zorba/xqdoc/src/xqdoc-html.xq' --- doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-07 23:26:13 +0000 +++ doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-16 21:50:22 +0000 @@ -17,7 +17,7 @@ import module namespace xqdoc = "http://zorba.io/modules/xqdoc";; import module namespace batch = "http://www.zorba-xquery.com/modules/xqdoc/batch";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; import module namespace xqdoc-html = "http://www.zorba-xquery.com/xqdoc-html"; at "xqdoc-html.xqy"; declare namespace xqd = "http://www.xqdoc.org/1.0";; === modified file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqy' --- doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-10-07 23:26:13 +0000 +++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-10-16 21:50:22 +0000 @@ -28,7 +28,7 @@ import module namespace dot = "http://www.zorba-xquery.com/modules/image/graphviz";; import module namespace xqd = "http://zorba.io/modules/xqdoc";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";; import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";; import module namespace menu = "http://www.zorba-xquery.com/modules/xqdoc/menu";; === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-10-16 18:45:10 +0000 +++ modules/CMakeLists.txt 2013-10-16 21:50:22 +0000 @@ -17,6 +17,7 @@ ADD_SUBDIRECTORY(full-text) ADD_SUBDIRECTORY(functx) ADD_SUBDIRECTORY(dateTime) +ADD_SUBDIRECTORY(fetch) ADD_SUBDIRECTORY(http-client) ADD_SUBDIRECTORY(item) ADD_SUBDIRECTORY(json) === modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt' --- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-16 18:45:10 +0000 +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-16 21:50:22 +0000 @@ -12,9 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0 - URI "http://www.zorba-xquery.com/modules/fetch";) - # Subdirectories DECLARE_ZORBA_MODULE(FILE store/documents/dynamic.xq VERSION 2.0 === added directory 'modules/fetch' === renamed file 'modules/com/zorba-xquery/www/modules/fetch.xq' => 'modules/fetch/fetch.xq' --- modules/com/zorba-xquery/www/modules/fetch.xq 2013-09-26 23:15:11 +0000 +++ modules/fetch/fetch.xq 2013-10-16 21:50:22 +0000 @@ -29,14 +29,14 @@ : : @project Zorba/Input Output/Fetch :) -module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +module namespace fetch = "http://zorba.io/modules/fetch";; declare namespace an = "http://zorba.io/annotations";; declare namespace zerr = "http://zorba.io/errors";; declare namespace ver = "http://zorba.io/options/versioning";; -declare option ver:module-version "2.1"; +declare option ver:module-version "1.0"; (:~ : <p>Tries to fetch the resource referred to by the given URI.</p> @@ -49,7 +49,7 @@ : @param $uri the resource to fetch. : @return the resource referred to by the given URI as streamble string. : - : @error zerr:ZXQP0025 if the URI could not be resolved + : @error uri:URI_UNRESOLVED_OR_NOSTREAM if the URI could not be resolved : or did not resolve to a <tt>StreamResource</tt>. : : @see <a href="../zorba/uriresolvers.html">URI Resolvers</a>. @@ -72,7 +72,7 @@ : @param $entity-kind the kind of resource to fetch. : @return the resource referred to by the given URI as streamble string. : - : @error zerr:ZXQP0025 if the URI could not be resolved + : @error uri:URI_NOT_RESOLVED_OR_NOSTREAM if the URI could not be resolved : or did not resolve to a <tt>StreamResource</tt>. : : @see <a href="../zorba/uriresolvers.html">URI Resolvers</a>. @@ -95,9 +95,9 @@ : @param $encoding the encoding of the content : @return the resource referred to by the given URI as streamble string. : - : @error zerr:ZXQP0025 if the URI could not be resolved + : @error uri:URI_UNRESOLVED_OR_NOSTREAM if the URI could not be resolved : or did not resolve to a <tt>StreamResource</tt>. - : @error zerr:ZXQP0006 if the given encoding is invalid or not supported. + : @error uri:CHARSET_UNKNOWN if the given encoding is invalid or not supported. : : @see <a href="../zorba/uriresolvers.html">URI Resolvers</a>. : @see <a href="../zorba/options_and_annotations.html">Documentation of Zorba's annotations</a>. @@ -118,7 +118,7 @@ : @param $uri the resource to fetch. : @return the resource referred to by the given URI as streamble base64Binary. : - : @error zerr:ZXQP0025 if the URI could not be resolved + : @error uri:URI_UNRESOLVED_OR_NOSTREAM if the URI could not be resolved : or did not resolve to a <tt>StreamResource</tt>. :) declare %an:streamable function fetch:content-binary($uri as xs:string) @@ -138,7 +138,7 @@ : @param $entity-kind the kind of resource to fetch. : @return the resource referred to by the given URI as streamble base64Binary. : - : @error zerr:ZXQP0025 if the URI could not be resolved + : @error uri:URI_UNRESOLVED_OR_NOSTREAM if the URI could not be resolved : or did not resolve to a <tt>StreamResource</tt>. :) declare %an:streamable function fetch:content-binary( === modified file 'modules/jsound/jsound.jq' --- modules/jsound/jsound.jq 2013-10-05 00:14:23 +0000 +++ modules/jsound/jsound.jq 2013-10-16 21:50:22 +0000 @@ -28,7 +28,7 @@ import module namespace jn = "http://jsoniq.org/functions";; import module namespace map = "http://jsound.io/modules/validate/map";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; declare namespace an = "http://zorba.io/annotations";; declare namespace ver = "http://zorba.io/options/versioning";; === modified file 'modules/xqdoc/xqdoc.xq' --- modules/xqdoc/xqdoc.xq 2013-10-07 23:26:13 +0000 +++ modules/xqdoc/xqdoc.xq 2013-10-16 21:50:22 +0000 @@ -61,7 +61,7 @@ :) module namespace xqd = "http://zorba.io/modules/xqdoc";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; import module namespace schema = "http://zorba.io/modules/schema";; import schema namespace opt = === modified file 'src/context/static_context.cpp' --- src/context/static_context.cpp 2013-10-16 18:45:10 +0000 +++ src/context/static_context.cpp 2013-10-16 21:50:22 +0000 @@ -464,7 +464,7 @@ const char* static_context::ZORBA_FETCH_FN_NS = -"http://www.zorba-xquery.com/modules/fetch";; +"http://zorba.io/modules/fetch";; const char* static_context::ZORBA_NODE_FN_NS = === modified file 'src/diagnostics/diagnostic_en.xml' --- src/diagnostics/diagnostic_en.xml 2013-10-15 23:27:57 +0000 +++ src/diagnostics/diagnostic_en.xml 2013-10-16 21:50:22 +0000 @@ -3697,7 +3697,7 @@ <diagnostic code="URI_UNRESOLVED_OR_NOSTREAM"> <comment>If the stream is unresolved or is not an stream.</comment> - <value>the stream is unresolved or it is not a stream</value> + <value>"$1": stream is unresolved or it is not a stream - "$2"</value> </diagnostic> </namespace> === modified file 'src/functions/pregenerated/func_fetch.cpp' --- src/functions/pregenerated/func_fetch.cpp 2013-03-05 23:11:50 +0000 +++ src/functions/pregenerated/func_fetch.cpp 2013-10-16 21:50:22 +0000 @@ -67,7 +67,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_fetch_content, - (createQName("http://www.zorba-xquery.com/modules/fetch","","content";), + (createQName("http://zorba.io/modules/fetch","","content";), GENV_TYPESYSTEM.STRING_TYPE_ONE, GENV_TYPESYSTEM.STRING_TYPE_ONE, GENV_TYPESYSTEM.STRING_TYPE_ONE, @@ -81,7 +81,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_fetch_content_binary, - (createQName("http://www.zorba-xquery.com/modules/fetch","","content-binary";), + (createQName("http://zorba.io/modules/fetch","","content-binary";), GENV_TYPESYSTEM.STRING_TYPE_ONE, GENV_TYPESYSTEM.STRING_TYPE_ONE, GENV_TYPESYSTEM.BASE64BINARY_TYPE_ONE), @@ -94,7 +94,7 @@ { DECL_WITH_KIND(sctx, fn_zorba_fetch_content_type, - (createQName("http://www.zorba-xquery.com/modules/fetch","","content-type";), + (createQName("http://zorba.io/modules/fetch","","content-type";), GENV_TYPESYSTEM.STRING_TYPE_ONE, GENV_TYPESYSTEM.STRING_TYPE_ONE), FunctionConsts::FN_ZORBA_FETCH_CONTENT_TYPE_1); === modified file 'src/runtime/fetch/fetch_impl.cpp' --- src/runtime/fetch/fetch_impl.cpp 2013-09-17 21:12:49 +0000 +++ src/runtime/fetch/fetch_impl.cpp 2013-10-16 21:50:22 +0000 @@ -17,6 +17,7 @@ #include <zorba/util/transcode_stream.h> #include <zorba/internal/unique_ptr.h> +#include <zorba/diagnostic_list.h> #include "diagnostics/assert.h" #include "diagnostics/xquery_diagnostics.h" @@ -84,7 +85,7 @@ if ( !lStreamRes.get() ) { throw XQUERY_EXCEPTION( - zerr::ZXQP0025_COULD_NOT_FETCH_RESOURCE, + zuri::URI_UNRESOLVED_OR_NOSTREAM, ERROR_PARAMS( aUri->getStringValue(), ZED(ZXQP0025_RESOURCE_NOT_FOUND) @@ -99,7 +100,7 @@ } catch (ZorbaException const& e) { throw XQUERY_EXCEPTION( - zerr::ZXQP0025_COULD_NOT_FETCH_RESOURCE, + zuri::URI_UNRESOLVED_OR_NOSTREAM, ERROR_PARAMS( aUri->getStringValue(), e.what() ), ERROR_LOC( aLoc ) ); @@ -141,7 +142,7 @@ if (!transcode::is_supported(lEncodingStr.c_str())) { throw XQUERY_EXCEPTION( - zerr::ZXQP0006_UNKNOWN_ENCODING, + zuri::CHARSET_UNKNOWN, ERROR_PARAMS( lEncodingStr.c_str() ), ERROR_LOC( loc ) ); === modified file 'src/runtime/spec/mappings.xml' --- src/runtime/spec/mappings.xml 2013-10-16 18:45:10 +0000 +++ src/runtime/spec/mappings.xml 2013-10-16 21:50:22 +0000 @@ -122,7 +122,7 @@ define="ZORBA_JSON_XML_FN_NS" prefix="fn-zorba-json"/> - <zorba:namespace uri="http://www.zorba-xquery.com/modules/fetch"; + <zorba:namespace uri="http://zorba.io/modules/fetch"; define="ZORBA_FETCH_FN_NS" prefix="fn-zorba-fetch"/> === modified file 'test/api/userdefined_uri_resolution.cpp' --- test/api/userdefined_uri_resolution.cpp 2013-08-14 08:46:44 +0000 +++ test/api/userdefined_uri_resolution.cpp 2013-10-16 21:50:22 +0000 @@ -84,7 +84,7 @@ { // Deny access to an URI that would otherwise work if(aUri == "http://zorbatest.lambda.nu:8080/tutorial/helloworld.xsd"; || - aUri == "http://www.zorba-xquery.com/modules/fetch"; || + aUri == "http://zorba.io/modules/fetch"; || aUri == "http://expath.org/ns/file";) { oUris.push_back(URIMapper::DENY_ACCESS); } @@ -272,7 +272,7 @@ try { XQuery_t lQuery = aZorba->compileQuery ("import module namespace fetch = " - "'http://www.zorba-xquery.com/modules/fetch'; " + "'http://zorba.io/modules/fetch'; " "1 + 1", lContext); std::cout << lQuery << std::endl; } catch (ZorbaException& e) { === modified file 'test/rbkt/Queries/zorba/fetch/fetch_bogus1.xq' --- test/rbkt/Queries/zorba/fetch/fetch_bogus1.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/fetch/fetch_bogus1.xq 2013-10-16 21:50:22 +0000 @@ -1,4 +1,4 @@ (: Fetch with unknown entity kind :) -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; fetch:content("http://zorba-tests.28msec.us/modules/ext";, "NOTHING") === modified file 'test/rbkt/Queries/zorba/fetch/fetch_bogus2.spec' --- test/rbkt/Queries/zorba/fetch/fetch_bogus2.spec 2013-08-07 05:28:39 +0000 +++ test/rbkt/Queries/zorba/fetch/fetch_bogus2.spec 2013-10-16 21:50:22 +0000 @@ -1,1 +1,1 @@ -Error: http://zorba.io/errors:ZXQP0025 +Error: http://zorba.io/modules/uri:URI_UNRESOLVED_OR_NOSTREAM === modified file 'test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq' --- test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq 2013-10-16 21:50:22 +0000 @@ -1,4 +1,4 @@ (: Fetch a valid module URI but as SOME_CONTENT :) -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; fetch:content("http://zorba-tests.28msec.us/modules/ext";, "SOME_CONTENT") === modified file 'test/rbkt/Queries/zorba/fetch/fetch_module1.xq' --- test/rbkt/Queries/zorba/fetch/fetch_module1.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/fetch/fetch_module1.xq 2013-10-16 21:50:22 +0000 @@ -1,4 +1,4 @@ (: Fetch a module's content :) -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; fetch:content("http://zorba-tests.28msec.us/modules/ext";, "MODULE") === modified file 'test/rbkt/Queries/zorba/fetch/fetch_module2.xq' --- test/rbkt/Queries/zorba/fetch/fetch_module2.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/fetch/fetch_module2.xq 2013-10-16 21:50:22 +0000 @@ -1,4 +1,4 @@ (: Fetch a module's content with versioning :) -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; fetch:content("http://zorba-tests.28msec.us/modules/ext#1.0";, "MODULE") === modified file 'test/rbkt/Queries/zorba/fetch/fetch_random_file.xq' --- test/rbkt/Queries/zorba/fetch/fetch_random_file.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/fetch/fetch_random_file.xq 2013-10-16 21:50:22 +0000 @@ -1,4 +1,4 @@ (: Fetch a random file from the filesystem :) -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; fetch:content("http://zorba-tests.28msec.us/random-file";, "SOME_CONTENT") === modified file 'test/rbkt/Queries/zorba/fetch/fetch_schema1.xq' --- test/rbkt/Queries/zorba/fetch/fetch_schema1.xq 2013-02-07 17:24:36 +0000 +++ test/rbkt/Queries/zorba/fetch/fetch_schema1.xq 2013-10-16 21:50:22 +0000 @@ -1,5 +1,5 @@ (: Fetch a schemas's content :) -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; fn:parse-xml( fetch:content("http://zorba-tests.28msec.us/modules/theschema";, "SCHEMA") === modified file 'test/rbkt/Queries/zorba/fetch/fetch_seekable.xq' --- test/rbkt/Queries/zorba/fetch/fetch_seekable.xq 2013-06-25 04:43:41 +0000 +++ test/rbkt/Queries/zorba/fetch/fetch_seekable.xq 2013-10-16 21:50:22 +0000 @@ -1,4 +1,4 @@ -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; import module namespace s = "http://zorba.io/modules/string";; === modified file 'test/rbkt/Queries/zorba/fetch/fetch_seekable_binary.xq' --- test/rbkt/Queries/zorba/fetch/fetch_seekable_binary.xq 2013-07-17 07:20:31 +0000 +++ test/rbkt/Queries/zorba/fetch/fetch_seekable_binary.xq 2013-10-16 21:50:22 +0000 @@ -1,4 +1,4 @@ -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; import module namespace b = "http://zorba.io/modules/base64";; === modified file 'test/rbkt/Queries/zorba/fetch/fetch_some_transcode.xq' --- test/rbkt/Queries/zorba/fetch/fetch_some_transcode.xq 2012-05-09 21:48:57 +0000 +++ test/rbkt/Queries/zorba/fetch/fetch_some_transcode.xq 2013-10-16 21:50:22 +0000 @@ -1,3 +1,3 @@ -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; fetch:content(resolve-uri("iso-8859-1.txt"), "SOME_CONTENT", "ISO-8859-1") === modified file 'test/rbkt/Queries/zorba/flwor/flwor24.xq' --- test/rbkt/Queries/zorba/flwor/flwor24.xq 2013-08-14 12:56:35 +0000 +++ test/rbkt/Queries/zorba/flwor/flwor24.xq 2013-10-16 21:50:22 +0000 @@ -1,6 +1,6 @@ import module namespace parse-xml = "http://zorba.io/modules/xml";; import schema namespace opt = "http://zorba.io/modules/xml-options";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; declare namespace an = "http://zorba.io/annotations";; === modified file 'test/rbkt/Queries/zorba/flwor/flwor25.xq' --- test/rbkt/Queries/zorba/flwor/flwor25.xq 2013-08-14 12:56:35 +0000 +++ test/rbkt/Queries/zorba/flwor/flwor25.xq 2013-10-16 21:50:22 +0000 @@ -1,6 +1,6 @@ import module namespace parse-xml = "http://zorba.io/modules/xml";; import schema namespace opt = "http://zorba.io/modules/xml-options";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; declare namespace an = "http://zorba.io/annotations";; declare namespace ext = "http://zorba.io/extensions";; === modified file 'test/rbkt/Queries/zorba/flwor/flwor26.xq' --- test/rbkt/Queries/zorba/flwor/flwor26.xq 2013-08-14 12:56:35 +0000 +++ test/rbkt/Queries/zorba/flwor/flwor26.xq 2013-10-16 21:50:22 +0000 @@ -1,6 +1,6 @@ import module namespace parse-xml = "http://zorba.io/modules/xml";; import schema namespace opt = "http://zorba.io/modules/xml-options";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";; import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";; === modified file 'test/rbkt/Queries/zorba/flwor/flwor27.xq' --- test/rbkt/Queries/zorba/flwor/flwor27.xq 2013-08-14 12:56:35 +0000 +++ test/rbkt/Queries/zorba/flwor/flwor27.xq 2013-10-16 21:50:22 +0000 @@ -1,6 +1,6 @@ import module namespace parse-xml = "http://zorba.io/modules/xml";; import schema namespace opt = "http://zorba.io/modules/xml-options";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; declare namespace an = "http://zorba.io/annotations";; declare namespace ext = "http://zorba.io/extensions";; === modified file 'test/rbkt/Queries/zorba/flwor/flwor28.xq' --- test/rbkt/Queries/zorba/flwor/flwor28.xq 2013-08-14 20:37:19 +0000 +++ test/rbkt/Queries/zorba/flwor/flwor28.xq 2013-10-16 21:50:22 +0000 @@ -1,6 +1,6 @@ import module namespace parse-xml = "http://zorba.io/modules/xml";; import schema namespace opt = "http://zorba.io/modules/xml-options";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";; import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";; === modified file 'test/rbkt/Queries/zorba/jsoniq/json_doc_1.xq' --- test/rbkt/Queries/zorba/jsoniq/json_doc_1.xq 2013-08-14 15:16:42 +0000 +++ test/rbkt/Queries/zorba/jsoniq/json_doc_1.xq 2013-10-16 21:50:22 +0000 @@ -1,5 +1,5 @@ -import module namespace fetch="http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch="http://zorba.io/modules/fetch";; import module namespace file="http://expath.org/ns/file";; === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-57.xq' --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-57.xq 2013-07-24 09:06:02 +0000 +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-fragment-skip-root-57.xq 2013-10-16 21:50:22 +0000 @@ -1,6 +1,6 @@ import module namespace parse-xml = "http://zorba.io/modules/xml";; import schema namespace opt = "http://zorba.io/modules/xml-options";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; variable $xmlcontents := fetch:content(resolve-uri("bad.xml")); === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-31.xq' --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-31.xq 2013-07-24 09:06:02 +0000 +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-31.xq 2013-10-16 21:50:22 +0000 @@ -2,7 +2,7 @@ Test x:parse() with streamable input :) -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; import module namespace x = "http://zorba.io/modules/xml";; import schema namespace opt = "http://zorba.io/modules/xml-options";; === modified file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-33.xq' --- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-33.xq 2013-07-24 09:06:02 +0000 +++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-33.xq 2013-10-16 21:50:22 +0000 @@ -1,6 +1,6 @@ import module namespace x = "http://zorba.io/modules/xml";; import schema namespace opt = "http://zorba.io/modules/xml-options";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; variable $xmlcontents := fetch:content(resolve-uri("wiki.xml")); === modified file 'test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm' --- test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2013-10-16 18:45:10 +0000 +++ test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2013-10-16 21:50:22 +0000 @@ -391,7 +391,7 @@ </sup> </li> <li> - <a href="www.zorba-xquery.com_modules_fetch.html" title="http://www.zorba-xquery.com/modules/fetch";>fetch</a> + <a href="www.zorba-xquery.com_modules_fetch.html" title="http://zorba.io/modules/fetch";>fetch</a> <sup> <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> </sup> === modified file 'test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq' --- test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq 2013-10-07 23:26:13 +0000 +++ test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq 2013-10-16 21:50:22 +0000 @@ -2,7 +2,7 @@ import module namespace file = "http://expath.org/ns/file";; import module namespace xqd = "http://zorba.io/modules/xqdoc";; -import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; +import module namespace fetch = "http://zorba.io/modules/fetch";; import schema namespace xqdoc = "http://www.xqdoc.org/1.0";; === modified file 'test/unit/test_static_context.cpp' --- test/unit/test_static_context.cpp 2013-06-15 02:57:08 +0000 +++ test/unit/test_static_context.cpp 2013-10-16 21:50:22 +0000 @@ -73,7 +73,7 @@ try { - Item lFetched = lSctx->fetch("http://www.zorba-xquery.com/modules/fetch";, "MODULE"); + Item lFetched = lSctx->fetch("http://zorba.io/modules/fetch";, "MODULE"); return !lFetched.isNull(); } @@ -128,7 +128,7 @@ try { - Item lFetched = lSctx->fetchBinary("http://www.zorba-xquery.com/modules/fetch";, "MODULE"); + Item lFetched = lSctx->fetchBinary("http://zorba.io/modules/fetch";, "MODULE"); size_t s; return !lFetched.isNull() && lFetched.getBase64BinaryValue(s);
-- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
