Merge lp:~zorba-coders/zorba/bug-1189794-core into lp:zorba

[Chris Hillery]

Update core math and random modules to Zorba 3.0 standards.

https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-oauth/+merge/175236

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224

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

[lp:~zorba-coders/zorba/bug-1189794-core]

11559. By Chris Hillery on 2013-07-17

More JSONifying - remove xs:, bareword true/false, etc.

[Zorba Build Bot (zorba-buildbot)]

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224 :
Votes: {'Approve': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224

Stage "CommitZorba" failed.

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

[lp:~zorba-coders/zorba/bug-1189794-core]

11560. By Chris Hillery on 2013-07-17

Update random module namespace URI.

11561. By Chris Hillery on 2013-07-17

JSONify random module.

11562. By Chris Hillery on 2013-07-17

Clean up XQDoc and error codes for random module.

11563. By Chris Hillery on 2013-07-17

s/INVALID_PARAMETER/INVALID_ARGUMENT/

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224

Stage "TestZorbaUbuntu" failed.
14 tests failed (8355 total tests run).

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224
https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-oauth/+merge/175236

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

[Zorba Build Bot (zorba-buildbot)]

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224 :
Votes: {'Approve': 1}

https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-oauth/+merge/175236 :
Votes: {'Approve': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224

Stage "CommitZorba" failed.

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

[lp:~zorba-coders/zorba/bug-1189794-core]

11564. By Chris Hillery on 2013-07-17

Merge from trunk.

11565. By Chris Hillery on 2013-07-17

Move base64 module into atomic/ directory.

[Luis Rodriguez Gonzalez (kuraru)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-core/+merge/175224
https://code.launchpad.net/~zorba-coders/zorba/bug-1189794-oauth/+merge/175236

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt	2013-07-17 07:20:31 +0000
+++ modules/CMakeLists.txt	2013-07-17 15:56:30 +0000
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ADD_SUBDIRECTORY(atomic)
 ADD_SUBDIRECTORY(com)
 ADD_SUBDIRECTORY(org)
 ADD_SUBDIRECTORY(functx)
@@ -20,7 +21,6 @@
 ADD_SUBDIRECTORY(full-text)
 ADD_SUBDIRECTORY(json)
 ADD_SUBDIRECTORY(nodes)
-ADD_SUBDIRECTORY(base64)
 
 # Add external module projects - any subdirectories of a directory
 # named "zorba_modules" as a sibling to the main Zorba source

=== added directory 'modules/atomic'
=== added file 'modules/atomic/CMakeLists.txt'
--- modules/atomic/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/atomic/CMakeLists.txt	2013-07-17 15:56:30 +0000
@@ -0,0 +1,20 @@
+# Copyright 2013 The FLWOR Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+DECLARE_ZORBA_MODULE(FILE math.xq VERSION 1.0
+  URI "http://zorba.io/modules/math")
+DECLARE_ZORBA_MODULE(FILE random.xq VERSION 1.0
+  URI "http://zorba.io/modules/random")
+DECLARE_ZORBA_MODULE(FILE base64.xq VERSION 1.0
+  URI "http://zorba.io/modules/base64")

=== renamed file 'modules/base64/base64.xq' => 'modules/atomic/base64.xq'
=== renamed file 'modules/com/zorba-xquery/www/modules/math.xq' => 'modules/atomic/math.xq'
--- modules/com/zorba-xquery/www/modules/math.xq	2013-06-15 16:20:18 +0000
+++ modules/atomic/math.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
-xquery version "3.0";
+jsoniq version "1.0";
 
 (:
  : Copyright 2006-2009 The FLWOR Foundation.
@@ -17,12 +17,12 @@
 :)
 
 (:~
- : Extensive math library.
+ : Extensive math library.<p/>
  :
  : @author Daniel Turcanu, Dan Muresan
  : @project Zorba/XQuery Data Model/Atomic/Math
  :)
-module namespace math = "http://www.zorba-xquery.com/modules/math";
+module namespace math = "http://zorba.io/modules/math";
 
 (:~
  : W3C Math namespace URI.
@@ -30,42 +30,23 @@
 declare namespace W3Cmath = "http://www.w3.org/2005/xpath-functions/math";
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
-declare option ver:module-version "2.0";
-
-(:~
- : Errors namespace URI.
-:)
-declare variable $math:errNS as xs:string := "http://www.zorba-xquery.com/modules/math";
-
-(:~
- : xs:QName with namespace URI="http://www.zorba-xquery.com/modules/math" and local name "math:Value" 
-:)
-declare variable $math:errValue as xs:QName := fn:QName($math:errNS, "math:Value");
-
-(:~
- : xs:QName with namespace URI="http://www.zorba-xquery.com/modules/math" and local name "math:Num"
-:)
-declare variable $math:errNum as xs:QName := fn:QName($math:errNS, "math:Num");
-
-(:~
- : xs:QName with namespace URI="http://www.zorba-xquery.com/modules/math" and local name "math:Div0"
-:)
-declare variable $math:errDiv0 as xs:QName := fn:QName($math:errNS, "math:Div0");
-
-(:~
- : xs:QName with namespace URI="http://www.zorba-xquery.com/modules/math" and local name "math:NA"
-:)
-declare variable $math:errNA as xs:QName := fn:QName($math:errNS, "math:NA");
-
-
-(:~
- : Returns the hyperbolic cosine of x.
+declare option ver:module-version "1.0";
+
+declare %private variable $math:errNS as string := "http://zorba.io/modules/math";
+declare %private variable $math:VALUE_NOT_NUMERIC as QName := fn:QName($math:errNS, "math:VALUE_NOT_NUMERIC");
+declare %private variable $math:INVALID_ARGUMENT as QName := fn:QName($math:errNS, "math:INVALID_ARGUMENT");
+declare %private variable $math:DIVIDE_BY_0 as QName := fn:QName($math:errNS, "math:DIVIDE_BY_0");
+declare %private variable $math:INVALID_INPUT as QName := fn:QName($math:errNS, "math:INVALID_INPUT");
+
+
+(:~
+ : Returns the hyperbolic cosine of x.<p/>
  : If the result it too large, INF is returned.
  : 
  : @param $arg must be smaller than 7.104760e+002
  : @return cosh(arg)
  :)
-declare function math:cosh ($arg as xs:double) as xs:double external;
+declare function math:cosh ($arg as double) as double external;
 
 (:~
  : Inverse hyperbolic cosine.
@@ -73,7 +54,7 @@
  : @param $arg the arg
  : @return the result of acosh(arg)
  :)
-declare function math:acosh ($arg as xs:double) as xs:double external;
+declare function math:acosh ($arg as double) as double external;
 
 (:~
  : Function performing the modulo operation between the two arguments.
@@ -82,51 +63,51 @@
  : @param $y the y
  : @return The remainder of x/y.
  :)
-declare function math:fmod ($x as xs:double, $y as xs:double) as xs:double external;
+declare function math:fmod ($x as double, $y as double) as double external;
 
 (:~
- : Returns the argument split as mantissa and exponent. 
+ : Returns the argument split as mantissa and exponent.<p/>
  : The recombining formula is (mantissa * 2^exponent).
  : 
  : @param $arg the double to be split.
  : @return A sequence of two doubles (mantissa, exponent)
  :)
-declare function math:frexp ($arg as xs:double) as xs:double+ external;
+declare function math:frexp ($arg as double) as double+ external;
 
 (:~
- : Computes a real number from the mantissa and exponent.
+ : Computes a real number from the mantissa and exponent.<p/>
  : The formula is (x * 2^i).
  : 
  : @param $x the mantissa
  : @param $i the exponent
  : @return the computed real number
  :)
-declare function math:ldexp ($x as xs:double, $i as xs:integer) as xs:double external;
+declare function math:ldexp ($x as double, $i as integer) as double external;
 
 (:~
- : Splits a floating-point value into fractional and integer parts.
+ : Splits a floating-point value into fractional and integer parts.<p/>
  : Both the fraction and integer keep the original sign of the value.
  : 
  : @param $arg the double to be split.
  : @return A sequence of two doubles (fraction, integer)
  :)
-declare function math:modf ($arg as xs:double) as xs:double+ external;
+declare function math:modf ($arg as double) as double+ external;
 
 (:~
- : Calculate hyperbolic sine.
+ : Calculate the hyperbolic sine.
  :
  : @param $arg the arg
  : @return the result of sinh(arg)
  :)
-declare function math:sinh ($arg as xs:double) as xs:double external;
+declare function math:sinh ($arg as double) as double external;
 
 (:~
- : Inverse hyperbolic sine of the number.
+ : Calculate the inverse hyperbolic sine.
  :
  : @param $arg the arg
  : @return the result of asinh(arg)
  :)
-declare function math:asinh($arg as xs:double) as xs:double external;
+declare function math:asinh($arg as double) as double external;
 
 (:~
  : Calculate the hyperbolic tangent.
@@ -134,7 +115,7 @@
  : @param $arg the arg
  : @return the result of tanh(arg)
  :)
-declare function math:tanh($arg as xs:double) as xs:double external;
+declare function math:tanh($arg as double) as double external;
 
 (:~
  : Calculate the hyperbolic tangent.
@@ -142,27 +123,27 @@
  : @param $arg must be in range -1 ... +1 (exclusive)
  : @return the result of atanh(arg)
  :)
-declare function math:atanh($arg as xs:double) as xs:double external;
+declare function math:atanh($arg as double) as double external;
 
 (:~
- : Convert angle from degrees to radians. <br/>
+ : Convert angle from degrees to radians. <p/>
  : The parameter is first converted to value range of (-360, 360).
  : 
  : @param $deg angle in  degrees
  : @return value in radians (-2PI, 2PI)
  :)
-declare function math:deg-to-rad($deg as xs:double) as xs:double
+declare function math:deg-to-rad($deg as double) as double
 {
   ($deg mod 360) * 2 * W3Cmath:pi() div 360
 };
 
 (:~
- : Convert angle from radians to degrees. <br/>
+ : Convert angle from radians to degrees. <p/>
  : 
  : @param $rad value in radians
  : @return value in degrees (-360, 360)
  :)
-declare function math:rad-to-deg($rad as xs:double) as xs:double
+declare function math:rad-to-deg($rad as double) as double
 {
   ($rad * 360 div 2 div W3Cmath:pi()) mod 360
 };
@@ -173,7 +154,7 @@
  : @param $arg the double to be checked
  : @return boolean true if argument is pos INF or neg INF
  :)
-declare function math:is_inf($arg as xs:double) as xs:boolean external;
+declare function math:is_inf($arg as double) as boolean external;
 
 (:~
  : Checks if the double value is Not a Number (NaN).
@@ -181,7 +162,7 @@
  : @param $arg the arg
  : @return boolean true if the double is NaN
  :)
-declare function math:is_nan($arg as xs:double) as xs:boolean external;
+declare function math:is_nan($arg as double) as boolean external;
 
 
 
@@ -189,58 +170,59 @@
 (:Excel math functions:)
 
 (:~
- : Borrowed from excel module.<br/>
- : Checks if the xs:anyAtomicType argument is actually a numeric type
- : or can be converted to numeric.
+ : Checks if the anyAtomicType argument is actually a numeric type
+ : or can be converted to numeric.<p/>
+ : Borrowed from excel module.
  : 
  : @param $value Parameter to be checked.
  : @return true if the value can be casted to numeric.
  :)
-declare function math:is-a-number($value as xs:anyAtomicType) as xs:boolean 
+declare function math:is-a-number($value as anyAtomicType) as boolean 
 {   
-  fn:string(fn:number($value)) ne 'NaN' 
+  fn:string(fn:number($value)) ne "NaN"
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Cast the xs:anyAtomicType to a numeric type.
+ : Cast the anyAtomicType to a numeric type.<p/>
  : If the value is already of a numeric type then nothing is changed.
  : Otherwise the value is casted to the numeric type that is most appropriate.
+ : <p/>
+ : Borrowed from excel module.
  : 
  : @param $number The parameter can be a number, string, boolean value.
  : @return The casted value.
- : @error math:errValue if the value cannot be casted to numeric type.
+ : @error math:VALUE_NOT_NUMERIC if the value cannot be casted to numeric type.
  :)
-declare function math:cast-as-numeric($number as xs:anyAtomicType) as xs:anyAtomicType
+declare function math:cast-as-numeric($number as anyAtomicType) as anyAtomicType
 {
   typeswitch ($number) 
-    case xs:double return $number
-    case xs:decimal return $number
-    case xs:double return $number
-    case xs:float return $number
+    case double return $number
+    case decimal return $number
+    case double return $number
+    case float return $number
     default return
-      if ($number castable as xs:integer) then
-        xs:integer($number)
-      else if ($number castable as xs:decimal) then
-        xs:decimal($number)
-      else if ($number castable as xs:double) then
-        xs:double($number)
+      if ($number castable as integer) then
+        integer($number)
+      else if ($number castable as decimal) then
+        decimal($number)
+      else if ($number castable as double) then
+        double($number)
       else
-        fn:error($math:errValue, "Provided value is not a number", $number)
+        fn:error($math:VALUE_NOT_NUMERIC, "Provided value is not a number", $number)
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns number rounded up, away from zero, to the nearest multiple of significance.
+ : Returns number rounded up, away from zero, to the nearest multiple of significance.<p/>
  : Significance must have the same sign as number.
  : Number and significance must be of a numeric type or castable to numeric.
- : Significance must not be zero.
+ : Significance must not be zero.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052090071033.aspx
  : @param $number The value you want to round.
  : @param $significance The multiple to which you want to round.
  : @return The rounded value.
- : @error math:errNum if significance is zero or it doesn't have the same sign as number.
+ : @error math:INVALID_ARGUMENT if significance is zero or it doesn't have the same sign as number.
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_ceiling1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_ceiling2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_ceiling3.xq
@@ -250,21 +232,21 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_ceiling7.xq
  :)
 declare function math:ceiling(
-  $number        as xs:double,
-  $significance  as xs:double) as xs:double
+  $number        as double,
+  $significance  as double) as double
 {
   if ($significance eq 0) then
-    fn:error($math:errNum, "Ceiling function does not accept significance 0")
+    fn:error($math:INVALID_ARGUMENT, "Ceiling function does not accept significance 0")
   else if ($number * $significance ge 0) then
 	  fn:ceiling($number div $significance) * $significance
   else
-    fn:error($math:errNum, "Ceiling function: both arguments must have the same sign")
+    fn:error($math:INVALID_ARGUMENT, "Ceiling function: both arguments must have the same sign")
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns number rounded up to the nearest even integer.
- : Regardless of the sign of number, a value is rounded up when adjusted away from zero. 
+ : Returns number rounded up to the nearest even integer.<p/>
+ : Regardless of the sign of number, a value is rounded up when adjusted away from zero.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052090801033.aspx
  : @param $number The value to round.
@@ -276,14 +258,14 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_even5.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_even6.xq
  :)
-declare function math:even($number as xs:double) as xs:integer
+declare function math:even($number as double) as integer
 {
   let $num := $number
   return
-    if ($num = 0) then
+    if ($num eq 0) then
       0
     else
-      let $intnum := xs:integer(math:ceiling($num, math:sign($num)))
+      let $intnum := integer(math:ceiling($num, math:sign($num)))
       return
         if ($intnum mod 2 ne 0) then
           if ($intnum gt 0) then
@@ -295,58 +277,57 @@
 };
 
 (:~
+ : Function for computing factorial.<p/>
+ : This recursive function computes: number * fact(number-1)<p/>
  : Borrowed from excel module.<br/>
- : Function for computing factorial.
- : This function should not be used outside this module.
- : This recursive function computes: number * fact(number-1)
  : 
  : @param $intnum A positive integer.
  : @return The factorial of intnum.
 :)
-declare %private function math:fact-integer($intnum as xs:integer) as xs:integer
+declare %private function math:fact-integer($intnum as integer) as integer
 {
-  if ($intnum = 1) then
+  if ($intnum eq 1) then
     1
   else
     $intnum * math:fact-integer($intnum - 1)
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the factorial of a number.
+ : Returns the factorial of a number.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052090841033.aspx
  : @param $number The non-negative number you want the factorial of.
  : @return Returns the factorial of a number. The factorial of a number is equal to 1*2*3*...* number.
- : @error math:errNum if the number is smaller than zero
+ : @error math:INVALID_ARGUMENT if the number is smaller than zero
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_fact1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_fact2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_fact3.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_fact4.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_fact5.xq
 :)
-declare function math:fact($number as xs:integer) as xs:integer
+declare function math:fact($number as integer) as integer
 {
   let $num := $number return
     if ($num eq 0) then
       1
     else
       if ($num lt 0) then
-        fn:error($math:errNum, "Fact function does not accept numbers smaller than zero")
+        fn:error($math:INVALID_ARGUMENT, "Fact function does not accept numbers smaller than zero")
       else
-        math:fact-integer(xs:integer($num))
+        math:fact-integer(integer($num))
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Rounds number down, toward zero, to the nearest multiple of significance.
+ : Rounds number down, toward zero, to the nearest multiple of significance.<p/>
  : Significance must have the same sign as number.
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052090941033.aspx
  : @param $number The value you want to round. 
  : @param $significance The multiple to which you want to round.
  : @return The rounded value as numeric type.
- : @error math:errNum if significance is zero or it doesn't have the same sign as number.
+ : @error math:INVALID_ARGUMENT if significance is zero or it doesn't have the same sign as number.
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_floor1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_floor2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_floor3.xq
@@ -354,24 +335,24 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_floor5.xq
 :)
 declare function math:floor(
-  $number as xs:double,
-  $significance as xs:double) as xs:double
+  $number as double,
+  $significance as double) as double
 {
   let $num := $number
   let $sig := $significance
   return
     if ($sig eq 0) then
-      fn:error($math:errNum, "Floor function does not accept significance 0")
+      fn:error($math:INVALID_ARGUMENT, "Floor function does not accept significance 0")
     else if ($num * $sig ge 0) then
       fn:floor($num div $sig) * $sig
     else
-      fn:error($math:errNum, "Floor function: both arguments must have the same sign")
+      fn:error($math:INVALID_ARGUMENT, "Floor function: both arguments must have the same sign")
 };
  
 (:~
- : Borrowed from excel module.<br/>
- : Rounds a number down to the nearest integer.
- : Positive numbers are rounded toward zero, negative numbers are rounded away from zero.
+ : Rounds a number down to the nearest integer.<p/>
+ : Positive numbers are rounded toward zero, negative numbers are rounded away from zero.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052091421033.aspx
  : @param $number The value to be rounded.
@@ -381,35 +362,35 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_int3.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_int4.xq
 :)
-declare function math:int($number as xs:double) as xs:integer
+declare function math:int($number as double) as integer
 {
-  xs:integer(fn:floor($number))
+  integer(fn:floor($number))
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the remainder after number is divided by divisor.
- : The result has the same sign as divisor.
+ : Returns the remainder after number is divided by divisor.<p/>
+ : The result has the same sign as divisor.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052091821033.aspx
  : @param $number The number for which you want to find the remainder.
  : @param $divisor The number by which you want to divide number.
  :        This cannot be zero.
  : @return The remainder from division as numeric type.
- : @error math:errDiv0 if divisor is zero after casting to numeric.
+ : @error math:DIVIDE_BY_0 if divisor is zero after casting to numeric.
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_mod1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_mod2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_mod3.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_mod4.xq
  :)
 declare function math:mod(
-  $number as xs:double,
-  $divisor as xs:double) as xs:double
+  $number as double,
+  $divisor as double) as double
 {
   let $num := $number
   let $div := $divisor return
     if ($div eq 0) then
-      fn:error($math:errDiv0, "Mod operator: divide by 0")
+      fn:error($math:DIVIDE_BY_0, "Mod operator: divide by 0")
     else
       let $result := $num mod $div
       return
@@ -420,8 +401,8 @@
 };
  
 (:~
- : Borrowed from excel module.<br/>
- : Returns number rounded up to the nearest odd integer, away from zero.
+ : Returns number rounded up to the nearest odd integer, away from zero.<p/>
+ : Borrowed from excel module.
  : 
  : @see  http://office.microsoft.com/en-us/excel/HP052092031033.aspx
  : @param $number The value to round.
@@ -433,33 +414,32 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_odd5.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_odd6.xq
  :)
