[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189748 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189748 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189748 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189748 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189748 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189748 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189748 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189748 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189748 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba. Commit message: Added a str() function for various locale enum string look-ups to ensure the index is never out of bounds. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189748 Added a str() function for various locale enum string look-ups to ensure the index is never out of bounds. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189748 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-xqdoc into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/update3.0-xqdoc into lp:zorba. Commit message: Update xqdoc module to zorba 3.0 Requested reviews: Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update3.0-xqdoc/+merge/189738 Update xqdoc module to zorba 3.0 -- https://code.launchpad.net/~zorba-coders/zorba/update3.0-xqdoc/+merge/189738 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'doc/zorba/xqdoc/src/xqdoc-html.xq' --- doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-05 00:21:53 + +++ doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-07 23:28:21 + @@ -15,7 +15,7 @@ :) import module namespace file = "http://expath.org/ns/file";; -import module namespace xqdoc = "http://www.zorba-xquery.com/modules/xqdoc";; +import module namespace xqdoc = "http://zorba.io/modules/xqdoc";; import module namespace batch = "http://www.zorba-xquery.com/modules/xqdoc/batch";; import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; import module namespace xqdoc-html = "http://www.zorba-xquery.com/xqdoc-html"; at "xqdoc-html.xqy"; === modified file 'doc/zorba/xqdoc/src/xqdoc-html.xqy' --- doc/zorba/xqdoc/src/xqdoc-html.xqy 2013-08-09 09:04:36 + +++ doc/zorba/xqdoc/src/xqdoc-html.xqy 2013-10-07 23:28:21 + @@ -18,7 +18,7 @@ import module namespace file = "http://expath.org/ns/file";; -import module namespace xqdoc = "http://www.zorba-xquery.com/modules/xqdoc";; +import module namespace xqdoc = "http://zorba.io/modules/xqdoc";; import module namespace batch = "http://www.zorba-xquery.com/modules/xqdoc/batch";; declare namespace xqd = "http://www.xqdoc.org/1.0";; === modified file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqy' --- doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-09-17 00:26:50 + +++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-10-07 23:28:21 + @@ -27,7 +27,7 @@ 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";; +import module namespace xqd = "http://zorba.io/modules/xqdoc";; import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";; 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";; === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-10-03 08:28:18 + +++ modules/CMakeLists.txt 2013-10-07 23:28:21 + @@ -27,10 +27,10 @@ ADD_SUBDIRECTORY(store) ADD_SUBDIRECTORY(structured-items) ADD_SUBDIRECTORY(w3c) -ADD_SUBDIRECTORY(xml) +ADD_SUBDIRECTORY(xml) +ADD_SUBDIRECTORY(xqdoc) ADD_SUBDIRECTORY(zorba-query) - # Add external module projects - any subdirectories of a directory # named "zorba_modules" as a sibling to the main Zorba source # directory. === modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt' --- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-01 03:34:33 + +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-07 23:28:21 + @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI "http://www.xqdoc.org/1.0";) DECLARE_ZORBA_MODULE(FILE datetime.xq VERSION 2.0 URI "http://www.zorba-xquery.com/modules/datetime";) DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0 @@ -21,10 +20,6 @@ URI "http://www.zorba-xquery.com/modules/reflection";) DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0 URI "http://www.zorba-xquery.com/modules/uri";) -DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0 - URI "http://www.zorba-xquery.com/modules/xqdoc";) -DECLARE_ZORBA_SCHEMA(FILE xqdoc-options.xsd - URI "http://www.zorba-xquery.com/modules/xqdoc-options";) # Subdirectories === modified file 'modules/com/zorba-xquery/www/modules/xqdoc/batch.xq' --- modules/com/zorba-xquery/www/modules/xqdoc/batch.xq 2013-08-09 08:27:30 + +++ modules/com/zorba-xquery/www/modules/xqdoc/batch.xq 2013-10-07 23:28:21 + @@ -30,7 +30,7 @@ import module namespace file = "http://expath.org/ns/file";; -import module namespace xqdoc = "http://www.zorba-xquery.com/modules/xqdoc";; +import module namespace xqdoc = "http://zorba.io/modules/xqdoc";; import module namespace menu = "http://www.zorba-xquery.com/modules/xqdoc/menu";; import module namespace html = "http://www.zorba-xquery.com/modules/xqdoc/html";; === added directory 'modules/xqdoc' === added file 'modules/xqdoc/CMakeLists.txt' --- modules/xqdoc/CMakeLists.txt 1970-01-01 00:00:00 + +++ modules/xqdoc/CMakeLists.txt 2013-10-07 23:28:21 + @@ -0,0 +1,5 @@ +DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI "http://www.xqdoc.org/1.0";) +DECLARE_ZORBA_MODULE(FILE
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_reflection into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/update3.0_reflection into lp:zorba. Commit message: Update reflection module to zorba 3.0 Requested reviews: Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update3.0_reflection/+merge/189737 Update reflection module to zorba 3.0 -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_reflection/+merge/189737 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-09-30 19:49:06 + +++ doc/zorba/xqdoc/images/modules.svg 2013-10-07 23:27:33 + @@ -1096,14 +1096,14 @@ 8 -http://www.zorba-xquery.com/modules/reflection";> +http://zorba.io/modules/reflection";> reflection 79->8 -http://zorba.io/modules/data-cleaning/conversion, TO: http://www.zorba-xquery.com/modules/reflection";> +http://zorba.io/modules/data-cleaning/conversion, TO: http://zorba.io/modules/reflection";> === modified file 'doc/zorba/xqdoc/images/modules_new.svg' --- doc/zorba/xqdoc/images/modules_new.svg 2013-10-06 23:04:13 + +++ doc/zorba/xqdoc/images/modules_new.svg 2013-10-07 23:27:33 + @@ -1102,16 +1102,30 @@ 7 +<<< TREE http://www.zorba-xquery.com/modules/reflection";> reflection +=== +http://zorba.io/modules/reflection";> + +reflection +>>> MERGE-SOURCE +<<< TREE 60->7 http://zorba.io/modules/data-cleaning/conversion, TO: http://www.zorba-xquery.com/modules/reflection";> +=== + +58->7 +http://zorba.io/modules/data-cleaning/conversion, TO: http://zorba.io/modules/reflection";> + + +>>> MERGE-SOURCE === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-10-03 08:28:18 + +++ modules/CMakeLists.txt 2013-10-07 23:27:33 + @@ -29,6 +29,7 @@ ADD_SUBDIRECTORY(w3c) ADD_SUBDIRECTORY(xml) ADD_SUBDIRECTORY(zorba-query) +ADD_SUBDIRECTORY(reflection) # Add external module projects - any subdirectories of a directory === modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt' --- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-01 03:34:33 + +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-07 23:27:33 + @@ -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 reflection.xq VERSION 2.0 - URI "http://www.zorba-xquery.com/modules/reflection";) DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0 URI "http://www.zorba-xquery.com/modules/uri";) DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0 === added directory 'modules/reflection' === added file 'modules/reflection/CMakeLists.txt' --- modules/reflection/CMakeLists.txt 1970-01-01 00:00:00 + +++ modules/reflection/CMakeLists.txt 2013-10-07 23:27:33 + @@ -0,0 +1,2 @@ +DECLARE_ZORBA_MODULE(FILE reflection.xq VERSION 2.0 + URI "http://zorba.io/modules/reflection";) \ No newline at end of file === renamed file 'modules/com/zorba-xquery/www/modules/reflection.xq' => 'modules/reflection/reflection.xq' --- modules/com/zorba-xquery/www/modules/reflection.xq 2013-09-26 23:15:11 + +++ modules/reflection/reflection.xq 2013-10-07 23:27:33 + @@ -27,7 +27,7 @@ : :) -module namespace reflection = "http://www.zorba-xquery.com/modules/reflection";; +module namespace reflection = "http://zorba.io/modules/reflection";; declare namespace an = "http://zorba.io/annotations";; === modified file 'src/api/staticcontextimpl.cpp' --- src/api/staticcontextimpl.cpp 2013-09-26 09:38:51 + +++ src/api/staticcontextimpl.cpp 2013-10-07 23:27:33 + @@ -1612,7 +1612,7 @@ // prolog lOut -<< "import module namespace ref = 'http://www.zorba-xquery.com/modules/reflection';" +<< "import module namespace ref = 'http://zorba.io/modules/reflection';" << std::endl; lOut << "declare variable $xxx-func-name as xs:QName external;" << std::endl; === modified file 'src/context/static_context.cpp' --- src/context/static_context.cpp 2013-10-03 04:14:17 + +++ src/context/static_context.cpp 2013-10-07 23:27:33 + @@ -440,7 +440,7 @@ const char* static_context::ZORBA_REFLECTION_FN_NS = -"http://www.zorba-xquery.com/modules/reflection";; +"http://zorba.io/modules/reflection";; const char* static_context::ZORBA_UTIL_FN_NS = === modified file 'src/runtime/spec/mappings.xml' --- src/runtime/spec/mappings.xml 2013-10-01 22:39:42 + +++ src/runtime/spec/mappings.xml 2013-10-07 23:27:33 + @@ -98,7 +98,7 @@ define="ZORBA_SCTX_FN_NS" prefix="fn-zorba-sctx"/> -http://www.zorba-xquery.com/modules/reflection"; +http://zorba.io/modules/reflection"; define="ZORBA_REFLECTION_FN_NS" prefix="fn-zorba-reflection"/> === modified file 'test/extern/extern-func-1.xq' --- test/ex
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189518 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189518 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189518 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189518 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189518 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189518 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Granted, but if it's the fault of the test, then it's a bug in the test. The MP should still be approved. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/189518 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
