zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1210410 into lp:zorba.

Commit message:
Change most non-module Zorba namespace URIs from www.zorba-xquery.com to zorba.io.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1210410/+merge/179358


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1210410/+merge/179358
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1210410 into lp:zorba.

=== modified file 'CMakeCPackOptions.cmake.in'
--- CMakeCPackOptions.cmake.in	2013-04-12 22:47:51 +0000
+++ CMakeCPackOptions.cmake.in	2013-08-09 09:26:44 +0000
@@ -23,8 +23,8 @@
 # for Windows Null Soft Installer System ...
 if(CPACK_GENERATOR MATCHES "NSIS")
   SET(CPACK_NSIS_DISPLAY_NAME "Zorba XQuery Processor ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-  SET(CPACK_NSIS_HELP_LINK "http:\\\\http://www.zorba-xquery.org/";)
-  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\http://www.zorba-xquery.org/";)
+  SET(CPACK_NSIS_HELP_LINK "http:\\\\http://www.zorba.io/";)
+  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\http://www.zorba.io/";)
   SET(CPACK_NSIS_CONTACT "info@xxxxxxxxxxxxxx")
   
   SET(CPACK_NSIS_CREATE_ICONS_EXTRA "

=== modified file 'ChangeLog'
--- ChangeLog	2013-08-02 17:36:56 +0000
+++ ChangeLog	2013-08-09 09:26:44 +0000
@@ -3,10 +3,15 @@
 
 version 3.0
 
+New Naming:
+  * All modules, annotations, options, collations, pragmas, and other
+    namespace URIs changed from http://www.zorba-xquery.com/
+    to http://zorba.io/ .
+
 New Features:
   * The grouping variable in a group by clause is now optional
   * New syntax for array lookup: expr1[[expr2]]
-  
+
 Optimizations:
   * Implemented hoisting optimization for general FLWOR.
   * Implemented flwor-merge optimization for general FLWOR.

=== modified file 'NOTICE.xml'
--- NOTICE.xml	2013-02-07 17:24:36 +0000
+++ NOTICE.xml	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<notice xmlns="http://www.zorba-xquery.com/notice";>
+<notice xmlns="http://zorba.io/notice";>
   <master-license>
     <license>Apache 2</license>
     <text>

=== modified file 'README.txt'
--- README.txt	2013-02-07 17:24:36 +0000
+++ README.txt	2013-08-09 09:26:44 +0000
@@ -5,7 +5,7 @@
   The Latest Version
   ------------------
 
-  The latest version can be found at http://www.zorba-xquery.org/.
+  The latest version can be found at http://www.zorba.io/.
 
   Documentation
   -------------

=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	2013-05-24 00:27:45 +0000
+++ bin/CMakeLists.txt	2013-08-09 09:26:44 +0000
@@ -61,9 +61,6 @@
 ZORBA_ADD_TEST(bin/zorba_f1 zorbacmd blub.xq)
 ZORBA_SET_TEST_PROPERTY(bin/zorba_f1 PASS_REGULAR_EXPRESSION ".*file {blub.xq} not found or not readable.*")
 
-ZORBA_ADD_TEST(bin/zorba_f2 zorbacmd "${CMAKE_CURRENT_SOURCE_DIR}/test/option.xq" --option "{http://www.zorba-xquery.com}option=highly_unique";)
-ZORBA_SET_TEST_PROPERTY(bin/zorba_f2 PASS_REGULAR_EXPRESSION "highly_unique")
-
 ZORBA_ADD_TEST(bin/zorba1 zorbacmd --omit-xml-declaration -q "1+1")
 ZORBA_SET_TEST_PROPERTY(bin/zorba1 PASS_REGULAR_EXPRESSION "2")
 
@@ -99,7 +96,7 @@
 ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk3 PASS_REGULAR_EXPRESSION ".*XQST0046.*mymod2.xq.*line-begin=['\"]17['\"] column-begin=['\"]1['\"] line-end=['\"]17['\"] column-end=['\"]26['\"].*")
 
 # test the --option option to set an option in the static context
-ZORBA_ADD_TEST(bin/zorba_option zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/option.xq" -f --option "{http://www.zorba-xquery.com}option=value";)
+ZORBA_ADD_TEST(bin/zorba_option zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/option.xq" -f --option "{http://zorba.io/}option=value";)
 ZORBA_SET_TEST_PROPERTY(bin/zorba_option PASS_REGULAR_EXPRESSION "value")
 
 # test the --uri-path, --lib-path, and --module-path args.

=== modified file 'bin/test/option.xq'
--- bin/test/option.xq	2013-02-07 17:24:36 +0000
+++ bin/test/option.xq	2013-08-09 09:26:44 +0000
@@ -16,4 +16,4 @@
 
 import module namespace i = "http://www.zorba-xquery.com/modules/introspection/sctx";;
 
-i:option(fn:QName("http://www.zorba-xquery.com";, "option"))
+i:option(fn:QName("http://zorba.io/";, "option"))

=== modified file 'bin/zorbacmdproperties.txt'
--- bin/zorbacmdproperties.txt	2013-02-07 17:24:36 +0000
+++ bin/zorbacmdproperties.txt	2013-08-09 09:26:44 +0000
@@ -32,7 +32,7 @@
 ("lib-path", po::value<std::string>(), "Library path (list of directories) where Zorba will look for dynamic libraries (e.g., module external function implementations.")
 ("module-path", po::value<std::string>(), "Path (list of directories) to add to both the URI and Library paths.")
 ("classpath", po::value<std::string>(), "JVM classpath to be used by modules using Java implementations")
-("option", po::value<std::vector<std::string> >(), "Set an XQuery option in the static context. The QName of the option is passed as a string in the notation by James Clark (i.e. {namespace}localname). For example, --option {http://www.zorba-xquery.com}option=value";).
+("option", po::value<std::vector<std::string> >(), "Set an XQuery option in the static context. The QName of the option is passed as a string in the notation by James Clark (i.e. {namespace}localname). For example, --option {http://zorba.io/}option=value";).
 ("trailing-nl", "Output a trailing newline after the result of the query.")
 ("stop-words", po::value<std::vector<std::string> >(), "Mapping specifying a stop-words URI to another.")
 ("thesaurus", po::value<std::vector<std::string> >(), "Mapping specifying a thesaurus URI to another.")

=== modified file 'bin/zorbacmdproperties_base.h'
--- bin/zorbacmdproperties_base.h	2013-05-14 01:56:17 +0000
+++ bin/zorbacmdproperties_base.h	2013-08-09 09:26:44 +0000
@@ -455,7 +455,7 @@
       }
       else if (strcmp (*argv, "--disable-http-resolution") == 0)
       {
-        init_val ("{http://www.zorba-xquery.com/options/features}disable=http-uri-resolution";,
+        init_val ("{http://zorba.io/options/features}disable=http-uri-resolution";,
                   theOption, 0);
       }
       else if (strcmp (*argv, "--") == 0)
@@ -515,7 +515,7 @@
         "--lib-path\nLibrary path (list of directories) where Zorba will look for dynamic libraries (e.g., module external function implementations.\n\n"
         "--module-path\nPath (list of directories) to add to both the URI and Library paths.\n\n"
         "--classpath\nJVM classpath to be used by modules using Java implementations\n\n"
-        "--option\nSet an XQuery option in the static context. The QName of the option is passed as a string in the notation by James Clark (i.e. {namespace}localname). For example, --option {http://www.zorba-xquery.com}option=value\n\n";
+        "--option\nSet an XQuery option in the static context. The QName of the option is passed as a string in the notation by James Clark (i.e. {namespace}localname). For example, --option {http://zorba.io/}option=value\n\n";
         "--trailing-nl\nOutput a trailing newline after the result of the query.\n\n"
         "--stop-words\nMapping specifying a stop-words URI to another.\n\n"
         "--thesaurus\nMapping specifying a thesaurus URI to another.\n\n"

=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2013-06-15 16:20:18 +0000
+++ cmake_modules/ZorbaModule.cmake	2013-08-09 09:26:44 +0000
@@ -748,7 +748,7 @@
 IF (NOT is_init)
   file (WRITE "${expected_failures_file}" "")
   file (WRITE "${zorba_manifest_file}"
-    "<z:manifest xmlns:z=\"http://www.zorba-xquery.com/manifest\";>\n")
+    "<z:manifest xmlns:z=\"http://zorba.io/manifest\";>\n")
   SET_PROPERTY (GLOBAL PROPERTY ZorbaModule_initialized 1)
 ENDIF (NOT is_init)
 

=== modified file 'config/fedora/zorba.spec.in'
--- config/fedora/zorba.spec.in	2013-02-07 17:24:36 +0000
+++ config/fedora/zorba.spec.in	2013-08-09 09:26:44 +0000
@@ -8,7 +8,7 @@
 
 Group: System Environment/Libraries
 License: ASL 2.0
-URL: http://www.zorba-xquery.com/
+URL: http://www.zorba.io/
 Source0: ftp://ftp.heanet.ie/pub/download.sourceforge/z/zo/zorba/%{name}-%{version}.tar.gz
 
 %{!?ruby_sitelib: %define ruby_sitelib %( ruby -r rbconfig -e "print Config::CONFIG['sitearchdir']")}

=== modified file 'doc/c/examples/ccontext.c'
--- doc/c/examples/ccontext.c	2013-02-07 17:24:36 +0000
+++ doc/c/examples/ccontext.c	2013-08-09 09:26:44 +0000
@@ -121,14 +121,14 @@
 
 /*   impl->create_context(impl, &lContext); */
 
-/*   lContext->set_base_uri(lContext, "http://www.zorba-xquery.com/";); */
-/*   lContext->add_collation(lContext, "http://www.zorba-xquery.com/collations/PRIMARY/de/DE";); */
+/*   lContext->set_base_uri(lContext, "http://zorba.io/";); */
+/*   lContext->add_collation(lContext, "http://zorba.io/collations/PRIMARY/de/DE";); */
 
 /*   lContext->get_base_uri(lContext, &lStringValue); */
-/*   if ( strcmp (lStringValue, "http://www.zorba-xquery.com/";) != 0) return 0; */
+/*   if ( strcmp (lStringValue, "http://zorba.io/";) != 0) return 0; */
 
 /*   impl->prepare(impl,  */
-/*                 "fn:compare('Strasse', 'Straße', 'http://www.zorba-xquery.com/collations/PRIMARY/de/DE')", */
+/*                 "fn:compare('Strasse', 'Straße', 'http://zorba.io/collations/PRIMARY/de/DE')", */
 /*                 lContext, &lExpr); */
 
 /*   lExpr->execute(lExpr, NULL, lOutFile); */
@@ -243,7 +243,7 @@
   if (check_error("create_string_sequence", lError)) return 0;
 
   lError = impl->prepare(impl,
-    "declare namespace ns=\"http://www.zorba-xquery.com/\";\n";
+    "declare namespace ns=\"http://zorba.io/\";\n";
     "declare variable $ns:foo as xs:string external;\n"
     "($ns:foo, $ns:foo, $ns:foo)", NULL, &lExpr);
   if (check_error("prepare", lError)) return 0;
@@ -251,7 +251,7 @@
   // get the dynamic context and set the variable
   lError = lExpr->create_context(lExpr, &lContext);
   if (check_error("create_context", lError)) return 0;
-  lError = lContext->set_variable(lContext, "http://www.zorba-xquery.com/";,
+  lError = lContext->set_variable(lContext, "http://zorba.io/";,
     "foo", lSeq);
   if (check_error("set_variable", lError)) return 0;
 
@@ -293,7 +293,7 @@
   impl->create_string_sequence(impl, lOther, 1, &lSeq2);
 
   lError = impl->prepare(impl,
-    "declare namespace ns=\"http://www.zorba-xquery.com/\";\n";
+    "declare namespace ns=\"http://zorba.io/\";\n";
     "declare variable $ns:foo as xs:string external;\n"
     "($ns:foo, $ns:foo, $ns:foo)", NULL, &lExpr);
   if (check_error("prepare", lError)) return 0;
@@ -301,20 +301,20 @@
   // get two dynamic context and bind $ns:foo on each to different values
   lError = lExpr->create_context(lExpr, &lContext1);
   if (check_error("create_context 1", lError)) return 0;
-  lError = lContext1->set_variable(lContext1, "http://www.zorba-xquery.com/";,
+  lError = lContext1->set_variable(lContext1, "http://zorba.io/";,
     "foo", lSeq1);
   if (check_error("set_variable 1", lError)) return 0;
   lError = lExpr->create_context(lExpr, &lContext2);
   if (check_error("create_context 2", lError)) return 0;
-  lError = lContext2->set_variable(lContext2, "http://www.zorba-xquery.com/";,
+  lError = lContext2->set_variable(lContext2, "http://zorba.io/";,
     "foo", lSeq2);
   if (check_error("set_variable 2", lError)) return 0;
 
   // Check the variable binding on both contexts
-  lError = lContext1->get_variable(lContext1, "http://www.zorba-xquery.com/";,
+  lError = lContext1->get_variable(lContext1, "http://zorba.io/";,
     "foo", &lVariable1);
   if (check_error("get_variable 1", lError)) return 0;
-  lError = lContext2->get_variable(lContext2, "http://www.zorba-xquery.com/";,
+  lError = lContext2->get_variable(lContext2, "http://zorba.io/";,
     "foo", &lVariable2);
   if (check_error("get_variable 2", lError)) return 0;
   if (check_sequence(lVariable1, lZorba[0], 1)) return 0;

=== modified file 'doc/c/examples/csequences.c'
--- doc/c/examples/csequences.c	2013-02-07 17:24:36 +0000
+++ doc/c/examples/csequences.c	2013-08-09 09:26:44 +0000
@@ -207,7 +207,7 @@
 {
   int lI = 0;
   lI += cr_sngl_test(impl, XQC_ANY_URI_TYPE, "anyURI",
-    "http://www.zorba-xquery.com/";);
+    "http://zorba.io/";);
   lI += cr_sngl_test(impl, XQC_DATE_TYPE, "date", "2010-01-13");
   lI += cr_sngl_test(impl, XQC_FLOAT_TYPE, "float", "8.25");
   lI += cr_sngl_test(impl, XQC_DOUBLE_TYPE, "double", "8.25123532152");

=== modified file 'doc/c/manual/indexpage.dox'
--- doc/c/manual/indexpage.dox	2013-02-07 17:24:36 +0000
+++ doc/c/manual/indexpage.dox	2013-08-09 09:26:44 +0000
@@ -6,7 +6,7 @@
   interface for the XQuery Data Model (XDM).
   The project is available under the BSD License and is hosted on <a href="http://www.sourceforge.net";>http://www.sourceforge.net</a>.
   It is a joint effort between <a href="http://xqilla.sourceforge.net/";>XQilla</a> and the 
-  <a href="http://www.zorba-xquery.org/";>FLWOR Foundation's Zorba Group</a> with the goal to make these two 
+  <a href="http://www.zorba.io/";>FLWOR Foundation's Zorba Group</a> with the goal to make these two 
   XQuery processor easily exchangable.
   However, XQC is still in it's early stages. Zorba implements most of the things 
   that are specified in XQC but also deviates from and enhances the XQC specification to some degree.

=== modified file 'doc/code/headers_svg/zorba_headers_dependencies.xqi'
--- doc/code/headers_svg/zorba_headers_dependencies.xqi	2013-02-07 17:24:36 +0000
+++ doc/code/headers_svg/zorba_headers_dependencies.xqi	2013-08-09 09:26:44 +0000
@@ -22,9 +22,9 @@
 import module namespace file = "http://expath.org/ns/file";;
 import module namespace dot = "http://www.zorba-xquery.com/modules/image/graphviz";;
 import module namespace html = "http://www.zorba-xquery.com/modules/converters/html";;
-import module namespace functx = "http://www.functx.com/";;
+import module namespace functx = "http://www.functx.com";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare variable $z:headersCollector := <headers/>;
 

=== modified file 'doc/cxx/examples/context.cpp'
--- doc/cxx/examples/context.cpp	2013-08-05 11:24:53 +0000
+++ doc/cxx/examples/context.cpp	2013-08-09 09:26:44 +0000
@@ -211,15 +211,15 @@
   StaticContext_t lStaticContext = aZorba->createStaticContext();
 
   /* Add the German collation to the context */
-  lStaticContext->addCollation("http://www.zorba-xquery.com/collations/PRIMARY/de/DE";);
-
-  lStaticContext->setBaseURI("http://www.zorba-xquery.com/";);
-
-  if ( lStaticContext->getBaseURI() != "http://www.zorba-xquery.com/";)
+  lStaticContext->addCollation("http://zorba.io/collations/PRIMARY/de/DE";);
+
+  lStaticContext->setBaseURI("http://zorba.io/";);
+
+  if ( lStaticContext->getBaseURI() != "http://zorba.io/";)
     return false;
 
   /* Use the German collation as the third argument to the fn:compare() XQuery function */
-  XQuery_t lQuery = aZorba->compileQuery("fn:compare('Strasse', 'Stra??e', 'http://www.zorba-xquery.com/collations/PRIMARY/de/DE')",
+  XQuery_t lQuery = aZorba->compileQuery("fn:compare('Strasse', 'Stra??e', 'http://zorba.io/collations/PRIMARY/de/DE')",
           lStaticContext);
 
   try {
@@ -243,9 +243,9 @@
   StaticContext_t lStaticContext = aZorba->createStaticContext();
 
   try {
-    lStaticContext->addCollation("http://www.zorba-xquery.com/zorba/collations/PRIMARY";);
+    lStaticContext->addCollation("http://zorba.io/zorba/collations/PRIMARY";);
 
-    XQuery_t lQuery = aZorba->compileQuery("fn:compare('Strasse', 'Stra??e', 'http://www.zorba-xquery.com/zorba/collations/PRIMARY')",
+    XQuery_t lQuery = aZorba->compileQuery("fn:compare('Strasse', 'Stra??e', 'http://zorba.io/zorba/collations/PRIMARY')",
         lStaticContext);
 
     std::cout << lQuery << std::endl;
@@ -369,14 +369,14 @@
         EntityData const* aEntityData)
   {
     if (aEntityData->getKind() == EntityData::MODULE &&
-      aUrl == "http://www.zorba-xquery.com/mymodule";) 
+      aUrl == "http://zorba.io/mymodule";) 
     {
       // we have only one module
       std::auto_ptr<std::stringstream> lQuery(new std::stringstream());
       (*lQuery)
-        << "module namespace mymodule = 'http://www.zorba-xquery.com/mymodule';" << std::endl
+        << "module namespace mymodule = 'http://zorba.io/mymodule';" << std::endl
         << "import module namespace dml = 'http://www.zorba-xquery.com/modules/store/static/collections/dml';" << std::endl
-        << "declare namespace an = 'http://www.zorba-xquery.com/annotations';" << std::endl
+        << "declare namespace an = 'http://zorba.io/annotations';" << std::endl
         << "declare variable $mymodule:var  := 'myvar';" << std::endl
         << "declare collection mymodule:collection;" << std::endl
         << "declare %an:automatic %an:value-equality index mymodule:index" << std::endl
@@ -408,7 +408,7 @@
   try {
     Zorba_CompilerHints_t hints;
     std::stringstream lProlog;
-    lProlog << "import module namespace mymodule = 'http://www.zorba-xquery.com/mymodule';" << std::endl
+    lProlog << "import module namespace mymodule = 'http://zorba.io/mymodule';" << std::endl
             << "import module namespace ddl = 'http://www.zorba-xquery.com/modules/store/static/collections/ddl';"
             << std::endl
             << "declare function local:collections() { " << std::endl

=== modified file 'doc/cxx/examples/datamanager.cpp'
--- doc/cxx/examples/datamanager.cpp	2013-08-06 09:10:25 +0000
+++ doc/cxx/examples/datamanager.cpp	2013-08-09 09:26:44 +0000
@@ -89,7 +89,7 @@
 
     // name of the collection
     Item lColName = aZorba->getItemFactory()->createQName(
-        "http://www.zorba-xquery.com/collections";, "mybooks");
+        "http://zorba.io/collections";, "mybooks");
 
     // (1) create the collection
     lColMgr->createCollection(lColName);
@@ -135,7 +135,7 @@
 
     // name of the collection
     Item lColName = aZorba->getItemFactory()->createQName(
-        "http://www.zorba-xquery.com/collections";, "mybooks");
+        "http://zorba.io/collections";, "mybooks");
 
     // (1) create the collection
     lColMgr->createCollection(lColName);

=== modified file 'doc/cxx/examples/errors.cpp'
--- doc/cxx/examples/errors.cpp	2013-02-07 17:24:36 +0000
+++ doc/cxx/examples/errors.cpp	2013-08-09 09:26:44 +0000
@@ -134,7 +134,7 @@
 {
   try {
     Item lQName = aZorba->getItemFactory()->createQName(
-        "http://www.zorba-xquery.com/options/warnings";, "", "error");
+        "http://zorba.io/options/warnings";, "", "error");
 
     // make sure that the warning zwarn::ZWST0002 is turned
     // into an error
@@ -142,7 +142,7 @@
     lCtx->declareOption(lQName, "ZWST0003");
 
     std::ostringstream s;
-    s << "declare namespace z = 'http://www.zorba-xquery.com/annotations';" << std::endl
+    s << "declare namespace z = 'http://zorba.io/annotations';" << std::endl
       << "declare %z:sequential function local:foo() { 1 };" << std::endl
       << "local:foo()" << std::endl;
     XQuery_t lQuery = aZorba->compileQuery(s.str(), lCtx); 

=== modified file 'doc/cxx/examples/external_functions.cpp'
--- doc/cxx/examples/external_functions.cpp	2013-02-07 17:24:36 +0000
+++ doc/cxx/examples/external_functions.cpp	2013-08-09 09:26:44 +0000
@@ -631,12 +631,12 @@
         EntityData const* aEntityData)
   {
     if (aEntityData->getKind() == EntityData::MODULE &&
-      aUrl == "http://www.zorba-xquery.com/mymodule";) 
+      aUrl == "http://zorba.io/mymodule";) 
     {
       // we have only one module
       std::auto_ptr<std::istream> lQuery
           (new std::istringstream
-           ("module namespace lm = 'http://www.zorba-xquery.com/mymodule'; "
+           ("module namespace lm = 'http://zorba.io/mymodule'; "
             "declare function lm:foo() { 'foo' }; "
             "declare function lm:ext() external;"));
       return StreamResource::create(lQuery.release(), &releaseStream);
@@ -664,7 +664,7 @@
 
   String getURI() const 
   {
-    return "http://www.zorba-xquery.com/mymodule";;
+    return "http://zorba.io/mymodule";;
   }
 
   void setExternalFunction(MyModuleExternalFunction* f)
@@ -732,7 +732,7 @@
   MyModuleExternalFunction lExtFunc(&lExternalModule);
 
   std::ostringstream queryText;
-  queryText << "import module namespace lm=\"http://www.zorba-xquery.com/mymodule\";";
+  queryText << "import module namespace lm=\"http://zorba.io/mymodule\";";
             << "concat(lm:foo(), lm:ext())" << std::endl;
 
   try

=== modified file 'doc/cxx/examples/sax2.cpp'
--- doc/cxx/examples/sax2.cpp	2013-02-07 17:24:36 +0000
+++ doc/cxx/examples/sax2.cpp	2013-08-09 09:26:44 +0000
@@ -86,7 +86,7 @@
   try 
   {
     // compile a query
-    XQuery_t lQuery = lZorba->compileQuery("<a xmlns:f=\"foo\" xmlns=\"http://zorba-xquery.com/defaultns\";> text a text a <b xmlns:ns1=\"http://zorba-xquery.com/usecase1\"; attr1=\"value1\" attr2=\"value2\"> text b </b><f:bar>foo</f:bar><foo /><bar /><b><![CDATA[ foo ]]></b></a>");
+    XQuery_t lQuery = lZorba->compileQuery("<a xmlns:f=\"foo\" xmlns=\"http://zorba.io/defaultns\";> text a text a <b xmlns:ns1=\"http://zorba.io/usecase1\"; attr1=\"value1\" attr2=\"value2\"> text b </b><f:bar>foo</f:bar><foo /><bar /><b><![CDATA[ foo ]]></b></a>");
 
     // register the content handler created above
     lQuery->registerSAXHandler( &lContentHandler );

=== modified file 'doc/cxx/examples/simple.cpp'
--- doc/cxx/examples/simple.cpp	2013-08-05 11:24:53 +0000
+++ doc/cxx/examples/simple.cpp	2013-08-09 09:26:44 +0000
@@ -245,7 +245,7 @@
 example_12(Zorba* aZorba)
 {
   XQuery_t lQuery = aZorba->compileQuery
-      ("<a xmlns:foo='http://www.zorba-xquery.com/'><b attr='1' xmlns:bar='http://www.zorba-xquery.com/uri2'/><b attr='2'/></a>");
+      ("<a xmlns:foo='http://zorba.io/'><b attr='1' xmlns:bar='http://zorba.io/uri2'/><b attr='2'/></a>");
 
   Iterator_t lIterator = lQuery->iterator();
   lIterator->open();

=== modified file 'doc/cxx/examples/uri_resolvers.cpp'
--- doc/cxx/examples/uri_resolvers.cpp	2013-06-20 11:05:03 +0000
+++ doc/cxx/examples/uri_resolvers.cpp	2013-08-09 09:26:44 +0000
@@ -40,7 +40,7 @@
     if (aEntityData->getKind() != EntityData::SCHEMA) {
       return;
     }
-    if(aUri == "http://www.zorba-xquery.com/helloworld";) {
+    if(aUri == "http://zorba.io/helloworld";) {
       oUris.push_back("http://zorbatest.lambda.nu:8080/tutorial/helloworld.xsd";);
     }
   }
@@ -65,12 +65,12 @@
         EntityData const* aEntityData)
   {
     if (aEntityData->getKind() == EntityData::MODULE &&
-      aUrl == "http://www.zorba-xquery.com/mymodule";) 
+      aUrl == "http://zorba.io/mymodule";) 
     {
       // we have only one module
       std::auto_ptr<std::istream> lModule
           (new std::istringstream
-           ("module namespace lm = 'http://www.zorba-xquery.com/mymodule'; "
+           ("module namespace lm = 'http://zorba.io/mymodule'; "
             "declare function lm:foo() { 'foo' };"));
       return StreamResource::create(lModule.release(), &releaseStream);
     }
@@ -102,7 +102,7 @@
   lContext->registerURLResolver(&lResolver);
 
   try {
-    XQuery_t lQuery = aZorba->compileQuery("import module namespace lm='http://www.zorba-xquery.com/mymodule'; lm:foo()", lContext); 
+    XQuery_t lQuery = aZorba->compileQuery("import module namespace lm='http://zorba.io/mymodule'; lm:foo()", lContext); 
     std::cout << lQuery << std::endl;
   } catch (ZorbaException& e) {
     std::cerr << e.what() << std::endl;
@@ -112,7 +112,7 @@
   // test if an error is raised if a module uri resolver is not
   // available using the serialization callback
   try {
-    XQuery_t lQuery = aZorba->compileQuery("import module namespace lm='http://www.zorba-xquery.com/mymodule'; lm:foo()", lContext); 
+    XQuery_t lQuery = aZorba->compileQuery("import module namespace lm='http://zorba.io/mymodule'; lm:foo()", lContext); 
 
     std::stringstream lSerializedQuery;
     lQuery->saveExecutionPlan(lSerializedQuery);
@@ -140,7 +140,7 @@
   try {
     XQuery_t lQuery = aZorba->compileQuery
       ("import schema namespace lm="
-        "'http://www.zorba-xquery.com/helloworld'; "
+        "'http://zorba.io/helloworld'; "
         "validate{ <p>Hello World!</p> }", lContext); 
     std::cout << lQuery << std::endl;
   } catch (ZorbaException& e) {

=== modified file 'doc/python/examples/test0.xq'
--- doc/python/examples/test0.xq	2013-02-07 17:24:36 +0000
+++ doc/python/examples/test0.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare variable $sequence := (65 to 90);
 declare variable $var := 1;

=== modified file 'doc/python/examples/test1.xq'
--- doc/python/examples/test1.xq	2013-02-07 17:24:36 +0000
+++ doc/python/examples/test1.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function local:magic-trick() 
 {

=== modified file 'doc/python/examples/test4.xq'
--- doc/python/examples/test4.xq	2013-02-07 17:24:36 +0000
+++ doc/python/examples/test4.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $x := 1;
 

=== modified file 'doc/python/examples/test6.xq'
--- doc/python/examples/test6.xq	2013-02-07 17:24:36 +0000
+++ doc/python/examples/test6.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $x := 42;
 

=== modified file 'doc/xqj/examples/Test_Zorba.java'
--- doc/xqj/examples/Test_Zorba.java	2012-05-15 19:57:41 +0000
+++ doc/xqj/examples/Test_Zorba.java	2013-08-09 09:26:44 +0000
@@ -225,7 +225,7 @@
     CollectionManager manager = new CollectionManager(xmlManager.getCollectionManager());
 
     ItemFactory factory = zorba.getItemFactory();
-    Item name = factory.createQName("http://www.zorba-xquery.com/";, "aaa");
+    Item name = factory.createQName("http://zorba.io/";, "aaa");
     manager.createCollection(name);
     boolean resultAdding = manager.isAvailableCollection(name);
     Collection collection = null;

=== modified file 'doc/zorba/commandline.dox'
--- doc/zorba/commandline.dox	2013-02-07 17:24:36 +0000
+++ doc/zorba/commandline.dox	2013-08-09 09:26:44 +0000
@@ -109,7 +109,7 @@
 Path (list of directories) to add to both the URI and Library paths.
 
 --option
-Set an XQuery option in the static context. The QName of the option is passed as a string in the notation by James Clark (i.e. {namespace}localname). For example, --option {http://www.zorba-xquery.com}option=value
+Set an XQuery option in the static context. The QName of the option is passed as a string in the notation by James Clark (i.e. {namespace}localname). For example, --option {http://zorba.io/}option=value
 
 --trailing-nl
 Output a trailing newline after the result of the query.

=== modified file 'doc/zorba/data_lifecycle.dox'
--- doc/zorba/data_lifecycle.dox	2013-02-07 17:24:36 +0000
+++ doc/zorba/data_lifecycle.dox	2013-08-09 09:26:44 +0000
@@ -311,7 +311,7 @@
 For example, a mobile device store can safely assume that only a single request at a time is processed whereas a store backed by a relational database might provide full-fledged ACID behavior.
 Analogously, a main memory store does not provide persistence of data across process boundaries.
 
-The Zorba source distribution as well as the packages provided by <a href="http://www.zorba-xquery.com/";>http://www.zorba-xquery.com/</a> come with a main memory based store.
+The Zorba source distribution as well as the packages provided by <a href="http://www.zorba.io/";>http://www.zorba.io/</a> come with a main memory based store.
 The lifecycle of the data in this store is bounded by the lifetime of the process in which it is running.
 For example, a document added to the store can be accessed by XQuery programs in the same process.
 As soon as the process terminates (or even earlier if Zorba is shutdown before the process terminates), the default in-memory store will destroy the XML data it contains.

=== modified file 'doc/zorba/errors_warnings.dox'
--- doc/zorba/errors_warnings.dox	2013-08-07 05:28:39 +0000
+++ doc/zorba/errors_warnings.dox	2013-08-09 09:26:44 +0000
@@ -33,7 +33,7 @@
 For example, given the following prolog of an XQuery module, all warnings are treated as errors:
 
 \code
-  declare namespace op = "http://www.zorba-xquery.com/options/warnings";;
+  declare namespace op = "http://zorba.io/options/warnings";;
   declare namespace w = "http://zorba.io/warnings";;
 
   declare option op:error "w:all";

=== modified file 'doc/zorba/ft_thesaurus.dox'
--- doc/zorba/ft_thesaurus.dox	2013-02-07 17:24:36 +0000
+++ doc/zorba/ft_thesaurus.dox	2013-08-09 09:26:44 +0000
@@ -89,7 +89,7 @@
 
 Alternatively,
 you can download a precompiled, little-endian (Intel) CPU WordNet database from
-<a href="http://www.zorba-xquery.com/downloads/WordNet-3.0/wordnet-en.zip";>here</a>.
+<a href="http://www.zorba.io/downloads/WordNet-3.0/wordnet-en.zip";>here</a>.
 
 \section ft_thesaurus_mappings Thesauri Mappings
 

=== modified file 'doc/zorba/impl_dep_features.dox'
--- doc/zorba/impl_dep_features.dox	2013-08-07 05:28:39 +0000
+++ doc/zorba/impl_dep_features.dox	2013-08-09 09:26:44 +0000
@@ -51,7 +51,7 @@
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
     <td>Any components of the static context or dynamic context that are overwritten or augmented by the implementation.</td>
-    <td>The following static context components are overwritten/augmented: 1. Statically known namespaces: Augmented with zerr –&gt; <a href="http://www.zorba-xquery.com/html/modules/zorba/errors";>http://zorba.io/errors</a> 2. Context item static type: item() 3. Default order for empty sequences: empty_greatest 4. Static Base URI: We use the rules in 4.5, where the implementation-defined default mentioned there is http://www.zorba-xquery.com, 5. Statically known default collection type: item()*</td>
+    <td>The following static context components are overwritten/augmented: 1. Statically known namespaces: Augmented with zerr –&gt; <a href="http://www.zorba-xquery.com/html/modules/zorba/errors";>http://zorba.io/errors</a> 2. Context item static type: item() 3. Default order for empty sequences: empty_greatest 4. Static Base URI: We use the rules in 4.5, where the implementation-defined default mentioned there is http://zorba.io/, 5. Statically known default collection type: item()*</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
@@ -604,7 +604,7 @@
     <td>W3C XQuery 1.0</td>
     <td>Base URI</td>
     <td>static</td>
-    <td>Uses the rules in http://www.w3.org/TR/xquery-30/#id-base-uri-decl, where the implementation-defined default mentioned there is http://www.zorba-xquery.com</td>
+    <td>Uses the rules in http://www.w3.org/TR/xquery-30/#id-base-uri-decl, where the implementation-defined default mentioned there is http://zorba.io/</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>

=== modified file 'doc/zorba/link_crawler2.dox'
--- doc/zorba/link_crawler2.dox	2013-02-07 17:24:36 +0000
+++ doc/zorba/link_crawler2.dox	2013-08-09 09:26:44 +0000
@@ -23,14 +23,14 @@
 import module namespace parse-xml = "http://www.zorba-xquery.com/modules/xml";;
 import module namespace file = "http://expath.org/ns/file";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 declare namespace xhtml="http://www.w3.org/1999/xhtml";;
 declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";;
 declare namespace err="http://www.w3.org/2005/xqt-errors";;
 declare namespace httpsch = "http://expath.org/ns/http-client";;
 
-declare variable $top-uri  as xs:string := "http://www.zorba-xquery.com/html/index";;
-declare variable $uri-host as xs:string := "http://www.zorba-xquery.com";;
+declare variable $top-uri  as xs:string := "http://www.zorba.io/";;
+declare variable $uri-host as xs:string := "http://www.zorba.io";;
 
 
 

=== modified file 'doc/zorba/modules_authoring.dox'
--- doc/zorba/modules_authoring.dox	2013-02-07 17:24:36 +0000
+++ doc/zorba/modules_authoring.dox	2013-08-09 09:26:44 +0000
@@ -17,7 +17,7 @@
 easy reference.
 
 \code
-module namespace mymod = "http://www.zorba-xquery.com/mymod";;
+module namespace mymod = "http://zorba.io/mymod";;
 \endcode
 
 After the module declaration, you may have as many <i>function</i> or
@@ -29,7 +29,7 @@
 it a value), as well as two simple functions.
 
 \code
-module namespace mymod = "http://www.zorba-xquery.com/mymod";;
+module namespace mymod = "http://zorba.io/mymod";;
 
 declare variable $mymod:value as xs:string := "my string value";
 
@@ -47,7 +47,7 @@
 imports the module and uses one of its functions:
 
 \code
-import module namespace mymod="http://www.zorba-xquery.com/mymod";
+import module namespace mymod="http://zorba.io/mymod";
   at "mymod.xq";
 
 mymod:hello()
@@ -97,7 +97,7 @@
 FIND_PACKAGE (Zorba REQUIRED)
 INCLUDE ("${Zorba_USE_FILE}")
 
-DECLARE_ZORBA_MODULE (FILE mymod.xq URI "http://www.zorba-xquery.com/mymod";)
+DECLARE_ZORBA_MODULE (FILE mymod.xq URI "http://zorba.io/mymod";)
 
 DONE_DECLARING_ZORBA_URIS ()
 \endcode
@@ -149,7 +149,7 @@
 (This "use file" technique is a convention for CMake projects.)
 
 \code
-DECLARE_ZORBA_MODULE (FILE mymod.xq URI "http://www.zorba-xquery.com/mymod";)
+DECLARE_ZORBA_MODULE (FILE mymod.xq URI "http://zorba.io/mymod";)
 \endcode
 
 <tt>DECLARE_ZORBA_MODULE()</tt> is the centerpiece of the Zorba module
@@ -260,7 +260,7 @@
 "..."</tt> clause from our test query which imports this module:
 
 \code
-import module namespace "http://www.zorba-xquery.com/mymod";;
+import module namespace "http://zorba.io/mymod";;
 
 mymod:hello()
 \endcode

=== modified file 'doc/zorba/modules_authoring_2.dox'
--- doc/zorba/modules_authoring_2.dox	2013-02-07 17:24:36 +0000
+++ doc/zorba/modules_authoring_2.dox	2013-08-09 09:26:44 +0000
@@ -32,7 +32,7 @@
 be anything you like. It does not have to have anything in common with
 the namespace URI. Conventionally, it will be the final component of
 your URI with ".xq" appended, as in our example where the filename for
-the namespace URI <tt>http://www.zorba-xquery.com/mymod</tt> was
+the namespace URI <tt>http://zorba.io/mymod</tt> was
 <tt>mymod.xq</tt>. This is a good convention, because once the module
 is <i>installed</i> into the <tt>URI_PATH</tt> directory or elsewhere,
 this is the filename it will have. However, it is not required.
@@ -51,12 +51,12 @@
 XQuery options are identified by a QName. The specific QName Zorba
 looks for has the localname <tt>module-version</tt>, and is located in
 the namespace
-<tt>http://www.zorba-xquery.com/options/versioning</tt>.  Therefore,
+<tt>http://zorba.io/options/versioning</tt>.  Therefore,
 put the following two lines into your module, after the module
 declaration:
 
 \code
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 \endcode
 
@@ -82,7 +82,7 @@
 
 \code
 DECLARE_ZORBA_MODULE
-  (FILE mymod.xq URI "http://www.zorba-xquery.com/mymod"; VERSION 1.0)
+  (FILE mymod.xq URI "http://zorba.io/mymod"; VERSION 1.0)
 \endcode
 
 As with <tt>URI</tt>, version numbers cannot contain space characters,
@@ -103,11 +103,11 @@
 
 \code
 DECLARE_ZORBA_MODULE
-  (FILE mymod-3.xq URI "http://www.zorba-xquery.com/mymod"; VERSION 3.1)
-DECLARE_ZORBA_MODULE
-  (FILE mymod-2.xq URI "http://www.zorba-xquery.com/mymod"; VERSION 2.4)
-DECLARE_ZORBA_MODULE
-  (FILE mymod-1.xq URI "http://www.zorba-xquery.com/mymod"; VERSION 1.6)
+  (FILE mymod-3.xq URI "http://zorba.io/mymod"; VERSION 3.1)
+DECLARE_ZORBA_MODULE
+  (FILE mymod-2.xq URI "http://zorba.io/mymod"; VERSION 2.4)
+DECLARE_ZORBA_MODULE
+  (FILE mymod-1.xq URI "http://zorba.io/mymod"; VERSION 1.6)
 \endcode
 
 If you do this incorrectly (out of order), you will get an error when
@@ -131,7 +131,7 @@
 
 \code
 DECLARE_ZORBA_SCHEMA
-  (URI "http://www.zorba-xquery.com/myschema"; FILE "schema.xsd")
+  (URI "http://zorba.io/myschema"; FILE "schema.xsd")
 \endcode
 
 The semantics and meanings of the <tt>URI</tt> and <tt>FILE</tt>
@@ -305,7 +305,7 @@
 IF (LIBXSLT_FOUND)
     INCLUDE_DIRECTORIES (${LIBXSLT_INCLUDE_DIR})
     DECLARE_ZORBA_MODULE (FILE xslt.xq VERSION 1.0
-      URI "http://www.zorba-xquery.com/modules/languages/xslt";
+      URI "http://zorba.io/modules/xslt";
       LINK_LIBRARIES "${LIBXSLT_LIBRARIES}")
 ENDIF (LIBXSLT_FOUND)
 \endcode

=== modified file 'doc/zorba/options.dox'
--- doc/zorba/options.dox	2013-08-07 05:28:39 +0000
+++ doc/zorba/options.dox	2013-08-09 09:26:44 +0000
@@ -23,7 +23,7 @@
 For example, the following declaration disables scripting support in the module that contains the option declaration.
 
 \code
-  declare namespace op = "http://www.zorba-xquery.com/options/features";;
+  declare namespace op = "http://zorba.io/options/features";;
 
   declare option op:disable "scripting";
 \endcode
@@ -32,7 +32,7 @@
 \subsection options_zorba Available Options
 
 Zorba provides a number of options which can be used to determine the behavior of a module.
-The namespace for all such options starts with <tt>http://www.zorba-xquery.com/options</tt>.
+The namespace for all such options starts with <tt>http://zorba.io/options</tt>.
 An error is raised (zerr:ZXQP0060) if a module declares an option with a namespace that is equal to or starts with this namespace but the local name refers to an option that is not known to Zorba.
 
 In the following, we describe the set of options available in Zorba.
@@ -44,7 +44,7 @@
 extension and the data definition facility are both features not defined by 
 the W3C but available in Zorba. The user can enable or disable any of these 
 extensions using an option declaration, respectively. The URI of the names 
-of these options is <tt>http://www.zorba-xquery.com/options/features</tt>.
+of these options is <tt>http://zorba.io/options/features</tt>.
 The local name to enable a feature is <tt>enable</tt> and to disable a feature 
 is <tt>disable</tt>, respectively. As a value, any of these options allows 
 a comma separated list of feature names (QNames).
@@ -53,14 +53,14 @@
 the following option declaration may be used:
 
 \code
-  declare namespace op = "http://www.zorba-xquery.com/options/features";;
-  declare namespace f = "http://www.zorba-xquery.com/features";;
+  declare namespace op = "http://zorba.io/options/features";;
+  declare namespace f = "http://zorba.io/features";;
 
   declare option op:disable "f:scripting, f:ddl";
 \endcode
 
 If a given feature doesn't specify a prefix, the name is resolved against the 
-default feature namespace <tt>http://www.zorba-xquery.com/features</tt>. All 
+default feature namespace <tt>http://zorba.io/features</tt>. All 
 Zorba specific features presented in the following are declared in this namespace.
 
 <ul>
@@ -108,7 +108,7 @@
 
 Options can also be used to provide the Zorba optimizer with certain "hints".
 All options used for this purpose have a QName whose namespace URI is
-<tt>http://www.zorba-xquery.com/options/optimizer</tt>. For some hints, the
+<tt>http://zorba.io/options/optimizer</tt>. For some hints, the
 optimizer needs to know only whether the hint should be applied or not; no
 additional information is required. For such hints, Zorba recognizes two 
 options, whose local name is <tt>enable</tt> and <tt>disable</tt>, respectivaly,
@@ -129,7 +129,7 @@
 it constructs each of the new \code <country> \endcode nodes.
 
 \code
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 
@@ -156,7 +156,7 @@
 For example, given the following prolog, all warnings are treated as errors:
 
 \code
-  declare namespace op = "http://www.zorba-xquery.com/options/warnings";;
+  declare namespace op = "http://zorba.io/options/warnings";;
   declare namespace w = "http://zorba.io/warnings";;
 
   declare option op:error "w:all";
@@ -171,7 +171,7 @@
 annotations) to be suppressed:
 
 \code
-  declare namespace op = "http://www.zorba-xquery.com/options/warnings";;
+  declare namespace op = "http://zorba.io/options/warnings";;
 
   declare option op:disable "ZWST0002";
 \endcode
@@ -192,7 +192,7 @@
 following option declaration may be used.
 
 \code
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.5";
 declare option ver:zorba-version "2.0";
 \endcode
@@ -234,7 +234,7 @@
 zorba::StaticContext_t lContext = zorba->createStaticContext();
 
 zorba::Item lEnable = zorba->getItemFactory()->createQName(
-  "http://www.zorba-xquery.com/options/features";, "", "enable");
+  "http://zorba.io/options/features";, "", "enable");
 
 lContext->declareOption(lEnable, "hof");
 
@@ -278,7 +278,7 @@
 
 Zorba provides a number of annotations that allow the user to define the 
 semantics of functions, variables, collections, and indexes. All these 
-annotations have the namespace <tt>http://www.zorba-xquery.com/annotations</tt>.
+annotations have the namespace <tt>http://zorba.io/annotations</tt>.
 
 
 \paragraph deterministic_annotation Deterministic and Nondeterministic Functions
@@ -299,7 +299,7 @@
 As an example, the following snippet declares a nondeterministic random function.
 
 \code
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare %an:nondeterministic function random:random() as xs:integer external;
 \endcode
@@ -338,7 +338,7 @@
 For example, preventing a variable from being assigned in scripting mode could be done as follows:
 
 \code
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare %an:nonassignable variable $var := 3;
 \endcode
@@ -511,7 +511,7 @@
 An extension expression consists of one or more pragmas, followed by an expression enclosed in curly braces.
 A pragma might be used to modify the behavior or semantics of the expression enclosed in curly braces.
 Pragmas are denoted by the delimiters (# and #), and consists of an identifying EQName.
-Zorba recognizes pragmas having the namespace <tt>http://www.zorba-xquery.com/extensions</tt>.
+Zorba recognizes pragmas having the namespace <tt>http://zorba.io/extensions</tt>.
 Specifically, Zorba recognizes the following pragmas:
 
 <ul>
@@ -519,7 +519,7 @@
 \code
 import module namespace db = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
-declare namespace ext = "http://www.zorba-xquery.com/extensions";;
+declare namespace ext = "http://zorba.io/extensions";;
 
 let $n := <a/>
 return (# ext:no-copy #) { $n is  db:apply-insert-last(xs:QName("local:bar"), $n) }

=== modified file 'doc/zorba/scripting.dox'
--- doc/zorba/scripting.dox	2013-02-07 17:24:36 +0000
+++ doc/zorba/scripting.dox	2013-08-09 09:26:44 +0000
@@ -352,7 +352,7 @@
 The following prolog option can be used to disable the scripting feature.
 
 \code
-  declare namespace op = "http://www.zorba-xquery.com/options/features";;
+  declare namespace op = "http://zorba.io/options/features";;
 
   declare option op:disable "scripting";
 \endcode

=== modified file 'doc/zorba/scripting_spec.html'
--- doc/zorba/scripting_spec.html	2013-02-07 17:24:36 +0000
+++ doc/zorba/scripting_spec.html	2013-08-09 09:26:44 +0000
@@ -192,7 +192,7 @@
          </li>
       </ul>
             
-      <p>This specification makes use of the prefix an for some annotations, bound with the namespace http://www.zorba-xquery.com/annotations</p>
+      <p>This specification makes use of the prefix an for some annotations, bound with the namespace http://zorba.io/annotations</p>
           
       <h1><a name="id-extensions-to-processing-model"></a>2. Extensions to the Processing Model
       </h1>

=== modified file 'doc/zorba/web_crawler.dox'
--- doc/zorba/web_crawler.dox	2013-02-07 17:24:36 +0000
+++ doc/zorba/web_crawler.dox	2013-08-09 09:26:44 +0000
@@ -25,8 +25,8 @@
 Change this variable to point to your website, or a subdirectory on your website.
 
 \code
-declare variable $top-uri  as xs:string := "http://www.zorba-xquery.com/html/index/";;
-declare variable $uri-host as xs:string := "http://www.zorba-xquery.com";;
+declare variable $top-uri  as xs:string := "http://zorba.io/";;
+declare variable $uri-host as xs:string := "http://zorba.io";;
 
 declare function local:is-internal($x as xs:string) as xs:boolean
 {

=== modified file 'doc/zorba/xqddf.dox'
--- doc/zorba/xqddf.dox	2013-08-07 05:28:39 +0000
+++ doc/zorba/xqddf.dox	2013-08-09 09:26:44 +0000
@@ -143,7 +143,7 @@
 
   import schema namespace news-schemas = "http://www.news.org/schemas";;
 
-  declare namespace an = "http://www.zorba-xquery.com/annotations";;
+  declare namespace an = "http://zorba.io/annotations";;
 
   declare collection news-data:employees as schema-element(news-schema:employee)*;
 
@@ -1031,7 +1031,7 @@
 
   import schema namespace news-schemas = "http://www.news.org/schemas";;
 
-  declare namespace an = "http://www.zorba-xquery.com/annotations";;
+  declare namespace an = "http://zorba.io/annotations";;
 
   declare collection news-data:employees as schema-element(news-schema:employee)*;
 

=== modified file 'doc/zorba/xqdoc/src/xqdoc-html.xq'
--- doc/zorba/xqdoc/src/xqdoc-html.xq	2013-08-06 01:09:07 +0000
+++ doc/zorba/xqdoc/src/xqdoc-html.xq	2013-08-09 09:26:44 +0000
@@ -20,7 +20,7 @@
 import module namespace xqdoc-html  = "http://www.zorba-xquery.com/xqdoc-html"; at "xqdoc-html.xqy";
 
 declare namespace xqd = "http://www.xqdoc.org/1.0";;
-declare namespace z   = "http://www.zorba-xquery.com/manifest";;
+declare namespace z   = "http://zorba.io/manifest";;
 declare namespace xs  = "http://www.w3.org/2001/XMLSchema";;
 
 declare variable $zorbaManifestPath   as xs:string external;

=== modified file 'doc/zorba/xqdoc/src/xqdoc-html.xqy'
--- doc/zorba/xqdoc/src/xqdoc-html.xqy	2013-06-15 16:20:18 +0000
+++ doc/zorba/xqdoc/src/xqdoc-html.xqy	2013-08-09 09:26:44 +0000
@@ -22,7 +22,7 @@
 import module namespace batch = "http://www.zorba-xquery.com/modules/xqdoc/batch";;
 
 declare namespace xqd = "http://www.xqdoc.org/1.0";;
-declare namespace z   = "http://www.zorba-xquery.com/manifest";;
+declare namespace z   = "http://zorba.io/manifest";;
 declare namespace xs  = "http://www.w3.org/2001/XMLSchema";;
 
 declare function xqdoc-html:id($label as xs:string)

=== modified file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqy'
--- doc/zorba/xqdoc/src/zorba_module_dependencies.xqy	2013-06-15 20:57:44 +0000
+++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqy	2013-08-09 09:26:44 +0000
@@ -20,11 +20,11 @@
 
 module namespace z = "http://www.zorba-xquery.com/module-dependencies";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
-declare namespace zm = "http://www.zorba-xquery.com/manifest";;
+declare namespace an = "http://zorba.io/annotations";;
+declare namespace zm = "http://zorba.io/manifest";;
 
 import module namespace file        = "http://expath.org/ns/file";;
-import module namespace functx      = "http://www.functx.com/";;
+import module namespace functx      = "http://www.functx.com";;
 
 import module namespace dot   = "http://www.zorba-xquery.com/modules/image/graphviz";;
 import module namespace xqd   = "http://www.zorba-xquery.com/modules/xqdoc";;

=== modified file 'include/zorba/static_context.h'
--- include/zorba/static_context.h	2013-06-12 04:55:14 +0000
+++ include/zorba/static_context.h	2013-08-09 09:26:44 +0000
@@ -160,12 +160,12 @@
   /** \brief Adds a collation URI.
    *
    * The URI specifies the locale and collation strength of the collation that is added.
-   * A valid collation URI must begin with %http://www.zorba-xquery.com/collations/.
+   * A valid collation URI must begin with %http://zorba.io/collations/.
    * This prefix is followed by a collation strength (i.e. PRIMARY, SECONDARY, TERTIARY,
    * QUATTERNARY, or IDENTICAL) followed by a '/'.
    * After the strength a lower-case two- or three-letter ISO-639 language code must follow.
    * The URI may end with an upper-case two-letter ISO-3166.
-   * For example, %http://www.zorba-xquery.com/collations/PRIMARY/en/US
+   * For example, %http://zorba.io/collations/PRIMARY/en/US
    * specifies an english language with US begin the country..
    *
    * Internally, ICU is used for comparing strings. For detailed description see

=== modified file 'modules/atomic/base64.xq'
--- modules/atomic/base64.xq	2013-08-07 05:28:39 +0000
+++ modules/atomic/base64.xq	2013-08-09 09:26:44 +0000
@@ -27,7 +27,7 @@
 
 declare namespace zerr = "http://zorba.io/errors";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 (:~

=== modified file 'modules/atomic/math.xq'
--- modules/atomic/math.xq	2013-07-17 09:15:53 +0000
+++ modules/atomic/math.xq	2013-08-09 09:26:44 +0000
@@ -29,7 +29,7 @@
 :)
 declare namespace W3Cmath = "http://www.w3.org/2005/xpath-functions/math";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 declare %private variable $math:errNS as string := "http://zorba.io/modules/math";;

=== modified file 'modules/atomic/random.xq'
--- modules/atomic/random.xq	2013-08-07 05:28:39 +0000
+++ modules/atomic/random.xq	2013-08-09 09:26:44 +0000
@@ -26,10 +26,10 @@
  :)
 module namespace r = "http://zorba.io/modules/random";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 declare namespace zerr = "http://zorba.io/errors";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 declare %private variable $r:errNS as string := "http://zorba.io/modules/random";;

=== modified file 'modules/atomic/string.xq'
--- modules/atomic/string.xq	2013-07-26 18:53:36 +0000
+++ modules/atomic/string.xq	2013-08-09 09:26:44 +0000
@@ -28,7 +28,7 @@
  :
  :)
 module namespace string = "http://zorba.io/modules/string";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/datetime.xq'
--- modules/com/zorba-xquery/www/modules/datetime.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/datetime.xq	2013-08-09 09:26:44 +0000
@@ -54,10 +54,10 @@
  :)
 module namespace datetime = "http://www.zorba-xquery.com/modules/datetime";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 declare namespace zerr = "http://zorba.io/errors";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/debugger/dbgp-message-handler.xq'
--- modules/com/zorba-xquery/www/modules/debugger/dbgp-message-handler.xq	2013-07-17 07:20:31 +0000
+++ modules/com/zorba-xquery/www/modules/debugger/dbgp-message-handler.xq	2013-08-09 09:26:44 +0000
@@ -26,7 +26,7 @@
 
 import module namespace base64 = "http://zorba.io/modules/base64";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/fetch.xq'
--- modules/com/zorba-xquery/www/modules/fetch.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/fetch.xq	2013-08-09 09:26:44 +0000
@@ -31,11 +31,11 @@
  :)
 module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare namespace zerr = "http://zorba.io/errors";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.1";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/introspection/sctx.xq'
--- modules/com/zorba-xquery/www/modules/introspection/sctx.xq	2013-06-15 20:57:44 +0000
+++ modules/com/zorba-xquery/www/modules/introspection/sctx.xq	2013-08-09 09:26:44 +0000
@@ -28,7 +28,7 @@
 
 module namespace sctx = "http://www.zorba-xquery.com/modules/introspection/sctx";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/item.xq'
--- modules/com/zorba-xquery/www/modules/item.xq	2013-06-15 20:57:44 +0000
+++ modules/com/zorba-xquery/www/modules/item.xq	2013-08-09 09:26:44 +0000
@@ -26,7 +26,7 @@
  :)
 module namespace item = "http://www.zorba-xquery.com/modules/item";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/node.xq'
--- modules/com/zorba-xquery/www/modules/node.xq	2013-06-15 16:20:18 +0000
+++ modules/com/zorba-xquery/www/modules/node.xq	2013-08-09 09:26:44 +0000
@@ -31,7 +31,7 @@
  :)
 module namespace node = "http://www.zorba-xquery.com/modules/node";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/reflection.xq'
--- modules/com/zorba-xquery/www/modules/reflection.xq	2013-06-15 16:20:18 +0000
+++ modules/com/zorba-xquery/www/modules/reflection.xq	2013-08-09 09:26:44 +0000
@@ -29,11 +29,11 @@
 
 module namespace reflection = "http://www.zorba-xquery.com/modules/reflection";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/schema.xq'
--- modules/com/zorba-xquery/www/modules/schema.xq	2013-06-15 20:57:44 +0000
+++ modules/com/zorba-xquery/www/modules/schema.xq	2013-08-09 09:26:44 +0000
@@ -25,7 +25,7 @@
  :
  :)
 module namespace schema = "http://www.zorba-xquery.com/modules/schema";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map.xq'
--- modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map.xq	2013-08-09 09:26:44 +0000
@@ -42,9 +42,9 @@
 
 declare namespace zerr = "http://zorba.io/errors";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/store/documents/dynamic.xq'
--- modules/com/zorba-xquery/www/modules/store/documents/dynamic.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/documents/dynamic.xq	2013-08-09 09:26:44 +0000
@@ -35,7 +35,7 @@
 
 declare namespace zerr = "http://zorba.io/errors";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/ddl.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/ddl.xq	2013-08-09 09:26:44 +0000
@@ -36,7 +36,7 @@
 module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 
 declare namespace zerr = "http://zorba.io/errors";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq	2013-08-09 09:26:44 +0000
@@ -35,9 +35,9 @@
 module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
 declare namespace zerr = "http://zorba.io/errors";;
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl.xq	2013-08-09 09:26:44 +0000
@@ -41,7 +41,7 @@
 import module namespace qddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 
 declare namespace zerr = "http://zorba.io/errors";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq	2013-08-09 09:26:44 +0000
@@ -43,9 +43,9 @@
 import module namespace qdml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
 declare namespace zerr = "http://zorba.io/errors";;
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq	2013-08-09 09:26:44 +0000
@@ -44,7 +44,7 @@
 module namespace cddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 
 declare namespace zerr = "http://zorba.io/errors";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq	2013-08-09 09:26:44 +0000
@@ -42,10 +42,10 @@
  :)
 module namespace cdml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 declare namespace zerr = "http://zorba.io/errors";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/indexes/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/static/indexes/ddl.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/indexes/ddl.xq	2013-08-09 09:26:44 +0000
@@ -43,7 +43,7 @@
 module namespace iddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 
 declare namespace zerr = "http://zorba.io/errors";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq	2013-08-09 09:26:44 +0000
@@ -43,9 +43,9 @@
 module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
 declare namespace zerr = "http://zorba.io/errors";;
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 
 declare option ver:module-version "2.0";
 

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl.xq	2013-08-09 09:26:44 +0000
@@ -44,7 +44,7 @@
 module namespace icddl = "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl";;
 
 declare namespace zerr = "http://zorba.io/errors";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml.xq	2013-08-09 09:26:44 +0000
@@ -42,7 +42,7 @@
 module namespace icdml = "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml";;
 
 declare namespace zerr = "http://zorba.io/errors";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/uri.xq'
--- modules/com/zorba-xquery/www/modules/uri.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/uri.xq	2013-08-09 09:26:44 +0000
@@ -26,7 +26,7 @@
 module namespace uri = "http://www.zorba-xquery.com/modules/uri";;
 
 declare namespace zerr = "http://zorba.io/errors";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 (:~

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc.xq	2013-08-07 05:28:39 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc.xq	2013-08-09 09:26:44 +0000
@@ -67,8 +67,8 @@
 import schema namespace opt =
   "http://www.zorba-xquery.com/modules/xqdoc-options";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace an = "http://zorba.io/annotations";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 declare namespace zerr = "http://zorba.io/errors";;

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc/batch.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc/batch.xq	2013-08-06 14:15:41 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc/batch.xq	2013-08-09 09:26:44 +0000
@@ -26,7 +26,7 @@
  :)
 module namespace batch = "http://www.zorba-xquery.com/modules/xqdoc/batch";;
 
-import module namespace functx = "http://www.functx.com/";;
+import module namespace functx = "http://www.functx.com";;
 
 import module namespace file = "http://expath.org/ns/file";;
 
@@ -34,13 +34,13 @@
 import module namespace menu  = "http://www.zorba-xquery.com/modules/xqdoc/menu";;
 import module namespace html  = "http://www.zorba-xquery.com/modules/xqdoc/html";;
 
-declare namespace an   = "http://www.zorba-xquery.com/annotations";;
+declare namespace an   = "http://zorba.io/annotations";;
 declare namespace out  = "http://www.w3.org/2010/xslt-xquery-serialization";;
 declare namespace xq   = "http://www.xqdoc.org/1.0";;
 declare namespace h    = "http://www.w3.org/1999/xhtml";;
 declare namespace err  = "http://www.w3.org/2005/xqt-errors";; 
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~
@@ -54,7 +54,7 @@
  : @param $modules Document describing the documentation project. For instance:
  : <pre class="ace-static" ace-mode="xml">
  : <modules>
- :  <namespace prefix="ann" uri="http://www.zorba-xquery.com/annotations"; />
+ :  <namespace prefix="ann" uri="http://zorba.io/annotations"; />
  :  <section id="modules" label="My Modules">
  :  <!-- Location hints are optionnals -->
  :    <module ns="http://example.com/mymodule"; label="My Module" id="module" file="module.xq" />

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc/html.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc/html.xq	2013-07-12 10:40:11 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc/html.xq	2013-08-09 09:26:44 +0000
@@ -38,7 +38,7 @@
 
 declare copy-namespaces no-preserve, inherit;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 declare %private variable $html:empty-tags-to-delete := ("tt");
@@ -478,25 +478,25 @@
 declare %private function html:is-function-nondeterministic($function as element(xq:function))
 as xs:boolean
 {
-  exists($function//xq:annotation[@namespace = "http://www.zorba-xquery.com/annotations"; and @localname = "nondeterministic"]) 
+  exists($function//xq:annotation[@namespace = "http://zorba.io/annotations"; and @localname = "nondeterministic"]) 
 };
 
 declare %private function html:is-function-streamable($function as element(xq:function))
 as xs:boolean
 {
-  exists($function//xq:annotation[@namespace = "http://www.zorba-xquery.com/annotations"; and @localname = "streamable"]) 
+  exists($function//xq:annotation[@namespace = "http://zorba.io/annotations"; and @localname = "streamable"]) 
 };
 
 declare %private function html:is-function-variadic($function as element(xq:function))
 as xs:boolean
 {
-  exists($function//xq:annotation[@namespace = "http://www.zorba-xquery.com/annotations"; and @localname = "variadic"]) 
+  exists($function//xq:annotation[@namespace = "http://zorba.io/annotations"; and @localname = "variadic"]) 
 };
 
 declare %private function html:is-function-sequential($function as element(xq:function))
 as xs:boolean
 {
-  exists($function//xq:annotation[@namespace = "http://www.zorba-xquery.com/annotations"; and @localname = "sequential"]) 
+  exists($function//xq:annotation[@namespace = "http://zorba.io/annotations"; and @localname = "sequential"]) 
 };
 
 declare %private function html:is-function-external($function as element(xq:function))

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc/menu.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc/menu.xq	2013-06-15 16:20:18 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc/menu.xq	2013-08-09 09:26:44 +0000
@@ -6,7 +6,7 @@
  :)
 module namespace menu = "http://www.zorba-xquery.com/modules/xqdoc/menu";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 declare variable $menu:not-found as xs:QName := xs:QName('menu:not-found');

=== modified file 'modules/full-text/full-text.xq'
--- modules/full-text/full-text.xq	2013-08-07 05:28:39 +0000
+++ modules/full-text/full-text.xq	2013-08-09 09:26:44 +0000
@@ -338,7 +338,7 @@
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 declare namespace zerr = "http://zorba.io/errors";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 (:===========================================================================:)

=== modified file 'modules/functx/CMakeLists.txt'
--- modules/functx/CMakeLists.txt	2013-02-07 17:24:36 +0000
+++ modules/functx/CMakeLists.txt	2013-08-09 09:26:44 +0000
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DECLARE_ZORBA_MODULE(FILE functx.xq URI "http://www.functx.com/";)
+DECLARE_ZORBA_MODULE(FILE functx.xq URI "http://www.functx.com";)

=== modified file 'modules/functx/functx.xq'
--- modules/functx/functx.xq	2013-06-15 20:57:44 +0000
+++ modules/functx/functx.xq	2013-08-09 09:26:44 +0000
@@ -27,7 +27,7 @@
  : @see     http://www.xqueryfunctions.com
  : @project FunctX
  :) 
-module namespace  functx = "http://www.functx.com/"; ;
+module namespace  functx = "http://www.functx.com"; ;
 
 (:~
  : Adds attributes to XML elements 

=== modified file 'modules/http-client/conv/http-client-wrapper.xq'
--- modules/http-client/conv/http-client-wrapper.xq	2013-07-25 14:47:04 +0000
+++ modules/http-client/conv/http-client-wrapper.xq	2013-08-09 09:26:44 +0000
@@ -42,8 +42,8 @@
 
 import schema namespace http-schema = "http://expath.org/ns/http-client";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace an = "http://zorba.io/annotations";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 declare namespace ser  = "http://www.w3.org/2010/xslt-xquery-serialization";;
 declare namespace jn = "http://jsoniq.org/functions";;

=== modified file 'modules/http-client/json/http-client.xq'
--- modules/http-client/json/http-client.xq	2013-07-24 07:21:59 +0000
+++ modules/http-client/json/http-client.xq	2013-08-09 09:26:44 +0000
@@ -187,8 +187,8 @@
 
 import module namespace libjn = "http://jsoniq.org/function-library";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace an = "http://zorba.io/annotations";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
 declare option ver:module-version "1.0";

=== modified file 'modules/http-client/xml/http-client.xq'
--- modules/http-client/xml/http-client.xq	2013-07-25 14:47:04 +0000
+++ modules/http-client/xml/http-client.xq	2013-08-09 09:26:44 +0000
@@ -256,8 +256,8 @@
 
 import schema namespace http-schema = "http://expath.org/ns/http-client";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace an = "http://zorba.io/annotations";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 declare namespace ser  = "http://www.w3.org/2010/xslt-xquery-serialization";;
 declare namespace jn = "http://jsoniq.org/functions";;

=== modified file 'modules/json/json-xml.xq'
--- modules/json/json-xml.xq	2013-08-08 03:32:36 +0000
+++ modules/json/json-xml.xq	2013-08-09 09:26:44 +0000
@@ -98,7 +98,7 @@
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 declare namespace zerr = "http://zorba.io/errors";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 (:~

=== modified file 'modules/org/expath/ns/file.xq'
--- modules/org/expath/ns/file.xq	2013-08-08 17:07:14 +0000
+++ modules/org/expath/ns/file.xq	2013-08-09 09:26:44 +0000
@@ -24,8 +24,8 @@
  :)
 module namespace file = "http://expath.org/ns/file";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace an = "http://zorba.io/annotations";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/org/jsoniq/www/function-library.xq'
--- modules/org/jsoniq/www/function-library.xq	2013-06-15 20:57:44 +0000
+++ modules/org/jsoniq/www/function-library.xq	2013-08-09 09:26:44 +0000
@@ -33,7 +33,7 @@
 
 import module namespace jn = "http://jsoniq.org/functions";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 (:~

=== modified file 'modules/org/jsoniq/www/functions.xq'
--- modules/org/jsoniq/www/functions.xq	2013-06-19 14:19:40 +0000
+++ modules/org/jsoniq/www/functions.xq	2013-08-09 09:26:44 +0000
@@ -37,7 +37,7 @@
 declare namespace jerr = "http://jsoniq.org/errors";;
 declare namespace js = "http://jsoniq.org/types";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 

=== modified file 'modules/structured-items/node-position.xq'
--- modules/structured-items/node-position.xq	2013-07-09 07:43:26 +0000
+++ modules/structured-items/node-position.xq	2013-08-09 09:26:44 +0000
@@ -32,7 +32,7 @@
  :)
 module namespace np = "http://zorba.io/modules/node-position";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~

=== modified file 'modules/structured-items/reference.xq'
--- modules/structured-items/reference.xq	2013-08-07 05:28:39 +0000
+++ modules/structured-items/reference.xq	2013-08-09 09:26:44 +0000
@@ -40,7 +40,7 @@
 
 declare namespace zerr = "http://zorba.io/errors";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 
 declare option ver:module-version "1.0";
 

=== modified file 'modules/xml/xml.xq'
--- modules/xml/xml.xq	2013-08-07 23:46:25 +0000
+++ modules/xml/xml.xq	2013-08-09 09:26:44 +0000
@@ -76,7 +76,7 @@
 declare namespace zerr = "http://zorba.io/errors";;
 declare namespace err = "http://www.w3.org/xqt-errors";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 

=== modified file 'modules/xqxq/xqxq.xq'
--- modules/xqxq/xqxq.xq	2013-06-15 20:57:44 +0000
+++ modules/xqxq/xqxq.xq	2013-08-09 09:26:44 +0000
@@ -25,10 +25,10 @@
  :)
 module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
-declare namespace op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+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";
 

=== modified file 'scripts/check_apache_license.xq'
--- scripts/check_apache_license.xq	2013-02-07 17:24:36 +0000
+++ scripts/check_apache_license.xq	2013-08-09 09:26:44 +0000
@@ -15,10 +15,10 @@
 :)
 
 import module namespace file = "http://expath.org/ns/file";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-declare namespace notice = "http://www.zorba-xquery.com/notice";;
-declare namespace opt = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+declare namespace ann = "http://zorba.io/annotations";;
+declare namespace notice = "http://zorba.io/notice";;
+declare namespace opt = "http://zorba.io/options/features";;
+declare namespace f = "http://zorba.io/features";;
 
 declare variable $path-to-zorba as xs:string external; (:PROJECT_SOURCE_DIR:)
 declare variable $path-to-modules as xs:string external; (:ZORBA_MODULES_DIR:)

=== modified file 'scripts/notice-generator.xq.in'
--- scripts/notice-generator.xq.in	2013-08-02 04:03:36 +0000
+++ scripts/notice-generator.xq.in	2013-08-09 09:26:44 +0000
@@ -15,8 +15,8 @@
 :)
 
 import module namespace file = "http://expath.org/ns/file";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-declare namespace notice = "http://www.zorba-xquery.com/notice";;
+declare namespace ann = "http://zorba.io/annotations";;
+declare namespace notice = "http://zorba.io/notice";;
 
 declare variable $local:path-to-zorba := "${PROJECT_SOURCE_DIR}"; 
 declare variable $local:zorba-version := "${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}";

=== modified file 'scripts/sanity_checks/conformance_xqftts.xqi'
--- scripts/sanity_checks/conformance_xqftts.xqi	2013-02-07 17:24:36 +0000
+++ scripts/sanity_checks/conformance_xqftts.xqi	2013-08-09 09:26:44 +0000
@@ -19,14 +19,14 @@
 module namespace conf  = "http://www.zorba-xquery.com/modules/conformance";;
 
 import module namespace file = "http://expath.org/ns/file";;
-import module namespace functx = "http://www.functx.com/";;
+import module namespace functx = "http://www.functx.com";;
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 
 import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace xqCat = "http://www.w3.org/2005/02/query-test-full-text";;
 declare namespace xqRes = "http://www.w3.org/2005/02/query-test-XQTSResult";;
 

=== modified file 'scripts/sanity_checks/conformance_xqts.xqi'
--- scripts/sanity_checks/conformance_xqts.xqi	2013-02-07 17:24:36 +0000
+++ scripts/sanity_checks/conformance_xqts.xqi	2013-08-09 09:26:44 +0000
@@ -19,14 +19,14 @@
 module namespace conf  = "http://www.zorba-xquery.com/modules/conformance";;
 
 import module namespace file = "http://expath.org/ns/file";;
-import module namespace functx = "http://www.functx.com/";;
+import module namespace functx = "http://www.functx.com";;
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 
 import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace xqCat = "http://www.w3.org/2005/02/query-test-XQTSCatalog";;
 declare namespace xqRes = "http://www.w3.org/2005/02/query-test-XQTSResult";;
 

=== modified file 'scripts/sanity_checks/conformance_xquts.xqi'
--- scripts/sanity_checks/conformance_xquts.xqi	2013-02-07 17:24:36 +0000
+++ scripts/sanity_checks/conformance_xquts.xqi	2013-08-09 09:26:44 +0000
@@ -19,14 +19,14 @@
 module namespace conf  = "http://www.zorba-xquery.com/modules/conformance";;
 
 import module namespace file = "http://expath.org/ns/file";;
-import module namespace functx = "http://www.functx.com/";;
+import module namespace functx = "http://www.functx.com";;
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 
 import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace xqCat = "http://www.w3.org/2005/02/query-test-update";;
 declare namespace xqRes = "http://www.w3.org/2005/02/query-test-XQTSResult";;
 

=== modified file 'src/context/default_uri_mappers.cpp'
--- src/context/default_uri_mappers.cpp	2013-08-02 21:35:01 +0000
+++ src/context/default_uri_mappers.cpp	2013-08-09 09:26:44 +0000
@@ -68,8 +68,13 @@
   URI lUri(aUri);
   zstring lPath = lUri.get_encoded_path();
   bool lChanged = false;
+  if (lPath.length() == 0) {
+    // If URI has *no* path component (eg. "http://www.functx.com"; with no
+    // trailing slash), provide a path of "/".
+    lPath.append("/");
+  }
   if (ascii::ends_with(lPath, "/")) {
-    // If URI ends with /, append "index.<extension>".
+    // If URI's path component ends with /, append "index.<extension>".
     lPath.append("index");
     lPath.append(lExtension);
     lChanged = true;

=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp	2013-08-06 08:41:26 +0000
+++ src/context/root_static_context.cpp	2013-08-09 09:26:44 +0000
@@ -163,7 +163,7 @@
 
   add_collation(ZORBA_DEF_COLLATION_NS, QueryLoc::null);
   add_collation(W3C_CODEPT_COLLATION_NS, QueryLoc::null);
-  add_collation("http://www.zorba-xquery.com/collations/SECONDARY/en/EN";, QueryLoc::null);
+  add_collation("http://zorba.io/collations/SECONDARY/en/EN";, QueryLoc::null);
   set_default_collation(W3C_CODEPT_COLLATION_NS, QueryLoc::null);
 
   set_construction_mode(StaticContextConsts::cons_preserve);

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2013-08-07 08:08:22 +0000
+++ src/context/static_context.cpp	2013-08-09 09:26:44 +0000
@@ -440,7 +440,7 @@
 
 const char*
 static_context::ZORBA_UTIL_FN_NS =
-"http://www.zorba-xquery.com/zorba/util-functions";;
+"http://zorba.io/util-functions";;
 
 const char*
 static_context::ZORBA_SCRIPTING_FN_NS =
@@ -488,31 +488,25 @@
   Target namespaces of zorba reserved modules
 ********************************************************************************/
 const char*
-static_context::XQUERY_OP_NS =
-"http://www.zorba-xquery.com/internal/xquery-ops";;
+static_context::XQUERY_OP_NS = "http://zorba.io/internal/xquery-ops";;
 
 const char*
-static_context::ZORBA_OP_NS =
-"http://www.zorba-xquery.com/internal/zorba-ops";;
+static_context::ZORBA_OP_NS = "http://zorba.io/internal/zorba-ops";;
 
 /***************************************************************************//**
   Options-related namespaces
 ********************************************************************************/
 const char*
-static_context::ZORBA_OPTIONS_NS =
-"http://www.zorba-xquery.com/options";;
-
-const char*
-static_context::ZORBA_OPTION_WARN_NS =
-"http://www.zorba-xquery.com/options/warnings";;
-
-const char*
-static_context::ZORBA_OPTION_FEATURE_NS =
-"http://www.zorba-xquery.com/options/features";;
-
-const char*
-static_context::ZORBA_OPTION_OPTIM_NS =
-"http://www.zorba-xquery.com/options/optimizer";;
+static_context::ZORBA_OPTIONS_NS = "http://zorba.io/options";;
+
+const char*
+static_context::ZORBA_OPTION_WARN_NS = "http://zorba.io/options/warnings";;
+
+const char*
+static_context::ZORBA_OPTION_FEATURE_NS = "http://zorba.io/options/features";;
+
+const char*
+static_context::ZORBA_OPTION_OPTIM_NS = "http://zorba.io/options/optimizer";;
 
 const char*
 static_context::XQUERY_NS =
@@ -524,7 +518,7 @@
 
 const char*
 static_context::ZORBA_VERSIONING_NS =
-"http://www.zorba-xquery.com/options/versioning";;
+"http://zorba.io/options/versioning";;
 
 
 /***************************************************************************//**

=== modified file 'src/functions/func_var_decl.cpp'
--- src/functions/func_var_decl.cpp	2013-05-03 14:31:19 +0000
+++ src/functions/func_var_decl.cpp	2013-08-09 09:26:44 +0000
@@ -87,7 +87,7 @@
   util:context-item()
   
   This library also contains the declaration of the ZORBA_UTIL_FN_NS 
-  "http://www.zorba-xquery.com/zorba/util-functions"; context-item() function,
+  "http://zorba.io/util-functions"; context-item() function,
   which is a placeholder for the "." or "$$" context item accessors, as a 
   universal and language-neutral (XQuery and JSONiq) function.   
 ********************************************************************************/  

=== modified file 'src/functions/pregenerated/func_booleans.cpp'
--- src/functions/pregenerated/func_booleans.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_booleans.cpp	2013-08-09 09:26:44 +0000
@@ -67,7 +67,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_is_same_node,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","is-same-node";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","is-same-node";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_QUESTION),
@@ -80,7 +80,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_node_before,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","node-before";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","node-before";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_QUESTION),
@@ -93,7 +93,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_node_after,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","node-after";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","node-after";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_QUESTION),

=== modified file 'src/functions/pregenerated/func_fn_hof_functions.cpp'
--- src/functions/pregenerated/func_fn_hof_functions.cpp	2013-06-04 21:47:40 +0000
+++ src/functions/pregenerated/func_fn_hof_functions.cpp	2013-08-09 09:26:44 +0000
@@ -84,7 +84,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_function_lookup_3_0,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","function-lookup";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","function-lookup";), 
         GENV_TYPESYSTEM.QNAME_TYPE_ONE, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
         GENV_TYPESYSTEM.ITEM_TYPE_QUESTION, 

=== modified file 'src/functions/pregenerated/func_jsoniq_functions.cpp'
--- src/functions/pregenerated/func_jsoniq_functions.cpp	2013-06-08 05:33:57 +0000
+++ src/functions/pregenerated/func_jsoniq_functions.cpp	2013-08-09 09:26:44 +0000
@@ -318,7 +318,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_json_item_accessor,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","json-item-accessor";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","json-item-accessor";), 
         GENV_TYPESYSTEM.ITEM_TYPE_ONE, 
         GENV_TYPESYSTEM.ITEM_TYPE_STAR),
         FunctionConsts::OP_ZORBA_JSON_ITEM_ACCESSOR_1);
@@ -330,7 +330,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_json_item_accessor,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","json-item-accessor";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","json-item-accessor";), 
         GENV_TYPESYSTEM.ITEM_TYPE_ONE, 
         GENV_TYPESYSTEM.ITEM_TYPE_QUESTION, 
         GENV_TYPESYSTEM.ITEM_TYPE_QUESTION),
@@ -355,7 +355,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_keys,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","keys";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","keys";), 
         GENV_TYPESYSTEM.ITEM_TYPE_QUESTION, 
         GENV_TYPESYSTEM.STRING_TYPE_STAR),
         FunctionConsts::OP_ZORBA_KEYS_1);
@@ -418,7 +418,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_members,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","members";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","members";), 
         GENV_TYPESYSTEM.ITEM_TYPE_QUESTION, 
         GENV_TYPESYSTEM.ITEM_TYPE_STAR),
         FunctionConsts::OP_ZORBA_MEMBERS_1);
@@ -477,7 +477,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_json_object_insert,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","json-object-insert";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","json-object-insert";), 
         GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE, 
         GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE, 
         GENV_TYPESYSTEM.EMPTY_TYPE),
@@ -490,7 +490,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_json_array_insert,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","json-array-insert";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","json-array-insert";), 
         GENV_TYPESYSTEM.JSON_ARRAY_TYPE_ONE, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
         GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
@@ -504,7 +504,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_json_delete,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","json-delete";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","json-delete";), 
         GENV_TYPESYSTEM.JSON_ITEM_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_ONE, 
         GENV_TYPESYSTEM.EMPTY_TYPE),
@@ -517,7 +517,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_json_replace_value,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","json-replace-value";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","json-replace-value";), 
         GENV_TYPESYSTEM.JSON_ITEM_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_ONE, 
         GENV_TYPESYSTEM.ITEM_TYPE_ONE, 
@@ -531,7 +531,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_json_rename,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","json-rename";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","json-rename";), 
         GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE, 
         GENV_TYPESYSTEM.STRING_TYPE_ONE, 
         GENV_TYPESYSTEM.STRING_TYPE_ONE, 
