Merge lp:~zorba-coders/zorba/update3.0_zorba-query-module into lp:zorba

[Juan Zacarias]

Update 3.0 for xqxq

Renamed xqxq module to zorba-query module (zq module)

Update 3.0 for xqxq

Renamed xqxq module to zorba-query module (zq module)

[lp:~zorba-coders/zorba/update3.0_zorba-query-module]

11596. By sorin.marian.nasoi <email address hidden> on 2013-08-12

Re-added changes that were wrongfully reverted in r11402.1.5.
Approved: Chris Hillery, Sorin Marian Nasoi

11597. By Juan Zacarias on 2013-08-13

XQXQ module modifications:
Changed namespace to zorba.io
Renamed module to zorba-query module (zq module)

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756

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/update3.0_zorba-query-module/+merge/179756 :
Votes: {'Pending': 2}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756

Stage "CommitZorba" failed.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756

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/update3.0_zorba-query-module/+merge/179756 :
Votes: {'Pending': 2}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756

Stage "CommitZorba" failed.

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

[Chris Hillery (ceejatec)]

Two small issues:

1. The module version number should be changed back to 1.0, since the name has changed so it's not the same module anymore. Don't forget to update both CMakeLists.txt and the module text itself, as well as (at least) FOTS driver where it is imported.

2. Can you try remove the word "XQuery" as much as possible from the module XQDoc? eg, instead of "XQuery program", just write "query", I think. In the main header comment, you could spell out that a query is either an XQuery or a JSONiq query.

Sorin: it looks like all the changes to FOTS driver are mechanical, eg. changing xqxq: to zq:. However, please review to make sure there are no surprises there.

review: Needs Fixing

[lp:~zorba-coders/zorba/update3.0_zorba-query-module]

11598. By Juan Zacarias on 2013-08-14

Cosmetic Changes for ZQ module.

11599. By Juan Zacarias on 2013-08-14

merged with trunk

11600. By Chris Hillery on 2013-08-14

Changed additional uses of "XQuery" and "program"; a bit of doc cleanup.

[Chris Hillery (ceejatec)]

I cleaned up a few more references to "XQuery" in the doc, and a couple other doc bits. Looks good now.

review: Approve

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756

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/update3.0_zorba-query-module/+merge/179756

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/update3.0_zorba-query-module/+merge/179756

Stage "CommitZorba" failed.

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

=== modified file 'ChangeLog'
--- ChangeLog	2013-08-09 23:05:46 +0000
+++ ChangeLog	2013-08-14 06:22:56 +0000
@@ -70,6 +70,7 @@
      that are not objects/arrays).
   * Bug fix: selector value in object/array navigation is always cast to
     string/integer
+  * Renamed xqxq module to zorba-query module(zq module).
 
 version 2.9
 

=== modified file 'doc/zorba/xqdoc/images/modules.svg'
--- doc/zorba/xqdoc/images/modules.svg	2013-08-07 05:28:39 +0000
+++ doc/zorba/xqdoc/images/modules.svg	2013-08-14 06:22:56 +0000
@@ -594,10 +594,10 @@
 <text text-anchor="middle" x="1306" y="-511.8" font-family="Times,serif" font-size="14.00">Programming Languages</text>
 </a>
 </g>
-<g id="graph100" class="cluster"><title>clusterZorbaProgrammingLanguagesXQXQ</title>
-<a xlink:title="Zorba/Programming Languages/XQXQ">
+<g id="graph100" class="cluster"><title>clusterZorbaProgrammingLanguagesZQ</title>
+<a xlink:title="Zorba/Programming Languages/ZQ">
 <polygon fill="lightsteelblue" stroke="black" points="1308,-421 1308,-496 1382,-496 1382,-421 1308,-421"/>
-<text text-anchor="middle" x="1345" y="-480.8" font-family="Times,serif" font-size="14.00">XQXQ</text>
+<text text-anchor="middle" x="1345" y="-480.8" font-family="Times,serif" font-size="14.00">ZQ</text>
 </a>
 </g>
 <g id="graph101" class="cluster"><title>clusterZorbaProgrammingLanguagesXSLT</title>
@@ -1895,9 +1895,9 @@
 </g>
 <!-- 45 -->
 <g id="node178" class="node"><title>45</title>
-<a xlink:href="../modules_zorba_programming_languages_XQXQ.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/xqxq">
+<a xlink:href="../modules_zorba_programming_languages_ZQ.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/zorba-query">
 <ellipse fill="white" stroke="white" cx="1345" cy="-447" rx="28.3955" ry="18"/>
-<text text-anchor="middle" x="1345" y="-443.3" font-family="Times,serif" font-size="14.00" fill="red">xqxq</text>
+<text text-anchor="middle" x="1345" y="-443.3" font-family="Times,serif" font-size="14.00" fill="red">zorba-query</text>
 </a>
 </g>
 <!-- 51 -->

=== modified file 'doc/zorba/xqdoc/images/modules_new.svg'
--- doc/zorba/xqdoc/images/modules_new.svg	2013-08-07 05:28:39 +0000
+++ doc/zorba/xqdoc/images/modules_new.svg	2013-08-14 06:22:56 +0000
@@ -594,10 +594,10 @@
 <text text-anchor="middle" x="1306" y="-511.8" font-family="Times,serif" font-size="14.00">Programming Languages</text>
 </a>
 </g>
-<g id="graph100" class="cluster"><title>clusterZorbaProgrammingLanguagesXQXQ</title>
-<a xlink:title="Zorba/Programming Languages/XQXQ">
+<g id="graph100" class="cluster"><title>clusterZorbaProgrammingLanguagesZQ</title>
+<a xlink:title="Zorba/Programming Languages/ZQ">
 <polygon fill="lightsteelblue" stroke="black" points="1308,-421 1308,-496 1382,-496 1382,-421 1308,-421"/>
-<text text-anchor="middle" x="1345" y="-480.8" font-family="Times,serif" font-size="14.00">XQXQ</text>
+<text text-anchor="middle" x="1345" y="-480.8" font-family="Times,serif" font-size="14.00">ZQ</text>
 </a>
 </g>
 <g id="graph101" class="cluster"><title>clusterZorbaProgrammingLanguagesXSLT</title>
@@ -1895,9 +1895,9 @@
 </g>
 <!-- 45 -->
 <g id="node178" class="node"><title>45</title>
-<a xlink:href="../modules_zorba_programming_languages_XQXQ.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/xqxq">
+<a xlink:href="../modules_zorba_programming_languages_ZQ.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/zorba-query">
 <ellipse fill="white" stroke="white" cx="1345" cy="-447" rx="28.3955" ry="18"/>
-<text text-anchor="middle" x="1345" y="-443.3" font-family="Times,serif" font-size="14.00" fill="red">xqxq</text>
+<text text-anchor="middle" x="1345" y="-443.3" font-family="Times,serif" font-size="14.00" fill="red">zorba-query</text>
 </a>
 </g>
 <!-- 51 -->

=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt	2013-08-07 23:46:25 +0000
+++ modules/CMakeLists.txt	2013-08-14 06:22:56 +0000
@@ -16,7 +16,7 @@
 ADD_SUBDIRECTORY(com)
 ADD_SUBDIRECTORY(org)
 ADD_SUBDIRECTORY(functx)
-ADD_SUBDIRECTORY(xqxq)
+ADD_SUBDIRECTORY(zorba-query)
 ADD_SUBDIRECTORY(w3c)
 ADD_SUBDIRECTORY(full-text)
 ADD_SUBDIRECTORY(xml)

=== renamed directory 'modules/xqxq' => 'modules/zorba-query'
=== modified file 'modules/zorba-query/CMakeLists.txt'
--- modules/xqxq/CMakeLists.txt	2013-04-09 14:22:41 +0000
+++ modules/zorba-query/CMakeLists.txt	2013-08-14 06:22:56 +0000
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/xqxq" VERSION 2.0 FILE "xqxq.xq")
\ No newline at end of file
+DECLARE_ZORBA_MODULE (URI "http://zorba.io/modules/zorba-query" VERSION 1.0 FILE "zorba-query.xq")
\ No newline at end of file

=== renamed file 'modules/xqxq/xqxq.xq' => 'modules/zorba-query/zorba-query.xq'
--- modules/xqxq/xqxq.xq	2013-08-09 08:27:30 +0000
+++ modules/zorba-query/zorba-query.xq	2013-08-14 06:22:56 +0000
@@ -16,242 +16,239 @@
 :)
 
 (:~
- : This module contains functions to compile and evaluate XQuery
- : programs. Also, it contains function that allow to parameterize
- : the static or dynamic evaluation phase.
+ : This module contains functions to compile and evaluate queries
+ : written in either JSONiq or XQuery. Also, it contains function that
+ : allow to parameterize the static or dynamic evaluation phase.
  :
  : @author Juan Zacarias
- : @project Zorba/Programming Languages/XQXQ
+ : @project Zorba/Programming Languages/ZQ
  :)
-module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+module namespace zq = 'http://zorba.io/modules/zorba-query';
 
 declare namespace an = "http://zorba.io/annotations";
 declare namespace ver = "http://zorba.io/options/versioning";
 declare namespace op = "http://zorba.io/options/features";
 declare namespace f = "http://zorba.io/features";
 
-declare option ver:module-version "2.0";
+declare option ver:module-version "1.0";
 
 (:~
- : The function prepares a given XQuery program for execution.
- : If the program was successfully compiled, the function returns an
+ : <p>The function prepares a given a query for execution.</p>
+ : <p>If the query was successfully compiled, the function returns an
  : identifier as xs:anyURI. This URI can be passed to other functions
- : of this module (e.g. to actually evaluate the program). The URI
- : is opaque and its lilfetime is bound by the lifetime of the XQuery
- : program that invoked this function. Further reference or uses
- : of the identifier lead to unexpected results.
- :
- : Successfully prepared queries need to be deleted by passing the resulting
- : identifier to the xqxq:delete-query function of this module.
- :
- : @param $main-module-text the XQuery program that should be prepared.
- :   The program needs to be a XQuery main module.
- :
- : @return an identifier for the compiled program that can be passed
+ : of this module (e.g. to actually evaluate the query). The URI
+ : is opaque and its lifetime is bound by the lifetime of the query
+ : that invoked this function. Further reference or uses
+ : of the identifier lead to unexpected results.</p>
+ : <p/>
+ : <p>Successfully prepared queries need to be deleted by passing the resulting
+ : identifier to the zq:delete-query function of this module.</p>
+ :
+ : @param $main-module-text the query that should be prepared.
+ :   The query needs to be a XQuery or JSONiq main module.
+ :
+ : @return an identifier for the compiled query that can be passed
  :   as arguments to other functions of this module.
  :
  : @error any (static or type) error that may be raised during the compilation
- : of the query. For example, err:XPST0003 if the given XQuery program could
+ : of the query. For example, err:XPST0003 if the given query could
  : not be parsed.
  :)
