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

Commit message:
Bump version to 2.8! Clean ChangeLog.

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/2.8-release-prep/+merge/142856
-- 
https://code.launchpad.net/~zorba-coders/zorba/2.8-release-prep/+merge/142856
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-01-09 04:48:12 +0000
+++ CMakeLists.txt	2013-01-11 09:49:26 +0000
@@ -478,7 +478,7 @@
 
 # zorba versioning
 SET(ZORBA_MAJOR_NUMBER "2")
-SET(ZORBA_MINOR_NUMBER "7")
+SET(ZORBA_MINOR_NUMBER "8")
 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	2013-01-11 01:34:56 +0000
+++ ChangeLog	2013-01-11 09:49:26 +0000
@@ -4,6 +4,7 @@
 version 2.8
 
 New Features:
+<<<<<<< TREE
   * (bug #1039284) Implemented jn:json-doc().
   * (bug #867363) Added http-uri-resolution feature to disable HTTP
 	when resolving URIs.
@@ -18,11 +19,28 @@
   * New external module client for Couchbase Server.
   * New external module client for SQLite Database.
   * New external module client for Oracle NoSQL Database.
+=======
+  * New external module for interfacing with Couchbase Server.
+  * New external module for interfacing with SQLite Database.
+  * New external module for interfacing with Oracle NoSQL Database.
+  * New external module for interfacing with relational databases via JDBC.
+  * Implemented JSONiq's json-doc() function.
+  * http-uri-resolution feature to disable HTTP when resolving URIs.
+  * Option to specify that parse-json() strips the top-level array.
+>>>>>>> MERGE-SOURCE
   * New info-extraction module for querying concepts and entities in
+<<<<<<< TREE
     natural language text.
   * New JDBC module for manipulating SQL relational databases.
+=======
+    natural language text.
+>>>>>>> MERGE-SOURCE
   * Extended cast and castable expression to allow any simple target type
     (as specified by XQuery 3.0)
+<<<<<<< TREE
+=======
+  * The XQXQ (XQuery-for-XQuery) module became part of the Zorba core.
+>>>>>>> MERGE-SOURCE
 
 Optimizations:
   * Various optimizations in the implementation of the optimizer rules.
@@ -32,33 +50,31 @@
   * Fixed iteration over the components of a window clause; this improves static
     type computation of expressions referencing window vars.
   * No need to cast xs:untypedAtomic to xs:string in order-by expression.
-  * Convert LET vars whose domain sequence has exactly one item to FOR vars.
+  * Convert LET variables whose domain sequence has exactly one item to FOR vars.
 
 Bug Fixes/Other Changes:
   * Fixed bug #949064  (faulty QName should be printed in the error message)
   * Fixed bug #1072644 (broken parser error location)
-  * Change XQXQ (XQuery-for-XQuery) module now part of Zorba core
-  * Fixed mustCopyInputNodes() method of no-copy, and jsoniq functions.
   * Fixed bug #868640 (Node lifetime is shorter than expected due to let
-    variable inlining)
-  * Fixed bug in castable expr when the target type is xs:QName.
-  * Fixed bug in testing if a sequence type is subtype of node(xs:untyped)
+      variable inlining)
   * Fixed bugs #1081626 (Segmentation fault in a side-effecting FLWOR),
-    #1079488 (streaming segfault)
+      #1079488 (streaming segfault)
   * Fixed bug #1062093 (bug in var reference iterators with an associated
-    position that is negative)
+      position that is negative)
   * Fixed bug #1073978 (FOTS: option default ns not supported)
-  * Fixed bug in probing multi-key value-range indexes
   * Fixed bug #1061222 (bad message for errors in index key type declaration)
   * Fixed bug #1065175 (preceding::node()[1] returns wrong results)
   * Fixed bug #1065321 (following:text() doesn't return results in doc order)
   * Fixed bug #1067706 (wrong const folding in mutually recursive udfs)
-  * Fixed bug #1021492 (while computeing the "sources" of a prolog var, skip
-    any var-setting exprs that appear in non-used (and non-optimized) functions).
+  * Fixed bug #1021492 (while computing the "sources" of a prolog var, skip
+      any var-setting exprs that appear in non-used (and non-optimized) functions).
   * Fixed bug #1070551 (zerr:ZOSE0003 stream read failure)
   * Fixed bug #992304 (Compiling library modules could load data from wrong
     source)
   * Fixed bug #1043294 (XQST0036 not used in XQuery 3.0).
+  * Fixed bug in castable expr when the target type is xs:QName.
+  * Fixed bug in testing if a sequence type is subtype of node(xs:untyped)
+  * Fixed mustCopyInputNodes() method of no-copy, and jsoniq functions.
   * Fixed bugs related to casting to user-defined types.
 
 