@@ -545,7 +545,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_json_array_append,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","json-array-append";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","json-array-append";), 
         GENV_TYPESYSTEM.JSON_ARRAY_TYPE_ONE, 
         GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
         GENV_TYPESYSTEM.EMPTY_TYPE),
@@ -558,7 +558,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_json_box,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","json-box";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","json-box";), 
         GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
         GENV_TYPESYSTEM.ITEM_TYPE_ONE),
         FunctionConsts::OP_ZORBA_JSON_BOX_1);

=== modified file 'src/functions/pregenerated/func_other_diagnostics.cpp'
--- src/functions/pregenerated/func_other_diagnostics.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_other_diagnostics.cpp	2013-08-09 09:26:44 +0000
@@ -57,7 +57,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_read_line,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","read-line";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","read-line";), 
         GENV_TYPESYSTEM.STRING_TYPE_ONE),
         FunctionConsts::OP_ZORBA_READ_LINE_0);
 
@@ -68,7 +68,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_util_print,
-        (createQName("http://www.zorba-xquery.com/zorba/util-functions","","print";), 
+        (createQName("http://zorba.io/util-functions","","print";), 
         GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
         GENV_TYPESYSTEM.EMPTY_TYPE),
         FunctionConsts::FN_ZORBA_UTIL_PRINT_1);

