[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba

2013-07-10 Thread noreply 
The proposal to merge lp:~zorba-coders/zorba/update3.0_node-position-module 
into lp:zorba has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
-- 
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba

2013-07-10 Thread Zorba Build Bot 
Validation queue succeeded - proposal merged!
-- 
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba

2013-07-10 Thread Zorba Build Bot 
Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue
-- 
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba

2013-07-10 Thread Juan Zacarias 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba

2013-07-09 Thread Zorba Build Bot 
Validation queue result for 
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/13/console to 
view the results.
-- 
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba

2013-07-09 Thread Zorba Build Bot 
Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
 :
Votes: {'Approve': 1}
-- 
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba

2013-07-09 Thread Zorba Build Bot 
Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue
-- 
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba

2013-07-09 Thread Chris Hillery 
Review: Approve

I changed the module version declaration back to "xquery version "1.0"". It 
seemed weird to have it claim to be "jsoniq" when the module is only dealing 
with XML nodes. I also added a copyright notice to 
modules/nodes/CMakeLists.txt. Other than that looked fine.
-- 
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba

2013-07-04 Thread Juan Zacarias 
Juan Zacarias has proposed merging 
lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba.

Commit message:
Updated node-position module to Zorba 3.0 format.

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

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105

Updated node-position module to Zorba 3.0 format.
-- 
https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'doc/zorba/xqdoc/images/modules.svg'
--- doc/zorba/xqdoc/images/modules.svg	2013-06-25 03:55:20 +
+++ doc/zorba/xqdoc/images/modules.svg	2013-07-04 22:33:25 +
@@ -2045,7 +2045,7 @@
 
 
 8
-http://www.zorba-xquery.com/modules/node-position";>
+http://zorba.io/modules/node-position";>
 
 node-position
 

=== modified file 'doc/zorba/xqdoc/images/modules_new.svg'
--- doc/zorba/xqdoc/images/modules_new.svg	2013-06-25 03:55:20 +
+++ doc/zorba/xqdoc/images/modules_new.svg	2013-07-04 22:33:25 +
@@ -2045,7 +2045,7 @@
 
 
 8
-http://www.zorba-xquery.com/modules/node-position";>
+http://zorba.io/modules/node-position";>
 
 node-position
 

=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt	2013-06-28 02:33:07 +
+++ modules/CMakeLists.txt	2013-07-04 22:33:25 +
@@ -18,6 +18,7 @@
 ADD_SUBDIRECTORY(xqxq)
 ADD_SUBDIRECTORY(w3c)
 ADD_SUBDIRECTORY(full-text)
+ADD_SUBDIRECTORY(nodes)
 
 # 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-06-28 02:33:07 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-07-04 22:33:25 +
@@ -62,8 +62,6 @@
   URI "http://www.zorba-xquery.com/modules/node-reference";)
 DECLARE_ZORBA_MODULE(FILE reference.xq VERSION 1.0
   URI "http://www.zorba-xquery.com/modules/reference";)
-DECLARE_ZORBA_MODULE(FILE node-position.xq VERSION 2.0
-  URI "http://www.zorba-xquery.com/modules/node-position";)
 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

=== added directory 'modules/nodes'
=== added file 'modules/nodes/CMakeLists.txt'
--- modules/nodes/CMakeLists.txt	1970-01-01 00:00:00 +
+++ modules/nodes/CMakeLists.txt	2013-07-04 22:33:25 +
@@ -0,0 +1,2 @@
+DECLARE_ZORBA_MODULE(FILE node-position.xq VERSION 2.0
+  URI "http://zorba.io/modules/node-position";)
\ No newline at end of file

=== renamed file 'modules/com/zorba-xquery/www/modules/node-position.xq' => 'modules/nodes/node-position.xq'
--- modules/com/zorba-xquery/www/modules/node-position.xq	2013-06-15 16:20:18 +
+++ modules/nodes/node-position.xq	2013-07-04 22:33:25 +
@@ -1,4 +1,4 @@
-xquery version "1.0";
+jsoniq version "1.0";
 (:
  : Copyright 2006-2011 The FLWOR Foundation.
  :
@@ -16,28 +16,28 @@
  :)
 
 (:~
- : This module provides a function (np:node-position) that, given a node, 
+ : This module provides a function (np:node-position) that, given a node, 
  : returns positional information about the node in the form of an xs:anyURI
  : item. The module also defines functions that use such positional information
  : to determine: (1) positional relationships between two nodes (e.g. if one 
  : is the ancestor of another) and (2) positional properties of a single node
- : (e.g. its level in the tree).
- :
- : Within this module, the term "node position" will be used to refer to an
- : xs:anyURI item that is returned by the np:node-position function.
+ : (e.g. its level in the tree).
+ : 
+ : Within this module, the term "node position" will be used to refer to an
+ : xs:anyURI item that is returned by the np:node-position function.
  :
  : @author Federico Cavalieri, Markos Zaharioudakis 
  :
  : @project Zorba/XQuery Data Model/Node/Node Position
  :)
-module namespace np = "http://www.zorba-xquery.com/modules/node-position";;
+module namespace np = "http://zorba.io/modules/node-position";;
 
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 declare option ver:module-version "2.0";
 
 (:~
- : Return a URI item containing positional information for a given node.
- :
+ : Return a URI item containing positional information for a given node.
+ : 
  : Within a snapshot, each has a different positional URI. However,
  : different nodes in different snapshots might have the same URI.  
  :
@@ -51,14 +51,14 @@
 ) as xs:anyURI external;
 
 (:~
- : Determines whether the node position given as second argument is
- : an ancestor of the node position given as first argument.
- :
- : If the two positions were obtained within the same snapshot S, then the
+ : Determines whether th