Merge lp:~zorba-coders/zorba/zorba-errors into lp:zorba

[Chris Hillery]

Corrected zorba errors/warnings URIs.

https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-stack/+merge/178883
https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-queue/+merge/178884

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/zorba-errors/+merge/178885
https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-stack/+merge/178883
https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-queue/+merge/178884

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

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/zorba-errors/+merge/178885 :
Votes: {'Approve': 1}

https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-stack/+merge/178883 :
Votes: {'Approve': 1}

https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-queue/+merge/178884 :
Votes: {'Approve': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/zorba-errors/+merge/178885

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/104/console to view the results.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/zorba-errors/+merge/178885
https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-stack/+merge/178883
https://code.launchpad.net/~zorba-coders/zorba/zorba-errors-queue/+merge/178884

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'doc/zorba/errors_warnings.dox'
--- doc/zorba/errors_warnings.dox	2013-06-28 00:56:53 +0000
+++ doc/zorba/errors_warnings.dox	2013-08-07 05:36:24 +0000
@@ -9,12 +9,12 @@
 Moreover, errors may be raised by any of the host language APIs.
 Each such error is identified by a QName.
 Most of the errors are defined by any of the XQuery specifications (e.g. XQuery 1.0 or 3.0, XQuery Update, or XQuery Full Text) and contained in the XPath and XQuery error namespace (http://www.w3.org/2005/xqt-errors).
-In addition, Zorba defines a set of errors in the %http://zorba.io/modules/zorba-errors namespace.
+In addition, Zorba defines a set of errors in the %http://zorba.io/errors namespace.
 
 A full list of potential errors can be found in the diagnostic_list.h header (<tt>err</tt> and <tt>zerr</tt> namespaces) of the C++ API and in the following XQuery modules:
 
 <ul>
-  <li><a href="../xqdoc/modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a></li>
+  <li><a href="../xqdoc/modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a></li>
   <li><a href="../xqdoc/xhtml/www.w3.org_2005_xqt-errors.html">http://www.w3.org/2005/xqt-errors</a></li>
 </ul>
 
@@ -25,8 +25,8 @@
 
 In addition to the errors mentioned in the previous section, Zorba may raise warnings during the static analysis phase of the query.
 Warnings are diagnostic messages that report constructions which are not inherently erroneous but which are risky or suggest there may have been an error.
-Like an error, a warning is identified by a QName whose namespace is %http://zorba.io/modules/zorba-warnings.
-A list of warnings can be found in the diagnostic_list.h header (zwarn namespace) of the C++ API and in the <a href="../xqdoc/modules_http:__zorba.io_modules_zorba-warnings.html">http://zorba.io/modules/zorba-warnings</a> module.
+Like an error, a warning is identified by a QName whose namespace is %http://zorba.io/warnings.
+A list of warnings can be found in the diagnostic_list.h header (zwarn namespace) of the C++ API and in the <a href="../xqdoc/modules_http:__zorba.io_modules_zorba-warnings.html">http://zorba.io/warnings</a> module.
 
 A warning can be enabled (i.e. will be reported), disabled (i.e. will not be reported), or turned into an error (i.e. an error with the same name will be raised) by specifying options in the static context that is used to compile the query (zorba::StaticContext::declareOption) or in the prolog of an XQuery module.
 
@@ -34,7 +34,7 @@
 
 \code
   declare namespace op = "http://www.zorba-xquery.com/options/warnings";
-  declare namespace w = "http://zorba.io/modules/zorba-warnings";
+  declare namespace w = "http://zorba.io/warnings";
 
   declare option op:error "w:all";
 \endcode
@@ -131,13 +131,13 @@
 </table>
 
 where the \c zerr prefix
-is bound to the namespace \c %http://zorba.io/modules/zorba-errors
+is bound to the namespace \c %http://zorba.io/errors
 and "data file" refers to the file that data is being read from,
 e.g., the result of reading XML (<tt>fn:doc</tt>) or JSON data.
 For example, the query:
 
 \code
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare function local:bar()
 {
@@ -160,7 +160,7 @@
 returns the following result:
 
 \code
-<stack xmlns="http://zorba.io/modules/zorba-errors">
+<stack xmlns="http://zorba.io/errors">
   <entry>
     <function namespace="http://www.w3.org/2005/xquery-local-functions" localname="bar" arity="0"/>
     <location name="filename.xq" line-begin="10" line-end="10" column-begin="3" column-end="14"/>

=== modified file 'doc/zorba/impl_dep_features.dox'
--- doc/zorba/impl_dep_features.dox	2013-06-28 00:56:53 +0000
+++ doc/zorba/impl_dep_features.dox	2013-08-07 05:36:24 +0000
@@ -51,7 +51,7 @@
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
     <td>Any components of the static context or dynamic context that are overwritten or augmented by the implementation.</td>
-    <td>The following static context components are overwritten/augmented: 1. Statically known namespaces: Augmented with zerr –&gt; <a href="http://www.zorba-xquery.com/html/modules/zorba/errors">http://zorba.io/modules/zorba-errors</a> 2. Context item static type: item() 3. Default order for empty sequences: empty_greatest 4. Static Base URI: We use the rules in 4.5, where the implementation-defined default mentioned there is http://www.zorba-xquery.com, 5. Statically known default collection type: item()*</td>
+    <td>The following static context components are overwritten/augmented: 1. Statically known namespaces: Augmented with zerr –&gt; <a href="http://www.zorba-xquery.com/html/modules/zorba/errors">http://zorba.io/errors</a> 2. Context item static type: item() 3. Default order for empty sequences: empty_greatest 4. Static Base URI: We use the rules in 4.5, where the implementation-defined default mentioned there is http://www.zorba-xquery.com, 5. Statically known default collection type: item()*</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
@@ -508,7 +508,7 @@
     <td>W3C XQuery 1.0</td>
     <td>Statically known namespaces</td>
     <td>static</td>
-    <td>fn –&gt; http://www.w3.org/2005/xpath-functions, xml –&gt; http://www.w3.org/XML/1998/namespace, xs –&gt; http://www.w3.org/2001/XMLSchema, xsi –&gt; http://www.w3.org/2001/XMLSchema-instance, local –&gt; http://www.w3.org/2005/xquery-local-functions, zerr –&gt; http://zorba.io/modules/zorba-errors</td>
+    <td>fn –&gt; http://www.w3.org/2005/xpath-functions, xml –&gt; http://www.w3.org/XML/1998/namespace, xs –&gt; http://www.w3.org/2001/XMLSchema, xsi –&gt; http://www.w3.org/2001/XMLSchema-instance, local –&gt; http://www.w3.org/2005/xquery-local-functions, zerr –&gt; http://zorba.io/errors</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>

=== modified file 'doc/zorba/options.dox'
--- doc/zorba/options.dox	2013-07-02 20:39:38 +0000
+++ doc/zorba/options.dox	2013-08-07 05:36:24 +0000
@@ -157,13 +157,13 @@
 
 \code
   declare namespace op = "http://www.zorba-xquery.com/options/warnings";
-  declare namespace w = "http://zorba.io/modules/zorba-warnings";
+  declare namespace w = "http://zorba.io/warnings";
 
   declare option op:error "w:all";
 \endcode
 
 If a given warning doesn't specify a prefix, the name is resolved against the 
-default warning namespace <tt>http://zorba.io/modules/zorba-warnings</tt>. All 
+default warning namespace <tt>http://zorba.io/warnings</tt>. All 
 Zorba specific warnings are defined in this namespace. A comprehensive list 
 of warnings is contained at the end of the C++ header file diagnostic_list.h.
 

=== modified file 'doc/zorba/xqddf.dox'
--- doc/zorba/xqddf.dox	2013-06-25 03:55:20 +0000
+++ doc/zorba/xqddf.dox	2013-08-07 05:36:24 +0000
@@ -2285,7 +2285,7 @@
 
 \section error_summary Appendix Error Summary
 
-The prefix "zerr" is bound to the error namespace of Zorba, i.e. %http://zorba.io/modules/zorba-errors .
+The prefix "zerr" is bound to the error namespace of Zorba, i.e. %http://zorba.io/errors .
 The prefix "err" is bound to the general XQuery error namespace, i.e. http://www.w3.org/2005/xqt-errors .
 
 <p>XQuery Data Definition Facility - Static Errors:</p>

=== modified file 'doc/zorba/xqdoc/images/modules.svg'
--- doc/zorba/xqdoc/images/modules.svg	2013-07-17 16:38:58 +0000
+++ doc/zorba/xqdoc/images/modules.svg	2013-08-07 05:36:24 +0000
@@ -2066,14 +2066,14 @@
 </g>
 <!-- 38 -->
 <g id="node219" class="node"><title>38</title>
-<a xlink:href="../modules_zorba_Zorba Error Codes.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/zorba-errors">
+<a xlink:href="../modules_zorba_Zorba Error Codes.html" xlink:title="(Zorba-core) module uri=http://zorba.io/errors">
 <ellipse fill="white" stroke="white" cx="479" cy="-447" rx="31.2965" ry="18"/>
 <text text-anchor="middle" x="479" y="-443.3" font-family="Times,serif" font-size="14.00" fill="red">errors</text>
 </a>
 </g>
 <!-- 39 -->
 <g id="node221" class="node"><title>39</title>
-<a xlink:href="../modules_zorba_Zorba Warning Codes.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/zorba-warnings">
+<a xlink:href="../modules_zorba_Zorba Warning Codes.html" xlink:title="(Zorba-core) module uri=http://zorba.io/warnings">
 <ellipse fill="white" stroke="white" cx="343" cy="-447" rx="42.3456" ry="18"/>
 <text text-anchor="middle" x="343" y="-443.3" font-family="Times,serif" font-size="14.00" fill="red">warnings</text>
 </a>

=== modified file 'doc/zorba/xqdoc/images/modules_new.svg'
--- doc/zorba/xqdoc/images/modules_new.svg	2013-07-12 07:48:15 +0000
+++ doc/zorba/xqdoc/images/modules_new.svg	2013-08-07 05:36:24 +0000
@@ -2066,14 +2066,14 @@
 </g>
 <!-- 38 -->
 <g id="node219" class="node"><title>38</title>
-<a xlink:href="../modules_zorba_Zorba Error Codes.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/zorba-errors">
+<a xlink:href="../modules_zorba_Zorba Error Codes.html" xlink:title="(Zorba-core) module uri=http://zorba.io/errors">
 <ellipse fill="white" stroke="white" cx="479" cy="-447" rx="31.2965" ry="18"/>
 <text text-anchor="middle" x="479" y="-443.3" font-family="Times,serif" font-size="14.00" fill="red">errors</text>
 </a>
 </g>
 <!-- 39 -->
 <g id="node221" class="node"><title>39</title>
-<a xlink:href="../modules_zorba_Zorba Warning Codes.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/zorba-warnings">
+<a xlink:href="../modules_zorba_Zorba Warning Codes.html" xlink:title="(Zorba-core) module uri=http://zorba.io/warnings">
 <ellipse fill="white" stroke="white" cx="343" cy="-447" rx="42.3456" ry="18"/>
 <text text-anchor="middle" x="343" y="-443.3" font-family="Times,serif" font-size="14.00" fill="red">warnings</text>
 </a>

=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt	2013-07-26 20:43:25 +0000
+++ modules/CMakeLists.txt	2013-08-07 05:36:24 +0000
@@ -185,9 +185,9 @@
 
 # error and warning modules
 DECLARE_ZORBA_MODULE( FILE pregenerated/zorba-errors.xq
-  URI "http://zorba.io/modules/zorba-errors" )
+  URI "http://zorba.io/errors" )
 DECLARE_ZORBA_MODULE( FILE pregenerated/zorba-warnings.xq
-  URI "http://zorba.io/modules/zorba-warnings" )
+  URI "http://zorba.io/warnings" )
 DECLARE_ZORBA_MODULE( FILE pregenerated/jsoniq-errors.xq
   URI "http://jsoniq.org/errors" )
 

=== modified file 'modules/atomic/base64.xq'
--- modules/atomic/base64.xq	2013-07-17 15:53:51 +0000
+++ modules/atomic/base64.xq	2013-08-07 05:36:24 +0000
@@ -25,7 +25,7 @@
  :)
 module namespace base64 = "http://zorba.io/modules/base64";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "1.0";