-declare %an:sequential function xqxq:prepare-main-module($main-module-text as xs:string) as 
+declare %an:sequential function zq:prepare-main-module($main-module-text as xs:string) as 
   xs:anyURI external;
 
 (:~
- : The function prepares a given XQuery program for execution.
- : If the program was successfully compiled, the function returns an
+ : <p>The function prepares a given query for execution.</p>
+ : <p>If the query was successfully compiled, the function returns an
  : identifier as xs:anyURI. This URI can be passed to other functions
- : of this module (e.g. to actually evaluate the program). The URI
- : is opaque and its lilfetime is bound by the lifetime of the XQuery
- : program that invoked this function. Further reference or uses
- : of the identifier lead to unexpected results.
- : 
- : Important notes regarding the second and third parameters of the function:
- : --------------------------------------------------------------------------
- :
- : These parameters allow you to specify a URL resolver and a URI mapper
+ : of this module (e.g. to actually evaluate the query). The URI
+ : is opaque and its lifetime is bound by the lifetime of the query
+ : that invoked this function. Further reference or uses
+ : of the identifier lead to unexpected results.</p>
+ : <p/>
+ : <p>Important notes regarding the second and third parameters of the function:</p>
+ : <p>--------------------------------------------------------------------------</p>
+ : <p/>
+ : <p>These parameters allow you to specify a URL resolver and a URI mapper
  : for Zorba to use when executing this query. See
- : http://www.zorba-xquery.com/html/documentation/2.7.0/zorba/uriresolvers
- :
- : The second parameter is a function item for a URL
+ : <a href="http://www.zorba-xquery.com/html/documentation/2.7.0/zorba/uriresolvers">here</a></p>
+ : <p/>
+ : <ul>The second parameter is a function item for a URL
  : resolver. The URL resolver function must recive 2 parameters:
- :   A $namespace as xs:string that will contain the url to be resolved.
- :   A $entity as xs:string that will contain the type of resolving needed;
- :   this can be 2 values "module" and "schema".
- : The function must return an empty sequence when the specified $namespace
- : or $entity are not the ones to be resolved.
- :
- : Example:
- :   
- : declare function mymod:url-resolver($namespace as xs:string, $entity as xs:string)
+ : <li>A $namespace as xs:string that will contain the url to be resolved.</li>
+ : <li>A $entity as xs:string that will contain the type of resolving needed.
+ :   This can be one of two values: "module" or "schema".</li>
+ : </ul>
+ : <p>The function must return the empty sequence when the specified $namespace
+ : or $entity are not the ones to be resolved.</p>
+ : <p/>
+ : <p>Example:</p>
+ : <p/>  
+ : <code>declare function mymod:url-resolver($namespace as xs:string, $entity as xs:string) as item()?
  : {
  :  if($namespace = 'http://test.xq')
  :  then "module namespace test = 'http://test'; declare function test:foo(){'foo'};"
  :  else ()
- : };
- :
- : The URL resolver function's namespace, name, and parameter naming are
- : not restricted by XQXQ.
- :
- : The URL resolver function's return type is not restricted, it could be a string, a sequence,
- : a node, etc. All the outputs types are to be serialized as a string.
- :
- : The third parameter is a function item for a URI mapper.
- : The URI mapper function, just like the URL resolver, receives 2 parameters:
- :   A $namespace as xs:string that will contain the URI to be mapped.
- :   A $entity as xs:string that will contain the type of resolving needed;
- :   this can be 2 values "module" and "schema".
- : The URI mapper must return an empty sequence when the specified $namesapce or $entity
- : are not to be mapped. Unlike the URL resolver this function must return a sequence of strings.
- :
- : Example:
- :
- : declare function mymod:uri-mapper($namespace as xs:string, $entity as xs:string)
+ : };</code>
+ : <p/>
+ : <p>The URL resolver function's namespace, name, and parameter naming are
+ : not restricted by ZQ.</p>
+ : <p/>
+ : <p>The URL resolver function's return type is not restricted, it could be a string, a sequence,
+ : a node, etc. All the outputs types are to be serialized as a string.</p>
+ : <p/>
+ : <p>The third parameter is a function item for a URI mapper.</p>
+ : <ul>The URI mapper function, just like the URL resolver, receives 2 parameters:
+ : <li>A $namespace as xs:string that will contain the URI to be mapped.</li>
+ : <li>A $entity as xs:string that will contain the type of resolving needed.
+ :   This can be one of two values: "module" or "schema".</li>
+ : </ul>
+ : <p>The URI mapper must return an empty sequence when the specified $namesapce or $entity
+ : are not to be mapped. Unlike the URL resolver this function must return a sequence of strings.</p>
+ : <p/>
+ : <p>Example:</p>
+ : <p/>
+ : <code>declare function mymod:uri-mapper($namespace as xs:string, $entity as xs:string)
  : {
  :  if($namespace = 'http://test')
- :  then ("http://www.zorba-xquery.com/test", "http://foo.com/schema/test")
+ :  then ("http://zorba.io/test", "http://foo.com/schema/test")
  :  else ()
- : };
- :
- : The URI mapper function's namespace, name, and parameter naming are
- : not restricted by XQXQ.
- :
- : In order to pass the above URL resolver and URI mapper to this function,
- : use the following syntax:
- :
- :   variable $queryID := xqxq:prepare-main-module("..query text..",
- :      mymod:url-resolver#2, mymod:uri-mapper#2);
- :
- : That is, the QName of the function followed by "#2". This is XQuery
+ : };</code>
+ : <p/>
+ : <p>The URI mapper function's namespace, name, and parameter naming are
+ : not restricted by ZQ.</p>
+ : <p/>
+ : <p>In order to pass the above URL resolver and URI mapper to this function,
+ : use the following syntax:</p>
+ : <p/>
+ :   <code>variable $queryID := zq:prepare-main-module("..query text..",
+ :      mymod:url-resolver#2, mymod:uri-mapper#2);</code>
+ : <p/>
+ : <p>That is, the QName of the function followed by "#2". This is XQuery
  : "higher-order function" syntax, meaning the function with the specified
  : QName which takes two arguments. Since URL resolvers and URI mappers
- : must take two arguments, both will always be specified with "#2".
- :
- : Note that parameters 2 and 3 should be declared as follows:
- :    as function($url as xs:string, $entity as xs:string) as item()
- :    as function($uri as xs:string, $entity as xs:string) as xs:string*
- : However Zorba's implementation of higher-order functions (HOF) is not
- : yet complete enough to allow for this. When Zorba's HOF implementation
- : is complete this function signature will be changed.
- :
- : Both the URL resolver and URI mapper functions are optional, meaning you
- : may pass the empty-sequence () for either.
- :
- : Successfully prepared queries need to be deleted by passing the resulting
- : identifier to the xqxq:delete-query function of this module.
- :
- : @param $main-module-text the XQuery program that should be prepared.
- :   The program needs to be a XQuery main module.
+ : must take two arguments, both will always be specified with "#2".</p>
+ : <p/>
+ : <p>Both the URL resolver and URI mapper functions are optional, meaning you
+ : may pass the empty-sequence () for either.</p>
+ : <p/>
+ : <p>Successfully prepared queries need to be deleted by passing the resulting
+ : identifier to the zq:delete-query function of this module.</p>
+ :
+ : @param $main-module-text the query that should be prepared.
+ :   The query needs to be a XQuery or JSONiq main module.
  :
  : @param $resolver the URL resolver function.
  : 
  : @param $mapper the URI mapper function.
  :
- : @return an identifier for the compiled program that can be passed
+ : @return an identifier for the compiled query that can be passed
  :   as arguments to other functions of this module.
  :
  : @error any (static or type) error that may be raised during the compilation
- : of the query. For example, err:XPST0003 if the given XQuery program could
+ : of the query. For example, err:XPST0003 if the given query could
  : not be parsed.
  :)
-declare %an:sequential function xqxq:prepare-main-module($main-module-text as xs:string, $resolver as item()?, $mapper as item()?) as 
-  xs:anyURI external;
+declare %an:sequential function zq:prepare-main-module(
+  $main-module-text as xs:string,
+  $resolver as ( function(xs:string, xs:string) as item()? )?,
+  $mapper as ( function(xs:string, xs:string) as xs:string* )? ) as 
+    xs:anyURI external;
 
 (:~
- : This function compiles a given XQuery library module. It can be used
- : to compile-check a module. 
+ : <p>This function compiles a given XQuery or JSONiq library module.
+ : It can be used to compile-check a module.</p> 
  :
- : @param $library-module-text the XQuery library module that should
+ : @param $library-module-text the library module that should
  :  be prepared. 
  :
- : @return the function is declared as sequential.It returns the
- :  empty-sequence.
+ : @return the empty-sequence.
  :
  : @error any (static or type) error that may be raised during the compilation
- : of the library module. For example, err:XPST0003 if the given XQuery library
+ : of the library module. For example, err:XPST0003 if the given library
  : module could not be parsed.
  :)
-declare %an:sequential function xqxq:prepare-library-module($library-module-text as xs:string) as 
+declare %an:sequential function zq:prepare-library-module($library-module-text as xs:string) as 
   empty-sequence() external ;
 
 (:~
- : The function tests if the context-item is bound for the
- : execution of the query referred to by the given query identifier.
+ : <p>The function tests if the context-item is bound for the
+ : execution of the query referred to by the given query identifier.</p>
  :
  : @param $query-key the identifier for a compiled query
  :
  : @return true if the context-item is bound, false otherwise.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
  :)
-declare function xqxq:is-bound-context-item($query-key as xs:anyURI) 
+declare function zq:is-bound-context-item($query-key as xs:anyURI) 
   as xs:boolean  external;
   
 
 (:~
- : The function tests if the given variable is bound for the
- : execution of the query referred to by the given query identifier.
+ : <p>The function tests if the given variable is bound for the
+ : execution of the query referred to by the given query identifier.</p>
  :
  : @param $query-key the identifier for a compiled query
  : @param $var-name the name of the variable
  :
  : @return true if the variable is bound, false otherwise.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
- : @error xqxq:UndeclaredVariable if the given variable is not declared
+ : @error zq:UNDECLARED_VARIABLE if the given variable is not declared
  :   in the query.
  :)
-declare function xqxq:is-bound-variable($query-key as xs:anyURI, $var-name as 
+declare function zq:is-bound-variable($query-key as xs:anyURI, $var-name as 
   xs:QName) as xs:boolean  external;
 
 (:~
- : The function returns the names of the external variables that
+ : <p>The function returns the names of the external variables that
  : are declared in the given query (either in the main module or
- : in any of the imported library modules).
+ : in any of the imported library modules).</p>
  :
  : @param $query-key the identifier for a compiled query
  :
  : @return the sequence of names of the said external variables.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
  :)
-declare function xqxq:external-variables($query-key as xs:anyURI) as
+declare function zq:external-variables($query-key as xs:anyURI) as
   xs:QName* external ;
   
 (:~
- : The function tests if the query identified by the given key
- : is an updating query.
+ : <p>The function tests if the query identified by the given key
+ : is an updating query.</p>
  :
  : @param $query-key the identifier for a compiled query
  :
  : @return true if the query is an updating query, false otherwise.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
  :)
-declare function xqxq:is-updating($query-key as xs:anyURI) as
+declare function zq:is-updating($query-key as xs:anyURI) as
   xs:boolean external;  
 
 (:~
- : The function tests if the query identified by the given key
- : is sequential query.
+ : <p>The function tests if the query identified by the given key
+ : is sequential query.</p>
  :
  : @param $query-key the identifier for a compiled query
  :
  : @return true if the query is a sequential, false otherwise.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
  :)
-declare function xqxq:is-sequential($query-key as xs:anyURI) as
+declare function zq:is-sequential($query-key as xs:anyURI) as
   xs:boolean external;
   
 (:~
- : This function binds the context-item of the prepared query
- : identified by the given key to the $dot argument.
+ : <p>This function binds the context-item of the prepared query
+ : identified by the given key to the $dot argument.</p>
  :
  : @param $query-key the identifier for a compiled query
  : @param $dot the context item to bind
@@ -259,15 +256,15 @@
  : @return the function has side effects and returns the empty
  :   sequence.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
  :)