@@ -76,7 +92,7 @@
   * Roundtripping of JSON items has been moved from the serializer to encoding functions.
   * Added uuid to public API.
   * Best-effort serialization of atomic values in JSON items.
-  * Positional pagination support for index probes 
+  * Positional pagination support for index probes
   * Recognize the {http://www.zorba-xquery.com/extensions}no-copy pragma to avoid
     copying nodes before insertion into a collection.
   * Added createUntypedAtomic to API's ItemFactory.
@@ -242,7 +258,7 @@
   * 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())
-  * Fixed bug in MarkNodeCopyProps rule (static cast to replace_expr without chaing the expr kind first)  
+  * Fixed bug in MarkNodeCopyProps rule (static cast to replace_expr without chaing the expr kind first)
   * Fixed bug in window iterator (binding the end vars in the output tuple stream)
   * Fixed bug #866547 (protect index-join rule from general flwor)
   * Fixed bug #867253 (cdml:delete-nodes should only remove root nodes)
@@ -268,10 +284,10 @@
 
 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) 
+  * Add XQuery 3.0 concat operator (http://www.w3.org/TR/xquery-30/#id-string-concat-expr)
   * New URI module providing percent-decoding functions.
   * The core parse-xml module is now able to parse input files in a streaming mode. A number of new options have also been added.
-  * LibXml2 version 2.7.0 or higher is now required in order to build Zorba.  
+  * LibXml2 version 2.7.0 or higher is now required in order to build Zorba.
   * 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).
@@ -290,7 +306,7 @@
 
 Optimization:
   * No-copy optimization: avoids copying nodes during node-constructor expressions.
-  * Added external function annotations %ann:propagates-input-nodes and 
+  * 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.
@@ -326,7 +342,7 @@
   * Fixed bug #907872 (segfault when returning an input ItemSequence from an external function).
   * Fixed bug in codegen: do not create a materialize clause if one exists already
     support.
-  * Fixed bug involving positional var and groupby 
+  * Fixed bug involving positional var and groupby
   * 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
@@ -343,17 +359,17 @@
   * Fixed bug #951772 (Comment node crashes serialization)
   * Fixed bug #945241 (StaticCollectionManager::declaredIndexes() and temporary indexes)
 
-	
+
 version 2.1
 
 New Features:
   * New node-position module. This module allows to obtain a representation of a node position, which
     can be used to assess structural relationships with other nodes.
   * New node-reference module. References can be obtained for any node, and
-	different nodes cannot have the same identifier.
+       different nodes cannot have the same identifier.
   * Custom Full-text thesaurus using Zorba URI resolver mechanism.
-  * Modified C++ API to add isSequential, getExternalVariables, isBoundContextItem and 
-  isBoundExternalVariable Functions
+  * Modified C++ API to add isSequential, getExternalVariables,
+       isBoundContextItem and isBoundExternalVariable Functions
   * Collection allows to retrieve information about the type
   and the annotations of a static collection.
   * Implemented the probe-index-range-value for general indexes
@@ -388,7 +404,7 @@
     corruption will occur)
   * Fixed bug # (Should not destroy the parent of a node that is being detached
     before the detach is done).
-  * Added const qualifier to StaticContext::getAuditEvent() 
+  * Added const qualifier to StaticContext::getAuditEvent()
   * Fixed bug #3408181 (available-collection() returns undeclared collections)
   * Fixed bug #859465 (Fatal error if a PUL contains two deactivate IC primitives)
   * Fixed bug #859467 (Fatal error if a PUL contains two activate Foreign Key primitives)
@@ -408,7 +424,7 @@
   * Fixed bug #869024 (segmentation fault with node-reference)
   * Fixed bug #869025 (segmentation fault with node-reference)
   * New node-reference module. References can be obtained for any node, and
-	different nodes cannot have the same identifier.
+      different nodes cannot have the same identifier.
   * Fixed bug #872697  (segmentation fault with validation of NMTOKENS)
   * General index cannot be declared as unique if the type of its key is
     xs:anyAtomicType or xs:untypedAtomic.
@@ -431,7 +447,7 @@
   * Fixed bug #862089 (Split binary/xq install directories for modules) by
   splitting "module path" into separate URI and Library paths
   * New node-position module. This module allows to obtain a representation of a node position, which
-    can be used to assess structural relationships with other nodes.   
+    can be used to assess structural relationships with other nodes.
   * Fixed bug #872502 (validation of the JSON module xqdoc fails)
   * Fixed bug #897619 (testdriver_mt can not run the XQueryX tests)
   * Fixed bug #867107 (xqdoc dependency to zorba is wrong)