=== modified file 'src/functions/pregenerated/func_qnames.cpp'
--- src/functions/pregenerated/func_qnames.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_qnames.cpp	2013-08-09 09:26:44 +0000
@@ -143,7 +143,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_QName_equal,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","QName-equal";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","QName-equal";), 
         GENV_TYPESYSTEM.QNAME_TYPE_ONE, 
         GENV_TYPESYSTEM.QNAME_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),

=== modified file 'src/functions/pregenerated/func_random.cpp'
--- src/functions/pregenerated/func_random.cpp	2013-07-17 09:01:57 +0000
+++ src/functions/pregenerated/func_random.cpp	2013-08-09 09:26:44 +0000
@@ -92,7 +92,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_util_uuid,
-        (createQName("http://www.zorba-xquery.com/zorba/util-functions","","uuid";), 
+        (createQName("http://zorba.io/util-functions","","uuid";), 
         GENV_TYPESYSTEM.STRING_TYPE_ONE),
         FunctionConsts::FN_ZORBA_UTIL_UUID_0);
 

=== modified file 'src/functions/pregenerated/func_sequences.cpp'
--- src/functions/pregenerated/func_sequences.cpp	2013-03-20 01:19:04 +0000
+++ src/functions/pregenerated/func_sequences.cpp	2013-08-09 09:26:44 +0000
@@ -307,7 +307,7 @@
       {
     std::vector<xqtref_t> lParamTypes;
     lParamTypes.push_back(GENV_TYPESYSTEM.ITEM_TYPE_STAR);DECL_WITH_KIND(sctx, op_concatenate,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","concatenate";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","concatenate";), 
         lParamTypes, GENV_TYPESYSTEM.ITEM_TYPE_STAR, true),
         FunctionConsts::OP_CONCATENATE_N);
 
