[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189785-core into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189785-core into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-csv/+merge/175208 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-archive/+merge/175215 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-nosql/+merge/175214 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-oauth/+merge/175217 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-csv/+merge/175208 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-archive/+merge/175215 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-nosql/+merge/175214 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Voting criteria failed for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 : Votes: {'Approve': 1} https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-csv/+merge/175208 : Votes: {'Approve': 1} https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-archive/+merge/175215 : Votes: {'Approve': 1} https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-nosql/+merge/175214 : Votes: {'Approve': 1} https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-oauth/+merge/175217 : Votes: {'Approve': 1} -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/38/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 Stage "TestZorbaUbuntu" failed. 1 tests failed (8355 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/92/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-csv/+merge/175208 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-archive/+merge/175215 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-nosql/+merge/175214 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-oauth/+merge/175217 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189785-core into lp:zorba has been updated. Description changed to: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-csv/+merge/175208 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-archive/+merge/175215 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-nosql/+merge/175214 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-oauth/+merge/175217 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189785-core into lp:zorba has been updated. Description changed to: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-csv/+merge/175208 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-archive/+merge/175215 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-nosql/+merge/175214 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189785-core into lp:zorba has been updated. Description changed to: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-csv/+merge/175208 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-archive/+merge/175212 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 Stage "TestZorbaUbuntu" failed. 19 tests failed (8355 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/91/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-csv/+merge/175208 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189785-core into lp:zorba has been updated. Description changed to: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-csv/+merge/175208 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 Stage "ZorbaVQ" failed. Check console output at http://jenkins.lambda.nu/job/ZorbaVQ/121/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 https://code.launchpad.net/~zorba-coders/zorba/csv-module/+merge/175205 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189785-core into lp:zorba has been updated. Description changed to: https://code.launchpad.net/~zorba-coders/zorba/csv-module/+merge/175205 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 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-1189785-core into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1189785-core into lp:zorba. Commit message: Update base64 module to Zorba 3.0 standards. Requested reviews: Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 https://code.launchpad.net/~zorba-coders/zorba/csv-module/+merge/175205 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189785-core/+merge/175204 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-07-11 00:55:07 + +++ modules/CMakeLists.txt 2013-07-17 07:25:44 + @@ -20,6 +20,7 @@ ADD_SUBDIRECTORY(full-text) ADD_SUBDIRECTORY(json) ADD_SUBDIRECTORY(nodes) +ADD_SUBDIRECTORY(base64) # Add external module projects - any subdirectories of a directory # named "zorba_modules" as a sibling to the main Zorba source === added directory 'modules/base64' === added file 'modules/base64/CMakeLists.txt' --- modules/base64/CMakeLists.txt 1970-01-01 00:00:00 + +++ modules/base64/CMakeLists.txt 2013-07-17 07:25:44 + @@ -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 base64.xq VERSION 1.0 + URI "http://zorba.io/modules/base64";) === renamed file 'modules/com/zorba-xquery/www/modules/converters/base64.xq' => 'modules/base64/base64.xq' --- modules/com/zorba-xquery/www/modules/converters/base64.xq 2013-06-25 03:55:20 + +++ modules/base64/base64.xq 2013-07-17 07:25:44 + @@ -1,4 +1,4 @@ -xquery version "1.0"; +jsoniq version "1.0"; (: : Copyright 2006-2009 The FLWOR Foundation. @@ -17,58 +17,58 @@ :) (:~ - : Base64 encoding and decoding + : Base64 encoding and decoding. : : @author Matthias Brantner : : @project Zorba/Data Converters/Base 64 :) -module namespace base64 = "http://www.zorba-xquery.com/modules/converters/base64";; +module namespace base64 = "http://zorba.io/modules/base64";; declare namespace zerr = "http://zorba.io/modules/zorba-errors";; declare namespace ver = "http://www.zorba-xquery.com/options/versioning";; -declare option ver:module-version "2.0"; +declare option ver:module-version "1.0"; (:~ - : Decode a xs:base64Binary. - : - : The function assumes that the content after decoding is valid - : UTF-8. - : - : @param $base64 The xs:base64Binary item to decode + : Decode a base64Binary. + : + : The function assumes that the content after decoding is valid + : UTF-8. + : + : @param $base64 The base64Binary item to decode : @return the base64-decoded value as string - * @error zerr:ZOSE0006 if $base64 contains invalid base-64 data. + : @error zerr:ZOSE0006 if $base64 contains invalid base-64 data. :) -declare function base64:decode($base64 as xs:base64Binary) -as xs:string external; +declare function base64:decode($base64 as base64Binary) +as string external; (:~ - : Decode a xs:base64Binary. - : - : The function assumes that the content after decoding has - : the given encoding. - : - : @param $base64 The xs:base64Binary item to decode + : Decode a base64Binary. + : + : <>The function assumes that the content after decoding has + : the given encoding. + : + : @param $base64 The base64Binary item to decode : @param $encoding The encoding of the string after base64-decoding it. - : If compiled with ICU, then Zorba supports any encoding that ICU supports; - : otherwise Zorba only supports ASCII and UTF-8. : The encoding parameter is case insensitive. : : @return the base64-decoded value as a string : : @error zerr:ZXQP0006 if the given encoding is invalid or not supported. - * @error zerr:ZOSE0006 if $base64 contains invalid base-64 data. + : "ASCII" and "UTF-8" are guaranteed to be supported; other encodings + : may be supported depending on the installation. + : @error zerr:ZOSE0006 if $base64 contains invalid base-64 data. :) declare function base64:decode( - $base64 as xs:base64Binary, - $encoding as xs:string) -as xs:string external; + $base64 as base64Binary, + $encoding as string) +as string external; (:~ - : Encode a xs:string as xs:base64Binary. + : Encode a string as base64Binary. : : @param $string The item whose string-value should be encoded : @return the base64-encoded string-value of the item parameter :) -declare function base64:encode($string as xs:string) as xs:base64Binary external; +declare function base64:encode($string as string) as