=== modified file 'modules/atomic/random.xq'
--- modules/atomic/random.xq	2013-07-17 09:15:28 +0000
+++ modules/atomic/random.xq	2013-08-07 05:36:24 +0000
@@ -27,7 +27,7 @@
 module namespace r = "http://zorba.io/modules/random";
 
 declare namespace an = "http://www.zorba-xquery.com/annotations";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "1.0";

=== modified file 'modules/com/zorba-xquery/www/modules/datetime.xq'
--- modules/com/zorba-xquery/www/modules/datetime.xq	2013-06-25 03:55:20 +0000
+++ modules/com/zorba-xquery/www/modules/datetime.xq	2013-08-07 05:36:24 +0000
@@ -55,7 +55,7 @@
 module namespace datetime = "http://www.zorba-xquery.com/modules/datetime";
 
 declare namespace an = "http://www.zorba-xquery.com/annotations";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "2.0";

=== modified file 'modules/com/zorba-xquery/www/modules/fetch.xq'
--- modules/com/zorba-xquery/www/modules/fetch.xq	2013-06-25 03:55:20 +0000
+++ modules/com/zorba-xquery/www/modules/fetch.xq	2013-08-07 05:36:24 +0000
@@ -33,7 +33,7 @@
 
 declare namespace an = "http://www.zorba-xquery.com/annotations";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "2.1";

=== modified file 'modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map.xq'
--- modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map.xq	2013-08-07 05:36:24 +0000
@@ -32,7 +32,7 @@
  : be an arbitrary sequence of items.</p>
  :
  : @see <a href="../../html/data_lifecycle.html">Data Lifecycle</a>
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Matthias Brantner
  :
@@ -40,7 +40,7 @@
  :)
 module namespace map = "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
 declare namespace an = "http://www.zorba-xquery.com/annotations";
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/documents/dynamic.xq'
--- modules/com/zorba-xquery/www/modules/store/documents/dynamic.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/documents/dynamic.xq	2013-08-07 05:36:24 +0000
@@ -25,7 +25,7 @@
  : more information about the lifecycle management and manipulation of documents.</p>
  :
  : @see <a href="../../html/data_lifecycle.html">Data Lifecycle</a>
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
  :
@@ -33,7 +33,7 @@
  :)
 module namespace doc = "http://www.zorba-xquery.com/modules/store/dynamic/documents";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "2.0";

=== modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/ddl.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/ddl.xq	2013-08-07 05:36:24 +0000
@@ -26,7 +26,7 @@
  :
  : @see <a href="../../html/data_lifecycle.html">Data Lifecycle</a>
  : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/dml
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
  :
@@ -35,7 +35,7 @@
  :)
 module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "2.0";
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq	2013-08-07 05:36:24 +0000
@@ -26,7 +26,7 @@
  : 
  : @see <a href="../../html/data_lifecycle.html">Data Lifecycle</a>
  : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
  :
@@ -34,7 +34,7 @@
  :)
 module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";

=== modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl.xq	2013-08-07 05:36:24 +0000
@@ -30,7 +30,7 @@
  : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml
  : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl
  : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/dml
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
  :
@@ -40,7 +40,7 @@
 
 import module namespace qddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "2.0";
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq	2013-08-07 05:36:24 +0000
@@ -30,7 +30,7 @@
  : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl
  : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl
  : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/dml
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
  :
@@ -42,7 +42,7 @@
 
 import module namespace qdml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq	2013-08-07 05:36:24 +0000
@@ -34,7 +34,7 @@
  : @see http://www.zorba-xquery.com/modules/store/static/indexes/dml
  : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl
  : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Nicolae Brinza, Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
  :
@@ -43,7 +43,7 @@
  :)
 module namespace cddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "2.0";
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq	2013-08-07 05:36:24 +0000
@@ -33,7 +33,7 @@
  : @see http://www.zorba-xquery.com/modules/store/static/indexes/dml
  : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl
  : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Nicolae Brinza, Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
  :
@@ -43,7 +43,7 @@
 module namespace cdml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
 
 declare namespace an = "http://www.zorba-xquery.com/annotations";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "2.0";

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/indexes/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/static/indexes/ddl.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/indexes/ddl.xq	2013-08-07 05:36:24 +0000
@@ -33,7 +33,7 @@
  : @see http://www.zorba-xquery.com/modules/store/static/collections/ddl
  : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl
  : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Nicolae Brinza, Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
  :
@@ -42,7 +42,7 @@
  :)
 module namespace iddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "2.0";
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq	2013-08-07 05:36:24 +0000
@@ -33,7 +33,7 @@
  : @see http://www.zorba-xquery.com/modules/store/static/collections/ddl
  : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl
  : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Zorba Team
  :
@@ -42,7 +42,7 @@
  :)
 module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace an = "http://www.zorba-xquery.com/annotations";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl.xq	2013-08-07 05:36:24 +0000
@@ -34,7 +34,7 @@
  : @see http://www.zorba-xquery.com/modules/store/static/indexes/ddl
  : @see http://www.zorba-xquery.com/modules/store/static/indexes/dml
  : @see http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Nicolae Brinza, Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
  :
@@ -43,7 +43,7 @@
  :)
 module namespace icddl = "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "2.0";
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml.xq	2013-06-28 00:56:53 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml.xq	2013-08-07 05:36:24 +0000
@@ -33,7 +33,7 @@
  : @see http://www.zorba-xquery.com/modules/store/static/collections/ddl
  : @see http://www.zorba-xquery.com/modules/store/static/indexes/ddl
  : @see http://www.zorba-xquery.com/modules/store/static/indexes/dml
- : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/modules/zorba-errors</a>
+ : @see <a href="modules_http:__zorba.io_modules_zorba-errors.html">http://zorba.io/errors</a>
  :
  : @author Nicolae Brinza, Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
  : @project Zorba/Data Store/Integrity Constraints/Static Data Manipulation
@@ -41,7 +41,7 @@
  :)
 module namespace icdml = "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "2.0";
 

=== modified file 'modules/com/zorba-xquery/www/modules/uri.xq'
--- modules/com/zorba-xquery/www/modules/uri.xq	2013-06-25 03:55:20 +0000
+++ modules/com/zorba-xquery/www/modules/uri.xq	2013-08-07 05:36:24 +0000
@@ -25,7 +25,7 @@
  :)
 module namespace uri = "http://www.zorba-xquery.com/modules/uri";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "1.0";
 

