zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

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

Requested reviews:
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609

do not predeclare zerr
-- 
https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2011-12-21 14:40:33 +0000
+++ ChangeLog	2011-12-21 19:43:39 +0000
@@ -9,6 +9,7 @@
     set multiple times via the c++ api).
   * Fixed bug #905050 (setting and getting the context item type via the c++ api)
   * Added createDayTimeDuration, createYearMonthDuration, createDocumentNode, createCommentNode, createPiNode to api's ItemFactory.
+  * zerr is not predeclared anymore to be http://www.zorba-xquery.com/errors
 
 version 2.1
 

=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp	2011-12-21 14:40:33 +0000
+++ src/context/root_static_context.cpp	2011-12-21 19:43:39 +0000
@@ -78,7 +78,7 @@
       "xml", XML_NS,
       "xs", XML_SCHEMA_NS,
       "xsi", XSI_NS,
-      "zerr", ZORBA_ERR_NS,
+      //"zerr", ZORBA_ERR_NS,
       NULL, NULL
     };
 

=== modified file 'test/rbkt/Queries/zorba/store/documents.xq'
--- test/rbkt/Queries/zorba/store/documents.xq	2011-08-04 02:14:56 +0000
+++ test/rbkt/Queries/zorba/store/documents.xq	2011-12-21 19:43:39 +0000
@@ -1,6 +1,7 @@
 import module namespace doc = "http://www.zorba-xquery.com/modules/store/dynamic/documents";;
 
 declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace zerr = "http://www.zorba-xquery.com/errors";;
 
 declare base-uri "http://www.zorba-xquery.com/";;
 

=== modified file 'test/rbkt/Queries/zorba/xqddf/test-node-reference.xq'
--- test/rbkt/Queries/zorba/xqddf/test-node-reference.xq	2011-04-11 20:48:27 +0000
+++ test/rbkt/Queries/zorba/xqddf/test-node-reference.xq	2011-12-21 19:43:39 +0000
@@ -1,5 +1,7 @@
 import module namespace ref = "http://www.zorba-xquery.com/modules/node-reference";;
 
+declare namespace zerr = "http://www.zorba-xquery.com/errors";;
+
 declare function local:foo($ref as xs:anyURI) {
   ref:node-by-reference($ref) 
 };