[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189803 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189803 into lp:zorba has been updated. Description changed to: https://code.launchpad.net/~zorba-coders/zorba/1189803-html/+merge/187932 https://code.launchpad.net/~zorba-coders/zorba/1189803-geoproj-module/+merge/187939 https://code.launchpad.net/~zorba-coders/zorba/1189803-read-pdf/+merge/187947 https://code.launchpad.net/~zorba-coders/zorba/1189803-csv/+merge/187949 https://code.launchpad.net/~zorba-coders/zorba/1189803-schema-tools/+merge/188235 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 https://code.launchpad.net/~zorba-coders/zorba/1189803-html/+merge/187932 https://code.launchpad.net/~zorba-coders/zorba/1189803-geoproj-module/+merge/187939 https://code.launchpad.net/~zorba-coders/zorba/1189803-read-pdf/+merge/187947 https://code.launchpad.net/~zorba-coders/zorba/1189803-csv/+merge/187949 https://code.launchpad.net/~zorba-coders/zorba/1189803-schema-tools/+merge/188235 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189803 into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 Stage TestZorbaUbuntu failed. 98 tests failed (8536 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/325/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Review: Needs Fixing Need to have dependent merge proposals for a number of non-core modules. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Actually there's a lot more work to be done here - updating test cases, documentation, static_context... I changed all ocurrences of the uri except for the ones in Changelog. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 Stage TestZorbaUbuntu failed. 1 tests failed (8535 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/309/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189803 into lp:zorba has been updated. Commit Message changed to: Updated core schema module to Zorba 3.0 standards. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 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/bug-1189803 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1189803 into lp:zorba. Requested reviews: Luis Rodriguez Gonzalez (kuraru) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-09-02 20:43:22 + +++ modules/CMakeLists.txt 2013-09-10 20:49:19 + @@ -25,6 +25,7 @@ ADD_SUBDIRECTORY(json) ADD_SUBDIRECTORY(structured-items) ADD_SUBDIRECTORY(item) +ADD_SUBDIRECTORY(schema) # 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-09-02 20:43:22 + +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-09-10 20:49:19 + @@ -19,8 +19,6 @@ 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 schema.xq VERSION 2.0 - URI http://www.zorba-xquery.com/modules/schema;) 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/schema' === added file 'modules/schema/CMakeLists.txt' --- modules/schema/CMakeLists.txt 1970-01-01 00:00:00 + +++ modules/schema/CMakeLists.txt 2013-09-10 20:49:19 + @@ -0,0 +1,16 @@ +# Copyright 2013 The FLWOR Foundation. +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 1.0 + URI http://zorba.io/modules/schema;) === renamed file 'modules/com/zorba-xquery/www/modules/schema.xq' = 'modules/schema/schema.xq' --- modules/com/zorba-xquery/www/modules/schema.xq 2013-08-09 08:27:30 + +++ modules/schema/schema.xq 2013-09-10 20:49:19 + @@ -1,4 +1,4 @@ -xquery version 1.0; +xquery version 3.0; (: : Copyright 2006-2009 The FLWOR Foundation. @@ -24,9 +24,9 @@ : @project Zorba/XQuery Data Model/Item/Schema : :) -module namespace schema = http://www.zorba-xquery.com/modules/schema;; +module namespace schema = http://zorba.io/modules/schema;; declare namespace ver = http://zorba.io/options/versioning;; -declare option ver:module-version 2.0; +declare option ver:module-version 1.0; (:~ : This function returns the name of the type of the item passed -- 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
