[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/204361 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 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/204361 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 result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 Stage "CommitZorba" failed. Check console output at http://jenkins.zorba.io:8180/job/CommitZorba/285/console to view the results. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 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
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 :
Votes: {'Approve': 1}
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 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 result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 Stage "BuildZorbaUbuntu" failed. Check compiler output at http://jenkins.zorba.io:8180/job/BuildZorbaUbuntu/510/parsed_console to view the results. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 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/204361 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:
zorba-cmd clean-up. Why this code is (mostly) duplicated here and inside
libzorba isn't clear.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361
zorba-cmd clean-up. Why this code is (mostly) duplicated here and inside
libzorba isn't clear.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt 2013-08-09 09:04:36 +
+++ bin/CMakeLists.txt 2014-01-31 23:28:34 +
@@ -45,6 +45,7 @@
SET(SRCS
zorbacmd.cpp
+ zorbacmdproperties_base.cpp
zorbacmdproperties.cpp
util.cpp
path_util.cpp
=== modified file 'bin/zorbacmdproperties.h'
--- bin/zorbacmdproperties.h 2013-06-16 00:37:21 +
+++ bin/zorbacmdproperties.h 2014-01-31 23:28:34 +
@@ -122,4 +122,5 @@
bool loadProperties(int argc, char* argv[]);
};
-#endif
+#endif /* ZORBA_CMD_PROPERTIES_H */
+/* vim:set et sw=2 ts=2: */
=== modified file 'bin/zorbacmdproperties.txt'
--- bin/zorbacmdproperties.txt 2013-08-09 09:04:36 +
+++ bin/zorbacmdproperties.txt 2014-01-31 23:28:34 +
@@ -1,40 +1,40 @@
-("timing,t", "Print timing information. In case of multiple queries the timing information is provided per each query. Both wallclock time and user time (which excludes I/O, network delays and other kernel waits) are shown.")
-("output-file,o", po::value(), "Write the result to the given file.")
-("serialization-parameter,z", po::value >(), "Set serialization parameter in the form of a parameter=value pair (see http://www.w3.org/TR/xslt-xquery-serialization/#serparam, e.g.: -z method=xhtml -z doctype-system=DTD/xhtml1-strict.dtd -z indent=yes).")
-("serialize-html", "Serialize the result as HTML.")
-("serialize-text", "Serialize the result as Text.")
-("indent,i", "Indent output.")
-("print-query", "Print the queries.")
-("print-errors-as-xml,x", "Print the errors as XML.")
-("byte-order-mark", "Set the byte-order-mark for the serializer.")
-("omit-xml-declaration,r", "Omit the XML declaration from the result.")
+("as-files,f", "Treat all -q arguments as file paths instead of URIs or inline queries.")
("base-uri", po::value(), "Set the base URI property of the static context.")
("boundary-space", po::value(), "Set the boundary-space policy ('strip' or 'preserve') in the static context.")
-("default-collation", po::value(), "Add the given collation and set the value of the default collation in the static context to the given collation.")
+("byte-order-mark", "Set the byte-order-mark for the serializer.")
+("classpath", po::value(), "JVM classpath to be used by modules using Java implementations")
+("compile-only", "Only compile (don't execute)")
+("compile-plan,c", "Output the query plan as binary.")
("construction-mode", po::value(), "Set the construction mode ('strip' or 'preserve') in the static context.")
-("ordering-mode", po::value(), "Set the ordering mode ('ordered' or 'unordered') in the static context.")
-("multiple,m", po::value()->default_value (1), "Execute the given queries multiple times.")
-("query,q", po::value >(&theQueriesOrFiles), "Query test or file URI (file://...)")
-("as-files,f", "Treat all -q arguments as file paths instead of URIs or inline queries.")
-("external-variable,e", po::value >(), "Provide the value for a variable given a file (name=file) or a value (name:=value)")
("context-item", po::value (), "Set the context item to the XML document in a given file.")
-("optimization-level", po::value()->default_value("O1"), "Optimization level for the query compiler (O0, O1 or O2 - default: O1)")
-("lib-module,l", "Query compiler option to treat the query as a library module. If this is set --compile-only option is also set to true.")
-("parse-only", "Stop after parsing the query.")
-("compile-only", "Only compile (don't execute)")
-("no-serializer", "Do not serialize (discard) result.")
("debug,d", "Launch the Zorba debugger server and connect to a DBGP-enabled debugger client.")
("debug-host,h", po::value()->default_value("127.0.0.1"), "The host where the DBGP-enabled debugger client listens for connections. Defaults to: 127.0.0.1")
("debug-port,p", po::value()->default_value (28028), "The port on which the DBGP-enabled debugger client listens for connections. Defaults to: 28028")
-("no-logo", "Print no logo when starting.")
-("timeout", po::value()->default_value(-1), "Specify a timeout in seconds. After the specified time, the execution of the query will be aborted.")
-("uri-path", po::value(), "URI path (list of directories) added to the built-in URI resolver, i.e. where to find modules/schemas to import.")
+("default-collation", po::value(), "Add the given collation and set the value of the default collation in the static context to the given collation.")
+("execute-plan", "Take a
[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/204361 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361 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-misc2 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc2 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 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-misc2 into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 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-misc2 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 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-misc2 into lp:zorba
Validation queue result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 Stage "TestZorbaUbuntu" failed. 13 tests failed (8754 total tests run). Check test results at http://jenkins.zorba.io:8180/job/TestZorbaUbuntu/450/testReport/ to view the results. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 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-misc2 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 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-misc2 into lp:zorba
Validation queue result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 Stage "TestZorbaUbuntu" failed. 13 tests failed (8754 total tests run). Check test results at http://jenkins.zorba.io:8180/job/TestZorbaUbuntu/449/testReport/ to view the results. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 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-misc2 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147 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