-declare function math:odd($number as xs:double) as xs:integer
+declare function math:odd($number as double) as integer
 {
   let $num := $number return
   if ($num eq 0) then
     1
   else
-    let $intnum := xs:integer(math:ceiling($num, math:sign($num)))
+    let $intnum := integer(math:ceiling($num, math:sign($num)))
     return
       if ($intnum mod 2 eq 0) then
         if ($intnum ge 0) then
-          ($intnum + 1) cast as xs:integer
+          ($intnum + 1) cast as integer
         else
-          ($intnum - 1) cast as xs:integer
+          ($intnum - 1) cast as integer
       else
-        $intnum cast as xs:integer
+        $intnum cast as integer
 };
  
 (:~
- : Borrowed from excel module.<br/>
- : Function for product.
- : This function should not be used outside this module.
- : Multiplies all numbers in the sequence.
+ : Function for product.<p/>
+ : Multiplies all numbers in the sequence.<p/>
+ : Borrowed from excel module.
  :
  : @param $numbers The list of arguments to be casted to numeric and multiplied.
  : @return The multiplication result as numeric type.
  :)
-declare %private function math:product-internal($numbers as xs:double*) as xs:double
+declare %private function math:product-internal($numbers as double*) as double
 {
   if (fn:empty($numbers)) then
     1
@@ -470,8 +450,8 @@
 };
  
 (:~
- : Borrowed from excel module.<br/>
- : Multiplies all the numbers given as arguments and returns the product.
+ : Multiplies all the numbers given as arguments and returns the product.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092231033.aspx
  : @param $numbers The sequence of arguments convertible to numeric types.
@@ -483,7 +463,7 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_product4.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_product5.xq
  :)
-declare function math:product($numbers as xs:double*) as xs:double
+declare function math:product($numbers as double*) as double
 {
   if (fn:empty($numbers)) then
     0
@@ -492,40 +472,40 @@
 };
  
 (:~
- : Borrowed from excel module.<br/>
- : Returns the integer portion of a division.
+ : Returns the integer portion of a division.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092271033.aspx
  : @param $numerator The divider.
  : @param $denominator The divisor. It cannot be zero.
  : @return The result value as numeric type.
- : @error math:errDiv0 if denominator casted as numeric type has value zero.
+ : @error math:DIVIDE_BY_0 if denominator casted as numeric type has value zero.
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_quotient1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_quotient2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_quotient3.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_quotient4.xq
  :)
 declare function math:quotient(
-  $numerator   as xs:double,
-  $denominator as xs:double) as xs:integer
+  $numerator   as double,
+  $denominator as double) as integer
 {
   let $numer := $numerator
   let $denom := $denominator
   return
     if ($denom eq 0) then
-      fn:error($math:errDiv0, "Quotient function: divide by 0")
+      fn:error($math:DIVIDE_BY_0, "Quotient function: divide by 0")
     else
-      xs:integer($numer div $denom)
+      integer($numer div $denom)
 };
  
 (:~
- : Borrowed from excel module.<br/>
- : Rounds a number to a specified number of digits.
+ : Rounds a number to a specified number of digits.<p/>
  : If precision is greater than 0 (zero), then number is rounded 
  : to the specified number of decimal places.
  : If num_digits is 0, then number is rounded to the nearest integer.
  : If num_digits is less than 0, then number is rounded to the left of the decimal point.
- : The 0.5 is rounded away from zero. 
+ : The 0.5 is rounded away from zero. <p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092391033.aspx
  : @param $number The number to round.
@@ -537,8 +517,8 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_round4.xq
  :)
 declare function math:round(
-  $number as xs:double,
-  $precision as xs:integer) as xs:double
+  $number as double,
+  $precision as integer) as double
 {
   let $num := $number
   return
@@ -559,12 +539,12 @@
 };
   
 (:~
- : Borrowed from excel module.<br/>
- : Rounds a number down, toward zero.
+ : Rounds a number down, toward zero.<p/>
  : If num_digits is greater than 0 (zero), then number is rounded down 
  : to the specified number of decimal places. 
  : If num_digits is 0, then number is rounded down to the nearest integer. 
- : If num_digits is less than 0, then number is rounded down to the left of the decimal point. 
+ : If num_digits is less than 0, then number is rounded down to the left of the decimal point. <p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092411033.aspx
  : @param $number The number to round
@@ -577,8 +557,8 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_rounddown5.xq
  :)
 declare function math:rounddown(
-  $number     as xs:double,
-  $precision  as xs:integer) as xs:double
+  $number     as double,
+  $precision  as integer) as double
 {
   let $num := $number
   return
@@ -599,12 +579,12 @@
 };
  
 (:~
- : Borrowed from excel module.<br/>
- : Rounds a number up, away from 0 (zero).
+ : Rounds a number up, away from 0 (zero).<p/>
  : If num_digits is greater than 0 (zero), then number is rounded down 
  : to the specified number of decimal places. 
  : If num_digits is 0, then number is rounded down to the nearest integer. 
- : If num_digits is less than 0, then number is rounded down to the left of the decimal point. 
+ : If num_digits is less than 0, then number is rounded down to the left of the decimal point. <p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092421033.aspx
  : @param $number The number to round
@@ -617,8 +597,8 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_roundup5.xq
  :)
 declare function math:roundup(
-  $number     as xs:double,
-  $precision  as xs:integer) as xs:double
+  $number     as double,
+  $precision  as integer) as double
 {
   let $num := $number
   return
@@ -639,10 +619,10 @@
 };
  
 (:~
- : Borrowed from excel module.<br/>
- : Determines the sign of a number. 
+ : Determines the sign of a number. <p/>
  : Returns 1 if the number is positive, zero (0) if the number is 0, 
- : and -1 if the number is negative.
+ : and -1 if the number is negative.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092551033.aspx
  : @param $number The argument
@@ -651,7 +631,7 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_sign2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_sign3.xq
  :)
-declare function math:sign($number as xs:double) as xs:integer
+declare function math:sign($number as double) as integer
 {
   let $num := $number
   return
@@ -664,8 +644,8 @@
  };
 
 (:~
- : Borrowed from excel module.<br/>
- : Truncates a number to an integer by removing the fractional part of the number.
+ : Truncates a number to an integer by removing the fractional part of the number.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052093241033.aspx
  : @param $number The argument .
@@ -673,15 +653,15 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_trunc1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_trunc2.xq
  :)
-declare function math:trunc($number as xs:double ) as xs:integer
+declare function math:trunc($number as double ) as integer
 {
-  xs:integer($number)
+  integer($number)
 };
  
 (:~
- : Borrowed from excel module.<br/>
- : Truncates a number down to precision.
- : This behaves exactly like rounddown.
+ : Truncates a number down to precision.<p/>
+ : This behaves exactly like rounddown.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052093241033.aspx
  : @param $number The argument castable to numeric type.
@@ -690,22 +670,22 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_trunc3.xq
  :)
 declare function math:trunc(
-  $number as xs:double,
-  $precision as xs:integer) as xs:double
+  $number as double,
+  $precision as integer) as double
 {
   math:rounddown($number, $precision)
 };
  
 (:~
- : Borrowed from excel module.<br/>
+ : Sorts a sequence of numbers or arguments castable to numeric.<p/>
+ : It first casts all arguments to numeric and then sorts ascending.<p/>
  : Helper function.<br/>
- : Sorts a sequence of numbers or arguments castable to numeric.
- : It first casts all arguments to numeric and then sorts ascending.
+ : Borrowed from excel module.
  :  
  : @param $numbers The sequence of arguments castable to numeric.
  : @return The sorted sequence as numeric types.
  :)
