Chris Hillery has proposed merging lp:~zorba-coders/zorba/zorba-2.5-prep into 
lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-2.5-prep/+merge/106728
-- 
https://code.launchpad.net/~zorba-coders/zorba/zorba-2.5-prep/+merge/106728
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/zorba-2.5-prep into lp:zorba.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-05-17 09:43:03 +0000
+++ CMakeLists.txt	2012-05-22 01:13:22 +0000
@@ -438,7 +438,7 @@
 
 # zorba versioning
 SET(ZORBA_MAJOR_NUMBER "2")
-SET(ZORBA_MINOR_NUMBER "2")
+SET(ZORBA_MINOR_NUMBER "5")
 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-05-21 18:29:36 +0000
+++ ChangeLog	2012-05-22 01:13:22 +0000
@@ -1,16 +1,9 @@
 Zorba - The XQuery Processor
 
-
-version 2.x
-
-  * Fixed bug #867170 (Variables declared in Prolog are Overwritten inside the query)
-  * Fixed bug #1001463 (type not available during computation of function caching)
-
-
 version 2.5
 
 New Features:
-  * XQuery 3.0 functions
+  * New XQuery 3.0 functions
     - fn:available-environment-variables
     - fn:environment-variables
     - fn:uri-collection
@@ -20,30 +13,33 @@
     - fn:nilled#0
     - fn:path
   * Added base64:decode#2 function which also does transcoding
-  * Extended API for Python, Java, PHP and Ruby.
-  * Add jvm classpath to zorbacmd and to Zorba API. Tracked by #931816
-  * Added full-text module.
+  * Extended API for Python, Java, PHP and Ruby
+  * Added JVM classpath to zorbacmd and to Zorba API
+  * Added full-text module
   * Added support for NO_ICU (to not use ICU for unicode processing)
-  * Added XQJ support.
-  * Added CollectionManager and DocumentManager support for XQJ.
-  * New API EntityKind SOME_CONTENT
-  * API StreamResource is able to specify whether a stream is seekable
-  * New functions in the fetch module and the StaticContext to fetch
+  * Added XQJ support
+  * Added CollectionManager and DocumentManager support for XQJ
+  * Added new API EntityKind SOME_CONTENT
+  * Added new API StreamResource which is able to specify whether a
+    stream is seekable or not.
+  * Added new functions in the fetch module and the StaticContext to fetch
     resources as binary
 
 Optimizations:
-  * optimized insertion into a collection (don't copy it if the node was created by an element constructor
-    and is not used anywhere else in the query
+  * optimized insertion into a collection (don't copy it if the node was
+    created by an element constructor and is not used anywhere else in the query)
+  * Fixed performance problem with the findNodeSources function of the no-copy rule
 
 Bug Fixes/Other Changes:
+  * Fixed bug #867170 (Variables declared in Prolog are Overwritten inside the query)
+  * Fixed bug #1001463 (type not available during computation of function caching)
   * Fixed bugs #905028 (Allow to set base URI to undefined)
-  * Fixed bugs #931501 and #866987 (improved error messages for fn:format-number(). Additionally, the function now throws the FODF1310 error instead of XTDE1310, as the 3.0 spec requires)
+  * Fixed bugs #931501 and #866987 (improved error messages for fn:format-number()
+  * fn:format-number raises FODF1310 instead of XTDE1310
   * Fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
-  * Fixed memory leak in case of index truncation
   * Fixed bug #862971 (no error upon duplicate function declarations)
-  * Fixed bug in mergeUpdates() method
   * Fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions)
-  * Fixed bug #986075 (encountering flwor expr with no clauses; due to common subexression being formed when inlining var in if-then-else expression) 
+  * Fixed bug #986075 (encountering flwor expr with no clauses)
   * Fixed bug #967864 (var substitution did not update theFreeVars property)
   * Fixed bug #891650 (context size var not always declared within path expr)
   * Fixed bug #948879 (--uri-path doesn't work with fetch:content())
