Matthias Brantner has proposed merging lp:~zorba-coders/zorba/zorba-2.2-prep 
into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-2.2-prep/+merge/97095

2.2 release preparations
-- 
https://code.launchpad.net/~zorba-coders/zorba/zorba-2.2-prep/+merge/97095
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-02-15 10:25:02 +0000
+++ CMakeLists.txt	2012-03-12 20:05:45 +0000
@@ -417,7 +417,7 @@
 
 # zorba versioning
 SET(ZORBA_MAJOR_NUMBER "2")
-SET(ZORBA_MINOR_NUMBER "1")
+SET(ZORBA_MINOR_NUMBER "2")
 SET(ZORBA_PATCH_NUMBER "0")
 SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
 MESSAGE(STATUS "Zorba version number: ${ZORBA_VERSION}")

=== modified file 'ChangeLog'
--- ChangeLog	2012-03-12 17:11:35 +0000
+++ ChangeLog	2012-03-12 20:05:45 +0000
@@ -2,69 +2,76 @@
 
 version 2.2
 
+New Features:
   * Add --compile-plan (-c) and --execute-plan (-e) options to zorba command line.
   * Add XQuery 3.0 concat operator (http://www.w3.org/TR/xquery-30/#id-string-concat-expr) 
-  * Fixed bug 923015 (clone() not implemented for full-text expressions)
+  * New URI module providing percent-decoding functions.
+  * Added index management function to the C++ api's StaticCollectionManager.
+  * Added createDayTimeDuration, createYearMonthDuration, createDocumentNode, createCommentNode, createPiNode to api's ItemFactory.
+  * Fixed bug #905050 (setting and getting the context item type via the c++ api).
+  * Added split function to the string module that allows for streamable tokenization but doesn't have regular expression
+  * Add new XQuery interface for the PHP bindings.
+  * Added two API methods StaticContext::getFunctions to introspect the functions of a static context
+  * Added API method Item::getNamespaceBindings().
+  * Added a transcoding streambuffer to the API which allows transcoding arbitrary encodings
+    from and to UTF-8
+  * file:read-text is able to handle arbitrary encodings (fixes bug #867159)
+  * http:send-request is able to handle arbitrary encodings
+  * Added API method StaticContext::getNamespaceBindings() (see bug #905035)
+  * New version of the JSON converter module in the core of Zorba (no external dependencies anymore)
+  * Added truncate function to the collection modules for efficient deletion of all nodes in a collection.
+
+
+Optimization:
   * No-copy optimization: avoids copying nodes during node-constructor expressions.
   * Added external function annotations %ann:propagates-input-nodes and 
     %ann:must-copy-input-nodes to be used by the no-copy optimization.
   * Caching of results for recursive functions with atomic parameter and return types.
   * Added %ann:cache and %ann:no-cache to enable or disable caching of results of functions with atomic parameter and return types.
-  * Added truncate function to the collection modules for efficient deletion of all nodes in a collection.
+  * Types-related optimizations for runtime operators (comparisons, FnBoolean, Or, And,
+    Compare, instance-of, cast, castable, treat, promote).
+  * More efficient implementation for base64Binary items
+  * Preallocate and reuse temp sequence iterator for LetVarITerator
+    and CtxVarIterator.
+  * Enhanced push-down of positional predicate into LetVarITerator
+    and CtxVarIterator.
+  * Change the implementation of the free-vars annotation and got rid
+    of the annotations map in expressions.
+
+Bug Fixes/Other Changes:
+  * Fixed bug 923015 (clone() not implemented for full-text expressions)
   * Fixed bug 917923 (bug in copying outer var values into the eval dynamic context)
   * Fixed bug 867509 (Can not handle largest xs:unsignedLong values)
-  * Fixed bug 952829 (Nondeterministic annotation doesn't seem to be checked)
   * Fixed bug 924063 (sentence is incorrectly incremented when token characters end without sentence terminator)
-  * New URI module providing percent-decoding functions.
-  * Optimization: change the implementation of the free-vars annotation and got rid
-    of the annotations map in expressions.
   * Fixed bug 909126 (bug in cloning of var_expr)
   * Fixed bug in destruction of exit_catcher_expr
   * Fixed bug #867024 (error messages)
-  * Types-related optimizations for runtime operators (comparisons, FnBoolean, Or, And,
-    Compare, instance-of, cast, castable, treat, promote).
   * Fixed bug #911585 (management of variables during eval)
-  * Fixed bug #951772 (Comment node crashes serialization)
   * Fixed bug #866423 (fn:empty and fn:exists iterators must reset their input in
     case of early-out)
-  * More efficient implementation for base64Binary items
-  * Added index management function to the C++ api's StaticCollectionManager.
   * Fixed bug #945241 (StaticCollectionManager::declaredIndexes() and temporary indexes)
   * Fixed bug #872288 (reset recursive flag during node rename)
   * Fixed bug #905041 (allow for the default element and function namespaces to be
     set multiple times via the c++ api).
   * Fixed bug #907872 (segfault when returning an input ItemSequence from an external function).
-  * Fixed bug #905050 (setting and getting the context item type via the c++ api).
-  * Added createDayTimeDuration, createYearMonthDuration, createDocumentNode, createCommentNode, createPiNode to api's ItemFactory.
   * Fixed bug in codegen: do not create a materialize clause if one exists already
-  * Added split function to the string module that allows for streamable tokenization but doesn't have regular expression
     support.
   * Fixed bug involving positional var and groupby 
-  * Optimization: preallocate and reuse temp sequence iterator for LetVarITerator
-    and CtxVarIterator.
-  * Optimization: enhanced push-down of positional predicate into LetVarITerator
-    and CtxVarIterator.
   * Fixed bug #867266 (do not hoist updating expressions)
   * Fixed bug #867022 (added location and params to some XPTY0004 errors)
   * zerr is not predeclared anymore to be http://www.zorba-xquery.com/errors
-  * Add new XQuery interface for the PHP bindings.
-  * Added two API methods StaticContext::getFunctions to introspect the functions of a static context
-  * Added API method Item::getNamespaceBindings().
-  * Added a transcoding streambuffer to the API which allows transcoding arbitrary encodings
-    from and to UTF-8
-  * file:read-text is able to handle arbitrary encodings (fixes bug #867159)
-  * http:send-request is able to handle arbitrary encodings
   * Fixed bug #917981 (disallow declaring same module twice).
-  * Added API method StaticContext::getNamespaceBindings() (see bug #905035)
   * Deprecated StaticContext:getNamespaceURIByPrefix()
   * Fixed bug #943788 (streamable string is not seekable)
   * Fixed bug 921624 (slow queries with bogus example.com schema URIs)
   * Fixed bug #918211 (xqueryx fulltext w3c conformance generation)
   * Fixed bug #918157 (Add XQFTTS to validation queue)
   * Fixed bug with unversioned modules with C++ external functions
-  * Fixed bug #878508 (JSON Module not escaping escape characters)
   * Fixed bug #912579 (validate-in-place on non-root elements)
   * Fixed bug #891209 (validation with xsi:type returns untyped)
+  * Fixed bug 952829 (Nondeterministic annotation doesn't seem to be checked)
+  * Fixed bug #951772 (Comment node crashes serialization)
+  * Fixed bug #945241 (StaticCollectionManager::declaredIndexes() and temporary indexes)
 
 version 2.1
 

=== modified file 'NOTICE.txt'
--- NOTICE.txt	2012-03-07 09:42:36 +0000
+++ NOTICE.txt	2012-03-12 20:05:45 +0000
@@ -1,5 +1,5 @@
 -----------
-Zorba 2.1.0
+Zorba 2.2.0
 -----------
 
 (Note: This file is generated automatically from NOTICE.xml.

=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt	2011-08-10 14:04:32 +0000
+++ modules/CMakeLists.txt	2012-03-12 20:05:45 +0000
@@ -27,7 +27,7 @@
 # ready for other modules' FIND_PACKAGE() calls. We also add all
 # module build dirs to CMAKE_PREFIX_PATH for the same reason.
 SET (project_regex "[Pp][Rr][Oo][Jj][Ee][Cc][Tt]")
-FILE (GLOB modules_dir_items RELATIVE "${ZORBA_MODULES_DIR}" "${ZORBA_MODULES_DIR}/*")
+FILE (GLOB modules_dir_items RELATIVE "${ZORBA_MODULES_DIR}" "${ZORBA_MODULES_DIR}/[a-zA-Z0-9]*")
 
 # Filter out non-directories
 SET (module_dirs)

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2012-03-07 15:49:25 +0000
+++ modules/ExternalModules.conf	2012-03-12 20:05:45 +0000
@@ -26,17 +26,17 @@
 #   "tag" is the VCS tag to check out (optional - defaults to HEAD;
 #       currently only works for bzr, since svn tags are just different URLS)
 
-data-cleaning   bzr  lp:zorba/data-cleaning-module       1.0
-data-converters bzr  lp:zorba/data-converters-module     
-data-formatting bzr  lp:zorba/data-formatting-module     zorba-2.1
-excel           bzr  lp:zorba/excel-module               zorba-2.1
-geo             bzr  lp:zorba/geo-module                 zorba-2.1
-http-client     bzr  lp:zorba/http-client-module         
-image           bzr  lp:zorba/image-module               zorba-2.1
-languages       bzr  lp:zorba/languages-module           zorba-2.1
-oauth           bzr  lp:zorba/oauth-module               zorba-2.1
-process         bzr  lp:zorba/process-module             zorba-2.1
-security        bzr  lp:zorba/security-module            zorba-2.1
-system          bzr  lp:zorba/system-module              zorba-2.1
-xqxq            bzr  lp:zorba/xqxq-module                1.0
-email           bzr  lp:zorba/email-module               zorba-2.1
+data-cleaning   bzr  lp:zorba/data-cleaning-module     zorba-2.2 
+data-converters bzr  lp:zorba/data-converters-module   zorba-2.2 
+data-formatting bzr  lp:zorba/data-formatting-module   zorba-2.2 
+excel           bzr  lp:zorba/excel-module             zorba-2.2 
+geo             bzr  lp:zorba/geo-module               zorba-2.2 
+http-client     bzr  lp:zorba/http-client-module       zorba-2.2 
+image           bzr  lp:zorba/image-module             zorba-2.2 
+languages       bzr  lp:zorba/languages-module         zorba-2.2 
+oauth           bzr  lp:zorba/oauth-module             zorba-2.2 
+process         bzr  lp:zorba/process-module           zorba-2.2 
+security        bzr  lp:zorba/security-module          zorba-2.2 
+system          bzr  lp:zorba/system-module            zorba-2.2 
+xqxq            bzr  lp:zorba/xqxq-module              zorba-2.2 
+email           bzr  lp:zorba/email-module             zorba-2.2 

-- 
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

Reply via email to