=== modified file 'modules/com/zorba-xquery/www/modules/xml.xq'
--- modules/com/zorba-xquery/www/modules/xml.xq	2013-06-25 03:55:20 +0000
+++ modules/com/zorba-xquery/www/modules/xml.xq	2013-08-07 05:36:24 +0000
@@ -73,7 +73,7 @@
 
 import schema namespace opt = "http://www.zorba-xquery.com/modules/xml-options";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace err = "http://www.w3.org/xqt-errors";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc.xq	2013-06-25 03:55:20 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc.xq	2013-08-07 05:36:24 +0000
@@ -71,7 +71,7 @@
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare option ver:module-version "2.0";
 

=== modified file 'modules/full-text/full-text.xq'
--- modules/full-text/full-text.xq	2013-06-28 02:33:07 +0000
+++ modules/full-text/full-text.xq	2013-08-07 05:36:24 +0000
@@ -336,7 +336,7 @@
 module namespace ft = "http://zorba.io/modules/full-text";
 
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "1.0";

=== modified file 'modules/json/json-xml.xq'
--- modules/json/json-xml.xq	2013-07-26 23:11:56 +0000
+++ modules/json/json-xml.xq	2013-08-07 05:36:24 +0000
@@ -97,7 +97,7 @@
 
 declare namespace an = "http://www.zorba-xquery.com/annotations";
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "1.0";

