zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1189797-node-module into lp:zorba.

Commit message:
Updated core module "node" to Zorba 3.0 standards.

Requested reviews:
  Chris Hillery (ceejatec)
Related bugs:
  Bug #1189797 in Zorba: "Update core module "node""
  https://bugs.launchpad.net/zorba/+bug/1189797

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189797-node-module/+merge/178910


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1189797-node-module/+merge/178910
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-07-26 20:43:25 +0000
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-08-07 08:35:37 +0000
@@ -17,8 +17,6 @@
   URI "http://www.zorba-xquery.com/modules/datetime";)
 DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/fetch";)
-DECLARE_ZORBA_MODULE(FILE node.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/node";)
 DECLARE_ZORBA_MODULE(FILE item.xq VERSION 1.0
   URI "http://www.zorba-xquery.com/modules/item";)
 DECLARE_ZORBA_MODULE(FILE reflection.xq VERSION 2.0

=== modified file 'modules/structured-items/CMakeLists.txt'
--- modules/structured-items/CMakeLists.txt	2013-07-24 07:29:14 +0000
+++ modules/structured-items/CMakeLists.txt	2013-08-07 08:35:37 +0000
@@ -16,3 +16,5 @@
   URI "http://zorba.io/modules/node-position";)
 DECLARE_ZORBA_MODULE(FILE reference.xq VERSION 1.0
   URI "http://zorba.io/modules/reference";)
+DECLARE_ZORBA_MODULE(FILE node.xq VERSION 2.0
+  URI "http://zorba.io/modules/node";)

=== renamed file 'modules/com/zorba-xquery/www/modules/node.xq' => 'modules/structured-items/node.xq'
--- modules/com/zorba-xquery/www/modules/node.xq	2013-06-15 16:20:18 +0000
+++ modules/structured-items/node.xq	2013-08-07 08:35:37 +0000
@@ -29,7 +29,7 @@
  : @author Matthias Brantner
  : @project Zorba/XQuery Data Model/Node/Node
  :)