@@ -460,7 +460,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_subsequence_int,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","subsequence-int";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","subsequence-int";), 
         GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
         GENV_TYPESYSTEM.ITEM_TYPE_STAR),
@@ -473,7 +473,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_subsequence_int,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","subsequence-int";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","subsequence-int";), 
         GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
@@ -487,7 +487,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_zorba_sequence_point_access,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","sequence-point-access";), 
+        (createQName("http://zorba.io/internal/zorba-ops","","sequence-point-access";), 
         GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
         GENV_TYPESYSTEM.ITEM_TYPE_QUESTION),
@@ -600,7 +600,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_sum_double,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_double";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","sum_double";), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_STAR, 
         GENV_TYPESYSTEM.DOUBLE_TYPE_ONE),
         FunctionConsts::OP_SUM_DOUBLE_1);
@@ -612,7 +612,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_sum_double,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_double";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","sum_double";), 
         GENV_TYPESYSTEM.DOUBLE_TYPE_STAR, 
         GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
         GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
@@ -625,7 +625,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_sum_float,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_float";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","sum_float";), 
         GENV_TYPESYSTEM.FLOAT_TYPE_STAR, 
         GENV_TYPESYSTEM.FLOAT_TYPE_ONE),
         FunctionConsts::OP_SUM_FLOAT_1);
@@ -637,7 +637,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_sum_float,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_float";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","sum_float";), 
         GENV_TYPESYSTEM.FLOAT_TYPE_STAR, 
         GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
         GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
@@ -650,7 +650,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_sum_decimal,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_decimal";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","sum_decimal";), 
         GENV_TYPESYSTEM.DECIMAL_TYPE_STAR, 
         GENV_TYPESYSTEM.DECIMAL_TYPE_ONE),
         FunctionConsts::OP_SUM_DECIMAL_1);
@@ -662,7 +662,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_sum_decimal,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_decimal";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","sum_decimal";), 
         GENV_TYPESYSTEM.DECIMAL_TYPE_STAR, 
         GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
         GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
@@ -675,7 +675,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_sum_integer,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_integer";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","sum_integer";), 
         GENV_TYPESYSTEM.INTEGER_TYPE_STAR, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
         FunctionConsts::OP_SUM_INTEGER_1);
@@ -687,7 +687,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_sum_integer,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_integer";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","sum_integer";), 
         GENV_TYPESYSTEM.INTEGER_TYPE_STAR, 
         GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
         GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
@@ -700,7 +700,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_to,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","to";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","to";), 
         GENV_TYPESYSTEM.INTEGER_TYPE_QUESTION, 
         GENV_TYPESYSTEM.INTEGER_TYPE_QUESTION, 
         GENV_TYPESYSTEM.INTEGER_TYPE_STAR),

=== modified file 'src/functions/pregenerated/func_strings.cpp'
--- src/functions/pregenerated/func_strings.cpp	2013-07-11 22:08:29 +0000
+++ src/functions/pregenerated/func_strings.cpp	2013-08-09 09:26:44 +0000
@@ -474,7 +474,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_substring_int,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","substring_int";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","substring_int";), 
         GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
         GENV_TYPESYSTEM.STRING_TYPE_ONE),
@@ -487,7 +487,7 @@
 
       {
     DECL_WITH_KIND(sctx, op_substring_int,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","substring_int";), 
+        (createQName("http://zorba.io/internal/xquery-ops","","substring_int";), 
         GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 

=== modified file 'src/runtime/spec/mappings.xml'
--- src/runtime/spec/mappings.xml	2013-08-07 08:08:22 +0000
+++ src/runtime/spec/mappings.xml	2013-08-09 09:26:44 +0000
@@ -98,19 +98,19 @@
                      define="ZORBA_INTROSPECT_SCTX_FN_NS" 
                      prefix="fn-zorba-introspect-sctx"/>
 
-		<zorba:namespace uri="http://www.zorba-xquery.com/modules/reflection";
+    <zorba:namespace uri="http://www.zorba-xquery.com/modules/reflection";
                      define="ZORBA_REFLECTION_FN_NS" 
                      prefix="fn-zorba-reflection"/>
 
-     <zorba:namespace uri="http://www.zorba-xquery.com/zorba/util-functions";
+    <zorba:namespace uri="http://zorba.io/util-functions";
                       define="ZORBA_UTIL_FN_NS"
                       prefix="fn-zorba-util"/>
 
-		<zorba:namespace uri="http://zorba.io/modules/string";
+    <zorba:namespace uri="http://zorba.io/modules/string";
                      define="ZORBA_STRING_FN_NS" 
                      prefix="fn-zorba-string"/>
 
-		<zorba:namespace uri="http://www.zorba-xquery.com/modules/uri";
+    <zorba:namespace uri="http://www.zorba-xquery.com/modules/uri";
                      define="ZORBA_URI_FN_NS" 
                      prefix="fn-zorba-uri"/>
 
@@ -118,15 +118,15 @@
                      define="ZORBA_JSON_FN_NS" 
                      prefix="fn-zorba-json"/>
 
-		<zorba:namespace uri="http://www.zorba-xquery.com/modules/fetch";
+    <zorba:namespace uri="http://www.zorba-xquery.com/modules/fetch";
                      define="ZORBA_FETCH_FN_NS" 
                      prefix="fn-zorba-fetch"/>
 
-		<zorba:namespace uri="http://www.zorba-xquery.com/modules/node";
+    <zorba:namespace uri="http://www.zorba-xquery.com/modules/node";
                      define="ZORBA_NODE_FN_NS" 
                      prefix="fn-zorba-node"/>
 
-		<zorba:namespace uri="http://www.zorba-xquery.com/modules/item";
+    <zorba:namespace uri="http://www.zorba-xquery.com/modules/item";
                      define="ZORBA_ITEM_FN_NS" 
                      prefix="fn-zorba-item"/>
                      
@@ -134,11 +134,11 @@
                      define="ZORBA_XML_FN_NS" 
                      prefix="fn-zorba-xml"/>
 
-    <zorba:namespace uri="http://www.zorba-xquery.com/internal/xquery-ops";
+    <zorba:namespace uri="http://zorba.io/internal/xquery-ops";
                      define="XQUERY_OP_NS"
                      prefix="op"/>
 
-    <zorba:namespace uri="http://www.zorba-xquery.com/internal/zorba-ops";
+    <zorba:namespace uri="http://zorba.io/internal/zorba-ops";
                      define="ZORBA_OP_NS"
                      prefix="op-zorba"/>
 

=== modified file 'src/runtime/spec/plan_iter_visitor_h.xq'
--- src/runtime/spec/plan_iter_visitor_h.xq	2013-02-07 17:24:36 +0000
+++ src/runtime/spec/plan_iter_visitor_h.xq	2013-08-09 09:26:44 +0000
@@ -15,7 +15,7 @@
 :)
 
 declare namespace zorba = "http://www.zorba-xquery.com";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 import module namespace gen = "http://www.zorba-xquery.com/internal/gen"; at "utils.xq";
 import module namespace file = "http://expath.org/ns/file";;

=== modified file 'src/runtime/spec/printer_visitor_cpp.xq'
--- src/runtime/spec/printer_visitor_cpp.xq	2013-08-02 21:35:01 +0000
+++ src/runtime/spec/printer_visitor_cpp.xq	2013-08-09 09:26:44 +0000
@@ -15,7 +15,7 @@
 :)
 
 declare namespace zorba = "http://www.zorba-xquery.com";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 import module namespace gen = "http://www.zorba-xquery.com/internal/gen"; at "utils.xq";
 import module namespace file = "http://expath.org/ns/file";;

=== modified file 'src/runtime/spec/printer_visitor_h.xq'
--- src/runtime/spec/printer_visitor_h.xq	2013-02-07 17:24:36 +0000
+++ src/runtime/spec/printer_visitor_h.xq	2013-08-09 09:26:44 +0000
@@ -15,7 +15,7 @@
 :)
 
 declare namespace zorba = "http://www.zorba-xquery.com";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 import module namespace gen = "http://www.zorba-xquery.com/internal/gen"; at "utils.xq";
 import module namespace file = "http://expath.org/ns/file";;

=== modified file 'src/zorbamisc/ns_consts.h'
--- src/zorbamisc/ns_consts.h	2013-08-07 05:28:39 +0000
+++ src/zorbamisc/ns_consts.h	2013-08-09 09:26:44 +0000
@@ -40,18 +40,15 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#define ZORBA_NS                "http://www.zorba-xquery.com/";
-#define ZORBA_MODULES_NS        "http://zorba.io/modules/";
+#define ZORBA_NS_BASE           "http://zorba.io/";
+#define ZORBA_COLLATION_NS_BASE ZORBA_NS_BASE "collations/"
 
 #define ZORBA_DEF_COLLATION_NS  ZORBA_COLLATION_NS_BASE "IDENTICAL/en/US"
-
-#define ZORBA_ERR_NS            "http://zorba.io/errors";
-#define ZORBA_WARN_NS           "http://zorba.io/warnings";
-
-#define ZORBA_FEATURES_NS       ZORBA_NS "features"
-#define ZORBA_ANNOTATIONS_NS    ZORBA_NS "annotations"
-#define ZORBA_COLLATION_NS_BASE ZORBA_NS "collations/"
-#define ZORBA_EXTENSIONS_NS     ZORBA_NS "extensions"
+#define ZORBA_ERR_NS            ZORBA_NS_BASE "errors"
+#define ZORBA_WARN_NS           ZORBA_NS_BASE "warnings"
+#define ZORBA_FEATURES_NS       ZORBA_NS_BASE "features"
+#define ZORBA_ANNOTATIONS_NS    ZORBA_NS_BASE "annotations"
+#define ZORBA_EXTENSIONS_NS     ZORBA_NS_BASE "extensions"
 
 // TODO these probably should not be in "ns_consts"
 #define ZORBA_OPTION_ENABLE_DTD "enable-dtd"

=== modified file 'src/zorbatypes/collation_manager.h'
--- src/zorbatypes/collation_manager.h	2013-02-07 17:24:36 +0000
+++ src/zorbatypes/collation_manager.h	2013-08-09 09:26:44 +0000
@@ -71,12 +71,12 @@
    * The URI specifies the locale and collation strengh that is used.
    *
    * The uri must begin with