-declare function math:sort-numbers($numbers as xs:double*) as xs:double*
+declare function math:sort-numbers($numbers as double*) as double*
 {
   let $sorted-numbers :=
     (
@@ -718,21 +698,21 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the double factorial of a number.
- : Computes the double factorial of n as n(n-2)(n-4)...
+ : Returns the double factorial of a number.<p/>
+ : Computes the double factorial of n as n(n-2)(n-4)...<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052090851033.aspx
  : @param $number The positive integer value.
  : @return The result as integer.
- : @error math:errNum if the number is negative.
+ : @error math:INVALID_ARGUMENT if the number is negative.
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_factdouble1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_factdouble2.xq
  :)
-declare function math:factdouble($number as xs:integer) as xs:integer
+declare function math:factdouble($number as integer) as integer
 {
   if ($number lt 0) then
-    fn:error($math:errNum, "Factdouble function: number should be greater than zero or equal")
+    fn:error($math:INVALID_ARGUMENT, "Factdouble function: number should be greater than zero or equal")
   else if ($number eq 1) then
     1
   else if ($number eq 2) then
@@ -742,16 +722,15 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Function for computing GCD.
- : This function should not be used outside this module.
+ : Function for computing GCD.<p/>
  : It calculates the minimum value from a sequence of positive integers, 
- : not taking into account the zero value.
+ : not taking into account the zero value.<p/>
+ : Borrowed from excel module.
  : 
  : @param $numbers The sequence of positive integers.
  : @return The minimum value. If the sequence contains only zero values, then zero is returned.
  :)
-declare %private function math:min-without-zero($numbers as xs:integer+) as xs:integer
+declare %private function math:min-without-zero($numbers as integer+) as integer
 {
   if (fn:count($numbers) eq 1) then
     $numbers[1]
@@ -769,36 +748,33 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Function for computing GCD.
- : This function should not be used outside this module.
- : Checks if all integer numbers from a sequence divide exactly to a divider.
+ : Function for computing GCD.<p/>
+ : Checks if all integer numbers from a sequence divide exactly to a divider.<p/>
+ : Borrowed from excel module.
  :
  : @param $numbers The positive integers.
  : @param $divider The divider to be tried.
  : @return true if the numbers divide exactly.
 :)
 declare %private function math:try-exact-divide(
-  $numbers as xs:integer*,
-  $divider as xs:integer) as xs:boolean
+  $numbers as integer*,
+  $divider as integer) as boolean
 {
   if (fn:empty($numbers)) then
-    fn:true()
+    true
   else
     if ($numbers[1] mod $divider ne 0) then
-      fn:false()
+      false
     else
       math:try-exact-divide(fn:subsequence($numbers, 2), $divider)
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Function for computing GCD.
- : This function should not be used outside this module.
+ : Function for computing GCD.<p/>
  : This function iterates through possible divisors and checks if the sequence
  : divides exactly to any of those. It starts from the minimum value from the
- : sequence and searches downwards.
- :
+ : sequence and searches downwards.<p/>
+ : Borrowed from excel module.
  : @param $numbers The sequence of positive integers.
  : @param $min-nonzero The minimum value of numbers sequence, excluding the zero value.
  : @param $iteration Which iteration is it. It starts from 1 and continues
@@ -806,9 +782,9 @@
  : @return The greatest common divisor if found, or 1 if not found.
  :)
 declare %private function math:iterate-all-gcd(
-  $numbers as xs:integer*, 
-  $min-nonzero as xs:integer,
-  $iteration as xs:integer) as xs:integer
+  $numbers as integer*, 
+  $min-nonzero as integer,
+  $iteration as integer) as integer
 {
   if ($min-nonzero mod $iteration eq 0) then
     if (math:try-exact-divide($numbers, $min-nonzero idiv $iteration)) then
@@ -816,21 +792,21 @@
     else
       math:iterate-all-gcd($numbers, $min-nonzero, $iteration + 1)
   else
-    if ($iteration > $min-nonzero idiv 2) then
+    if ($iteration gt $min-nonzero idiv 2) then
       1
     else
       math:iterate-all-gcd($numbers, $min-nonzero, $iteration + 1)
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the greatest common divisor GCD of a sequence of integers.
- : The sequence can have one or more positive integers.
+ : Returns the greatest common divisor GCD of a sequence of integers.<p/>
+ : The sequence can have one or more positive integers.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052091041033.aspx
  : @param $numbers The sequence of positive integers.
  : @return The GCD as integer.
- : @error math:errNum if any number is smaller than zero.
+ : @error math:INVALID_ARGUMENT if any number is smaller than zero.
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_gcd1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_gcd2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_gcd3.xq
@@ -840,15 +816,15 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_gcd7.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_gcd8.xq
  :)
-declare function math:gcd($numbers as xs:integer+) as xs:integer
+declare function math:gcd($numbers as integer+) as integer
 {
-  if (fn:count($numbers) = 1) then
+  if (fn:count($numbers) eq 1) then
     $numbers[1]
   else
     let $minval := math:min-without-zero($numbers)
     return
       if ($minval lt 0) then
-        fn:error($math:errNum, "gcd function: numbers should be greater than zero or equal")
+        fn:error($math:INVALID_ARGUMENT, "gcd function: numbers should be greater than zero or equal")
       else if ($minval eq 0) then
         0
       else 
@@ -856,22 +832,22 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the least common multiple of integers.<br/>
- : LCM for two numbers is computed by multiplying them and dividing with GCD. <br/>
- : The function is applied recursively replacing the first two numbers in the sequence with their LCM.
+ : Returns the least common multiple of integers.<p/>
+ : LCM for two numbers is computed by multiplying them and dividing with GCD.
+ : The function is applied recursively replacing the first two numbers in the sequence with their LCM.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052091521033.aspx
  : @param $numbers The sequence of one or more positive integers.
  : @return The LCM as integer.
- : @error math:errNum if any number is smaller than zero.
+ : @error math:INVALID_ARGUMENT if any number is smaller than zero.
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_lcm1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_lcm2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_lcm3.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_lcm4.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_lcm5.xq
  :)
-declare function math:lcm($numbers as xs:integer+) as xs:integer
+declare function math:lcm($numbers as integer+) as integer
 {
   if(count($numbers) eq 1) then
     $numbers[1]
@@ -889,11 +865,11 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns a number rounded to the desired multiple.
+ : Returns a number rounded to the desired multiple.<p/>
  : MROUND rounds up, away from zero, if the remainder of dividing number by multiple
  : is greater than or equal to half the value of multiple.
- : MROUND is computed through math:floor function.
+ : MROUND is computed through math:floor function.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052091851033.aspx
  : @param $number The value to round, 
@@ -904,8 +880,8 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_mround3.xq
  :)
 declare function math:mround(
-  $number   as xs:decimal,
-  $multiple as xs:double) as xs:double
+  $number   as decimal,
+  $multiple as double) as double
 {
   let $num := $number
   let $mul := $multiple
@@ -923,25 +899,25 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Converts an Arabic numeral to roman, as text.
- : Only the classic format is supported (out of all formats Excel requires).<br/>
+ : Converts an Arabic numeral to roman, as text.<p/>
+ : Only the classic format is supported (out of all formats Excel requires).
  : M is the largest digit, it represents 1000.
- : Numbers bigger than 2000 will be represented by a sequence of "M".<br/>
- : D = 500, C = 100, L = 50, X = 10, V = 5, I = 1.
+ : Numbers bigger than 2000 will be represented by a sequence of "M".
+ : D = 500, C = 100, L = 50, X = 10, V = 5, I = 1.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092381033.aspx
  : @param $number A positive integer.
  : @return The roman string representation.
- : @error math:errNum if the input integer is negative 
+ : @error math:INVALID_ARGUMENT if the input integer is negative 
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_roman1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_roman2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_roman3.xq
  :)
-declare function math:roman($number as xs:integer) as xs:string
+declare function math:roman($number as integer) as string
 {
   if ($number lt 0) then
-    fn:error($math:errNum, "Roman function: number should be greater than zero or equal")
+    fn:error($math:INVALID_ARGUMENT, "Roman function: number should be greater than zero or equal")
   else if ($number ge 1000) then
     fn:concat("M", math:roman($number - 1000))
   else if ($number ge 900) then
@@ -1003,9 +979,9 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
  : Multiplies the elements on the same position in each sequence
- : and sums up the results.
+ : and sums up the results.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092931033.aspx
  : @param $array1 the sequences of numbers
@@ -1013,8 +989,8 @@
  : @return the sum of products
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_sumproduct2.xq
 :)
- declare function math:sumproduct( $array1 as xs:double*,
-                                    $array2 as xs:double*  ) as xs:double
+ declare function math:sumproduct( $array1 as double*,
+                                    $array2 as double*  ) as double
  {
     if( fn:empty($array1) or 
         fn:empty($array2)) 
@@ -1026,16 +1002,16 @@
  };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the sum of the squares of the arguments.
- : It uses the sumproduct function.
+ : Returns the sum of the squares of the arguments.<p/>
+ : It uses the sumproduct function.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092951033.aspx
  : @param $numbers the sequence of one or more numbers
  : @return the sum of squared values, as numeric type
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_sumsq1.xq
 :)
- declare function math:sumsq( $numbers as xs:double+) as xs:double
+ declare function math:sumsq( $numbers as double+) as double
  {
    math:sumproduct($numbers, $numbers)
  };
@@ -1045,12 +1021,11 @@
 (:Excel statistical functions :)
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the median of the given numbers. 
+ : Returns the median of the given numbers. <p/>
  : The median is the number in the middle of a set of numbers.
  : Half the numbers have values that are greater than the median, 
- : and half the numbers have values that are less than the median. 
- : 
+ : and half the numbers have values that are less than the median. <p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052091741033.aspx
  : @param $numbers the sequence of numbers, of any length
@@ -1059,71 +1034,71 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_median1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_median2.xq
 :)
-declare function math:median( $numbers as xs:double* ) as xs:double
+declare function math:median( $numbers as double* ) as double
 {
   let $number_count := fn:count( $numbers )
   let $sorted_numbers := math:sort-numbers( $numbers ) return
-  if ($number_count mod 2 != 0) then
+  if ($number_count mod 2 ne 0) then
     $sorted_numbers[$number_count idiv 2 + 1]
   else
-    if ($number_count = 0) then
+    if ($number_count eq 0) then
       0
     else
       ($sorted_numbers[$number_count idiv 2] + $sorted_numbers[$number_count idiv 2 + 1] ) div 2
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the most frequently occurring, or repetitive, value in a sequence.
+ : Returns the most frequently occurring, or repetitive, value in a sequence.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052091831033.aspx
  : @param $numbers the sequence of numbers, of any length
  : @return The most occuring number
- : @error math:errNA if there are no duplicate numbers
+ : @error math:INVALID_INPUT if there are no duplicate numbers
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_mode1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_mode2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_mode3.xq
 :)
-declare function math:mode( $numbers as xs:double* ) as xs:double
+declare function math:mode( $numbers as double* ) as double
 {
   if ( fn:empty($numbers)) then
-    fn:error($math:errNA, "Mode function: empty sequence")
+    fn:error($math:INVALID_INPUT, "Mode function: empty sequence")
   else
   let $result := 
   ( for $n_at in fn:distinct-values($numbers) 
     let $n := $n_at
     let $count := fn:count( (for $d in $numbers where $d eq $n return $d) )
-    where $count > 1 
+    where $count gt 1 
     order by $count descending
     return $n
   ) return 
   if (fn:empty($result)) then
-    fn:error($math:errNA, "Mode function: no duplicate elements")
+    fn:error($math:INVALID_INPUT, "Mode function: no duplicate elements")
   else
     $result[1]
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the k-th percentile of values in a sequence.
+ : Returns the k-th percentile of values in a sequence.<p/>
  : If k is not a multiple of 1/(n - 1), 
  :   PERCENTILE interpolates to determine the value at the k-th percentile.  
- : The function is computed by (max-min)*k + min
+ : The function is computed by (max-min)*k + min<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092111033.aspx
  : @param $numbers the sequence of numbers, of any length
  : @param $k_at the percentile, with value between 0 .. 1 inclusive
  : @return The computed percentile
- : @error math:errNum if percentile is not between 0 .. 1
+ : @error math:INVALID_ARGUMENT if percentile is not between 0 .. 1
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_percentile1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_percentile2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_percentile3.xq
 :)
-declare function math:percentile( $numbers as xs:double*, $k_at as xs:double) as xs:double
+declare function math:percentile( $numbers as double*, $k_at as double) as double
 {
   let $k := $k_at return
-  if ($k < 0 or $k > 1) then
-    fn:error($math:errNum, "Percentile function: k must be a value between 0 and 1 inclusive")
+  if ($k lt 0 or $k gt 1) then
+    fn:error($math:INVALID_ARGUMENT, "Percentile function: k must be a value between 0 and 1 inclusive")
   else
     let $max := fn:max($numbers)
     let $min := fn:min($numbers) return
@@ -1133,10 +1108,9 @@
 
 
 (:~
- : Borrowed from excel module.<br/>
- : Function for AVEDEV.
- : This function should not be used outside this module.
- : Computes formula sum(abs(x - average)) for every x in $numbers
+ : Function for AVEDEV.<p/>
+ : Computes formula sum(abs(x - average)) for every x in $numbers<p/>
+ : Borrowed from excel module.
  :
  : @param $numbers The sequence of numbers.
  :        Sequence can be of any length.
@@ -1144,8 +1118,8 @@
  : @return The result of the formula.
  :)
 declare %private function math:sum-deviations(
-  $numbers as xs:double*,
-  $average as xs:double) as xs:double
+  $numbers as double*,
+  $average as double) as double
 {
   if (fn:empty($numbers)) then
     0
@@ -1154,9 +1128,9 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the average of the absolute deviations of data points from their mean.
- : The formula is sum(abs(x - average_x))/n, where n is the count of x in the sequence.
+ : Returns the average of the absolute deviations of data points from their mean.<p/>
+ : The formula is sum(abs(x - average_x))/n, where n is the count of x in the sequence.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052089931033.aspx
  : @param $numbers the sequence of numbers.
@@ -1164,36 +1138,36 @@
  : @return The formula result
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_avedev1.xq
 :)
-declare function math:avedev($numbers as xs:double+) as xs:double
+declare function math:avedev($numbers as double+) as double
 {
   let $average := fn:avg($numbers) return
   math:sum-deviations($numbers, $average) div fn:count($numbers)
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the k-th largest value in a data set. 
+ : Returns the k-th largest value in a data set. <p/>
  : If n is the number of data points in a range, 
  :   then LARGE(array,1) returns the largest value, 
- :   and LARGE(array,n) returns the smallest value.
+ :   and LARGE(array,n) returns the smallest value.<p/>
+ : Borrowed from excel module.<br/>
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052091511033.aspx
  : @param $numbers the sequence of numbers
  :           The sequence can be of any length, from 1 up.
  : @param $k the position of largest value, with value from 1 to count of values
  : @return The k-th largest value as numeric type
- : @error math:errNum if the sequence is empty or k is not a value between 1
+ : @error math:INVALID_ARGUMENT if the sequence is empty or k is not a value between 1
  :  and the size of the sequence
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_large1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_large2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_large3.xq
 :)
