zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

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

Commit message:
Update core "item" module to Zorba 3.0 standards.

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

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189793-item-module/+merge/178904


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

=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt	2013-07-26 20:43:25 +0000
+++ modules/CMakeLists.txt	2013-08-07 08:00:50 +0000
@@ -22,6 +22,8 @@
 ADD_SUBDIRECTORY(http-client)
 ADD_SUBDIRECTORY(json)
 ADD_SUBDIRECTORY(structured-items)
+ADD_SUBDIRECTORY(item)
+
 
 # Add external module projects - any subdirectories of a directory
 # named "zorba_modules" as a sibling to the main Zorba source

=== 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:00:50 +0000
@@ -19,8 +19,6 @@
   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
   URI "http://www.zorba-xquery.com/modules/reflection";)
 DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 2.0

=== added directory 'modules/item'
=== renamed file 'modules/com/zorba-xquery/www/modules/item.xq' => 'modules/item/item.xq'
--- modules/com/zorba-xquery/www/modules/item.xq	2013-06-15 20:57:44 +0000
+++ modules/item/item.xq	2013-08-07 08:00:50 +0000
@@ -24,13 +24,13 @@
  : @author Matthias Brantner
  : @project Zorba/XQuery Data Model/Item/Item
  :)
-module namespace item = "http://www.zorba-xquery.com/modules/item";;
+module namespace item = "http://zorba.io/modules/item";;
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 declare option ver:module-version "1.0";
 
 (:~
- : Computes the size in bytes of the given item in main memory.
+ : Computes the size in bytes of the given item in main memory.<p/>
  :
  : @param $item the item whose size to compute.
  :

=== 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:00:50 +0000
@@ -464,7 +464,7 @@
 
 const char*
 static_context::ZORBA_ITEM_FN_NS =
-"http://www.zorba-xquery.com/modules/item";;
+"http://zorba.io/modules/item";;
 
 const char*
 static_context::ZORBA_XML_FN_NS =

=== modified file 'src/functions/pregenerated/func_item.cpp'
--- src/functions/pregenerated/func_item.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_item.cpp	2013-08-07 08:00:50 +0000
@@ -47,7 +47,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_item_size,
-        (createQName("http://www.zorba-xquery.com/modules/item","","size";), 
+        (createQName("http://zorba.io/modules/item","","size";), 
         GENV_TYPESYSTEM.ITEM_TYPE_ONE, 
         GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
         FunctionConsts::FN_ZORBA_ITEM_SIZE_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:00:50 +0000
@@ -126,7 +126,7 @@
                      define="ZORBA_NODE_FN_NS" 
                      prefix="fn-zorba-node"/>
 
-		<zorba:namespace uri="http://www.zorba-xquery.com/modules/item";
+		<zorba:namespace uri="http://zorba.io/modules/item";
                      define="ZORBA_ITEM_FN_NS" 
                      prefix="fn-zorba-item"/>