@@ -52,7 +48,6 @@
   * Fixed bug #866547 (protect index-join rule from general flwor)
   * Fixed bug #867253 (cdml:delete-nodes should only remove root nodes)
   * Fixed bug #967428 (do not hoist index creation outside a try-catch)
-  * Fixed performance problem with the findNodeSources function of the no-copy rule
   * Fixed bug #872234 (prevent a rewritting to take place in case of sequential expr)
   * Fixed bug #966706 (key uniqueness of index not enforced during incremental refresh)
   * Fixed bug #906494 (default compile with D_FILE_OFFSET_BITS=64)
@@ -64,7 +59,7 @@
   * Fixed bug #996084 (crash in Streamable*Item with file module)
   * Fixed bug #947627 (throw XQST0099 if more than one declarations of context item type in same module)
   * Fixed bug #980526 (no-copy rule bug due to global var being set in "distant" udf)
-  * Fixed bug #949910 (has-children may be invoked on all nodes). Internally, zorba::store::Item::getChildren() now returns NULL on node classes without offspring (instead of raising an error).
+  * Fixed bug #949910 (has-children may be invoked on all nodes)
   * Fixed Bug #933490 (Error ItemFactoryImpl::createBase64Binary with istream)
   * Fixed bug #867112 (Diagnostic Handler was not working on external APIs)
   * Fixed bug #857842 (Assertion failed with simple content element with comments)

=== modified file 'NOTICE.txt'
--- NOTICE.txt	2012-05-03 12:31:51 +0000
+++ NOTICE.txt	2012-05-22 01:13:22 +0000
@@ -1,5 +1,5 @@
 -----------
-Zorba 2.2.0
+Zorba 2.5.0
 -----------
 
 (Note: This file is generated automatically from NOTICE.xml.

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2012-05-03 12:31:51 +0000
+++ modules/ExternalModules.conf	2012-05-22 01:13:22 +0000
@@ -26,21 +26,21 @@
 #   "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.1 
-data-converters bzr  lp:zorba/data-converters-module   zorba-2.2 
-data-formatting bzr  lp:zorba/data-formatting-module   zorba-2.2-jvm
-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             1.0
-languages       bzr  lp:zorba/languages-module         zorba-2.2 
-oauth           bzr  lp:zorba/oauth-module             1.0 
-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 
-util-jvm        bzr  lp:zorba/util-jvm-module
-schema-tools    bzr  lp:zorba/schema-tools-module
-stack           bzr  lp:zorba/stack-module
-queue           bzr  lp:zorba/queue-module
+data-cleaning   bzr  lp:zorba/data-cleaning-module    zorba-2.5
+data-converters bzr  lp:zorba/data-converters-module  zorba-2.5
+data-formatting bzr  lp:zorba/data-formatting-module  zorba-2.5
+excel           bzr  lp:zorba/excel-module            zorba-2.5
+geo             bzr  lp:zorba/geo-module              zorba-2.5
+http-client     bzr  lp:zorba/http-client-module      zorba-2.5
+image           bzr  lp:zorba/image-module            zorba-2.5
+languages       bzr  lp:zorba/languages-module        zorba-2.5
+oauth           bzr  lp:zorba/oauth-module            zorba-2.5
+process         bzr  lp:zorba/process-module          zorba-2.5
+security        bzr  lp:zorba/security-module         zorba-2.5
+system          bzr  lp:zorba/system-module           zorba-2.5
+xqxq            bzr  lp:zorba/xqxq-module             zorba-2.5
+email           bzr  lp:zorba/email-module            zorba-2.5
+util-jvm        bzr  lp:zorba/util-jvm-module         zorba-2.5
+schema-tools    bzr  lp:zorba/schema-tools-module     zorba-2.5
+stack           bzr  lp:zorba/stack-module            zorba-2.5
+queue           bzr  lp:zorba/queue-module            zorba-2.5

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