-declare %an:sequential function xqxq:bind-context-item($query-key as xs:anyURI,
+declare %an:sequential function zq:bind-context-item($query-key as xs:anyURI,
   $dot as item()) as empty-sequence() external ;
 
 (:~
- : This function binds the variable with name $name of
- : the prepared query identified by $query-key to the given sequence.
+ : <p>This function binds the variable with name $name of
+ : the prepared query identified by $query-key to the given sequence.</p>
  :
  : @param $query-key the identifier for a compiled query
  : @param $name the name of the external variable to bind
@@ -277,195 +274,193 @@
  : @return the function has side effects and returns the empty
  :   sequence.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
- : @error xqxq:UndeclaredVariable if the given variable is not declared
+ : @error zq:UNDECLARED_VARIABLE if the given variable is not declared
  :   in the query.
  :)
-declare %an:sequential function xqxq:bind-variable($query-key as xs:anyURI,
+declare %an:sequential function zq:bind-variable($query-key as xs:anyURI,
   $var as xs:QName, $value as item()*) as empty-sequence() external ;
 
 
 (:~
- : Evaluates the given prepared query and returns the result
+ : <p>Evaluates the given prepared query and returns the result
  : of the evaluation. The query must not be sequential or
- : updating.
+ : updating.</p>
  :
  : @param $query-key the identifier for a compiled query
  :
  : @return the result of evaluating the given query
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
  :
- : @error xqxq:QueryIsUpdating if the query is an updating query.
+ : @error zq:QUERY_IS_UPDATING if the query is an updating query.
  :
- : @error xqxq:QueryIsSequential if the query is sequential.
+ : @error zq:QUERY_IS_SEQUENTIAL if the query is sequential.
  :
  : @error any dynamic error that is raised by evaluating the
  :   given query.
  :
  :)
-declare function xqxq:evaluate($query-key as xs:anyURI) as item()* external;
+declare function zq:evaluate($query-key as xs:anyURI) as item()* external;
 
 (:~
- : Evaluates the given prepared query and applies the updates
- : computed by this query. The query must be an updating query.
+ : <p>Evaluates the given prepared query and applies the updates
+ : computed by this query. The query must be an updating query.</p>
  :
  : @param $query-key the identifier for a compiled query
  :
  : @return the function has side effects because it applies
  :  the updates of the query. It returns the empty sequence.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
  :
- : @error xqxq:QueryNotUpdating if the query is not an updating query.
+ : @error zq:QUERY_NOT_UPDATING if the query is not an updating query.
  :
- : @error xqxq:QueryIsSequential if the query is sequential.
+ : @error zq:QUERY_IS_SEQUENTIAL if the query is sequential.
  :
  : @error any dynamic error that is raised by evaluating the
  :   given query or applying its updates.
  :
  :)
-declare updating function xqxq:evaluate-updating($query-key as xs:anyURI) external;
+declare updating function zq:evaluate-updating($query-key as xs:anyURI) external;
 
 (:~ 
- : Evaluates the given prepared query and returns the result
- : of the evaluation. The query must be sequential.
+ : <p>Evaluates the given prepared query and returns the result
+ : of the evaluation. The query must be sequential.</p>
  :
  : @param $query-key the identifier for a compiled query
  :
  : @return the result of evaluating the query.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
  :
- : @error xqxq:QueryNotSequential if the query is not sequential.
+ : @error zq:QUERY_NOT_SEQUENTIAL if the query is not sequential.
  :
- : @error xqxq:QueryIsUpdating if the query is an updating query.
+ : @error zq:QUERY_IS_UPDATING if the query is an updating query.
  :
  : @error any dynamic error that is raised by evaluating the
  :   given query.
  :
  :)
-declare %an:sequential function xqxq:evaluate-sequential($query-key as
+declare %an:sequential function zq:evaluate-sequential($query-key as
   xs:string) as item()* external;
   
 (:~ 
- : Deletes the prepared query associated with the given identifier.
- : After the query is deleted, the corresponding identifier should
- : not be used as argument to any of the functions of this module.
+ : <p>Deletes the prepared query associated with the given identifier.</p>
+ : <p>After the query is deleted, the corresponding identifier should
+ : not be used as argument to any of the functions of this module.</p>
  :
  : @param $query-key the identifier for a compiled query
  :
  : @return the function has side effects and returns the empty sequence.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
  :
  :)
-declare %an:sequential function xqxq:delete-query($query-key as xs:anyURI) as
+declare %an:sequential function zq:delete-query($query-key as xs:anyURI) as
   empty-sequence() external;
 
 (:~
- : This function returns the value of a variable that is bound in the
- : given query.
+ : <p>This function returns the value of a variable that is bound in the
+ : given query.</p>
  :
  : @param $query-key the identifier of a compiled query.
  : @param $var-name the name of the variable whose value should be returned.
  :
  : @return the value bound to the given variable.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
- : @error xqxq:UndeclaredVariable if the given variable is not declared
+ : @error zq:UNDECLARED_VARIABLE if the given variable is not declared
  :   in the query.
- : @error xqxq:UnboundVariable if the given variable doesn't have a value.
+ : @error zq:UNBOUND_VARIABLE if the given variable doesn't have a value.
  :)
-declare function xqxq:variable-value($query-key as xs:anyURI, $var-name as 
+declare function zq:variable-value($query-key as xs:anyURI, $var-name as 
   xs:QName) as item()* external;
 
 (:~
- : Returns the compiled query identified by the given query-key 
- : as binary data.
+ : <p>Returns the compiled query identified by the given query-key 
+ : as binary data.</p>
  :
  : @param $query-key the identifier of a compiled query.
  :
  : @return the query as xs:base64Binary.
  :
- : @error xqxq:NoQueryMatch if no query with the given identifier
+ : @error zq:NO_QUERY_MATCH if no query with the given identifier
  :   was prepared.
- : @error xqxq:QueryPlanError if there is an error serializing the query.
+ : @error zq:NO_QUERY_PLAN if there is an error serializing the query.
  :)
-declare function xqxq:query-plan($query-key as xs:anyURI) 
+declare function zq:query-plan($query-key as xs:anyURI) 
   as xs:base64Binary external;
   
   
 (:~
- : The function loads a given XQuery program for execution from a 
- : xs:base64Binary query plan, obtained through the xqxq:query-plan function.
- : If the program was successfully loaded, the function returns an
+ : <p>The function loads a given query for execution from a 
+ : xs:base64Binary query plan, obtained through the zq:query-plan function.</p>
+ : <p>If the query was successfully loaded, the function returns an
  : identifier as xs:anyURI. This URI can be passed to other functions
- : of this module (e.g. to actually evaluate the program). The URI
- : is opaque and its lifetime is bound by the lifetime of the XQuery
- : program that invoked this function. Further reference or uses
- : of the identifier lead to unexpected results.
- :
- : Successfully prepared queries need to be deleted by passing the resulting
- : identifier to the xqxq:delete-query function of this module.
- :
- : @param $main-module-text the XQuery program that should be prepared.
- :   The program needs to be a XQuery main module.
- :
- : @return an identifier for the compiled program that can be passed
+ : of this module (e.g. to actually evaluate the query). The URI
+ : is opaque and its lifetime is bound by the lifetime of the query
+ : that invoked this function. Further reference or uses
+ : of the identifier lead to unexpected results.</p>
+ : <p/>
+ : <p>Successfully prepared queries need to be deleted by passing the resulting
+ : identifier to the zq:delete-query function of this module.</p>
+ :
+ : @param $plan the binary query plan.
+ :
+ : @return an identifier for the compiled query that can be passed
  :   as arguments to other functions of this module.
  :
  : @error any (static or type) error that may be raised during the compilation
- : of the query. For example, err:XPST0003 if the given XQuery program could
+ : of the query. For example, err:XPST0003 if the given query could
  : not be parsed.
  :)    
-declare function xqxq:load-from-query-plan($plan as xs:base64Binary)
+declare function zq:load-from-query-plan($plan as xs:base64Binary)
   as xs:anyURI external;
 
 (:~
- : The function loads a given XQuery program for execution from a 
- : xs:base64Binary query plan, obtained through the xqxq:query-plan function.
- : If the program was successfully loaded, the function returns an
+ : <p>The function loads a given query for execution from a 
+ : xs:base64Binary query plan, obtained through the zq:query-plan function.</p>
+ : <p>If the query was successfully loaded, the function returns an
  : identifier as xs:anyURI. This URI can be passed to other functions
- : of this module (e.g. to actually evaluate the program). The URI
- : is opaque and its lilfetime is bound by the lifetime of the XQuery
- : program that invoked this function. Further reference or uses
- : of the identifier lead to unexpected results.
- : 
- : For important notes regarding the second and third parameters of the 
- : function, review the comments in xqxq:prepare-main-module#3.
- :
- : Successfully prepared queries need to be deleted by passing the resulting
- : identifier to the xqxq:delete-query function of this module.
- :
- : @param $main-module-text the XQuery program that should be prepared.
- :   The program needs to be a XQuery main module.
+ : of this module (e.g. to actually evaluate the query). The URI
+ : is opaque and its lilfetime is bound by the lifetime of the query
+ : that invoked this function. Further reference or uses
+ : of the identifier lead to unexpected results.</p>                 
+ : <p/>
+ : <p>For important notes regarding the second and third parameters of the 
+ : function, review the comments in zq:prepare-main-module#3.</p>
+ : <p/>
+ : <p>Successfully prepared queries need to be deleted by passing the resulting
+ : identifier to the zq:delete-query function of this module.</p>
+ :
+ : @param $plan the binary query plan.
  :
  : @param $resolver the URL resolver function.
  : 
  : @param $mapper the URI mapper function.
  :
- : @return an identifier for the compiled program that can be passed
+ : @return an identifier for the compiled query that can be passed
  :   as arguments to other functions of this module.
  :
  : @error any (static or type) error that may be raised during the compilation
- : of the query. For example, err:XPST0003 if the given XQuery program could
+ : of the query. For example, err:XPST0003 if the given query could
  : not be parsed.
  :)  
-declare function xqxq:load-from-query-plan($plan as xs:base64Binary,
+declare function zq:load-from-query-plan($plan as xs:base64Binary,
   $resolver as item()?, $mapper as item()?) as xs:anyURI external;
 
 (:~
- : Internal helper function. Only necessary because of incomplete HOF
- : support in Zorba.
+ : <p>Internal helper function. Only necessary because of incomplete HOF
+ : support in Zorba.</p>
  :)
-declare %private function xqxq:hof-invoker($hof as item(),
+declare %private function zq:hof-invoker($hof as item(),
   $ns as xs:string, $entity as xs:string) as item()*
 {
    $hof($ns, $entity)

=== renamed directory 'modules/xqxq/xqxq.xq.src' => 'modules/zorba-query/zorba-query.xq.src'
=== renamed file 'modules/xqxq/xqxq.xq.src/xqxq.cpp' => 'modules/zorba-query/zorba-query.xq.src/zorba-query.cpp'
--- modules/xqxq/xqxq.xq.src/xqxq.cpp	2013-08-01 11:24:18 +0000
+++ modules/zorba-query/zorba-query.xq.src/zorba-query.cpp	2013-08-14 06:22:56 +0000
@@ -13,15 +13,15 @@
 #include <zorba/util/uuid.h>
 #include <vector>
 
-#include "xqxq.h"
+#include "zorba-query.h"
 
-namespace zorba { namespace xqxq {
+namespace zorba { namespace zorbaquery {
 
 /*******************************************************************************
 
 ********************************************************************************/
 zorba::ExternalFunction*
-XQXQModule::getExternalFunction(const zorba::String& localName)
+ZorbaQueryModule::getExternalFunction(const zorba::String& localName)
 {
   FuncMap_t::iterator lIte = theFunctions.find(localName);
     
@@ -102,7 +102,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void XQXQModule::destroy() 
+void ZorbaQueryModule::destroy() 
 {
   delete this;
 }
@@ -111,7 +111,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-XQXQModule::~XQXQModule()
+ZorbaQueryModule::~ZorbaQueryModule()
 {
   for (FuncMap_t::const_iterator lIter = theFunctions.begin();
        lIter != theFunctions.end(); ++lIter) 
@@ -229,11 +229,11 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void XQXQFunction::throwError(const char *err_localname, const std::string& aErrorMessage)
+void ZorbaQueryFunction::throwError(const char *err_localname, const std::string& aErrorMessage)
 {
-  String errNS(XQXQ_MODULE_NAMESPACE);
+  String errNS(ZORBA_QUERY_MODULE_NAMESPACE);
   String errName(err_localname);
-  Item errQName = XQXQModule::getItemFactory()->createQName(errNS, errName);
+  Item errQName = ZorbaQueryModule::getItemFactory()->createQName(errNS, errName);
   String errDescription(aErrorMessage);
   throw USER_EXCEPTION(errQName, errDescription);
 }
@@ -242,7 +242,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-XQXQFunction::XQXQFunction(const XQXQModule* aModule)
+ZorbaQueryFunction::ZorbaQueryFunction(const ZorbaQueryModule* aModule)
   :
   theModule(aModule)
 {
@@ -253,7 +253,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-XQXQFunction::~XQXQFunction()
+ZorbaQueryFunction::~ZorbaQueryFunction()
 {
 }
 
@@ -261,7 +261,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-String XQXQFunction::getURI() const 
+String ZorbaQueryFunction::getURI() const 
 {
   return theModule->getURI();
 }
@@ -270,7 +270,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-String XQXQFunction::getOneStringArgument(const Arguments_t& aArgs, int aPos) const
+String ZorbaQueryFunction::getOneStringArgument(const Arguments_t& aArgs, int aPos) const
 {
   Item lItem;
   Iterator_t args_iter = aArgs[aPos]->getIterator();
@@ -285,7 +285,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-Item XQXQFunction::getItemArgument(const Arguments_t& aArgs, int aPos) const
+Item ZorbaQueryFunction::getItemArgument(const Arguments_t& aArgs, int aPos) const
 {
   Item lItem;
   Iterator_t args_iter = aArgs[aPos]->getIterator();
@@ -300,7 +300,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-Iterator_t XQXQFunction::getIterArgument(const Arguments_t& aArgs, int aPos) const
+Iterator_t ZorbaQueryFunction::getIterArgument(const Arguments_t& aArgs, int aPos) const
 {
   Iterator_t args_iter = aArgs[aPos]->getIterator();
   return args_iter;
@@ -310,21 +310,21 @@
 /*******************************************************************************
 
 ********************************************************************************/
-XQuery_t XQXQFunction::getQuery(
+XQuery_t ZorbaQueryFunction::getQuery(
     const zorba::DynamicContext* aDctx,
     const zorba::String& aIdent) const
 {
   QueryMap* lQueryMap;
 
   if (!(lQueryMap =
-        dynamic_cast<QueryMap*>(aDctx->getExternalFunctionParameter("xqxqQueryMap"))))
+        dynamic_cast<QueryMap*>(aDctx->getExternalFunctionParameter("zqQueryMap"))))
   {
-    throwError("NoQueryMatch", "No query with the given identifier was found");
+    throwError("NO_QUERY_MATCH", "No query with the given identifier was found");
   }
   
   XQuery_t lQuery;
   if (!(lQuery = lQueryMap->getQuery(aIdent)))
-    throwError("NoQueryMatch", "No query with the given identifier was found");
+    throwError("NO_QUERY_MATCH", "No query with the given identifier was found");
   
   return lQuery;
 }
@@ -333,7 +333,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void  XQXQURIMapper::mapURI(
+void  ZorbaQueryURIMapper::mapURI(
     String aUri,
     EntityData const* aEntityData,
     std::vector<String>& oUris)
@@ -355,15 +355,15 @@
   //construct the arguments for the url resolver
   std::vector<ItemSequence_t> lArgs;
   ItemSequence_t lSeq0 = new SingletonItemSequence(theFunction);
-  ItemSequence_t lSeq1 = new SingletonItemSequence(XQXQModule::getItemFactory()->createString(aUri));
-  ItemSequence_t lSeq2 = new SingletonItemSequence(XQXQModule::getItemFactory()->createString(lDataKind));
+  ItemSequence_t lSeq1 = new SingletonItemSequence(ZorbaQueryModule::getItemFactory()->createString(aUri));
+  ItemSequence_t lSeq2 = new SingletonItemSequence(ZorbaQueryModule::getItemFactory()->createString(lDataKind));
   lArgs.push_back(lSeq0);
   lArgs.push_back(lSeq1);
   lArgs.push_back(lSeq2);
 
   //invoke the HOF helper function using the arguments generated
-  Item lHofHelper = XQXQModule::getItemFactory()->
-  createQName("http://www.zorba-xquery.com/modules/xqxq", "xqxq", "hof-invoker");
+  Item lHofHelper = ZorbaQueryModule::getItemFactory()->
+  createQName("http://zorba.io/modules/zorba-query", "zq", "hof-invoker");
 
   ItemSequence_t lResult = theCtx->invoke(lHofHelper, lArgs);
   
@@ -384,7 +384,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-Resource* XQXQURLResolver::resolveURL(
+Resource* ZorbaQueryURLResolver::resolveURL(
     const String& aUrl,
     EntityData const* aEntityData)
 { 
@@ -405,15 +405,15 @@
   //construct the arguments for the url resolver
   std::vector<ItemSequence_t> lArgs;
   ItemSequence_t lSeq0 = new SingletonItemSequence(theFunction);
-  ItemSequence_t lSeq1 = new SingletonItemSequence(XQXQModule::getItemFactory()->createString(aUrl));
-  ItemSequence_t lSeq2 = new SingletonItemSequence(XQXQModule::getItemFactory()->createString(lDataKind));
+  ItemSequence_t lSeq1 = new SingletonItemSequence(ZorbaQueryModule::getItemFactory()->createString(aUrl));
+  ItemSequence_t lSeq2 = new SingletonItemSequence(ZorbaQueryModule::getItemFactory()->createString(lDataKind));
   lArgs.push_back(lSeq0);
   lArgs.push_back(lSeq1);
   lArgs.push_back(lSeq2);
   
   //invoke the HOF helper function using the arguments generated
-  Item lHofHelper = XQXQModule::getItemFactory()->
-  createQName("http://www.zorba-xquery.com/modules/xqxq", "xqxq", "hof-invoker");
+  Item lHofHelper = ZorbaQueryModule::getItemFactory()->
+  createQName("http://zorba.io/modules/zorba-query", "zq", "hof-invoker");
 
   ItemSequence_t lResult = theCtx->invoke(lHofHelper, lArgs);
 
@@ -459,10 +459,10 @@
   StaticContext_t lSctxChild = aSctx->createChildContext();
    
   QueryMap* lQueryMap;
-  if (!(lQueryMap = dynamic_cast<QueryMap*>(lDynCtx->getExternalFunctionParameter("xqxqQueryMap"))))
+  if (!(lQueryMap = dynamic_cast<QueryMap*>(lDynCtx->getExternalFunctionParameter("zqQueryMap"))))
   {
     lQueryMap = new QueryMap();
-    lDynCtx->addExternalFunctionParameter("xqxqQueryMap", lQueryMap);     
+    lDynCtx->addExternalFunctionParameter("zqQueryMap", lQueryMap);     
   }
 
   Zorba* lZorba = Zorba::getInstance(0);
@@ -473,15 +473,15 @@
     
   StaticContext_t ltempSctx = lZorba->createStaticContext();
 
-  std::auto_ptr<XQXQURLResolver> lResolver;
-  std::auto_ptr<XQXQURIMapper> lMapper;
+  std::auto_ptr<ZorbaQueryURLResolver> lResolver;
+  std::auto_ptr<ZorbaQueryURIMapper> lMapper;
 
   if ( aArgs.size() > 2 )
   {
     Item lMapperFunctionItem = getItemArgument(aArgs, 2);
     if (!lMapperFunctionItem.isNull())
     {
-      lMapper.reset(new XQXQURIMapper(lMapperFunctionItem, lSctxChild));
+      lMapper.reset(new ZorbaQueryURIMapper(lMapperFunctionItem, lSctxChild));
       ltempSctx->registerURIMapper(lMapper.get());
     }
   }
@@ -491,7 +491,7 @@
     Item lResolverFunctionItem = getItemArgument(aArgs, 1);
     if (!lResolverFunctionItem.isNull())
     {
-      lResolver.reset(new XQXQURLResolver(lResolverFunctionItem, lSctxChild));
+      lResolver.reset(new ZorbaQueryURLResolver(lResolverFunctionItem, lSctxChild));
       ltempSctx->registerURLResolver(lResolver.get());
     }  
   }
@@ -505,12 +505,12 @@
   {
     lQuery = NULL;
     std::ostringstream err;
-    err << "The query compiled using xqxq:prepare-main-module raised an error at"
+    err << "The query compiled using zq:prepare-main-module raised an error at"
         << " file " << xe.source_uri() << " line " << xe.source_line()
         << " column " << xe.source_column() << ": " << xe.what();
     // << " -- Query string : " << std::endl << lQueryString;
 
-    Item errQName = XQXQModule::getItemFactory()->createQName(
+    Item errQName = ZorbaQueryModule::getItemFactory()->createQName(
                                 xe.diagnostic().qname().ns(),
                                 xe.diagnostic().qname().localname());
     throw USER_EXCEPTION(errQName, err.str());
@@ -519,10 +519,10 @@
   {
     lQuery = NULL;
     std::ostringstream err;
-    err << "The query compiled using xqxq:prepare-main-module raised an error: "
+    err << "The query compiled using zq:prepare-main-module raised an error: "
         << e.what();
 
-    Item errQName = XQXQModule::getItemFactory()->
+    Item errQName = ZorbaQueryModule::getItemFactory()->
     createQName(e.diagnostic().qname().ns(), e.diagnostic().qname().localname());
 
     throw USER_EXCEPTION(errQName, err.str());
@@ -538,7 +538,7 @@
   
   lQueryMap->storeQuery(lStrUUID, lQuery, lMapper.release(), lResolver.release());
   
-  return ItemSequence_t(new SingletonItemSequence(XQXQModule::getItemFactory()->createAnyURI(lStrUUID)));
+  return ItemSequence_t(new SingletonItemSequence(ZorbaQueryModule::getItemFactory()->createAnyURI(lStrUUID)));
 }
     
     
@@ -563,11 +563,11 @@
   catch (XQueryException& xe)
   {
     std::ostringstream err;
-    err << "The query compiled using xqxq:prepare-library-module raised an error at"
+    err << "The query compiled using zq:prepare-library-module raised an error at"
         << " line " << xe.source_line() << " column " << xe.source_column()
         << ": " << xe.what();
 
-    Item errQName = XQXQModule::getItemFactory()->
+    Item errQName = ZorbaQueryModule::getItemFactory()->
     createQName(xe.diagnostic().qname().ns(), xe.diagnostic().qname().localname());
 
     throw USER_EXCEPTION(errQName, err.str());
@@ -575,10 +575,10 @@
   catch (ZorbaException& e)
   {
     std::ostringstream err;
-    err << "The query compiled using xqxq:prepare-main-query raised an error: "
+    err << "The query compiled using zq:prepare-main-query raised an error: "
         << e.what();
 
-      Item errQName = XQXQModule::getItemFactory()->
+      Item errQName = ZorbaQueryModule::getItemFactory()->
       createQName(e.diagnostic().qname().ns(), e.diagnostic().qname().localname());
 
       throw USER_EXCEPTION(errQName, err.str());
@@ -595,14 +595,14 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs, 0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs, 0);
 
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
 
   bool lIsContextItemBound = lQuery->getDynamicContext()->isBoundContextItem();
 
   return ItemSequence_t(new SingletonItemSequence(
-          XQXQModule::getItemFactory()->createBoolean(lIsContextItemBound)));
+          ZorbaQueryModule::getItemFactory()->createBoolean(lIsContextItemBound)));
 }
 
 
@@ -614,11 +614,11 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs, 0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs, 0);
   
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
 
-  Item lVarQName = XQXQFunction::getItemArgument(aArgs, 1);
+  Item lVarQName = ZorbaQueryFunction::getItemArgument(aArgs, 1);
   bool lIsBoundVariable = false;
 
   try
@@ -628,10 +628,10 @@
   catch (ZorbaException& ze)
   {
     if (ze.diagnostic() == zerr::ZAPI0011_VARIABLE_NOT_DECLARED)
-      XQXQFunction::throwError("UndeclaredVariable", ze.what());  
+      ZorbaQueryFunction::throwError("UNDECLARED_VARIABLE", ze.what());  
     throw; // should not happen
   }
-  return ItemSequence_t(new SingletonItemSequence(XQXQModule::getItemFactory()->createBoolean(lIsBoundVariable)));
+  return ItemSequence_t(new SingletonItemSequence(ZorbaQueryModule::getItemFactory()->createBoolean(lIsBoundVariable)));
 }
 
 
@@ -643,7 +643,7 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {  
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs, 0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs, 0);
 
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
     
@@ -669,11 +669,11 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs, 0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs, 0);
   
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
 
-  return ItemSequence_t(new SingletonItemSequence(XQXQModule::getItemFactory()->createBoolean(lQuery->isUpdating())));
+  return ItemSequence_t(new SingletonItemSequence(ZorbaQueryModule::getItemFactory()->createBoolean(lQuery->isUpdating())));
 }
 
 
@@ -685,11 +685,11 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs, 0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs, 0);
   
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
 
-  return ItemSequence_t(new SingletonItemSequence(XQXQModule::getItemFactory()->createBoolean(lQuery->isSequential())));
+  return ItemSequence_t(new SingletonItemSequence(ZorbaQueryModule::getItemFactory()->createBoolean(lQuery->isSequential())));
 }
 
 
@@ -701,12 +701,12 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs,0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs,0);
   
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
 
   // shouldn't raise errors
-  Item lItemContext = XQXQFunction::getItemArgument(aArgs, 1);
+  Item lItemContext = ZorbaQueryFunction::getItemArgument(aArgs, 1);
   lQuery->getDynamicContext()->setContextItem(lItemContext);
 
   return ItemSequence_t(new EmptySequence());
@@ -721,7 +721,7 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  XQXQFunction::throwError("ImplementationError", "This function is not implemented yet");
+  ZorbaQueryFunction::throwError("ImplementationError", "This function is not implemented yet");
 
   return ItemSequence_t(new EmptySequence());
 }
@@ -735,7 +735,7 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  XQXQFunction::throwError("ImplementationError", "This function is not implemented yet");
+  ZorbaQueryFunction::throwError("ImplementationError", "This function is not implemented yet");
 
   return ItemSequence_t(new EmptySequence());
 }
@@ -749,13 +749,13 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs,0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs,0);
   
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
     
-  Item lVarQName = XQXQFunction::getItemArgument(aArgs, 1); 
+  Item lVarQName = ZorbaQueryFunction::getItemArgument(aArgs, 1); 
 
-  Iterator_t lVarValue = XQXQFunction::getIterArgument(aArgs, 2); 
+  Iterator_t lVarValue = ZorbaQueryFunction::getIterArgument(aArgs, 2); 
 
   if (!lQuery->getDynamicContext()->setVariable(lVarQName.getNamespace(),
                                                 lVarQName.getLocalName(),
@@ -765,7 +765,7 @@
     lMsg << "{" << lVarQName.getNamespace() << "}" << lVarQName.getLocalName()
          << ": undefined variable";
 
-    throwError("UndeclaredVariable", lMsg.str());
+    throwError("UNDECLARED_VARIABLE", lMsg.str());
   }
 
   return ItemSequence_t(new EmptySequence());
@@ -785,11 +785,11 @@
   {
     std::ostringstream err;
     err << "The query " << "(" << theQueryID
-        << ") evaluated using xqxq:evaluate raised an error at"
+        << ") evaluated using zq:evaluate raised an error at"
         << " line " << xe.source_line() << " column "
         << xe.source_column() << ": " << xe.what();
 
-    Item errQName = XQXQModule::getItemFactory()->
+    Item errQName = ZorbaQueryModule::getItemFactory()->
     createQName(xe.diagnostic().qname().ns(), xe.diagnostic().qname().localname());
 
     throw USER_EXCEPTION(errQName, err.str());
@@ -798,10 +798,10 @@
   {
     std::ostringstream err;
     err << "The query " << "(" << theQueryID
-        << ") evaluated using xqxq:evaluate raised an error at"
+        << ") evaluated using zq:evaluate raised an error at"
         << e.what();
 
-    Item errQName = XQXQModule::getItemFactory()->
+    Item errQName = ZorbaQueryModule::getItemFactory()->
     createQName(e.diagnostic().qname().ns(), e.diagnostic().qname().localname());
 
     throw USER_EXCEPTION(errQName, err.str());
@@ -817,18 +817,18 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs,0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs,0);
 
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
 
   if (lQuery->isUpdating())
   {
-    throwError("QueryIsUpdating", "Executing Query shouldn't be updating.");
+    throwError("QUERY_IS_UPDATING", "Executing Query shouldn't be updating.");
   }
      
   if (lQuery->isSequential())
   {
-    throwError("QueryIsSequential", "Executing Query shouldn't be sequential.");
+    throwError("QUERY_IS_SEQUENTIAL", "Executing Query shouldn't be sequential.");
   }
       
   Iterator_t lIterQuery = lQuery->iterator();
@@ -845,18 +845,18 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs,0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs,0);
   
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
     
   if (lQuery->isSequential())
   {
-    throwError("QueryIsSequential", "Executing Query shouldn't be sequential.");   
+    throwError("QUERY_IS_SEQUENTIAL", "Executing Query shouldn't be sequential.");   
   }
 
   if(!lQuery->isUpdating())
   {
-    throwError("QueryNotUpdating", "Executing Query should be updating.") ; 
+    throwError("QUERY_NOT_UPDATING", "Executing Query should be updating.") ; 
   }
   
   Iterator_t lIterQuery = lQuery->iterator();
@@ -872,18 +872,18 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs, 0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs, 0);
   
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
 
   if(lQuery->isUpdating())
   {
-    throwError("QueryIsUpdating", "Executing Query shouldn't be updating.");
+    throwError("QUERY_IS_UPDATING", "Executing Query shouldn't be updating.");
   }
 
   if(!lQuery->isSequential())
   {
-    throwError("QueryNotSequential", "Executing Query should be sequential.");    
+    throwError("QUERY_NOT_SEQUENTIAL", "Executing Query should be sequential.");    
   }
 
   Iterator_t lIterQuery = lQuery->iterator();
@@ -899,17 +899,17 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs,0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs,0);
 
   QueryMap* lQueryMap;
-  if (!(lQueryMap= dynamic_cast<QueryMap*>(aDctx->getExternalFunctionParameter("xqxqQueryMap"))))
+  if (!(lQueryMap= dynamic_cast<QueryMap*>(aDctx->getExternalFunctionParameter("zqQueryMap"))))
   {
-    throwError("NoQueryMatch", "String identifying query does not exists.");
+    throwError("NO_QUERY_MATCH", "String identifying query does not exists.");
   }
 
   if (!lQueryMap->deleteQuery(lQueryID))
   {
-    throwError("NoQueryMatch","String identifying query does not exists.");
+    throwError("NO_QUERY_MATCH","String identifying query does not exists.");
   }
       
   return ItemSequence_t(new EmptySequence());
@@ -924,17 +924,17 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs,0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs,0);
 
   QueryMap* lQueryMap;
-  if (!(lQueryMap= dynamic_cast<QueryMap*>(aDctx->getExternalFunctionParameter("xqxqQueryMap"))))
+  if (!(lQueryMap= dynamic_cast<QueryMap*>(aDctx->getExternalFunctionParameter("zqQueryMap"))))
   {
-    throwError("NoQueryMatch", "String identifying query does not exists.");
+    throwError("NO_QUERY_MATCH", "String identifying query does not exists.");
   }
 
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
 
-  Item lVarQName = XQXQFunction::getItemArgument(aArgs, 1);
+  Item lVarQName = ZorbaQueryFunction::getItemArgument(aArgs, 1);
   bool lIsBoundVariable = false;
 
   zorba::DynamicContext* lCtx = lQuery->getDynamicContext();
@@ -947,7 +947,7 @@
   catch (ZorbaException& ze)
   {
     if (ze.diagnostic() == zerr::ZAPI0011_VARIABLE_NOT_DECLARED)
-      XQXQFunction::throwError("UndeclaredVariable", ze.what());  
+      ZorbaQueryFunction::throwError("UNDECLARED_VARIABLE", ze.what());  
     throw; // should not happen
   }
 
@@ -955,7 +955,7 @@
   {
     std::ostringstream lMsg;
     lMsg << lLocal << ": variable not bound";
-    XQXQFunction::throwError("UnboundVariable", lMsg.str());  
+    ZorbaQueryFunction::throwError("UNBOUND_VARIABLE", lMsg.str());  
   }
 
   zorba::Iterator_t lIterator;
@@ -981,12 +981,12 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  String lQueryID = XQXQFunction::getOneStringArgument(aArgs,0);
+  String lQueryID = ZorbaQueryFunction::getOneStringArgument(aArgs,0);
 
   QueryMap* lQueryMap;
-  if (!(lQueryMap = dynamic_cast<QueryMap*>(aDctx->getExternalFunctionParameter("xqxqQueryMap"))))
+  if (!(lQueryMap = dynamic_cast<QueryMap*>(aDctx->getExternalFunctionParameter("zqQueryMap"))))
   {
-    throwError("NoQueryMatch", "String identifying query does not exists.");
+    throwError("NO_QUERY_MATCH", "String identifying query does not exists.");
   }
 
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
@@ -995,10 +995,10 @@
   lExcPlan.reset(new std::stringstream());
   if (!lQuery->saveExecutionPlan(*lExcPlan.get()))
   {
-    throwError("QueryPlanError", "FAILED getting query execution plan.");
+    throwError("NO_QUERY_PLAN", "FAILED getting query execution plan.");
   }
   
-  return ItemSequence_t(new SingletonItemSequence(XQXQModule::getItemFactory()->createStreamableBase64Binary(*lExcPlan.release(), &streamReleaser)));
+  return ItemSequence_t(new SingletonItemSequence(ZorbaQueryModule::getItemFactory()->createStreamableBase64Binary(*lExcPlan.release(), &streamReleaser)));
 }
  
 
@@ -1010,24 +1010,24 @@
     const zorba::StaticContext* aSctx,
     const zorba::DynamicContext* aDctx) const 
 {
-  Item lQueryPlanItem = XQXQFunction::getItemArgument(aArgs,0);
+  Item lQueryPlanItem = ZorbaQueryFunction::getItemArgument(aArgs,0);
   std::istream& lQueryPlanStream = lQueryPlanItem.getStream();
 
   DynamicContext* lDynCtx = const_cast<DynamicContext*>(aDctx);
   StaticContext_t lSctxChild = aSctx->createChildContext();
    
   QueryMap* lQueryMap;
-  if (!(lQueryMap = dynamic_cast<QueryMap*>(lDynCtx->getExternalFunctionParameter("xqxqQueryMap"))))
+  if (!(lQueryMap = dynamic_cast<QueryMap*>(lDynCtx->getExternalFunctionParameter("zqQueryMap"))))
   {
     lQueryMap = new QueryMap();
-    lDynCtx->addExternalFunctionParameter("xqxqQueryMap", lQueryMap);     
+    lDynCtx->addExternalFunctionParameter("zqQueryMap", lQueryMap);     
   }
 
   Zorba* lZorba = Zorba::getInstance(0);
   XQuery_t lQuery;
   
-  std::auto_ptr<XQXQURLResolver> lResolver;
-  std::auto_ptr<XQXQURIMapper> lMapper;
+  std::auto_ptr<ZorbaQueryURLResolver> lResolver;
+  std::auto_ptr<ZorbaQueryURIMapper> lMapper;
   try
   {
     lQuery = lZorba->createQuery();
@@ -1038,14 +1038,14 @@
       Item lMapperFunctionItem = getItemArgument(aArgs, 2);
       if (!lMapperFunctionItem.isNull())
       {
-        lMapper.reset(new XQXQURIMapper(lMapperFunctionItem, lSctxChild));
+        lMapper.reset(new ZorbaQueryURIMapper(lMapperFunctionItem, lSctxChild));
         lPlanSer.add_URIMapper(lMapper.get());
       }
 
       Item lResolverFunctionItem = getItemArgument(aArgs, 1);
       if (!lResolverFunctionItem.isNull())
       {
-        lResolver.reset(new XQXQURLResolver(lResolverFunctionItem, lSctxChild));
+        lResolver.reset(new ZorbaQueryURLResolver(lResolverFunctionItem, lSctxChild));
         lPlanSer.add_URLResolver(lResolver.get());
       }
 
@@ -1063,7 +1063,7 @@
     err << "The query loaded from the query plan raised an error at"
       << " file" << xe.source_uri() << " line" << xe.source_line()
       << " column" << xe.source_column() << ": " << xe.what();
-    Item errQName = XQXQModule::getItemFactory()->createQName(
+    Item errQName = ZorbaQueryModule::getItemFactory()->createQName(
       xe.diagnostic().qname().ns(),
       xe.diagnostic().qname().localname());
     throw USER_EXCEPTION(errQName, err.str());
@@ -1076,7 +1076,7 @@
       err << "The query loaded from the query plan raised an error: failed to load pre-compiled query: document, collection, or module resolver required but not given.";
     else
       err << "The query loaded from the query plan raised an error: "<< ze.what();
-    Item errQName = XQXQModule::getItemFactory()->createQName(
+    Item errQName = ZorbaQueryModule::getItemFactory()->createQName(
       ze.diagnostic().qname().ns(),
       ze.diagnostic().qname().localname());
     throw USER_EXCEPTION(errQName, err.str());
@@ -1091,10 +1091,10 @@
   String lStrUUID = lStream.str();
 
   lQueryMap->storeQuery(lStrUUID, lQuery, lMapper.release(), lResolver.release());
-  return ItemSequence_t(new SingletonItemSequence(XQXQModule::getItemFactory()->createAnyURI(lStrUUID)));
+  return ItemSequence_t(new SingletonItemSequence(ZorbaQueryModule::getItemFactory()->createAnyURI(lStrUUID)));
 }
 
-}/*namespace xqxq*/ }/*namespace zorba*/
+}/*namespace zorbaquery*/ }/*namespace zorba*/
 
 #ifdef WIN32
 #  define DLL_EXPORT __declspec(dllexport)
@@ -1103,5 +1103,5 @@
 #endif
 
 extern "C" DLL_EXPORT zorba::ExternalModule* createModule() {
-  return new zorba::xqxq::XQXQModule();
+  return new zorba::zorbaquery::ZorbaQueryModule();
 }

=== renamed file 'modules/xqxq/xqxq.xq.src/xqxq.h' => 'modules/zorba-query/zorba-query.xq.src/zorba-query.h'
--- modules/xqxq/xqxq.xq.src/xqxq.h	2013-04-15 12:07:41 +0000
+++ modules/zorba-query/zorba-query.xq.src/zorba-query.h	2013-08-14 06:22:56 +0000
@@ -1,5 +1,5 @@
-#ifndef __COM_ZORBA_WWW_MODULES_XQXQ_H__
-#define __COM_ZORBA_WWW_MODULES_XQXQ_H__
+#ifndef __COM_ZORBA_WWW_MODULES_ZORBA_QUERY_H__
+#define __COM_ZORBA_WWW_MODULES_ZORBA_QUERY_H__
 
 #include <map>
 
@@ -9,15 +9,15 @@
 #include <zorba/dynamic_context.h>
 #include <zorba/serialization_callback.h>
 
-#define XQXQ_MODULE_NAMESPACE "http://www.zorba-xquery.com/modules/xqxq"
+#define ZORBA_QUERY_MODULE_NAMESPACE "http://zorba.io/modules/zorba-query"
 
-namespace zorba { namespace xqxq {
+namespace zorba { namespace zorbaquery {
   
   
 /*******************************************************************************
 
 ********************************************************************************/
-class XQXQModule : public ExternalModule 
+class ZorbaQueryModule : public ExternalModule 
 {
 protected:
   class ltstr
@@ -36,9 +36,9 @@
 
 public:
 
-  virtual ~XQXQModule();
+  virtual ~ZorbaQueryModule();
 
-  virtual zorba::String getURI() const {return XQXQ_MODULE_NAMESPACE;}
+  virtual zorba::String getURI() const {return ZORBA_QUERY_MODULE_NAMESPACE;}
 
   virtual zorba::ExternalFunction* getExternalFunction(const String& localName);
 
@@ -54,14 +54,14 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class XQXQURLResolver : public URLResolver
+class ZorbaQueryURLResolver : public URLResolver
 {
 protected:
   Item             theFunction;
   StaticContext_t  theCtx;
 
 public:
-  XQXQURLResolver(Item& aFunction, StaticContext_t& aSctx)
+  ZorbaQueryURLResolver(Item& aFunction, StaticContext_t& aSctx)
     :
     URLResolver(),
     theFunction(aFunction),
@@ -69,20 +69,20 @@
   {
   }
         
-  virtual ~XQXQURLResolver() { }
+  virtual ~ZorbaQueryURLResolver() { }
       
   virtual Resource* resolveURL(const String& url, EntityData const* entityData);
 };
   
 
-class XQXQURIMapper : public URIMapper
+class ZorbaQueryURIMapper : public URIMapper
 {
 protected:
   Item            theFunction;
   StaticContext_t theCtx;
     
 public:
-  XQXQURIMapper(Item& aFunction, StaticContext_t& aSctx)
+  ZorbaQueryURIMapper(Item& aFunction, StaticContext_t& aSctx)
     :
     URIMapper(),
     theFunction(aFunction),
@@ -90,7 +90,7 @@
   {
   }
     
-  virtual ~XQXQURIMapper(){ }
+  virtual ~ZorbaQueryURIMapper(){ }
     
   virtual void mapURI(
     const zorba::String aUri,
@@ -146,10 +146,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class XQXQFunction : public ContextualExternalFunction
+class ZorbaQueryFunction : public ContextualExternalFunction
 {
 protected:
-  const XQXQModule * theModule;
+  const ZorbaQueryModule * theModule;
 
 protected:
   static void throwError(const char*, const std::string&);
@@ -166,9 +166,9 @@
       const zorba::String& aIdent) const;
 
 public:
-  XQXQFunction(const XQXQModule* module);
+  ZorbaQueryFunction(const ZorbaQueryModule* module);
 
-  virtual ~XQXQFunction();
+  virtual ~ZorbaQueryFunction();
 
   virtual String getURI() const;
 };
@@ -177,10 +177,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class PrepareMainModuleFunction : public XQXQFunction
+class PrepareMainModuleFunction : public ZorbaQueryFunction
 {
 public:
-  PrepareMainModuleFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  PrepareMainModuleFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~PrepareMainModuleFunction(){  }
       
@@ -197,10 +197,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class PrepareLibraryModuleFunction : public XQXQFunction
+class PrepareLibraryModuleFunction : public ZorbaQueryFunction
 {
 public:
-  PrepareLibraryModuleFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  PrepareLibraryModuleFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~PrepareLibraryModuleFunction(){}
       
@@ -217,10 +217,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class IsBoundContextItemFunction : public XQXQFunction
+class IsBoundContextItemFunction : public ZorbaQueryFunction
 {
 public:
-  IsBoundContextItemFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  IsBoundContextItemFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~IsBoundContextItemFunction(){}
 
@@ -237,10 +237,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class IsBoundVariableFunction : public XQXQFunction
+class IsBoundVariableFunction : public ZorbaQueryFunction
 {
 public:
-  IsBoundVariableFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  IsBoundVariableFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~IsBoundVariableFunction(){}
 
@@ -257,10 +257,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class GetExternalVariablesFunction : public XQXQFunction
+class GetExternalVariablesFunction : public ZorbaQueryFunction
 {
 public:
-  GetExternalVariablesFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  GetExternalVariablesFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~GetExternalVariablesFunction() {}
 
@@ -277,10 +277,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class IsUpdatingFunction : public XQXQFunction
+class IsUpdatingFunction : public ZorbaQueryFunction
 {
 public:
-  IsUpdatingFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  IsUpdatingFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~IsUpdatingFunction() {}
 
@@ -297,10 +297,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class IsSequentialFunction : public XQXQFunction
+class IsSequentialFunction : public ZorbaQueryFunction
 {
 public:
-  IsSequentialFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  IsSequentialFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~IsSequentialFunction() {}
 
@@ -317,10 +317,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class BindContextItemFunction : public XQXQFunction
+class BindContextItemFunction : public ZorbaQueryFunction
 {
 public:
-  BindContextItemFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  BindContextItemFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~BindContextItemFunction() {}
 
@@ -337,10 +337,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class BindContextPositionFunction : public XQXQFunction
+class BindContextPositionFunction : public ZorbaQueryFunction
 {
 public:
-  BindContextPositionFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  BindContextPositionFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~BindContextPositionFunction() {}
 
@@ -357,10 +357,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class BindContextSizeFunction : public XQXQFunction
+class BindContextSizeFunction : public ZorbaQueryFunction
 {
 public:
-  BindContextSizeFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  BindContextSizeFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~BindContextSizeFunction() {}
   
@@ -377,10 +377,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class BindVariableFunction : public XQXQFunction
+class BindVariableFunction : public ZorbaQueryFunction
 {
 public:
-  BindVariableFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  BindVariableFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~BindVariableFunction() {}
 
@@ -448,10 +448,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class EvaluateFunction : public XQXQFunction
+class EvaluateFunction : public ZorbaQueryFunction
 {
 public:
-  EvaluateFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  EvaluateFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~EvaluateFunction() {}
 
@@ -468,10 +468,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class EvaluateUpdatingFunction : public XQXQFunction
+class EvaluateUpdatingFunction : public ZorbaQueryFunction
 {
 public:
-  EvaluateUpdatingFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  EvaluateUpdatingFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~EvaluateUpdatingFunction() {}
 
@@ -488,10 +488,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class EvaluateSequentialFunction : public XQXQFunction
+class EvaluateSequentialFunction : public ZorbaQueryFunction
 {
 public:
-  EvaluateSequentialFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  EvaluateSequentialFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~EvaluateSequentialFunction() {}
 
@@ -508,17 +508,17 @@
   }
   
 protected:
-  const XQXQModule* theModule;
+  const ZorbaQueryModule* theModule;
 };
 
 
 /*******************************************************************************
 
 ********************************************************************************/
-class DeleteQueryFunction : public XQXQFunction
+class DeleteQueryFunction : public ZorbaQueryFunction
 {
 public:
-  DeleteQueryFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  DeleteQueryFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~DeleteQueryFunction() {}
 
@@ -531,7 +531,7 @@
            const zorba::DynamicContext*) const;
 };
 
-  class VariableValueFunction : public XQXQFunction{
+  class VariableValueFunction : public ZorbaQueryFunction{
     protected:
       class ValueItemSequence : public ItemSequence
       {
@@ -551,7 +551,7 @@
 
       };
     public:
-      VariableValueFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+      VariableValueFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
       virtual ~VariableValueFunction() {}
 
@@ -567,10 +567,10 @@
 /*******************************************************************************
 
 ********************************************************************************/
-class QueryPlanFunction : public XQXQFunction
+class QueryPlanFunction : public ZorbaQueryFunction
 {
 public:
-  QueryPlanFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  QueryPlanFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~QueryPlanFunction() {}
 
@@ -587,17 +587,17 @@
   }
   
 protected:
-  const XQXQModule* theModule;
+  const ZorbaQueryModule* theModule;
 };
 
 
 /*******************************************************************************
 
 ********************************************************************************/
-class LoadFromQueryPlanFunction : public XQXQFunction
+class LoadFromQueryPlanFunction : public ZorbaQueryFunction
 {
 public:
-  LoadFromQueryPlanFunction(const XQXQModule* aModule) : XQXQFunction(aModule) {}
+  LoadFromQueryPlanFunction(const ZorbaQueryModule* aModule) : ZorbaQueryFunction(aModule) {}
 
   virtual ~LoadFromQueryPlanFunction() {}
 
@@ -614,7 +614,7 @@
   }
   
 protected:
-  const XQXQModule* theModule;
+  const ZorbaQueryModule* theModule;
 
   class QueryPlanSerializationCallback : public zorba::SerializationCallback
   {
@@ -645,7 +645,7 @@
     getURLResolver(size_t i) const { return theUrlResolvers.size() < i? NULL : theUrlResolvers[i]; }
   };
 };
-}/*xqxq namespace*/}/*zorba namespace*/
-
-
-#endif //_COM_ZORBA_WWW_MODULES_XQXQ_H_
+}/*zorbaquery namespace*/}/*zorba namespace*/
+
+
+#endif //_COM_ZORBA_WWW_MODULES_ZORBA_QUERY_H_

=== modified file 'test/fots_driver/cli.xq'
--- test/fots_driver/cli.xq	2013-05-20 17:56:33 +0000
+++ test/fots_driver/cli.xq	2013-08-14 06:22:56 +0000
@@ -157,14 +157,14 @@
 
 (:~
  : Enable or disable verbose output. When this is set to true the exact query
- : that is run by XQXQ is also written down into a query_*.xq file.
+ : that is run by ZQ is also written down into a query_*.xq file.
  :)
 declare variable $verbose as xs:string external := "false";
 
 
 (:~
  : Enable or disable plan serializer usage. When this is set to true the query
- : plan is saved then loaded and executed by XQXQ.
+ : plan is saved then loaded and executed by ZQ.
  :)
 declare variable $usePlanSerializer as xs:string external := "false";
 

=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq	2013-08-12 19:12:06 +0000
+++ test/fots_driver/environment.xq	2013-08-14 06:22:56 +0000
@@ -22,8 +22,8 @@
 module namespace env =
   "http://www.zorba-xquery.com/fots-driver/environment";
 
-import module namespace xqxq =
-  "http://www.zorba-xquery.com/modules/xqxq";
+import module namespace zq =
+  "http://zorba.io/modules/zorba-query";
 
 import module namespace util =
   "http://www.zorba-xquery.com/fots-driver/util" at "util.xq";
@@ -335,15 +335,15 @@
  : If a test-case query TQ references a source doc via the context item, this
  : function creates and returns the xquery code for computing a value for the
  : context item and binding this value inside TQ. The result of this function
- : is added to the query FQ that will be evaluated via XQXQ by the fots test
- : driver. The function assumes that TQ will appear as a nested XQXQ query
- : within FQ, and that $queryID is the FQ variable storing the XQXQ query id
+ : is added to the query FQ that will be evaluated via ZQ by the fots test
+ : driver. The function assumes that TQ will appear as a nested ZQ query
+ : within FQ, and that $queryID is the FQ variable storing the ZQ query id
  : of TQ.
  :
  : If the source doc needs to be validated, the code created by this function
  : looks like this:
  :
- :  variable $contextItemQuery := xqxq:prepare-main-module
+ :  variable $contextItemQuery := zq:prepare-main-module
  :  (
  :  '
  :  import schema some-prefix = "some-URI";
@@ -353,16 +353,16 @@
  :  (), mapper:uri-mapper#2
  :  );
  :
- : variable $contextItem := xqxq:evaluate($contextItemQuery);
+ : variable $contextItem := zq:evaluate($contextItemQuery);
  :
- : xqxq:bind-context-item($queryID, $contextItem);
+ : zq:bind-context-item($queryID, $contextItem);
  :
  : If no validation is required, the code created by this function looks like
  : this:
  :
  : variable $contextItem := doc("some-xml-file");
  :
- : xqxq:bind-context-item($queryID, $contextItem);
+ : zq:bind-context-item($queryID, $contextItem);
  :
  : @param $env The environment (local or non-local) that applies to the current
  :             test case.
@@ -385,14 +385,14 @@
     (
     env:compute-context-item($env, $envBaseURI, $needsDTDValidation),
     "",
-    'xqxq:bind-context-item($queryID, $contextItem);'
+    'zq:bind-context-item($queryID, $contextItem);'
     )
     ,
     "&#xA;"
     )
   else if(exists($env/fots:context-item/@select))
   then
-    concat('xqxq:bind-context-item($queryID,',
+    concat('zq:bind-context-item($queryID,',
            $env/fots:context-item/@select,
            ');')
   else
@@ -423,7 +423,7 @@
     string-join(
     (
     "&#xA;",
-    "variable $contextItemQuery := xqxq:prepare-main-module",
+    "variable $contextItemQuery := zq:prepare-main-module",
     "(",
     "'",
     if ($needsSchemaValidation) then env:get-schema-import($env) else (),
@@ -436,7 +436,7 @@
     "(), mapper:uri-mapper#2",
     ");",
     "",
-    "variable $contextItem := xqxq:evaluate($contextItemQuery);"
+    "variable $contextItem := zq:evaluate($contextItemQuery);"
     )
     ,
     "&#xA;")
@@ -471,17 +471,17 @@
 
 (:~
  : Creates the xquery code for assigning values to the external variables of
- : a nested XQXQ query. The nested XQXQ query is a test-case query TQ, and the
+ : a nested zorba-query query. The nested ZQ query is a test-case query TQ, and the
  : result of this function is added to the query FQ that will be evaluated via
- : XQXQ by the fots test driver. The function assumes that TQ will appear as a
- : nested XQXQ query within FQ, and that $queryID is the FQ variable storing
- : the XQXQ query id of TQ.
+ : ZQ by the fots test driver. The function assumes that TQ will appear as a
+ : nested ZQ query within FQ, and that $queryID is the FQ variable storing
+ : the ZQ query id of TQ.
  :
  : @param $env The environment (local or non-local) that applies to the current
  :        test case
  : @param $envBaseURI The absolute pathname of the directory containing the
  :        file that defines the environment.
- : @return the strings for variable binding in XQXQ.
+ : @return the strings for variable binding in ZQ.
  :)
 declare function env:set-variables(
   $env        as element(fots:environment)?,
@@ -497,7 +497,7 @@
     (
       for $src in $env/fots:source[starts-with(@role, "$")]
       return
-        concat('xqxq:bind-variable($queryID, xs:QName("',
+        concat('zq:bind-variable($queryID, xs:QName("',
                substring-after($src/@role, "$"),
                '"), ',
                'doc("',
@@ -515,7 +515,7 @@
       let $varName := $param/@name
       where (exists($select) and exists($param[@declared eq "true"]))
       return
-        concat('xqxq:bind-variable( $queryID, xs:QName("',
+        concat('zq:bind-variable( $queryID, xs:QName("',
                $param/@name,
                '"), ',
                $varValue,
@@ -528,13 +528,13 @@
 
 
 (:~
- : Returns the XQXQ URL resolver declaration.
+ : Returns the ZQ URL resolver declaration.
  :
  : @param $case the test case.
  : @param $env the environment.
  : @param $envBaseURI URI of the environment.
  : @param $testSetBaseURI URI to the test set that defines the test case.
- : @return the XQXQ URL resolver declaration.
+ : @return the ZQ URL resolver declaration.
  :)
 declare function env:resolver(
   $case           as element(fots:test-case),
@@ -625,12 +625,12 @@
 
 
 (:~
- : Returns the XQXQ URL mapper declaration.
+ : Returns the ZQ URL mapper declaration.
  : @param $case the test case.
  : @param $env the environment.
  : @param $envBaseURI URI of the environment.
  : @param $testSetBaseURI URI to the test set that defines the test case.
- : @return the XQXQ URL mapper declaration.
+ : @return the ZQ URL mapper declaration.
  :)
 declare function env:mapper(
   $case           as element(fots:test-case),

=== modified file 'test/fots_driver/evaluate.xq'
--- test/fots_driver/evaluate.xq	2013-08-09 08:27:30 +0000
+++ test/fots_driver/evaluate.xq	2013-08-14 06:22:56 +0000
@@ -25,8 +25,8 @@
 import schema namespace output =
   "http://www.w3.org/2010/xslt-xquery-serialization";
 
-import module namespace xqxq =
-  "http://www.zorba-xquery.com/modules/xqxq";
+import module namespace zq =
+  "http://zorba.io/modules/zorba-query";
 
 import module namespace schema =
   "http://www.zorba-xquery.com/modules/schema";
@@ -296,13 +296,13 @@
              "declare variable $result external; ",
              xs:string($expResult));
 
-    variable $queryKey := xqxq:prepare-main-module($queryText);
+    variable $queryKey := zq:prepare-main-module($queryText);
 
-    variable $queryKeyResult := xqxq:bind-variable($queryKey,
+    variable $queryKeyResult := zq:bind-variable($queryKey,
                                                    xs:QName('result'),
                                                    $result);
 
-    variable $queryResult := xqxq:evaluate($queryKey);
+    variable $queryResult := zq:evaluate($queryKey);
  
    if ($queryResult)
    then ()
@@ -346,11 +346,11 @@
       "declare variable $x external;",
       "let $y := (",string(data($expResult)),") return ",
       "every $i in 1 to max((count($x),count($y))) satisfies deep-equal($x[$i],$y[$i])");
-    variable $queryKey := xqxq:prepare-main-module($queryText),
-             $queryKeyResult := xqxq:bind-variable($queryKey,
+    variable $queryKey := zq:prepare-main-module($queryText),
+             $queryKeyResult := zq:bind-variable($queryKey,
                                                    xs:QName('x'),
                                                    $result),
-             $queryResult := xqxq:evaluate($queryKey);
+             $queryResult := zq:evaluate($queryKey);
     if ($queryResult)
     then ()
     else "'assert-deep-eq' returned: actual result is not deep-equal to expected result."
@@ -404,12 +404,12 @@
                   then concat("'",$expResult,"'")
                   else $expResult,
                   ")"));
-    variable  $queryKey := xqxq:prepare-main-module($queryText);
+    variable  $queryKey := zq:prepare-main-module($queryText);
   
-    xqxq:bind-variable($queryKey,
+    zq:bind-variable($queryKey,
                       xs:QName('x'),
                       $result);
-    variable $queryResult := xqxq:evaluate($queryKey);
+    variable $queryResult := zq:evaluate($queryKey);
     if ($queryResult)
     then ()
     else "'assert-eq' returned: result doesn't match expected result."
@@ -463,11 +463,11 @@
       "let $y := (",string(data($expResult)),") return ",
       "deep-equal(local:order-string-values($x), local:order-string-values($y)) or
        deep-equal(reverse($x), $y)");
-    variable $queryKey := xqxq:prepare-main-module($queryText),
-             $queryKeyResult := xqxq:bind-variable($queryKey,
+    variable $queryKey := zq:prepare-main-module($queryText),
+             $queryKeyResult := zq:bind-variable($queryKey,
                                                   xs:QName('x'),
                                                   $result),
-             $queryResult := xqxq:evaluate($queryKey);
+             $queryResult := zq:evaluate($queryKey);
     if ($queryResult)
     then ()
     else "'assert-permutation' returned: result isn't a permutation of expected result."
@@ -609,11 +609,11 @@
   {
     variable $queryText := concat( "declare variable $x external; $x instance of ",
                                   data($expResult));
-    variable $queryKey := xqxq:prepare-main-module($queryText),
-             $queryKeyResult := xqxq:bind-variable($queryKey,
+    variable $queryKey := zq:prepare-main-module($queryText),
+             $queryKeyResult := zq:bind-variable($queryKey,
                                                   xs:QName('x'),
                                                   $result),
-             $queryResult := xqxq:evaluate($queryKey);
+             $queryResult := zq:evaluate($queryKey);
     if ($queryResult)
     then ()
     else concat("'assert-type' returned: result doesn't have type '",

=== modified file 'test/fots_driver/execute.xq'
--- test/fots_driver/execute.xq	2013-08-09 08:27:30 +0000
+++ test/fots_driver/execute.xq	2013-08-14 06:22:56 +0000
@@ -22,8 +22,8 @@
 module namespace execute =
   "http://www.zorba-xquery.com/fots-driver/execute";
 
-import module namespace xqxq =
-  "http://www.zorba-xquery.com/modules/xqxq#2.0";
+import module namespace zq =
+  "http://zorba.io/modules/zorba-query#2.0";
 
 import module namespace eval =
   "http://www.zorba-xquery.com/fots-driver/evaluate" at "evaluate.xq";
@@ -43,17 +43,17 @@
 declare option op:disable "f:trace";
 
 (:~
- : XQXQ invoke.
- : @param $xqxqQueryText the query that will be run.
+ : ZQ invoke.
+ : @param $zqQueryText the query that will be run.
  : @param $case the test case.
  : @param $verbose if set to TRUE it will also output the actual result.
  : @param $testSetBaseURI the URI of the directory that contains the file of the
           associated test set.
  : @param $usePlanSerializer if true the plan serializer is used.
- : @return the result of running the query with XQXQ.
+ : @return the result of running the query with ZQ.
  :)
-declare %ann:sequential function execute:xqxq-invoke(
-  $xqxqQueryText      as xs:string,
+declare %ann:sequential function execute:zq-invoke(
+  $zqQueryText      as xs:string,
   $case               as element(fots:test-case),
   $verbose            as xs:boolean?,
   $testSetBaseURI     as xs:anyURI,
@@ -64,22 +64,22 @@
   {
     if($usePlanSerializer) then
     {
-      variable $queryKey := xqxq:prepare-main-module($xqxqQueryText);
-      variable $queryPlan := xqxq:query-plan($queryKey);
-      variable $queryPlanKey := xqxq:load-from-query-plan($queryPlan);
-      variable $queryResult := xqxq:evaluate-sequential($queryPlanKey);
+      variable $queryKey := zq:prepare-main-module($zqQueryText);
+      variable $queryPlan := zq:query-plan($queryKey);
+      variable $queryPlanKey := zq:load-from-query-plan($queryPlan);
+      variable $queryResult := zq:evaluate-sequential($queryPlanKey);
 
-      xqxq:delete-query($queryPlanKey);
-      xqxq:delete-query($queryKey);
+      zq:delete-query($queryPlanKey);
+      zq:delete-query($queryKey);
 
       eval:result($queryResult, $case/fots:result/*, $testSetBaseURI)
     }
     else
     {
-      variable $queryKey := xqxq:prepare-main-module($xqxqQueryText);
-      variable $queryResult := xqxq:evaluate-sequential($queryKey);
+      variable $queryKey := zq:prepare-main-module($zqQueryText);
+      variable $queryResult := zq:evaluate-sequential($queryKey);
 
-      xqxq:delete-query($queryKey);
+      zq:delete-query($queryKey);
 
       eval:result($queryResult, $case/fots:result/*, $testSetBaseURI)
     }

=== modified file 'test/fots_driver/fots-driver.xq'
--- test/fots_driver/fots-driver.xq	2013-08-12 19:12:06 +0000
+++ test/fots_driver/fots-driver.xq	2013-08-14 06:22:56 +0000
@@ -886,7 +886,7 @@
       "&#xA;"
       );
 
-    variable $xqxqQuery := driver:create-XQXQ-query($query,
+    variable $zqQuery := driver:create-ZQ-query($query,
                                                     $case,
                                                     $env,
                                                     $envBaseURI,
@@ -896,12 +896,12 @@
     (:if $verbose then print the query to a file:)
     if ($verbose and
         ($cliMode eq "run-test-case"))
-    then util:write-query-to-file($xqxqQuery, $queryName);
+    then util:write-query-to-file($zqQuery, $queryName);
     else ();
 
     variable $startDateTime := datetime:current-dateTime();
 
-    variable $result := execute:xqxq-invoke($xqxqQuery,
+    variable $result := execute:zq-invoke($zqQuery,
                                             $case,
                                             $verbose,
                                             $testSetURI,
@@ -914,7 +914,7 @@
     if ($checkPass) then
       feedback:pass($case,
                     $result,
-                    $xqxqQuery,
+                    $zqQuery,
                     $env,
                     $duration,
                     $verbose,
@@ -927,7 +927,7 @@
     else
      feedback:fail($case,
                    $result,
-                   $xqxqQuery,
+                   $zqQuery,
                    $testSetName,
                    $env,
                    $duration,
@@ -956,9 +956,9 @@
 
 
 (:~
- : Creates the text for the complete query FQ that will be evaluated via XQXQ
+ : Creates the text for the complete query FQ that will be evaluated via ZQ
  : by the fots test driver. The actual test-case query TQ will be evaluated as
- : a nested XQXQ query within FQ. FQ may contain additional nested XQXQ queries,
+ : a nested ZQ query within FQ. FQ may contain additional nested zorba-query queries,
  : for example to compute values for external variables declared in TQ.
  :
  : @param $queryText the text for the test-case query TQ. It is content of
@@ -972,7 +972,7 @@
  :        These may be defined at test-set level and/or test-case level.
  : @return the query that will be evaluated.
  :)
-declare %private function driver:create-XQXQ-query(
+declare %private function driver:create-ZQ-query(
   $queryText          as xs:string,
   $case               as element(fots:test-case),
   $env                as element(fots:environment)?,
@@ -995,7 +995,7 @@
     (
     (
     "",
-    "import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';",
+    "import module namespace zq = 'http://zorba.io/modules/zorba-query';",
    
     if ($needsDTDValidation) then
       ("import module namespace zorba-xml = 'http://zorba.io/modules/xml';",
@@ -1003,11 +1003,11 @@
     else (),
    
     if (exists($resolver))
-    then "declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';"
+    then "declare namespace resolver = 'http://zorba.io/modules/zorba-query/url-resolver';"
     else (),
 
     if (exists($mapper))
-    then "declare namespace mapper = 'http://www.zorba-xquery.com/modules/xqxq/uri-mapper';"
+    then "declare namespace mapper = 'http://zorba.io/modules/zorba-query/uri-mapper';"
     else (),
 
     "",
@@ -1037,7 +1037,7 @@
     let $escAposQueryText := replace($queryText,"'","''")
     let $escAmpQueryText  := replace($escAposQueryText, '&amp;', '&amp;amp;')
     return concat(
-           "variable $queryID := xqxq:prepare-main-module&#xA;(",
+           "variable $queryID := zq:prepare-main-module&#xA;(",
            "&#xA;",
            "'",
            "&#xA;",
@@ -1058,9 +1058,9 @@
     env:set-variables($env, $envBaseURI),
     env:set-variables($case/fots:environment, $testSetURI),
 
-    "xqxq:evaluate($queryID),",
+    "zq:evaluate($queryID),",
     "",
-    "xqxq:delete-query($queryID)",
+    "zq:delete-query($queryID)",
     "        "
     ),
     "&#xA;"

=== renamed directory 'test/rbkt/ExpQueryResults/zorba/xqxq' => 'test/rbkt/ExpQueryResults/zorba/zorba-query'
=== renamed directory 'test/rbkt/Queries/zorba/xqxq' => 'test/rbkt/Queries/zorba/zorba-query'
=== modified file 'test/rbkt/Queries/zorba/zorba-query/bind-context-item.xq'
--- test/rbkt/Queries/zorba/xqxq/bind-context-item.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/bind-context-item.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key := xqxq:prepare-main-module("insert node <child>Content</child> into /parent");
+variable $query-key := zq:prepare-main-module("insert node <child>Content</child> into /parent");
 variable $xml := doc("context-item.xml");
-xqxq:bind-context-item($query-key, $xml); 
-xqxq:is-bound-context-item($query-key)
+zq:bind-context-item($query-key, $xml); 
+zq:is-bound-context-item($query-key)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/bind-variable.xq'
--- test/rbkt/Queries/zorba/xqxq/bind-variable.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/bind-variable.xq	2013-08-14 06:22:56 +0000
@@ -1,4 +1,4 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
-variable $query-key := xqxq:prepare-main-module('declare variable $a external; $a');
-xqxq:bind-variable($query-key,xs:QName('a'),"foo");
-xqxq:is-bound-variable($query-key, xs:QName('a'))
\ No newline at end of file
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
+variable $query-key := zq:prepare-main-module('declare variable $a external; $a');
+zq:bind-variable($query-key,xs:QName('a'),"foo");
+zq:is-bound-variable($query-key, xs:QName('a'))
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/zorba-query/delete.spec'
--- test/rbkt/Queries/zorba/xqxq/delete.spec	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/delete.spec	2013-08-14 06:22:56 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/xqxq:NoQueryMatch
\ No newline at end of file
+Error: http://zorba.io/modules/zorba-query:NO_QUERY_MATCH
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/zorba-query/delete.xq'
--- test/rbkt/Queries/zorba/xqxq/delete.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/delete.xq	2013-08-14 06:22:56 +0000
@@ -1,5 +1,5 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key := xqxq:prepare-main-module("1+1");
-xqxq:delete-query($query-key);
-xqxq:evaluate($query-key)
+variable $query-key := zq:prepare-main-module("1+1");
+zq:delete-query($query-key);
+zq:evaluate($query-key)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/error-in-query.xq'
--- test/rbkt/Queries/zorba/xqxq/error-in-query.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/error-in-query.xq	2013-08-14 06:22:56 +0000
@@ -1,4 +1,4 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
 declare namespace op = 'http://zorba.io/options/features';
 declare namespace f = 'http://zorba.io/features';
@@ -12,9 +12,9 @@
 default return ()
 };
 
-variable $queryID := xqxq:prepare-main-module(
+variable $queryID := zq:prepare-main-module(
   "declare namespace foo='http://test';
    declare namespace foo='http://test';
    1",
    local:url-resolver#2, ());
-xqxq:evaluate($queryID)
+zq:evaluate($queryID)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/evaluate-sequential.xq'
--- test/rbkt/Queries/zorba/xqxq/evaluate-sequential.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/evaluate-sequential.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key := xqxq:prepare-main-module('
+variable $query-key := zq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
 declare namespace an = "http://zorba.io/annotations";
 declare %an:sequential function local:foo() {
@@ -12,6 +12,6 @@
 local:foo()
 ');    
 variable $xml := doc("context-item.xml");
-xqxq:bind-context-item($query-key, $xml);  
-xqxq:evaluate-sequential($query-key)
+zq:bind-context-item($query-key, $xml);  
+zq:evaluate-sequential($query-key)
  

=== modified file 'test/rbkt/Queries/zorba/zorba-query/evaluate-sequential2.spec'
--- test/rbkt/Queries/zorba/xqxq/evaluate-sequential2.spec	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/evaluate-sequential2.spec	2013-08-14 06:22:56 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/xqxq:QueryIsUpdating
\ No newline at end of file
+Error: http://zorba.io/modules/zorba-query:QUERY_IS_UPDATING
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/zorba-query/evaluate-sequential2.xq'
--- test/rbkt/Queries/zorba/xqxq/evaluate-sequential2.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/evaluate-sequential2.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key := xqxq:prepare-main-module("insert node <child>Content</child> into /parent");
+variable $query-key := zq:prepare-main-module("insert node <child>Content</child> into /parent");
 variable $xml := doc("context-item.xml");
-xqxq:bind-context-item($query-key, $xml);  
-xqxq:evaluate-sequential($query-key)
\ No newline at end of file
+zq:bind-context-item($query-key, $xml);  
+zq:evaluate-sequential($query-key)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/zorba-query/evaluate-updating.xq'
--- test/rbkt/Queries/zorba/xqxq/evaluate-updating.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/evaluate-updating.xq	2013-08-14 06:22:56 +0000
@@ -1,7 +1,7 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key := xqxq:prepare-main-module("insert node <child>Content</child> into /parent");
+variable $query-key := zq:prepare-main-module("insert node <child>Content</child> into /parent");
 variable $xml := doc("context-item.xml");
-xqxq:bind-context-item($query-key, $xml);  
-xqxq:evaluate-updating($query-key);
+zq:bind-context-item($query-key, $xml);  
+zq:evaluate-updating($query-key);
 $xml
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/zorba-query/evaluate-updating2.spec'
--- test/rbkt/Queries/zorba/xqxq/evaluate-updating2.spec	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/evaluate-updating2.spec	2013-08-14 06:22:56 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/xqxq:QueryIsSequential
\ No newline at end of file
+Error: http://zorba.io/modules/zorba-query:QUERY_IS_SEQUENTIAL
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/zorba-query/evaluate-updating2.xq'
--- test/rbkt/Queries/zorba/xqxq/evaluate-updating2.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/evaluate-updating2.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key := xqxq:prepare-main-module('
+variable $query-key := zq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
 declare namespace an = "http://zorba.io/annotations";
 declare %an:sequential function local:foo() {
@@ -11,5 +11,5 @@
 
 local:foo()
 ');    
-xqxq:evaluate-updating($query-key);
+zq:evaluate-updating($query-key);
  

=== modified file 'test/rbkt/Queries/zorba/zorba-query/evaluate.xq'
--- test/rbkt/Queries/zorba/xqxq/evaluate.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/evaluate.xq	2013-08-14 06:22:56 +0000
@@ -1,5 +1,5 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key := xqxq:prepare-main-module("1+1");
-variable $a := xqxq:evaluate($query-key);
+variable $query-key := zq:prepare-main-module("1+1");
+variable $a := zq:evaluate($query-key);
 $a

=== modified file 'test/rbkt/Queries/zorba/zorba-query/evaluate2.xq'
--- test/rbkt/Queries/zorba/xqxq/evaluate2.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/evaluate2.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key := xqxq:prepare-main-module("declare variable $a external; $a+1");
-xqxq:bind-variable($query-key, xs:QName("a"), 1);
-variable $b := xqxq:evaluate($query-key);
+variable $query-key := zq:prepare-main-module("declare variable $a external; $a+1");
+zq:bind-variable($query-key, xs:QName("a"), 1);
+variable $b := zq:evaluate($query-key);
 $b

=== modified file 'test/rbkt/Queries/zorba/zorba-query/evaluate3.spec'
--- test/rbkt/Queries/zorba/xqxq/evaluate3.spec	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/evaluate3.spec	2013-08-14 06:22:56 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/xqxq:QueryIsSequential
\ No newline at end of file
+Error: http://zorba.io/modules/zorba-query:QUERY_IS_SEQUENTIAL
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/zorba-query/evaluate3.xq'
--- test/rbkt/Queries/zorba/xqxq/evaluate3.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/evaluate3.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key := xqxq:prepare-main-module('
+variable $query-key := zq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
 declare namespace an = "http://zorba.io/annotations";
 declare %an:sequential function local:foo() {
@@ -11,5 +11,5 @@
 
 local:foo()
 ');
-variable $a := xqxq:evaluate($query-key);
+variable $a := zq:evaluate($query-key);
 $a

=== modified file 'test/rbkt/Queries/zorba/zorba-query/external-module.xq'
--- test/rbkt/Queries/zorba/xqxq/external-module.xq	2013-07-17 09:01:57 +0000
+++ test/rbkt/Queries/zorba/zorba-query/external-module.xq	2013-08-14 06:22:56 +0000
@@ -1,8 +1,8 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key := xqxq:prepare-main-module('
+variable $query-key := zq:prepare-main-module('
     import module namespace r = "http://zorba.io/modules/random";
 
     count((for $i in 1 to 10 return r:random(10), r:random())) eq 101
     ');
-xqxq:evaluate($query-key)
\ No newline at end of file
+zq:evaluate($query-key)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/zorba-query/get-external-variables.xq'
--- test/rbkt/Queries/zorba/xqxq/get-external-variables.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/get-external-variables.xq	2013-08-14 06:22:56 +0000
@@ -1,4 +1,4 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
-variable $query-key2 := xqxq:prepare-main-module('declare variable $c external; $c');
-variable $query-key := xqxq:prepare-main-module('declare variable $a external;declare variable $d := "hi"; $a');                                                
-xqxq:external-variables($query-key)
\ No newline at end of file
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
+variable $query-key2 := zq:prepare-main-module('declare variable $c external; $c');
+variable $query-key := zq:prepare-main-module('declare variable $a external;declare variable $d := "hi"; $a');                                                
+zq:external-variables($query-key)
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/zorba-query/is-bound-context-item.xq'
--- test/rbkt/Queries/zorba/xqxq/is-bound-context-item.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/is-bound-context-item.xq	2013-08-14 06:22:56 +0000
@@ -1,4 +1,4 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key := xqxq:prepare-main-module("insert node <child/> into /parent");  
-xqxq:is-bound-context-item($query-key)
+variable $query-key := zq:prepare-main-module("insert node <child/> into /parent");  
+zq:is-bound-context-item($query-key)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/is-bound-variable.xq'
--- test/rbkt/Queries/zorba/xqxq/is-bound-variable.xq	2013-02-15 06:11:20 +0000
+++ test/rbkt/Queries/zorba/zorba-query/is-bound-variable.xq	2013-08-14 06:22:56 +0000
@@ -1,11 +1,11 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
-variable $query-key := xqxq:prepare-main-module('
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
+variable $query-key := zq:prepare-main-module('
   declare variable $a external;
   declare variable $b external := 2;
   declare variable $c external;
   $a');
-xqxq:bind-variable($query-key, xs:QName('a'), "foo");
-xqxq:is-bound-variable($query-key, xs:QName('a')),
-xqxq:is-bound-variable($query-key, xs:QName('b')),
-xqxq:is-bound-variable($query-key, xs:QName('c')),
-xqxq:variable-value($query-key, xs:QName('a'))
+zq:bind-variable($query-key, xs:QName('a'), "foo");
+zq:is-bound-variable($query-key, xs:QName('a')),
+zq:is-bound-variable($query-key, xs:QName('b')),
+zq:is-bound-variable($query-key, xs:QName('c')),
+zq:variable-value($query-key, xs:QName('a'))

=== modified file 'test/rbkt/Queries/zorba/zorba-query/is-bound-variable2.spec'
--- test/rbkt/Queries/zorba/xqxq/is-bound-variable2.spec	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/is-bound-variable2.spec	2013-08-14 06:22:56 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/xqxq:UndeclaredVariable
\ No newline at end of file
+Error: http://zorba.io/modules/zorba-query:UNDECLARED_VARIABLE
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/zorba-query/is-bound-variable2.xq'
--- test/rbkt/Queries/zorba/xqxq/is-bound-variable2.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/is-bound-variable2.xq	2013-08-14 06:22:56 +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 zq = 'http://zorba.io/modules/zorba-query';
+variable $query-key := zq:prepare-main-module('
   declare variable $a external;
   declare variable $b external := 2;
   declare variable $c external;
   $a');
-xqxq:is-bound-variable($query-key, xs:QName('x'))
\ No newline at end of file
+zq:is-bound-variable($query-key, xs:QName('x'))
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/zorba-query/is-sequential.xq'
--- test/rbkt/Queries/zorba/xqxq/is-sequential.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/is-sequential.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key1 := xqxq:prepare-main-module('
+variable $query-key1 := zq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
 declare namespace an = "http://zorba.io/annotations";
 declare %an:sequential function local:foo() {
@@ -11,8 +11,8 @@
 
 local:foo()
 ');  
-variable $query-key2 := xqxq:prepare-main-module("insert node <child/> into /parent");  
-variable $is-sequential := xqxq:is-sequential($query-key1);
-variable $is-not-sequential := xqxq:is-sequential($query-key2); 
+variable $query-key2 := zq:prepare-main-module("insert node <child/> into /parent");  
+variable $is-sequential := zq:is-sequential($query-key1);
+variable $is-not-sequential := zq:is-sequential($query-key2); 
 $is-sequential, $is-not-sequential
  

=== modified file 'test/rbkt/Queries/zorba/zorba-query/is-updating.xq'
--- test/rbkt/Queries/zorba/xqxq/is-updating.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/is-updating.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key1 := xqxq:prepare-main-module('
+variable $query-key1 := zq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
 declare namespace an = "http://zorba.io/annotations";
 declare %an:sequential function local:foo() {
@@ -11,10 +11,10 @@
 
 local:foo()
 ');  
-variable $query-key2 := xqxq:prepare-main-module("insert node <child/> into /parent");  
-variable $is-updating := xqxq:is-updating($query-key2);
-variable $is-not-updating := xqxq:is-updating($query-key1); 
-xqxq:delete-query($query-key1);
-xqxq:delete-query($query-key2);
+variable $query-key2 := zq:prepare-main-module("insert node <child/> into /parent");  
+variable $is-updating := zq:is-updating($query-key2);
+variable $is-not-updating := zq:is-updating($query-key1); 
+zq:delete-query($query-key1);
+zq:delete-query($query-key2);
 $is-updating, $is-not-updating
  

=== modified file 'test/rbkt/Queries/zorba/zorba-query/multiple-queries.xq'
--- test/rbkt/Queries/zorba/xqxq/multiple-queries.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/multiple-queries.xq	2013-08-14 06:22:56 +0000
@@ -1,9 +1,9 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $query-key1 := xqxq:prepare-main-module("1+1");
-variable $query-key2 := xqxq:prepare-main-module("1+2");
-variable $a := xqxq:evaluate($query-key1);
-variable $b := xqxq:evaluate($query-key2);
-xqxq:delete-query($query-key1);
-xqxq:delete-query($query-key2);
+variable $query-key1 := zq:prepare-main-module("1+1");
+variable $query-key2 := zq:prepare-main-module("1+2");
+variable $a := zq:evaluate($query-key1);
+variable $b := zq:evaluate($query-key2);
+zq:delete-query($query-key1);
+zq:delete-query($query-key2);
 $a, $b

=== modified file 'test/rbkt/Queries/zorba/zorba-query/prepare-library-module.xq'
--- test/rbkt/Queries/zorba/xqxq/prepare-library-module.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/zorba-query/prepare-library-module.xq	2013-08-14 06:22:56 +0000
@@ -1,3 +1,3 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-xqxq:prepare-library-module('module namespace foo = "foo:bar"; declare function foo:bar() { 1 }')
+zq:prepare-library-module('module namespace foo = "foo:bar"; declare function foo:bar() { 1 }')

=== modified file 'test/rbkt/Queries/zorba/zorba-query/query-plan.xq'
--- test/rbkt/Queries/zorba/xqxq/query-plan.xq	2013-03-22 23:09:40 +0000
+++ test/rbkt/Queries/zorba/zorba-query/query-plan.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-variable $queryID := xqxq:prepare-main-module("1+1");
-variable $query-plan := xqxq:query-plan($queryID); 
-variable $queryID2 := xqxq:load-from-query-plan($query-plan);
-xqxq:evaluate ($queryID2)
+variable $queryID := zq:prepare-main-module("1+1");
+variable $query-plan := zq:query-plan($queryID); 
+variable $queryID2 := zq:load-from-query-plan($query-plan);
+zq:evaluate ($queryID2)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/query-plan2.xq'
--- test/rbkt/Queries/zorba/xqxq/query-plan2.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/query-plan2.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
+declare namespace resolver = 'http://zorba.io/modules/zorba-query/url-resolver';
 declare namespace op = "http://zorba.io/options/features";
 declare namespace f = "http://zorba.io/features";
 
@@ -10,11 +10,11 @@
   else ()
 };
 
-variable $queryID := xqxq:prepare-main-module(
+variable $queryID := zq:prepare-main-module(
   "import module namespace test = 'http://test'; test:foo()",
   resolver:url-resolver#2, ());
 
 
-variable $query-plan := xqxq:query-plan($queryID); 
-variable $queryID2 := xqxq:load-from-query-plan($query-plan, resolver:url-resolver#2, ());
-xqxq:evaluate ($queryID2)
+variable $query-plan := zq:query-plan($queryID); 
+variable $queryID2 := zq:load-from-query-plan($query-plan, resolver:url-resolver#2, ());
+zq:evaluate ($queryID2)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/query-plan3.xq'
--- test/rbkt/Queries/zorba/xqxq/query-plan3.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/query-plan3.xq	2013-08-14 06:22:56 +0000
@@ -1,7 +1,7 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
-declare namespace mapper = 'http://www.zorba-xquery.com/modules/xqxq/uri-mapper';
+declare namespace resolver = 'http://zorba.io/modules/zorba-query/url-resolver';
+declare namespace mapper = 'http://zorba.io/modules/zorba-query/uri-mapper';
 declare namespace op = "http://zorba.io/options/features";
 declare namespace f = "http://zorba.io/features";
 
@@ -18,11 +18,11 @@
    else ()
 };
 
-variable $queryID := xqxq:prepare-main-module
+variable $queryID := zq:prepare-main-module
 (
   "import module namespace test = 'http://test'; test:foo()", 
   resolver:url-resolver#2, mapper:uri-mapper#2
 );
-variable $query-plan := xqxq:query-plan($queryID); 
-variable $queryID2 := xqxq:load-from-query-plan($query-plan, resolver:url-resolver#2, mapper:uri-mapper#2);
-xqxq:evaluate ($queryID2)
+variable $query-plan := zq:query-plan($queryID); 
+variable $queryID2 := zq:load-from-query-plan($query-plan, resolver:url-resolver#2, mapper:uri-mapper#2);
+zq:evaluate ($queryID2)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/query-plan4.xq'
--- test/rbkt/Queries/zorba/xqxq/query-plan4.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/query-plan4.xq	2013-08-14 06:22:56 +0000
@@ -1,7 +1,7 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
-declare namespace mapper = 'http://www.zorba-xquery.com/modules/xqxq/uri-mapper';
+declare namespace resolver = 'http://zorba.io/modules/zorba-query/url-resolver';
+declare namespace mapper = 'http://zorba.io/modules/zorba-query/uri-mapper';
 declare namespace op = "http://zorba.io/options/features";
 declare namespace f = "http://zorba.io/features";
 
@@ -18,11 +18,11 @@
    else ()
 };
 
-variable $queryID := xqxq:prepare-main-module
+variable $queryID := zq:prepare-main-module
 (
   "import module namespace test = 'http://test'; test:foo()", 
   resolver:url-resolver#2, mapper:uri-mapper#2
 );
-variable $query-plan := xqxq:query-plan($queryID); 
-variable $queryID2 := xqxq:load-from-query-plan($query-plan);
-xqxq:evaluate ($queryID2)
+variable $query-plan := zq:query-plan($queryID); 
+variable $queryID2 := zq:load-from-query-plan($query-plan);
+zq:evaluate ($queryID2)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/uri-mapper.xq'
--- test/rbkt/Queries/zorba/xqxq/uri-mapper.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/uri-mapper.xq	2013-08-14 06:22:56 +0000
@@ -1,7 +1,7 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
-declare namespace mapper = 'http://www.zorba-xquery.com/modules/xqxq/uri-mapper';
+declare namespace resolver = 'http://zorba.io/modules/zorba-query/url-resolver';
+declare namespace mapper = 'http://zorba.io/modules/zorba-query/uri-mapper';
 declare namespace op = "http://zorba.io/options/features";
 declare namespace f = "http://zorba.io/features";
 
@@ -18,9 +18,9 @@
    else ()
 };
 
-variable $queryID := xqxq:prepare-main-module
+variable $queryID := zq:prepare-main-module
 (
   "import module namespace test = 'http://test'; test:foo()", 
   resolver:url-resolver#2, mapper:uri-mapper#2
 );
-xqxq:evaluate($queryID)
+zq:evaluate($queryID)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/uri-mapper2.xq'
--- test/rbkt/Queries/zorba/xqxq/uri-mapper2.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/uri-mapper2.xq	2013-08-14 06:22:56 +0000
@@ -1,7 +1,7 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
-declare namespace mapper = 'http://www.zorba-xquery.com/modules/xqxq/uri-mapper';
+declare namespace resolver = 'http://zorba.io/modules/zorba-query/url-resolver';
+declare namespace mapper = 'http://zorba.io/modules/zorba-query/uri-mapper';
 declare namespace op = "http://zorba.io/options/features";
 declare namespace f = "http://zorba.io/features";
 
@@ -12,10 +12,10 @@
   else ()
 };
 
-variable $queryID := xqxq:prepare-main-module
+variable $queryID := zq:prepare-main-module
 (
   "import schema namespace test = 'http://test'; validate{<test:test><test:subtest>a</test:subtest><test:subtest2>a</test:subtest2></test:test>}", 
   (),
   mapper:uri-mapper#2
 );
-xqxq:evaluate($queryID)
+zq:evaluate($queryID)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/url-module-resolver.xq'
--- test/rbkt/Queries/zorba/xqxq/url-module-resolver.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/url-module-resolver.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
+declare namespace resolver = 'http://zorba.io/modules/zorba-query/url-resolver';
 declare namespace op = "http://zorba.io/options/features";
 declare namespace f = "http://zorba.io/features";
 
@@ -10,7 +10,7 @@
   else ()
 };
 
-variable $queryID := xqxq:prepare-main-module(
+variable $queryID := zq:prepare-main-module(
   "import module namespace test = 'http://test'; test:foo()",
   resolver:url-resolver#2, ());
-xqxq:evaluate($queryID)
+zq:evaluate($queryID)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/url-schema-resolver.xq'
--- test/rbkt/Queries/zorba/xqxq/url-schema-resolver.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/url-schema-resolver.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
+declare namespace resolver = 'http://zorba.io/modules/zorba-query/url-resolver';
 
 declare namespace op = "http://zorba.io/options/features";
 declare namespace f = "http://zorba.io/features";
@@ -13,7 +13,7 @@
     ()
 };
 
-variable $queryID := xqxq:prepare-main-module(
+variable $queryID := zq:prepare-main-module(
   "import schema namespace test = 'http://test'; validate {<test:test><test:subtest>a</test:subtest><test:subtest2>a</test:subtest2></test:test>}",
   resolver:url-resolver#2, ());
-xqxq:evaluate($queryID)
+zq:evaluate($queryID)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/url-schema-resolver2.xq'
--- test/rbkt/Queries/zorba/xqxq/url-schema-resolver2.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/url-schema-resolver2.xq	2013-08-14 06:22:56 +0000
@@ -1,28 +1,28 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
 import module namespace ddl =
     "http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl";
 import module namespace dml =
     "http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/dml";
 
-declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
+declare namespace resolver = 'http://zorba.io/modules/zorba-query/url-resolver';
 declare namespace op = "http://zorba.io/options/features";
 declare namespace f = "http://zorba.io/features";
 
 declare function resolver:url-resolver($namespace as xs:string, $entity as xs:string) {
   if ($entity = 'schema')
   then
-    dml:collection("http://www.zorba-xquery.com/modules/xqxq")//xs:schema[@targetNamespace=$namespace]
+    dml:collection("http://zorba.io/modules/zorba-query")//xs:schema[@targetNamespace=$namespace]
   else
     ()
 };
 
-declare variable $coll := "http://www.zorba-xquery.com/modules/xqxq";
+declare variable $coll := "http://zorba.io/modules/zorba-query";
 declare variable $schema := doc("test.xsd");
 ddl:create($coll);
 
 dml:apply-insert-nodes-first($coll, $schema);
-variable $query-key := xqxq:prepare-main-module(
+variable $query-key := zq:prepare-main-module(
   "import schema namespace test = 'http://test'; validate {<test:test><test:subtest>a</test:subtest><test:subtest2>a</test:subtest2></test:test>}",
   resolver:url-resolver#2, ());
-xqxq:evaluate($query-key)
+zq:evaluate($query-key)

=== modified file 'test/rbkt/Queries/zorba/zorba-query/url-schema-resolver3.xq'
--- test/rbkt/Queries/zorba/xqxq/url-schema-resolver3.xq	2013-08-09 08:27:30 +0000
+++ test/rbkt/Queries/zorba/zorba-query/url-schema-resolver3.xq	2013-08-14 06:22:56 +0000
@@ -1,6 +1,6 @@
-import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
+import module namespace zq = 'http://zorba.io/modules/zorba-query';
 
-declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
+declare namespace resolver = 'http://zorba.io/modules/zorba-query/url-resolver';
 
 declare namespace op = "http://zorba.io/options/features";
 declare namespace f = "http://zorba.io/features";
@@ -13,16 +13,16 @@
     ()
 };
 
-variable $contextQueryID := xqxq:prepare-main-module(
+variable $contextQueryID := zq:prepare-main-module(
   "import schema namespace test = 'http://test';
   declare variable $cwd as xs:anyURI external;
   validate { doc(resolve-uri('test.xml', $cwd)) }",
   resolver:url-resolver#2, ());
-xqxq:bind-variable($contextQueryID, fn:QName("", "cwd"), resolve-uri("."));
-variable $contextItem := xqxq:evaluate($contextQueryID);
+zq:bind-variable($contextQueryID, fn:QName("", "cwd"), resolve-uri("."));
+variable $contextItem := zq:evaluate($contextQueryID);
 
-variable $queryID := xqxq:prepare-main-module(
+variable $queryID := zq:prepare-main-module(
   "import schema namespace test = 'http://test'; //*:test",
   resolver:url-resolver#2, ());
-xqxq:bind-context-item($queryID, $contextItem);
-xqxq:evaluate($queryID)
+zq:bind-context-item($queryID, $contextItem);
+zq:evaluate($queryID)