-module namespace node = "http://www.zorba-xquery.com/modules/node";;
+module namespace node = "http://zorba.io/modules/node";;
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 declare option ver:module-version "2.0";
@@ -167,7 +167,7 @@
 
 (:~
  : Return a deep copy of every given node according to the properties
- : specified in the static context of the invoking module.
+ : specified in the static context of the invoking module.<p/>
  :
  : Please note that a copy of a node is parentless.
  :

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2013-08-05 11:54:06 +0000
+++ src/context/static_context.cpp	2013-08-07 08:35:37 +0000
@@ -460,7 +460,7 @@
 
 const char*
 static_context::ZORBA_NODE_FN_NS =
-"http://www.zorba-xquery.com/modules/node";;
+"http://zorba.io/modules/node";;
 
 const char*
 static_context::ZORBA_ITEM_FN_NS =

=== modified file 'src/functions/pregenerated/func_nodes.cpp'
--- src/functions/pregenerated/func_nodes.cpp	2013-07-24 08:12:12 +0000
+++ src/functions/pregenerated/func_nodes.cpp	2013-08-07 08:35:37 +0000
@@ -401,7 +401,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_node_ancestor_of,
-        (createQName("http://www.zorba-xquery.com/modules/node","","ancestor-of";), 
+        (createQName("http://zorba.io/modules/node","","ancestor-of";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
@@ -414,7 +414,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_node_descendant_of,
-        (createQName("http://www.zorba-xquery.com/modules/node","","descendant-of";), 
+        (createQName("http://zorba.io/modules/node","","descendant-of";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
@@ -427,7 +427,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_node_parent_of,
-        (createQName("http://www.zorba-xquery.com/modules/node","","parent-of";), 
+        (createQName("http://zorba.io/modules/node","","parent-of";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
@@ -440,7 +440,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_node_child_of,
-        (createQName("http://www.zorba-xquery.com/modules/node","","child-of";), 
+        (createQName("http://zorba.io/modules/node","","child-of";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
@@ -453,7 +453,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_node_following_of,
-        (createQName("http://www.zorba-xquery.com/modules/node","","following-of";), 
+        (createQName("http://zorba.io/modules/node","","following-of";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
@@ -466,7 +466,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_node_preceding_of,
-        (createQName("http://www.zorba-xquery.com/modules/node","","preceding-of";), 
+        (createQName("http://zorba.io/modules/node","","preceding-of";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
@@ -479,7 +479,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_node_following_sibling_of,
-        (createQName("http://www.zorba-xquery.com/modules/node","","following-sibling-of";), 
+        (createQName("http://zorba.io/modules/node","","following-sibling-of";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
@@ -492,7 +492,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_node_preceding_sibling_of,
-        (createQName("http://www.zorba-xquery.com/modules/node","","preceding-sibling-of";), 
+        (createQName("http://zorba.io/modules/node","","preceding-sibling-of";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
@@ -505,7 +505,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_node_level,
-        (createQName("http://www.zorba-xquery.com/modules/node","","level";), 
+        (createQName("http://zorba.io/modules/node","","level";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
         FunctionConsts::FN_ZORBA_NODE_LEVEL_1);
@@ -517,7 +517,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_node_least_common_ancestor,
-        (createQName("http://www.zorba-xquery.com/modules/node","","least-common-ancestor";), 
+        (createQName("http://zorba.io/modules/node","","least-common-ancestor";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION),
@@ -553,7 +553,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_node_copy,
-        (createQName("http://www.zorba-xquery.com/modules/node","","copy";), 
+        (createQName("http://zorba.io/modules/node","","copy";), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR, 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR),
         FunctionConsts::FN_ZORBA_NODE_COPY_1);

=== modified file 'src/runtime/spec/mappings.xml'
--- src/runtime/spec/mappings.xml	2013-07-26 20:43:25 +0000
+++ src/runtime/spec/mappings.xml	2013-08-07 08:35:37 +0000
@@ -122,7 +122,7 @@
                      define="ZORBA_FETCH_FN_NS" 
                      prefix="fn-zorba-fetch"/>
 
-		<zorba:namespace uri="http://www.zorba-xquery.com/modules/node";
+		<zorba:namespace uri="http://zorba.io/modules/node";
                      define="ZORBA_NODE_FN_NS" 
                      prefix="fn-zorba-node"/>
 

=== 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-07 08:35:37 +0000
@@ -2,7 +2,7 @@
 
 declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
 
-import module namespace node = "http://www.zorba-xquery.com/modules/node";;
+import module namespace node = "http://zorba.io/modules/node";;
 
 declare option opt:enable "for-serialization-only";
 

=== 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-07 08:35:37 +0000
@@ -2,7 +2,7 @@
 
 declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
 
-import module namespace node = "http://www.zorba-xquery.com/modules/node";;
+import module namespace node = "http://zorba.io/modules/node";;
 
 declare copy-namespaces no-preserve, inherit;
 

=== 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-07 08:35:37 +0000
@@ -1,6 +1,6 @@
 declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";;
 
-import module namespace node = "http://www.zorba-xquery.com/modules/node";;
+import module namespace node = "http://zorba.io/modules/node";;
 
 declare copy-namespaces preserve, no-inherit;
 

=== modified file 'test/rbkt/Queries/zorba/nodes/copy01.xq'
--- test/rbkt/Queries/zorba/nodes/copy01.xq	2012-03-15 02:55:49 +0000
+++ test/rbkt/Queries/zorba/nodes/copy01.xq	2013-08-07 08:35:37 +0000
@@ -1,4 +1,4 @@
-import module namespace node = "http://www.zorba-xquery.com/modules/node";;
+import module namespace node = "http://zorba.io/modules/node";;
 
 let $node :=
   <a>

=== modified file 'test/rbkt/Queries/zorba/nodes/rel_and_props1.xq'
--- test/rbkt/Queries/zorba/nodes/rel_and_props1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/nodes/rel_and_props1.xq	2013-08-07 08:35:37 +0000
@@ -1,4 +1,4 @@
-import module namespace node = "http://www.zorba-xquery.com/modules/node";;
+import module namespace node = "http://zorba.io/modules/node";;
 
 let $x :=  <a>
              <b/>

=== modified file 'test/rbkt/Queries/zorba/nodes/rel_and_props2.xq'
--- test/rbkt/Queries/zorba/nodes/rel_and_props2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/nodes/rel_and_props2.xq	2013-08-07 08:35:37 +0000
@@ -1,4 +1,4 @@
-import module namespace node = "http://www.zorba-xquery.com/modules/node";;
+import module namespace node = "http://zorba.io/modules/node";;
 
 let $x :=  document { 
             <a>