=== modified file 'modules/pregenerated/zorba-errors.xq'
--- modules/pregenerated/zorba-errors.xq	2013-07-26 05:18:25 +0000
+++ modules/pregenerated/zorba-errors.xq	2013-08-07 05:36:24 +0000
@@ -21,7 +21,7 @@
 
 (:~
  : This module contains one variable declaration for each diagnostic of the
- : http://zorba.io/modules/zorba-errors namespace.
+ : http://zorba.io/errors namespace.
  : The variables serves as documentation for the errors but can also
  : be used in the code. For example, one useful scenario is to compare
  : an error caught in the catch clause of a try-catch expression with one of
@@ -33,9 +33,9 @@
 
 xquery version '1.0';
 
-module namespace zerr = 'http://zorba.io/modules/zorba-errors';
+module namespace zerr = 'http://zorba.io/errors';
 
-declare variable $zerr:NS := 'http://zorba.io/modules/zorba-errors';
+declare variable $zerr:NS := 'http://zorba.io/errors';
 
 (:~
  :

=== modified file 'modules/pregenerated/zorba-warnings.xq'
--- modules/pregenerated/zorba-warnings.xq	2013-06-25 00:41:44 +0000
+++ modules/pregenerated/zorba-warnings.xq	2013-08-07 05:36:24 +0000
@@ -21,7 +21,7 @@
 
 (:~
  : This module contains one variable declaration for each diagnostic of the
- : http://zorba.io/modules/zorba-warnings namespace.
+ : http://zorba.io/warnings namespace.
  : The variables serves as documentation for the errors but can also
  : be used in the code. For example, one useful scenario is to compare
  : an error caught in the catch clause of a try-catch expression with one of
@@ -33,9 +33,9 @@
 
 xquery version '1.0';
 
-module namespace zwarn = 'http://zorba.io/modules/zorba-warnings';
+module namespace zwarn = 'http://zorba.io/warnings';
 
-declare variable $zwarn:NS := 'http://zorba.io/modules/zorba-warnings';
+declare variable $zwarn:NS := 'http://zorba.io/warnings';
 
 (:~
  :

=== modified file 'modules/structured-items/reference.xq'
--- modules/structured-items/reference.xq	2013-07-24 07:29:14 +0000
+++ modules/structured-items/reference.xq	2013-08-07 05:36:24 +0000
@@ -38,7 +38,7 @@
  :)
 module namespace ref = "http://zorba.io/modules/reference";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 

=== modified file 'src/diagnostics/diagnostic_list_xq.xq'
--- src/diagnostics/diagnostic_list_xq.xq	2013-06-25 00:41:44 +0000
+++ src/diagnostics/diagnostic_list_xq.xq	2013-08-07 05:36:24 +0000
@@ -92,9 +92,9 @@
   else if ( $namespace = "jerr" )
     then "http://jsoniq.org/errors"
   else if ( $namespace = "zerr" )
-    then "http://zorba.io/modules/zorba-errors"
+    then "http://zorba.io/errors"
   else if ( $namespace = "zwarn" )
-    then "http://zorba.io/modules/zorba-warnings"
+    then "http://zorba.io/warnings"
   else
     fn:error()
 };

=== modified file 'src/zorbamisc/ns_consts.h'
--- src/zorbamisc/ns_consts.h	2013-07-01 18:59:06 +0000
+++ src/zorbamisc/ns_consts.h	2013-08-07 05:36:24 +0000
@@ -45,8 +45,8 @@
 
 #define ZORBA_DEF_COLLATION_NS  ZORBA_COLLATION_NS_BASE "IDENTICAL/en/US"
 
-#define ZORBA_ERR_NS            ZORBA_MODULES_NS "zorba-errors"
-#define ZORBA_WARN_NS           ZORBA_MODULES_NS "zorba-warnings"
+#define ZORBA_ERR_NS            "http://zorba.io/errors"
+#define ZORBA_WARN_NS           "http://zorba.io/warnings"
 
 #define ZORBA_FEATURES_NS       ZORBA_NS "features"
 #define ZORBA_ANNOTATIONS_NS    ZORBA_NS "annotations"

=== modified file 'test/rbkt/ExpQueryResults/zorba/trycatch/stacktrace1.xml.res'
--- test/rbkt/ExpQueryResults/zorba/trycatch/stacktrace1.xml.res	2013-06-25 03:55:20 +0000
+++ test/rbkt/ExpQueryResults/zorba/trycatch/stacktrace1.xml.res	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-<stack xmlns="http://zorba.io/modules/zorba-errors"><entry><function namespace="http://www.w3.org/2005/xquery-local-functions" localname="bar" arity="0"/><location line-begin="10" line-end="10" column-begin="3" column-end="14"/></entry><entry><function namespace="http://www.w3.org/2005/xquery-local-functions" localname="foo" arity="0"/><location line-begin="15" line-end="15" column-begin="3" column-end="14"/></entry></stack>
+<stack xmlns="http://zorba.io/errors"><entry><function namespace="http://www.w3.org/2005/xquery-local-functions" localname="bar" arity="0"/><location line-begin="10" line-end="10" column-begin="3" column-end="14"/></entry><entry><function namespace="http://www.w3.org/2005/xquery-local-functions" localname="foo" arity="0"/><location line-begin="15" line-end="15" column-begin="3" column-end="14"/></entry></stack>

=== modified file 'test/rbkt/ExpQueryResults/zorba/trycatch/stacktrace2.xml.res'
--- test/rbkt/ExpQueryResults/zorba/trycatch/stacktrace2.xml.res	2013-06-25 03:55:20 +0000
+++ test/rbkt/ExpQueryResults/zorba/trycatch/stacktrace2.xml.res	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-<stack xmlns="http://zorba.io/modules/zorba-errors"><entry><function namespace="http://www.w3.org/2005/xquery-local-functions" localname="bar" arity="0"/><location line-begin="11" line-end="11" column-begin="3" column-end="14"/></entry><entry><function namespace="http://www.w3.org/2005/xquery-local-functions" localname="foo" arity="0"/><location line-begin="16" line-end="16" column-begin="3" column-end="14"/></entry></stack>
+<stack xmlns="http://zorba.io/errors"><entry><function namespace="http://www.w3.org/2005/xquery-local-functions" localname="bar" arity="0"/><location line-begin="11" line-end="11" column-begin="3" column-end="14"/></entry><entry><function namespace="http://www.w3.org/2005/xquery-local-functions" localname="foo" arity="0"/><location line-begin="16" line-end="16" column-begin="3" column-end="14"/></entry></stack>

=== modified file 'test/rbkt/Queries/zorba/HigherOrder/combinator-01.spec'
--- test/rbkt/Queries/zorba/HigherOrder/combinator-01.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/combinator-01.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0003
+Error: http://zorba.io/errors:ZXQP0003

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-02.spec'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-02.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-02.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-warnings:ZWST0003
+Error: http://zorba.io/warnings:ZWST0003

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-03.spec'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-03.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-03.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-warnings:ZWST0002
+Error: http://zorba.io/warnings:ZWST0002

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-04.spec'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-04.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-04.spec	2013-08-07 05:36:24 +0000
@@ -1,2 +1,2 @@
-Error: http://zorba.io/modules/zorba-warnings:ZWST0003
+Error: http://zorba.io/warnings:ZWST0003
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-05.spec'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-05.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-05.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-warnings:ZWST0002
+Error: http://zorba.io/warnings:ZWST0002

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-01.spec'
--- test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-01.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-01.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:XSST0007
+Error: http://zorba.io/errors:XSST0007

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-02.spec'
--- test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-02.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-02.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:XSST0007
+Error: http://zorba.io/errors:XSST0007

=== modified file 'test/rbkt/Queries/zorba/block/seq_func1.spec'
--- test/rbkt/Queries/zorba/block/seq_func1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/block/seq_func1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:XSST0002
+Error: http://zorba.io/errors:XSST0002

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_004/q3.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_004/q3.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_004/q3.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0017
+Error: http://zorba.io/errors:ZDDY0017

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_010/q3.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_010/q3.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_010/q3.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0001 
+Error: http://zorba.io/errors:ZDDY0001 

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q11.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q11.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q11.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0002 
+Error: http://zorba.io/errors:ZDDY0002 

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q3.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q3.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q3.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0006 
+Error: http://zorba.io/errors:ZAPI0006 

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q31.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q31.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q31.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0006 
+Error: http://zorba.io/errors:ZAPI0006 

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q32.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q32.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q32.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0006 
+Error: http://zorba.io/errors:ZAPI0006 

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q33.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q33.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q33.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0006 
+Error: http://zorba.io/errors:ZAPI0006 

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q34.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q34.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q34.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0006 
+Error: http://zorba.io/errors:ZAPI0006 

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q35.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q35.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q35.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0006 
+Error: http://zorba.io/errors:ZAPI0006 

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q36.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q36.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q36.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0006 
+Error: http://zorba.io/errors:ZAPI0006 

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q37.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q37.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q37.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0006 
+Error: http://zorba.io/errors:ZAPI0006 

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q40.spec'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q40.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q40.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0006 
+Error: http://zorba.io/errors:ZAPI0006 

=== modified file 'test/rbkt/Queries/zorba/collections/collection_001.spec'
--- test/rbkt/Queries/zorba/collections/collection_001.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/collection_001.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDST0003
+Error: http://zorba.io/errors:ZDST0003

=== modified file 'test/rbkt/Queries/zorba/collections/collection_002.spec'
--- test/rbkt/Queries/zorba/collections/collection_002.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/collection_002.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDST0002
+Error: http://zorba.io/errors:ZDST0002

=== modified file 'test/rbkt/Queries/zorba/collections/collection_does_not_exist.spec'
--- test/rbkt/Queries/zorba/collections/collection_does_not_exist.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/collection_does_not_exist.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0003
+Error: http://zorba.io/errors:ZDDY0003

=== modified file 'test/rbkt/Queries/zorba/collections/create_collision.spec'
--- test/rbkt/Queries/zorba/collections/create_collision.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/create_collision.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0016
+Error: http://zorba.io/errors:ZDDY0016

=== modified file 'test/rbkt/Queries/zorba/collections/declare_1.spec'
--- test/rbkt/Queries/zorba/collections/declare_1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/declare_1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDST0001
+Error: http://zorba.io/errors:ZDST0001

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_001.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_001.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_001.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0017
+Error: http://zorba.io/errors:ZDDY0017

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_002.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_002.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_002.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0017
+Error: http://zorba.io/errors:ZDDY0017

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_004.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_004.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_004.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0017
+Error: http://zorba.io/errors:ZDDY0017

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_const.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_const.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_const.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0004
+Error: http://zorba.io/errors:ZDDY0004

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_queue.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_queue.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes/delete_nodes_collection_queue.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0017
+Error: http://zorba.io/errors:ZDDY0017

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_001.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_001.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_001.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0001
+Error: http://zorba.io/errors:ZDDY0001

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_002.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_002.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_002.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0003
+Error: http://zorba.io/errors:ZDDY0003

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_003.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_003.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_003.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0012
+Error: http://zorba.io/errors:ZDDY0012

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_004.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_004.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_004.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0011
+Error: http://zorba.io/errors:ZDDY0011

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_005.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_005.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_005.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0001
+Error: http://zorba.io/errors:ZDDY0001

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_006.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_006.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_006.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0003
+Error: http://zorba.io/errors:ZDDY0003

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_007.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_007.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_007.spec	2013-08-07 05:36:24 +0000
@@ -1,2 +1,2 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0012
+Error: http://zorba.io/errors:ZDDY0012
 

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_008.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_008.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_008.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0011
+Error: http://zorba.io/errors:ZDDY0011

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_append_only.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_append_only.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_append_only.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0007
+Error: http://zorba.io/errors:ZDDY0007

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_append_only_2.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_append_only_2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_append_only_2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0007
+Error: http://zorba.io/errors:ZDDY0007

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_const.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_const.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_const.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0004
+Error: http://zorba.io/errors:ZDDY0004

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_const_2.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_const_2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_const_2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0004
+Error: http://zorba.io/errors:ZDDY0004

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_001.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_001.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_001.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0001
+Error: http://zorba.io/errors:ZDDY0001

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_002.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_002.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_002.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0003
+Error: http://zorba.io/errors:ZDDY0003

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_003.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_003.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_003.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0012
+Error: http://zorba.io/errors:ZDDY0012

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_004.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_004.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_004.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0011
+Error: http://zorba.io/errors:ZDDY0011

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_005.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_005.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_005.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0001
+Error: http://zorba.io/errors:ZDDY0001

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_006.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_006.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_006.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0003
+Error: http://zorba.io/errors:ZDDY0003

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_007.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_007.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_007.spec	2013-08-07 05:36:24 +0000
@@ -1,2 +1,2 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0012
+Error: http://zorba.io/errors:ZDDY0012
 

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_008.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_008.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_008.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0011
+Error: http://zorba.io/errors:ZDDY0011

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_append_only.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_append_only.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_append_only.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0007
+Error: http://zorba.io/errors:ZDDY0007

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_append_only_2.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_append_only_2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_append_only_2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0007
+Error: http://zorba.io/errors:ZDDY0007

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_const.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_const.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_const.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0004
+Error: http://zorba.io/errors:ZDDY0004

=== modified file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_const_2.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_const_2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_const_2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0004
+Error: http://zorba.io/errors:ZDDY0004

=== modified file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_001.spec'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_001.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_001.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0017
+Error: http://zorba.io/errors:ZDDY0017

=== modified file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_002.spec'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_002.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_002.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0017
+Error: http://zorba.io/errors:ZDDY0017

=== modified file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_004.spec'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_004.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_004.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0017
+Error: http://zorba.io/errors:ZDDY0017

=== modified file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_008.spec'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_008.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_008.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0040
+Error: http://zorba.io/errors:ZDDY0040

=== modified file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_009.spec'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_009.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_009.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0040
+Error: http://zorba.io/errors:ZDDY0040

=== modified file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_015.spec'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_015.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_015.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDTY0001
+Error: http://zorba.io/errors:ZDTY0001

=== modified file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_016.spec'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_016.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_016.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0039
+Error: http://zorba.io/errors:ZDDY0039

=== modified file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_017.spec'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_017.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_017.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0039
+Error: http://zorba.io/errors:ZDDY0039

=== modified file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_append_only.spec'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_append_only.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_append_only.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0037
+Error: http://zorba.io/errors:ZDDY0037

=== modified file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_const.spec'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_const.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_const.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0004
+Error: http://zorba.io/errors:ZDDY0004

=== modified file 'test/rbkt/Queries/zorba/collections/edit/edit_collection_queue.spec'
--- test/rbkt/Queries/zorba/collections/edit/edit_collection_queue.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/edit/edit_collection_queue.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0038
+Error: http://zorba.io/errors:ZDDY0038

=== modified file 'test/rbkt/Queries/zorba/collections/index_of_3.spec'
--- test/rbkt/Queries/zorba/collections/index_of_3.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/index_of_3.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0003
+Error: http://zorba.io/errors:ZDDY0003

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_001.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_001.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_001.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0001
+Error: http://zorba.io/errors:ZDDY0001

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_002.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_002.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_002.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0003
+Error: http://zorba.io/errors:ZDDY0003

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_004.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_004.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_004.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDTY0001
+Error: http://zorba.io/errors:ZDTY0001

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_append_only.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_append_only.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_append_only.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0005
+Error: http://zorba.io/errors:ZDDY0005

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_const.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_const.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_const.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0004
+Error: http://zorba.io/errors:ZDDY0004

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_queue.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_queue.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes/insert_collection_queue.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0006
+Error: http://zorba.io/errors:ZDDY0006

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_001.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_001.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_001.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0001
+Error: http://zorba.io/errors:ZDDY0001

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_002.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_002.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_002.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0003
+Error: http://zorba.io/errors:ZDDY0003

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_003.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_003.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_003.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0012
+Error: http://zorba.io/errors:ZDDY0012

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_004.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_004.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_004.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDTY0001
+Error: http://zorba.io/errors:ZDTY0001

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_append_only.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_append_only.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_append_only.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0005
+Error: http://zorba.io/errors:ZDDY0005

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_const.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_const.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_const.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0004
+Error: http://zorba.io/errors:ZDDY0004

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_queue.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_queue.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_after/insert_collection_queue.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0006
+Error: http://zorba.io/errors:ZDDY0006

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_001.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_001.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_001.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0001
+Error: http://zorba.io/errors:ZDDY0001

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_002.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_002.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_002.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0003
+Error: http://zorba.io/errors:ZDDY0003

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_003.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_003.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_003.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0012
+Error: http://zorba.io/errors:ZDDY0012

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_004.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_004.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_004.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDTY0001
+Error: http://zorba.io/errors:ZDTY0001

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_append_only.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_append_only.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_append_only.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0005
+Error: http://zorba.io/errors:ZDDY0005

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_const.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_const.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_const.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0004
+Error: http://zorba.io/errors:ZDDY0004

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_queue.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_queue.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_before/insert_collection_queue.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0006
+Error: http://zorba.io/errors:ZDDY0006

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_001.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_001.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_001.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0001
+Error: http://zorba.io/errors:ZDDY0001

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_002.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_002.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_002.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0003
+Error: http://zorba.io/errors:ZDDY0003

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_003.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_003.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_003.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0012
+Error: http://zorba.io/errors:ZDDY0012

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_004.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_004.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_004.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDTY0001
+Error: http://zorba.io/errors:ZDTY0001

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_append_only.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_append_only.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_append_only.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0005
+Error: http://zorba.io/errors:ZDDY0005

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_const.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_const.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_const.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0004
+Error: http://zorba.io/errors:ZDDY0004

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_queue.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_queue.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_first/insert_collection_queue.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0006
+Error: http://zorba.io/errors:ZDDY0006

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_001.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_001.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_001.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0001
+Error: http://zorba.io/errors:ZDDY0001

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_002.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_002.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_002.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0003
+Error: http://zorba.io/errors:ZDDY0003

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_003.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_003.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_003.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0012
+Error: http://zorba.io/errors:ZDDY0012

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_004.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_004.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_004.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDTY0001
+Error: http://zorba.io/errors:ZDTY0001

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_append_only.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_append_only.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_append_only.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0005
+Error: http://zorba.io/errors:ZDDY0005

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_const.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_const.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_const.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0004
+Error: http://zorba.io/errors:ZDDY0004

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_queue.spec'
--- test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_queue.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_last/insert_collection_queue.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0006
+Error: http://zorba.io/errors:ZDDY0006

=== modified file 'test/rbkt/Queries/zorba/collections/paging_1.xq'
--- test/rbkt/Queries/zorba/collections/paging_1.xq	2013-07-24 08:12:12 +0000
+++ test/rbkt/Queries/zorba/collections/paging_1.xq	2013-08-07 05:36:24 +0000
@@ -4,7 +4,7 @@
 import module namespace ref = "http://zorba.io/modules/reference";
 
 declare namespace ann = "http://www.zorba-xquery.com/annotations";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare function local:order($items)
 {

=== modified file 'test/rbkt/Queries/zorba/collections/paging_5.spec'
--- test/rbkt/Queries/zorba/collections/paging_5.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/collections/paging_5.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZSTR0066
+Error: http://zorba.io/errors:ZSTR0066

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-date-la-uD-1.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-date-la-uD-1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-date-la-uD-1.spec	2013-08-07 05:36:24 +0000
@@ -1,2 +1,2 @@
 Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/datetime/datetime-parse-date-la-uD-1.xml.res
-Error: http://zorba.io/modules/zorba-errors:ZOSE0007
+Error: http://zorba.io/errors:ZOSE0007

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-date-ld-1.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-date-ld-1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-date-ld-1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDTP0005
+Error: http://zorba.io/errors:ZDTP0005

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-date-lj-uY-1.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-date-lj-uY-1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-date-lj-uY-1.spec	2013-08-07 05:36:24 +0000
@@ -1,2 +1,2 @@
 Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/datetime/datetime-parse-date-lj-uY-1.xml.res
-Error: http://zorba.io/modules/zorba-errors:ZOSE0007
+Error: http://zorba.io/errors:ZOSE0007

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-date-uA-uD-1.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-date-uA-uD-1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-date-uA-uD-1.spec	2013-08-07 05:36:24 +0000
@@ -1,2 +1,2 @@
 Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/datetime/datetime-parse-date-uA-uD-1.xml.res
-Error: http://zorba.io/modules/zorba-errors:ZOSE0007
+Error: http://zorba.io/errors:ZOSE0007

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-date-uA-uD-2.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-date-uA-uD-2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-date-uA-uD-2.spec	2013-08-07 05:36:24 +0000
@@ -1,2 +1,2 @@
 Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/datetime/datetime-parse-date-uA-uD-2.xml.res
-Error: http://zorba.io/modules/zorba-errors:ZOSE0007
+Error: http://zorba.io/errors:ZOSE0007

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-dateTime-uAB-ld-uYTZ-1.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-dateTime-uAB-ld-uYTZ-1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-dateTime-uAB-ld-uYTZ-1.spec	2013-08-07 05:36:24 +0000
@@ -1,2 +1,2 @@
 Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/datetime/datetime-parse-dateTime-uAB-ld-uYTZ-1.xml.res
-Error: http://zorba.io/modules/zorba-errors:ZOSE0007
+Error: http://zorba.io/errors:ZOSE0007

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-dateTime-uAB-ld-uYTZ-2.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-dateTime-uAB-ld-uYTZ-2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-dateTime-uAB-ld-uYTZ-2.spec	2013-08-07 05:36:24 +0000
@@ -1,2 +1,2 @@
 Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/datetime/datetime-parse-dateTime-uAB-ld-uYTZ-2.xml.res
-Error: http://zorba.io/modules/zorba-errors:ZOSE0007
+Error: http://zorba.io/errors:ZOSE0007

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-time-lr-1.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-time-lr-1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-time-lr-1.spec	2013-08-07 05:36:24 +0000
@@ -1,2 +1,2 @@
 Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/datetime/datetime-parse-time-lr-1.xml.res
-Error: http://zorba.io/modules/zorba-errors:ZOSE0007
+Error: http://zorba.io/errors:ZOSE0007

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-time-lr-2.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-time-lr-2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-time-lr-2.spec	2013-08-07 05:36:24 +0000
@@ -1,2 +1,2 @@
 Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/datetime/datetime-parse-time-lr-2.xml.res
-Error: http://zorba.io/modules/zorba-errors:ZOSE0007
+Error: http://zorba.io/errors:ZOSE0007

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-time-uH-2.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-time-uH-2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-time-uH-2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDTP0003
+Error: http://zorba.io/errors:ZDTP0003

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-time-uM-1.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-time-uM-1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-time-uM-1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDTP0005
+Error: http://zorba.io/errors:ZDTP0005

=== modified file 'test/rbkt/Queries/zorba/datetime/datetime-parse-time-uS-1.spec'
--- test/rbkt/Queries/zorba/datetime/datetime-parse-time-uS-1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/datetime/datetime-parse-time-uS-1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDTP0005
+Error: http://zorba.io/errors:ZDTP0005

=== modified file 'test/rbkt/Queries/zorba/error/data-location-json-1.xq'
--- test/rbkt/Queries/zorba/error/data-location-json-1.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/error/data-location-json-1.xq	2013-08-07 05:36:24 +0000
@@ -1,6 +1,6 @@
 import module namespace file = "http://expath.org/ns/file";
 import module namespace jn = "http://jsoniq.org/functions";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 let $file := "$RBKT_SRC_DIR/Queries/zorba/error/data-location.json"
 let $json := file:read-text( $file )

=== modified file 'test/rbkt/Queries/zorba/error/data-location-json-2.xq'
--- test/rbkt/Queries/zorba/error/data-location-json-2.xq	2013-07-26 21:52:47 +0000
+++ test/rbkt/Queries/zorba/error/data-location-json-2.xq	2013-08-07 05:36:24 +0000
@@ -1,6 +1,6 @@
 import module namespace file = "http://expath.org/ns/file";
 import module namespace jn = "http://jsoniq.org/functions";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 let $file := "$RBKT_SRC_DIR/Queries/zorba/error/data-location.json"
 let $json := file:read-text( $file )

=== modified file 'test/rbkt/Queries/zorba/error/data-location-xml-1.xq'
--- test/rbkt/Queries/zorba/error/data-location-xml-1.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/error/data-location-xml-1.xq	2013-08-07 05:36:24 +0000
@@ -1,5 +1,5 @@
 import module namespace file = "http://expath.org/ns/file";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 try {
   fn:doc( "data-location.xml" )

=== modified file 'test/rbkt/Queries/zorba/error/data-location-xml-2.xq'
--- test/rbkt/Queries/zorba/error/data-location-xml-2.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/error/data-location-xml-2.xq	2013-08-07 05:36:24 +0000
@@ -1,5 +1,5 @@
 import module namespace file = "http://expath.org/ns/file";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 let $file := "$RBKT_SRC_DIR/Queries/zorba/error/data-location.xml"
 let $xml := file:read-text( $file )

=== modified file 'test/rbkt/Queries/zorba/error/warning1.xq'
--- test/rbkt/Queries/zorba/error/warning1.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/error/warning1.xq	2013-08-07 05:36:24 +0000
@@ -1,6 +1,6 @@
 (:
  : test if the warning module is syntactically correct
  :)
-import module namespace zwarn = "http://zorba.io/modules/zorba-warnings";
+import module namespace zwarn = "http://zorba.io/warnings";
 
 $zwarn:ZWST0002

=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_bogus1.spec'
--- test/rbkt/Queries/zorba/fetch/fetch_bogus1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/fetch/fetch_bogus1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0026
+Error: http://zorba.io/errors:ZXQP0026

=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_bogus2.spec'
--- test/rbkt/Queries/zorba/fetch/fetch_bogus2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/fetch/fetch_bogus2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0025
+Error: http://zorba.io/errors:ZXQP0025

=== modified file 'test/rbkt/Queries/zorba/index/declare_index/declare_01.spec'
--- test/rbkt/Queries/zorba/index/declare_index/declare_01.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/declare_index/declare_01.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDST0021
+Error: http://zorba.io/errors:ZDST0021

=== modified file 'test/rbkt/Queries/zorba/index/declare_index/declare_05.spec'
--- test/rbkt/Queries/zorba/index/declare_index/declare_05.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/declare_index/declare_05.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDST0029
+Error: http://zorba.io/errors:ZDST0029

=== modified file 'test/rbkt/Queries/zorba/index/error1.spec'
--- test/rbkt/Queries/zorba/index/error1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/error1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDST0023
+Error: http://zorba.io/errors:ZDST0023

=== modified file 'test/rbkt/Queries/zorba/index/error2.spec'
--- test/rbkt/Queries/zorba/index/error2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/error2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDST0029
+Error: http://zorba.io/errors:ZDST0029

=== modified file 'test/rbkt/Queries/zorba/index/error3.spec'
--- test/rbkt/Queries/zorba/index/error3.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/error3.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDST0032
+Error: http://zorba.io/errors:ZDST0032

=== modified file 'test/rbkt/Queries/zorba/index/error4.spec'
--- test/rbkt/Queries/zorba/index/error4.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/error4.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDTY0010
+Error: http://zorba.io/errors:ZDTY0010

=== modified file 'test/rbkt/Queries/zorba/index/index_does_not_exist.spec'
--- test/rbkt/Queries/zorba/index/index_does_not_exist.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/index_does_not_exist.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0023
+Error: http://zorba.io/errors:ZDDY0023

=== modified file 'test/rbkt/Queries/zorba/index/index_does_not_exist_2.spec'
--- test/rbkt/Queries/zorba/index/index_does_not_exist_2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/index_does_not_exist_2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0023
+Error: http://zorba.io/errors:ZDDY0023

=== modified file 'test/rbkt/Queries/zorba/index/index_exists_already.spec'
--- test/rbkt/Queries/zorba/index/index_exists_already.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/index_exists_already.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0022
+Error: http://zorba.io/errors:ZDDY0022

=== modified file 'test/rbkt/Queries/zorba/index/index_probe_range.spec'
--- test/rbkt/Queries/zorba/index/index_probe_range.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/index_probe_range.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0026
+Error: http://zorba.io/errors:ZDDY0026

=== modified file 'test/rbkt/Queries/zorba/index/probe_index_invalid_params.spec'
--- test/rbkt/Queries/zorba/index/probe_index_invalid_params.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/probe_index_invalid_params.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0025
+Error: http://zorba.io/errors:ZDDY0025

=== modified file 'test/rbkt/Queries/zorba/index/remove_collection_with_index.spec'
--- test/rbkt/Queries/zorba/index/remove_collection_with_index.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/remove_collection_with_index.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0013
+Error: http://zorba.io/errors:ZDDY0013

=== modified file 'test/rbkt/Queries/zorba/index/undo2.xq'
--- test/rbkt/Queries/zorba/index/undo2.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/undo2.xq	2013-08-07 05:36:24 +0000
@@ -3,7 +3,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
 import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
 
 u:create-db();

=== modified file 'test/rbkt/Queries/zorba/index/undo3.xq'
--- test/rbkt/Queries/zorba/index/undo3.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/undo3.xq	2013-08-07 05:36:24 +0000
@@ -3,7 +3,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
 import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
 
 u:create-db();

=== modified file 'test/rbkt/Queries/zorba/index/undo4.xq'
--- test/rbkt/Queries/zorba/index/undo4.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/undo4.xq	2013-08-07 05:36:24 +0000
@@ -4,7 +4,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
 import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
 
 u:create-db();

=== modified file 'test/rbkt/Queries/zorba/index/unique.xq'
--- test/rbkt/Queries/zorba/index/unique.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/index/unique.xq	2013-08-07 05:36:24 +0000
@@ -3,7 +3,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
 import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
 
 u:create-db();

=== modified file 'test/rbkt/Queries/zorba/json/json-jmla-j2x-06.spec'
--- test/rbkt/Queries/zorba/json/json-jmla-j2x-06.spec	2013-07-26 05:18:25 +0000
+++ test/rbkt/Queries/zorba/json/json-jmla-j2x-06.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZJ2X0001
+Error: http://zorba.io/errors:ZJ2X0001

=== modified file 'test/rbkt/Queries/zorba/json/json-jmla-j2x-07.spec'
--- test/rbkt/Queries/zorba/json/json-jmla-j2x-07.spec	2013-07-26 03:37:51 +0000
+++ test/rbkt/Queries/zorba/json/json-jmla-j2x-07.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZJ2X0001
+Error: http://zorba.io/errors:ZJ2X0001

=== modified file 'test/rbkt/Queries/zorba/json/json-jmla-j2x-08.spec'
--- test/rbkt/Queries/zorba/json/json-jmla-j2x-08.spec	2013-07-26 05:18:25 +0000
+++ test/rbkt/Queries/zorba/json/json-jmla-j2x-08.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZJ2X0001
+Error: http://zorba.io/errors:ZJ2X0001

=== modified file 'test/rbkt/Queries/zorba/json/json-snelson-x2j-array-06.spec'
--- test/rbkt/Queries/zorba/json/json-snelson-x2j-array-06.spec	2013-07-24 00:08:40 +0000
+++ test/rbkt/Queries/zorba/json/json-snelson-x2j-array-06.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZJSE0004
+Error: http://zorba.io/errors:ZJSE0004

=== modified file 'test/rbkt/Queries/zorba/json/json-snelson-x2j-array-07.spec'
--- test/rbkt/Queries/zorba/json/json-snelson-x2j-array-07.spec	2013-07-24 00:08:40 +0000
+++ test/rbkt/Queries/zorba/json/json-snelson-x2j-array-07.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZJSE0008
+Error: http://zorba.io/errors:ZJSE0008

=== modified file 'test/rbkt/Queries/zorba/json/json-snelson-x2j-array-08.spec'
--- test/rbkt/Queries/zorba/json/json-snelson-x2j-array-08.spec	2013-07-24 00:08:40 +0000
+++ test/rbkt/Queries/zorba/json/json-snelson-x2j-array-08.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZJSE0002
+Error: http://zorba.io/errors:ZJSE0002

=== modified file 'test/rbkt/Queries/zorba/json/json-snelson-x2j-array-09.spec'
--- test/rbkt/Queries/zorba/json/json-snelson-x2j-array-09.spec	2013-07-24 00:08:40 +0000
+++ test/rbkt/Queries/zorba/json/json-snelson-x2j-array-09.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZJSE0003
+Error: http://zorba.io/errors:ZJSE0003

=== modified file 'test/rbkt/Queries/zorba/json/json-snelson-x2j-array-10.spec'
--- test/rbkt/Queries/zorba/json/json-snelson-x2j-array-10.spec	2013-07-24 00:08:40 +0000
+++ test/rbkt/Queries/zorba/json/json-snelson-x2j-array-10.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZJSE0004
+Error: http://zorba.io/errors:ZJSE0004

=== modified file 'test/rbkt/Queries/zorba/json/json-snelson-x2j-array-11.spec'
--- test/rbkt/Queries/zorba/json/json-snelson-x2j-array-11.spec	2013-07-24 00:08:40 +0000
+++ test/rbkt/Queries/zorba/json/json-snelson-x2j-array-11.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZJSE0004
+Error: http://zorba.io/errors:ZJSE0004

=== modified file 'test/rbkt/Queries/zorba/nodes/position_err.xq'
--- test/rbkt/Queries/zorba/nodes/position_err.xq	2013-07-04 22:17:19 +0000
+++ test/rbkt/Queries/zorba/nodes/position_err.xq	2013-08-07 05:36:24 +0000
@@ -2,7 +2,7 @@
 
 declare namespace err="http://www.w3.org/2005/xqt-errors";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 try
 {

=== modified file 'test/rbkt/Queries/zorba/options/unknown_1.spec'
--- test/rbkt/Queries/zorba/options/unknown_1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/options/unknown_1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0060
+Error: http://zorba.io/errors:ZXQP0060

=== modified file 'test/rbkt/Queries/zorba/random/seeded-random1.xq'
--- test/rbkt/Queries/zorba/random/seeded-random1.xq	2013-07-17 09:01:57 +0000
+++ test/rbkt/Queries/zorba/random/seeded-random1.xq	2013-08-07 05:36:24 +0000
@@ -1,6 +1,6 @@
 import module namespace r = "http://zorba.io/modules/random";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
 
 count(r:seeded-random(1, 2)) eq 2,

=== modified file 'test/rbkt/Queries/zorba/reference/json-reference_1.spec'
--- test/rbkt/Queries/zorba/reference/json-reference_1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/reference/json-reference_1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0080
+Error: http://zorba.io/errors:ZAPI0080

=== modified file 'test/rbkt/Queries/zorba/reference/reference_4.spec'
--- test/rbkt/Queries/zorba/reference/reference_4.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/reference/reference_4.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0028
+Error: http://zorba.io/errors:ZAPI0028

=== modified file 'test/rbkt/Queries/zorba/schemas/val-inplace-err2.spec'
--- test/rbkt/Queries/zorba/schemas/val-inplace-err2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/schemas/val-inplace-err2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZAPI0090
+Error: http://zorba.io/errors:ZAPI0090

=== modified file 'test/rbkt/Queries/zorba/scripting/break0.spec'
--- test/rbkt/Queries/zorba/scripting/break0.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/scripting/break0.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:XSST0009
+Error: http://zorba.io/errors:XSST0009

=== modified file 'test/rbkt/Queries/zorba/scripting/flwor4.spec'
--- test/rbkt/Queries/zorba/scripting/flwor4.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/scripting/flwor4.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0017
+Error: http://zorba.io/errors:ZDDY0017

=== modified file 'test/rbkt/Queries/zorba/scripting/nonsequential3.spec'
--- test/rbkt/Queries/zorba/scripting/nonsequential3.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/scripting/nonsequential3.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:XSST0004
+Error: http://zorba.io/errors:XSST0004

=== modified file 'test/rbkt/Queries/zorba/scripting/q2.spec'
--- test/rbkt/Queries/zorba/scripting/q2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/scripting/q2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:XSST0004
+Error: http://zorba.io/errors:XSST0004

=== modified file 'test/rbkt/Queries/zorba/scripting/udf1.spec'
--- test/rbkt/Queries/zorba/scripting/udf1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/scripting/udf1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:XSST0006
+Error: http://zorba.io/errors:XSST0006

=== modified file 'test/rbkt/Queries/zorba/store/documents.xq'
--- test/rbkt/Queries/zorba/store/documents.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/store/documents.xq	2013-08-07 05:36:24 +0000
@@ -1,7 +1,7 @@
 import module namespace doc = "http://www.zorba-xquery.com/modules/store/dynamic/documents";
 
 declare namespace ann = "http://www.zorba-xquery.com/annotations";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare base-uri "http://www.zorba-xquery.com/";
 

=== modified file 'test/rbkt/Queries/zorba/store/unordered-map/map5.spec'
--- test/rbkt/Queries/zorba/store/unordered-map/map5.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/store/unordered-map/map5.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0023
+Error: http://zorba.io/errors:ZDDY0023

=== modified file 'test/rbkt/Queries/zorba/store/unordered-map/map6.xq'
--- test/rbkt/Queries/zorba/store/unordered-map/map6.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/store/unordered-map/map6.xq	2013-08-07 05:36:24 +0000
@@ -1,6 +1,6 @@
 import module namespace map = "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
 
 

=== modified file 'test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm'
--- test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm	2013-07-26 20:43:25 +0000
+++ test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm	2013-08-07 05:36:24 +0000
@@ -728,13 +728,13 @@
                   </sup>
                 </li>
                 <li>
-                  <a href="www.zorba-xquery.com_errors.html" title="http://zorba.io/modules/zorba-errors">errors</a>
+                  <a href="www.zorba-xquery.com_errors.html" title="http://zorba.io/errors">errors</a>
                   <sup>
                     <img src="images/ZCsmall.gif" alt="ZC" title="This module is part of Zorba core." />
                   </sup>
                 </li>
                 <li>
-                  <a href="www.zorba-xquery.com_warnings.html" title="http://zorba.io/modules/zorba-warnings">warnings</a>
+                  <a href="www.zorba-xquery.com_warnings.html" title="http://zorba.io/warnings">warnings</a>
                   <sup>
                     <img src="images/ZCsmall.gif" alt="ZC" title="This module is part of Zorba core." />
                   </sup>

=== modified file 'test/rbkt/Queries/zorba/trycatch/stacktrace1.xq'
--- test/rbkt/Queries/zorba/trycatch/stacktrace1.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/trycatch/stacktrace1.xq	2013-08-07 05:36:24 +0000
@@ -1,4 +1,4 @@
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare function local:bar()
 {

=== modified file 'test/rbkt/Queries/zorba/trycatch/stacktrace2.xq'
--- test/rbkt/Queries/zorba/trycatch/stacktrace2.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/trycatch/stacktrace2.xq	2013-08-07 05:36:24 +0000
@@ -1,4 +1,4 @@
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 declare namespace err = "http://www.w3.org/xqt-errors";
 
 declare function local:bar()

=== modified file 'test/rbkt/Queries/zorba/trycatch/stacktrace3.xq'
--- test/rbkt/Queries/zorba/trycatch/stacktrace3.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/trycatch/stacktrace3.xq	2013-08-07 05:36:24 +0000
@@ -1,4 +1,4 @@
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 try
 {

=== modified file 'test/rbkt/Queries/zorba/trycatch/trycatch10.xq'
--- test/rbkt/Queries/zorba/trycatch/trycatch10.xq	2013-06-25 03:00:45 +0000
+++ test/rbkt/Queries/zorba/trycatch/trycatch10.xq	2013-08-07 05:36:24 +0000
@@ -2,7 +2,7 @@
  : check if the zorba error module is correct and its variables
  : can be used to catch an error
  :)
-import module namespace zerr = "http://zorba.io/modules/zorba-errors";
+import module namespace zerr = "http://zorba.io/errors";
 import module namespace doc = "http://www.zorba-xquery.com/modules/store/dynamic/documents";
 
 declare namespace err = "http://www.w3.org/2005/xqt-errors";

=== modified file 'test/rbkt/Queries/zorba/trycatch/trycatch16.xq'
--- test/rbkt/Queries/zorba/trycatch/trycatch16.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/trycatch/trycatch16.xq	2013-08-07 05:36:24 +0000
@@ -1,5 +1,5 @@
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 try {
   1

=== modified file 'test/rbkt/Queries/zorba/udf/udf-recursive-1.spec'
--- test/rbkt/Queries/zorba/udf/udf-recursive-1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/udf/udf-recursive-1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0003
+Error: http://zorba.io/errors:ZXQP0003

=== modified file 'test/rbkt/Queries/zorba/uris/decode_02.spec'
--- test/rbkt/Queries/zorba/uris/decode_02.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/uris/decode_02.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0006
+Error: http://zorba.io/errors:ZXQP0006

=== modified file 'test/rbkt/Queries/zorba/uris/disable-http-5.spec'
--- test/rbkt/Queries/zorba/uris/disable-http-5.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http-5.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0061
+Error: http://zorba.io/errors:ZXQP0061

=== modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.spec'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-opaque-noscheme.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZURI0002
+Error: http://zorba.io/errors:ZURI0002

=== modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.spec'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-opaque.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZURI0001
+Error: http://zorba.io/errors:ZURI0001

=== modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-path1.spec'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-path1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-path1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZURI0003
+Error: http://zorba.io/errors:ZURI0003

=== modified file 'test/rbkt/Queries/zorba/uris/serialize-wrong-path2.spec'
--- test/rbkt/Queries/zorba/uris/serialize-wrong-path2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/uris/serialize-wrong-path2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZURI0003
+Error: http://zorba.io/errors:ZURI0003

=== modified file 'test/rbkt/Queries/zorba/versioning/import-chain2.spec'
--- test/rbkt/Queries/zorba/versioning/import-chain2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/versioning/import-chain2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0037
+Error: http://zorba.io/errors:ZXQP0037

=== modified file 'test/rbkt/Queries/zorba/versioning/import-chain3.spec'
--- test/rbkt/Queries/zorba/versioning/import-chain3.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/versioning/import-chain3.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0037
+Error: http://zorba.io/errors:ZXQP0037

=== modified file 'test/rbkt/Queries/zorba/versioning/import5.spec'
--- test/rbkt/Queries/zorba/versioning/import5.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/versioning/import5.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0037
+Error: http://zorba.io/errors:ZXQP0037

=== modified file 'test/rbkt/Queries/zorba/versioning/import6.spec'
--- test/rbkt/Queries/zorba/versioning/import6.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/versioning/import6.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0037
+Error: http://zorba.io/errors:ZXQP0037

=== modified file 'test/rbkt/Queries/zorba/versioning/import7.spec'
--- test/rbkt/Queries/zorba/versioning/import7.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/versioning/import7.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0039
+Error: http://zorba.io/errors:ZXQP0039

=== modified file 'test/rbkt/Queries/zorba/versioning/zorba-version2.spec'
--- test/rbkt/Queries/zorba/versioning/zorba-version2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/versioning/zorba-version2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0038
+Error: http://zorba.io/errors:ZXQP0038

=== modified file 'test/rbkt/Queries/zorba/versioning/zorba-version3.spec'
--- test/rbkt/Queries/zorba/versioning/zorba-version3.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/versioning/zorba-version3.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0039
+Error: http://zorba.io/errors:ZXQP0039

=== modified file 'test/rbkt/Queries/zorba/versioning/zorba-version5.spec'
--- test/rbkt/Queries/zorba/versioning/zorba-version5.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/versioning/zorba-version5.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0038
+Error: http://zorba.io/errors:ZXQP0038

=== modified file 'test/rbkt/Queries/zorba/xqddf/daniel/dic2.spec'
--- test/rbkt/Queries/zorba/xqddf/daniel/dic2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/daniel/dic2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0033
+Error: http://zorba.io/errors:ZDDY0033

=== modified file 'test/rbkt/Queries/zorba/xqddf/daniel/dic3.spec'
--- test/rbkt/Queries/zorba/xqddf/daniel/dic3.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/daniel/dic3.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0033
+Error: http://zorba.io/errors:ZDDY0033

=== modified file 'test/rbkt/Queries/zorba/xqddf/daniel/ric2.spec'
--- test/rbkt/Queries/zorba/xqddf/daniel/ric2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/daniel/ric2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0033
+Error: http://zorba.io/errors:ZDDY0033

=== modified file 'test/rbkt/Queries/zorba/xqddf/daniel/ric3.spec'
--- test/rbkt/Queries/zorba/xqddf/daniel/ric3.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/daniel/ric3.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0033
+Error: http://zorba.io/errors:ZDDY0033

=== modified file 'test/rbkt/Queries/zorba/xqddf/daniel/t4.spec'
--- test/rbkt/Queries/zorba/xqddf/daniel/t4.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/daniel/t4.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0012
+Error: http://zorba.io/errors:ZDDY0012

=== modified file 'test/rbkt/Queries/zorba/xqddf/daniel/t5.spec'
--- test/rbkt/Queries/zorba/xqddf/daniel/t5.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/daniel/t5.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0012
+Error: http://zorba.io/errors:ZDDY0012

=== modified file 'test/rbkt/Queries/zorba/xqddf/error_01.spec'
--- test/rbkt/Queries/zorba/xqddf/error_01.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_01.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDST0027
+Error: http://zorba.io/errors:ZDST0027

=== modified file 'test/rbkt/Queries/zorba/xqddf/error_02.spec'
--- test/rbkt/Queries/zorba/xqddf/error_02.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_02.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDST0027
+Error: http://zorba.io/errors:ZDST0027

=== modified file 'test/rbkt/Queries/zorba/xqddf/error_03.spec'
--- test/rbkt/Queries/zorba/xqddf/error_03.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_03.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDST0027
+Error: http://zorba.io/errors:ZDST0027

=== modified file 'test/rbkt/Queries/zorba/xqddf/ic-forEach-err.spec'
--- test/rbkt/Queries/zorba/xqddf/ic-forEach-err.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/ic-forEach-err.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0033
+Error: http://zorba.io/errors:ZDDY0033

=== modified file 'test/rbkt/Queries/zorba/xqddf/ic-foreignKey-err.spec'
--- test/rbkt/Queries/zorba/xqddf/ic-foreignKey-err.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/ic-foreignKey-err.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0033
+Error: http://zorba.io/errors:ZDDY0033

=== modified file 'test/rbkt/Queries/zorba/xqddf/ic-simple-err.spec'
--- test/rbkt/Queries/zorba/xqddf/ic-simple-err.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/ic-simple-err.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0033
+Error: http://zorba.io/errors:ZDDY0033

=== modified file 'test/rbkt/Queries/zorba/xqddf/ic-uniqueKey-err1.spec'
--- test/rbkt/Queries/zorba/xqddf/ic-uniqueKey-err1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/ic-uniqueKey-err1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0033
+Error: http://zorba.io/errors:ZDDY0033

=== modified file 'test/rbkt/Queries/zorba/xqddf/ic-uniqueKey-err2.spec'
--- test/rbkt/Queries/zorba/xqddf/ic-uniqueKey-err2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/ic-uniqueKey-err2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0033
+Error: http://zorba.io/errors:ZDDY0033

=== modified file 'test/rbkt/Queries/zorba/xqddf/test-node-reference.xq'
--- test/rbkt/Queries/zorba/xqddf/test-node-reference.xq	2013-07-24 08:12:12 +0000
+++ test/rbkt/Queries/zorba/xqddf/test-node-reference.xq	2013-08-07 05:36:24 +0000
@@ -1,6 +1,6 @@
 import module namespace ref = "http://zorba.io/modules/reference";
 
-declare namespace zerr = "http://zorba.io/modules/zorba-errors";
+declare namespace zerr = "http://zorba.io/errors";
 
 declare function local:foo($ref as xs:anyURI) {
   ref:dereference($ref) 

=== modified file 'test/rbkt/Queries/zorba/xqddf/test1.spec'
--- test/rbkt/Queries/zorba/xqddf/test1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqddf/test1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZDDY0001
+Error: http://zorba.io/errors:ZDDY0001

=== modified file 'test/rbkt/Queries/zorba/xqdoc/content_with_error.spec'
--- test/rbkt/Queries/zorba/xqdoc/content_with_error.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqdoc/content_with_error.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQD0002
+Error: http://zorba.io/errors:ZXQD0002

=== modified file 'test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq'
--- test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq	2013-07-16 23:58:03 +0000
+++ test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq	2013-08-07 05:36:24 +0000
@@ -64,8 +64,8 @@
                 ($moduleUri = "http://www.w3.org/2005/xpath-functions/math") or
                 ($moduleUri = "http://www.functx.com/") or
                 ($moduleUri = "http://www.w3.org/2005/xqt-errors") or
-                ($moduleUri = "http://zorba.io/modules/zorba-errors") or
-                ($moduleUri = "http://zorba.io/modules/zorba-warnings") or
+                ($moduleUri = "http://zorba.io/errors") or
+                ($moduleUri = "http://zorba.io/warnings") or
                 ($moduleUri = "http://jsoniq.org/errors") or
                 ($moduleUri = "http://www.zorba-xquery.com/modules/xqdoc/batch") or
                 ($moduleUri = "http://www.zorba-xquery.com/modules/xqdoc/menu") or

=== modified file 'test/rbkt/Queries/zorba/xqueryx/err1.spec'
--- test/rbkt/Queries/zorba/xqueryx/err1.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqueryx/err1.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0032
+Error: http://zorba.io/errors:ZXQP0032

=== modified file 'test/rbkt/Queries/zorba/xqueryx/err2.spec'
--- test/rbkt/Queries/zorba/xqueryx/err2.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqueryx/err2.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZXQP0031
+Error: http://zorba.io/errors:ZXQP0031

=== modified file 'test/rbkt/Queries/zorba/xqxq/query-plan4.spec'
--- test/rbkt/Queries/zorba/xqxq/query-plan4.spec	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/xqxq/query-plan4.spec	2013-08-07 05:36:24 +0000
@@ -1,1 +1,1 @@
-Error: http://zorba.io/modules/zorba-errors:ZCSE0013
+Error: http://zorba.io/errors:ZCSE0013

=== modified file 'test/rbkt/Scripts/w3c/XQFTTS.xml'
--- test/rbkt/Scripts/w3c/XQFTTS.xml	2013-06-25 03:55:20 +0000
+++ test/rbkt/Scripts/w3c/XQFTTS.xml	2013-08-07 05:36:24 +0000
@@ -47,7 +47,7 @@
     <implementation-defined-item 
       name="overwrittenContextComponents"
       spec="XQuery"
-      value="The following static context components are overwritten/augmented: 1. Statically known namespaces: Augmented with zerr –> http://zorba.io/modules/zorba-errors 2. Context item static type: item() 3. Default order for empty sequences: empty_greatest 4. Static Base URI: We use the rules in 4.5, where the implementation-defined default mentioned there is http://www.zorba-xquery.com, 5. Statically known default collection type: item()*">
+      value="The following static context components are overwritten/augmented: 1. Statically known namespaces: Augmented with zerr –> http://zorba.io/errors 2. Context item static type: item() 3. Default order for empty sequences: empty_greatest 4. Static Base URI: We use the rules in 4.5, where the implementation-defined default mentioned there is http://www.zorba-xquery.com, 5. Statically known default collection type: item()*">
       <description last-mod="2005-04-04">Any components of the static context or dynamic context that are overwritten or augmented by the implementation.</description>
     </implementation-defined-item>
     
@@ -504,7 +504,7 @@
       spec="XQuery"
       name="Statically known namespaces" 
       context-type="static" 
-      value="fn –> http://www.w3.org/2005/xpath-functions, xml –> http://www.w3.org/XML/1998/namespace, xs –> http://www.w3.org/2001/XMLSchema, xsi –> http://www.w3.org/2001/XMLSchema-instance, local –> http://www.w3.org/2005/xquery-local-functions, zerr –> http://zorba.io/modules/zorba-errors"/>
+      value="fn –> http://www.w3.org/2005/xpath-functions, xml –> http://www.w3.org/XML/1998/namespace, xs –> http://www.w3.org/2001/XMLSchema, xsi –> http://www.w3.org/2001/XMLSchema-instance, local –> http://www.w3.org/2005/xquery-local-functions, zerr –> http://zorba.io/errors"/>
     
     <context-property
       spec="XQuery"    

=== modified file 'test/rbkt/Scripts/w3c/XQTS.xml'
--- test/rbkt/Scripts/w3c/XQTS.xml	2013-06-25 03:55:20 +0000
+++ test/rbkt/Scripts/w3c/XQTS.xml	2013-08-07 05:36:24 +0000
@@ -46,7 +46,7 @@
    <implementation-defined-item 
     name="overwrittenContextComponents" 
     spec="XQuery"
-    value="The following static context components are overwritten/augmented: 1. Statically known namespaces: Augmented with zerr –> http://zorba.io/modules/zorba-errors 2. Context item static type: item() 3. Default order for empty sequences: empty_greatest 4. Static Base URI: We use the rules in 4.5, where the implementation-defined default mentioned there is http://www.zorba-xquery.com, 5. Statically known default collection type: item()*">
+    value="The following static context components are overwritten/augmented: 1. Statically known namespaces: Augmented with zerr –> http://zorba.io/errors 2. Context item static type: item() 3. Default order for empty sequences: empty_greatest 4. Static Base URI: We use the rules in 4.5, where the implementation-defined default mentioned there is http://www.zorba-xquery.com, 5. Statically known default collection type: item()*">
     <description last-mod="2005-04-04">Any components of the static context or dynamic context that are overwritten or augmented by the implementation.</description>
    </implementation-defined-item>
    
@@ -300,7 +300,7 @@
     <context-property 
      name="Statically known namespaces" 
      context-type="static" 
-     value="fn –> http://www.w3.org/2005/xpath-functions, xml –> http://www.w3.org/XML/1998/namespace, xs –> http://www.w3.org/2001/XMLSchema, xsi –> http://www.w3.org/2001/XMLSchema-instance, local –> http://www.w3.org/2005/xquery-local-functions, zerr –> http://zorba.io/modules/zorba-errors"/>
+     value="fn –> http://www.w3.org/2005/xpath-functions, xml –> http://www.w3.org/XML/1998/namespace, xs –> http://www.w3.org/2001/XMLSchema, xsi –> http://www.w3.org/2001/XMLSchema-instance, local –> http://www.w3.org/2005/xquery-local-functions, zerr –> http://zorba.io/errors"/>
 
     <context-property 
      name="Default element/type namespace"