-declare function math:large($numbers as xs:double+, $k as xs:integer) as xs:double
+declare function math:large($numbers as double+, $k as integer) as double
 {
   if (fn:empty($numbers)) then
-    fn:error($math:errNum, "Large function: value list must not be empty")  
-  else if ($k > fn:count($numbers) or $k le 0) then
-    fn:error($math:errNum, "Large function: k must be between 1 and the count of numbers ", $k)
+    fn:error($math:INVALID_ARGUMENT, "Large function: value list must not be empty")  
+  else if ($k gt fn:count($numbers) or $k le 0) then
+    fn:error($math:INVALID_ARGUMENT, "Large function: k must be between 1 and the count of numbers ", $k)
   else
     let $ordered_numbers :=
       (for $n in $numbers 
@@ -1205,11 +1179,11 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the rank of a number in a list of numbers. 
+ : Returns the rank of a number in a list of numbers. <p/>
  : The rank of a number is its size relative to other values in a list. 
  : (If you were to sort the list, the rank of the number would be its position.)
- : RANK gives duplicate numbers the same rank.
+ : RANK gives duplicate numbers the same rank.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092311033.aspx
  : @param $x The number whose rank you want to find.
@@ -1224,9 +1198,9 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_rank4.xq
  :)
 declare function math:rank(
-  $x                as xs:double, 
-  $numbers          as xs:double*, 
-  $order_ascending  as xs:boolean) as xs:double
+  $x                as double, 
+  $numbers          as double*, 
+  $order_ascending  as boolean) as double
 {
   let $ordered_numbers :=
     if ($order_ascending) then (
@@ -1244,12 +1218,12 @@
   let $rank :=
     (
       for $i at $pos in $ordered_numbers
-      where $xnum = $i or $order_ascending and $xnum < $i
-                     or fn:not($order_ascending) and $xnum > $i
+      where $xnum eq $i or $order_ascending and $xnum lt $i
+                     or fn:not($order_ascending) and $xnum gt $i
       return 
-        if ($xnum = $i) then
+        if ($xnum eq $i) then
           $pos
-        else if ($pos = 1) then
+        else if ($pos eq 1) then
           0
         else
           ($pos - 1) + ($xnum - $ordered_numbers[$pos - 1]) div ($ordered_numbers[$pos] - $ordered_numbers[$pos - 1])
@@ -1262,8 +1236,8 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : This RANK function is same as the above, only that $order_ascending is set by default to false.
+ : This RANK function is same as the above, only that $order_ascending is set by default to false.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092311033.aspx
  : @param $x The number whose rank you want to find.
@@ -1274,46 +1248,45 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_rank5.xq
 :)
 declare function math:rank(
-  $x        as xs:double, 
-  $numbers  as xs:double*) as xs:double
+  $x        as double, 
+  $numbers  as double*) as double
 {
-  math:rank($x, $numbers, fn:false())
+  math:rank($x, $numbers, false)
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the rank of a value in a data set as a percentage of the data set.
+ : Returns the rank of a value in a data set as a percentage of the data set.<p/>
  : If x does not match one of the values in array, 
  :   PERCENTRANK interpolates to return the correct percentage rank. <br/>
- : The formula is uses: (RANK - 1) / (size - 1) .
- : 
+ : The formula is uses: (RANK - 1) / (size - 1) .<p/>
+ : Borrowed from excel module.
  : @see http://office.microsoft.com/en-us/excel/HP052092121033.aspx
  : @param $numbers the sequence of numbers.
  :    The sequence can be of any length, from 1 up.
  : @param $x is the value for which you want to know the rank
  : @return The percentage of rank. 
- : @error math:errNum if the sequence is zero length
+ : @error math:INVALID_ARGUMENT if the sequence is zero length
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_percentrank1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_percentrank2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_percentrank3.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_percentrank4.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_percentrank5.xq
 :)
-declare function math:percentrank($numbers as xs:double*, $x as xs:double) as xs:double
+declare function math:percentrank($numbers as double*, $x as double) as double
 {
   if (fn:empty($numbers)) then
-    fn:error($math:errNum, "Percentrank function: value list must not be empty")
+    fn:error($math:INVALID_ARGUMENT, "Percentrank function: value list must not be empty")
   else  
-    let $rank := math:rank($x, $numbers, fn:true()) return
-    if ($rank = 0) then
+    let $rank := math:rank($x, $numbers, true) return
+    if ($rank eq 0) then
       0
     else
       ($rank - 1) div (fn:count($numbers) - 1)
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the quartile of a data set. 
+ : Returns the quartile of a data set. <p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092261033.aspx
  : @param $numbers sequence of numbers.
@@ -1325,50 +1298,50 @@
  :     <dt>3</dt> <dd> compute third quartile (75th percentile)</dd>
  :     <dt>4</dt> <dd> compute maximum value</dd></dl>
  :  @return the computed quartile, as numeric type
- : @error math:errNum if the sequence is zero length or $quart is not one of the values 0,1,3,4
+ : @error math:INVALID_ARGUMENT if the sequence is zero length or $quart is not one of the values 0,1,3,4
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_quartile1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_quartile2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_quartile3.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_quartile4.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_quartile5.xq
 :)
-declare function math:quartile($numbers as xs:double*, $quart as xs:integer) as xs:double
+declare function math:quartile($numbers as double*, $quart as integer) as double
 {
   if (fn:empty($numbers)) then
-    fn:error($math:errNum, "Quartile function: value list must not be empty")
+    fn:error($math:INVALID_ARGUMENT, "Quartile function: value list must not be empty")
   else  
-  if ($quart = 0) then
+  if ($quart eq 0) then
     fn:min($numbers)
   else
-  if ($quart = 1) then
+  if ($quart eq 1) then
     let $r := (fn:count($numbers) + 3) div 4
-    let $rint := xs:integer($r)
+    let $rint := integer($r)
     let $rrem := $r - $rint 
     let $sorted_numbers := math:sort-numbers( $numbers ) return
       ($numbers[$rint + 1] - $numbers[$rint]) * $rrem + $numbers[$rint] 
   else
-  if ($quart = 2) then
+  if ($quart eq 2) then
     math:median($numbers)
   else
-  if ($quart = 3) then
+  if ($quart eq 3) then
     let $r := (3 * fn:count($numbers) + 1) div 4
-    let $rint := xs:integer($r)
+    let $rint := integer($r)
     let $rrem := $r - $rint 
     let $sorted_numbers := math:sort-numbers( $numbers ) return
       ($numbers[$rint + 1] - $numbers[$rint]) * $rrem + $numbers[$rint] 
   else
-  if ($quart = 4) then
+  if ($quart eq 4) then
     fn:max($numbers)
   else
-    fn:error($math:errNum, "Quartile function: quart should be between 0 and 4 :", $quart)
+    fn:error($math:INVALID_ARGUMENT, "Quartile function: quart should be between 0 and 4 :", $quart)
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : This function computes the k-th smallest value in a data set. 
+ : This function computes the k-th smallest value in a data set. <p/>
  : Use this function to return values with a particular relative standing in a data set.
  : If n is the number of data points in array, SMALL(array,1) equals the smallest value, 
  :   and SMALL(array,n) equals the largest value. 
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092661033.aspx
  : @param $numbers A sequence of numbers.
@@ -1376,17 +1349,17 @@
  : @param $k The position (from the smallest) in the sequence of data to return.
  :        Must have value between 1 and size of sequence.
  : @return The k-th smallest value of $numbers.
- : @error math:errNum if the sequence is zero length or $k is not a value
+ : @error math:INVALID_ARGUMENT if the sequence is zero length or $k is not a value
  :   between 1 and the size of sequence.
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_small1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_small2.xq
 :)
-declare function math:small($numbers as xs:double*, $k as xs:integer) as xs:double
+declare function math:small($numbers as double*, $k as integer) as double
 {
   if (fn:empty($numbers)) then
-    fn:error($math:errNum, "Small function: value list must not be empty")
+    fn:error($math:INVALID_ARGUMENT, "Small function: value list must not be empty")
   else if ($k gt fn:count($numbers) or $k le 0) then
-    fn:error($math:errNum, "Small function: k must be between 1 and the count of numbers ", $k)
+    fn:error($math:INVALID_ARGUMENT, "Small function: k must be between 1 and the count of numbers ", $k)
   else
     let $ordered_numbers := (
         for $n in $numbers 
@@ -1400,17 +1373,16 @@
 
 
 (:~
- : Borrowed from excel module.<br/>
- : Function for VAR, VARA, VARP, VARPA and SLOPE.
- : This function should not be used outside this module.
- : It computes formula sum((x - average_x)^2) for all x in $numbers.
+ : Function for VAR, VARA, VARP, VARPA and SLOPE.<p/>
+ : It computes formula sum((x - average_x)^2) for all x in $numbers.<p/>
+ : Borrowed from excel module.
  :
  : @param $numbers the sequence of numbers.
  :        The sequence can be of any length.
  : @param $average The precomputed average over the sequence.
  : @return The result as numeric type.
  :)
-declare %private function math:sumsq-deviations($numbers as xs:double*, $average as xs:double) as xs:double
+declare %private function math:sumsq-deviations($numbers as double*, $average as double) as double
 {
   if (fn:empty($numbers)) then
     0
@@ -1421,11 +1393,11 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Estimates variance based on a sample.<br/>
- : The formula is sum(x - average_x)^2 / (n - 1).<br/>
- : average_x is computed with AVERAGE function.<br/>
- : n is the count of numbers from the sequence, excluding empty values.
+ : Estimates variance based on a sample.<p/>
+ : The formula is sum(x - average_x)^2 / (n - 1).
+ : average_x is computed with AVERAGE function.
+ : n is the count of numbers from the sequence, excluding empty values.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052093301033.aspx
  : @param $numbers the sequence of numbers.
@@ -1433,7 +1405,7 @@
  : @return The variance, as numeric type
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_var1.xq
  :)
-declare function math:var($numbers as xs:double+) as xs:double
+declare function math:var($numbers as double+) as double
 {
   let $average := fn:avg($numbers)
   return
@@ -1441,11 +1413,11 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Estimates variance based on a sample.<br/>
- : The formula is sum(x - average_x)^2 / (n - 1).<br/>
- : average_x is computed with AVERAGE function.<br/>
- : n is the size of sequence, including empty values.<br/>
+ : Estimates variance based on a sample.<p/>
+ : The formula is sum(x - average_x)^2 / (n - 1).
+ : average_x is computed with AVERAGE function.
+ : n is the size of sequence, including empty values.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052093311033.aspx
  : @param $numbers the sequence of numbers.
@@ -1453,18 +1425,18 @@
  : @return The variance, as numeric type
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_vara1.xq
 :)
-declare function math:vara($numbers as xs:double+) as xs:double
+declare function math:vara($numbers as double+) as double
 {
   let $average := fn:avg($numbers) return
   math:sumsq-deviations($numbers, $average) div (fn:count($numbers) - 1)
 };
 
 (:~
+ : Calculates variance based on the entire population.<p/>
+ : The formula is sum(x - average_x)^2 / n.
+ : average_x is computed with AVERAGE function.
+ : n is the count of numbers from the sequence, excluding empty values.<p/>
  : Borrowed from excel module.<br/>
- : Calculates variance based on the entire population.<br/>
- : The formula is sum(x - average_x)^2 / n.<br/>
- : average_x is computed with AVERAGE function.<br/>
- : n is the count of numbers from the sequence, excluding empty values.<br/>
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052093321033.aspx
  : @param $numbers the sequence of numbers.
@@ -1472,18 +1444,18 @@
  : @return The variance, as numeric type
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_varp1.xq
 :)
-declare function math:varp($numbers as xs:double+) as xs:double
+declare function math:varp($numbers as double+) as double
 {
   let $average := fn:avg($numbers) return
   math:sumsq-deviations($numbers, $average) div fn:count($numbers)
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Calculates variance based on the entire population.<br/>
- : The formula is sum(x - average_x)^2 / n.<br/>
- : average_x is computed with AVERAGE function.<br/>
- : n is the size of sequence, including empty values.<br/>
+ : Calculates variance based on the entire population.<p/>
+ : The formula is sum(x - average_x)^2 / n.
+ : average_x is computed with AVERAGE function.
+ : n is the size of sequence, including empty values.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052093321033.aspx
  : @param $numbers the sequence of numbers.
@@ -1491,61 +1463,58 @@
  : @return The variance, as numeric type
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_varpa1.xq
 :)
-declare function math:varpa($numbers as xs:double+) as xs:double
+declare function math:varpa($numbers as double+) as double
 {
   let $average := fn:avg($numbers) return
   math:sumsq-deviations($numbers, $average) div fn:count($numbers)
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Function for PROB function.
- : This function should not be used outside this module.
+ : Function for PROB function.<p/>
  : Computes the sum over a sequence of numbers.
- : Checks if the values are between 0 and 1.
+ : Checks if the values are between 0 and 1.<p/>
+ : Borrowed from excel module.
  :
  : @param $prob_range The sequence of probabilities.
  : @return The sum of probabilities. This should be 1.
- : @error math:errNum if any probability is not between 0 and 1.
- : @error math:errValue if any parameter is not castable to numeric.
+ : @error math:INVALID_ARGUMENT if any probability is not between 0 and 1.
 :)
-declare %private function math:sum-prob($prob_range as xs:double*) as xs:double
+declare %private function math:sum-prob($prob_range as double*) as double
 {
   if (fn:empty($prob_range)) then
     0
   else
     let $prob_num := $prob_range[1]
   return
-    if ($prob_num < 0 or $prob_num > 1) then
-      fn:error($math:errNum, "Prob function: prob values should be between 0 and 1 ", $prob_num)
+    if ($prob_num lt 0 or $prob_num gt 1) then
+      fn:error($math:INVALID_ARGUMENT, "Prob function: prob values should be between 0 and 1 ", $prob_num)
     else
       $prob_num + math:sum-prob(fn:subsequence($prob_range, 2))
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Function for PROB function.
- : This function should not be used outside this module.
+ : Function for PROB function.<p/>
  : Checks the prob range and x range if they have the same number of values.
- : Adds all probabilities corresponding to values between range_lower_limit and upper_limit.
+ : Adds all probabilities corresponding to values between range_lower_limit and upper_limit.<p/>
+ : Borrowed from excel module.
  :
  : @param $x_range The sequence of x values.
  : @param $prob_range The sequence of probabilities associated to x values.
  : @param $range_lower_limit The lower limit of the range to compute the probability.
  : @param $upper_limit The upper limit of the range to compute the probability.
  : @return The sum of probabilities.
- : @error $math:errNum if x_range and prob_range do not have the same number of values.
+ : @error $math:INVALID_ARGUMENT if x_range and prob_range do not have the same number of values.
  :)
 declare %private function math:sum-prob-x(
-  $x_range            as xs:double*,
-  $prob_range         as xs:double*,
-  $range_lower_limit  as xs:double,
-  $upper_limit        as xs:double) as xs:double
+  $x_range            as double*,
+  $prob_range         as double*,
+  $range_lower_limit  as double,
+  $upper_limit        as double) as double
 {
   if (fn:empty($x_range) and fn:not(fn:empty($prob_range))) then
-    fn:error($math:errNum, "Prob function: x range and prob range should have the same number of elements")
+    fn:error($math:INVALID_ARGUMENT, "Prob function: x range and prob range should have the same number of elements")
   else if (fn:empty($prob_range) and fn:not(fn:empty($x_range))) then
-    fn:error($math:errNum, "Prob function: x range and prob range should have the same number of elements")
+    fn:error($math:INVALID_ARGUMENT, "Prob function: x range and prob range should have the same number of elements")
   else if (fn:empty($prob_range) and fn:empty($x_range)) then
     0
   else
@@ -1564,9 +1533,9 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the probability that values in a range are between two limits.
- : 
+ : Returns the probability that values in a range are between two limits.<p/>
+ : Borrowed from excel module.
+ :
  : @see http://office.microsoft.com/en-us/excel/HP052092221033.aspx
  : @param $x_range is the range of numeric values of x with which there are associated probabilities.
  :       This does not need to be ordered.
@@ -1574,19 +1543,19 @@
  : @param $range_lower_limit is the lower bound on the value for which you want a probability.
  : @param $upper_limit  is the upper bound on the value for which you want a probability.
  : @return The probability of the entire range
- : @error math:errNum if any probability is not between 0 and 1
- : @error math:errNum if the sum of probabilities is not equal to 1
- : @error math:errNum if x_range and prob_range do not have the same number of values
+ : @error math:INVALID_ARGUMENT if any probability is not between 0 and 1
+ : @error math:INVALID_ARGUMENT if the sum of probabilities is not equal to 1
+ : @error math:INVALID_ARGUMENT if x_range and prob_range do not have the same number of values
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_prob2.xq
 :)
-declare function math:prob($x_range as xs:double+,
-                            $prob_range as xs:double+,
-                            $range_lower_limit as xs:double,
-                            $upper_limit as xs:double) as xs:double
+declare function math:prob($x_range as double+,
+                            $prob_range as double+,
+                            $range_lower_limit as double,
+                            $upper_limit as double) as double
 {
   let $prob_sum := math:sum-prob($prob_range) return
-  if ($prob_sum != 1) then
-    fn:error($math:errNum, "Prob function: prob sum should equal 1")
+  if ($prob_sum ne 1) then
+    fn:error($math:INVALID_ARGUMENT, "Prob function: prob sum should equal 1")
   else
     math:sum-prob-x($x_range, $prob_range, 
                     $range_lower_limit, 
@@ -1594,9 +1563,9 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : This is the same as above, only that upper_limit is not specified.
- : The probability is computed only for range_lower_limit.
+ : This is the same as math:prob#4, only that upper_limit is not specified.<p/>
+ : The probability is computed only for range_lower_limit.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092221033.aspx
  : @param $x_range is the range of numeric values of x with which there are associated probabilities.
@@ -1604,43 +1573,42 @@
  : @param $prob_range is a set of probabilities associated with values in x_range.
  : @param $range_lower_limit is the value for which you want a probability.
  : @return The probability of the range_lower_limit value
- : @error math:errNum if any probability is not between 0 and 1
- : @error math:errNum if the sum of probabilities is not equal to 1
- : @error math:errNum if x_range and prob_range do not have the same number of values
+ : @error math:INVALID_ARGUMENT if any probability is not between 0 and 1
+ : @error math:INVALID_ARGUMENT if the sum of probabilities is not equal to 1
+ : @error math:INVALID_ARGUMENT if x_range and prob_range do not have the same number of values
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_prob1.xq
  :)
-declare function math:prob($x_range as xs:double+,
-                            $prob_range as xs:double+,
-                            $range_lower_limit as xs:double) as xs:double
+declare function math:prob($x_range as double+,
+                            $prob_range as double+,
+                            $range_lower_limit as double) as double
 {
   math:prob($x_range, $prob_range, $range_lower_limit, $range_lower_limit)
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Function for SLOPE function.
- : This function should not be used outside this module.
- : It computes the formula:<br/>
- : sum((x - average_x)(y - average_y)) <br/>
- : where average_x and average_y are computed with AVERAGE function.
+ : Function for SLOPE function.<p/>
+ : It computes the formula:<p/>
+ : sum((x - average_x)(y - average_y))<p/>
+ : where average_x and average_y are computed with AVERAGE function.<p/>
+ : Borrowed from excel module.
  :
  : @param $x_numbers The sequence of x numbers.
  : @param $x_average The precomputed AVERAGE over the x_numbers.
  : @param $y_numbers The sequence of y numbers.
  : @param $y_average The precomputed AVERAGE over the y_numbers.
  : @return The formula result, as numeric type.
- : @error math:errNA if there are different numbers of x's and y's.
+ : @error math:INVALID_INPUT if there are different numbers of x's and y's.
  :)
 declare %private function math:sum-x-y-deviations(
-  $x_numbers as xs:double*, 
-  $x_average as xs:double,
-  $y_numbers as xs:double*, 
-  $y_average as xs:double) as xs:double
+  $x_numbers as double*, 
+  $x_average as double,
+  $y_numbers as double*, 
+  $y_average as double) as double
 {
   if (fn:empty($x_numbers) and fn:not(fn:empty($y_numbers))) then
-    fn:error($math:errNA, "Slope function: different number of x's and y's")
+    fn:error($math:INVALID_INPUT, "Slope function: different number of x's and y's")
   else if (fn:empty($y_numbers) and fn:not(fn:empty($x_numbers))) then
-    fn:error($math:errNA, "Slope function: different number of x's and y's")
+    fn:error($math:INVALID_INPUT, "Slope function: different number of x's and y's")
   else if (fn:empty($x_numbers) and fn:empty($y_numbers)) then
     0
   else
@@ -1652,13 +1620,13 @@
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns the slope of the linear regression line through data points in known_y's and known_x's.
+ : Returns the slope of the linear regression line through data points in known_y's and known_x's.<p/>
  : The slope is the vertical distance divided by the horizontal distance between 
  :   any two points on the line, which is the rate of change along the regression line.
- : It computes the formula:<br/>
- : sum((x - average_x)(y - average_y)) / sum((x - average_x)^2)  <br/>
- : where average_x and average_y are computed with AVERAGE function.
+ : It computes the formula:<p/>
+ : sum((x - average_x)(y - average_y)) / sum((x - average_x)^2)<p/>
+ : where average_x and average_y are computed with AVERAGE function.<p/>
+ : Borrowed from excel module.
  : 
  : @see http://office.microsoft.com/en-us/excel/HP052092641033.aspx
  : @param $known_y the sequence of y numbers.
@@ -1666,57 +1634,57 @@
  : @param $known_x the sequence of x numbers.
  :    The sequence can be of any length, from 1 up.  
  : @return The slope value, as numeric type
- : @error math:errNA if there are different numbers of x's and y's or if the sequence is empty
- : @error math:errDiv0 if all x's are equal
+ : @error math:INVALID_INPUT if there are different numbers of x's and y's or if the sequence is empty
+ : @error math:DIVIDE_BY_0 if all x's are equal
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_slope1.xq
 :)
-declare function math:slope($known_y as xs:double+,
-                       $known_x as xs:double+) as xs:double
+declare function math:slope($known_y as double+,
+                       $known_x as double+) as double
 {
   if (fn:empty($known_y) or fn:empty($known_x)) then
-    fn:error($math:errNA, "Slope function: known_x and known_y cannot be empty sequences")
+    fn:error($math:INVALID_INPUT, "Slope function: known_x and known_y cannot be empty sequences")
   else
   let $x_average := fn:avg($known_x) 
   let $y_average := fn:avg($known_y) 
   let $xsq_dev := math:sumsq-deviations($known_x, $x_average) return
-  if ($xsq_dev = 0) then
-    fn:error($math:errDiv0, "Slope function: all x's are equal")
+  if ($xsq_dev eq 0) then
+    fn:error($math:DIVIDE_BY_0, "Slope function: all x's are equal")
   else
   let $x_y_dev := math:sum-x-y-deviations($known_x, $x_average, $known_y, $y_average) return
   $x_y_dev div $xsq_dev
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Returns a normalized value from a distribution characterized by mean and standard_dev.<br/>
- : The formula is (x - mean) / standard_dev .
+ : Returns a normalized value from a distribution characterized by mean and standard_dev.<p/>
+ : The formula is (x - mean) / standard_dev .<p/>
+ : Borrowed from excel module.
  :
  : @see http://office.microsoft.com/en-us/excel/HP052092731033.aspx
  : @param $x is the value you want to normalize
  : @param $mean  is the arithmetic mean of the distribution.
  : @param $standard_dev is the standard deviation of the distribution.
  : @return The normalized x, as numeric type
- : @error math:errNum if standard_dev is a value smaller than zero or equal
+ : @error math:INVALID_ARGUMENT if standard_dev is a value smaller than zero or equal
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_standardize1.xq
 :)
-declare function math:standardize($x as xs:double,
-                                   $mean as xs:double,
-                                   $standard_dev as xs:double) as xs:double
+declare function math:standardize($x as double,
+                                   $mean as double,
+                                   $standard_dev as double) as double
 {
   if ($standard_dev le 0) then
-    fn:error($math:errNum, "Standardize function: standard_dev must be positive ", $standard_dev)
+    fn:error($math:INVALID_ARGUMENT, "Standardize function: standard_dev must be positive ", $standard_dev)
   else
     ($x - $mean) div $standard_dev
 };
 
 
 (:~
- : Borrowed from excel module.<br/>
- : Estimates standard deviation based on a sample. 
+ : Estimates standard deviation based on a sample. <p/>
  : The standard deviation is a measure of how widely values are dispersed 
  :   from the average value (the mean).
  : It is computed with formula:
- : sqrt( sum((x-average_x)^2) / (n-1) )    = sqrt ( VAR(numbers) )
+ : sqrt( sum((x-average_x)^2) / (n-1) )    = sqrt ( VAR(numbers) )<p/>
+ : Borrowed from excel module.
  :
  : @see http://office.microsoft.com/en-us/excel/HP052092771033.aspx
  : @param $numbers the sequence of numbers
@@ -1724,18 +1692,18 @@
  : @return the standard deviation, as numeric type
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_stdev1.xq
 :)
-declare function math:stdev($numbers as xs:double+) as xs:double
+declare function math:stdev($numbers as double+) as double
 {
   W3Cmath:sqrt(math:var($numbers))
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Estimates standard deviation based on a sample. 
+ : Estimates standard deviation based on a sample. <p/>
  : The standard deviation is a measure of how widely values are dispersed 
  :   from the average value (the mean).
  : It is computed with formula:
- : sqrt( sum((x-average_x)^2) / (n-1) )    = sqrt ( VARA(numbers) )
+ : sqrt( sum((x-average_x)^2) / (n-1) )    = sqrt ( VARA(numbers) )<p/>
+ : Borrowed from excel module.
  :
  : @see http://office.microsoft.com/en-us/excel/HP052092791033.aspx
  : @param $numbers the sequence of numbers.
@@ -1743,18 +1711,18 @@
  : @return the standard deviation, as numeric type
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_stdeva1.xq
 :)
-declare function math:stdeva($numbers as xs:double+) as xs:double
+declare function math:stdeva($numbers as double+) as double
 {
   W3Cmath:sqrt(math:vara($numbers))
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Calculates standard deviation based on the entire population given as arguments. 
+ : Calculates standard deviation based on the entire population given as arguments. <p/>
  : The standard deviation is a measure of how widely values are dispersed from 
  :   the average value (the mean).
  : It is computed with formula:
- : sqrt( sum((x-average_x)^2) / n )    = sqrt ( VARP(numbers) )
+ : sqrt( sum((x-average_x)^2) / n )    = sqrt ( VARP(numbers) )<p/>
+ : Borrowed from excel module.
  :
  : @see http://office.microsoft.com/en-us/excel/HP052092811033.aspx
  : @param $numbers the sequence of numbers or values castable to numeric
@@ -1762,18 +1730,18 @@
  : @return the standard deviation, as numeric type
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_stdevp1.xq
 :)
-declare function math:stdevp($numbers as xs:double+) as xs:double
+declare function math:stdevp($numbers as double+) as double
 {
   W3Cmath:sqrt(math:varp($numbers))
 };
 
 (:~
- : Borrowed from excel module.<br/>
- : Calculates standard deviation based on the entire population given as arguments. 
+ : Calculates standard deviation based on the entire population given as arguments. <p/>
  : The standard deviation is a measure of how widely values are dispersed from 
  :   the average value (the mean).
  : It is computed with formula:
- : sqrt( sum((x-average_x)^2) / n )    = sqrt ( VARPA(numbers) )
+ : sqrt( sum((x-average_x)^2) / n )    = sqrt ( VARPA(numbers) )<p/>
+ : Borrowed from excel module.
  :
  : @see http://office.microsoft.com/en-us/excel/HP052092831033.aspx
  : @param $numbers the sequence of numbers or values castable to numeric
@@ -1781,15 +1749,15 @@
  : @return the standard deviation, as numeric type
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_stdevpa1.xq
 :)
-declare function math:stdevpa($numbers as xs:double+) as xs:double
+declare function math:stdevpa($numbers as double+) as double
 {
   W3Cmath:sqrt(math:varpa($numbers))
 };
 
 (:~ 
- : Borrowed from excel module.<br/>
- : Returns a subtotal in a sequence of numbers.
- : The function applied is given by $function_num.
+ : Returns a subtotal in a sequence of numbers.<p/>
+ : The function applied is given by $function_num.<p/>
+ : Borrowed from excel module.
  :   
  : @see http://office.microsoft.com/en-us/excel/HP052092881033.aspx
  : @param $function_num <dl>defines the function to be applied on sequence values.
@@ -1811,7 +1779,7 @@
  :     The sequence can be of any length.
  : @return The function result, as numeric type
  : @error * depends on the function called
- : @error math:errNum if $function_num is not a value between 1 .. 11 or 101 .. 111
+ : @error math:INVALID_ARGUMENT if $function_num is not a value between 1 .. 11 or 101 .. 111
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_subtotal1.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_subtotal2.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_subtotal3.xq
@@ -1824,40 +1792,40 @@
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_subtotal10.xq
  : @example test/rbkt/Queries/zorba/math/from_excel/excel_subtotal11.xq
 :)
-declare function math:subtotal($function_num as xs:integer, $numbers as xs:double*) as xs:double
+declare function math:subtotal($function_num as integer, $numbers as double*) as double
 {
-  if ($function_num = 1 or $function_num = 101) then
+  if ($function_num eq 1 or $function_num eq 101) then
     fn:avg($numbers)
   else 
-  if ($function_num = 2 or $function_num = 102) then
-    fn:count($numbers)
-  else
-  if ($function_num = 3 or $function_num = 103) then
-    fn:count($numbers)
-  else
-  if ($function_num = 4 or $function_num = 104) then
+  if ($function_num eq 2 or $function_num eq 102) then
+    fn:count($numbers)
+  else
+  if ($function_num eq 3 or $function_num eq 103) then
+    fn:count($numbers)
+  else
+  if ($function_num eq 4 or $function_num eq 104) then
     fn:max($numbers)
   else
-  if ($function_num = 5 or $function_num = 105) then
+  if ($function_num eq 5 or $function_num eq 105) then
     fn:min($numbers)
   else
-  if ($function_num = 6 or $function_num = 106) then
+  if ($function_num eq 6 or $function_num eq 106) then
     math:product($numbers)
   else
-  if ($function_num = 7 or $function_num = 107) then
+  if ($function_num eq 7 or $function_num eq 107) then
    math:stdev($numbers)
   else
-  if ($function_num = 8 or $function_num = 108) then
+  if ($function_num eq 8 or $function_num eq 108) then
     math:stdevp($numbers)
   else
-  if ($function_num = 9 or $function_num = 109) then
+  if ($function_num eq 9 or $function_num eq 109) then
     fn:sum($numbers)
   else
-  if ($function_num = 10 or $function_num = 110) then
+  if ($function_num eq 10 or $function_num eq 110) then
     math:var($numbers)
   else
-  if ($function_num = 11 or $function_num = 111) then
+  if ($function_num eq 11 or $function_num eq 111) then
     math:varp($numbers)
   else
-    fn:error($math:errNum, "Subtotal function: function_num should be between 1 and 11 or 101 and 111")
+    fn:error($math:INVALID_ARGUMENT, "Subtotal function: function_num should be between 1 and 11 or 101 and 111")
 };

=== renamed file 'modules/com/zorba-xquery/www/modules/random.xq' => 'modules/atomic/random.xq'
--- modules/com/zorba-xquery/www/modules/random.xq	2013-06-25 03:55:20 +0000
+++ modules/atomic/random.xq	2013-07-17 15:56:30 +0000
@@ -1,7 +1,7 @@
-xquery version "3.0";
+jsoniq version "1.0";
 
 (:
- : Copyright 2006-2009 The FLWOR Foundation.
+ : Copyright 2006-2013 The FLWOR Foundation.
  :
  : Licensed under the Apache License, Version 2.0 (the "License");
  : you may not use this file except in compliance with the License.
@@ -24,18 +24,21 @@
  : @project Zorba/XQuery Data Model/Atomic/Random
  :
  :)
-module namespace r = "http://www.zorba-xquery.com/modules/random";
+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 ver = "http://www.zorba-xquery.com/options/versioning";
-declare option ver:module-version "2.0";
+declare option ver:module-version "1.0";
+
+declare %private variable $r:errNS as string := "http://zorba.io/modules/random";
+declare %private variable $r:INVALID_ARGUMENT as QName := fn:QName($r:errNS, "r:INVALID_ARGUMENT");
 
 (:~
- : This function generates an arbitrary number of pseudo-random numbers.
+ : <p>This function generates an arbitrary number of pseudo-random numbers.
  : The sequence is repeatable by calling the function with the same
- : seed.
+ : seed.</p>
  :
  : <p>The function is based on posix function <tt>srand()</tt> and
  : <tt>rand()</tt>. Specifically, it invokes <tt>srand($seed)</tt>
@@ -56,14 +59,14 @@
  :  than the max value of <tt>unsigned int</tt> on the given platform.
  :)
 declare function r:seeded-random(
-  $seed as xs:integer,
-  $num as xs:integer
-) as xs:integer* external;
+  $seed as integer,
+  $num as integer
+) as integer* external;
 
 (:~
- : This function generates an arbitrary number of random numbers.
+ : <p>This function generates an arbitrary number of random numbers.
  : The function is nondeterministic because the sequence is
- : <b>not</b> repeatable.
+ : <b>not</b> repeatable.</p>
  :
  : <p>However, the function is based on posix function <tt>srand()</tt> and
  : <tt>rand()</tt>. Specifically, it invokes <tt>srand()</tt>
@@ -76,30 +79,30 @@
  :  sequence if <tt>$num</tt> is negative.
  :)
 declare %an:nondeterministic function r:random(
-  $num as xs:integer
-) as xs:integer* external;
+  $num as integer
+) as integer* external;
 
 (:~
- : This function generates one random number.
- : The function is nondeterministic.
+ : <p>This function generates one random number.
+ : The function is nondeterministic.</p>
  :
  : <p>The function is based on <tt>r:random#1</tt>. Specifically, it
  : returns the value of invoking <tt>r:random(1)</tt>.</p>
  :
  : @return a random integer
  :)