-   * http://www.zorba-xquery.com/collations/.
+   * http://zorba.io/collations/.
    * Then a collation strengh (PRIMARY, SECONDARY, TERTIARY, QUATTERNARY,
    * or IDENTICAL followed by a '/'.
    * Then a lowercase two-letter or three-letter ISO-639 code
    * followed by '/' and an optional uppercase two-letter ISO-3166 code.
-   * For example, http://www.zorba-xquery.com/collations/PRIMARY/en/US
+   * For example, http://zorba.io/collations/PRIMARY/en/US
    * specifies an english language with US begin the country..
    *
    * For a detailed description see

=== modified file 'swig/StaticContext.h'
--- swig/StaticContext.h	2013-02-07 17:24:36 +0000
+++ swig/StaticContext.h	2013-08-09 09:26:44 +0000
@@ -91,12 +91,12 @@
   /** \brief Adds a collation URI.
    *
    * The URI specifies the locale and collation strength of the collation that is added.
-   * A valid collation URI must begin with %http://www.zorba-xquery.com/collations/.
+   * A valid collation URI must begin with %http://zorba.io/collations/.
    * This prefix is followed by a collation strength (i.e. PRIMARY, SECONDARY, TERTIARY,
    * QUATTERNARY, or IDENTICAL) followed by a '/'.
    * After the strength a lower-case two- or three-letter ISO-639 language code must follow.
    * The URI may end with an upper-case two-letter ISO-3166.
-   * For example, %http://www.zorba-xquery.com/collations/PRIMARY/en/US
+   * For example, %http://zorba.io/collations/PRIMARY/en/US
    * specifies an english language with US begin the country..
    *
    * Internally, ICU is used for comparing strings. For detailed description see

=== modified file 'swig/xqj/managers/module2.xq'
--- swig/xqj/managers/module2.xq	2012-04-28 06:29:50 +0000
+++ swig/xqj/managers/module2.xq	2013-08-09 09:26:44 +0000
@@ -20,7 +20,7 @@
 
 import module namespace mod3 = "http://www.mod3.com/"; at "file:///${CMAKE_CURRENT_BINARY_DIR}/managers/module3.xq";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:ordered collection mod2:coll as node()*;
 

=== modified file 'swig/xqj/managers/module3.xq'
--- swig/xqj/managers/module3.xq	2012-04-28 06:17:35 +0000
+++ swig/xqj/managers/module3.xq	2013-08-09 09:26:44 +0000
@@ -16,7 +16,7 @@
 
 module namespace mod3 = "http://www.mod3.com/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:ordered %ann:append-only collection mod3:coll as node()*;
 

=== modified file 'test/driver/testdriver.cpp'
--- test/driver/testdriver.cpp	2013-07-31 17:16:23 +0000
+++ test/driver/testdriver.cpp	2013-08-09 09:26:44 +0000
@@ -197,10 +197,10 @@
 
       zorba::Item lEnable
         = engine->getItemFactory()->createQName(
-            "http://www.zorba-xquery.com/options/features";, "", "enable");
+            "http://zorba.io/options/features";, "", "enable");
       zorba::Item lDisable
         = engine->getItemFactory()->createQName(
-            "http://www.zorba-xquery.com/options/features";, "", "disable");
+            "http://zorba.io/options/features";, "", "disable");
       lContext->declareOption(lDisable, "scripting");
     }
 

=== modified file 'test/driver/testdriver_common.cpp'
--- test/driver/testdriver_common.cpp	2013-08-06 08:41:26 +0000
+++ test/driver/testdriver_common.cpp	2013-08-09 09:26:44 +0000
@@ -544,7 +544,7 @@
   if ( spec.getEnableDtd() )
   {
     zorba::Item lQName = driverCtx.theEngine->getItemFactory()->
-    createQName("http://www.zorba-xquery.com/options/features";, "", "enable");
+    createQName("http://zorba.io/options/features";, "", "enable");
 
     sctx->declareOption(lQName, "dtd");
   }

=== modified file 'test/driver/testdriver_mt.cpp'
--- test/driver/testdriver_mt.cpp	2013-07-31 17:16:23 +0000
+++ test/driver/testdriver_mt.cpp	2013-08-09 09:26:44 +0000
@@ -573,7 +573,7 @@
       sctx->setXQueryVersion(zorba::xquery_version_1_0);
 
       zorba::Item lDisable = zorba->getItemFactory()->
-      createQName("http://www.zorba-xquery.com/options/features";, "", "disable");
+      createQName("http://zorba.io/options/features";, "", "disable");
 
       sctx->declareOption(lDisable, "scripting");
       sctx->setTraceStream(queries->theOutput);

=== modified file 'test/driver/updtestdriver.cpp'
--- test/driver/updtestdriver.cpp	2013-08-06 08:41:26 +0000
+++ test/driver/updtestdriver.cpp	2013-08-09 09:26:44 +0000
@@ -325,10 +325,10 @@
         lContext->registerURIMapper( smapper.get() );
 
         zorba::Item lEnable = engine->getItemFactory()->
-        createQName("http://www.zorba-xquery.com/options/features";, "", "enable");
+        createQName("http://zorba.io/options/features";, "", "enable");
 
         zorba::Item lDisable = engine->getItemFactory()->
-        createQName("http://www.zorba-xquery.com/options/features";, "", "disable");
+        createQName("http://zorba.io/options/features";, "", "disable");
 
         lContext->declareOption(lDisable, "scripting");
 #if 1

=== modified file 'test/extern/nondeterm-1.xq'
--- test/extern/nondeterm-1.xq	2013-02-07 17:24:36 +0000
+++ test/extern/nondeterm-1.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace extern="urn:extern";
 declare %ann:nondeterministic function extern:nondeterm() external;
 

=== modified file 'test/extern/nondeterm-2.xq'
--- test/extern/nondeterm-2.xq	2013-02-07 17:24:36 +0000
+++ test/extern/nondeterm-2.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace extern="urn:extern";
 declare %ann:nondeterministic function extern:nondeterm() external;
 

=== modified file 'test/extern/nondeterm-3.xq'
--- test/extern/nondeterm-3.xq	2013-02-07 17:24:36 +0000
+++ test/extern/nondeterm-3.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace extern = "urn:extern";
 declare %ann:nondeterministic function extern:nondeterm() external;
 

=== modified file 'test/extern/nondeterm-4.xq'
--- test/extern/nondeterm-4.xq	2013-02-07 17:24:36 +0000
+++ test/extern/nondeterm-4.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace extern="urn:extern";
 declare %ann:nondeterministic function extern:nondeterm() external;
 

=== modified file 'test/extern/nondeterm-5.xq'
--- test/extern/nondeterm-5.xq	2013-02-07 17:24:36 +0000
+++ test/extern/nondeterm-5.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace extern = "urn:extern";
 declare %ann:nondeterministic function extern:nondeterm() external;
 

=== modified file 'test/extern/nondeterm-6.xq'
--- test/extern/nondeterm-6.xq	2013-02-07 17:24:36 +0000
+++ test/extern/nondeterm-6.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace extern = "urn:extern";
 declare %ann:nondeterministic function extern:nondeterm() external;
 

=== modified file 'test/extern/nondeterm-7.xq'
--- test/extern/nondeterm-7.xq	2013-02-07 17:24:36 +0000
+++ test/extern/nondeterm-7.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace extern="urn:extern";
 declare %ann:nondeterministic function extern:nondeterm() external;
 

=== modified file 'test/extern/nondeterm-8.xq'
--- test/extern/nondeterm-8.xq	2013-02-07 17:24:36 +0000
+++ test/extern/nondeterm-8.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace extern="urn:extern";
 declare %ann:nondeterministic function extern:nondeterm() external;
 

=== modified file 'test/extern/nondeterm-9.xq'
--- test/extern/nondeterm-9.xq	2013-02-07 17:24:36 +0000
+++ test/extern/nondeterm-9.xq	2013-08-09 09:26:44 +0000
@@ -14,7 +14,7 @@
  : limitations under the License.
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace extern = "urn:extern";
 declare %ann:nondeterministic function extern:nondeterm() external;
 

=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq	2013-08-05 16:13:27 +0000
+++ test/fots_driver/environment.xq	2013-08-09 09:26:44 +0000
@@ -32,7 +32,7 @@
   "http://www.w3.org/2010/09/qt-fots-catalog";;
 
 declare namespace ann =
-  "http://www.zorba-xquery.com/annotations";;
+  "http://zorba.io/annotations";;
 
 
 (:~

=== modified file 'test/fots_driver/evaluate.xq'
--- test/fots_driver/evaluate.xq	2013-07-24 09:17:59 +0000
+++ test/fots_driver/evaluate.xq	2013-08-09 09:26:44 +0000
@@ -47,7 +47,7 @@
   "http://www.w3.org/2010/09/qt-fots-catalog";;
 
 declare namespace ann =
-  "http://www.zorba-xquery.com/annotations";;
+  "http://zorba.io/annotations";;
 
 
 (:~

=== modified file 'test/fots_driver/execute.xq'
--- test/fots_driver/execute.xq	2013-04-09 14:22:41 +0000
+++ test/fots_driver/execute.xq	2013-08-09 09:26:44 +0000
@@ -35,11 +35,11 @@
   "http://www.w3.org/2005/xqt-errors";;
 
 declare namespace ann =
-  "http://www.zorba-xquery.com/annotations";;
-
-
-declare namespace op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+  "http://zorba.io/annotations";;
+
+
+declare namespace op = "http://zorba.io/options/features";;
+declare namespace f = "http://zorba.io/features";;
 declare option op:disable "f:trace";
 
 (:~

=== modified file 'test/fots_driver/feedback.xq'
--- test/fots_driver/feedback.xq	2013-07-19 08:58:43 +0000
+++ test/fots_driver/feedback.xq	2013-08-09 09:26:44 +0000
@@ -23,7 +23,7 @@
   "http://www.zorba-xquery.com/fots-driver/feedback";;
 
 declare namespace ann =
-  "http://www.zorba-xquery.com/annotations";;
+  "http://zorba.io/annotations";;
 
 declare namespace fots =
   "http://www.w3.org/2010/09/qt-fots-catalog";;

=== modified file 'test/fots_driver/fots-driver.xq'
--- test/fots_driver/fots-driver.xq	2013-08-07 08:08:22 +0000
+++ test/fots_driver/fots-driver.xq	2013-08-09 09:26:44 +0000
@@ -23,7 +23,7 @@
   "http://www.zorba-xquery.com/fots-driver";;
 
 import module namespace functx =
-  "http://www.functx.com/";;
+  "http://www.functx.com";;
 
 import module namespace datetime  =
   "http://www.zorba-xquery.com/modules/datetime";;
@@ -54,7 +54,7 @@
   "http://www.w3.org/2010/09/qt-fots-catalog";;
 
 declare namespace ann =
-  "http://www.zorba-xquery.com/annotations";;
+  "http://zorba.io/annotations";;
 
 (:~
  : Returns the names of all qualifying test-sets.

=== modified file 'test/fots_driver/reporting.xq'
--- test/fots_driver/reporting.xq	2013-08-06 01:09:07 +0000
+++ test/fots_driver/reporting.xq	2013-08-09 09:26:44 +0000
@@ -32,7 +32,7 @@
 import module namespace fots-err =
   "http://www.zorba-xquery.com/fots-driver/errors"; at "errors.xq";
 import module namespace functx =
-  "http://www.functx.com/";;
+  "http://www.functx.com";;
 
 declare namespace err =
   "http://www.w3.org/2005/xqt-errors";;
@@ -45,7 +45,7 @@
   "http://www.w3.org/2012/08/qt-fots-results";;
 
 declare namespace ann =
-  "http://www.zorba-xquery.com/annotations";;
+  "http://zorba.io/annotations";;
 
 
 (:~

=== modified file 'test/fots_driver/tools/process.xq'
--- test/fots_driver/tools/process.xq	2013-05-22 17:10:21 +0000
+++ test/fots_driver/tools/process.xq	2013-08-09 09:26:44 +0000
@@ -32,7 +32,7 @@
   "http://www.zorba-xquery.com/fots-driver/errors"; at "../errors.xq";
   
 declare namespace ann =
-  "http://www.zorba-xquery.com/annotations";;
+  "http://zorba.io/annotations";;
 declare namespace fots =
   "http://www.w3.org/2010/09/qt-fots-catalog";;
 

=== modified file 'test/fots_driver/util.xq'
--- test/fots_driver/util.xq	2013-08-05 23:01:27 +0000
+++ test/fots_driver/util.xq	2013-08-09 09:26:44 +0000
@@ -38,10 +38,10 @@
   "http://www.w3.org/2010/09/qt-fots-catalog";;
 
 declare namespace ann =
-  "http://www.zorba-xquery.com/annotations";;
+  "http://zorba.io/annotations";;
 
-declare namespace op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+declare namespace op = "http://zorba.io/options/features";;
+declare namespace f = "http://zorba.io/features";;
 declare option op:disable "f:trace";
 
 (:~

=== modified file 'test/rbkt/ExpQueryResults/zorba/fetch/fetch_module1.xml.res'
--- test/rbkt/ExpQueryResults/zorba/fetch/fetch_module1.xml.res	2013-02-07 17:24:36 +0000
+++ test/rbkt/ExpQueryResults/zorba/fetch/fetch_module1.xml.res	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 (: Test module with external functions implemented in C++ :)
 module namespace ext = "http://zorba-tests.28msec.us/modules/ext";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 declare function ext:func() as xs:string external;

=== modified file 'test/rbkt/ExpQueryResults/zorba/fetch/fetch_module2.xml.res'
--- test/rbkt/ExpQueryResults/zorba/fetch/fetch_module2.xml.res	2013-02-07 17:24:36 +0000
+++ test/rbkt/ExpQueryResults/zorba/fetch/fetch_module2.xml.res	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 (: Test module with external functions implemented in C++ :)
 module namespace ext = "http://zorba-tests.28msec.us/modules/ext";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 declare function ext:func() as xs:string external;

=== modified file 'test/rbkt/ExpQueryResults/zorba/xqdoc/collindex.xml.res'
--- test/rbkt/ExpQueryResults/zorba/xqdoc/collindex.xml.res	2012-09-24 08:06:53 +0000
+++ test/rbkt/ExpQueryResults/zorba/xqdoc/collindex.xml.res	2013-08-09 09:26:44 +0000
@@ -12,7 +12,7 @@
       <xqdoc:namespace prefix="cil" uri="http://www.zorba-xquery.com/collindex"; isSchema="false"/>
       <xqdoc:namespace prefix="ddl" uri="http://www.zorba-xquery.com/modules/store/static/collections/ddl"; isSchema="false"/>
       <xqdoc:namespace prefix="dml" uri="http://www.zorba-xquery.com/modules/store/static/collections/dml"; isSchema="false"/>
-      <xqdoc:namespace prefix="functx" uri="http://www.functx.com/"; isSchema="false"/>
+      <xqdoc:namespace prefix="functx" uri="http://www.functx.com"; isSchema="false"/>
       <xqdoc:namespace prefix="idml" uri="http://www.zorba-xquery.com/modules/store/static/indexes/dml"; isSchema="false"/>
       <xqdoc:namespace prefix="req" uri="http://www.28msec.com/modules/http/request"; isSchema="false"/>
       <xqdoc:namespace prefix="resp" uri="http://www.28msec.com/modules/http/response"; isSchema="false"/>
@@ -20,7 +20,7 @@
   </xqdoc:module>
   <xqdoc:imports>
     <xqdoc:import type="library">
-      <xqdoc:uri>http://www.functx.com/</xqdoc:uri>
+      <xqdoc:uri>http://www.functx.com</xqdoc:uri>
     </xqdoc:import>
     <xqdoc:import type="library">
       <xqdoc:uri>http://www.28msec.com/modules/http/request</xqdoc:uri>

=== modified file 'test/rbkt/ExpQueryResults/zorba/xqdoc/local.xml.res'
--- test/rbkt/ExpQueryResults/zorba/xqdoc/local.xml.res	2013-02-07 17:24:36 +0000
+++ test/rbkt/ExpQueryResults/zorba/xqdoc/local.xml.res	2013-08-09 09:26:44 +0000
@@ -1,1 +1,1 @@
-<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0";><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="main"><xqdoc:uri>local.xqlib</xqdoc:uri><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="ann" uri="http://www.zorba-xquery.com/annotations"; isSchema="false"/><xqdoc:namespace prefix="xqd" uri="http://www.zorba-xquery.com/modules/xqdoc"; isSchema="false"/><xqdoc:namespace prefix="xqds" uri="http://www.xqdoc.org/1.0"; isSchema="true"/></xqdoc:custom></xqdoc:module><xqdoc:imports><xqdoc:import type="schema"><xqdoc:uri>http://www.xqdoc.org/1.0</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://www.zorba-xquery.com/modules/xqdoc</xqdoc:uri></xqdoc:import></xqdoc:imports><xqdoc:variables/><xqdoc:collections/><xqdoc:indexes/><xqdoc:functions><xqdoc:function arity="1"><xqdoc:name>local:remove-date</xqdoc:name><xqdoc:annotations><xqdoc:annotation namespace="http://www.zorba-xquery.com/annotations"; localname="sequential" prefix="ann" value=""/></xqdoc:annotations><xqdoc:signature>declare %ann:sequential function local:remove-date($xqdoc)</xqdoc:signature><xqdoc:parameters><xqdoc:parameter><xqdoc:name>xqdoc</xqdoc:name></xqdoc:parameter></xqdoc:parameters></xqdoc:function></xqdoc:functions></xqdoc:xqdoc>
+<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0";><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="main"><xqdoc:uri>local.xqlib</xqdoc:uri><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="ann" uri="http://zorba.io/annotations"; isSchema="false"/><xqdoc:namespace prefix="xqd" uri="http://www.zorba-xquery.com/modules/xqdoc"; isSchema="false"/><xqdoc:namespace prefix="xqds" uri="http://www.xqdoc.org/1.0"; isSchema="true"/></xqdoc:custom></xqdoc:module><xqdoc:imports><xqdoc:import type="schema"><xqdoc:uri>http://www.xqdoc.org/1.0</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://www.zorba-xquery.com/modules/xqdoc</xqdoc:uri></xqdoc:import></xqdoc:imports><xqdoc:variables/><xqdoc:collections/><xqdoc:indexes/><xqdoc:functions><xqdoc:function arity="1"><xqdoc:name>local:remove-date</xqdoc:name><xqdoc:annotations><xqdoc:annotation namespace="http://zorba.io/annotations"; localname="sequential" prefix="ann" value=""/></xqdoc:annotations><xqdoc:signature>declare %ann:sequential function local:remove-date($xqdoc)</xqdoc:signature><xqdoc:parameters><xqdoc:parameter><xqdoc:name>xqdoc</xqdoc:name></xqdoc:parameter></xqdoc:parameters></xqdoc:function></xqdoc:functions></xqdoc:xqdoc>

=== modified file 'test/rbkt/ExpQueryResults/zorba/xqdoc/no_global_var.xml.res'
--- test/rbkt/ExpQueryResults/zorba/xqdoc/no_global_var.xml.res	2013-02-07 17:24:36 +0000
+++ test/rbkt/ExpQueryResults/zorba/xqdoc/no_global_var.xml.res	2013-08-09 09:26:44 +0000
@@ -1,1 +1,1 @@
-<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0";><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="library"><xqdoc:uri>foo:bar</xqdoc:uri><xqdoc:name>no_global_var.xqlib</xqdoc:name><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="ann" uri="http://www.zorba-xquery.com/annotations"; isSchema="false"/><xqdoc:namespace prefix="foo" uri="foo:bar" isSchema="false"/></xqdoc:custom></xqdoc:module><xqdoc:imports/><xqdoc:variables><xqdoc:variable><xqdoc:uri>foo:foo</xqdoc:uri></xqdoc:variable></xqdoc:variables><xqdoc:collections></xqdoc:collections><xqdoc:indexes></xqdoc:indexes><xqdoc:functions><xqdoc:function arity="0"><xqdoc:name>foo:bar</xqdoc:name><xqdoc:annotations><xqdoc:annotation namespace="http://www.zorba-xquery.com/annotations"; localname="sequential" prefix="ann" value=""/></xqdoc:annotations><xqdoc:signature>declare %ann:sequential function foo:bar()</xqdoc:signature><xqdoc:invoked arity="2"><xqdoc:uri>http://www.w3.org/2005/xpath-functions</xqdoc:uri><xqdoc:name>concat</xqdoc:name></xqdoc:invoked></xqdoc:function></xqdoc:functions></xqdoc:xqdoc>
+<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0";><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="library"><xqdoc:uri>foo:bar</xqdoc:uri><xqdoc:name>no_global_var.xqlib</xqdoc:name><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="ann" uri="http://zorba.io/annotations"; isSchema="false"/><xqdoc:namespace prefix="foo" uri="foo:bar" isSchema="false"/></xqdoc:custom></xqdoc:module><xqdoc:imports/><xqdoc:variables><xqdoc:variable><xqdoc:uri>foo:foo</xqdoc:uri></xqdoc:variable></xqdoc:variables><xqdoc:collections></xqdoc:collections><xqdoc:indexes></xqdoc:indexes><xqdoc:functions><xqdoc:function arity="0"><xqdoc:name>foo:bar</xqdoc:name><xqdoc:annotations><xqdoc:annotation namespace="http://zorba.io/annotations"; localname="sequential" prefix="ann" value=""/></xqdoc:annotations><xqdoc:signature>declare %ann:sequential function foo:bar()</xqdoc:signature><xqdoc:invoked arity="2"><xqdoc:uri>http://www.w3.org/2005/xpath-functions</xqdoc:uri><xqdoc:name>concat</xqdoc:name></xqdoc:invoked></xqdoc:function></xqdoc:functions></xqdoc:xqdoc>

=== modified file 'test/rbkt/Queries/zorba/HigherOrder/hof-020.xq'
--- test/rbkt/Queries/zorba/HigherOrder/hof-020.xq	2013-03-13 21:14:37 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/hof-020.xq	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 (: Function expecting a function, caller supplies inline function :)
 (: Author - Michael Kay, Saxonica :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:scramble(
     $x as function(*), 

=== modified file 'test/rbkt/Queries/zorba/HigherOrder/hof-022.xq'
--- test/rbkt/Queries/zorba/HigherOrder/hof-022.xq	2013-03-13 21:14:37 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/hof-022.xq	2013-08-09 09:26:44 +0000
@@ -3,9 +3,9 @@
 (: Name and arity of a user-defined function :)
 (: Author - Michael Kay, Saxonica :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
-declare namespace o = "http://www.zorba-xquery.com/options/features";;
+declare namespace o = "http://zorba.io/options/features";;
 
 declare %ann:sequential function local:scramble(
     $x as function(xs:string) as xs:string,

=== modified file 'test/rbkt/Queries/zorba/HigherOrder/hof-101.xq'
--- test/rbkt/Queries/zorba/HigherOrder/hof-101.xq	2013-03-27 14:17:57 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/hof-101.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare %private variable $handlers := ();
 

=== modified file 'test/rbkt/Queries/zorba/HigherOrder/hof-102.xq'
--- test/rbkt/Queries/zorba/HigherOrder/hof-102.xq	2013-03-13 21:14:37 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/hof-102.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace o = "http://www.zorba-xquery.com/options/features";;
+declare namespace o = "http://zorba.io/options/features";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
 try { function () { fn:error() } () } catch err:FOER0000 { 0 }

=== modified file 'test/rbkt/Queries/zorba/HigherOrder/hof-103.xq'
--- test/rbkt/Queries/zorba/HigherOrder/hof-103.xq	2013-03-13 21:14:37 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/hof-103.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace o = "http://www.zorba-xquery.com/options/features";;
+declare namespace o = "http://zorba.io/options/features";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
 try { function() { 1 div 0 } () } catch err:FOAR0001 { 0 }

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-05.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-05.xq	2013-07-17 09:01:57 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-05.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare namespace random = "http://zorba.io/modules/random";;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-06.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-06.xq	2013-07-17 09:01:57 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-06.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare namespace random = "http://zorba.io/modules/random";;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-07.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-07.xq	2013-07-17 09:01:57 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-07.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare namespace random = "http://zorba.io/modules/random";;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-10.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-10.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-10.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "https://www.zorba-xquery.com/annotations";;
+declare namespace ann = "https://zorba.io/annotations";;
 
 declare %ann:deterministic function local:public()
 {

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-11.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-11.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-11.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:nondeterministic function local:public()
 {

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-12.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-12.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-12.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:nonassignable %ann:nonassignable variable $var := 3;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-13.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-13.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-13.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:assignable %ann:assignable variable $var := 3;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-14.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-14.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-14.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:assignable %ann:nonassignable variable $var := 3;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-err-22.xq'
--- test/rbkt/Queries/zorba/annotations/annot-err-22.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-err-22.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";; 
+declare namespace ann = "http://zorba.io/annotations";; 
 
 declare %ann:nonexistent variable $var := 3;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-literals-01.xq'
--- test/rbkt/Queries/zorba/annotations/annot-literals-01.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-literals-01.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 (: The purpose of the query is to the parsing of annotations
    literals. The value will be ignored :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential("string literal") function local:func()
 {

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-literals-02.xq'
--- test/rbkt/Queries/zorba/annotations/annot-literals-02.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-literals-02.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 (: The purpose of the query is to the parsing of annotations
    literals. The value will be ignored :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential(123) function local:func() {   1 };
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-literals-03.xq'
--- test/rbkt/Queries/zorba/annotations/annot-literals-03.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-literals-03.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 (: The purpose of the query is to the parsing of annotations
    literals. The value will be ignored :)
    
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;   
+declare namespace ann = "http://zorba.io/annotations";;   
 
 declare %ann:sequential(123, "string literal") function local:func() {   1 };
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-literals-04.xq'
--- test/rbkt/Queries/zorba/annotations/annot-literals-04.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-literals-04.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 (: The purpose of the query is to the parsing of annotations
    literals. The value will be ignored :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential(123, "string literal", 456, "just random") function
 local:func() {   1 };

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-02.xq'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-02.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-02.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
-declare namespace zann = "http://www.zorba-xquery.com/annotations";;
-declare namespace zwarn = "http://www.zorba-xquery.com/options/warnings";;
+declare namespace zann = "http://zorba.io/annotations";;
+declare namespace zwarn = "http://zorba.io/options/warnings";;
 declare option zwarn:error "ZWST0003";
 
 declare %zann:sequential function local:foo()

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-03.xq'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-03.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-03.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 declare namespace unknown = "unknown-annotation";
-declare namespace zwarn = "http://www.zorba-xquery.com/options/warnings";;
+declare namespace zwarn = "http://zorba.io/options/warnings";;
 
 (: all warnings are errors :)
 declare option zwarn:error "all";

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-04.xq'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-04.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-04.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
-declare namespace zann = "http://www.zorba-xquery.com/annotations";;
-declare namespace zwarn = "http://www.zorba-xquery.com/options/warnings";;
+declare namespace zann = "http://zorba.io/annotations";;
+declare namespace zwarn = "http://zorba.io/options/warnings";;
 declare option zwarn:enable "all";
 declare option zwarn:error "ZWST0003";
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-05.xq'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-05.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-05.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 declare namespace unknown = "unknown-annotation";
-declare namespace zwarn = "http://www.zorba-xquery.com/options/warnings";;
+declare namespace zwarn = "http://zorba.io/options/warnings";;
 declare option zwarn:error "ZWST0002";
 declare option zwarn:enable "all";
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-var-assignable-01.xq'
--- test/rbkt/Queries/zorba/annotations/annot-var-assignable-01.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-var-assignable-01.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:assignable variable $var := 3;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-var-assignable-02.xq'
--- test/rbkt/Queries/zorba/annotations/annot-var-assignable-02.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-var-assignable-02.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 {
   %ann:assignable variable $var := 3;

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-01.xq'
--- test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-01.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-01.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:nonassignable variable $var := 3;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-02.xq'
--- test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-02.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-var-nonassignable-02.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 {
   %ann:nonassignable variable $var := 3;

=== modified file 'test/rbkt/Queries/zorba/block/block_and_type.xq'
--- test/rbkt/Queries/zorba/block/block_and_type.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/block_and_type.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 (:
  : This query tests if it is possible to have a return type in a function that 

=== modified file 'test/rbkt/Queries/zorba/block/declare_variable.xq'
--- test/rbkt/Queries/zorba/block/declare_variable.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/declare_variable.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test2 () as xs:string
 {

=== modified file 'test/rbkt/Queries/zorba/block/local_var1.xq'
--- test/rbkt/Queries/zorba/block/local_var1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/local_var1.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $x := 1;
 

=== modified file 'test/rbkt/Queries/zorba/block/local_var2.xq'
--- test/rbkt/Queries/zorba/block/local_var2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/local_var2.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $x := 42;
 

=== modified file 'test/rbkt/Queries/zorba/block/local_var3.xq'
--- test/rbkt/Queries/zorba/block/local_var3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/local_var3.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $x := 5;
 

=== modified file 'test/rbkt/Queries/zorba/block/local_var4.xq'
--- test/rbkt/Queries/zorba/block/local_var4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/local_var4.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $x := 100;
 

=== modified file 'test/rbkt/Queries/zorba/block/local_var5.xq'
--- test/rbkt/Queries/zorba/block/local_var5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/local_var5.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $x as xs:integer := 1;
 

=== modified file 'test/rbkt/Queries/zorba/block/no_hoisting_of_seq_return.xq'
--- test/rbkt/Queries/zorba/block/no_hoisting_of_seq_return.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/no_hoisting_of_seq_return.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() 
 {

=== modified file 'test/rbkt/Queries/zorba/block/seq_func1.xq'
--- test/rbkt/Queries/zorba/block/seq_func1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/seq_func1.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() 
 {

=== modified file 'test/rbkt/Queries/zorba/block/seq_func2.xq'
--- test/rbkt/Queries/zorba/block/seq_func2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/seq_func2.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() as xs:boolean 
 {

=== modified file 'test/rbkt/Queries/zorba/block/set2.xq'
--- test/rbkt/Queries/zorba/block/set2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/set2.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $x := 1;
 

=== modified file 'test/rbkt/Queries/zorba/block/set3.xq'
--- test/rbkt/Queries/zorba/block/set3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/block/set3.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $x := 1;
 

=== modified file 'test/rbkt/Queries/zorba/collections/availability.xq'
--- test/rbkt/Queries/zorba/collections/availability.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/availability.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:create() {
   ddl:create($ns:collection_1);

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_001/q1.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_001/q1.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_001/q1.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:create(xs:QName("ns:collection_1"));

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_001/q2.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_001/q2.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_001/q2.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:create(xs:QName("ns:collection_2"));

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_001/q3.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_001/q3.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_001/q3.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:delete(xs:QName("ns:collection_1"));

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_002/q1.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_002/q1.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_002/q1.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:create(xs:QName("ns:collection_1"));

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_002/q2.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_002/q2.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_002/q2.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:create(xs:QName("ns:collection_2"));

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_003/q1.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_003/q1.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_003/q1.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:create(xs:QName("ns:http"));

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_003/q2.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_003/q2.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_003/q2.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   dml:insert-nodes-first(xs:QName("ns:http"), <book>One Thousand and One Nights</book>);

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_004/q1.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_004/q1.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_004/q1.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:create(xs:QName("ns:http"), (<b><a/></b>, <a/>));

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_004/q2.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_004/q2.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_004/q2.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   dml:insert-nodes-last(xs:QName('ns:http'), <a/>);

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_005/q1.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_005/q1.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_005/q1.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $input-context1 external;
 

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_010/q1.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_010/q1.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_010/q1.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:create(xs:QName("ns:collection_1"));

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_010/q2.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_010/q2.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_010/q2.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:create(xs:QName("ns:collection_2"));

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q1.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q1.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q1.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:create(xs:QName('ns:collection_1'), (<a/>,<b/>));

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q2.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q2.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q2.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:create(xs:QName("ns:collection_2"));

=== modified file 'test/rbkt/Queries/zorba/collections/chained_test_collection_011/q3.cxq'
--- test/rbkt/Queries/zorba/collections/chained_test_collection_011/q3.cxq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/chained_test_collection_011/q3.cxq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace ns = "http://example.org/datamodule/"; at "../collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:delete(xs:QName('ns:collection_333'));

=== modified file 'test/rbkt/Queries/zorba/collections/collection_001.xqdata'
--- test/rbkt/Queries/zorba/collections/collection_001.xqdata	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/collection_001.xqdata	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace ns = "http://www.example.com/example";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection ns:collection as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/collections/collection_available_check.xq'
--- test/rbkt/Queries/zorba/collections/collection_available_check.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/collection_available_check.xq	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
 declare function local:testa() {

=== modified file 'test/rbkt/Queries/zorba/collections/collection_known_check.xq'
--- test/rbkt/Queries/zorba/collections/collection_known_check.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/collection_known_check.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare namespace ns = "http://www.unknown.com/";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;

=== modified file 'test/rbkt/Queries/zorba/collections/collections.xqdata'
--- test/rbkt/Queries/zorba/collections/collections.xqdata	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/collections.xqdata	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace ns = "http://example.org/datamodule/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $ns:collection_1 as xs:QName := xs:QName("ns:collection_1");
 declare %ann:ordered collection ns:collection_1 as node()*;

=== modified file 'test/rbkt/Queries/zorba/collections/create_collection.xq'
--- test/rbkt/Queries/zorba/collections/create_collection.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/create_collection.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:create() {
   ddl:create(xs:QName("ns:test1"));

=== modified file 'test/rbkt/Queries/zorba/collections/create_collision.xq'
--- test/rbkt/Queries/zorba/collections/create_collision.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/create_collision.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test() {
   (ddl:create($ns:http),ddl:create($ns:http));

=== modified file 'test/rbkt/Queries/zorba/collections/delete_collection.xq'
--- test/rbkt/Queries/zorba/collections/delete_collection.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/delete_collection.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:create() 
 {

=== modified file 'test/rbkt/Queries/zorba/collections/edit/collection_with_index.xqdata'
--- test/rbkt/Queries/zorba/collections/edit/collection_with_index.xqdata	2012-12-10 16:04:40 +0000
+++ test/rbkt/Queries/zorba/collections/edit/collection_with_index.xqdata	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection ns:collection as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/collections/edit/collection_with_type.xqdata'
--- test/rbkt/Queries/zorba/collections/edit/collection_with_type.xqdata	2012-12-11 15:01:41 +0000
+++ test/rbkt/Queries/zorba/collections/edit/collection_with_type.xqdata	2013-08-09 09:26:44 +0000
@@ -2,6 +2,6 @@
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection ns:collection as element(foo)*;

=== modified file 'test/rbkt/Queries/zorba/collections/inconsistency_1.xqdata'
--- test/rbkt/Queries/zorba/collections/inconsistency_1.xqdata	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/inconsistency_1.xqdata	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 module namespace ns = "http://example.org/datamodule/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:queue %ann:append-only collection ns:collection_1;

=== modified file 'test/rbkt/Queries/zorba/collections/inconsistency_2.xqdata'
--- test/rbkt/Queries/zorba/collections/inconsistency_2.xqdata	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/inconsistency_2.xqdata	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace ns = "http://example.org/datamodule/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:ordered %ann:unordered collection ns:collection_1;
 

=== modified file 'test/rbkt/Queries/zorba/collections/inconsistency_3.xqdata'
--- test/rbkt/Queries/zorba/collections/inconsistency_3.xqdata	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/inconsistency_3.xqdata	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 module namespace ns = "http://example.org/datamodule/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:queue %ann:unordered collection ns:collection_1;

=== modified file 'test/rbkt/Queries/zorba/collections/index_of_1.xq'
--- test/rbkt/Queries/zorba/collections/index_of_1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/index_of_1.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/collections/index_of_3.xq'
--- test/rbkt/Queries/zorba/collections/index_of_3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/index_of_3.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_after_1.xq'
--- test/rbkt/Queries/zorba/collections/insert_nodes_after_1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_after_1.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_at_1.xq'
--- test/rbkt/Queries/zorba/collections/insert_nodes_at_1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_at_1.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_at_4.xq'
--- test/rbkt/Queries/zorba/collections/insert_nodes_at_4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_at_4.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_before_1.xq'
--- test/rbkt/Queries/zorba/collections/insert_nodes_before_1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_before_1.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_first.xq'
--- test/rbkt/Queries/zorba/collections/insert_nodes_first.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_first.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:create() {
   ddl:create(xs:QName("ns:test1"));

=== modified file 'test/rbkt/Queries/zorba/collections/insert_nodes_last.xq'
--- test/rbkt/Queries/zorba/collections/insert_nodes_last.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/insert_nodes_last.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:create() 
 {

=== modified file 'test/rbkt/Queries/zorba/collections/modifier_1.xq'
--- test/rbkt/Queries/zorba/collections/modifier_1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/modifier_1.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "modifier_1.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
 declare %ann:sequential function local:ddl() {

=== modified file 'test/rbkt/Queries/zorba/collections/modifier_1.xqdata'
--- test/rbkt/Queries/zorba/collections/modifier_1.xqdata	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/modifier_1.xqdata	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace ns = "http://example.org/datamodule/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $ns:coll_1 as xs:QName := xs:QName("ns:coll_1");
 declare %ann:const collection ns:coll_1 as node()*;

=== modified file 'test/rbkt/Queries/zorba/collections/modifier_2.xq'
--- test/rbkt/Queries/zorba/collections/modifier_2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/modifier_2.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "modifier_1.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 

=== modified file 'test/rbkt/Queries/zorba/collections/modifier_3.xq'
--- test/rbkt/Queries/zorba/collections/modifier_3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/modifier_3.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "modifier_3.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
 declare %ann:sequential function local:ddl() {

=== modified file 'test/rbkt/Queries/zorba/collections/modifier_3.xqdata'
--- test/rbkt/Queries/zorba/collections/modifier_3.xqdata	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/modifier_3.xqdata	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace ns = "http://example.org/datamodule/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $ns:coll_1 as xs:QName := xs:QName("ns:coll_1");
 

=== modified file 'test/rbkt/Queries/zorba/collections/no_copy_01.xq'
--- test/rbkt/Queries/zorba/collections/no_copy_01.xq	2012-09-12 21:29:50 +0000
+++ test/rbkt/Queries/zorba/collections/no_copy_01.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace db = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 
-declare namespace ext = "http://www.zorba-xquery.com/extensions";;
+declare namespace ext = "http://zorba.io/extensions";;
 
 ddl:create(xs:QName("local:bar"));
 

=== modified file 'test/rbkt/Queries/zorba/collections/node_type.xq'
--- test/rbkt/Queries/zorba/collections/node_type.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/node_type.xq	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 import schema namespace s = "http://www.zorba-xquery.org/schema"; at "node_type.xsd";
 import module namespace ns = "http://example.org/datamodule/"; at "node_type.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
 declare function local:create-person($name as xs:string) as schema-element(s:person) 

=== modified file 'test/rbkt/Queries/zorba/collections/node_type.xqdata'
--- test/rbkt/Queries/zorba/collections/node_type.xqdata	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/node_type.xqdata	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace ns = "http://example.org/datamodule/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 import schema namespace s = "http://www.zorba-xquery.org/schema"; at "node_type.xsd";
 

=== modified file 'test/rbkt/Queries/zorba/collections/paging_1.xq'
--- test/rbkt/Queries/zorba/collections/paging_1.xq	2013-08-07 05:28:39 +0000
+++ test/rbkt/Queries/zorba/collections/paging_1.xq	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace zerr = "http://zorba.io/errors";;
 
 declare function local:order($items)

=== modified file 'test/rbkt/Queries/zorba/collections/paging_2.xq'
--- test/rbkt/Queries/zorba/collections/paging_2.xq	2013-07-24 08:12:12 +0000
+++ test/rbkt/Queries/zorba/collections/paging_2.xq	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/collections/paging_3.xq'
--- test/rbkt/Queries/zorba/collections/paging_3.xq	2013-07-24 08:12:12 +0000
+++ test/rbkt/Queries/zorba/collections/paging_3.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace ns = "http://www.zorba-xquery.com/test";;
 
 declare %ann:sequential function local:test()

=== modified file 'test/rbkt/Queries/zorba/collections/paging_4.xq'
--- test/rbkt/Queries/zorba/collections/paging_4.xq	2013-07-24 08:12:12 +0000
+++ test/rbkt/Queries/zorba/collections/paging_4.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace ns = "http://www.zorba-xquery.com/test";;
 
 declare %ann:sequential function local:test()

=== modified file 'test/rbkt/Queries/zorba/collections/paging_5.xq'
--- test/rbkt/Queries/zorba/collections/paging_5.xq	2013-07-24 08:12:12 +0000
+++ test/rbkt/Queries/zorba/collections/paging_5.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace ns = "http://www.zorba-xquery.com/test";;
 
 declare %ann:sequential function local:test()

=== modified file 'test/rbkt/Queries/zorba/collections/q1.xq'
--- test/rbkt/Queries/zorba/collections/q1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/q1.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/collections/q12.xq'
--- test/rbkt/Queries/zorba/collections/q12.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/q12.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo($collName as xs:QName) {
   ddl:create($collName,<a/>);

=== modified file 'test/rbkt/Queries/zorba/collections/remove_node_at_1.xq'
--- test/rbkt/Queries/zorba/collections/remove_node_at_1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/remove_node_at_1.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/collections/remove_node_at_border.xq'
--- test/rbkt/Queries/zorba/collections/remove_node_at_border.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/remove_node_at_border.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
 declare %ann:sequential function local:ddl() {

=== modified file 'test/rbkt/Queries/zorba/collections/remove_nodes_1.xq'
--- test/rbkt/Queries/zorba/collections/remove_nodes_1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/collections/remove_nodes_1.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace ns = "http://example.org/datamodule/"; at "collections.xqdata";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/file/common.xqlib'
--- test/rbkt/Queries/zorba/file/common.xqlib	2013-08-02 17:12:50 +0000
+++ test/rbkt/Queries/zorba/file/common.xqlib	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 
 declare function commons:error($messages as xs:string*) as xs:string* {

=== modified file 'test/rbkt/Queries/zorba/file/copy.xqlib'
--- test/rbkt/Queries/zorba/file/copy.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/file/copy.xqlib	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace file = "http://expath.org/ns/file";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:nondeterministic %ann:sequential function fct:test-copy($rbktPath as xs:string, $file as xs:string) {
 

=== modified file 'test/rbkt/Queries/zorba/file/createWriteReadDeleteSeries.xq'
--- test/rbkt/Queries/zorba/file/createWriteReadDeleteSeries.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/file/createWriteReadDeleteSeries.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace file = "http://expath.org/ns/file";;
 import module namespace commons = "http://expath.org/ns/file/tests/commons"; at "common.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $xml := <elem>value</elem>;
 declare variable $testDir := "tmpCreateWriteReadDeleteSeries";

=== modified file 'test/rbkt/Queries/zorba/functx/functx-x-1.xqlib'
--- test/rbkt/Queries/zorba/functx/functx-x-1.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/functx-x-1.xqlib	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace functx1 = "http://www.28msec.com/compile-time/lib/functx1"; at "functx1.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 
 declare function def:t ()

=== modified file 'test/rbkt/Queries/zorba/functx/functx-x-10.xqlib'
--- test/rbkt/Queries/zorba/functx/functx-x-10.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/functx-x-10.xqlib	2013-08-09 09:26:44 +0000
@@ -11,7 +11,7 @@
 import module namespace functx9 = "http://www.28msec.com/compile-time/lib/functx9";    at "functx9.xqlib";
 import module namespace functx10 = "http://www.28msec.com/compile-time/lib/functx10";  at "functx10.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function def:t ()
 {

=== modified file 'test/rbkt/Queries/zorba/functx/functx-x-2.xqlib'
--- test/rbkt/Queries/zorba/functx/functx-x-2.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/functx-x-2.xqlib	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 import module namespace functx1 = "http://www.28msec.com/compile-time/lib/functx1"; at "functx1.xqlib";
 import module namespace functx2 = "http://www.28msec.com/compile-time/lib/functx2"; at "functx2.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function def:t ()
 {

=== modified file 'test/rbkt/Queries/zorba/functx/functx-x-3.xqlib'
--- test/rbkt/Queries/zorba/functx/functx-x-3.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/functx-x-3.xqlib	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 import module namespace functx2 = "http://www.28msec.com/compile-time/lib/functx2"; at "functx2.xqlib";
 import module namespace functx3 = "http://www.28msec.com/compile-time/lib/functx3"; at "functx3.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function def:t ()
 {

=== modified file 'test/rbkt/Queries/zorba/functx/functx-x-4.xqlib'
--- test/rbkt/Queries/zorba/functx/functx-x-4.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/functx-x-4.xqlib	2013-08-09 09:26:44 +0000
@@ -5,7 +5,7 @@
 import module namespace functx3 = "http://www.28msec.com/compile-time/lib/functx3"; at "functx3.xqlib";
 import module namespace functx4 = "http://www.28msec.com/compile-time/lib/functx4"; at "functx4.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function def:t ()
 {

=== modified file 'test/rbkt/Queries/zorba/functx/functx-x-5.xqlib'
--- test/rbkt/Queries/zorba/functx/functx-x-5.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/functx-x-5.xqlib	2013-08-09 09:26:44 +0000
@@ -6,7 +6,7 @@
 import module namespace functx4 = "http://www.28msec.com/compile-time/lib/functx4"; at "functx4.xqlib";
 import module namespace functx5 = "http://www.28msec.com/compile-time/lib/functx5"; at "functx5.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function def:t ()
 {

=== modified file 'test/rbkt/Queries/zorba/functx/functx-x-6.xqlib'
--- test/rbkt/Queries/zorba/functx/functx-x-6.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/functx-x-6.xqlib	2013-08-09 09:26:44 +0000
@@ -7,7 +7,7 @@
 import module namespace functx5 = "http://www.28msec.com/compile-time/lib/functx5"; at "functx5.xqlib";
 import module namespace functx6 = "http://www.28msec.com/compile-time/lib/functx6"; at "functx6.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function def:t ()
 {

=== modified file 'test/rbkt/Queries/zorba/functx/functx-x-7.xqlib'
--- test/rbkt/Queries/zorba/functx/functx-x-7.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/functx-x-7.xqlib	2013-08-09 09:26:44 +0000
@@ -8,7 +8,7 @@
 import module namespace functx6 = "http://www.28msec.com/compile-time/lib/functx6"; at "functx6.xqlib";
 import module namespace functx7 = "http://www.28msec.com/compile-time/lib/functx7"; at "functx7.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function def:t ()
 {

=== modified file 'test/rbkt/Queries/zorba/functx/functx-x-8.xqlib'
--- test/rbkt/Queries/zorba/functx/functx-x-8.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/functx-x-8.xqlib	2013-08-09 09:26:44 +0000
@@ -9,7 +9,7 @@
 import module namespace functx7 = "http://www.28msec.com/compile-time/lib/functx7"; at "functx7.xqlib";
 import module namespace functx8 = "http://www.28msec.com/compile-time/lib/functx8"; at "functx8.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function def:t ()
 {

=== modified file 'test/rbkt/Queries/zorba/functx/functx-x-9.xqlib'
--- test/rbkt/Queries/zorba/functx/functx-x-9.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/functx-x-9.xqlib	2013-08-09 09:26:44 +0000
@@ -10,7 +10,7 @@
 import module namespace functx8 = "http://www.28msec.com/compile-time/lib/functx8"; at "functx8.xqlib";
 import module namespace functx9 = "http://www.28msec.com/compile-time/lib/functx9"; at "functx9.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function def:t ()
 {

=== modified file 'test/rbkt/Queries/zorba/functx/functx-x-call.xq'
--- test/rbkt/Queries/zorba/functx/functx-x-call.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/functx-x-call.xq	2013-08-09 09:26:44 +0000
@@ -19,7 +19,7 @@
 import module namespace f10 = "http://www.28msec.com/compile-time/functx-x-10";
     at "functx-x-10.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 f1:t(),
 f2:t(),

=== modified file 'test/rbkt/Queries/zorba/functx/substring-before-last.xq'
--- test/rbkt/Queries/zorba/functx/substring-before-last.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/functx/substring-before-last.xq	2013-08-09 09:26:44 +0000
@@ -1,3 +1,3 @@
-import module namespace functx = "http://www.functx.com/";;
+import module namespace functx = "http://www.functx.com";;
 
 functx:substring-before-last('abc-def-ghi', '-')
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/groupby/collation01.xq'
--- test/rbkt/Queries/zorba/groupby/collation01.xq	2012-06-08 09:00:33 +0000
+++ test/rbkt/Queries/zorba/groupby/collation01.xq	2013-08-09 09:26:44 +0000
@@ -1,14 +1,14 @@
 
 
 for $x in ("AA", "aa")
-group by $x collation "http://www.zorba-xquery.com/collations/SECONDARY/en/EN";, $x
+group by $x collation "http://zorba.io/collations/SECONDARY/en/EN";, $x
 return <res>{$x}</res>
 ,
 "
 "
 ,
 for $x in ("AA", "aa")
-group by $x, $x collation "http://www.zorba-xquery.com/collations/SECONDARY/en/EN";
+group by $x, $x collation "http://zorba.io/collations/SECONDARY/en/EN";
 return <res>{$x}</res>
 ,
 "

=== modified file 'test/rbkt/Queries/zorba/groupby/groupby31.xq'
--- test/rbkt/Queries/zorba/groupby/groupby31.xq	2012-06-05 17:10:39 +0000
+++ test/rbkt/Queries/zorba/groupby/groupby31.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $global := 0;
 

=== modified file 'test/rbkt/Queries/zorba/index/auctions_module1.xqlib'
--- test/rbkt/Queries/zorba/index/auctions_module1.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/auctions_module1.xqlib	2013-08-09 09:26:44 +0000
@@ -6,7 +6,7 @@
 import module namespace index_ddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 import module namespace index_dml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $auctions:auctions := xs:QName("auctions:auctions");
 declare variable $auctions:PersonId := xs:QName("auctions:PersonId");

=== modified file 'test/rbkt/Queries/zorba/index/auto_idx_01.xqlib'
--- test/rbkt/Queries/zorba/index/auto_idx_01.xqlib	2013-06-24 19:46:35 +0000
+++ test/rbkt/Queries/zorba/index/auto_idx_01.xqlib	2013-08-09 09:26:44 +0000
@@ -10,7 +10,7 @@
 import module namespace iddl = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare collection upd:auctions as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/index/available.xq'
--- test/rbkt/Queries/zorba/index/available.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/available.xq	2013-08-09 09:26:44 +0000
@@ -5,7 +5,7 @@
 import module namespace index_ddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 import module namespace index_dml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test_create() {
   ddl:create(xs:QName("decl:coll1"));

=== modified file 'test/rbkt/Queries/zorba/index/count.xqlib'
--- test/rbkt/Queries/zorba/index/count.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/count.xqlib	2013-08-09 09:26:44 +0000
@@ -7,7 +7,7 @@
 import module namespace index_ddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 import module namespace index_dml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection def:user as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/index/declare_index/declare_01.xqlib'
--- test/rbkt/Queries/zorba/index/declare_index/declare_01.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/declare_index/declare_01.xqlib	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection decl:coll1;
 

=== modified file 'test/rbkt/Queries/zorba/index/declare_index/declare_02.xqlib'
--- test/rbkt/Queries/zorba/index/declare_index/declare_02.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/declare_index/declare_02.xqlib	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace manip = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection decl:coll1;
 

=== modified file 'test/rbkt/Queries/zorba/index/declare_index/declare_03.xqlib'
--- test/rbkt/Queries/zorba/index/declare_index/declare_03.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/declare_index/declare_03.xqlib	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace manip = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection decl:coll1;
 

=== modified file 'test/rbkt/Queries/zorba/index/declare_index/declare_04.xqlib'
--- test/rbkt/Queries/zorba/index/declare_index/declare_04.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/declare_index/declare_04.xqlib	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection decl:coll1;
 

=== modified file 'test/rbkt/Queries/zorba/index/declare_index/declare_05.xqlib'
--- test/rbkt/Queries/zorba/index/declare_index/declare_05.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/declare_index/declare_05.xqlib	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace decl = "http://www.test.com/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection decl:coll1;
 

=== modified file 'test/rbkt/Queries/zorba/index/declared.xqlib'
--- test/rbkt/Queries/zorba/index/declared.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/declared.xqlib	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection decl:coll1;
 

=== modified file 'test/rbkt/Queries/zorba/index/delete_from_collection_01.xqlib'
--- test/rbkt/Queries/zorba/index/delete_from_collection_01.xqlib	2012-04-25 16:31:01 +0000
+++ test/rbkt/Queries/zorba/index/delete_from_collection_01.xqlib	2013-08-09 09:26:44 +0000
@@ -8,7 +8,7 @@
 
 import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;        
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare collection seq:counters as node()*;

=== modified file 'test/rbkt/Queries/zorba/index/error_module1.xqlib'
--- test/rbkt/Queries/zorba/index/error_module1.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/error_module1.xqlib	2013-08-09 09:26:44 +0000
@@ -6,7 +6,7 @@
 
 module namespace idx = "http://www.w3.org/TestModules/idx";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:value-range index idx:foo 
 on nodes doc("auction.xml")/site/people/person

=== modified file 'test/rbkt/Queries/zorba/index/error_module2.xqlib'
--- test/rbkt/Queries/zorba/index/error_module2.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/error_module2.xqlib	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 module namespace idx = "http://www.w3.org/TestModules/idx";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:value-range index idx:foo 
 on nodes ./site/people/person

=== modified file 'test/rbkt/Queries/zorba/index/error_module3.xqlib'
--- test/rbkt/Queries/zorba/index/error_module3.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/error_module3.xqlib	2013-08-09 09:26:44 +0000
@@ -7,7 +7,7 @@
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection idx:auctions as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/index/index_does_not_exist.xqlib'
--- test/rbkt/Queries/zorba/index/index_does_not_exist.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/index_does_not_exist.xqlib	2013-08-09 09:26:44 +0000
@@ -5,7 +5,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:ordered collection news-data:employees as schema-element(news-schemas:employee)*;
 

=== modified file 'test/rbkt/Queries/zorba/index/keys_mod.xqlib'
--- test/rbkt/Queries/zorba/index/keys_mod.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/keys_mod.xqlib	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:unordered collection keys-lib:foo as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/index/match_veq_01.xqlib'
--- test/rbkt/Queries/zorba/index/match_veq_01.xqlib	2013-01-29 06:01:31 +0000
+++ test/rbkt/Queries/zorba/index/match_veq_01.xqlib	2013-08-09 09:26:44 +0000
@@ -11,7 +11,7 @@
 import module namespace iddl = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare %an:ordered collection accounts:accounts as element(account);

=== modified file 'test/rbkt/Queries/zorba/index/match_veq_02.xqlib'
--- test/rbkt/Queries/zorba/index/match_veq_02.xqlib	2013-02-17 00:04:30 +0000
+++ test/rbkt/Queries/zorba/index/match_veq_02.xqlib	2013-08-09 09:26:44 +0000
@@ -11,7 +11,7 @@
 import module namespace iddl = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare %an:ordered collection sessions:sessions as element()*;

=== modified file 'test/rbkt/Queries/zorba/index/match_veq_03.xqlib'
--- test/rbkt/Queries/zorba/index/match_veq_03.xqlib	2013-02-17 00:04:30 +0000
+++ test/rbkt/Queries/zorba/index/match_veq_03.xqlib	2013-08-09 09:26:44 +0000
@@ -10,7 +10,7 @@
 import module namespace iddl = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare %an:ordered collection sessions:sessions as element()*;

=== modified file 'test/rbkt/Queries/zorba/index/match_veq_04.xqlib'
--- test/rbkt/Queries/zorba/index/match_veq_04.xqlib	2012-12-14 18:01:41 +0000
+++ test/rbkt/Queries/zorba/index/match_veq_04.xqlib	2013-08-09 09:26:44 +0000
@@ -9,7 +9,7 @@
 import module namespace iddl = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare collection sessions:sessions;

=== modified file 'test/rbkt/Queries/zorba/index/match_veq_05.xqlib'
--- test/rbkt/Queries/zorba/index/match_veq_05.xqlib	2012-12-18 15:33:17 +0000
+++ test/rbkt/Queries/zorba/index/match_veq_05.xqlib	2013-08-09 09:26:44 +0000
@@ -9,7 +9,7 @@
 import module namespace iddl = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare %an:ordered collection sessions:sessions;

=== modified file 'test/rbkt/Queries/zorba/index/match_veq_06.xqlib'
--- test/rbkt/Queries/zorba/index/match_veq_06.xqlib	2013-01-03 22:31:40 +0000
+++ test/rbkt/Queries/zorba/index/match_veq_06.xqlib	2013-08-09 09:26:44 +0000
@@ -16,7 +16,7 @@
 import module namespace doc = 
 "http://www.zorba-xquery.com/modules/store/dynamic/documents";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare construction strip;
 

=== modified file 'test/rbkt/Queries/zorba/index/match_veq_07.xqlib'
--- test/rbkt/Queries/zorba/index/match_veq_07.xqlib	2012-12-20 13:26:06 +0000
+++ test/rbkt/Queries/zorba/index/match_veq_07.xqlib	2013-08-09 09:26:44 +0000
@@ -15,7 +15,7 @@
 import module namespace doc = 
 "http://www.zorba-xquery.com/modules/store/dynamic/documents";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare collection x:auctions;

=== modified file 'test/rbkt/Queries/zorba/index/match_veq_08.xqlib'
--- test/rbkt/Queries/zorba/index/match_veq_08.xqlib	2013-02-21 06:30:02 +0000
+++ test/rbkt/Queries/zorba/index/match_veq_08.xqlib	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 
 import module namespace db = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare collection db28:answers as object()*;
 

=== modified file 'test/rbkt/Queries/zorba/index/match_veq_09.xqlib'
--- test/rbkt/Queries/zorba/index/match_veq_09.xqlib	2013-02-21 21:46:03 +0000
+++ test/rbkt/Queries/zorba/index/match_veq_09.xqlib	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 
 import module namespace db = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare collection db28:answers as object()*;
 

=== modified file 'test/rbkt/Queries/zorba/index/match_veq_10.xqlib'
--- test/rbkt/Queries/zorba/index/match_veq_10.xqlib	2013-02-21 22:41:14 +0000
+++ test/rbkt/Queries/zorba/index/match_veq_10.xqlib	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 import module namespace db = 
 "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare collection db28:answers as object()*;
 

=== modified file 'test/rbkt/Queries/zorba/index/match_veq_11.xqlib'
--- test/rbkt/Queries/zorba/index/match_veq_11.xqlib	2013-02-22 00:08:45 +0000
+++ test/rbkt/Queries/zorba/index/match_veq_11.xqlib	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 import module namespace db = 
 "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare collection ca:custaccs as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/index/match_vrange_01.xqlib'
--- test/rbkt/Queries/zorba/index/match_vrange_01.xqlib	2013-01-29 06:01:31 +0000
+++ test/rbkt/Queries/zorba/index/match_vrange_01.xqlib	2013-08-09 09:26:44 +0000
@@ -13,7 +13,7 @@
 import module namespace idml = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare %private %an:ordered collection data:parents;

=== modified file 'test/rbkt/Queries/zorba/index/match_vrange_02.xq'
--- test/rbkt/Queries/zorba/index/match_vrange_02.xq	2013-01-11 22:14:05 +0000
+++ test/rbkt/Queries/zorba/index/match_vrange_02.xq	2013-08-09 09:26:44 +0000
@@ -13,7 +13,7 @@
 import module namespace idml = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare function

=== modified file 'test/rbkt/Queries/zorba/index/match_vrange_02.xqlib'
--- test/rbkt/Queries/zorba/index/match_vrange_02.xqlib	2013-01-29 06:01:31 +0000
+++ test/rbkt/Queries/zorba/index/match_vrange_02.xqlib	2013-08-09 09:26:44 +0000
@@ -12,7 +12,7 @@
 import module namespace idml = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare construction strip;
 

=== modified file 'test/rbkt/Queries/zorba/index/match_vrange_02a.xq'
--- test/rbkt/Queries/zorba/index/match_vrange_02a.xq	2013-01-04 13:50:49 +0000
+++ test/rbkt/Queries/zorba/index/match_vrange_02a.xq	2013-08-09 09:26:44 +0000
@@ -13,7 +13,7 @@
 import module namespace idml = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare function 

=== modified file 'test/rbkt/Queries/zorba/index/match_vrange_02b.xq'
--- test/rbkt/Queries/zorba/index/match_vrange_02b.xq	2013-01-12 22:10:40 +0000
+++ test/rbkt/Queries/zorba/index/match_vrange_02b.xq	2013-08-09 09:26:44 +0000
@@ -13,7 +13,7 @@
 import module namespace idml = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare variable $doc11 := 

=== modified file 'test/rbkt/Queries/zorba/index/match_vrange_03.xq'
--- test/rbkt/Queries/zorba/index/match_vrange_03.xq	2013-01-29 06:01:31 +0000
+++ test/rbkt/Queries/zorba/index/match_vrange_03.xq	2013-08-09 09:26:44 +0000
@@ -13,7 +13,7 @@
 import module namespace idml = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare function

=== modified file 'test/rbkt/Queries/zorba/index/match_vrange_03.xqlib'
--- test/rbkt/Queries/zorba/index/match_vrange_03.xqlib	2013-01-29 06:01:31 +0000
+++ test/rbkt/Queries/zorba/index/match_vrange_03.xqlib	2013-08-09 09:26:44 +0000
@@ -12,7 +12,7 @@
 import module namespace idml = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare construction strip;
 

=== modified file 'test/rbkt/Queries/zorba/index/match_vrange_04.xqlib'
--- test/rbkt/Queries/zorba/index/match_vrange_04.xqlib	2013-04-27 16:36:36 +0000
+++ test/rbkt/Queries/zorba/index/match_vrange_04.xqlib	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare %an:mutable %an:unordered %an:mutable-nodes collection db28:foo;
 

=== modified file 'test/rbkt/Queries/zorba/index/match_vrange_05.xqlib'
--- test/rbkt/Queries/zorba/index/match_vrange_05.xqlib	2013-05-04 21:26:57 +0000
+++ test/rbkt/Queries/zorba/index/match_vrange_05.xqlib	2013-08-09 09:26:44 +0000
@@ -10,7 +10,7 @@
 import module namespace iddl = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare %an:ordered collection foo:foo as object()*;

=== modified file 'test/rbkt/Queries/zorba/index/match_vrange_06.xqlib'
--- test/rbkt/Queries/zorba/index/match_vrange_06.xqlib	2013-05-09 18:50:15 +0000
+++ test/rbkt/Queries/zorba/index/match_vrange_06.xqlib	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare %an:mutable %an:unordered %an:mutable-nodes collection db28:foo;
 

=== modified file 'test/rbkt/Queries/zorba/index/multi_key_01.xq'
--- test/rbkt/Queries/zorba/index/multi_key_01.xq	2013-01-03 20:25:05 +0000
+++ test/rbkt/Queries/zorba/index/multi_key_01.xq	2013-08-09 09:26:44 +0000
@@ -12,7 +12,7 @@
 import module namespace idml = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare variable $doc11 := 

=== modified file 'test/rbkt/Queries/zorba/index/multi_key_01.xqlib'
--- test/rbkt/Queries/zorba/index/multi_key_01.xqlib	2013-01-03 20:25:05 +0000
+++ test/rbkt/Queries/zorba/index/multi_key_01.xqlib	2013-08-09 09:26:44 +0000
@@ -12,7 +12,7 @@
 import module namespace idml = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare construction strip;
 

=== modified file 'test/rbkt/Queries/zorba/index/multi_key_02.xq'
--- test/rbkt/Queries/zorba/index/multi_key_02.xq	2013-01-03 20:25:05 +0000
+++ test/rbkt/Queries/zorba/index/multi_key_02.xq	2013-08-09 09:26:44 +0000
@@ -12,7 +12,7 @@
 import module namespace idml = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare variable $doc11 := 

=== modified file 'test/rbkt/Queries/zorba/index/multi_key_02.xqlib'
--- test/rbkt/Queries/zorba/index/multi_key_02.xqlib	2013-01-03 20:25:05 +0000
+++ test/rbkt/Queries/zorba/index/multi_key_02.xqlib	2013-08-09 09:26:44 +0000
@@ -12,7 +12,7 @@
 import module namespace idml = 
 "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare construction strip;
 

=== modified file 'test/rbkt/Queries/zorba/index/numbers.xqlib'
--- test/rbkt/Queries/zorba/index/numbers.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/numbers.xqlib	2013-08-09 09:26:44 +0000
@@ -6,7 +6,7 @@
 import module namespace index_ddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 import module namespace index_dml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 
 declare variable $num:collname := xs:QName("num:numbers");

=== modified file 'test/rbkt/Queries/zorba/index/paging.xqlib'
--- test/rbkt/Queries/zorba/index/paging.xqlib	2013-01-03 20:25:05 +0000
+++ test/rbkt/Queries/zorba/index/paging.xqlib	2013-08-09 09:26:44 +0000
@@ -5,7 +5,7 @@
 import module namespace iddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare collection data:people as node()*;
 declare variable $data:people := xs:QName("data:people");

=== modified file 'test/rbkt/Queries/zorba/index/remove_collection_with_index.xqlib'
--- test/rbkt/Queries/zorba/index/remove_collection_with_index.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/remove_collection_with_index.xqlib	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection decl:coll1;
 

=== modified file 'test/rbkt/Queries/zorba/index/undo2.xqlib'
--- test/rbkt/Queries/zorba/index/undo2.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/index/undo2.xqlib	2013-08-09 09:26:44 +0000
@@ -5,7 +5,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare variable $auctions:auctions1 := xs:QName("auctions:auctions1");
 declare variable $auctions:PersonId1 := xs:QName("auctions:PersonId1");

=== modified file 'test/rbkt/Queries/zorba/index/undo4.xqlib'
--- test/rbkt/Queries/zorba/index/undo4.xqlib	2012-07-03 03:12:05 +0000
+++ test/rbkt/Queries/zorba/index/undo4.xqlib	2013-08-09 09:26:44 +0000
@@ -5,7 +5,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 

=== modified file 'test/rbkt/Queries/zorba/index/unique.xqlib'
--- test/rbkt/Queries/zorba/index/unique.xqlib	2012-04-22 21:55:56 +0000
+++ test/rbkt/Queries/zorba/index/unique.xqlib	2013-08-09 09:26:44 +0000
@@ -5,7 +5,7 @@
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 import module namespace idml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare variable $auctions:auctions1 := xs:QName("auctions:auctions1");
 declare variable $auctions:PersonId1 := xs:QName("auctions:PersonId1");

=== modified file 'test/rbkt/Queries/zorba/jsoniq/collection-and-index/foaf_module-no-index.xqlib'
--- test/rbkt/Queries/zorba/jsoniq/collection-and-index/foaf_module-no-index.xqlib	2012-06-15 14:33:58 +0000
+++ test/rbkt/Queries/zorba/jsoniq/collection-and-index/foaf_module-no-index.xqlib	2013-08-09 09:26:44 +0000
@@ -6,7 +6,7 @@
 import module namespace index_ddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 import module namespace index_dml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $foaf:network:= xs:QName("foaf:network");
 

=== modified file 'test/rbkt/Queries/zorba/jsoniq/collection-and-index/foaf_module-with-index-and-xml.xqlib'
--- test/rbkt/Queries/zorba/jsoniq/collection-and-index/foaf_module-with-index-and-xml.xqlib	2012-09-04 23:48:51 +0000
+++ test/rbkt/Queries/zorba/jsoniq/collection-and-index/foaf_module-with-index-and-xml.xqlib	2013-08-09 09:26:44 +0000
@@ -6,7 +6,7 @@
 import module namespace index_ddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 import module namespace index_dml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $foaf:network:= xs:QName("foaf:network");
 declare variable $foaf:person:= xs:QName("foaf:person");

=== modified file 'test/rbkt/Queries/zorba/jsoniq/collection-and-index/foaf_module-with-index.xqlib'
--- test/rbkt/Queries/zorba/jsoniq/collection-and-index/foaf_module-with-index.xqlib	2012-06-15 14:37:19 +0000
+++ test/rbkt/Queries/zorba/jsoniq/collection-and-index/foaf_module-with-index.xqlib	2013-08-09 09:26:44 +0000
@@ -6,7 +6,7 @@
 import module namespace index_ddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 import module namespace index_dml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $foaf:network:= xs:QName("foaf:network");
 declare variable $foaf:person:= xs:QName("foaf:person");

=== modified file 'test/rbkt/Queries/zorba/jsoniq/dataguide.xq'
--- test/rbkt/Queries/zorba/jsoniq/dataguide.xq	2013-03-20 01:19:04 +0000
+++ test/rbkt/Queries/zorba/jsoniq/dataguide.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare variable $input:=
   for $i in 1 to 1000

=== modified file 'test/rbkt/Queries/zorba/jsoniq/dataguide1.jq'
--- test/rbkt/Queries/zorba/jsoniq/dataguide1.jq	2013-05-13 12:19:46 +0000
+++ test/rbkt/Queries/zorba/jsoniq/dataguide1.jq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare default function namespace "foo.com";
 

=== modified file 'test/rbkt/Queries/zorba/misc/guestbook.xqlib'
--- test/rbkt/Queries/zorba/misc/guestbook.xqlib	2012-06-21 09:42:44 +0000
+++ test/rbkt/Queries/zorba/misc/guestbook.xqlib	2013-08-09 09:26:44 +0000
@@ -6,7 +6,7 @@
 
 import module namespace db = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare collection guestbook:entries as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/modules/schema1-lib1.xqlib'
--- test/rbkt/Queries/zorba/modules/schema1-lib1.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/modules/schema1-lib1.xqlib	2013-08-09 09:26:44 +0000
@@ -8,7 +8,7 @@
 import schema namespace foo = "http://expath.org/ns/http-client";;
 :)
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function f:test($e)
 {

=== modified file 'test/rbkt/Queries/zorba/modules/schema1-lib2.xqlib'
--- test/rbkt/Queries/zorba/modules/schema1-lib2.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/modules/schema1-lib2.xqlib	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace lib = "http://www.example.com/lib";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare namespace foo = "http://expath.org/ns/http-client";;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/baseuri.xq'
--- test/rbkt/Queries/zorba/no-copy/baseuri.xq	2012-10-12 09:05:54 +0000
+++ test/rbkt/Queries/zorba/no-copy/baseuri.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare base-uri "http://x.com/root";;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/dataguide-c.xq'
--- test/rbkt/Queries/zorba/no-copy/dataguide-c.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/dataguide-c.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace map = 
   "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:assignable variable $co as xs:integer :=0;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/dataguide-nc.xq'
--- test/rbkt/Queries/zorba/no-copy/dataguide-nc.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/dataguide-nc.xq	2013-08-09 09:26:44 +0000
@@ -1,9 +1,9 @@
 import module namespace map = 
   "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/dataguide2-c.xq'
--- test/rbkt/Queries/zorba/no-copy/dataguide2-c.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/dataguide2-c.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 
 declare function local:collapseNodes($x as node()*) as node()*

=== modified file 'test/rbkt/Queries/zorba/no-copy/dataguide2-nc.xq'
--- test/rbkt/Queries/zorba/no-copy/dataguide2-nc.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/dataguide2-nc.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-
-
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace ann = "http://zorba.io/annotations";;
+
+
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/dblp-q0.xq'
--- test/rbkt/Queries/zorba/no-copy/dblp-q0.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/dblp-q0.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/eval12.xq'
--- test/rbkt/Queries/zorba/no-copy/eval12.xq	2012-10-09 16:33:56 +0000
+++ test/rbkt/Queries/zorba/no-copy/eval12.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 import module namespace refl = "http://www.zorba-xquery.com/modules/reflection";;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/eval15.xq'
--- test/rbkt/Queries/zorba/no-copy/eval15.xq	2012-10-09 16:33:56 +0000
+++ test/rbkt/Queries/zorba/no-copy/eval15.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 import module namespace refl = "http://www.zorba-xquery.com/modules/reflection";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 declare variable $local:account  := ();

=== modified file 'test/rbkt/Queries/zorba/no-copy/hashjoin-9065.xq'
--- test/rbkt/Queries/zorba/no-copy/hashjoin-9065.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/hashjoin-9065.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/hashjoin-9198.xq'
--- test/rbkt/Queries/zorba/no-copy/hashjoin-9198.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/hashjoin-9198.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/hashjoin-9199.xq'
--- test/rbkt/Queries/zorba/no-copy/hashjoin-9199.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/hashjoin-9199.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/hashjoin-9212.xq'
--- test/rbkt/Queries/zorba/no-copy/hashjoin-9212.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/hashjoin-9212.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/hashjoin-9389.xq'
--- test/rbkt/Queries/zorba/no-copy/hashjoin-9389.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/hashjoin-9389.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/hashjoin-9390.xq'
--- test/rbkt/Queries/zorba/no-copy/hashjoin-9390.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/hashjoin-9390.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/hashjoin-9392.xq'
--- test/rbkt/Queries/zorba/no-copy/hashjoin-9392.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/hashjoin-9392.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/hashjoin-gary1.xq'
--- test/rbkt/Queries/zorba/no-copy/hashjoin-gary1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/hashjoin-gary1.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/hashjoin-idx1.xq'
--- test/rbkt/Queries/zorba/no-copy/hashjoin-idx1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/hashjoin-idx1.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/hashjoin-idx4.xq'
--- test/rbkt/Queries/zorba/no-copy/hashjoin-idx4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/hashjoin-idx4.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/hashjoin-q8.xq'
--- test/rbkt/Queries/zorba/no-copy/hashjoin-q8.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/hashjoin-q8.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/node-copy-01.xq'
--- test/rbkt/Queries/zorba/no-copy/node-copy-01.xq	2012-10-05 08:48:49 +0000
+++ test/rbkt/Queries/zorba/no-copy/node-copy-01.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 import module namespace node = "http://www.zorba-xquery.com/modules/node";;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/node-copy-02.xq'
--- test/rbkt/Queries/zorba/no-copy/node-copy-02.xq	2012-10-05 08:48:49 +0000
+++ test/rbkt/Queries/zorba/no-copy/node-copy-02.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 import module namespace node = "http://www.zorba-xquery.com/modules/node";;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/node-copy-03.xq'
--- test/rbkt/Queries/zorba/no-copy/node-copy-03.xq	2012-10-05 08:48:49 +0000
+++ test/rbkt/Queries/zorba/no-copy/node-copy-03.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 import module namespace node = "http://www.zorba-xquery.com/modules/node";;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/path17.xq'
--- test/rbkt/Queries/zorba/no-copy/path17.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/path17.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q1.xq'
--- test/rbkt/Queries/zorba/no-copy/q1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q1.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q10.xq'
--- test/rbkt/Queries/zorba/no-copy/q10.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q10.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q11.xq'
--- test/rbkt/Queries/zorba/no-copy/q11.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q11.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q12.xq'
--- test/rbkt/Queries/zorba/no-copy/q12.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q12.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q13.xq'
--- test/rbkt/Queries/zorba/no-copy/q13.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q13.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q14.xq'
--- test/rbkt/Queries/zorba/no-copy/q14.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q14.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q15.xq'
--- test/rbkt/Queries/zorba/no-copy/q15.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q15.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q16.xq'
--- test/rbkt/Queries/zorba/no-copy/q16.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q16.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q17.xq'
--- test/rbkt/Queries/zorba/no-copy/q17.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q17.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q18.xq'
--- test/rbkt/Queries/zorba/no-copy/q18.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q18.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 declare namespace local = "http://www.foobar.org";;
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q19.xq'
--- test/rbkt/Queries/zorba/no-copy/q19.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q19.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q2.xq'
--- test/rbkt/Queries/zorba/no-copy/q2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q2.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q20.xq'
--- test/rbkt/Queries/zorba/no-copy/q20.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q20.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q21.xq'
--- test/rbkt/Queries/zorba/no-copy/q21.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q21.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $glob as element():= <glob/>;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q3.xq'
--- test/rbkt/Queries/zorba/no-copy/q3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q3.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q4.xq'
--- test/rbkt/Queries/zorba/no-copy/q4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q4.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q5.xq'
--- test/rbkt/Queries/zorba/no-copy/q5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q5.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q6.xq'
--- test/rbkt/Queries/zorba/no-copy/q6.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q6.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q7.xq'
--- test/rbkt/Queries/zorba/no-copy/q7.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q7.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q8.xq'
--- test/rbkt/Queries/zorba/no-copy/q8.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q8.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/q9.xq'
--- test/rbkt/Queries/zorba/no-copy/q9.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/q9.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/recursive_01.xq'
--- test/rbkt/Queries/zorba/no-copy/recursive_01.xq	2012-10-12 09:05:54 +0000
+++ test/rbkt/Queries/zorba/no-copy/recursive_01.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-
-
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace ann = "http://zorba.io/annotations";;
+
+
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/ser_01.xq'
--- test/rbkt/Queries/zorba/no-copy/ser_01.xq	2012-10-01 08:31:58 +0000
+++ test/rbkt/Queries/zorba/no-copy/ser_01.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare copy-namespaces preserve, inherit;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/ser_02.xq'
--- test/rbkt/Queries/zorba/no-copy/ser_02.xq	2012-10-01 08:31:58 +0000
+++ test/rbkt/Queries/zorba/no-copy/ser_02.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare copy-namespaces preserve, no-inherit;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/ser_03.xq'
--- test/rbkt/Queries/zorba/no-copy/ser_03.xq	2012-10-02 11:57:15 +0000
+++ test/rbkt/Queries/zorba/no-copy/ser_03.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 
 xquery version "1.0" encoding "UTF-8";
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/test2.xq'
--- test/rbkt/Queries/zorba/no-copy/test2.xq	2012-06-08 11:00:08 +0000
+++ test/rbkt/Queries/zorba/no-copy/test2.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare construction strip;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/test4.xq'
--- test/rbkt/Queries/zorba/no-copy/test4.xq	2012-10-02 22:10:55 +0000
+++ test/rbkt/Queries/zorba/no-copy/test4.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare construction strip;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/test5.xq'
--- test/rbkt/Queries/zorba/no-copy/test5.xq	2012-10-02 22:10:55 +0000
+++ test/rbkt/Queries/zorba/no-copy/test5.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare construction strip;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/test6.xq'
--- test/rbkt/Queries/zorba/no-copy/test6.xq	2012-10-10 13:05:50 +0000
+++ test/rbkt/Queries/zorba/no-copy/test6.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare construction strip;
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/udfs1.xq'
--- test/rbkt/Queries/zorba/no-copy/udfs1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/udfs1.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/no-copy/udfs2.xq'
--- test/rbkt/Queries/zorba/no-copy/udfs2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/no-copy/udfs2.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 
 
-declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
+declare namespace opt = "http://zorba.io/options/optimizer";;
 
 declare option opt:enable "for-serialization-only";
 

=== modified file 'test/rbkt/Queries/zorba/nondeterministic/datetime.xq'
--- test/rbkt/Queries/zorba/nondeterministic/datetime.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/nondeterministic/datetime.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 import module namespace datetime = "http://www.zorba-xquery.com/modules/datetime";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:index()
 { 

=== modified file 'test/rbkt/Queries/zorba/options/unknown_1.xq'
--- test/rbkt/Queries/zorba/options/unknown_1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/options/unknown_1.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 (: unknown options in Zorba's namespace raise an error:)
-declare namespace op = "http://www.zorba-xquery.com/options";;
+declare namespace op = "http://zorba.io/options";;
 
 declare option op:blub "";
 

=== modified file 'test/rbkt/Queries/zorba/parser/syntax-errors/missing-comma-02.xq'
--- test/rbkt/Queries/zorba/parser/syntax-errors/missing-comma-02.xq	2013-01-09 08:47:50 +0000
+++ test/rbkt/Queries/zorba/parser/syntax-errors/missing-comma-02.xq	2013-08-09 09:26:44 +0000
@@ -10,7 +10,7 @@
 {
 
 refl:eval(
-'declare namespace an = "http://www.zorba-xquery.com/annotations";;
+'declare namespace an = "http://zorba.io/annotations";;
 
  declare %an:sequential function local:image(
    $id as xs:string, $width as xs:int*,

=== modified file 'test/rbkt/Queries/zorba/parser/syntax-errors/missing-semicolon-05.xq'
--- test/rbkt/Queries/zorba/parser/syntax-errors/missing-semicolon-05.xq	2013-01-08 16:08:11 +0000
+++ test/rbkt/Queries/zorba/parser/syntax-errors/missing-semicolon-05.xq	2013-08-09 09:26:44 +0000
@@ -10,7 +10,7 @@
 {
 
 refl:eval(
-'declare namespace an = "http://www.zorba-xquery.com/annotations";;
+'declare namespace an = "http://zorba.io/annotations";;
 
 declare %an:sequential function local:func($a, $b) {
   if ($a) then {

=== modified file 'test/rbkt/Queries/zorba/reference/collections.xqdata'
--- test/rbkt/Queries/zorba/reference/collections.xqdata	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/reference/collections.xqdata	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace ns = "http://example.org/datamodule/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:ordered collection ns:test as node()*;
 declare collection ns:test2 as node()*;

=== modified file 'test/rbkt/Queries/zorba/reference/json-reference_3.xq'
--- test/rbkt/Queries/zorba/reference/json-reference_3.xq	2013-07-24 07:29:14 +0000
+++ test/rbkt/Queries/zorba/reference/json-reference_3.xq	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/reference/json-reference_4.xq'
--- test/rbkt/Queries/zorba/reference/json-reference_4.xq	2013-07-24 07:29:14 +0000
+++ test/rbkt/Queries/zorba/reference/json-reference_4.xq	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/reference/json-reference_5.xq'
--- test/rbkt/Queries/zorba/reference/json-reference_5.xq	2013-07-24 07:29:14 +0000
+++ test/rbkt/Queries/zorba/reference/json-reference_5.xq	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/reference/reference_coll_1.xq'
--- test/rbkt/Queries/zorba/reference/reference_coll_1.xq	2013-07-24 08:12:12 +0000
+++ test/rbkt/Queries/zorba/reference/reference_coll_1.xq	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/reference/reference_coll_2.xq'
--- test/rbkt/Queries/zorba/reference/reference_coll_2.xq	2013-07-24 08:12:12 +0000
+++ test/rbkt/Queries/zorba/reference/reference_coll_2.xq	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/reference/reference_coll_3.xq'
--- test/rbkt/Queries/zorba/reference/reference_coll_3.xq	2013-07-24 08:12:12 +0000
+++ test/rbkt/Queries/zorba/reference/reference_coll_3.xq	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/reference/reference_coll_4.xq'
--- test/rbkt/Queries/zorba/reference/reference_coll_4.xq	2013-07-24 23:54:44 +0000
+++ test/rbkt/Queries/zorba/reference/reference_coll_4.xq	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/reference/reference_coll_5.xq'
--- test/rbkt/Queries/zorba/reference/reference_coll_5.xq	2013-07-24 23:54:44 +0000
+++ test/rbkt/Queries/zorba/reference/reference_coll_5.xq	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 import module namespace ref = "http://zorba.io/modules/reference";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test()
 {

=== modified file 'test/rbkt/Queries/zorba/schemas/is-validated.xq'
--- test/rbkt/Queries/zorba/schemas/is-validated.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/schemas/is-validated.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace schema = "http://www.zorba-xquery.com/modules/schema";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $var := ();
 

=== modified file 'test/rbkt/Queries/zorba/scripting/disable_scripting.xq'
--- test/rbkt/Queries/zorba/scripting/disable_scripting.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/disable_scripting.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace op = "http://www.zorba-xquery.com/options/features";;
+declare namespace op = "http://zorba.io/options/features";;
 
 declare option op:disable "scripting";
 

=== modified file 'test/rbkt/Queries/zorba/scripting/exit1.xq'
--- test/rbkt/Queries/zorba/scripting/exit1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/exit1.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function local:magic-trick() 
 {

=== modified file 'test/rbkt/Queries/zorba/scripting/exit5.xq'
--- test/rbkt/Queries/zorba/scripting/exit5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/exit5.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function local:searchFor($obj as xs:string) 
 {

=== modified file 'test/rbkt/Queries/zorba/scripting/exit6.xq'
--- test/rbkt/Queries/zorba/scripting/exit6.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/exit6.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function local:searchFor($obj as xs:string) 
 {

=== modified file 'test/rbkt/Queries/zorba/scripting/exit7.xq'
--- test/rbkt/Queries/zorba/scripting/exit7.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/exit7.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:cook() as element(soup)
 {

=== modified file 'test/rbkt/Queries/zorba/scripting/flwor1.xq'
--- test/rbkt/Queries/zorba/scripting/flwor1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/flwor1.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $col := xs:QName("myCollection");
 

=== modified file 'test/rbkt/Queries/zorba/scripting/flwor12.xq'
--- test/rbkt/Queries/zorba/scripting/flwor12.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/flwor12.xq	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 
 declare variable $col := xs:QName("myCollection");

=== modified file 'test/rbkt/Queries/zorba/scripting/flwor15.xq'
--- test/rbkt/Queries/zorba/scripting/flwor15.xq	2012-03-28 05:19:57 +0000
+++ test/rbkt/Queries/zorba/scripting/flwor15.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace map = "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $local:processed-internal-links as xs:QName := 
 xs:QName("processed-internal-links");

=== modified file 'test/rbkt/Queries/zorba/scripting/flwor2.xq'
--- test/rbkt/Queries/zorba/scripting/flwor2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/flwor2.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $col := xs:QName("myCollection");
 

=== modified file 'test/rbkt/Queries/zorba/scripting/flwor3.xq'
--- test/rbkt/Queries/zorba/scripting/flwor3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/flwor3.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $col := xs:QName("myCollection");
 

=== modified file 'test/rbkt/Queries/zorba/scripting/flwor4.xq'
--- test/rbkt/Queries/zorba/scripting/flwor4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/flwor4.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $col := xs:QName("myCollection");
 

=== modified file 'test/rbkt/Queries/zorba/scripting/flwor5.xq'
--- test/rbkt/Queries/zorba/scripting/flwor5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/flwor5.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $col := xs:QName("myCollection");
 

=== modified file 'test/rbkt/Queries/zorba/scripting/flwor6.xq'
--- test/rbkt/Queries/zorba/scripting/flwor6.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/flwor6.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $col := xs:QName("myCollection");
 

=== modified file 'test/rbkt/Queries/zorba/scripting/gflwor1.xq'
--- test/rbkt/Queries/zorba/scripting/gflwor1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/gflwor1.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $col := xs:QName("myCollection");
 

=== modified file 'test/rbkt/Queries/zorba/scripting/gflwor2.xq'
--- test/rbkt/Queries/zorba/scripting/gflwor2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/gflwor2.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $col := xs:QName("myCollection");
 

=== modified file 'test/rbkt/Queries/zorba/scripting/local_vars3.xq'
--- test/rbkt/Queries/zorba/scripting/local_vars3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/local_vars3.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 declare namespace ann = "http://www.my-annotation.com/";;
-declare namespace op = "http://www.zorba-xquery.com/options/warnings";;
+declare namespace op = "http://zorba.io/options/warnings";;
 
 declare option op:disable "all";
 

=== modified file 'test/rbkt/Queries/zorba/scripting/nonsequential1.xq'
--- test/rbkt/Queries/zorba/scripting/nonsequential1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/nonsequential1.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:nonsequential %ann:sequential function local:foo() 
 {

=== modified file 'test/rbkt/Queries/zorba/scripting/nonsequential2.xq'
--- test/rbkt/Queries/zorba/scripting/nonsequential2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/nonsequential2.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:nonsequential function local:foo() 
 {

=== modified file 'test/rbkt/Queries/zorba/scripting/nonsequential3.xq'
--- test/rbkt/Queries/zorba/scripting/nonsequential3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/nonsequential3.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 import module namespace map = "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:nonsequential function local:foo() 
 {

=== modified file 'test/rbkt/Queries/zorba/scripting/q1.xq'
--- test/rbkt/Queries/zorba/scripting/q1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/q1.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $sequence := (65 to 90);
 declare variable $var := 1;

=== modified file 'test/rbkt/Queries/zorba/scripting/q2.xq'
--- test/rbkt/Queries/zorba/scripting/q2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/q2.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $sequence := (65 to 90);
 declare variable $var := 1;

=== modified file 'test/rbkt/Queries/zorba/scripting/q3.xq'
--- test/rbkt/Queries/zorba/scripting/q3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/q3.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $sequence := (65 to 90);
 declare variable $var := 1;

=== modified file 'test/rbkt/Queries/zorba/scripting/udf1.xq'
--- test/rbkt/Queries/zorba/scripting/udf1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/scripting/udf1.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace x =
 "http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo()
 {

=== modified file 'test/rbkt/Queries/zorba/sequences/seq66.xq'
--- test/rbkt/Queries/zorba/sequences/seq66.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/sequences/seq66.xq	2013-08-09 09:26:44 +0000
@@ -1,1 +1,1 @@
-fn:index-of (("a", "b", "c"), "a", "http://www.zorba-xquery.com/collations/IDENTICAL/en/US";)
+fn:index-of (("a", "b", "c"), "a", "http://zorba.io/collations/IDENTICAL/en/US";)

=== modified file 'test/rbkt/Queries/zorba/sequences/seq68.xq'
--- test/rbkt/Queries/zorba/sequences/seq68.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/sequences/seq68.xq	2013-08-09 09:26:44 +0000
@@ -1,1 +1,1 @@
-fn:index-of (("a", "b", "c"), "a", ("http://www.zorba-xquery.com/collations/IDENTICAL/en/US";, "foo"))
+fn:index-of (("a", "b", "c"), "a", ("http://zorba.io/collations/IDENTICAL/en/US";, "foo"))

=== modified file 'test/rbkt/Queries/zorba/spec/xquery_1_0.xq'
--- test/rbkt/Queries/zorba/spec/xquery_1_0.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/spec/xquery_1_0.xq	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 import module namespace util = "http://www.zorba-xquery.com/util"; at "xquery_spec.xqi";
 
 import module namespace sctx = "http://www.zorba-xquery.com/modules/introspection/sctx";;
-import module namespace functx = "http://www.functx.com/";;
+import module namespace functx = "http://www.functx.com";;
 
 declare variable $xquery_version as xs:string := "1.0";
 

=== modified file 'test/rbkt/Queries/zorba/spec/xquery_3_0.xq'
--- test/rbkt/Queries/zorba/spec/xquery_3_0.xq	2012-02-01 09:29:01 +0000
+++ test/rbkt/Queries/zorba/spec/xquery_3_0.xq	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 import module namespace util = "http://www.zorba-xquery.com/util"; at "xquery_spec.xqi";
 
 import module namespace sctx = "http://www.zorba-xquery.com/modules/introspection/sctx";;
-import module namespace functx = "http://www.functx.com/";;
+import module namespace functx = "http://www.functx.com";;
 import module namespace file = "http://expath.org/ns/file";;
 
 import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";;

=== modified file 'test/rbkt/Queries/zorba/spec/xquery_spec.xqi'
--- test/rbkt/Queries/zorba/spec/xquery_spec.xqi	2013-06-04 21:47:40 +0000
+++ test/rbkt/Queries/zorba/spec/xquery_spec.xqi	2013-08-09 09:26:44 +0000
@@ -9,7 +9,7 @@
 
 import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $util:xquery_version_1_0 := "1.0";
 declare variable $util:xquery_version_3_0 := "3.0";

=== modified file 'test/rbkt/Queries/zorba/store/documents.xq'
--- test/rbkt/Queries/zorba/store/documents.xq	2013-08-07 05:28:39 +0000
+++ test/rbkt/Queries/zorba/store/documents.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 import module namespace doc = "http://www.zorba-xquery.com/modules/store/dynamic/documents";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace zerr = "http://zorba.io/errors";;
 
 declare base-uri "http://www.zorba-xquery.com/";;

=== modified file 'test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm'
--- test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm	2013-08-07 23:46:25 +0000
+++ test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm	2013-08-09 09:26:44 +0000
@@ -694,7 +694,7 @@
               <span>www.functx.com</span>
               <ul>
                 <li>
-                  <a href="www.functx.com_index.html" title="http://www.functx.com/";>functx</a>
+                  <a href="www.functx.com_index.html" title="http://www.functx.com";>functx</a>
                   <sup>
                     <img src="images/ZCsmall.gif" alt="ZC" title="This module is part of Zorba core." />
                   </sup>
@@ -871,7 +871,7 @@
         <table class="varlist">
           <tr>
             <td>ann</td>
-            <td>http://www.zorba-xquery.com/annotations</td>
+            <td>http://zorba.io/annotations</td>
           </tr>
           <tr>
             <td>err</td>
@@ -891,7 +891,7 @@
           </tr>
           <tr>
             <td>ver</td>
-            <td>http://www.zorba-xquery.com/options/versioning</td>
+            <td>http://zorba.io/options/versioning</td>
           </tr>
         </table>
         <div class="section">

=== modified file 'test/rbkt/Queries/zorba/string/ContainsFunc/ContainsFunc4.xq'
--- test/rbkt/Queries/zorba/string/ContainsFunc/ContainsFunc4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/string/ContainsFunc/ContainsFunc4.xq	2013-08-09 09:26:44 +0000
@@ -1,1 +1,1 @@
-fn:contains ( "abcdefghi", "def", "http://www.zorba-xquery.com/collations/IDENTICAL/en/US";)
+fn:contains ( "abcdefghi", "def", "http://zorba.io/collations/IDENTICAL/en/US";)

=== modified file 'test/rbkt/Queries/zorba/string/Regex/regex_a10.xq'
--- test/rbkt/Queries/zorba/string/Regex/regex_a10.xq	2011-10-31 21:47:18 +0000
+++ test/rbkt/Queries/zorba/string/Regex/regex_a10.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 
 import module namespace file = "http://expath.org/ns/file";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 variable $http-content;
 $http-content := file:read-text(resolve-uri("zorba.html"));

=== modified file 'test/rbkt/Queries/zorba/string/Regex/regex_a11.xq'
--- test/rbkt/Queries/zorba/string/Regex/regex_a11.xq	2011-10-31 21:47:18 +0000
+++ test/rbkt/Queries/zorba/string/Regex/regex_a11.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 
 import module namespace file = "http://expath.org/ns/file";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 variable $http-content;
 $http-content := file:read-text(resolve-uri("zorba2.html"));

=== modified file 'test/rbkt/Queries/zorba/trycatch/trycatch14.xq'
--- test/rbkt/Queries/zorba/trycatch/trycatch14.xq	2012-06-04 10:10:53 +0000
+++ test/rbkt/Queries/zorba/trycatch/trycatch14.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace op = "http://www.zorba-xquery.com/options/features";;
+declare namespace op = "http://zorba.io/options/features";;
 
 declare option op:disable "scripting";
 

=== modified file 'test/rbkt/Queries/zorba/trycatch/trycatch15.xq'
--- test/rbkt/Queries/zorba/trycatch/trycatch15.xq	2012-06-04 10:10:53 +0000
+++ test/rbkt/Queries/zorba/trycatch/trycatch15.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace op = "http://www.zorba-xquery.com/options/features";;
+declare namespace op = "http://zorba.io/options/features";;
 
 declare option op:disable "scripting";
 

=== modified file 'test/rbkt/Queries/zorba/udf/cache_01.xq'
--- test/rbkt/Queries/zorba/udf/cache_01.xq	2013-06-15 21:18:01 +0000
+++ test/rbkt/Queries/zorba/udf/cache_01.xq	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare function local:dummy()
 {

=== modified file 'test/rbkt/Queries/zorba/updates/flwor1.xq'
--- test/rbkt/Queries/zorba/updates/flwor1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/updates/flwor1.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test() 
 {

=== modified file 'test/rbkt/Queries/zorba/updates/upd14.xq'
--- test/rbkt/Queries/zorba/updates/upd14.xq	2012-06-01 08:35:24 +0000
+++ test/rbkt/Queries/zorba/updates/upd14.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 import schema namespace f = "http://www.evaluescience.com/schemas/forms"; at "forms.xsd";
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare %an:no-cache %an:sequential function local:test2() 
 {

=== modified file 'test/rbkt/Queries/zorba/uris/disable-http-2.spec'
--- test/rbkt/Queries/zorba/uris/disable-http-2.spec	2012-11-06 10:11:37 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http-2.spec	2013-08-09 09:26:44 +0000
@@ -1,2 +1,2 @@
-Options: {http://www.zorba-xquery.com/options/features}disable=http-uri-resolution
+Options: {http://zorba.io/options/features}disable=http-uri-resolution
 Error: http://www.w3.org/2005/xqt-errors:XQST0059

=== modified file 'test/rbkt/Queries/zorba/uris/disable-http-3.spec'
--- test/rbkt/Queries/zorba/uris/disable-http-3.spec	2012-11-06 10:11:37 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http-3.spec	2013-08-09 09:26:44 +0000
@@ -1,1 +1,1 @@
-Options: {http://www.zorba-xquery.com/options/features}disable=http-uri-resolution
+Options: {http://zorba.io/options/features}disable=http-uri-resolution

=== modified file 'test/rbkt/Queries/zorba/uris/disable-http-5.xq'
--- test/rbkt/Queries/zorba/uris/disable-http-5.xq	2012-11-08 21:58:20 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http-5.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 (: Cannot specify this option inside query, unfortunately, since options :)
 (: must come after imports. :)
-declare namespace op = "http://www.zorba-xquery.com/options/features";;
+declare namespace op = "http://zorba.io/options/features";;
 declare option op:disable "http-uri-resolution";
 
 1

=== modified file 'test/rbkt/Queries/zorba/uris/disable-http.spec'
--- test/rbkt/Queries/zorba/uris/disable-http.spec	2012-11-06 10:11:37 +0000
+++ test/rbkt/Queries/zorba/uris/disable-http.spec	2013-08-09 09:26:44 +0000
@@ -1,2 +1,2 @@
-Options: {http://www.zorba-xquery.com/options/features}disable=http-uri-resolution
+Options: {http://zorba.io/options/features}disable=http-uri-resolution
 Error: http://www.w3.org/2005/xqt-errors:XQST0059

=== modified file 'test/rbkt/Queries/zorba/versioning/zorba-version1.xq'
--- test/rbkt/Queries/zorba/versioning/zorba-version1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/versioning/zorba-version1.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 (: test that a query can declare a Zorba version it requires :)
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:zorba-version "2.0";
 
 1+1

=== modified file 'test/rbkt/Queries/zorba/versioning/zorba-version2.xq'
--- test/rbkt/Queries/zorba/versioning/zorba-version2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/versioning/zorba-version2.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 (: test for declaring a Zorba version that doesn't meet the current Zorba :)
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:zorba-version "15.0";
 
 1+1

=== modified file 'test/rbkt/Queries/zorba/versioning/zorba-version3.xq'
--- test/rbkt/Queries/zorba/versioning/zorba-version3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/versioning/zorba-version3.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 (: test for declaring invalid Zorba version :)
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:zorba-version "2.0alpha";
 
 1+1

=== modified file 'test/rbkt/Queries/zorba/versioning/zorba-version4.xq'
--- test/rbkt/Queries/zorba/versioning/zorba-version4.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/versioning/zorba-version4.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 (: test for declaring a range of Zorba versions :)
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:zorba-version "1.4-3.0";
 
 1+1

=== modified file 'test/rbkt/Queries/zorba/versioning/zorba-version5.xq'
--- test/rbkt/Queries/zorba/versioning/zorba-version5.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/versioning/zorba-version5.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 (: test for declaring a range of Zorba versions that we don't meet :)
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:zorba-version "3.4-5.0";
 
 1+1

=== modified file 'test/rbkt/Queries/zorba/versioning/zorba-version6.xq'
--- test/rbkt/Queries/zorba/versioning/zorba-version6.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/versioning/zorba-version6.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 (: test for declaring Zorba version including patch number :)
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:zorba-version "2.0.0";
 
 1+1

=== modified file 'test/rbkt/Queries/zorba/xqddf/admin.xq'
--- test/rbkt/Queries/zorba/xqddf/admin.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqddf/admin.xq	2013-08-09 09:26:44 +0000
@@ -8,7 +8,7 @@
 
 import module namespace news-data = "http://www.news.org/data"; at "news-data.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 
 declare %ann:sequential function local:init() 

=== modified file 'test/rbkt/Queries/zorba/xqddf/daniel/xqddf_prolog.xqlib'
--- test/rbkt/Queries/zorba/xqddf/daniel/xqddf_prolog.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqddf/daniel/xqddf_prolog.xqlib	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection xqddf-test:white-collection as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/xqddf/default.xqlib'
--- test/rbkt/Queries/zorba/xqddf/default.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqddf/default.xqlib	2013-08-09 09:26:44 +0000
@@ -7,7 +7,7 @@
 import module namespace index_ddl = "http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
 import module namespace index_dml = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection def:user as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/xqddf/error_01.xqlib'
--- test/rbkt/Queries/zorba/xqddf/error_01.xqlib	2012-10-09 14:59:40 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_01.xqlib	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 
 module namespace error = "http://www.example.com/error";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;

=== modified file 'test/rbkt/Queries/zorba/xqddf/error_02.xqlib'
--- test/rbkt/Queries/zorba/xqddf/error_02.xqlib	2012-10-09 14:59:40 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_02.xqlib	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace error = "http://www.example.com/error";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;

=== modified file 'test/rbkt/Queries/zorba/xqddf/error_03.xqlib'
--- test/rbkt/Queries/zorba/xqddf/error_03.xqlib	2012-10-09 14:59:40 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_03.xqlib	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace error = "http://www.example.com/error";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;

=== modified file 'test/rbkt/Queries/zorba/xqddf/news-data.xqlib'
--- test/rbkt/Queries/zorba/xqddf/news-data.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqddf/news-data.xqlib	2013-08-09 09:26:44 +0000
@@ -7,7 +7,7 @@
 import module namespace init = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace manip = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection news-data:employees
   as schema-element(news:employee)*;

=== modified file 'test/rbkt/Queries/zorba/xqddf/test1_mod2.xqlib'
--- test/rbkt/Queries/zorba/xqddf/test1_mod2.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqddf/test1_mod2.xqlib	2013-08-09 09:26:44 +0000
@@ -8,7 +8,7 @@
 
 import module namespace module1 = "http://www.zorba-xquery.com/module1"; at "test1_mod1.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 
 declare collection module2:coll as node()*;

=== modified file 'test/rbkt/Queries/zorba/xqddf/test2.xqlib'
--- test/rbkt/Queries/zorba/xqddf/test2.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqddf/test2.xqlib	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection test2:foo as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/xqddf/test3.xqlib'
--- test/rbkt/Queries/zorba/xqddf/test3.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqddf/test3.xqlib	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare collection test3:foo as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/xqddf/test4.xqlib'
--- test/rbkt/Queries/zorba/xqddf/test4.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqddf/test4.xqlib	2013-08-09 09:26:44 +0000
@@ -8,7 +8,7 @@
 
 declare namespace d = "http://www.28msec.com/d/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 
 declare collection n:foo as node();

=== modified file 'test/rbkt/Queries/zorba/xqddf/test5.xqlib'
--- test/rbkt/Queries/zorba/xqddf/test5.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqddf/test5.xqlib	2013-08-09 09:26:44 +0000
@@ -1,12 +1,12 @@
 module namespace guestbook = "http://www.28msec.com/guestbook";;
 
-import module namespace functx = "http://www.functx.com/";;
+import module namespace functx = "http://www.functx.com";;
 
 import module namespace db = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
 import module namespace idx = "http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
 
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 
 declare collection guestbook:entries as node()*;
 

=== modified file 'test/rbkt/Queries/zorba/xqdoc/basic.xq'
--- test/rbkt/Queries/zorba/xqdoc/basic.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqdoc/basic.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";;
 import schema namespace xqds = "http://www.xqdoc.org/1.0";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $local:dir :=
   let $base-uri := fn:static-base-uri()

=== modified file 'test/rbkt/Queries/zorba/xqdoc/basic_options.xq'
--- test/rbkt/Queries/zorba/xqdoc/basic_options.xq	2012-09-26 17:39:48 +0000
+++ test/rbkt/Queries/zorba/xqdoc/basic_options.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";;
 import schema namespace xqds = "http://www.xqdoc.org/1.0";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace opt = "http://www.zorba-xquery.com/modules/xqdoc-options";; 
 
 declare variable $local:dir :=

=== modified file 'test/rbkt/Queries/zorba/xqdoc/collindex.xq'
--- test/rbkt/Queries/zorba/xqdoc/collindex.xq	2012-09-24 06:08:17 +0000
+++ test/rbkt/Queries/zorba/xqdoc/collindex.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";;
 import schema namespace xqds = "http://www.xqdoc.org/1.0";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $local:dir :=
   let $base-uri := fn:static-base-uri()

=== modified file 'test/rbkt/Queries/zorba/xqdoc/collindex.xqlib'
--- test/rbkt/Queries/zorba/xqdoc/collindex.xqlib	2012-09-24 07:30:21 +0000
+++ test/rbkt/Queries/zorba/xqdoc/collindex.xqlib	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 module namespace cil = "http://www.zorba-xquery.com/collindex";;
 
-import module namespace functx = "http://www.functx.com/";;
+import module namespace functx = "http://www.functx.com";;
 
 import module namespace req = "http://www.28msec.com/modules/http/request";;
 import module namespace resp = "http://www.28msec.com/modules/http/response";;

=== modified file 'test/rbkt/Queries/zorba/xqdoc/content.xq'
--- test/rbkt/Queries/zorba/xqdoc/content.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqdoc/content.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace file = "http://expath.org/ns/file";;
 import schema namespace xqds = "http://www.xqdoc.org/1.0";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:remove-date($xqdoc)
 {

=== modified file 'test/rbkt/Queries/zorba/xqdoc/content_options.xq'
--- test/rbkt/Queries/zorba/xqdoc/content_options.xq	2012-09-26 17:39:48 +0000
+++ test/rbkt/Queries/zorba/xqdoc/content_options.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 import module namespace file = "http://expath.org/ns/file";;
 import schema namespace xqds = "http://www.xqdoc.org/1.0";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace opt = "http://www.zorba-xquery.com/modules/xqdoc-options";; 
 
 declare %ann:sequential function local:remove-date($xqdoc)

=== modified file 'test/rbkt/Queries/zorba/xqdoc/content_with_error.xq'
--- test/rbkt/Queries/zorba/xqdoc/content_with_error.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqdoc/content_with_error.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";;
 import schema namespace xqds = "http://www.xqdoc.org/1.0";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:remove-date($xqdoc)
 {

=== modified file 'test/rbkt/Queries/zorba/xqdoc/local.xq'
--- test/rbkt/Queries/zorba/xqdoc/local.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqdoc/local.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";;
 import schema namespace xqds = "http://www.xqdoc.org/1.0"; at "xqdoc-1.0.xsd";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $local:dir :=
   let $base-uri := fn:static-base-uri()

=== modified file 'test/rbkt/Queries/zorba/xqdoc/local.xqlib'
--- test/rbkt/Queries/zorba/xqdoc/local.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqdoc/local.xqlib	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";;
 import schema namespace xqds = "http://www.xqdoc.org/1.0"; at "xqdoc-1.0.xsd";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:remove-date($xqdoc)
 {

=== modified file 'test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq'
--- test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq	2013-08-07 05:28:39 +0000
+++ test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq	2013-08-09 09:26:44 +0000
@@ -6,9 +6,9 @@
 
 import schema namespace xqdoc = "http://www.xqdoc.org/1.0";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
-declare namespace zm = "http://www.zorba-xquery.com/manifest";;
+declare namespace zm = "http://zorba.io/manifest";;
 
 declare copy-namespaces preserve, inherit;
 
@@ -62,7 +62,7 @@
           return string-join(
              if(($moduleUri = "http://www.w3.org/2005/xpath-functions";) or
                 ($moduleUri = "http://www.w3.org/2005/xpath-functions/math";) or
-                ($moduleUri = "http://www.functx.com/";) or
+                ($moduleUri = "http://www.functx.com";) or
                 ($moduleUri = "http://www.w3.org/2005/xqt-errors";) or
                 ($moduleUri = "http://zorba.io/errors";) or
                 ($moduleUri = "http://zorba.io/warnings";) or
@@ -118,7 +118,7 @@
     (: Test for explicit XQuery Version :)
     if(($moduleUri = "http://www.w3.org/2005/xpath-functions";) or
        ($moduleUri = "http://www.w3.org/2005/xpath-functions/math";) or
-       ($moduleUri = "http://www.functx.com/";)) then ()
+       ($moduleUri = "http://www.functx.com";)) then ()
     else
       if (fn:not($hasXQueryVersion)) then
       fn:concat("

=== modified file 'test/rbkt/Queries/zorba/xqdoc/no_global_var.xq'
--- test/rbkt/Queries/zorba/xqdoc/no_global_var.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqdoc/no_global_var.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";;
 import schema namespace xqds = "http://www.xqdoc.org/1.0";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $local:dir :=
   let $base-uri := fn:static-base-uri()

=== modified file 'test/rbkt/Queries/zorba/xqdoc/no_global_var.xqlib'
--- test/rbkt/Queries/zorba/xqdoc/no_global_var.xqlib	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqdoc/no_global_var.xqlib	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace foo = "foo:bar";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $foo:foo external;
 

=== modified file 'test/rbkt/Queries/zorba/xqdoc/testSchemaTypes.xq'
--- test/rbkt/Queries/zorba/xqdoc/testSchemaTypes.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqdoc/testSchemaTypes.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 (: test if prefixes declared by schema imports can be used in type constructors :)
 import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $local:dir :=
   let $base-uri := fn:static-base-uri()

=== modified file 'test/rbkt/Queries/zorba/xqdoc/unorderedAnnotations.xq'
--- test/rbkt/Queries/zorba/xqdoc/unorderedAnnotations.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/xqdoc/unorderedAnnotations.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";;
 import schema namespace xqds = "http://www.xqdoc.org/1.0";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $local:dir :=
   let $base-uri := fn:static-base-uri()

=== modified file 'test/rbkt/Queries/zorba/xqxq/error-in-query.xq'
--- test/rbkt/Queries/zorba/xqxq/error-in-query.xq	2013-03-13 21:14:37 +0000
+++ test/rbkt/Queries/zorba/xqxq/error-in-query.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
 
-declare namespace op = 'http://www.zorba-xquery.com/options/features';
-declare namespace f = 'http://www.zorba-xquery.com/features';
+declare namespace op = 'http://zorba.io/options/features';
+declare namespace f = 'http://zorba.io/features';
 
 declare function local:url-resolver($namespace as xs:string, $entity as xs:string) {
 switch($entity)

=== modified file 'test/rbkt/Queries/zorba/xqxq/evaluate-sequential.xq'
--- test/rbkt/Queries/zorba/xqxq/evaluate-sequential.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/xqxq/evaluate-sequential.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 variable $query-key := xqxq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 declare %an:sequential function local:foo() {
   ddl:create(xs:QName("hola"),(<a/>,<b/>));                  
   

=== modified file 'test/rbkt/Queries/zorba/xqxq/evaluate-updating2.xq'
--- test/rbkt/Queries/zorba/xqxq/evaluate-updating2.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/xqxq/evaluate-updating2.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 variable $query-key := xqxq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 declare %an:sequential function local:foo() {
   ddl:create(xs:QName("hola"),(<a/>,<b/>));                  
   

=== modified file 'test/rbkt/Queries/zorba/xqxq/evaluate3.xq'
--- test/rbkt/Queries/zorba/xqxq/evaluate3.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/xqxq/evaluate3.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 variable $query-key := xqxq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 declare %an:sequential function local:foo() {
   ddl:create(xs:QName("hola"),(<a/>,<b/>));                  
   

=== modified file 'test/rbkt/Queries/zorba/xqxq/is-sequential.xq'
--- test/rbkt/Queries/zorba/xqxq/is-sequential.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/xqxq/is-sequential.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 variable $query-key1 := xqxq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 declare %an:sequential function local:foo() {
   ddl:create(xs:QName("hola"),(<a/>,<b/>));                  
   

=== modified file 'test/rbkt/Queries/zorba/xqxq/is-updating.xq'
--- test/rbkt/Queries/zorba/xqxq/is-updating.xq	2012-10-25 00:07:03 +0000
+++ test/rbkt/Queries/zorba/xqxq/is-updating.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 variable $query-key1 := xqxq:prepare-main-module('
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-declare namespace an = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://zorba.io/annotations";;
 declare %an:sequential function local:foo() {
   ddl:create(xs:QName("hola"),(<a/>,<b/>));                  
   

=== modified file 'test/rbkt/Queries/zorba/xqxq/query-plan2.xq'
--- test/rbkt/Queries/zorba/xqxq/query-plan2.xq	2013-03-22 23:09:40 +0000
+++ test/rbkt/Queries/zorba/xqxq/query-plan2.xq	2013-08-09 09:26:44 +0000
@@ -1,11 +1,11 @@
 import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
 
 declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
-declare namespace op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+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($namespace = 'http://test.xq')
+  if($namespace = 'http://test')
   then "module namespace test = 'http://test'; declare function test:foo(){'foo'};"
   else ()
 };

=== modified file 'test/rbkt/Queries/zorba/xqxq/query-plan3.xq'
--- test/rbkt/Queries/zorba/xqxq/query-plan3.xq	2013-03-22 23:09:40 +0000
+++ test/rbkt/Queries/zorba/xqxq/query-plan3.xq	2013-08-09 09:26:44 +0000
@@ -2,8 +2,8 @@
 
 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 op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+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($namespace = 'http://foo')

=== modified file 'test/rbkt/Queries/zorba/xqxq/query-plan4.xq'
--- test/rbkt/Queries/zorba/xqxq/query-plan4.xq	2013-03-22 23:09:40 +0000
+++ test/rbkt/Queries/zorba/xqxq/query-plan4.xq	2013-08-09 09:26:44 +0000
@@ -2,8 +2,8 @@
 
 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 op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+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($namespace = 'http://foo')

=== modified file 'test/rbkt/Queries/zorba/xqxq/uri-mapper.xq'
--- test/rbkt/Queries/zorba/xqxq/uri-mapper.xq	2013-03-13 21:14:37 +0000
+++ test/rbkt/Queries/zorba/xqxq/uri-mapper.xq	2013-08-09 09:26:44 +0000
@@ -2,8 +2,8 @@
 
 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 op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+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($namespace = 'http://foo')

=== modified file 'test/rbkt/Queries/zorba/xqxq/uri-mapper2.xq'
--- test/rbkt/Queries/zorba/xqxq/uri-mapper2.xq	2013-03-13 21:14:37 +0000
+++ test/rbkt/Queries/zorba/xqxq/uri-mapper2.xq	2013-08-09 09:26:44 +0000
@@ -2,8 +2,8 @@
 
 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 op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+declare namespace op = "http://zorba.io/options/features";;
+declare namespace f = "http://zorba.io/features";;
 
 declare function mapper:uri-mapper($namespace as xs:string, $entity as xs:string)
 {

=== modified file 'test/rbkt/Queries/zorba/xqxq/url-module-resolver.xq'
--- test/rbkt/Queries/zorba/xqxq/url-module-resolver.xq	2013-03-13 21:14:37 +0000
+++ test/rbkt/Queries/zorba/xqxq/url-module-resolver.xq	2013-08-09 09:26:44 +0000
@@ -1,11 +1,11 @@
 import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
 
 declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
-declare namespace op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+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($namespace = 'http://test.xq')
+  if($namespace = 'http://test')
   then "module namespace test = 'http://test'; declare function test:foo(){'foo'};"
   else ()
 };

=== modified file 'test/rbkt/Queries/zorba/xqxq/url-schema-resolver.xq'
--- test/rbkt/Queries/zorba/xqxq/url-schema-resolver.xq	2013-03-13 21:14:37 +0000
+++ test/rbkt/Queries/zorba/xqxq/url-schema-resolver.xq	2013-08-09 09:26:44 +0000
@@ -2,8 +2,8 @@
 
 declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
 
-declare namespace op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+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($namespace = 'http://test' and $entity = 'schema')

=== modified file 'test/rbkt/Queries/zorba/xqxq/url-schema-resolver2.xq'
--- test/rbkt/Queries/zorba/xqxq/url-schema-resolver2.xq	2013-03-13 21:14:37 +0000
+++ test/rbkt/Queries/zorba/xqxq/url-schema-resolver2.xq	2013-08-09 09:26:44 +0000
@@ -6,8 +6,8 @@
     "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 op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+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')

=== modified file 'test/rbkt/Queries/zorba/xqxq/url-schema-resolver3.xq'
--- test/rbkt/Queries/zorba/xqxq/url-schema-resolver3.xq	2013-03-13 21:14:37 +0000
+++ test/rbkt/Queries/zorba/xqxq/url-schema-resolver3.xq	2013-08-09 09:26:44 +0000
@@ -2,8 +2,8 @@
 
 declare namespace resolver = 'http://www.zorba-xquery.com/modules/xqxq/url-resolver';
 
-declare namespace op = "http://www.zorba-xquery.com/options/features";;
-declare namespace f = "http://www.zorba-xquery.com/features";;
+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($namespace = 'http://test' and $entity = 'schema')

=== modified file 'test/rbkt/modules/CMakeLists.txt'
--- test/rbkt/modules/CMakeLists.txt	2013-04-17 21:30:29 +0000
+++ test/rbkt/modules/CMakeLists.txt	2013-08-09 09:26:44 +0000
@@ -46,7 +46,7 @@
 DECLARE_ZORBA_MODULE(URI "http://zorba-tests.28msec.us/modules/myschema";
   VERSION 1.0 FILE "schema.xq" TEST_ONLY)
 
-DECLARE_ZORBA_SCHEMA(URI "http://www.zorba-xquery.com/manifest";
+DECLARE_ZORBA_SCHEMA(URI "http://zorba.io/manifest";
   FILE "manifest.xsd" TEST_ONLY)
 
 IF (NOT ZORBA_NO_XMLSCHEMA)

=== modified file 'test/rbkt/modules/bad-ver.xq'
--- test/rbkt/modules/bad-ver.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/modules/bad-ver.xq	2013-08-09 09:26:44 +0000
@@ -2,7 +2,7 @@
 
 module namespace vm = "http://zorba-tests.28msec.us/modules/bad-ver";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.4.";
 
 declare variable $vm:value as xs:string := "version 1";

=== modified file 'test/rbkt/modules/check_manifest.xq'
--- test/rbkt/modules/check_manifest.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/modules/check_manifest.xq	2013-08-09 09:26:44 +0000
@@ -1,4 +1,4 @@
-import schema namespace mani = "http://www.zorba-xquery.com/manifest";;
+import schema namespace mani = "http://zorba.io/manifest";;
 
 declare variable $manifest as xs:string external;
 

=== modified file 'test/rbkt/modules/ext.xq'
--- test/rbkt/modules/ext.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/modules/ext.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 (: Test module with external functions implemented in C++ :)
 module namespace ext = "http://zorba-tests.28msec.us/modules/ext";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 declare function ext:func() as xs:string external;

=== modified file 'test/rbkt/modules/ext2.xq'
--- test/rbkt/modules/ext2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/modules/ext2.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 (: Test module with external functions implemented in C++ :)
 module namespace ext = "http://zorba-tests.28msec.us/modules/ext";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.0";
 
 declare function ext:func() as xs:string external;

=== modified file 'test/rbkt/modules/link.xq'
--- test/rbkt/modules/link.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/modules/link.xq	2013-08-09 09:26:44 +0000
@@ -1,7 +1,7 @@
 (: Test module with external functions implemented in C++, with link libs :)
 module namespace link = "http://zorba-tests.28msec.us/modules/link";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 declare function link:xerces-func() as xs:integer external;

=== modified file 'test/rbkt/modules/manifest.xsd'
--- test/rbkt/modules/manifest.xsd	2013-02-07 17:24:36 +0000
+++ test/rbkt/modules/manifest.xsd	2013-08-09 09:26:44 +0000
@@ -1,5 +1,5 @@
-<xs:schema targetNamespace="http://www.zorba-xquery.com/manifest";
-           xmlns:mani = "http://www.zorba-xquery.com/manifest";
+<xs:schema targetNamespace="http://zorba.io/manifest";
+           xmlns:mani = "http://zorba.io/manifest";
            xmlns:xs="http://www.w3.org/2001/XMLSchema";
            elementFormDefault="qualified">
 

=== modified file 'test/rbkt/modules/module-A.xq'
--- test/rbkt/modules/module-A.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/modules/module-A.xq	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#1.0";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 declare function modA:hello() as xs:string {

=== modified file 'test/rbkt/modules/module-B.xq'
--- test/rbkt/modules/module-B.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/modules/module-B.xq	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 import module namespace vm = "http://zorba-tests.28msec.us/modules/ver#2.0";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 declare function modB:hello() as xs:string {

=== modified file 'test/rbkt/modules/schema.xq'
--- test/rbkt/modules/schema.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/modules/schema.xq	2013-08-09 09:26:44 +0000
@@ -3,7 +3,7 @@
 
 import schema namespace sch = "http://zorba-tests.28msec.us/modules/theschema";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
 
 declare function schema:test() {

=== modified file 'test/rbkt/modules/ver.xq'
--- test/rbkt/modules/ver.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/modules/ver.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace vm = "http://zorba-tests.28msec.us/modules/ver";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.4.5";
 
 declare variable $vm:value as xs:string := "version 1";

=== modified file 'test/rbkt/modules/ver2.xq'
--- test/rbkt/modules/ver2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/modules/ver2.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 module namespace vm = "http://zorba-tests.28msec.us/modules/ver";;
 
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "2.3";
 
 declare variable $vm:value as xs:string := "version 2";

=== modified file 'test/unit/collection1.xq'
--- test/unit/collection1.xq	2013-02-07 17:24:36 +0000
+++ test/unit/collection1.xq	2013-08-09 09:26:44 +0000
@@ -19,7 +19,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:test() 
 {

=== modified file 'test/unit/collection1.xqlib'
--- test/unit/collection1.xqlib	2013-02-07 17:24:36 +0000
+++ test/unit/collection1.xqlib	2013-08-09 09:26:44 +0000
@@ -17,7 +17,7 @@
 
 module namespace mod1 = "http://www.mod1.ch/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $mod1:coll := xs:QName("mod1:coll");
 

=== modified file 'test/unit/collection2.xq'
--- test/unit/collection2.xq	2013-02-07 17:24:36 +0000
+++ test/unit/collection2.xq	2013-08-09 09:26:44 +0000
@@ -19,7 +19,7 @@
 
 import module namespace mod2 = "http://www.mod2.ch/"; at "file:///${CMAKE_CURRENT_BINARY_DIR}/collection2.xqlib";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";; 
+declare namespace ann = "http://zorba.io/annotations";; 
 declare namespace mod1 = "http://www.mod1.ch/";;
 
 declare %ann:sequential function local:test() 

=== modified file 'test/unit/collection2.xqlib'
--- test/unit/collection2.xqlib	2013-02-07 17:24:36 +0000
+++ test/unit/collection2.xqlib	2013-08-09 09:26:44 +0000
@@ -18,6 +18,6 @@
 module namespace mod2 = "http://www.mod2.ch/";;
 
 declare namespace mod1 = "http://www.mod1.ch/";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:ordered collection mod2:coll as node()*;

=== modified file 'test/unit/cxx_api_ch1.xq'
--- test/unit/cxx_api_ch1.xq	2013-02-07 17:24:36 +0000
+++ test/unit/cxx_api_ch1.xq	2013-08-09 09:26:44 +0000
@@ -15,7 +15,7 @@
 :)
 
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:foo() {
   ddl:create(xs:QName("hola"),(<a/>,<b/>));                  

=== modified file 'test/unit/guestbook.xq'
--- test/unit/guestbook.xq	2013-02-07 17:24:36 +0000
+++ test/unit/guestbook.xq	2013-08-09 09:26:44 +0000
@@ -19,7 +19,7 @@
 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";; 
+declare namespace ann = "http://zorba.io/annotations";; 
 
 declare collection guestbook:entries as node()*;
 declare variable $guestbook:entries as xs:QName := xs:QName("guestbook:entries");

=== modified file 'test/unit/main_sequential.xqlib'
--- test/unit/main_sequential.xqlib	2013-02-07 17:24:36 +0000
+++ test/unit/main_sequential.xqlib	2013-08-09 09:26:44 +0000
@@ -16,7 +16,7 @@
 
 module namespace main = "http://nonamespace.com";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";; 
+declare namespace ann = "http://zorba.io/annotations";; 
 declare namespace https = "blubb";
 
 declare function main:check-params($a, $b, $c) 

=== modified file 'test/unit/mini_audit.xq'
--- test/unit/mini_audit.xq	2012-02-27 14:46:27 +0000
+++ test/unit/mini_audit.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 import module namespace refl = "http://www.zorba-xquery.com/modules/reflection";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:sequential function local:create() 
 {

=== modified file 'test/unit/mini_http.xq'
--- test/unit/mini_http.xq	2013-04-29 18:47:57 +0000
+++ test/unit/mini_http.xq	2013-08-09 09:26:44 +0000
@@ -1,6 +1,6 @@
 declare namespace http = "http://www.28msec.com/modules/http";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare variable $http:var := "";
 

=== modified file 'test/unit/module2.xq'
--- test/unit/module2.xq	2013-02-07 17:24:36 +0000
+++ test/unit/module2.xq	2013-08-09 09:26:44 +0000
@@ -20,7 +20,7 @@
 
 import module namespace mod3 = "http://www.mod3.com/"; at "file:///${CMAKE_CURRENT_BINARY_DIR}/module3.xq";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:ordered collection mod2:coll as node()*;
 

=== modified file 'test/unit/module3.xq'
--- test/unit/module3.xq	2013-02-07 17:24:36 +0000
+++ test/unit/module3.xq	2013-08-09 09:26:44 +0000
@@ -16,7 +16,7 @@
 
 module namespace mod3 = "http://www.mod3.com/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:ordered %ann:append-only collection mod3:coll as node()*;
 

=== modified file 'test/unit/module6.xq'
--- test/unit/module6.xq	2013-02-07 17:24:36 +0000
+++ test/unit/module6.xq	2013-08-09 09:26:44 +0000
@@ -16,7 +16,7 @@
 
 module namespace mod6 = "http://www.mod6.com/";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 import schema namespace s = "http://www.zorba-xquery.com/schemas/simple"; at "file:///${CMAKE_CURRENT_BINARY_DIR}/schema1.xsd";
 

=== modified file 'test/update/Queries/zorba/store/sc1_ex1.xqlib'
--- test/update/Queries/zorba/store/sc1_ex1.xqlib	2013-02-07 17:24:36 +0000
+++ test/update/Queries/zorba/store/sc1_ex1.xqlib	2013-08-09 09:26:44 +0000
@@ -4,7 +4,7 @@
 
 import schema namespace kml = "http://earth.google.com/kml/2.1"; at "kml21.xsd";
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 
 declare %ann:unordered collection kml-data:placemarks
   as schema-element(kml:Placemark)*;

=== modified file 'test/zperf/src/start.xq'
--- test/zperf/src/start.xq	2013-05-16 11:47:06 +0000
+++ test/zperf/src/start.xq	2013-08-09 09:26:44 +0000
@@ -23,7 +23,7 @@
 import module namespace http="http://expath.org/ns/http-client";;
 
 declare namespace pdash = "http://www.28msec.com/pdash";;
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace ann = "http://zorba.io/annotations";;
 declare namespace err = "http://www.w3.org/2005/xqt-errors";;
 
 

=== modified file 'test/zperf/src/timings.xq'
--- test/zperf/src/timings.xq	2013-02-07 17:24:36 +0000
+++ test/zperf/src/timings.xq	2013-08-09 09:26:44 +0000
@@ -16,7 +16,7 @@
 
 module namespace tims = 'http://www.example.com/timings';
 
-import module namespace functx = "http://www.functx.com/";; 
+import module namespace functx = "http://www.functx.com";; 
 
 declare namespace pdash = "http://www.28msec.com/pdash";;