=== modified file 'NOTICE.txt'
--- NOTICE.txt	2012-10-03 21:51:10 +0000
+++ NOTICE.txt	2013-01-11 09:49:26 +0000
@@ -1,5 +1,5 @@
 -----------
-Zorba 2.7.0
+Zorba 2.8.0
 -----------
 
 (Note: This file is generated automatically from NOTICE.xml.

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2013-01-10 20:26:23 +0000
+++ modules/ExternalModules.conf	2013-01-11 09:49:26 +0000
@@ -26,30 +26,31 @@
 #   "tag" is the VCS tag to check out (optional - defaults to HEAD;
 #       currently only works for bzr, since svn tags are just different URLS)
 
-archive         bzr  lp:zorba/archive-module          zorba-2.7
-csv             bzr  lp:zorba/csv-module              zorba-2.7
-data-cleaning   bzr  lp:zorba/data-cleaning-module    zorba-2.7
-data-formatting bzr  lp:zorba/data-formatting-module  zorba-2.7
-excel           bzr  lp:zorba/excel-module            zorba-2.7
-info-extraction bzr  lp:zorba/info-extraction-module
-geo             bzr  lp:zorba/geo-module              zorba-2.7
-geoproj         bzr  lp:zorba/geoproj-module
-graphviz        bzr  lp:zorba/graphviz-module         zorba-2.7
-html            bzr  lp:zorba/html-module             zorba-2.7
-http-client     bzr  lp:zorba/http-client-module      zorba-2.7
-image           bzr  lp:zorba/image-module
-jdbc            bzr  lp:zorba/jdbc-module
-languages       bzr  lp:zorba/languages-module        zorba-2.7
-oracle-nosql-db        bzr  lp:zorba/oracle-nosql-db-module 
-oauth           bzr  lp:zorba/oauth-module            zorba-2.7
-process         bzr  lp:zorba/process-module          zorba-2.7
-read-pdf        bzr  lp:zorba/read-pdf-module         zorba-2.7
-security        bzr  lp:zorba/security-module
-system          bzr  lp:zorba/system-module           zorba-2.7
-email           bzr  lp:zorba/email-module            zorba-2.7
-util-jvm        bzr  lp:zorba/util-jvm-module         zorba-2.7
-schema-tools    bzr  lp:zorba/schema-tools-module     zorba-2.7
-stack           bzr  lp:zorba/stack-module            zorba-2.7
-queue           bzr  lp:zorba/queue-module            zorba-2.7
-couchbase       bzr  lp:zorba/couchbase-module
-sqlite          bzr  lp:zorba/sqlite-module
+archive         bzr  lp:zorba/archive-module          zorba-2.8
+csv             bzr  lp:zorba/csv-module              zorba-2.8
+data-cleaning   bzr  lp:zorba/data-cleaning-module    zorba-2.8
+data-formatting bzr  lp:zorba/data-formatting-module  zorba-2.8
+excel           bzr  lp:zorba/excel-module            zorba-2.8
+info-extraction bzr  lp:zorba/info-extraction-module  zorba-2.8
+geo             bzr  lp:zorba/geo-module              zorba-2.8
+geoproj         bzr  lp:zorba/geoproj-module          zorba-2.8
+graphviz        bzr  lp:zorba/graphviz-module         zorba-2.8
+html            bzr  lp:zorba/html-module             zorba-2.8
+http-client     bzr  lp:zorba/http-client-module      zorba-2.8
+image           bzr  lp:zorba/image-module            zorba-2.8
+jdbc            bzr  lp:zorba/jdbc-module             zorba-2.8
+languages       bzr  lp:zorba/languages-module        zorba-2.8
+oracle-nosql-db bzr  lp:zorba/oracle-nosql-db-module  zorba-2.8
+oauth           bzr  lp:zorba/oauth-module            zorba-2.8
+process         bzr  lp:zorba/process-module          zorba-2.8
+read-pdf        bzr  lp:zorba/read-pdf-module         zorba-2.8
+security        bzr  lp:zorba/security-module         zorba-2.8
+system          bzr  lp:zorba/system-module           zorba-2.8
+email           bzr  lp:zorba/email-module            zorba-2.8
+util-jvm        bzr  lp:zorba/util-jvm-module         zorba-2.8
+schema-tools    bzr  lp:zorba/schema-tools-module     zorba-2.8
+stack           bzr  lp:zorba/stack-module            zorba-2.8
+queue           bzr  lp:zorba/queue-module            zorba-2.8
+couchbase       bzr  lp:zorba/couchbase-module        zorba-2.8
+sqlite          bzr  lp:zorba/sqlite-module           zorba-2.8
+

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