[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_FOTS_snapshot_June_11th into lp:zorba
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/bump_FOTS_snapshot_June_11th into lp:zorba. Commit message: - bumped FOTS snapshot to May 11th - updated DISPUTED test-cases Requested reviews: Chris Hillery (ceejatec) Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_June_11th/+merge/168629 -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_June_11th/+merge/168629 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'test/fots/CMakeLists.txt' --- test/fots/CMakeLists.txt 2013-06-07 09:10:30 + +++ test/fots/CMakeLists.txt 2013-06-11 09:31:50 + @@ -125,26 +125,10 @@ #disputed tests. These test are run but marked as 'pass' by FOTS driver. #All these entries should have a *valid* opened bug number from W3C bugzilla. -EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDecl.external K2-ExternalVariablesWith-22 21960) -EXPECTED_FOTS_FAILURE (DISPUTED app-CatalogCheck Catalog002 22277) -EXPECTED_FOTS_FAILURE (DISPUTED app-CatalogCheck Catalog013 22280) -EXPECTED_FOTS_FAILURE (DISPUTED app-CatalogCheck Catalog014 22281) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-001 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-005 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-006 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-007 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-015 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-016 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-020 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-028 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-034 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-035 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-037 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-041 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-042 22294) -EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport empty-union-049 22294) +EXPECTED_FOTS_FAILURE (DISPUTED app-CatalogCheck Catalog002 22324) EXPECTED_FOTS_FAILURE (DISPUTED fn-format-dateTime format-dateTime-006 22282) EXPECTED_FOTS_FAILURE (DISPUTED misc-XMLEdition XML10-4ed-Excluded-char-1 13869) +EXPECTED_FOTS_FAILURE (DISPUTED prod-ModuleImport modules-22 22317) # Next three possibly unique to old RQ machine, but they need to be # marked for the RQ to pass. === modified file 'test/fots/ImportFOTS.cmake' --- test/fots/ImportFOTS.cmake 2013-06-06 11:57:04 + +++ test/fots/ImportFOTS.cmake 2013-06-11 09:31:50 + @@ -19,7 +19,7 @@ # Change this to publish updated FOTS archives -SET (FOTS_ARCHIVE FOTS_060613.tgz) +SET (FOTS_ARCHIVE FOTS_110613.tgz) # Change this to modify which elements in FOTS driver results are output # as CDATA -- 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/bump_FOTS_snapshot_June_11th into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_June_11th into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_June_11th/+merge/168629 -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_June_11th/+merge/168629 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/bump_FOTS_snapshot_June_11th into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bump_FOTS_snapshot_June_11th-2013-06-11T09-30-55.809Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_June_11th/+merge/168629 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Commit Message changed to: 1. optimization: replaced use of create_value_type() in runtime with getTypeCode() 2. optimized switch expression For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168595 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168595 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Description changed to: 1. optimization: replaced use of create_value_type() in runtime with getTypeCode() 2. optimized switch expression For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168595 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168595 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/bump_FOTS_snapshot_June_11th into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_June_11th/+merge/168629 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/bump_FOTS_snapshot_June_11th into lp:zorba
Validation queue job bump_FOTS_snapshot_June_11th-2013-06-11T09-30-55.809Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_June_11th/+merge/168629 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/bump_FOTS_snapshot_June_11th into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_June_11th into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_June_11th/+merge/168629 -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_June_11th/+merge/168629 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/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168595 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168595 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168595 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/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-06-11T10-20-00.706Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168595 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/markos-scratch into lp:zorba
Validation queue job markos-scratch-2013-06-11T10-20-00.706Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168595 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168595 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168595 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/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 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/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
fix hof regressions caused by Sorin/Nicolai checkin in 11491
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644
fix hof regressions caused by Sorin/Nicolai checkin in 11491
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-06-11 09:43:21 +
+++ src/compiler/translator/translator.cpp 2013-06-11 11:21:56 +
@@ -12156,9 +12156,9 @@
}
case FunctionConsts::FN_FOLD_RIGHT_3:
{
-arguments[2] = CREATE(fo)(theRootSctx, theUDF, loc,
+arguments[0] = CREATE(fo)(theRootSctx, theUDF, loc,
BUILTIN_FUNC(FN_REVERSE_1),
- arguments[2]);
+ arguments[0]);
break;
}
case FunctionConsts::FN_FOR_EACH_2:
@@ -12640,9 +12640,9 @@
{
flwor_expr* flworBody = CREATE(flwor)(theRootSctx, theUDF, loc);
-let_clause* lc = wrap_in_letclause(foArgs[0]);
+let_clause* lc = wrap_in_letclause(foArgs[1]);
flworBody-add_clause(lc);
-foArgs[0] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc-get_var());
+foArgs[1] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc-get_var());
flworBody-set_return_expr(generate_fn_body(f, foArgs, loc));
body = flworBody;
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-06-11 12:27:33 +
+++ test/fots/CMakeLists.txt 2013-06-11 11:21:56 +
@@ -143,14 +143,6 @@
EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog010 1187807)
EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog011 1187807)
EXPECTED_FOTS_FAILURE (fn-fold-left fold-left-009 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-005 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-006 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-007 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-014 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-015 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-016 1187685)
-EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-017 1187685)
-EXPECTED_FOTS_FAILURE (fn-for-each-pair fn-for-each-pair-026 1187685)
EXPECTED_FOTS_FAILURE (fn-format-number numberformat60a 1167609)
EXPECTED_FOTS_FAILURE (fn-format-number numberformat60m 1167609)
EXPECTED_FOTS_FAILURE (fn-format-number numberformat60o 1167609)
@@ -160,9 +152,6 @@
EXPECTED_FOTS_FAILURE (fn-format-number numberformat83 1167641)
EXPECTED_FOTS_FAILURE (fn-format-number numberformat87 1167641)
EXPECTED_FOTS_FAILURE (fn-format-number numberformat88 1167641)
-EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-424 1187685)
-EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-426 1187685)
-EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-430 1187685)
EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-062 1187685)
EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-530 1188329)
EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
@@ -295,9 +284,6 @@
EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-17 1160015)
EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-18 1160015)
EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-062 1182910)
-EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-424 1182910)
-EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-426 1182910)
-EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-430 1182910)
EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 1188159)
EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy40 1172258)
EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy41 1172258)
--
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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 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/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-06-11T11-24-56.578Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 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/markos-scratch into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job markos-scratch-2013-06-11T11-24-56.578Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 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/bug-1188084 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-1188084/+merge/168556 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/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-06-11T14-27-55.813Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 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/bug-1188084 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1188084 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1188084/+merge/168556 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1188084/+merge/168556 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/fix_bug_1187807 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1187807 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 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/fix_bug_1187807 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1187807 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 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/fix_bug_1187807 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1187807 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 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/fix_bug_1187807 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 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/fix_bug_1187807 into lp:zorba
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/fix_bug_1187807
into lp:zorba.
Commit message:
- temporary fix for lp:1187807: FOTS driver adds a base-uri in the prolog; the
complete/clean fix requires lp:1133806 to be fixed.
Requested reviews:
Chris Hillery (ceejatec)
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #1187807 in Zorba: fots driver should add as base-uri the URI of the
FOTS file containg the test-case
https://bugs.launchpad.net/zorba/+bug/1187807
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681
--
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-06-11 12:27:33 +
+++ test/fots/CMakeLists.txt 2013-06-11 14:33:41 +
@@ -129,6 +129,7 @@
EXPECTED_FOTS_FAILURE (DISPUTED fn-format-dateTime format-dateTime-006 22282)
EXPECTED_FOTS_FAILURE (DISPUTED misc-XMLEdition XML10-4ed-Excluded-char-1 13869)
EXPECTED_FOTS_FAILURE (DISPUTED prod-ModuleImport modules-22 22317)
+EXPECTED_FOTS_FAILURE (DISPUTED app-CatalogCheck Catalog011 22327)
# Next three possibly unique to old RQ machine, but they need to be
# marked for the RQ to pass.
@@ -140,8 +141,6 @@
# This test passes on the old and new RQ machines, but fails for Sorin.
#EXPECTED_FOTS_FAILURE (fn-normalize-unicode fn-normalize-unicode-11 0)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog010 1187807)
-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog011 1187807)
EXPECTED_FOTS_FAILURE (fn-fold-left fold-left-009 1187685)
EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-005 1187685)
EXPECTED_FOTS_FAILURE (fn-fold-right fold-right-006 1187685)
@@ -170,10 +169,8 @@
EXPECTED_FOTS_FAILURE (fn-normalize-space fn-normalize-space-25 1187802)
EXPECTED_FOTS_FAILURE (fn-normalize-unicode cbcl-fn-normalize-unicode-001 1187813)
EXPECTED_FOTS_FAILURE (fn-normalize-unicode cbcl-fn-normalize-unicode-006 1187813)
-EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-001 1187807)
-EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-010 1188260)
-EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-011 1187807)
-EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-001 1187807)
+EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-010 1189927)
+EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-011 1188260)
EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-016 1188269)
EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-017 1188269)
EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-020 1188269)
@@ -229,7 +226,7 @@
EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-8 1172270)
EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-9 1172270)
EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-10 1172270)
-EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 1187807)
+EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 1133806)
EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 1188281)
EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-11 1188279)
EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-12 1188279)
=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq 2013-05-17 23:57:15 +
+++ test/fots_driver/environment.xq 2013-06-11 14:33:41 +
@@ -82,16 +82,27 @@
: @param $env the non-local environment of the test-case, if any. It is an
:environment specified either at the test-set level or at the catalog
:level and is referenced by the test-case.
+ : @param $test the raw query text.
+ : @param $testSetURI the URI of the directory that contains the file of the
+ :associated test-set.
: @param $envCase the local environment of the test-case, if any.
: @return the declare base-uri prolog statement.
:)
declare function env:decl-base-uri(
- $env as element(fots:environment)?,
- $envCase as element(fots:environment)?
+ $envas element(fots:environment)?,
+ $envCaseas element(fots:environment)?,
+ $test as xs:string,
+ $testSetURI as xs:anyURI
) as xs:string?
{
- for $baseURI in ($env/fots:static-base-uri, $envCase/fots:static-base-uri)
- return concat(declare base-uri ', $baseURI/@uri, ';)
+ if($env/fots:static-base-uri, $envCase/fots:static-base-uri) then
+for $baseURI in ($env/fots:static-base-uri, $envCase/fots:static-base-uri)
+return concat('declare base-uri ', $baseURI/@uri, ';')
+ else if(not(contains($test,declare base-uri ) or
+ contains($test,xquery version ) or
+ contains($test,declare(::)base-uri))) then
+concat('declare base-uri ', $testSetURI, ';')
+ else ()
};
@@ -161,7 +172,7 @@
$test as xs:string
) as xs:boolean
{
- contains($test, concat(import schema namespace , $prefix))
+ contains($test, concat('import schema namespace ',
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2013-06-11T14-27-55.813Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/168644 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/fix_bug_1187807 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1187807-2013-06-11T14-55-55.909Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 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/fix_bug_1187807 into lp:zorba
Validation queue job fix_bug_1187807-2013-06-11T14-55-55.909Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 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/fix_bug_1187807 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 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/bug-1188084 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1188084-2013-06-11T15-22-53.109Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-1188084/+merge/168556 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/fix_bug_1187807 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1187807 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1187807/+merge/168681 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/bug-1188084 into lp:zorba
Validation queue job bug-1188084-2013-06-11T15-22-53.109Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-1188084/+merge/168556 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/bug-1188084 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1188084 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1188084/+merge/168556 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1188084/+merge/168556 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/new-jsoniq into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/168471 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/168471 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/168471 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/new-jsoniq into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-jsoniq-2013-06-11T18-18-56.738Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/168471 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/new-jsoniq into lp:zorba
Validation queue job new-jsoniq-2013-06-11T18-18-56.738Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/168471 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/168471 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/168471 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/feature-jdbc-tables into lp:zorba/jdbc-module
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/feature-jdbc-tables into lp:zorba/jdbc-module.
Commit message:
- jdbc:tables function to retrieve list of tables
- implement getBoolean to be able to retrieve boolean-typed columns from the
database
- slight change to tests in order to make them run independently
- allow for reading MS SQL Server timestamp columns
- optimized creation of base64Binaries avoiding encoding
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811
--
https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811
Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module.
=== modified file 'include/javaids.h'
--- include/javaids.h 2013-01-29 21:33:07 +
+++ include/javaids.h 2013-06-11 21:05:32 +
@@ -53,7 +53,7 @@
jmethodID close;
jmethodID createStatement;
jmethodID prepareStatement;
-
+ jmethodID getMetadata;
};
class JavaStatement {
public:
@@ -75,6 +75,7 @@
jmethodID beforeFirst;
jmethodID next;
jmethodID getInt;
+ jmethodID getBoolean;
jmethodID getDouble;
jmethodID getString;
jmethodID getBLOB;
@@ -128,7 +129,12 @@
jmethodID getBytes;
jmethodID length;
};
-
+class JavaDatabaseMetadata {
+public:
+ bool init();
+ jclass classID;
+ jmethodID getTables;
+};
}}; // namespace zorba, jdbc
=== modified file 'include/jdbc.h'
--- include/jdbc.h 2013-01-29 21:33:07 +
+++ include/jdbc.h 2013-06-11 21:05:32 +
@@ -49,6 +49,7 @@
extern JavaStatement jStatement;
extern JavaResultSet jResultSet;
extern JavaResultSetMetadata jResultSetMetadata;
+extern JavaDatabaseMetadata jDatabaseMetadata;
extern JavaPreparedStatement jPreparedStatement;
extern JavaParameterMetadata jParameterMetadata;
extern JavaBlob jBlob;
@@ -107,6 +108,9 @@
static String
getStringArg(const ExternalFunction::Arguments_t args, int index);
+static bool
+ getOptionalStringArg(const ExternalFunction::Arguments_t args, int index, String aRes);
+
static Item
getItemArg(const ExternalFunction::Arguments_t args, int index);
=== modified file 'include/sqltypes.h'
--- include/sqltypes.h 2013-01-29 21:33:07 +
+++ include/sqltypes.h 2013-06-11 21:05:32 +
@@ -73,6 +73,7 @@
static bool isFloat(long lType);
static bool isString(long lType);
static bool isBLOB(long lType);
+static bool isBoolean(long lType);
};
=== added file 'include/tables.h'
--- include/tables.h 1970-01-01 00:00:00 +
+++ include/tables.h 2013-06-11 21:05:32 +
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2006-2012 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.
+ */
+
+#include zorba/empty_sequence.h
+#include zorba/external_module.h
+#include zorba/item_factory.h
+#include zorba/zorba.h
+
+#include JavaVMSingleton.h
+
+
+namespace zorba
+{
+namespace jdbc
+{
+
+class TablesFunction : public ContextualExternalFunction
+{
+ private:
+const ExternalModule* theModule;
+ItemFactory* theFactory;
+XmlDataManager* theDataManager;
+
+ public:
+TablesFunction(const ExternalModule* aModule) :
+ theModule(aModule),
+ theFactory(Zorba::getInstance(0)-getItemFactory()),
+ theDataManager(Zorba::getInstance(0)-getXmlDataManager())
+{}
+
+~TablesFunction()
+{}
+
+ public:
+virtual String getURI() const
+{ return theModule-getURI(); }
+
+virtual String getLocalName() const
+{ return tables; }
+
+virtual ItemSequence_t
+ evaluate(const ExternalFunction::Arguments_t args,
+ const zorba::StaticContext*,
+ const zorba::DynamicContext*) const;
+};
+
+
+
+}}; // namespace zorba, jdbc
+
=== modified file 'src/jdbc.xq'
--- src/jdbc.xq 2013-02-02 04:36:34 +
+++ src/jdbc.xq 2013-06-11 21:05:32 +
@@ -543,3 +543,35 @@
:)
declare %an:sequential function jdbc:close-dataset(
$dataset-id as xs:anyURI) as empty-sequence() external;
+
+(:~
+ : Return the list of tables from a connection
+ :
+ : @param $connection-id The identifier to a connection.
+ : @param $catalog A filter of the catalog name of the tables.
+ : Send empty-sequence for all tables.
+ : @param $schema A filter of the schema name of the tables.
+ : Send empty-sequence for all tables.
+ : @param $table A filter of the
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-jdbc-tables into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/feature-jdbc-tables into lp:zorba/jdbc-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-jdbc-tables-2013-06-11T21-05-52.162Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/feature-jdbc-tables into lp:zorba/jdbc-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
The attempt to merge lp:~zorba-coders/zorba/feature-jdbc-tables into lp:zorba/jdbc-module failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job feature-jdbc-tables-2013-06-11T21-05-52.162Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/feature-jdbc-tables into lp:zorba/jdbc-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-jdbc-tables-2013-06-11T21-47-41.751Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
Validation queue job feature-jdbc-tables-2013-06-11T21-47-41.751Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/feature-jdbc-tables into lp:zorba/jdbc-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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-1180220 into lp:zorba
Review: Approve Juan reported some Windows compilation failures which are now fixed. There are a number of test failures but they seem to be the same set as without Paul's changes, so presumably no regressions. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220/+merge/167177 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-1180220 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1180220 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180220/+merge/167177 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220/+merge/167177 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-1180220 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1180220-2013-06-11T23-06-19.773Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220/+merge/167177 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-1180220 into lp:zorba
Validation queue job bug-1180220-2013-06-11T23-06-19.773Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220/+merge/167177 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-1180220 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1180220 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180220/+merge/167177 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220/+merge/167177 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-1180220-fix-moduleconf into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1180220-fix-moduleconf into lp:zorba. Commit message: Restore normal trunk branches for modules. Requested reviews: Chris Hillery (ceejatec) Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-fix-moduleconf/+merge/168832 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-fix-moduleconf/+merge/168832 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/ExternalModules.conf' --- modules/ExternalModules.conf 2013-06-07 05:58:11 + +++ modules/ExternalModules.conf 2013-06-11 23:56:27 + @@ -27,8 +27,7 @@ # currently only works for bzr, since svn tags are just different URLS) archive bzr lp:zorba/archive-module zorba-2.9 -#csv bzr lp:zorba/csv-module -csv bzr lp:~zorba-coders/zorba/bug-1180220-util-jvm +csv bzr lp:zorba/csv-module data-cleaning bzr lp:zorba/data-cleaning-module data-formatting bzr lp:zorba/data-formatting-module excel bzr lp:zorba/excel-modulezorba-2.9 -- 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-1180220-fix-moduleconf into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-fix-moduleconf/+merge/168832 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-1180220-fix-moduleconf into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-fix-moduleconf/+merge/168832 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-1180220-fix-moduleconf into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1180220-fix-moduleconf into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-fix-moduleconf/+merge/168832 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-fix-moduleconf/+merge/168832 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-1180220-fix-moduleconf into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1180220-fix-moduleconf-2013-06-12T00-01-16.384Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-fix-moduleconf/+merge/168832 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-1180220-fix-moduleconf into lp:zorba
Validation queue job bug-1180220-fix-moduleconf-2013-06-12T00-01-16.384Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-fix-moduleconf/+merge/168832 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-1180220-fix-moduleconf into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1180220-fix-moduleconf into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-fix-moduleconf/+merge/168832 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1180220-fix-moduleconf/+merge/168832 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:
Removed redundant typedef and #includes.
Requested reviews:
Matthias Brantner (matthias-brantner)
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/168835
Removed redundant typedef and #includes.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/168835
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/util/fs_util.h'
--- src/util/fs_util.h 2013-06-01 00:30:39 +
+++ src/util/fs_util.h 2013-06-12 00:34:29 +
@@ -17,20 +17,13 @@
#ifndef ZORBA_FS_UTIL_H
#define ZORBA_FS_UTIL_H
-#include zorba/config.h
-#include zorba/internal/cxx_util.h
#include zorba/util/fs_util.h
-#include ascii_util.h
#include string_util.h
namespace zorba {
namespace fs {
-// Exceptions /
-
-typedef os_error::exception exception;
-
// Directory //
#ifdef ZORBA_WITH_FILE_ACCESS
--
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/168835 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/168835 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/168835 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/168835 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 merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-06-12T00-38-00.639Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/168835 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 job pjl-misc-2013-06-12T00-38-00.639Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/168835 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: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/168835 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/168835 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/feature-jdbc-tables into lp:zorba/jdbc-module
Review: Approve Looks very nice! -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/feature-jdbc-tables into lp:zorba/jdbc-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-jdbc-tables-2013-06-12T02-37-45.473Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
Validation queue job feature-jdbc-tables-2013-06-12T02-37-45.473Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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/feature-jdbc-tables into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/feature-jdbc-tables into lp:zorba/jdbc-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 -- https://code.launchpad.net/~zorba-coders/zorba/feature-jdbc-tables/+merge/168811 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- 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-1189996 into lp:zorba
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1189996 into
lp:zorba.
Commit message:
Relocated some headers to zorba/include/util.
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #1189996 in Zorba: Relocate some public API headers to util
https://bugs.launchpad.net/zorba/+bug/1189996
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189996/+merge/168850
Relocated some headers to zorba/include/util.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1189996/+merge/168850
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-06-11 23:35:24 +
+++ ChangeLog 2013-06-12 05:24:33 +
@@ -32,6 +32,7 @@
for user-defined types.
* jn:members function takes item()* as aparameter (instead of item())
* jn:keys function takes item()* as aparameter (instead of item())
+ * Fixed bug #1189996 (Relocate some public API headers to util)
* Object/array navigation allows item()* as the type of the input sequence
(doing implicit iteration over the input sequence and skipping items
that are not objects/arrays).
=== modified file 'doc/cxx/examples/binary.cpp'
--- doc/cxx/examples/binary.cpp 2013-02-07 17:24:36 +
+++ doc/cxx/examples/binary.cpp 2013-06-12 05:24:33 +
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#include zorba/zorba.h
-#include zorba/base64.h
+#include zorba/util/base64_util.h
#include iostream
-
using namespace zorba;
bool
encode_example()
{
String lString(Hello Zorba);
- String lEncoded = zorba::encoding::Base64::encode(lString);
+ String lEncoded = zorba::base64::encode(lString);
return lEncoded == SGVsbG8gWm9yYmE=;
}
@@ -32,7 +32,7 @@
decode_example()
{
String lEncoded(SGVsbG8gWm9yYmE=);
- String lDecoded = zorba::encoding::Base64::decode(lEncoded);
+ String lDecoded = zorba::base64::decode(lEncoded);
return lDecoded == Hello Zorba;
}
=== modified file 'include/zorba/annotation.h'
--- include/zorba/annotation.h 2013-02-07 17:24:36 +
+++ include/zorba/annotation.h 2013-06-12 05:24:33 +
@@ -18,7 +18,7 @@
#include zorba/config.h
#include zorba/api_shared_types.h
-#include zorba/smart_ptr.h
+#include zorba/util/smart_ptr.h
namespace zorba {
=== modified file 'include/zorba/api_shared_types.h'
--- include/zorba/api_shared_types.h 2013-05-31 03:38:45 +
+++ include/zorba/api_shared_types.h 2013-06-12 05:24:33 +
@@ -17,7 +17,7 @@
#define ZORBA_SHARED_TYPES_INCL_H
#include zorba/config.h
-#include zorba/smart_ptr.h
+#include zorba/util/smart_ptr.h
namespace zorba {
=== modified file 'include/zorba/dynamic_context.h'
--- include/zorba/dynamic_context.h 2013-05-22 02:22:35 +
+++ include/zorba/dynamic_context.h 2013-06-12 05:24:33 +
@@ -21,12 +21,12 @@
#include memory
#include zorba/config.h
-#include zorba/locale.h
-#include zorba/time.h
#include zorba/api_shared_types.h
+#include zorba/external_function_parameter.h
#include zorba/static_context_consts.h
+#include zorba/util/calendar.h
+#include zorba/util/locale.h
#include zorba/xmldatamanager.h
-#include zorba/external_function_parameter.h
namespace zorba {
=== modified file 'include/zorba/function.h'
--- include/zorba/function.h 2013-04-19 22:25:21 +
+++ include/zorba/function.h 2013-06-12 05:24:33 +
@@ -21,7 +21,7 @@
#include zorba/config.h
#include zorba/api_shared_types.h
-#include zorba/smart_ptr.h
+#include zorba/util/smart_ptr.h
namespace zorba {
=== modified file 'include/zorba/query_location.h'
--- include/zorba/query_location.h 2013-02-07 17:24:36 +
+++ include/zorba/query_location.h 2013-06-12 05:24:33 +
@@ -18,8 +18,8 @@
#define QUERYLOCATION_H
#include zorba/config.h
-#include zorba/smart_ptr.h
#include zorba/api_shared_types.h
+#include zorba/util/smart_ptr.h
namespace zorba{
=== modified file 'include/zorba/static_context.h'
--- include/zorba/static_context.h 2013-03-25 23:02:19 +
+++ include/zorba/static_context.h 2013-06-12 05:24:33 +
@@ -16,17 +16,17 @@
#ifndef XQP_STATIC_CONTEXT_API_H
#define XQP_STATIC_CONTEXT_API_H
+#include vector
+
#include zorba/config.h
#include zorba/api_shared_types.h
#include zorba/zorba_string.h
#include zorba/typeident.h
#include zorba/static_context_consts.h
#include zorba/options.h // for compiler hints class
-#include vector
#include zorba/function.h
#include zorba/annotation.h
-#include zorba/smart_ptr.h
-#include zorba/smart_ptr.h
+#include zorba/util/smart_ptr.h
#ifndef ZORBA_NO_FULL_TEXT
#include zorba/thesaurus.h
#endif /* ZORBA_NO_FULL_TEXT */
=== modified file 'include/zorba/stemmer.h'
--- include/zorba/stemmer.h 2013-06-01 00:30:39 +
+++ include/zorba/stemmer.h 2013-06-12 05:24:33 +
@@ -24,7 +24,7 @@
#include zorba/internal/cxx_util.h
#include zorba/internal/unique_ptr.h
#include zorba/internal/ztd.h
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189996/+merge/168850 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-1189996 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189996 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189996/+merge/168850 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189996/+merge/168850 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-1189996 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1189996-2013-06-12T05-27-59.092Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189996/+merge/168850 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-1189996 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1189996 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job bug-1189996-2013-06-12T05-27-59.092Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189996/+merge/168850 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-1189996 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189996 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189996/+merge/168850 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189996/+merge/168850 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