-declare %an:nondeterministic function r:random() as xs:integer
+declare %an:nondeterministic function r:random() as integer
 {
   r:random(1)
 };
 
 (:~
- : This function generates an arbitrary number of pseudo-random numbers
+ : <p>This function generates an arbitrary number of pseudo-random numbers
  : within a given range. The sequence is repeatable by calling the
- : function with the same seed and boundaries.
+ : function with the same seed and boundaries.</p>
  :
  : <p>The function is based on the function <tt>r:seeded-random#2</tt>.
- : Specifically, it's result is repeatable if called with the
+ : Specifically, its result is repeatable if called with the
  : same arguments.</p>
  :
  : @param $seed the initial seed value for the sequence
@@ -114,37 +117,37 @@
  :
  : @error zerr:ZQXD0004 if the given seed is negative or great
  :  than the max value of <tt>unsigned int</tt> on the given platform.
- : @error r:invalid-arg if <tt>$lower</tt> is greater than <tt>$upper</tt>
+ : @error r:INVALID_ARGUMENT if <tt>$lower</tt> is greater than <tt>$upper</tt>
  :)
 declare function r:seeded-random-between(
-  $seed as xs:integer,
-  $lower as xs:integer,
-  $upper as xs:integer,
-  $num as xs:integer
-) as xs:integer*
+  $seed as integer,
+  $lower as integer,
+  $upper as integer,
+  $num as integer
+) as integer*
 {
   if ( $lower eq $upper ) then
     $lower
   else
-    if ( $lower > $upper ) then
+    if ( $lower gt $upper ) then
       fn:error(
-        fn:QName("http://www.zorba-xquery.com/modules/random", "invalid-arg"),
-        "$lower must be smaller or equal than $upper",
+        $r:INVALID_ARGUMENT,
+        "$lower must be less than or equal to $upper",
         ($lower, $upper)
       )
     else
       for $i in r:seeded-random( $seed, $num )
       return
         if ( ( $upper - $lower ) lt 10000 ) then
-          xs:integer( fn:round( xs:double( $i mod 10000 ) div 10000 * ( $upper - $lower) ) + $lower )
+          integer( fn:round( double( $i mod 10000 ) div 10000 * ( $upper - $lower) ) + $lower )
         else
-          xs:integer( fn:round( xs:double( $i ) mod ( $upper - $lower ) ) + $lower )
+          integer( fn:round( double( $i ) mod ( $upper - $lower ) ) + $lower )
 };
 
 (:~
- : This function generates an arbitrary number of random numbers
+ : <p>This function generates an arbitrary number of random numbers
  : within a given range. The function is nondeterministic because
- : the sequence is <b>not</b> repeatable.
+ : the sequence is <b>not</b> repeatable.</p>
  :
  : @param $lower the lower bound for every value within the sequence
  : @param $upper the upper bound for every value within the sequence
@@ -155,34 +158,34 @@
  :     equal to <tt>$upper</tt> and the empty sequence if <tt>$num</tt>
  :     is negative.
  :
- : @error r:invalid-arg if <tt>$lower</tt> is greater than <tt>$upper</tt>
+ : @error r:INVALID_ARGUMENT if <tt>$lower</tt> is greater than <tt>$upper</tt>
  :)
 declare %an:nondeterministic function r:random-between(
-  $lower as xs:integer,
-  $upper as xs:integer,
-  $num as xs:integer) as xs:integer*
+  $lower as integer,
+  $upper as integer,
+  $num as integer) as integer*
 {
   if ( $lower eq $upper ) then
     $lower
   else
-    if ( $lower > $upper ) then
+    if ( $lower gt $upper ) then
       fn:error(
-        fn:QName("http://www.zorba-xquery.com/modules/random", "invalid-arg"),
-        "$lower must be smaller or equal than $upper",
+        $r:INVALID_ARGUMENT,
+        "$lower must be less than or equal to $upper",
         ($lower, $upper)
       )
     else
       for $i in r:random( $num )
       return
         if ( ( $upper - $lower ) lt 10000 ) then
-          xs:integer( fn:round( xs:double( $i mod 10000 ) div 10000 * ( $upper - $lower) ) + $lower )
+          integer( fn:round( double( $i mod 10000 ) div 10000 * ( $upper - $lower) ) + $lower )
         else
-          xs:integer( fn:round( xs:double( $i ) mod ( $upper - $lower ) ) + $lower )
+          integer( fn:round( double( $i ) mod ( $upper - $lower ) ) + $lower )
 };
 
 (:~
- : This function generates one random number within a given range.
- : The function is nondeterministic.
+ : <p>This function generates one random number within a given range.
+ : The function is nondeterministic.</p>
  :
  : <p>The function is based on <tt>r:random-between#3</tt>.
  : Specifically, it returns the value of invoking
@@ -193,18 +196,19 @@
  : @return a random integer within the given range
  :)
 declare %an:nondeterministic function r:random-between(
-  $lower as xs:integer,
-  $upper as xs:integer
-) as xs:integer
+  $lower as integer,
+  $upper as integer
+) as integer
 {
   r:random-between($lower, $upper, 1)
 };
 
 (:~
- : This function returns a uuid. Note, that the function is not stable,
- : that is, it returns a different UUID everytime the function is invoked.
+ : <p>This function returns a uuid.</p>
+ : <p> Note, that the function is not stable,
+ : that is, it returns a different UUID everytime the function is invoked.</p>
  :
- : @return the generated UUID as xs:string
+ : @return the generated UUID as string
 :)
-declare %an:nondeterministic function r:uuid() as xs:string external;
+declare %an:nondeterministic function r:uuid() as string external;
 

=== removed directory 'modules/base64'
=== removed file 'modules/base64/CMakeLists.txt'
--- modules/base64/CMakeLists.txt	2013-07-17 07:20:31 +0000
+++ modules/base64/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# Copyright 2013 The FLWOR Foundation.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-DECLARE_ZORBA_MODULE(FILE base64.xq VERSION 1.0
-  URI "http://zorba.io/modules/base64")

=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-07-17 07:20:31 +0000
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-07-17 15:56:30 +0000
@@ -56,8 +56,6 @@
   URI "http://www.zorba-xquery.com/modules/datetime")
 DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/fetch")
-DECLARE_ZORBA_MODULE(FILE math.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/math")
 DECLARE_ZORBA_MODULE(FILE node-reference.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/node-reference")
 DECLARE_ZORBA_MODULE(FILE reference.xq VERSION 1.0
@@ -66,8 +64,6 @@
   URI "http://www.zorba-xquery.com/modules/node")
 DECLARE_ZORBA_MODULE(FILE item.xq VERSION 1.0
   URI "http://www.zorba-xquery.com/modules/item")
-DECLARE_ZORBA_MODULE(FILE random.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/random")
 DECLARE_ZORBA_MODULE(FILE reflection.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/reflection")
 DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 2.0

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2013-07-17 07:20:31 +0000
+++ src/context/static_context.cpp	2013-07-17 15:56:30 +0000
@@ -353,7 +353,7 @@
 
 const char*
 static_context::ZORBA_MATH_FN_NS =
-"http://www.zorba-xquery.com/modules/math";
+"http://zorba.io/modules/math";
 
 const char*
 static_context::ZORBA_BASE64_FN_NS =
@@ -433,7 +433,7 @@
 
 const char*
 static_context::ZORBA_RANDOM_FN_NS =
-"http://www.zorba-xquery.com/modules/random";
+"http://zorba.io/modules/random";
 
 const char*
 static_context::ZORBA_INTROSP_SCTX_FN_NS =

=== modified file 'src/functions/pregenerated/func_maths.cpp'
--- src/functions/pregenerated/func_maths.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_maths.cpp	2013-07-17 15:56:30 +0000
@@ -442,7 +442,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_cosh,
-        (createQName("http://www.zorba-xquery.com/modules/math","","cosh"), 
+        (createQName("http://zorba.io/modules/math","","cosh"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE),
         FunctionConsts::FN_ZORBA_MATH_COSH_1);
@@ -454,7 +454,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_acosh,
-        (createQName("http://www.zorba-xquery.com/modules/math","","acosh"), 
+        (createQName("http://zorba.io/modules/math","","acosh"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE),
         FunctionConsts::FN_ZORBA_MATH_ACOSH_1);
@@ -466,7 +466,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_fmod,
-        (createQName("http://www.zorba-xquery.com/modules/math","","fmod"), 
+        (createQName("http://zorba.io/modules/math","","fmod"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE),
@@ -479,7 +479,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_ldexp,
-        (createQName("http://www.zorba-xquery.com/modules/math","","ldexp"), 
+        (createQName("http://zorba.io/modules/math","","ldexp"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE),
@@ -505,7 +505,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_sinh,
-        (createQName("http://www.zorba-xquery.com/modules/math","","sinh"), 
+        (createQName("http://zorba.io/modules/math","","sinh"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE),
         FunctionConsts::FN_ZORBA_MATH_SINH_1);
@@ -517,7 +517,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_asinh,
-        (createQName("http://www.zorba-xquery.com/modules/math","","asinh"), 
+        (createQName("http://zorba.io/modules/math","","asinh"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE),
         FunctionConsts::FN_ZORBA_MATH_ASINH_1);
@@ -529,7 +529,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_tanh,
-        (createQName("http://www.zorba-xquery.com/modules/math","","tanh"), 
+        (createQName("http://zorba.io/modules/math","","tanh"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE),
         FunctionConsts::FN_ZORBA_MATH_TANH_1);
@@ -541,7 +541,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_atanh,
-        (createQName("http://www.zorba-xquery.com/modules/math","","atanh"), 
+        (createQName("http://zorba.io/modules/math","","atanh"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE),
         FunctionConsts::FN_ZORBA_MATH_ATANH_1);
@@ -564,7 +564,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_is_inf,
-        (createQName("http://www.zorba-xquery.com/modules/math","","is_inf"), 
+        (createQName("http://zorba.io/modules/math","","is_inf"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
         FunctionConsts::FN_ZORBA_MATH_IS_INF_1);
@@ -576,7 +576,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_is_nan,
-        (createQName("http://www.zorba-xquery.com/modules/math","","is_nan"), 
+        (createQName("http://zorba.io/modules/math","","is_nan"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
         FunctionConsts::FN_ZORBA_MATH_IS_NAN_1);
@@ -588,7 +588,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_modf,
-        (createQName("http://www.zorba-xquery.com/modules/math","","modf"), 
+        (createQName("http://zorba.io/modules/math","","modf"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_PLUS),
         FunctionConsts::FN_ZORBA_MATH_MODF_1);
@@ -600,7 +600,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_math_frexp,
-        (createQName("http://www.zorba-xquery.com/modules/math","","frexp"), 
+        (createQName("http://zorba.io/modules/math","","frexp"), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_PLUS),
         FunctionConsts::FN_ZORBA_MATH_FREXP_1);

=== modified file 'src/functions/pregenerated/func_random.cpp'
--- src/functions/pregenerated/func_random.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_random.cpp	2013-07-17 15:56:30 +0000
@@ -67,7 +67,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_random_seeded_random,
-        (createQName("http://www.zorba-xquery.com/modules/random","","seeded-random"), 
+        (createQName("http://zorba.io/modules/random","","seeded-random"), 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
         GENV_TYPESYSTEM.INTEGER_TYPE_STAR),
@@ -80,7 +80,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_random_random,
-        (createQName("http://www.zorba-xquery.com/modules/random","","random"), 
+        (createQName("http://zorba.io/modules/random","","random"), 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
         GENV_TYPESYSTEM.INTEGER_TYPE_STAR),
         FunctionConsts::FN_ZORBA_RANDOM_RANDOM_1);
@@ -103,7 +103,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_util_uuid,
-        (createQName("http://www.zorba-xquery.com/modules/random","","uuid"), 
+        (createQName("http://zorba.io/modules/random","","uuid"), 
         GENV_TYPESYSTEM.STRING_TYPE_ONE),
         FunctionConsts::FN_ZORBA_RANDOM_UUID_0);
 

=== modified file 'src/runtime/spec/mappings.xml'
--- src/runtime/spec/mappings.xml	2013-07-17 07:20:31 +0000
+++ src/runtime/spec/mappings.xml	2013-07-17 15:56:30 +0000
@@ -12,7 +12,7 @@
                      define="XQUERY_MATH_FN_NS"
                      prefix="math"/>
 
-    <zorba:namespace uri="http://www.zorba-xquery.com/modules/math"
+    <zorba:namespace uri="http://zorba.io/modules/math"
                      define="ZORBA_MATH_FN_NS"
                      prefix="fn-zorba-math"/>
 
@@ -94,7 +94,7 @@
                      define="ZORBA_XQDOC_FN_NS" 
                      prefix="fn-zorba-xqdoc"/>
 
-    <zorba:namespace uri="http://www.zorba-xquery.com/modules/random" 
+    <zorba:namespace uri="http://zorba.io/modules/random" 
                      define="ZORBA_RANDOM_FN_NS" 
                      prefix="fn-zorba-random"/>
 

=== modified file 'test/rbkt/ExpQueryResults/zorba/random/seeded-random-between1.xml.res'
--- test/rbkt/ExpQueryResults/zorba/random/seeded-random-between1.xml.res	2013-02-07 17:24:36 +0000
+++ test/rbkt/ExpQueryResults/zorba/random/seeded-random-between1.xml.res	2013-07-17 15:56:30 +0000
@@ -1,1 +1,1 @@
-true true $lower must be smaller or equal than $upper 4 1
+true true $lower must be less than or equal to $upper 4 1

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-05.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-05.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-05.xq	2013-07-17 15:56:30 +0000
@@ -1,6 +1,6 @@
 declare namespace ann = "http://www.zorba-xquery.com/annotations";
 
-declare namespace random = "http://www.zorba-xquery.com/modules/random";
+declare namespace random = "http://zorba.io/modules/random";
 
 declare %ann:deterministic %ann:deterministic function random:random() as xs:integer external;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-06.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-06.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-06.xq	2013-07-17 15:56:30 +0000
@@ -1,6 +1,6 @@
 declare namespace ann = "http://www.zorba-xquery.com/annotations";
 
-declare namespace random = "http://www.zorba-xquery.com/modules/random";
+declare namespace random = "http://zorba.io/modules/random";
 
 declare %ann:nondeterministic %ann:nondeterministic function random:random() as xs:integer external;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-07.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-07.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-07.xq	2013-07-17 15:56:30 +0000
@@ -1,6 +1,6 @@
 declare namespace ann = "http://www.zorba-xquery.com/annotations";
 
-declare namespace random = "http://www.zorba-xquery.com/modules/random";
+declare namespace random = "http://zorba.io/modules/random";
 
 declare %ann:deterministic %ann:nondeterministic function random:random() as xs:integer external;
 

=== modified file 'test/rbkt/Queries/zorba/jsoniq/roundtrip/roundtrip_02.xq'
--- test/rbkt/Queries/zorba/jsoniq/roundtrip/roundtrip_02.xq	2012-09-19 19:47:50 +0000
+++ test/rbkt/Queries/zorba/jsoniq/roundtrip/roundtrip_02.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace f = "http://expath.org/ns/file";
-import module namespace r = "http://www.zorba-xquery.com/modules/random";
+import module namespace r = "http://zorba.io/modules/random";
 
 import schema namespace o = "http://www.w3.org/2010/xslt-xquery-serialization";
 

=== modified file 'test/rbkt/Queries/zorba/math/acosh1.xq'
--- test/rbkt/Queries/zorba/math/acosh1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/acosh1.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:acosh(8723321.4)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/asinh1.xq'
--- test/rbkt/Queries/zorba/math/asinh1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/asinh1.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:asinh(8723321.4)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/atanh1.xq'
--- test/rbkt/Queries/zorba/math/atanh1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/atanh1.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:atanh(0.3)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/cosh1.xq'
--- test/rbkt/Queries/zorba/math/cosh1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/cosh1.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:cosh(7.104760e+002)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/cosh2.xq'
--- test/rbkt/Queries/zorba/math/cosh2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/cosh2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 declare namespace math="http://www.w3.org/2005/xpath-functions/math";
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:cosh(math:log(2))
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/deg-to-rad.xq'
--- test/rbkt/Queries/zorba/math/deg-to-rad.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/deg-to-rad.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 (: test for bug #3079279 :)
-import module namespace math="http://www.zorba-xquery.com/modules/math";
+import module namespace math="http://zorba.io/modules/math";
 
 math:deg-to-rad(10)

=== modified file 'test/rbkt/Queries/zorba/math/fmod1.xq'
--- test/rbkt/Queries/zorba/math/fmod1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/fmod1.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:fmod(-10, 3)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/fmod2.xq'
--- test/rbkt/Queries/zorba/math/fmod2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/fmod2.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:fmod(2.3, 1.1)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/fmod3.xq'
--- test/rbkt/Queries/zorba/math/fmod3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/fmod3.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:fmod(-10, 0)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/frexp1.xq'
--- test/rbkt/Queries/zorba/math/frexp1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/frexp1.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:frexp(16.4)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_avedev1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_avedev1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_avedev1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:avedev((4, 5, 6, 7, 5, 4, 3))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_ceiling1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_ceiling1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_ceiling1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:ceiling(2.5, 1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_ceiling2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_ceiling2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_ceiling2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:ceiling(-2.5, -2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_ceiling3.spec'
--- test/rbkt/Queries/zorba/math/from_excel/excel_ceiling3.spec	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_ceiling3.spec	2013-07-17 15:56:30 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/math:Num
+Error: http://zorba.io/modules/math:INVALID_ARGUMENT

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_ceiling3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_ceiling3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_ceiling3.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:ceiling(-2.5, 2)
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_ceiling4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_ceiling4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_ceiling4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:ceiling(1.5, 0.1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_ceiling5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_ceiling5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_ceiling5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:ceiling(0.234, 0.01)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_ceiling6.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_ceiling6.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_ceiling6.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:ceiling(-20.1, -20.2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_ceiling7.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_ceiling7.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_ceiling7.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:ceiling(0.6, 5E-1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_even1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_even1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_even1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:even(1.5)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_even2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_even2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_even2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:even(3)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_even3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_even3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_even3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:even(2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_even4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_even4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_even4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:even(-1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_even5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_even5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_even5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:even(2.5)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_even6.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_even6.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_even6.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:even(0)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_fact1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_fact1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_fact1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:fact(5)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_fact2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_fact2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_fact2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:fact(1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_fact3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_fact3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_fact3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:fact(0)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_fact4.spec'
--- test/rbkt/Queries/zorba/math/from_excel/excel_fact4.spec	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_fact4.spec	2013-07-17 15:56:30 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/math:Num
+Error: http://zorba.io/modules/math:INVALID_ARGUMENT

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_fact4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_fact4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_fact4.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:fact(-1)
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_fact5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_fact5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_fact5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:fact(1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_factdouble1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_factdouble1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_factdouble1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:factdouble(6)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_factdouble2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_factdouble2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_factdouble2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:factdouble(7)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_floor1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_floor1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_floor1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:floor(2.5, 1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_floor2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_floor2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_floor2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:floor(-2.5, -2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_floor3.spec'
--- test/rbkt/Queries/zorba/math/from_excel/excel_floor3.spec	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_floor3.spec	2013-07-17 15:56:30 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/math:Num
+Error: http://zorba.io/modules/math:INVALID_ARGUMENT

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_floor3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_floor3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_floor3.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:floor(-2.5, 2)
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_floor4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_floor4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_floor4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:floor(1.5, 0.1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_floor5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_floor5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_floor5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:floor(0.234, 0.01)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_floor6.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_floor6.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_floor6.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 (1.31 - math:floor(1.31, 0.2)) ge 0.1

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_gcd1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_gcd1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_gcd1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:gcd((5, 2))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_gcd2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_gcd2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_gcd2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:gcd((24, 36))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_gcd3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_gcd3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_gcd3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:gcd((7, 1))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_gcd4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_gcd4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_gcd4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:gcd((5, 0))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_gcd5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_gcd5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_gcd5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:gcd((13, 17, 23, 29))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_gcd6.spec'
--- test/rbkt/Queries/zorba/math/from_excel/excel_gcd6.spec	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_gcd6.spec	2013-07-17 15:56:30 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/math:Num
+Error: http://zorba.io/modules/math:INVALID_ARGUMENT

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_gcd6.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_gcd6.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_gcd6.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:gcd((-5, 0, 2))
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_gcd7.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_gcd7.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_gcd7.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:gcd((3))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_gcd8.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_gcd8.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_gcd8.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:gcd((6, 12, 15))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_int1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_int1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_int1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:int(8.9)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_int2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_int2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_int2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:int(-8.9)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_int3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_int3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_int3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:int(19.5)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_int4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_int4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_int4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:int(-4.3)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_large1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_large1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_large1.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:large((), 1)
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_large2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_large2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_large2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:large((3, 4, 5, 2, 3, 4, 5, 6, 4, 7), 3)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_large3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_large3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_large3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:large((3, 4, 5, 2, 3, 4, 5, 6, 4, 7), 7 )

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_lcm1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_lcm1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_lcm1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:lcm((5,2))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_lcm2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_lcm2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_lcm2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:lcm((24, 36))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_lcm3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_lcm3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_lcm3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:lcm((5,0))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_lcm4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_lcm4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_lcm4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:lcm((2, 4, 8))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_lcm5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_lcm5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_lcm5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:lcm((11, 12, 13))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_median1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_median1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_median1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:median((1, 3, 4, 2, 5))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_median2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_median2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_median2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:median((1, 3, 4, 2))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mod1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mod1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mod1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:mod(3,2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mod2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mod2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mod2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:mod(-3,2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mod3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mod3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mod3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:mod(3,-2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mod4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mod4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mod4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:mod(-3,-2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mode1.spec'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mode1.spec	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mode1.spec	2013-07-17 15:56:30 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/math:NA
+Error: http://zorba.io/modules/math:INVALID_INPUT

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mode1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mode1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mode1.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:mode((1, 3, 4, 2, 5))
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mode2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mode2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mode2.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:mode((1, 3, 4, 2, "l"))
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mode3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mode3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mode3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:mode((1, 3, 4, 3, 2, 2, 5, 3, 5))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mround1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mround1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mround1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:mround(10, 3)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mround2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mround2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mround2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:mround(-10, -3)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mround3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mround3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mround3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-zorba-math="http://www.zorba-xquery.com/modules/math";
+zorba-math="http://zorba.io/modules/math";
 
 zorba-math:mround(1.3, 0.2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_mround4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_mround4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_mround4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-zorba-math="http://www.zorba-xquery.com/modules/math";
+zorba-math="http://zorba.io/modules/math";
 
 zorba-math:mround(-1.3, -0.2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_odd1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_odd1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_odd1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:odd(1.5)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_odd2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_odd2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_odd2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:odd(3)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_odd3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_odd3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_odd3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:odd(2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_odd4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_odd4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_odd4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:odd(-1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_odd5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_odd5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_odd5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:odd(-2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_odd6.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_odd6.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_odd6.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:odd(0)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_percentile1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_percentile1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_percentile1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:percentile((1, 3, 4, 3, 2, 2, 5, 3, 5), 1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_percentile2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_percentile2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_percentile2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:percentile((1, 3, 4, 3, 2, 2, 5, 3, 5), 0.5)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_percentile3.spec'
--- test/rbkt/Queries/zorba/math/from_excel/excel_percentile3.spec	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_percentile3.spec	2013-07-17 15:56:30 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/math:Num
+Error: http://zorba.io/modules/math:INVALID_ARGUMENT

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_percentile3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_percentile3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_percentile3.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:percentile((1, 3, 4, 3, 2, 2, 5, 3, 5), 5)
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_percentrank1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_percentrank1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_percentrank1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:percentrank((13, 12, 11, 8, 4, 3, 2, 1, 1, 1), 2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_percentrank2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_percentrank2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_percentrank2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:percentrank((13, 12, 11, 8, 4, 3, 2, 1, 1, 1), 4)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_percentrank3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_percentrank3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_percentrank3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:percentrank((13, 12, 11, 8, 4, 3, 2, 1, 1, 1), 8)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_percentrank4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_percentrank4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_percentrank4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:percentrank((13, 12, 11, 8, 4, 3, 2, 1, 1, 1), 5)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_percentrank5.spec'
--- test/rbkt/Queries/zorba/math/from_excel/excel_percentrank5.spec	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_percentrank5.spec	2013-07-17 15:56:30 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/math:Num
+Error: http://zorba.io/modules/math:INVALID_ARGUMENT

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_percentrank5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_percentrank5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_percentrank5.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:percentrank((), 2)
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_prob1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_prob1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_prob1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:prob((0, 1, 2, 3), (0.2, 0.3, 0.1, 0.4), 2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_prob2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_prob2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_prob2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:prob((0, 1, 2, 3), (0.2, 0.3, 0.1, 0.4), 1, 3)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_product1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_product1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_product1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:product((2, 0.5))
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_product2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_product2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_product2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:product((5, 15, 30, 0))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_product3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_product3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_product3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:product((5, 15, 30, -1))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_product4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_product4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_product4.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:product((5, 15, 30, "POP"))
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_product5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_product5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_product5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:product(())

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_quartile1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_quartile1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_quartile1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:quartile((1, 2, 4, 7, 8, 9, 10, 12), 0)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_quartile2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_quartile2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_quartile2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:quartile((1, 2, 4, 7, 8, 9, 10, 12), 1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_quartile3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_quartile3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_quartile3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:quartile((1, 2, 4, 7, 8, 9, 10, 12), 2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_quartile4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_quartile4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_quartile4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:quartile((1, 2, 4, 7, 8, 9, 10, 12), 3)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_quartile5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_quartile5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_quartile5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:quartile((1, 2, 4, 7, 8, 9, 10, 12), 4)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_quotient1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_quotient1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_quotient1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:quotient(5,2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_quotient2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_quotient2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_quotient2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:quotient(4.5, 3.1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_quotient3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_quotient3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_quotient3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:quotient(-10,3)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_quotient4.spec'
--- test/rbkt/Queries/zorba/math/from_excel/excel_quotient4.spec	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_quotient4.spec	2013-07-17 15:56:30 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/math:Div0
+Error: http://zorba.io/modules/math:DIVIDE_BY_0

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_quotient4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_quotient4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_quotient4.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:quotient(1,0)
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_rank1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_rank1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_rank1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:rank(3.5, (7, 3.5, 3.5, 1, 2), fn:true() )

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_rank2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_rank2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_rank2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:rank(7, (7, 3.5, 3.5, 1, 2), fn:true() )

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_rank3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_rank3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_rank3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:rank(3.5, (7, 3.5, 3.5, 1, 2) )

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_rank4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_rank4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_rank4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:rank(3.5, (2, 3, 4), fn:true() )

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_rank5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_rank5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_rank5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:rank(3.5, (1, 2) )

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_roman1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_roman1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_roman1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:roman(499)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_roman2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_roman2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_roman2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:roman(2009)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_roman3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_roman3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_roman3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:roman(1555)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_round1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_round1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_round1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:round(2.15, 1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_round2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_round2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_round2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:round(2.149, 1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_round3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_round3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_round3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:round(-1.475, 2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_round4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_round4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_round4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:round(21.5, -1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_rounddown1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_rounddown1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_rounddown1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:rounddown(3.2, 0)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_rounddown2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_rounddown2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_rounddown2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:rounddown(76.9,0)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_rounddown3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_rounddown3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_rounddown3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:rounddown(3.14159, 3)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_rounddown4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_rounddown4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_rounddown4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:rounddown(-3.14159, 1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_rounddown5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_rounddown5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_rounddown5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:rounddown(31415.92654, -2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_roundup1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_roundup1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_roundup1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:roundup(3.2, 0)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_roundup2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_roundup2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_roundup2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:roundup(76.9,0)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_roundup3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_roundup3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_roundup3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:roundup(3.14159, 3)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_roundup4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_roundup4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_roundup4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:roundup(-3.14159, 1)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_roundup5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_roundup5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_roundup5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:roundup(31415.92654, -2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_sign1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_sign1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_sign1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:sign(100)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_sign2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_sign2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_sign2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:sign(0)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_sign3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_sign3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_sign3.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:sign(-1E100)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_slope1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_slope1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_slope1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:slope((2, 3, 9, 1, 8, 7, 5), (6, 5, 11, 7, 5, 4, 4))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_small1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_small1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_small1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:small((3, 4, 5, 2, 3, 4, 6, 4, 7), 4)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_small2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_small2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_small2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:small((1, 4, 8, 3, 7, 12, 54, 8, 23), 2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_standardize1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_standardize1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_standardize1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:standardize(42, 40, 1.5)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_stdev1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_stdev1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_stdev1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:stdev((1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_stdeva1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_stdeva1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_stdeva1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:stdeva((1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_stdevp1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_stdevp1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_stdevp1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:stdevp((1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_stdevpa1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_stdevpa1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_stdevpa1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:stdevpa((1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_subtotal1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_subtotal1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_subtotal1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:subtotal(1, (2, 3, 4))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_subtotal10.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_subtotal10.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_subtotal10.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:subtotal(10, (1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_subtotal11.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_subtotal11.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_subtotal11.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:subtotal(11, (1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_subtotal2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_subtotal2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_subtotal2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:subtotal(2, (2, 3, 4))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_subtotal3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_subtotal3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_subtotal3.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:subtotal(3, (2, 3, 4, "", "x"))
 

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_subtotal4.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_subtotal4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_subtotal4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:subtotal(4, (2, 3, 4))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_subtotal5.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_subtotal5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_subtotal5.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:subtotal(5, (2, 3, 4))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_subtotal6.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_subtotal6.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_subtotal6.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:subtotal(6, (2, 3, 4))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_subtotal7.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_subtotal7.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_subtotal7.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:subtotal(7, (1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_subtotal8.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_subtotal8.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_subtotal8.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:subtotal(8, (1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_subtotal9.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_subtotal9.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_subtotal9.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:subtotal(9, (2, 3, 4))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_sumproduct2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_sumproduct2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_sumproduct2.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:sumproduct((1,2,3,4,5),
                 (1,2,3,4,5))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_sumsq1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_sumsq1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_sumsq1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:sumsq((1,2,3,4,5))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_trunc1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_trunc1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_trunc1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:trunc(8.9)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_trunc2.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_trunc2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_trunc2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:trunc(-8.9)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_trunc3.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_trunc3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_trunc3.xq	2013-07-17 15:56:30 +0000
@@ -1,5 +1,5 @@
 declare namespace math="http://www.w3.org/2005/xpath-functions/math";
 import module namespace
-zorba-math="http://www.zorba-xquery.com/modules/math";
+zorba-math="http://zorba.io/modules/math";
 
 zorba-math:trunc(math:pi(), 2)

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_var1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_var1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_var1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:var((1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_vara1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_vara1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_vara1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:vara((1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_varp1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_varp1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_varp1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:varp((1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/from_excel/excel_varpa1.xq'
--- test/rbkt/Queries/zorba/math/from_excel/excel_varpa1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/from_excel/excel_varpa1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 import module namespace
-math="http://www.zorba-xquery.com/modules/math";
+math="http://zorba.io/modules/math";
 
 math:varpa((1345, 1301, 1368, 1322, 1310, 1370, 1318, 1350, 1303, 1299))

=== modified file 'test/rbkt/Queries/zorba/math/is_inf1.xq'
--- test/rbkt/Queries/zorba/math/is_inf1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/is_inf1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 declare namespace math="http://www.w3.org/2005/xpath-functions/math";
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:is_inf(math:pow(0, -1))

=== modified file 'test/rbkt/Queries/zorba/math/is_nan1.xq'
--- test/rbkt/Queries/zorba/math/is_nan1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/is_nan1.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:is_nan(xs:double("NaN"))

=== modified file 'test/rbkt/Queries/zorba/math/ldexp1.xq'
--- test/rbkt/Queries/zorba/math/ldexp1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/ldexp1.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:ldexp(4, 3)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/modf1.xq'
--- test/rbkt/Queries/zorba/math/modf1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/modf1.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:modf(-14.876543)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/sinh1.xq'
--- test/rbkt/Queries/zorba/math/sinh1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/sinh1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
 declare namespace math="http://www.w3.org/2005/xpath-functions/math";
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:sinh(math:pi() div 2)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/math/tanh1.xq'
--- test/rbkt/Queries/zorba/math/tanh1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/math/tanh1.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace fn-zorba-math = "http://www.zorba-xquery.com/modules/math";
+import module namespace fn-zorba-math = "http://zorba.io/modules/math";
 
 fn-zorba-math:tanh(1)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/random/random1.xq'
--- test/rbkt/Queries/zorba/random/random1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/random/random1.xq	2013-07-17 15:56:30 +0000
@@ -1,3 +1,3 @@
-import module namespace r = "http://www.zorba-xquery.com/modules/random";
+import module namespace r = "http://zorba.io/modules/random";
 
 count((for $i in 1 to 10 return r:random(10), r:random())) eq 101

=== modified file 'test/rbkt/Queries/zorba/random/seeded-random-between1.xq'
--- test/rbkt/Queries/zorba/random/seeded-random-between1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/random/seeded-random-between1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
-import module namespace r = "http://www.zorba-xquery.com/modules/random";
+import module namespace r = "http://zorba.io/modules/random";
 
 declare namespace err = "http://www.w3.org/2005/xqt-errors";
 
@@ -10,7 +10,7 @@
 try
 {
   r:seeded-random-between(1, 4, 1, 100)
-} catch r:invalid-arg
+} catch r:INVALID_ARGUMENT
 {
   $err:description, $err:value
 }

=== modified file 'test/rbkt/Queries/zorba/random/seeded-random1.xq'
--- test/rbkt/Queries/zorba/random/seeded-random1.xq	2013-06-25 03:55:20 +0000
+++ test/rbkt/Queries/zorba/random/seeded-random1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
-import module namespace r = "http://www.zorba-xquery.com/modules/random";
+import module namespace r = "http://zorba.io/modules/random";
 
 declare namespace zerr = "http://zorba.io/modules/zorba-errors";
 declare namespace err = "http://www.w3.org/2005/xqt-errors";

=== modified file 'test/rbkt/Queries/zorba/random/uuid1.xq'
--- test/rbkt/Queries/zorba/random/uuid1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/random/uuid1.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
-import module namespace r = "http://www.zorba-xquery.com/modules/random";
+import module namespace r = "http://zorba.io/modules/random";
 
 (: all uuids are distinct? :)
 let $seq := for $i in 1 to 10 return r:uuid()

=== modified file 'test/rbkt/Queries/zorba/random/uuid2.xq'
--- test/rbkt/Queries/zorba/random/uuid2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/random/uuid2.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
-import module namespace r = "http://www.zorba-xquery.com/modules/random";
+import module namespace r = "http://zorba.io/modules/random";
 
 (: all uuids are distinct? :)
 let $seq := for $i in 1 to 10 return r:uuid()

=== modified file 'test/rbkt/Queries/zorba/reflection/reflection-invoke-10.xq'
--- test/rbkt/Queries/zorba/reflection/reflection-invoke-10.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/reflection/reflection-invoke-10.xq	2013-07-17 15:56:30 +0000
@@ -1,6 +1,6 @@
 import module namespace ref  = "http://www.zorba-xquery.com/modules/reflection";
-import module namespace rand = "http://www.zorba-xquery.com/modules/random";
+import module namespace rand = "http://zorba.io/modules/random";
 
-declare variable $name as xs:QName := fn:QName('http://www.zorba-xquery.com/modules/random', 'random');
+declare variable $name as xs:QName := fn:QName('http://zorba.io/modules/random', 'random');
 
 count( ref:invoke($name) ) > 0

=== modified file 'test/rbkt/Queries/zorba/scripting/constr4.xq'
--- test/rbkt/Queries/zorba/scripting/constr4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/constr4.xq	2013-07-17 15:56:30 +0000
@@ -1,4 +1,4 @@
-import module namespace r = "http://www.zorba-xquery.com/modules/random";
+import module namespace r = "http://zorba.io/modules/random";
 
 (: test call to a nondeterministic function in an element constructor :)
 element book {

=== modified file 'test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm'
--- test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm	2013-07-17 07:20:31 +0000
+++ test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm	2013-07-17 15:56:30 +0000
@@ -126,7 +126,7 @@
                       </sup>
                     </li>
                     <li>
-                      <a href="www.zorba-xquery.com_modules_math.html" title="http://www.zorba-xquery.com/modules/math">math</a>
+                      <a href="www.zorba-xquery.com_modules_math.html" title="http://zorba.io/modules/math">math</a>
                       <sup>
                         <a href="http://www.w3.org/TR/xquery-30/#dt-external-function" target="_blank" title="There are external functions (either private or public) declared in this module.">(E)</a>
                       </sup>
@@ -135,7 +135,7 @@
                       </sup>
                     </li>
                     <li>
-                      <a href="www.zorba-xquery.com_modules_random.html" title="http://www.zorba-xquery.com/modules/random">random</a>
+                      <a href="www.zorba-xquery.com_modules_random.html" title="http://zorba.io/modules/random">random</a>
                       <sup>
                         <a href="http://www.w3.org/TR/xquery-30/#dt-external-function" target="_blank" title="There are external functions (either private or public) declared in this module.">(E)</a>
                       </sup>

=== modified file 'test/rbkt/Queries/zorba/xqxq/external-module.xq'
--- test/rbkt/Queries/zorba/xqxq/external-module.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/xqxq/external-module.xq	2013-07-17 15:56:30 +0000
@@ -1,7 +1,7 @@
 import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
 
 variable $query-key := xqxq:prepare-main-module('
-    import module namespace r = "http://www.zorba-xquery.com/modules/random";
+    import module namespace r = "http://zorba.io/modules/random";
 
     count((for $i in 1 to 10 return r:random(10), r:random())) eq 101
     ');

=== modified file 'test/unit/invoke.cpp'
--- test/unit/invoke.cpp	2013-02-07 17:24:36 +0000
+++ test/unit/invoke.cpp	2013-07-17 15:56:30 +0000
@@ -164,12 +164,12 @@
 
     std::ostringstream lProlog;
     lProlog
-      << "import module namespace r = 'http://www.zorba-xquery.com/modules/random';";
+      << "import module namespace r = 'http://zorba.io/modules/random';";
     lSctx->loadProlog(lProlog.str(), lHints);
 
     ItemFactory* lFac = z->getItemFactory();
     Item lQName = lFac->createQName(
-        "http://www.zorba-xquery.com/modules/random",
+        "http://zorba.io/modules/random",
         "random"); 
 
     std::vector<ItemSequence_t> lArgs;