Merge lp:~zorba-coders/zorba/jsoniq into lp:zorba

[Chris Hillery]

Adds JSONiq. (Please replace with more comprehensive commit message; this is just to make the validation queue start.)

Adds JSONiq.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/-2012-01-31T00-53-26.285Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:zorba/3.0 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:71 (list):
  list index: 2 out of range (-2, 1)

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job -2012-01-31T00-53-26.285Z is finished. The final
  status was:

  43 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/-2012-01-31T01-44-59.475Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:zorba/3.0 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:71 (list):
  list index: 2 out of range (-2, 1)

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job -2012-01-31T01-44-59.475Z is finished. The final
  status was:

  17 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[lp:~zorba-coders/zorba/jsoniq]

10604. By Matthias Brantner on 2012-01-31

- typed value for null and pairs
- return pairs in order of insertion
- most of the delete UP (no errors or undo, yet)

10605. By Chris Hillery on 2012-01-31

More serialization method changes:
1. Re-introduced json_emitter which only outputs JSON ("json" output method
will explicitly use this)
2. Introduce new jsoniq_emitter which detects whether first item is JDM or
XDM and uses an xml_emitter or json_emitter accordingly ("jsoniq" output
method will use this, and is the default)

10606. By Markos Zaharioudakis on 2012-01-31

work on jsoniq collections

10607. By Matthias Brantner on 2012-01-31

error checking and fixes for json:delete

10608. By Till Westmann on 2012-01-31

added support for the serialization method "JSONiq" in the testdriver

10609. By Till Westmann on 2012-01-31

introduced diagnostic categories JSONIQ_CORE and JSONIQ_UPDATE

10610. By Till Westmann on 2012-01-31

fixed expeted error for jsoniq/insert02

10611. By Markos Zaharioudakis on 2012-01-31

work on jsoniq collections

10612. By Matthias Brantner on 2012-02-01

array inserting updates

10613. By Matthias Brantner on 2012-02-01

fix generation of the jsoniq error module

10614. By Matthias Brantner on 2012-02-01

- manual maintenance of reference count for array members
- cleanup json puls

10615. By Markos Zaharioudakis on 2012-02-01

implemented ddl module for dynamic jsoniq collections + fixed bug #924595 + added syntax for structured-item() type test

10616. By Markos Zaharioudakis on 2012-02-01

work on jsoniq collections + fixed a bug in SimpleJSONArray::copy

10617. By Markos Zaharioudakis on 2012-02-01

work on jsoniq collections

10618. By Matthias Brantner on 2012-02-02

- upd:rename
- upd:replace-value
- improved upd:delete (with type promotion)
- fixed implementation of delete by using the position of an array in apply

10619. By Markos Zaharioudakis on 2012-02-02

finished DML module for dynamic jsoniq collections + fixed memory problem in root_typemanager

10620. By Paul J. Lucas on 2012-02-02

Merge from trunk.

10621. By Matthias Brantner on 2012-02-02

bugfix to report errors for duplicate keys in an object

10622. By Matthias Brantner on 2012-02-02

fixed the build without ZORBA_WITH_JSON

10623. By Matthias Brantner on 2012-02-02

fixed error messages

10624. By Matthias Brantner on 2012-02-02

empty member accessor

10625. By Chris Hillery on 2012-02-03

Support all atomic types when serializing, including those serialized as
"JSONiq value".

10626. By Matthias Brantner on 2012-02-03

- objects and pairs don't have a string value
- better error for fn:data on objects and arrays
- fixed return type for j:size()

10627. By Matthias Brantner on 2012-02-04

- fixed copy-transform to also allow json-items
- fixed flatten for json pairs
- added all queries from the use case document as tests

10628. By Matthias Brantner on 2012-02-05

better error for member accessor with wrong arg type

10629. By Chris Hillery on 2012-02-06

Add serialization of nested XML. Escape all strings appropriately.

10630. By Markos Zaharioudakis on 2012-02-06

fixed bug in implicit invocation of json item accessor functions

10631. By Chris Hillery on 2012-02-06

Added Item API methods for JSONiq.

10632. By Matthias Brantner on 2012-02-06

undo fix for type-promotion wrapping. this is fixed by normalize_fo

10633. By Matthias Brantner on 2012-02-06

raise an error if json:values is called with a pair

10634. By Matthias Brantner on 2012-02-07

hack for allowing true, false, and null in the content of a pair

10635. By Matthias Brantner on 2012-02-07

hack to treat a block whose expression returns only pairs as an object constructor

this means that the top-level sequential top-level program can never return pairs (only an object)

10636. By Matthias Brantner on 2012-02-07

fixed fn:boolean for json pairs and json:null

- fn:boolean(json:null()) => false
- fn:boolean(pair) => fn:boolean(value(pair))
- fn:booelean(pair*) => error

10637. By Matthias Brantner on 2012-02-07

merge

10638. By Matthias Brantner on 2012-02-07

fixed test case such that fn:data and explicit unboxing and flattening is not needed anymore

10639. By Matthias Brantner on 2012-02-07

changed semantics of the member selector to automatically do iteration

10640. By Matthias Brantner on 2012-02-07

implicit iteration for member selectors

10641. By Matthias Brantner on 2012-02-07

allow true, false, and null everywhere

10642. By Matthias Brantner on 2012-02-08

support for pairs with colon operator (removed direct and computed object and array constructors)

10643. By Chris Hillery on 2012-02-08

Fix serialization of control sequences.

10644. By Chris Hillery on 2012-02-08

Ignore standard "build" directory, and CMakeLists.txt.user (which is a
project file created by the QtCreator IDE).

10645. By Chris Hillery on 2012-02-08

Adding documentation for all functions.

10646. By Chris Hillery on 2012-02-08

Merge from trunk.

10647. By Chris Hillery on 2012-02-08

Added ItemFactory methods to create JSON items, along with test cases.

10648. By Markos Zaharioudakis on 2012-02-08

predeclared jn prefix

10649. By Markos Zaharioudakis on 2012-02-08

predeclared jn prefix (2nd try)

10650. By Matthias Brantner on 2012-02-08

commit the pre-generated parser files

10651. By Matthias Brantner on 2012-02-08

fixed jsoniq namespace + always process the jsoniq module because it contains udfs

10652. By Matthias Brantner on 2012-02-08

build fixes for without json

10653. By Matthias Brantner on 2012-02-08

added two tutorials as html. also temporarily removed the json module declaration
in order to make xqdoc work

10654. By Matthias Brantner on 2012-02-09

merge with trunk

10655. By Matthias Brantner on 2012-02-09

always indent by default in the swig bindings (this is a hack to get a nicer output in the web interface)

10656. By Matthias Brantner on 2012-02-09

fixed output of JSON_Test in xqdoc (e.g. array())

10657. By Chris Hillery on 2012-02-09

Allow "jsoniq" serialization method to serve for SAX output.

10658. By Chris Hillery on 2012-02-09

There are now 6 built-in namespace bindings (including jn: ).

10659. By Chris Hillery on 2012-02-09

Use Store::populateJSONArray() in ItemFactory.

10660. By Matthias Brantner on 2012-02-09

updated namespace prefix in the jsoniq module to jn

10661. By Matthias Brantner on 2012-02-09

- revert rev. 10655
- in execute, make the default indent + no xml decl

10662. By Matthias Brantner on 2012-02-09

updated jsoniq tutorials to latest drafts

10663. By Nicolae Brinza on 2012-03-07

Implementation of the new Cloudscript grammar.

10664. By Markos Zaharioudakis on 2012-03-08

removed pairs from type system and compiler

10665. By Markos Zaharioudakis on 2012-03-08

merge from trunk

10666. By Markos Zaharioudakis on 2012-03-09

forbid json items in xml constructors

10667. By Markos Zaharioudakis on 2012-03-09

translation of json constructor exprs

10668. By Markos Zaharioudakis on 2012-03-12

re-implemented json constructors

10669. By Markos Zaharioudakis on 2012-03-12

fixed EBV for jsoniq

10670. By Markos Zaharioudakis on 2012-03-13

work on jsoniq functions

10671. By Markos Zaharioudakis on 2012-03-13

fixed error codes and tests

10672. By Markos Zaharioudakis on 2012-03-13

implemented values( as object()) function

10673. By Markos Zaharioudakis on 2012-03-13

implemented accumulating object constructor

10674. By Markos Zaharioudakis on 2012-03-13

implemented the project function

10675. By Markos Zaharioudakis on 2012-03-16

implemented object insertions

10676. By Markos Zaharioudakis on 2012-03-19

more work on jsoniq updates

10677. By Markos Zaharioudakis on 2012-03-20

more work on jsoniq updates

10678. By Chris Hillery on 2012-03-20

Add Cloudscript-defined serialization parameters (boilerplate; not all
features implemented fully yet). Enable setting of serialization
parameters via .spec files.

10679. By Chris Hillery on 2012-03-20

Added CloudScript serialization error codes, and implementation checks to
throw them when appropriate. Several test cases.

10680. By Markos Zaharioudakis on 2012-03-20

done with object updates

10681. By Markos Zaharioudakis on 2012-03-20

fixed tests failing due to serialization changes

10682. By Markos Zaharioudakis on 2012-03-22

more work on array updates

10683. By Markos Zaharioudakis on 2012-03-23

done with array updates

10684. By Markos Zaharioudakis on 2012-03-23

renamed jn:names to jn:keys + removed 0-arity navigation

10685. By Markos Zaharioudakis on 2012-03-24

removed array(ItemType) type

10686. By Markos Zaharioudakis on 2012-04-03

introduced JNTY0002 error

10687. By Markos Zaharioudakis on 2012-04-11

merge from trunk + work on static and dynamic collection modules

10688. By Markos Zaharioudakis on 2012-04-12

merged with trunk

10689. By Markos Zaharioudakis on 2012-04-17

fixed no-copy rule omission

10690. By Chris Hillery on 2012-04-19

Re-enable support for "old-style" Serialization: .spec file options
(should be deprecated, but still used by some non-core modules)

10691. By Chris Hillery on 2012-04-24

Remove public API methods that are specific to Object Pairs (no longer part
of the JSONiq spec).

10692. By Ghislain Fourny on 2012-05-10

Merged jsoniq-plan_serialization branch.

10693. By Ghislain Fourny on 2012-05-10

Merged trunk back.

10694. By Ghislain Fourny on 2012-05-10

Fixed flwor expression clause getter.

10695. By Ghislain Fourny on 2012-05-10

Now compiles and links.

10696. By Ghislain Fourny on 2012-05-14

Merged trunk back (10838).

10697. By Ghislain Fourny on 2012-05-15

Fixed some tests.

10698. By Chris Hillery on 2012-05-15

Additional fixes to handle old-style --method Serialization args correctly.

10699. By Ghislain Fourny on 2012-05-15

Copied pregenerated scanner and parser files.

10700. By Ghislain Fourny on 2012-05-18

Merged changes from child branch.

10701. By Ghislain Fourny on 2012-06-08

Merged trunk back.

10702. By Ghislain Fourny on 2012-06-08

Added curly braces in JSON insert expressions.

10703. By Ghislain Fourny on 2012-06-08

Extended update syntax to general FilterExprs.

10704. By Ghislain Fourny on 2012-06-11

Solved memory leak.

10705. By Ghislain Fourny on 2012-06-11

Adding tests.

10706. By Ghislain Fourny on 2012-06-11

Collection functions now work with general items.

10707. By Ghislain Fourny on 2012-06-11

Began removing pairs in the implementation. Still build errors.

10708. By Ghislain Fourny on 2012-06-12

Now compiles, but does not link yet.

10709. By Ghislain Fourny on 2012-06-12

Now links.

10710. By Ghislain Fourny on 2012-06-12

All JSONiq tests now pass.

10711. By Ghislain Fourny on 2012-06-12

Renamed cloudscript-extensions to jsoniq-extensions

10712. By Ghislain Fourny on 2012-06-12

Renamed cloudscript to jsoniq.

10713. By Ghislain Fourny on 2012-06-12

Renamed cloudscript to jsoniq.

10714. By Ghislain Fourny on 2012-06-12

Renamed cloudscript to jsoniq.

10715. By Ghislain Fourny on 2012-06-12

Now outputs INF upon positive infinity.

10716. By Ghislain Fourny on 2012-06-12

Using the pre-imported jn: prefix in some tests.

10717. By Ghislain Fourny on 2012-06-13

JSON items are now pointing to the root of their tree.

10718. By Ghislain Fourny on 2012-06-14

Indices should now work.

10719. By Ghislain Fourny on 2012-06-14

Index creation and probe should now work.

10720. By Ghislain Fourny on 2012-06-14

Reverted rename.

10721. By Ghislain Fourny on 2012-06-15

Reverted renaming.

10722. By Ghislain Fourny on 2012-06-15

Merged trunk back.

10723. By Ghislain Fourny on 2012-06-15

Merged jsoniq-deactivated back.

10724. By Ghislain Fourny on 2012-06-15

Fixed index maintenance.

10725. By Ghislain Fourny on 2012-06-15

Fixed tests.

10726. By Ghislain Fourny on 2012-06-18

Merged trunk back.

10727. By Ghislain Fourny on 2012-06-18

Synced error codes.

10728. By Ghislain Fourny on 2012-06-18

Added guards.

10729. By Ghislain Fourny on 2012-06-18

Deactivating JSON for merge proposal and one more fix.

10730. By Ghislain Fourny on 2012-06-19

Synced error codes.

10731. By Ghislain Fourny on 2012-06-19

Solved bug 918151 by allowing mixed items if a flag is set.

10732. By Ghislain Fourny on 2012-06-19

Removed useless and obsolete code that still contained JSON Pairs.

10733. By Ghislain Fourny on 2012-06-19

Fixed comment.

10734. By Ghislain Fourny on 2012-06-19

Added files.

10735. By Markos Zaharioudakis on 2012-06-20

small cosmetic changes

10736. By Ghislain Fourny on 2012-06-20

Implemented Markos' comments 1 through 5.

10737. By Ghislain Fourny on 2012-06-20

Implemented Markos' comments 7, 8 and 9.

10738. By Ghislain Fourny on 2012-06-20

Changed signature of getArraySize() to xs_integer.

10739. By Ghislain Fourny on 2012-06-20

Corrected bug and reverted mappings.xml to JSONiq deactivated version.

10740. By Ghislain Fourny on 2012-06-20

Adding tests.

10741. By Ghislain Fourny on 2012-06-20

Updated pregenerated parser files.

10742. By Ghislain Fourny on 2012-06-20

Generating preprocessor guards for STRUCTURED_ITEM.

10743. By Ghislain Fourny on 2012-06-21

Fixed emit_end().

10744. By Ghislain Fourny on 2012-06-21

Updated updating error code and adding wrappers.

10745. By Ghislain Fourny on 2012-06-22

Now back to original order when outputting keys.

10746. By Ghislain Fourny on 2012-06-22

Optimized JSON root management system.

10747. By Ghislain Fourny on 2012-06-22

Optimized JSON item value memory management.

10748. By Ghislain Fourny on 2012-06-22

Using items instead of zstrings as keys in JSON objects.

10749. By Ghislain Fourny on 2012-06-22

Replaced dynamic casts with static casts and added dynamic cast assertions for debug mode.

10750. By Ghislain Fourny on 2012-06-22

Merged trunk back.

10751. By Markos Zaharioudakis on 2012-06-26

compilation fixes

10752. By Markos Zaharioudakis on 2012-06-26

compilation fixes

10753. By Markos Zaharioudakis on 2012-06-26

added all variants of getStringValue() for JSONNull + cosmetic

10754. By Markos Zaharioudakis on 2012-06-26

merge from trunk

10755. By Ghislain Fourny on 2012-06-26

Implemented Markos' comments, except 10.

10756. By Ghislain Fourny on 2012-06-26

Merged trunk back.

10757. By Ghislain Fourny on 2012-06-26

Fixed tests.

10758. By Ghislain Fourny on 2012-06-27

Merged trunk back.

10759. By Ghislain Fourny on 2012-06-28

Implemented more efficient data structure on objects.

10760. By Ghislain Fourny on 2012-06-28

Changed parameter of getObjectValue() to an item.

10761. By Ghislain Fourny on 2012-06-28

Removed free list.

10762. By Ghislain Fourny on 2012-06-28

changed 1st param of setJSONRoot() to Item* to save some ref counting + eliminated some compiler warnings

10763. By Ghislain Fourny on 2012-06-28

Fixed compilation error on Windows.

10764. By Ghislain Fourny on 2012-06-28

Improved efficiency of removing an object pair.

10765. By Markos Zaharioudakis on 2012-06-28

a better implementation for SimpleJSONObject::remove()

10766. By Markos Zaharioudakis on 2012-06-28

small optimizations + cosmetic

10767. By Markos Zaharioudakis on 2012-06-28

commented out ZORBA_TEST_PLAN_SERIALIZATION flag in testdriver.cpp

10768. By Markos Zaharioudakis on 2012-06-29

fixed compiler warnings

10769. By Markos Zaharioudakis on 2012-06-29

fixed print out of jsoniq errors

10770. By Markos Zaharioudakis on 2012-06-29

added missing <value> to a couple of jsoniq errors

10771. By Ghislain Fourny on 2012-07-02

Deactivated invariant assertions for the moment.

10772. By Ghislain Fourny on 2012-07-04

Merged trunk back.

10773. By Ghislain Fourny on 2012-07-04

Regenerated files.

10774. By Ghislain Fourny on 2012-07-04

A small fix (already in trunk).

Unmerged revisions

=== modified file 'CMakeConfiguration.txt'
--- CMakeConfiguration.txt	2012-01-11 17:30:25 +0000
+++ CMakeConfiguration.txt	2012-02-07 00:26:21 +0000
@@ -152,6 +152,9 @@
 SET(ZORBA_WITH_BIG_INTEGER OFF CACHE BOOL "enable arbitrary precision integers")
 MESSAGE(STATUS "ZORBA_WITH_BIG_INTEGER:               " ${ZORBA_WITH_BIG_INTEGER})
 
+SET(ZORBA_WITH_JSON ON CACHE BOOL "enable integrated JSON support")
+MESSAGE(STATUS "ZORBA_WITH_JSON:                      " ${ZORBA_WITH_JSON})
+
 IF (ZORBA_SUPPRESS_SWIG)
   SET (no_swig ON)
 ELSE (ZORBA_SUPPRESS_SWIG)

=== modified file 'ChangeLog'
--- ChangeLog	2012-02-02 09:56:52 +0000
+++ ChangeLog	2012-02-07 00:26:21 +0000
@@ -35,6 +35,7 @@
   * Fixed bug #918157 (Add XQFTTS to validation queue)
   * Fixed bug with unversioned modules with C++ external functions
 
+	
 version 2.1
 
 New Features:

=== added file 'NOTICE.txt'
--- NOTICE.txt	1970-01-01 00:00:00 +0000
+++ NOTICE.txt	2012-02-07 00:26:21 +0000
@@ -0,0 +1,740 @@
+-----------
+Zorba 2.1.0
+-----------
+
+(Note: This file is generated automatically from NOTICE.xml.
+Please do not modify this file directly.)
+
+
+
+
+Apache 2
+
+      Copyright 2006-2011 The FLWOR Foundation
+
+      See LICENSE.txt for license information.
+
+      ------------------------
+      This product includes software developed at
+      The FLWOR Foundation (http://www.flworfound.org/).
+
+      ------------------------
+      Portions of this software were developed at the Systems
+      Group of the ETH Zurich, Switzerland.
+    
+
+Other files used by this project:
+----------------------------------------------------
+
+src/zorbatypes/m_apm.h
+src/zorbatypes/mapm/
+
+Copyright: 1999-2007 Michael C. Ring
+Website: http://www.tc.umn.edu/~ringx004/mapm-main.html
+
+      This software is Freeware.
+
+      Permission to use, copy, and distribute this software and its
+      documentation for any purpose with or without fee is hereby granted,
+      provided that the above copyright notice appear in all copies and
+      that both that copyright notice and this permission notice appear
+      in supporting documentation.
+
+      Permission to modify the software is granted. Permission to distribute
+      the modified code is granted. Modifications are to be distributed by
+      using the file 'license.txt' as a template to modify the file header.
+      'license.txt' is available in the official MAPM distribution.
+
+      To distribute modified source code, insert the file 'license.txt'
+      at the top of all modified source code files and edit accordingly.
+
+      This software is provided "as is" without express or implied warranty.
+    
+----------------------------------------------------
+
+src/zorbamisc/config/stdint.h
+
+Copyright: 2006 Alexander Chemeris
+
+
+      Redistribution and use in source and binary forms, with or without
+      modification, are permitted provided that the following conditions are met:
+
+      1. Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+      2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+      3. The name of the author may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+      WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+      EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+      PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+      OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+      OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+      ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    
+----------------------------------------------------
+
+src/zorbautils/stemmer/
+
+Copyright: 2001 Dr. Martin Porter
+
+
+      All the software given out on this Snowball site is covered by the BSD
+      License (see http://www.opensource.org/licenses/bsd-license.html), with
+      Copyright (c) 2001, Dr Martin Porter, and (for the Java developments)
+      Copyright (c) 2002, Richard Boulton.
+
+      Essentially, all this means is that you can do what you like with the code,
+      except claim another Copyright for it, or claim that it is issued under a
+      different license. The software is also issued without warranties, which
+      means that if anyone suffers through its use, they cannot come back and sue
+      you. You also have to alert anyone to whom you give the Snowball software to
+      the fact that it is covered by the BSD license.
+
+      We have not bothered to insert the licensing arrangement into the text of
+      the Snowball software.
+    
+----------------------------------------------------
+
+src/util/less.h
+
+Copyright: 1998 Paul J. Lucas
+
+
+      Redistribution and use in source and binary forms, with or without
+      modification, are permitted provided that the following conditions are met:
+
+      o  Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+      o  Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+      o  The name of the author may not be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE.
+    
+----------------------------------------------------
+
+src/util/auto_vector.h (has been modified)
+
+Copyright: 2003 Reliable Software
+
+
+      Redistribution and use in source and binary forms, with or without
+      modification, are permitted provided that the following conditions are met:
+
+      o  Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+      o  Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+      o  The name of the author may not be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE.
+    
+----------------------------------------------------
+
+cmake_modules/FindBoost.cmake
+
+Copyright: 
+      2006-2008 Andreas Schneider <[e-mail]>
+      2007      Wengo
+      2007      Mike Jackson
+      2008      Andreas Pakulat <[e-mail]>
+    
+
+
+      Redistribution AND use is allowed according to the terms of the New BSD license.
+      For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+    
+----------------------------------------------------
+
+cmake_modules/FindJNI.cmake
+cmake_modules/FindPythonLibs.cmake
+cmake_modules/FindSWIG.cmake
+
+Copyright: 2001-2009 Kitware, Inc.
+
+
+      Distributed under the OSI-approved BSD License (the "License");
+      see accompanying file Copyright.txt for details.
+
+      This software is distributed WITHOUT ANY WARRANTY; without even the
+      implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+      See the License for more information.
+
+      CMake - Cross Platform Makefile Generator
+      Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+      All rights reserved.
+
+      Redistribution and use in source and binary forms, with or without
+      modification, are permitted provided that the following conditions
+      are met:
+
+      * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+      * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+      * Neither the names of Kitware, Inc., the Insight Software Consortium,
+      nor the names of their contributors may be used to endorse or promote
+      products derived from this software without specific prior written
+      permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+      "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+      LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+      A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+      HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+      LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+      DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+      THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+      (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+      OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+      ------------------------------------------------------------------------------
+
+      The above copyright and license notice applies to distributions of
+      CMake in source and binary form.  Some source files contain additional
+      notices of original copyright by their contributors; see each source
+      for details.  Third-party software packages supplied with CMake under
+      compatible licenses provide their own copyright notices documented in
+      corresponding subdirectories.
+
+      ------------------------------------------------------------------------------
+
+      CMake was initially developed by Kitware with the following sponsorship:
+
+      * National Library of Medicine at the National Institutes of Health
+      as part of the Insight Segmentation and Registration Toolkit (ITK).
+
+      * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
+      Visualization Initiative.
+
+      * National Alliance for Medical Image Computing (NAMIC) is funded by the
+      National Institutes of Health through the NIH Roadmap for Medical Research,
+      Grant U54 EB005149.
+
+      * Kitware, Inc.
+    
+----------------------------------------------------
+
+/xml.xsd
+
+Copyright: 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
+
+
+      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+      W3C Software Notice and License
+
+      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
+
+      License
+
+      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
+
+      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
+      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
+      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+      Disclaimers
+
+      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+    
+----------------------------------------------------
+
+schemas/xslt-xquery-serialization.xsd
+
+Copyright: 2010 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
+
+
+      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+      W3C Software Notice and License
+
+      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
+
+      License
+
+      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
+
+      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
+      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
+      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+      Disclaimers
+
+      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+    
+----------------------------------------------------
+
+modules/w3c/xpath-functions.xsd
+
+Copyright: 2005 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
+
+
+      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+      W3C Software Notice and License
+
+      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
+
+      License
+
+      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
+
+      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
+      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
+      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+      Disclaimers
+
+      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+    
+----------------------------------------------------
+
+include/xqc.h
+
+Copyright: 2008, Matthias Brantner, John Snelson
+
+
+      * All rights reserved.
+      *
+      * Redistribution and use in source and binary forms, with or without
+      * modification, are permitted provided that the following conditions are met:
+      *
+      *     * Redistributions of source code must retain the above copyright notice,
+      *       this list of conditions and the following disclaimer.
+      *     * Redistributions in binary form must reproduce the above copyright
+      *       notice, this list of conditions and the following disclaimer in the
+      *       documentation and/or other materials provided with the distribution.
+      *     * Neither the name of the developers nor the names of contributors may be
+      *       used to endorse or promote products derived from this software without
+      *       specific prior written permission.
+      *
+      * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+      * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+      * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+      * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+      * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+      * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+      * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+      * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+      * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      * POSSIBILITY OF SUCH DAMAGE.
+    
+----------------------------------------------------
+
+modules/functx/functx.xq
+
+Copyright: 2007 Datypic
+
+
+      : This library is free software; you can redistribute it and/or
+      : modify it under the terms of the GNU Lesser General Public
+      : License as published by the Free Software Foundation; either
+      : version 2.1 of the License.
+
+      : This library is distributed in the hope that it will be useful,
+      : but WITHOUT ANY WARRANTY; without even the implied warranty of
+      : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      : Lesser General Public License for more details.
+
+      : You should have received a copy of the GNU Lesser General Public
+      : License along with this library; if not, write to the Free Software
+      : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    
+----------------------------------------------------
+
+src/compiler/parser/FlexLexer.h
+
+Copyright: 1993 The Regents of the University of California
+
+
+      // All rights reserved.
+      //
+      // This code is derived from software contributed to Berkeley by
+      // Kent Williams and Tom Epperly.
+      //
+      //  Redistribution and use in source and binary forms, with or without
+      //  modification, are permitted provided that the following conditions
+      //  are met:
+
+      //  1. Redistributions of source code must retain the above copyright
+      //  notice, this list of conditions and the following disclaimer.
+      //  2. Redistributions in binary form must reproduce the above copyright
+      //  notice, this list of conditions and the following disclaimer in the
+      //  documentation and/or other materials provided with the distribution.
+
+      //  Neither the name of the University nor the names of its contributors
+      //  may be used to endorse or promote products derived from this software
+      //  without specific prior written permission.
+
+      //  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+      //  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+      //  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+      //  PURPOSE.
+    
+----------------------------------------------------
+
+src/diagnostics/StackWalker.cpp
+src/diagnostics/StackWalker.h
+
+Copyright: 2005 Jochen Kalmbach 
+
+
+      Under BSD License: http://www.opensource.org/licenses/bsd-license.php
+    
+----------------------------------------------------
+
+src/util/singleton.h
+src/util/threads.h
+
+Copyright: 2001 Andrei Alexandrescu
+
+
+      This code accompanies the book:
+      Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design
+          Patterns Applied". Copyright (c) 2001. Addison-Wesley.
+      Permission to use, copy, modify, distribute and sell this software for any
+          purpose is hereby granted without fee, provided that the above copyright
+          notice appear in all copies and that both that copyright notice and this
+          permission notice appear in supporting documentation.
+      The author or Addison-Wesley Longman make no representations about the
+          suitability of this software for any purpose. It is provided "as is"
+          without express or implied warranty.
+    
+
+External libraries used by this project:
+----------------------------------------------------
+
+Name: LIBXML2
+Preferred version: 2.2.16 or higher
+Is mandatory: true
+Website: http://xmlsoft.org/
+License: MIT
+Copyright: 1998-2002 Daniel Veillard.  All Rights Reserved.
+External notice: 
+
+      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+      Except as contained in this notice, the name of Daniel Veillard shall not
+      be used in advertising or otherwise to promote the sale, use or other deal-
+      ings in this Software without prior written authorization from him.
+    
+----------------------------------------------------
+
+Name: LIBXSLT
+Preferred version: 1.1.26
+Is mandatory: false
+Website: http://xmlsoft.org/XSLT/
+License: MIT
+Copyright: 2001-2002 Daniel Veillard.  All Rights Reserved.
+External notice: 
+
+      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+      Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from him.
+
+    
+----------------------------------------------------
+
+Name: ICU4C
+Preferred version: 3.6 or higher
+Is mandatory: true
+Website: http://www.icu-project.org/
+License: ICU License
+Copyright: 1995-2011 International Business Machines Corporation and others 
+External notice: 
+
+      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+      Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
+    
+----------------------------------------------------
+
+Name: CURL
+Preferred version: above 7.12
+Is mandatory: false
+Website: http://curl.haxx.se/
+License: MIT/X derivate license
+Copyright: 1996 - 2011, Daniel Stenberg, <[e-mail]>.
+External notice: 
+
+      All rights reserved.
+
+      Permission to use, copy, modify, and distribute this software for any purpose
+      with or without fee is hereby granted, provided that the above copyright
+      notice and this permission notice appear in all copies.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+      NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+      DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+      OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+      OR OTHER DEALINGS IN THE SOFTWARE.
+
+      Except as contained in this notice, the name of a copyright holder shall not
+      be used in advertising or otherwise to promote the sale, use or other dealings
+      in this Software without prior written authorization of the copyright holder.
+    
+----------------------------------------------------
+
+Name: ICONV
+Preferred version: above 1.12
+Is mandatory: true
+Website: http://www.gnu.org/software/libiconv/
+License: LGPL
+Copyright: 1998, 2010 Free Software Foundation, Inc.
+External notice: 
+
+----------------------------------------------------
+
+Name: ZLIB
+Preferred version: 1.2.5
+Is mandatory: true
+Website: http://www.zlib.net/
+Copyright: 1995-2004 Jean-loup Gailly and Mark Adler
+External notice: 
+
+      This software is provided 'as-is', without any express or implied
+      warranty.  In no event will the authors be held liable for any damages
+      arising from the use of this software.
+
+      Permission is granted to anyone to use this software for any purpose,
+      including commercial applications, and to alter it and redistribute it
+      freely, subject to the following restrictions:
+
+      1. The origin of this software must not be misrepresented; you must not
+      claim that you wrote the original software. If you use this software
+      in a product, an acknowledgment in the product documentation would be
+      appreciated but is not required.
+      2. Altered source versions must be plainly marked as such, and must not be
+      misrepresented as being the original software.
+      3. This notice may not be removed or altered from any source distribution.
+
+      Jean-loup Gailly [e-mail]
+      Mark Adler [e-mail]
+    
+----------------------------------------------------
+
+Name: XERCES
+Preferred version: 2.8.0 or higher
+Is mandatory: true
+Website: http://xerces.apache.org/xerces-c/
+License: Apache 2
+Copyright: Copyright © 1999-2010 The Apache Software Foundation. All Rights Reserved.
+External notice: 
+
+      http://www.apache.org/licenses/LICENSE-2.0
+    
+----------------------------------------------------
+
+Name: BOOST (boost_filesystem)
+Preferred version: 1.32 or higher
+Is mandatory: false
+Website: http://www.boost.org/
+License: Boost Software License v1.0
+Copyright: 
+      Beman Dawes, David Abrahams, 1998-2005.
+      Rene Rivera 2004-2007
+    
+External notice: 
+
+      Permission is hereby granted, free of charge, to any person or organization
+      obtaining a copy of the software and accompanying documentation covered by
+      this license (the "Software") to use, reproduce, display, distribute,
+      execute, and transmit the Software, and to prepare derivative works of the
+      Software, and to permit third-parties to whom the Software is furnished to
+      do so, all subject to the following:
+
+      The copyright notices in the Software and this entire statement, including
+      the above license grant, this restriction and the following disclaimer,
+      must be included in all copies of the Software, in whole or in part, and
+      all derivative works of the Software, unless such copies or derivative
+      works are solely in the form of machine-executable object code generated by
+      a source language processor.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+      SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+      FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+      ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+      DEALINGS IN THE SOFTWARE.
+    
+
+External applications used by this project:
+----------------------------------------------------
+
+Name: FLEX
+Preferred version: 2.5.33
+Is mandatory: false
+Website: http://flex.sourceforge.net/
+Copyright: 
+      2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The Flex Project.
+      1990, 1997 The Regents of the University of California. All rights reserved.
+    
+External notice: 
+
+      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+      1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+      2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+      
+      Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED “AS IS” AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+    
+----------------------------------------------------
+
+Name: BISON
+Preferred version: 2.4 or higher
+Is mandatory: false
+Website: http://www.gnu.org/software/bison/
+License: GPL
+Copyright: 1998, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+External notice: 
+
+----------------------------------------------------
+
+Name: DOXYGEN
+Preferred version: v1.7.4 
+Is mandatory: false
+Website: www.doxygen.org
+License: GPL
+Copyright: 1997-2011 by Dimitri van Heesch
+External notice: 
+
+      Permission to use, copy, modify, and distribute this software and its documentation under the terms of the GNU General Public License is hereby granted.
+      No representations are made about the suitability of this software for any purpose. 
+      It is provided "as is" without express or implied warranty. 
+      See the GNU General Public License for more details.
+
+      Documents produced by doxygen are derivative works derived from the input used in their production; they are not affected by this license.
+    
+----------------------------------------------------
+
+Name: CMAKE
+Preferred version: 2.8.4
+Is mandatory: true
+Website: http://www.cmake.org/
+License: Creative Commons Attribution-NoDerivs 3.0 Unported License
+Copyright: 2000-2009 Kitware, Inc., Insight Software Consortium. All rights reserved.
+External notice: 
+
+      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+      Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+      Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+      Neither the names of Kitware, Inc., the Insight Software Consortium, nor the names of their contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    
+----------------------------------------------------
+
+Name: SWIG
+Preferred version: 2.0.4 or above
+Is mandatory: false
+Website: http://www.swig.org/
+License: GPL
+Copyright: 
+      1995-2011 The SWIG Developers
+      2005-2006 Arizona Board of Regents (University of Arizona).
+      1998-2005 University of Chicago.
+      1995-1998 The University of Utah and the Regents of the University of California
+    
+External notice: 
+
+      SWIG is free software: you can redistribute it and/or modify it
+      under the terms of the GNU General Public License as published by
+      the Free Software Foundation, either version 3 of the License, or
+      (at your option) any later version. See the LICENSE-GPL file for
+      the full terms of the GNU General Public license version 3.
+
+      Portions of SWIG are also licensed under the terms of the licenses
+      in the file LICENSE-UNIVERSITIES. You must observe the terms of
+      these licenses, as well as the terms of the GNU General Public License,
+      when you distribute SWIG.
+
+      The SWIG library and examples, under the Lib and Examples top level
+      directories, are distributed under the following terms:
+
+      You may copy, modify, distribute, and make derivative works based on
+      this software, in source code or object code form, without
+      restriction. If you distribute the software to others, you may do
+      so according to the terms of your choice. This software is offered as
+      is, without warranty of any kind.
+
+      See the COPYRIGHT file for a list of contributors to SWIG and their
+      copyright notices.
+    
\ No newline at end of file

=== removed file 'NOTICE.txt'
--- NOTICE.txt	2011-10-21 08:09:17 +0000
+++ NOTICE.txt	1970-01-01 00:00:00 +0000
@@ -1,740 +0,0 @@
------------
-Zorba 2.1.0
------------
-
-(Note: This file is generated automatically from NOTICE.xml.
-Please do not modify this file directly.)
-
-
-
-
-Apache 2
-
-      Copyright 2006-2011 The FLWOR Foundation
-
-      See LICENSE.txt for license information.
-
-      ------------------------
-      This product includes software developed at
-      The FLWOR Foundation (http://www.flworfound.org/).
-
-      ------------------------
-      Portions of this software were developed at the Systems
-      Group of the ETH Zurich, Switzerland.
-    
-
-Other files used by this project:
-----------------------------------------------------
-
-src/zorbatypes/m_apm.h
-src/zorbatypes/mapm/
-
-Copyright: 1999-2007 Michael C. Ring
-Website: http://www.tc.umn.edu/~ringx004/mapm-main.html
-
-      This software is Freeware.
-
-      Permission to use, copy, and distribute this software and its
-      documentation for any purpose with or without fee is hereby granted,
-      provided that the above copyright notice appear in all copies and
-      that both that copyright notice and this permission notice appear
-      in supporting documentation.
-
-      Permission to modify the software is granted. Permission to distribute
-      the modified code is granted. Modifications are to be distributed by
-      using the file 'license.txt' as a template to modify the file header.
-      'license.txt' is available in the official MAPM distribution.
-
-      To distribute modified source code, insert the file 'license.txt'
-      at the top of all modified source code files and edit accordingly.
-
-      This software is provided "as is" without express or implied warranty.
-    
-----------------------------------------------------
-
-src/zorbamisc/config/stdint.h
-
-Copyright: 2006 Alexander Chemeris
-
-
-      Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions are met:
-
-      1. Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-      2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-      3. The name of the author may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-      THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-      WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-      EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-      PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-      OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-      OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-      ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    
-----------------------------------------------------
-
-src/zorbautils/stemmer/
-
-Copyright: 2001 Dr. Martin Porter
-
-
-      All the software given out on this Snowball site is covered by the BSD
-      License (see http://www.opensource.org/licenses/bsd-license.html), with
-      Copyright (c) 2001, Dr Martin Porter, and (for the Java developments)
-      Copyright (c) 2002, Richard Boulton.
-
-      Essentially, all this means is that you can do what you like with the code,
-      except claim another Copyright for it, or claim that it is issued under a
-      different license. The software is also issued without warranties, which
-      means that if anyone suffers through its use, they cannot come back and sue
-      you. You also have to alert anyone to whom you give the Snowball software to
-      the fact that it is covered by the BSD license.
-
-      We have not bothered to insert the licensing arrangement into the text of
-      the Snowball software.
-    
-----------------------------------------------------
-
-src/util/less.h
-
-Copyright: 1998 Paul J. Lucas
-
-
-      Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions are met:
-
-      o  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-      o  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-      o  The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-    
-----------------------------------------------------
-
-src/util/auto_vector.h (has been modified)
-
-Copyright: 2003 Reliable Software
-
-
-      Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions are met:
-
-      o  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-      o  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-      o  The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-    
-----------------------------------------------------
-
-cmake_modules/FindBoost.cmake
-
-Copyright: 
-      2006-2008 Andreas Schneider <[e-mail]>
-      2007      Wengo
-      2007      Mike Jackson
-      2008      Andreas Pakulat <[e-mail]>
-    
-
-
-      Redistribution AND use is allowed according to the terms of the New BSD license.
-      For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-    
-----------------------------------------------------
-
-cmake_modules/FindJNI.cmake
-cmake_modules/FindPythonLibs.cmake
-cmake_modules/FindSWIG.cmake
-
-Copyright: 2001-2009 Kitware, Inc.
-
-
-      Distributed under the OSI-approved BSD License (the "License");
-      see accompanying file Copyright.txt for details.
-
-      This software is distributed WITHOUT ANY WARRANTY; without even the
-      implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-      See the License for more information.
-
-      CMake - Cross Platform Makefile Generator
-      Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-      All rights reserved.
-
-      Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions
-      are met:
-
-      * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-      * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-      * Neither the names of Kitware, Inc., the Insight Software Consortium,
-      nor the names of their contributors may be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.
-
-      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-      "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-      LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-      A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-      HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-      LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-      DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-      THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-      (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-      OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-      ------------------------------------------------------------------------------
-
-      The above copyright and license notice applies to distributions of
-      CMake in source and binary form.  Some source files contain additional
-      notices of original copyright by their contributors; see each source
-      for details.  Third-party software packages supplied with CMake under
-      compatible licenses provide their own copyright notices documented in
-      corresponding subdirectories.
-
-      ------------------------------------------------------------------------------
-
-      CMake was initially developed by Kitware with the following sponsorship:
-
-      * National Library of Medicine at the National Institutes of Health
-      as part of the Insight Segmentation and Registration Toolkit (ITK).
-
-      * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
-      Visualization Initiative.
-
-      * National Alliance for Medical Image Computing (NAMIC) is funded by the
-      National Institutes of Health through the NIH Roadmap for Medical Research,
-      Grant U54 EB005149.
-
-      * Kitware, Inc.
-    
-----------------------------------------------------
-
-/xml.xsd
-
-Copyright: 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
-
-
-      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-      W3C Software Notice and License
-
-      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
-
-      License
-
-      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
-
-      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
-      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
-      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
-
-      Disclaimers
-
-      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
-    
-----------------------------------------------------
-
-schemas/xslt-xquery-serialization.xsd
-
-Copyright: 2010 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
-
-
-      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-      W3C Software Notice and License
-
-      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
-
-      License
-
-      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
-
-      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
-      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
-      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
-
-      Disclaimers
-
-      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
-    
-----------------------------------------------------
-
-modules/w3c/xpath-functions.xsd
-
-Copyright: 2005 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
-
-
-      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-      W3C Software Notice and License
-
-      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
-
-      License
-
-      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
-
-      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
-      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
-      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
-
-      Disclaimers
-
-      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
-    
-----------------------------------------------------
-
-include/xqc.h
-
-Copyright: 2008, Matthias Brantner, John Snelson
-
-
-      * All rights reserved.
-      *
-      * Redistribution and use in source and binary forms, with or without
-      * modification, are permitted provided that the following conditions are met:
-      *
-      *     * Redistributions of source code must retain the above copyright notice,
-      *       this list of conditions and the following disclaimer.
-      *     * Redistributions in binary form must reproduce the above copyright
-      *       notice, this list of conditions and the following disclaimer in the
-      *       documentation and/or other materials provided with the distribution.
-      *     * Neither the name of the developers nor the names of contributors may be
-      *       used to endorse or promote products derived from this software without
-      *       specific prior written permission.
-      *
-      * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-      * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-      * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-      * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-      * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-      * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-      * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-      * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-      * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-      * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-      * POSSIBILITY OF SUCH DAMAGE.
-    
-----------------------------------------------------
-
-modules/functx/functx.xq
-
-Copyright: 2007 Datypic
-
-
-      : This library is free software; you can redistribute it and/or
-      : modify it under the terms of the GNU Lesser General Public
-      : License as published by the Free Software Foundation; either
-      : version 2.1 of the License.
-
-      : This library is distributed in the hope that it will be useful,
-      : but WITHOUT ANY WARRANTY; without even the implied warranty of
-      : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      : Lesser General Public License for more details.
-
-      : You should have received a copy of the GNU Lesser General Public
-      : License along with this library; if not, write to the Free Software
-      : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-    
-----------------------------------------------------
-
-src/compiler/parser/FlexLexer.h
-
-Copyright: 1993 The Regents of the University of California
-
-
-      // All rights reserved.
-      //
-      // This code is derived from software contributed to Berkeley by
-      // Kent Williams and Tom Epperly.
-      //
-      //  Redistribution and use in source and binary forms, with or without
-      //  modification, are permitted provided that the following conditions
-      //  are met:
-
-      //  1. Redistributions of source code must retain the above copyright
-      //  notice, this list of conditions and the following disclaimer.
-      //  2. Redistributions in binary form must reproduce the above copyright
-      //  notice, this list of conditions and the following disclaimer in the
-      //  documentation and/or other materials provided with the distribution.
-
-      //  Neither the name of the University nor the names of its contributors
-      //  may be used to endorse or promote products derived from this software
-      //  without specific prior written permission.
-
-      //  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-      //  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-      //  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-      //  PURPOSE.
-    
-----------------------------------------------------
-
-src/diagnostics/StackWalker.cpp
-src/diagnostics/StackWalker.h
-
-Copyright: 2005 Jochen Kalmbach 
-
-
-      Under BSD License: http://www.opensource.org/licenses/bsd-license.php
-    
-----------------------------------------------------
-
-src/util/singleton.h
-src/util/threads.h
-
-Copyright: 2001 Andrei Alexandrescu
-
-
-      This code accompanies the book:
-      Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design
-          Patterns Applied". Copyright (c) 2001. Addison-Wesley.
-      Permission to use, copy, modify, distribute and sell this software for any
-          purpose is hereby granted without fee, provided that the above copyright
-          notice appear in all copies and that both that copyright notice and this
-          permission notice appear in supporting documentation.
-      The author or Addison-Wesley Longman make no representations about the
-          suitability of this software for any purpose. It is provided "as is"
-          without express or implied warranty.
-    
-
-External libraries used by this project:
-----------------------------------------------------
-
-Name: LIBXML2
-Preferred version: 2.2.16 or higher
-Is mandatory: true
-Website: http://xmlsoft.org/
-License: MIT
-Copyright: 1998-2002 Daniel Veillard.  All Rights Reserved.
-External notice: 
-
-      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-      Except as contained in this notice, the name of Daniel Veillard shall not
-      be used in advertising or otherwise to promote the sale, use or other deal-
-      ings in this Software without prior written authorization from him.
-    
-----------------------------------------------------
-
-Name: LIBXSLT
-Preferred version: 1.1.26
-Is mandatory: false
-Website: http://xmlsoft.org/XSLT/
-License: MIT
-Copyright: 2001-2002 Daniel Veillard.  All Rights Reserved.
-External notice: 
-
-      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-      Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from him.
-
-    
-----------------------------------------------------
-
-Name: ICU4C
-Preferred version: 3.6 or higher
-Is mandatory: true
-Website: http://www.icu-project.org/
-License: ICU License
-Copyright: 1995-2011 International Business Machines Corporation and others 
-External notice: 
-
-      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-      Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
-    
-----------------------------------------------------
-
-Name: CURL
-Preferred version: above 7.12
-Is mandatory: false
-Website: http://curl.haxx.se/
-License: MIT/X derivate license
-Copyright: 1996 - 2011, Daniel Stenberg, <[e-mail]>.
-External notice: 
-
-      All rights reserved.
-
-      Permission to use, copy, modify, and distribute this software for any purpose
-      with or without fee is hereby granted, provided that the above copyright
-      notice and this permission notice appear in all copies.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
-      NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-      DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-      OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-      OR OTHER DEALINGS IN THE SOFTWARE.
-
-      Except as contained in this notice, the name of a copyright holder shall not
-      be used in advertising or otherwise to promote the sale, use or other dealings
-      in this Software without prior written authorization of the copyright holder.
-    
-----------------------------------------------------
-
-Name: ICONV
-Preferred version: above 1.12
-Is mandatory: true
-Website: http://www.gnu.org/software/libiconv/
-License: LGPL
-Copyright: 1998, 2010 Free Software Foundation, Inc.
-External notice: 
-
-----------------------------------------------------
-
-Name: ZLIB
-Preferred version: 1.2.5
-Is mandatory: true
-Website: http://www.zlib.net/
-Copyright: 1995-2004 Jean-loup Gailly and Mark Adler
-External notice: 
-
-      This software is provided 'as-is', without any express or implied
-      warranty.  In no event will the authors be held liable for any damages
-      arising from the use of this software.
-
-      Permission is granted to anyone to use this software for any purpose,
-      including commercial applications, and to alter it and redistribute it
-      freely, subject to the following restrictions:
-
-      1. The origin of this software must not be misrepresented; you must not
-      claim that you wrote the original software. If you use this software
-      in a product, an acknowledgment in the product documentation would be
-      appreciated but is not required.
-      2. Altered source versions must be plainly marked as such, and must not be
-      misrepresented as being the original software.
-      3. This notice may not be removed or altered from any source distribution.
-
-      Jean-loup Gailly [e-mail]
-      Mark Adler [e-mail]
-    
-----------------------------------------------------
-
-Name: XERCES
-Preferred version: 2.8.0 or higher
-Is mandatory: true
-Website: http://xerces.apache.org/xerces-c/
-License: Apache 2
-Copyright: Copyright © 1999-2010 The Apache Software Foundation. All Rights Reserved.
-External notice: 
-
-      http://www.apache.org/licenses/LICENSE-2.0
-    
-----------------------------------------------------
-
-Name: BOOST (boost_filesystem)
-Preferred version: 1.32 or higher
-Is mandatory: false
-Website: http://www.boost.org/
-License: Boost Software License v1.0
-Copyright: 
-      Beman Dawes, David Abrahams, 1998-2005.
-      Rene Rivera 2004-2007
-    
-External notice: 
-
-      Permission is hereby granted, free of charge, to any person or organization
-      obtaining a copy of the software and accompanying documentation covered by
-      this license (the "Software") to use, reproduce, display, distribute,
-      execute, and transmit the Software, and to prepare derivative works of the
-      Software, and to permit third-parties to whom the Software is furnished to
-      do so, all subject to the following:
-
-      The copyright notices in the Software and this entire statement, including
-      the above license grant, this restriction and the following disclaimer,
-      must be included in all copies of the Software, in whole or in part, and
-      all derivative works of the Software, unless such copies or derivative
-      works are solely in the form of machine-executable object code generated by
-      a source language processor.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-      SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-      FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-      ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-      DEALINGS IN THE SOFTWARE.
-    
-
-External applications used by this project:
-----------------------------------------------------
-
-Name: FLEX
-Preferred version: 2.5.33
-Is mandatory: false
-Website: http://flex.sourceforge.net/
-Copyright: 
-      2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The Flex Project.
-      1990, 1997 The Regents of the University of California. All rights reserved.
-    
-External notice: 
-
-      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-      1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-      2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-      
-      Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-      THIS SOFTWARE IS PROVIDED “AS IS” AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-    
-----------------------------------------------------
-
-Name: BISON
-Preferred version: 2.4 or higher
-Is mandatory: false
-Website: http://www.gnu.org/software/bison/
-License: GPL
-Copyright: 1998, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-External notice: 
-
-----------------------------------------------------
-
-Name: DOXYGEN
-Preferred version: v1.7.4 
-Is mandatory: false
-Website: www.doxygen.org
-License: GPL
-Copyright: 1997-2011 by Dimitri van Heesch
-External notice: 
-
-      Permission to use, copy, modify, and distribute this software and its documentation under the terms of the GNU General Public License is hereby granted.
-      No representations are made about the suitability of this software for any purpose. 
-      It is provided "as is" without express or implied warranty. 
-      See the GNU General Public License for more details.
-
-      Documents produced by doxygen are derivative works derived from the input used in their production; they are not affected by this license.
-    
-----------------------------------------------------
-
-Name: CMAKE
-Preferred version: 2.8.4
-Is mandatory: true
-Website: http://www.cmake.org/
-License: Creative Commons Attribution-NoDerivs 3.0 Unported License
-Copyright: 2000-2009 Kitware, Inc., Insight Software Consortium. All rights reserved.
-External notice: 
-
-      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-      Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-      Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-      Neither the names of Kitware, Inc., the Insight Software Consortium, nor the names of their contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    
-----------------------------------------------------
-
-Name: SWIG
-Preferred version: 2.0.4 or above
-Is mandatory: false
-Website: http://www.swig.org/
-License: GPL
-Copyright: 
-      1995-2011 The SWIG Developers
-      2005-2006 Arizona Board of Regents (University of Arizona).
-      1998-2005 University of Chicago.
-      1995-1998 The University of Utah and the Regents of the University of California
-    
-External notice: 
-
-      SWIG is free software: you can redistribute it and/or modify it
-      under the terms of the GNU General Public License as published by
-      the Free Software Foundation, either version 3 of the License, or
-      (at your option) any later version. See the LICENSE-GPL file for
-      the full terms of the GNU General Public license version 3.
-
-      Portions of SWIG are also licensed under the terms of the licenses
-      in the file LICENSE-UNIVERSITIES. You must observe the terms of
-      these licenses, as well as the terms of the GNU General Public License,
-      when you distribute SWIG.
-
-      The SWIG library and examples, under the Lib and Examples top level
-      directories, are distributed under the following terms:
-
-      You may copy, modify, distribute, and make derivative works based on
-      this software, in source code or object code form, without
-      restriction. If you distribute the software to others, you may do
-      so according to the terms of your choice. This software is offered as
-      is, without warranty of any kind.
-
-      See the COPYRIGHT file for a list of contributors to SWIG and their
-      copyright notices.
-    
\ No newline at end of file

=== modified file 'doc/cxx/examples/CMakeLists.txt'
--- doc/cxx/examples/CMakeLists.txt	2011-08-19 00:03:31 +0000
+++ doc/cxx/examples/CMakeLists.txt	2012-02-07 00:26:21 +0000
@@ -36,6 +36,10 @@
 #  LIST(APPEND API_EXAMPLES debugger.cpp)
 ENDIF(ZORBA_WITH_DEBUGGER)
 
+IF (ZORBA_WITH_JSON)
+  LIST (APPEND API_EXAMPLES jsoniq.cpp)
+ENDIF (ZORBA_WITH_JSON)
+
 CREATE_TEST_SOURCELIST(
   examples
   examples.cpp

=== added file 'doc/cxx/examples/jsoniq.cpp'
--- doc/cxx/examples/jsoniq.cpp	1970-01-01 00:00:00 +0000
+++ doc/cxx/examples/jsoniq.cpp	2012-02-07 00:26:21 +0000
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2006-2008 The FLWOR Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <iostream>
+#include <sstream>
+
+#include <zorba/zorba.h>
+#include <zorba/store_manager.h>
+#include <zorba/serializer.h>
+#include <zorba/singleton_item_sequence.h>
+#include <zorba/zorba_exception.h>
+
+using namespace zorba;
+
+namespace jsoniq_test {
+
+/**
+ * Test accessing a JSONArray's members
+ */
+bool
+example_1(Zorba* aZorba)
+{
+  Iterator_t lIterator, lMembers;
+  XQuery_t lQuery = aZorba->compileQuery("[ 1, 2, 3 ]");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  // Ensure we got a JSON array
+  if (!lItem.isJSONItem() ||
+      lItem.getJSONItemKind() != store::StoreConsts::jsonArray) {
+    std::cerr << "Item is not JSON Array!" << std::endl;
+    return false;
+  }
+
+  // Ensure array has 3 integer members
+  lMembers = lItem.getArrayMembers();
+  lMembers->open();
+  Item lMember;
+  int count = 0;
+  while (lMembers->next(lMember)) {
+    // This will throw an exception if the item isn't an integer
+    std::cout << lMember.getLongValue() << std::endl;
+    count++;
+  }
+  if (count != 3) {
+    std::cerr << count << " array members returned, expecting 3" << std::endl;
+    return false;
+  }
+  lMembers->close();
+  lIterator->close();
+
+  return true;
+}
+
+
+/**
+ * Test accessing a JSONObject's Object Pairs, as well as the Pairs'
+ * names and values
+ */
+bool
+example_2(Zorba* aZorba)
+{
+  Iterator_t lIterator, lPairs;
+  XQuery_t lQuery = aZorba->compileQuery("{ \"one\" : 1, \"two\" : 2 }");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  // Ensure we got a JSON object
+  if (!lItem.isJSONItem() ||
+      lItem.getJSONItemKind() != store::StoreConsts::jsonObject) {
+    std::cerr << "Item is not JSON object!" << std::endl;
+    return false;
+  }
+
+  // Ensure object has 2 pairs with integer values
+  lPairs = lItem.getObjectPairs();
+  lPairs->open();
+  Item lPair;
+  int count = 0;
+  while (lPairs->next(lPair)) {
+    if (!lPair.isJSONItem() ||
+        lPair.getJSONItemKind() != store::StoreConsts::jsonPair) {
+      std::cerr << "Item is not a JSON pair!" << std::endl;
+    }
+    Item lName = lPair.getPairName();
+    std::cout << "   \"" << lName.getStringValue() << "\": ";
+    Item lValue = lPair.getPairValue();
+    std::cout << lValue.getLongValue() << std::endl;
+    count++;
+  }
+  if (count != 2) {
+    std::cerr << count << " object pairs returned, expecting 2" << std::endl;
+    return false;
+  }
+  lPairs->close();
+  lIterator->close();
+
+  return true;}
+
+
+/**
+ * Test accessing a JSONArray's members directly by index
+ */
+bool
+example_3(Zorba* aZorba)
+{
+  Iterator_t lIterator;
+  XQuery_t lQuery = aZorba->compileQuery("[ 1, 2, 3 ]");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  Item lMember;
+  for (int i = 1; i <= 3; i++) {
+    lMember = lItem.getArrayMember(i);
+    std::cout << lMember.getLongValue() << std::endl;
+  }
+
+  lIterator->close();
+
+  return true;
+}
+
+
+/**
+ * Test accessing a JSONObject's values directly by name
+ */
+bool
+example_4(Zorba* aZorba)
+{
+  Iterator_t lIterator;
+  XQuery_t lQuery = aZorba->compileQuery("{ \"one\" : 1, \"two\" : 2 }");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  Item lValue;
+  lValue = lItem.getObjectValue("one");
+  std::cout << lValue.getLongValue() << std::endl;
+  lValue = lItem.getObjectValue("two");
+  std::cout << lValue.getLongValue() << std::endl;
+
+  lIterator->close();
+
+  return true;
+}
+
+/**
+ * Test accessing a non-existent JSONArray member
+ */
+bool
+example_5(Zorba* aZorba)
+{
+  Iterator_t lIterator, lMembers;
+  XQuery_t lQuery = aZorba->compileQuery("[ 1, 2, 3 ]");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  Item lNonMember = lItem.getArrayMember(4);
+  lIterator->close();
+
+  if (!lNonMember.isNull()) {
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Test accessing a non-existent JSONObject pair value
+ */
+bool
+example_6(Zorba* aZorba)
+{
+  Iterator_t lIterator;
+  XQuery_t lQuery = aZorba->compileQuery("{ \"one\" : 1, \"two\" : 2 }");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  Item lNonValue = lItem.getObjectValue("three");
+  lIterator->close();
+
+  if (!lNonValue.isNull()) {
+    return false;
+  }
+  return true;
+}
+
+} /* namespace jsoniq-test */
+
+int 
+jsoniq(int argc, char* argv[])
+{
+  void* lStore = StoreManager::getStore();
+  Zorba *lZorba = Zorba::getInstance(lStore);
+
+  bool res = false;
+
+  std::cout << "executing jsoniq example 1" << std::endl;
+  res = jsoniq_test::example_1(lZorba);
+  if (!res) return 1; 
+  std::cout << std::endl;
+
+  std::cout << "executing jsoniq example 2" << std::endl;
+  res = jsoniq_test::example_2(lZorba);
+  if (!res) return 1; 
+  std::cout << std::endl;
+
+  std::cout << "executing jsoniq example 3" << std::endl;
+  res = jsoniq_test::example_3(lZorba);
+  if (!res) return 1; 
+  std::cout << std::endl;
+
+  std::cout << "executing jsoniq example 4" << std::endl;
+  res = jsoniq_test::example_4(lZorba);
+  if (!res) return 1; 
+  std::cout << std::endl;
+
+  std::cout << "executing jsoniq example 5" << std::endl;
+  res = jsoniq_test::example_5(lZorba);
+  if (!res) return 1; 
+  std::cout << std::endl;
+
+  std::cout << "executing jsoniq example 6" << std::endl;
+  res = jsoniq_test::example_6(lZorba);
+  if (!res) return 1; 
+  std::cout << std::endl;
+
+  lZorba->shutdown();
+  StoreManager::shutdownStore(lStore);
+  return 0;
+}

=== modified file 'doc/zorba/indexpage.dox.in'
--- doc/zorba/indexpage.dox.in	2011-10-07 08:28:43 +0000
+++ doc/zorba/indexpage.dox.in	2012-02-07 00:26:21 +0000
@@ -124,7 +124,7 @@
 
     \ref options_and_annotations
 
-    <!--li>\ref extensions_update</li-->
+    \ref jsoniq
 
 
 </td></tr>

=== added file 'doc/zorba/jsoniq.dox'
--- doc/zorba/jsoniq.dox	1970-01-01 00:00:00 +0000
+++ doc/zorba/jsoniq.dox	2012-02-07 00:26:21 +0000
@@ -0,0 +1,66 @@
+/** \page jsoniq JSONiq
+
+JSON is a lot simpler than XML in many data-oriented applications, and it is widely used in Web Service APIs and data feeds.
+But JSON has no full-featured query language, which means it is no longer simple for the most demanding applications.
+JSONiq is a small and simple set of extensions to XQuery that add support for JSON.
+
+The specification for the JSONiq XQuery extension can be found at http://www.jsoniq.org/.
+
+
+\section jsoniq_tutorial Tutorial
+
+\section jsoniq_functions Functions
+
+\section jsoniq_flavor Zorba's Flavor of JSONiq
+
+\subsection jsoniq_grammar Grammar
+
+\subsubsection jsoniq_constructors Constructor
+
+\begincode
+PrimaryExpr ::= .... BlockExpr | 
+                     JSONDirectObjectConstructor | 
+                     JSONComputedObjectConstructor |
+                     JSONComputedPairConstructor
+
+BlockExpr ::= "{" Statement* Expr? "}"
+
+JSONComputedPairConstructor ::= "pair" "{" ExprSingle ":" ExprSingle "}"
+
+JSONComputedObjectConstructor ::= "object" "{" Expr? | JSONDirectObjectContent "}"
+
+JSONDirectObjectConstructor ::= "{" JSONDirectObjectContent "}"
+ 
+JSONDirectObjectContent ::= JSONDirectPairConstructor+
+
+JSONDirectPairConstructor ::= ExprSingle ":" ExprSingle
+\endcode
+
+\subsubsection jsoniq_types Types
+
+\begincode
+ItemType ::=
+...
+JSONTest
+
+JSONTest ::= StructuredItemTest
+  | JSONItemTest
+  | JSONObjectTest
+  | JSONArrayTest
+  | JSONPairTest
+
+StructuredItemTest ::= "structured-item" "(" ")"
+
+JSONItemTest ::= "json-item" "(" ")"
+
+JSONObjectTest ::= "object" "(" ")"
+
+JSONArrayTest ::= "array" "(" ")"
+
+JSONPairTest ::= "pair" "(" ")"
+\endcode
+
+
+\subsection jsoniq_serialization Serialization
+
+*/

=== modified file 'include/zorba/config.h.cmake'
--- include/zorba/config.h.cmake	2012-02-05 12:31:20 +0000
+++ include/zorba/config.h.cmake	2012-02-07 00:26:21 +0000
@@ -155,6 +155,7 @@
 #cmakedefine ZORBA_WITH_BIG_INTEGER
 #cmakedefine ZORBA_WITH_DEBUGGER
 #cmakedefine ZORBA_WITH_FILE_ACCESS
+#cmakedefine ZORBA_WITH_JSON
 #cmakedefine ZORBA_WITH_LIBXML2_SAX
 
 // Zorba parser configuration

=== modified file 'include/zorba/diagnostic.h'
--- include/zorba/diagnostic.h	2011-07-01 16:07:54 +0000
+++ include/zorba/diagnostic.h	2012-02-07 00:26:21 +0000
@@ -239,7 +239,15 @@
   ZORBA_DEBUGGER,                       // Zorba Debugger
   ZORBA_OS,                             // Operating System
   ZORBA_SERIALIZATION,
-  ZORBA_STORE
+  ZORBA_STORE,
+
+  JSON_PARSER,
+  JSON_SERIALIZATION,
+
+# ifdef ZORBA_WITH_JSON
+  JSONIQ_CORE,
+  JSONIQ_UPDATE
+# endif
 };
 
 /**

=== modified file 'include/zorba/error.h'
--- include/zorba/error.h	2011-07-04 21:23:55 +0000
+++ include/zorba/error.h	2012-02-07 00:26:21 +0000
@@ -42,6 +42,13 @@
  */
 typedef internal::SystemDiagnostic<internal::ZorbaErrQName> ZorbaErrorCode;
 
+#ifdef ZORBA_WITH_JSON
+/**
+ * An %JSONiqErrorCode is a diagnostic for all JSONiq-specific errors.
+ */
+typedef internal::SystemDiagnostic<internal::JSONiqErrQName> JSONiqErrorCode;
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 
 /**

=== modified file 'include/zorba/identtypes.h'
--- include/zorba/identtypes.h	2011-09-21 14:49:55 +0000
+++ include/zorba/identtypes.h	2012-02-07 00:26:21 +0000
@@ -18,10 +18,14 @@
 
 #include <zorba/config.h>
 
-namespace zorba {
-class ZORBA_DLL_PUBLIC IdentTypes {
+namespace zorba 
+{
+
+class ZORBA_DLL_PUBLIC IdentTypes 
+{
 public:
-  typedef enum {
+  typedef enum 
+  {
     NAMED_TYPE,     // builtin atomic type
     ELEMENT_TYPE,
     ATTRIBUTE_TYPE,
@@ -30,12 +34,20 @@
     TEXT_TYPE,
     COMMENT_TYPE,
     ANY_NODE_TYPE, // node()
+#ifdef ZORBA_WITH_JSON
+    STRUCTURED_ITEM_TYPE,
+    JSON_ITEM_TYPE,
+    JSON_OBJECT_TYPE,
+    JSON_ARRAY_TYPE,
+    JSON_PAIR_TYPE,
+#endif
     ITEM_TYPE,     // item()
     EMPTY_TYPE,    // empty-sequence()
     INVALID_TYPE,
   } kind_t;
 
-  typedef enum {
+  typedef enum 
+  {
     QUANT_ONE,
     QUANT_QUESTION,
     QUANT_PLUS,

=== modified file 'include/zorba/internal/qname.h'
--- include/zorba/internal/qname.h	2011-06-30 16:42:30 +0000
+++ include/zorba/internal/qname.h	2012-02-07 00:26:21 +0000
@@ -182,6 +182,46 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifdef ZORBA_WITH_JSON
+
+/**
+ * An %JSONiqErrQName is-a FixedQName for standard JSONiq errors.
+ */
+class ZORBA_DLL_PUBLIC JSONiqErrQName :
+  public FixedQName<JSONiqErrQName,char const*>
+{
+  typedef FixedQName<JSONiqErrQName,char const*> base_type;
+public:
+  static char const NAMESPACE[];
+  static char const PREFIX[];
+
+  /**
+   * Constructs an %JSONiqErrQName.
+   *
+   * @param localname The local-name of the error.
+   */
+  JSONiqErrQName( char const *localname ) : base_type( localname ) { }
+
+  /**
+   * Gets the category of error this QName represents.
+   *
+   * @return Returns UNKNOWN_CATEGORY as there currently
+   *         are no categories for JSONiq errors
+   */
+  zorba::diagnostic::category category() const;
+
+  /**
+   * Gets the kind of error this QName represents.
+   *
+   * @return Returns said kind.
+   */
+  zorba::diagnostic::kind kind() const;
+};
+
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+
 /**
  * An %ZorbaWarningQName is-a FixedQName for Zorba warnings.
  */

=== modified file 'include/zorba/item.h'
--- include/zorba/item.h	2012-01-11 17:30:25 +0000
+++ include/zorba/item.h	2012-02-07 00:26:21 +0000
@@ -142,6 +142,21 @@
   Item
   getType() const;
 
+#ifdef ZORBA_WITH_JSON
+
+  /**
+   * \brief Check if the Item is a JSON Item, that is, part of the JSONiq
+   * data model.
+   *
+   * Note that this function is available for all types of Items.
+   *
+   * @return true if the Item is a JSON Item, false otherwise.
+   */
+  bool
+  isJSONItem() const;
+
+#endif /* ZORBA_WITH_JSON */
+
   /** \brief Get the atomization value of the Item.
    *
    * The atomization value is the value that is returned by atomization 
@@ -346,6 +361,83 @@
   int
   getNodeKind() const;
 
+#ifdef ZORBA_WITH_JSON
+
+  /** \brief Get the kind of this (JSON) Item.
+   *
+   * Note that this function is only available for JSON Items, that is, Items
+   * which return true from isJSONItem().
+   *
+   * @return the kind of this JSON item
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON).
+   */
+  store::StoreConsts::JSONItemKind
+  getJSONItemKind() const;
+
+  /** \brief Get the pairs from a JSON Object.
+   *
+   * Note that this function is only available for JSON Objects.
+   *
+   * @return Iterator over the pairs in this object.
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON Object).
+   */
+  Iterator_t
+  getObjectPairs() const;
+
+  /** \brief Get the members of a JSON Array.
+   *
+   * Note that this function is only available for JSON Arrays.
+   *
+   * @return Iterator over the members of this array.
+   * @throw ZorbaException if an error occure (e.g. the Item is not of type JSON Array).
+   */
+  Iterator_t
+  getArrayMembers() const;
+
+  /** \brief Returns the value of a JSON Pair with the given name from a JSON Object.
+   *
+   * Note that this function is only available for JSON Objects.
+   *
+   * @param aName the name of the pair to return.
+   * @return Item the named Pair.
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON Object).
+   */
+  Item
+  getObjectValue(String aName) const;
+
+  /** \brief Returns the item in the JSON array at the specified index.
+   *
+   * Note that this function is only available for JSON Arrays.
+   *
+   * @param aIndex the index in the array.
+   * @return Item the indexed Item.
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON Array).
+   */
+  Item
+  getArrayMember(uint32_t aIndex) const;
+
+  /** \brief Returns the name of a JSON Pair.
+   *
+   * Note that this function is only available for JSON Pairs.
+   *
+   * @return Item the name of the Pair.
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON Pair).
+   */
+  Item
+  getPairName() const;
+
+  /** \brief Returns the value of a JSON Pair.
+   *
+   * Note that this function is only available for JSON Pairs.
+   *
+   * @return Item the value of the Pair.
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON Pair).
+   */
+  Item
+  getPairValue() const;
+
+#endif /* ZORBA_WITH_JSON */
+
   /**
    * Checks whether the item's content is streamable.
    *

=== modified file 'include/zorba/options.h'
--- include/zorba/options.h	2012-01-11 17:30:25 +0000
+++ include/zorba/options.h	2012-02-07 00:26:21 +0000
@@ -83,7 +83,11 @@
   ZORBA_SERIALIZATION_METHOD_HTML,
   ZORBA_SERIALIZATION_METHOD_XHTML,
   ZORBA_SERIALIZATION_METHOD_TEXT,
-  ZORBA_SERIALIZATION_METHOD_BINARY
+  ZORBA_SERIALIZATION_METHOD_BINARY,
+#ifdef ZORBA_WITH_JSON
+  ZORBA_SERIALIZATION_METHOD_JSON,
+  ZORBA_SERIALIZATION_METHOD_JSONIQ
+#endif
 } Zorba_serialization_method_t;
 
 

=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2011-12-21 14:40:33 +0000
+++ include/zorba/pregenerated/diagnostic_list.h	2012-02-07 00:26:21 +0000
@@ -504,6 +504,12 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0042_ITERATOR_CLOSED;
 
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0043_CANNOT_SERIALIZE_JSON_ITEM;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0044_CANNOT_SERIALIZE_XML_ITEM;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0045_CANNOT_SERIALIZE_MIXED_XDM_JDM;
+
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0070_INVALID_SERIALIZATION_METHOD_FOR_SAX;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0080_CANNOT_RETRIEVE_NODE_REFERENCE;
@@ -704,6 +710,8 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0012_COLLECTION_ITEM_MUST_BE_A_NODE;
 
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0013_COLLECTION_ITEM_MUST_BE_STRUCTURED;
+
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0015_IC_ALREADY_EXISTS;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0016_IC_DOES_NOT_EXIST;
@@ -746,8 +754,68 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode XSST0010;
 
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0001_ILLEGAL_CHARACTER;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0002_ILLEGAL_CODEPOINT;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0003_ILLEGAL_ESCAPE;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0004_ILLEGAL_LITERAL;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0005_ILLEGAL_NUMBER;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0006_UNEXPECTED_TOKEN;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0007_UNTERMINATED_STRING;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0001_NOT_DOCUMENT_OR_ELEMENT_NODE;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0002_ELEMENT_MISSING_ATTRIBUTE;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0003_BAD_ATTRIBUTE_VALUE;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0004_BAD_ELEMENT;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0005_BAD_CHILD_ELEMENT;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0006_NO_ELEMENT_CHILD;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0007_NO_TEXT_CHILD;
+
 } // namespace zerr
 
+namespace jerr {
+
+#if defined(ZORBA_WITH_JSON)
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0001;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0002;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0003;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0020;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0040;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0060;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0061;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSTY0001;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSTY0002;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0062;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0063;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0064;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0065;
+#endif
+
+} // namespace jerr
+
 namespace zwarn {
 
 extern ZORBA_DLL_PUBLIC ZorbaWarningCode ZWST0002_UNKNOWN_ANNOTATION;

=== modified file 'include/zorba/store_consts.h'
--- include/zorba/store_consts.h	2011-06-14 17:26:33 +0000
+++ include/zorba/store_consts.h	2012-02-07 00:26:21 +0000
@@ -25,6 +25,13 @@
 {
  public:
 
+  enum NsScoping 
+  {
+    ALL_NAMESPACES,
+    ONLY_LOCAL_NAMESPACES,
+    ONLY_PARENT_NAMESPACES
+  };
+
   enum NodeKind
   {
     anyNode        = 0,
@@ -36,16 +43,10 @@
     commentNode    = 6
   };
 
-  enum NsScoping 
-  {
-    ALL_NAMESPACES,
-    ONLY_LOCAL_NAMESPACES,
-    ONLY_PARENT_NAMESPACES
-  };
-
   static std::string toString(NodeKind k)
   {
-    switch(k) {
+    switch(k) 
+    {
       case anyNode:
         return "anyNode";
 
@@ -71,6 +72,39 @@
         return "<unknown NodeKind>";
     }
   }
+
+
+  /* ATTENTION: the ordering of the enum values is important. Do NOT change it! */
+  enum JSONItemKind
+  {
+    jsonItem       = 0,
+    jsonObject     = 1,
+    jsonArray      = 2,
+    jsonPair       = 3
+  };
+
+
+  static std::string toString(JSONItemKind k)
+  {
+    switch(k) 
+    {
+      case jsonItem:
+        return "json-item";
+
+      case jsonObject:
+        return "object";
+
+      case jsonArray:
+        return "array";
+
+      case jsonPair:
+        return "pair";
+
+      default:
+        return "<unknown JSONItemKind>";
+    }
+  }
+ 
 };
 
 } // namespace store

=== modified file 'include/zorba/typeident.h'
--- include/zorba/typeident.h	2011-06-14 17:26:33 +0000
+++ include/zorba/typeident.h	2012-02-07 00:26:21 +0000
@@ -64,45 +64,55 @@
         const String& localNameName,
         bool localNameWildcard,
         TypeIdentifier_t contentType,
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
+        IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
 
     static
     TypeIdentifier_t
     createDocumentType(
         TypeIdentifier_t contentType,
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
-
-    static
-    TypeIdentifier_t
-    createPIType(
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
-
-    static
-    TypeIdentifier_t
-    createTextType(
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
-
-    static
-    TypeIdentifier_t
-    createCommentType(
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
-
-    static
-    TypeIdentifier_t
-    createAnyNodeType(
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
-
-    static
-    TypeIdentifier_t
-    createItemType(
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
+        IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createPIType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createTextType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createCommentType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createAnyNodeType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+#ifdef ZORBA_WITH_JSON
+    static
+    TypeIdentifier_t
+    createStructuredItemType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createJSONItemType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createJSONObjectType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createJSONArrayType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createJSONPairType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+#endif
+
+    static
+    TypeIdentifier_t
+    createItemType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
 
     static
     TypeIdentifier_t

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2011-12-21 14:40:33 +0000
+++ modules/ExternalModules.conf	2012-02-07 00:26:21 +0000
@@ -27,7 +27,7 @@
 #       currently only works for bzr, since svn tags are just different URLS)
 
 data-cleaning   bzr  lp:zorba/data-cleaning-module       zorba-2.1
-data-converters bzr  lp:zorba/data-converters-module     zorba-2.1
+data-converters bzr  lp:zorba/data-converters-module
 data-formatting bzr  lp:zorba/data-formatting-module     zorba-2.1
 email           bzr  lp:zorba/email-module               zorba-2.1
 excel           bzr  lp:zorba/excel-module               zorba-2.1

=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-02-05 12:31:20 +0000
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-02-07 00:26:21 +0000
@@ -67,10 +67,14 @@
   URI "http://www.zorba-xquery.com/modules/xml")
 DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/xqdoc")
+DECLARE_ZORBA_MODULE(FILE converters/json.xq VERSION 2.0
+  URI "http://www.zorba-xquery.com/modules/converters/json")
 
 # Subdirectories
 DECLARE_ZORBA_MODULE(FILE converters/base64.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/converters/base64")
+DECLARE_ZORBA_MODULE(FILE converters/json.xq VERSION 2.0
+  URI "http://www.zorba-xquery.com/modules/converters/json")
 DECLARE_ZORBA_MODULE(FILE introspection/sctx.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/introspection/sctx")
 DECLARE_ZORBA_MODULE(FILE xqdoc2xhtml/error.xq VERSION 2.0
@@ -103,6 +107,11 @@
 DECLARE_ZORBA_MODULE(FILE store/static/integrity_constraints/dml.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml")
 
+DECLARE_ZORBA_MODULE(FILE store/jsoniq/dynamic/collections/ddl.xq VERSION 1.0
+  URI "http://www.zorba-xquery.com/modules/store/jsoniq/dynamic/collections/ddl")
+DECLARE_ZORBA_MODULE(FILE store/jsoniq/dynamic/collections/dml.xq VERSION 1.0
+  URI "http://www.zorba-xquery.com/modules/store/jsoniq/dynamic/collections/dml")
+
 # debugger client DBGP message handler module
 IF (ZORBA_WITH_DEBUGGER)
   DECLARE_ZORBA_MODULE (FILE debugger/dbgp-message-handler.xq VERSION 1.0

=== added file 'modules/com/zorba-xquery/www/modules/converters/json-options.xsd'
--- modules/com/zorba-xquery/www/modules/converters/json-options.xsd	1970-01-01 00:00:00 +0000
+++ modules/com/zorba-xquery/www/modules/converters/json-options.xsd	2012-02-07 00:26:21 +0000
@@ -0,0 +1,47 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:json="http://www.zorba-xquery.com/modules/converters/json-options"
+  targetNamespace="http://www.zorba-xquery.com/modules/converters/json-options"
+  elementFormDefault="qualified" attributeFormDefault="unqualified">
+<!--
+:: Copyright 2006-2008 The FLWOR Foundation.
+::
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+:: http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+::
+-->
+
+
+  <xs:element name="options">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="json-param" minOccurs="1" maxOccurs="1">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute name="name" type="xs:string" use="required"/>
+                <xs:attribute name="value" use="required">
+                  <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                      <xs:enumeration value="simple-json"/>
+                      <xs:enumeration value="json-ml"/>
+                    </xs:restriction>
+                  </xs:simpleType>
+                </xs:attribute>
+              <xs:attribute name="type" type="xs:string" use="optional"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

=== added file 'modules/com/zorba-xquery/www/modules/converters/json.xq'
--- modules/com/zorba-xquery/www/modules/converters/json.xq	1970-01-01 00:00:00 +0000
+++ modules/com/zorba-xquery/www/modules/converters/json.xq	2012-02-07 00:26:21 +0000
@@ -0,0 +1,231 @@
+xquery version "3.0";
+
+ (:
+  : Copyright 2006-2009 The FLWOR Foundation.
+  :
+  : Licensed under the Apache License, Version 2.0 (the "License");
+  : you may not use this file except in compliance with the License.
+  : You may obtain a copy of the License at
+  :
+  : http://www.apache.org/licenses/LICENSE-2.0
+  :
+  : Unless required by applicable law or agreed to in writing, software
+  : distributed under the License is distributed on an "AS IS" BASIS,
+  : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  : See the License for the specific language governing permissions and
+  : limitations under the License.
+  :)
+
+ (:~
+  :
+  : <p>In order to enable JSON processing with XQuery, Zorba implements a set
+  : of functions that open XQuery developers the door to process JSON
+  : data. Specifically, this module provides two types of functions. Functions
+  : to:
+  : <ul>
+  :   <li>parse JSON and convert it to XDM and</li>
+  :   <li>serialize XDM in order to output JSON.</li>
+  : </ul>
+  : </p>
+  :
+  : <p>Both types of functions are available to parse and serialize two
+  : types of XDM-JSON mappings:<ul><li>the first mapping called in this document 
+  : <strong>simple XDM-JSON</strong> has been
+  : <a href="http://john.snelson.org.uk/parsing-json-into-xquery">
+  : proposed by John Snelson</a></li><li>the second mapping is called 
+  : <a href="http://jsonml.org/">JsonML</a></li></ul>In the following, we
+  : briefly describe both mappings.</p>
+  : 
+  : <h2>Simple XDM-JSON Mapping</h2>
+  : <ul><li>In order to process JSON with XQuery, Zorba implements a mapping between
+  : JSON and XML that was initially proposed by John Snelson in his article
+  : <a href="http://snelson.org.uk/archives/2008/02/parsing_json_in.php#more"
+  : target="_blank">Parsing JSON into XQuery</a></li></ul>
+  :
+  : <h2>JsonML Mapping</h2>
+  : <ul>
+  : <li><a href="http://jsonml.org" target="_blank">JSonML</a> (JSON Markup Language)
+  : is an application of the JSON format.</li>
+  : <li>The purpose of JSonML is to provide a compact format for transporting
+  : XML-based markup as JSon. In contrast to the <strong>simple XDM-JSON</strong> mapping described above
+  : <strong>JsonML</strong> allows a lossless conversion back and forth.</li></ul>
+  :
+  : @author Sorin Nasoi
+  :
+  : @see <a href="http://john.snelson.org.uk/parsing-json-into-xquery">Mapping proposed by John Snelson</a>
+  : @see <a href="http://jsonml.org" target="_blank">JSonML</a>
+  : @project data processing/data converters
+  :
+  :)
+module namespace json = "http://www.zorba-xquery.com/modules/converters/json";
+
+import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
+
+import schema namespace json-options = "http://www.zorba-xquery.com/modules/converters/json-options";
+
+declare namespace err = "http://www.w3.org/2005/xqt-errors";
+
+declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+declare option ver:module-version "2.0";
+
+(:~
+ : This function parses a JSON string and returns an XDM instance according
+ : to either one of the mappings described above.
+ :
+ : @param $arg a sequence of valid JSON strings.
+ : @param $options a set of name and value pairs that provide options
+ :        to configure the JSON mapping process that have to be validated against the 
+ :        "http://www.zorba-xquery.com/modules/converters/json-options" schema.
+ : @return  a sequence of nodes according to either one of the mappings described above.
+ : @error err:XQDY0027 if $options can not be validated against the json-options schema
+ : @error json:ParseError if the JSON string passed as parameter is not
+ :    valid JSON.
+ : @example test_json/Queries/converters/jansson/parse_json_02.xq
+ : @example test_json/Queries/converters/jansson/parse_json_ml_01.xq
+ :)
+declare function json:parse(
+  $arg as xs:string?,
+  $options as element(json-options:options)
+) as element(*, xs:untyped)*
+{
+  let $validated-options := if(schema:is-validated($options)) then
+                                $options
+                              else
+                                validate{$options} 
+  return
+    json:parse-internal($arg, $validated-options)
+};
+
+(:~
+ : This function parses a JSON string and returns an XDM instance according
+ : to simple XDM-JSON mapping described above.
+ :
+ : @param $arg a sequence of valid JSON strings.
+ : @return a sequence of nodes according to Simple XDM-JSON mapping described above.
+ : @error json:ParseError if the JSON string passed as parameter is not
+ :    valid JSON.
+ : @example test_json/Queries/converters/jansson/parse_json_11.xq
+ :)
+declare function json:parse(
+  $arg as xs:string?
+) as element(*, xs:untyped)*
+{
+  json:parse-internal($arg,
+    validate {
+      <options xmlns="http://www.zorba-xquery.com/modules/converters/json-options" >
+        <json-param name="mapping" value="simple-json" />
+      </options>
+    }
+  )
+};
+
+(:~
+ : This function parses a JSON string and returns an XDM instance according
+ : to JsonML mapping described above.
+ :
+ : @param $arg a sequence of valid JSON strings.
+ : @return  a sequence of nodes according the JSON-ML mapping described above.
+ : @error json:ParseError if the JSON string passed as parameter is not
+ :    valid JSON.
+ : @example test_json/Queries/converters/jansson/parse_json_ml_05.xq
+ :)
+declare function json:parse-ml(
+  $arg as xs:string?
+) as element(*, xs:untyped)*
+{
+  json:parse-internal($arg,
+    validate {
+      <options xmlns="http://www.zorba-xquery.com/modules/converters/json-options" >
+        <json-param name="mapping" value="json-ml" type="array"/>
+      </options>
+    }
+  )
+};
+
+declare %private function json:parse-internal(
+  $html as xs:string,
+  $options as item()?
+) as element()* external;
+
+
+(:~
+ : The serialize function takes a sequence of nodes as parameter and
+ : transforms each element into a valid JSON string according to one of the
+ : mappings described above.
+ :
+ : @param $xml a sequence of nodes.
+ : @param $options a set of name and value pairs that provide options
+ :        to configure the JSON mapping process that have to be validated against the 
+ :        "http://www.zorba-xquery.com/modules/converters/json-options" schema.
+ : @return a JSON string.
+ : @error err:XQDY0027 if $options can not be validated against the json-options schema
+ : @error json:InvalidXDM if the input $xml is not a valid XDM
+ :  representation of JSON or JSON ML.
+ : @example test_json/Queries/converters/jansson/serialize_json_01.xq
+ : @example test_json/Queries/converters/jansson/serialize_json_ml_01.xq
+ :)
+declare function json:serialize(
+  $xml as item()*, 
+  $options as element(json-options:options) 
+) as xs:string
+{
+  let $validated-options := if(schema:is-validated($options)) then
+                              $options
+                            else
+                              validate{$options} 
+  return
+    json:serialize-internal($xml, $validated-options)
+};
+
+(:~
+ : The serialize function takes a sequence of nodes as parameter and
+ : transforms each element into a valid JSON string according to the
+ : Simple XDM-JSON mapping described above
+ :
+ : @param $xml a sequence of nodes.
+ : @return a JSON string.
+ : @error json:InvalidXDM if the input $xml is not a valid XDM
+ :  representation of JSON or JSON ML.
+ : @example test_json/Queries/converters/jansson/serialize_json_18.xq
+ :)
+declare function json:serialize(
+  $xml as item()* 
+) as xs:string
+{
+  json:serialize-internal($xml,
+    validate {
+      <options xmlns="http://www.zorba-xquery.com/modules/converters/json-options" >
+        <json-param name="mapping" value="simple-json" />
+      </options>
+   }
+ )
+};
+
+(:~
+ : The serialize function takes a sequence of nodes as parameter and
+ : transforms each element into a valid JSON string according to the
+ : JsonML mapping described above.
+ :
+ : @param $xml a sequence of nodes.
+ : @return a JSON string.
+ : @error json:InvalidXDM if the input $xml is not a valid XDM
+ :  representation of JSON or JSON ML.
+ : @example test_json/Queries/converters/jansson/serialize_json_ml_04.xq
+ :)
+declare function json:serialize-ml(
+  $xml as item()* 
+) as xs:string
+{
+  json:serialize-internal($xml,
+    validate {
+      <options xmlns="http://www.zorba-xquery.com/modules/converters/json-options" >
+       <json-param name="mapping" value="json-ml" type="array"/>
+      </options>
+   }
+ )
+};
+
+declare %private function json:serialize-internal(
+  $xml as item()*,
+  $options as item()?
+  ) as xs:string external;

=== modified file 'modules/com/zorba-xquery/www/modules/pregenerated/errors.xq'
--- modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2011-12-21 14:40:33 +0000
+++ modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2012-02-07 00:26:21 +0000
@@ -309,6 +309,18 @@
 
 (:~
 :)
+declare variable $zerr:ZAPI0043 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0043");
+
+(:~
+:)
+declare variable $zerr:ZAPI0044 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0044");
+
+(:~
+:)
+declare variable $zerr:ZAPI0045 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0045");
+
+(:~
+:)
 declare variable $zerr:ZAPI0070 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0070");
 
 (:~
@@ -704,6 +716,10 @@
 
 (:~
 :)
+declare variable $zerr:ZSTR0013 as xs:QName := fn:QName($zerr:NS, "zerr:ZSTR0013");
+
+(:~
+:)
 declare variable $zerr:ZSTR0015 as xs:QName := fn:QName($zerr:NS, "zerr:ZSTR0015");
 
 (:~
@@ -784,4 +800,60 @@
 
 (:~
 :)
-declare variable $zerr:XSST0010 as xs:QName := fn:QName($zerr:NS, "zerr:XSST0010");
\ No newline at end of file
+declare variable $zerr:XSST0010 as xs:QName := fn:QName($zerr:NS, "zerr:XSST0010");
+
+(:~
+:)
+declare variable $zerr:ZJPE0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0001");
+
+(:~
+:)
+declare variable $zerr:ZJPE0002 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0002");
+
+(:~
+:)
+declare variable $zerr:ZJPE0003 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0003");
+
+(:~
+:)
+declare variable $zerr:ZJPE0004 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0004");
+
+(:~
+:)
+declare variable $zerr:ZJPE0005 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0005");
+
+(:~
+:)
+declare variable $zerr:ZJPE0006 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0006");
+
+(:~
+:)
+declare variable $zerr:ZJPE0007 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0007");
+
+(:~
+:)
+declare variable $zerr:ZJSE0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0001");
+
+(:~
+:)
+declare variable $zerr:ZJSE0002 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0002");
+
+(:~
+:)
+declare variable $zerr:ZJSE0003 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0003");
+
+(:~
+:)
+declare variable $zerr:ZJSE0004 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0004");
+
+(:~
+:)
+declare variable $zerr:ZJSE0005 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0005");
+
+(:~
+:)
+declare variable $zerr:ZJSE0006 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0006");
+
+(:~
+:)
+declare variable $zerr:ZJSE0007 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0007");
\ No newline at end of file

=== added directory 'modules/com/zorba-xquery/www/modules/store/jsoniq'
=== added directory 'modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic'
=== added directory 'modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections'
=== added file 'modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/ddl.xq	1970-01-01 00:00:00 +0000
+++ modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/ddl.xq	2012-02-07 00:26:21 +0000
@@ -0,0 +1,122 @@
+xquery version "3.0";
+
+(:
+ : Copyright 2006-2009 The FLWOR Foundation.
+ :
+ : Licensed under the Apache License, Version 2.0 (the "License");
+ : you may not use this file except in compliance with the License.
+ : You may obtain a copy of the License at
+ :
+ : http://www.apache.org/licenses/LICENSE-2.0
+ :
+ : Unless required by applicable law or agreed to in writing, software
+ : distributed under the License is distributed on an "AS IS" BASIS,
+ : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ : See the License for the specific language governing permissions and
+ : limitations under the License.
+:)
+
+(:~
+ : This modules defines a set of functions for managing persistent, ordered, and
+ : updatable collections that can contain both XML nodes and JSON objects and arrays.
+ :
+ : <p>Please refer to our documentation for <a href="../../html/data_lifecycle.html">
+ : more information</a> about the lifecycle management and the manipulation of such
+ : collections.</p>
+ :
+ : @see <a href="../../html/data_lifecycle.html">Data Lifecycle</a>
+ : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/dml
+ : @see <a href="www.zorba-xquery.com_errors.html">http://www.zorba-xquery.com/errors</a>
+ :
+ : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
+ :
+ : @project store/jsoniq/collections/dynamic
+ :
+ :)
+module namespace ddl = "http://www.zorba-xquery.com/modules/store/jsoniq/dynamic/collections/ddl";
+
+declare namespace zerr = "http://www.zorba-xquery.com/errors";
+declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+
+declare option ver:module-version "1.0";
+declare option ver:zorba-version "2.1";
+
+(:~
+ : The function returns true if a collection with the given QName is available.
+ :
+ : @param $name The QName of the collection that is being checked.
+ :
+ : @return true if the collection is available and false otherwise.
+ :
+ :)
+declare function ddl:is-available-collection($name as xs:QName) as xs:boolean external;
+
+
+(:~
+ : The function returns a sequence of QNames of the collections that are
+ : available. The sequence will be empty if there are no collections.
+ :
+ : @return A sequence of QNames, one for each available collection, or an emtpy sequence.
+ :
+ :)
+declare function ddl:available-collections() as xs:QName* external;
+
+
+(:~
+ : The create function is an updating function which creates
+ : the collection with the given expanded QName.
+ :
+ : @param $name The QName of the collection to create.
+ :
+ : @return The result of the function is an empty XDM instance and a 
+ :         pending update list which, once applied, creates a collection
+ :         with the given name.
+ :
+ : @error zerr:ZDDY0002 if a collection with the given expanded QName already
+ :        exists.
+ :
+ :)
+declare updating function ddl:create($name as xs:QName) external;
+
+
+(:~
+ : The create function is an updating function which creates
+ : the collection with the given expanded QName. Moreover, it adds copies
+ : of the sequence $content to the new collection.
+ :
+ : @param $name The QName of the collection to create.
+ : @param $content The sequence of items that should be added to the new collection.
+ :                 The sequence may contain any mix of XML nodes, JSON objects, or
+ :                 JSON arrays.
+ : @return The result of the function is an empty XDM instance and a 
+ :         pending update list which, once applied, creates a collection
+ :         with the given name and inserts the given nodes into it.
+ :
+ : @error zerr:ZDDY0002 if a collection with the given expanded QName already
+ :        exists.
+ :
+ : @see ddl:create
+ : @see ddl:insert-nodes-last
+ :
+ :)
+declare updating function ddl:create(
+    $name as xs:QName,
+    $content as structured-item()*) external;
+
+
+(:~
+ : The delete function is an updating function that removes
+ : the collection with the given expanded QName.
+ :
+ : @param $name The QName of the collection to delete.
+ :
+ : @return The result of the function is an empty XDM instance and a pending
+ :         update list which, once applied, deletes the collection with the given
+ :         name.
+ :
+ : @error zerr:ZDDY0003 if the collection with the given name does not exist.
+ : @error zerr:ZDDY0015 if any of the in-scope variables references a node that
+ :        belongs to the collection with QName $name.
+ :
+ :)
+declare updating function ddl:delete($coll as xs:QName) external;

=== added file 'modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/dml.xq	1970-01-01 00:00:00 +0000
+++ modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/dml.xq	2012-02-07 00:26:21 +0000
@@ -0,0 +1,354 @@
+xquery version "3.0";
+
+(:
+ : Copyright 2006-2009 The FLWOR Foundation.
+ :
+ : Licensed under the Apache License, Version 2.0 (the "License");
+ : you may not use this file except in compliance with the License.
+ : You may obtain a copy of the License at
+ :
+ : http://www.apache.org/licenses/LICENSE-2.0
+ :
+ : Unless required by applicable law or agreed to in writing, software
+ : distributed under the License is distributed on an "AS IS" BASIS,
+ : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ : See the License for the specific language governing permissions and
+ : limitations under the License.
+:)
+
+(:~
+ : This modules provides a set of functions to modify a collection and retrieve the
+ : items contained in a particular collection. Collections that are accessed by the
+ : functions of this module may contain any mix of XML nodes, JSON objects, or
+ : JSON arrays. The term "structured item" is used in this module to refer to an
+ : XML node, JSON object, or JSON array.
+ :
+ : <p>Please refer to our documentation for <a href="../../html/data_lifecycle.html">
+ : more information</a> about the lifecycle management and the manipulation of such
+ : collections.</p>
+ : 
+ : @see <a href="../../html/data_lifecycle.html">Data Lifecycle</a>
+ : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl
+ : @see <a href="www.zorba-xquery.com_errors.html">http://www.zorba-xquery.com/errors</a>
+ :
+ : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
+ :
+ : @project store/jsoniq/collections/dynamic
+ :)
+module namespace dml = "http://www.zorba-xquery.com/modules/store/jsoniq/dynamic/collections/dml";
+
+declare namespace zerr = "http://www.zorba-xquery.com/errors";
+declare namespace ann = "http://www.zorba-xquery.com/annotations";
+
+declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+
+declare option ver:module-version "1.0";
+declare option ver:zorba-version "2.1";
+
+(:~
+ : The insert-nodes-first function is an updating function that inserts copies of the
+ : given structured items at the beginning of the collection.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is an empty XDM instance and a pending update
+ :         list which, once applied, inserts the items into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ :)
+declare updating function dml:insert-nodes-first(
+  $name as xs:QName,
+  $content as structured-item()*) external;
+
+(:~
+ : The insert-nodes-last function is an updating function that inserts copies of the
+ : given structured items at the end of the collection.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is an empty XDM instance and a pending update list
+ :         which, once applied, inserts the items into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ :)
+declare updating function dml:insert-nodes-last(
+  $name as xs:QName,
+  $content as structured-item()*) external;
+
+
+(:~
+ : The insert-nodes-before function is an updating function that inserts copies
+ : of the given structured items into a collection at the position directly 
+ : preceding the given target item.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $target The item in the collection before which the $content
+ :        sequence should be inserted.
+ : @param $content The sequences of structured items whose copies should be 
+ :        added to the collection.
+ :
+ : @return The result of the function is an empty XDM instance and a pending update list
+ :         which, once applied, inserts the items into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ : @error zerr:ZDDY0011 if the target item is not contained in the collection.
+ :
+ :)
+declare updating function dml:insert-nodes-before(
+  $name as xs:QName,
+  $target as structured-item(),
+  $content as structured-item()*) external;
+
+
+(:~
+ : The insert-nodes-after function is an updating function that inserts copies
+ : of the given structured items into a collection at the position directly 
+ : following the given target item.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $target The structured item in the collection after which the $content
+ :        sequence should be inserted.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is an empty XDM instance and a pending update list
+ :         which, once applied, inserts the items into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ : @error zerr:ZDDY0011 if the target item is not contained in the collection.
+ :
+ :)
+declare updating function dml:insert-nodes-after(
+  $name as xs:QName,
+  $pos as structured-item(),
+  $content as structured-item()*) external;
+
+
+(:~
+ : This function does the same as the insert-nodes function except
+ : it immediately applies the resulting pending updates and returns the
+ : structured items that have been inserted.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is the sequence of items that have been
+ :         inserted into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ : @see dml:insert-nodes-first
+ :
+ :)
+declare %ann:sequential function dml:apply-insert-nodes-first(
+  $name as xs:QName,
+  $content as structured-item()*) as structured-item()* external;
+
+
+(:~
+ : This function does the same as the insert-nodes-last function except
+ : it immediately applies the resulting pending updates and returns the
+ : structured items that have been inserted.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is the sequence of items that have been
+ :         inserted into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ : @see dml:insert-nodes-last
+ :
+ :)
+declare %ann:sequential function dml:apply-insert-nodes-last(
+  $name as xs:QName,
+  $content as structured-item()*) as structured-item()* external;
+
+
+(:~
+ : This function does the same as the insert-nodes-before function except
+ : it immediately applies the resulting pending updates and returns the
+ : structured items that have been inserted.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $target The structured item in the collection before which the $content
+ :        sequence should be inserted.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is the sequence of items that have been
+ :         inserted into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ : @see dml:insert-nodes-before
+ :
+ :)
+declare %ann:sequential function dml:apply-insert-nodes-before(
+  $name as xs:QName,
+  $target as structured-item(),
+  $content as structured-item()*) as structured-item()* external;
+
+
+(:~
+ : This function does the same as the insert-nodes-after function except
+ : it immediately applies the resulting pending updates and returns the
+ : structured items that have been inserted.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $target The structured item in the collection after which the $content
+ :        sequence should be inserted.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is the sequence of items that have been
+ :         inserted into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ : @see dml:insert-nodes-after
+ :
+ :)
+declare %ann:sequential function dml:apply-insert-nodes-after(
+  $name as xs:QName,
+  $pos as structured-item(),
+  $content as structured-item()*) as structured-item()* external;
+
+
+(:~
+ : The delete-nodes function is an updating function that deletes zero of more
+ : structured items from a collection. 
+ :
+ : @param $target the structured items in the collection that should be deleted.
+ :
+ : @return The result of this function is an empty XDM instance and a pending update
+ :         list which, once applied, deletes the items from their collections.
+ :
+ : @error zerr:ZDDY0011 if any items in the $target sequence is not a member of
+ :        a collection or not all items of the $target sequence belong to the 
+ :        same collection.
+ :)
+declare updating function dml:delete-nodes($target as structured-item()*) external;
+
+
+(:~
+ : The delete-node-first function is an updating function that deletes the
+ : first item from a collection.
+ :
+ : @param $name The name of the collection from which the first item should be deleted.
+ :
+ : @return The result of this function is an empty XDM instance and a pending update
+ :         list which, once applied, deletes the first item from the collection.
+ :
+ : @error zerr:ZDDY0011 if the collection doesn't contain any item.
+ :
+ :)
+declare updating function dml:delete-node-first($name as xs:QName) external;
+
+
+(:~
+ : The delete-nodes-first function is an updating function that deletes the
+ : first n items from a collection.
+ :
+ : @param $name The name of the collection from which the first items should be deleted.
+ : @param $number The number of items that should be removed from the beginning of
+ :        the collection.
+ :
+ : @return The result of this function is an empty XDM instance and a pending update
+ :         list which, once applied, deletes the items from the collection.
+ :
+ : @error zerr:ZDDY0011 if the collection doesn't contain the given number of items.
+ :
+ :)
+declare updating function dml:delete-nodes-first(
+  $name as xs:QName,
+  $number as xs:integer) external;
+
+
+(:~
+ : The delete-node-last function is an updating function that deletes the
+ : last item from a collection.
+ :
+ : @param $name The name of the collection from which the last item should be deleted.
+ :
+ : @return The result of this function is an empty XDM instance and a pending update
+ :         list which, once applied, deletes the last item from the collection.
+ :
+ : @error zerr:ZDDY0009 If available collections does not provide a mapping
+ :        for the expanded QName $name.
+ : @error zerr:ZDDY0011 if the collection doesn't contain any item.
+ :
+ :)
+declare updating function dml:delete-node-last($name as xs:QName) external;
+
+
+(:~
+ : The delete-nodes-last function is an updating function that deletes the
+ : last n items from an ordered collection.
+ :
+ : @param $name The name of the collection from which the last items should be deleted.
+ : @param $number The number of items to delete.
+ :
+ : @return The result of this function is an empty XDM instance and a pending update
+ :         list which, once applied, deletes the last n items.
+ :
+ : @error zerr:ZDDY0009 If available collections does not provide a mapping
+ :        for the expanded QName $name.
+ : @error zerr:ZDDY0011 if the collection doesn't contain the given number of items.
+ :
+ :)
+declare updating function dml:delete-nodes-last(
+  $name as xs:QName,
+  $number as xs:integer) external;
+
+
+(:~
+ : The index-of function returns the index of the given structured item in 
+ : the collection.
+ :
+ : @param $item The structured item to retrieve the index of.
+ :
+ : @return Returns the position as xs:integer of the given item in the collection.
+ :
+ : @error zerr:ZDDY0011 if item is not contained in any collection.
+ :
+ :)
+declare function dml:index-of($item as structured-item()) as xs:integer external;
+
+
+(:~
+ : The collection function returns the sequence of structured items of the 
+ : collection identified by the given name.
+ :
+ : @param $name The name of the collection.
+ :
+ : @return The sequence contained in the given collection.
+ :
+ : @error zerr:ZDDY0009 If available collections does not provide a mapping
+ :        for the expanded QName $name.
+ :
+ :)
+declare function dml:collection($name as xs:QName) as structured-item()* external;
+
+
+(:~
+ : This function returns the name of the collection the given structured item
+ : belongs to.
+ :
+ : @param $item The item for which to get the name of the collection
+ : @return The result of this function is a QName which identifies the collection
+ :         to which the given item belongs to.
+ :
+ : @error zerr:ZDDY0011 if the given item does not belong to a collection.
+ :
+ :)
+declare function dml:collection-name($item as structured-item()) as xs:QName external;

=== added directory 'modules/com/zorba-xquery/www/modules/store/jsoniq/static'
=== modified file 'modules/org/CMakeLists.txt'
--- modules/org/CMakeLists.txt	2011-01-19 14:45:10 +0000
+++ modules/org/CMakeLists.txt	2012-02-07 00:26:21 +0000
@@ -12,3 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ADD_SUBDIRECTORY(expath)
+ADD_SUBDIRECTORY(jsoniq)
+

=== added directory 'modules/org/jsoniq'
=== added file 'modules/org/jsoniq/CMakeLists.txt'
--- modules/org/jsoniq/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/org/jsoniq/CMakeLists.txt	2012-02-07 00:26:21 +0000
@@ -0,0 +1,15 @@
+# Copyright 2011 The FLWOR Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ADD_SUBDIRECTORY(www)

=== added directory 'modules/org/jsoniq/www'
=== added file 'modules/org/jsoniq/www/CMakeLists.txt'
--- modules/org/jsoniq/www/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/org/jsoniq/www/CMakeLists.txt	2012-02-07 00:26:21 +0000
@@ -0,0 +1,21 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+IF(ZORBA_WITH_JSON)
+  DECLARE_ZORBA_MODULE(FILE functions.xq VERSION 1.0
+    URI "http://www.jsoniq.org/functions")
+  DECLARE_ZORBA_MODULE (FILE pregenerated/errors.xq
+    URI "http://www.jsoniq.org/errors")
+ENDIF(ZORBA_WITH_JSON)
+

=== added file 'modules/org/jsoniq/www/functions.xq'
--- modules/org/jsoniq/www/functions.xq	1970-01-01 00:00:00 +0000
+++ modules/org/jsoniq/www/functions.xq	2012-02-07 00:26:21 +0000
@@ -0,0 +1,272 @@
+module namespace j = "http://www.jsoniq.org/functions";
+
+import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
+
+declare namespace jdm = "http://www.jsoniq.org/";
+
+declare namespace err = "http://www.w3.org/2005/xqt-errors";
+
+declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+declare option ver:module-version "1.0";
+
+(:~
+ :
+ : @param $a
+ : @return
+ :)
+declare function j:flatten($a as array()) as item()* external;
+
+(:~
+ :
+ : @param $j
+ : @return
+ :)
+declare function j:parse-json($j as xs:string) as json-item()? external;
+
+(:~
+ :
+ : @param $o
+ : @return
+ :)
+declare function j:names($o as object()) as xs:string* external;
+
+(:~
+ :
+ : @param $p
+ : @return
+ :)
+declare function j:name($p as pair()) as xs:string external;
+
+(:~
+ :
+ : @param $o
+ : @return
+ :)
+declare function j:pairs($o as object()) as pair()* external;
+
+(:~
+ :
+ : @param $o
+ : @param $n
+ : @return
+ :)
+declare function j:pair($o as object(), $n as xs:string) as pair()? external;
+
+(:~
+ :
+ : @param $o
+ : @param $n
+ : @return
+ :)
+declare function j:member($o as array(), $p as xs:integer) as item()? external;
+
+(:~
+ :
+ : @param $j
+ : @return
+ :)
+declare function j:size($j as json-item()) as xs:integer external;
+
+(:~
+ :
+ : @param $j
+ : @return
+ :)
+declare function j:values($j as json-item()) as item()* external;
+
+(:~
+ :
+ : @param $p
+ : @return
+ :)
+declare function j:value($p as pair()) as item() external;
+
+(:~
+ : Returns the jdm:null value null.
+ :
+ : @return the said value
+ :)
+declare function j:null() as jdm:null external;
+
+(:~
+ :
+ : @param $p
+ :
+ : @return
+ :
+ : @error j:JUDY0060 if pair with the given name already exists
+ :)
+declare updating function j:insert-into(
+  $o as object(),
+  $p as pair()*) external;
+
+(:~
+ :
+ : @param $p
+ : @return
+ :)
+declare updating function j:insert-as-first(
+  $a as array(),
+  $i as item()*) external;
+
+(:~
+ :
+ : @param $p
+ : @return
+ : @error j:JUDY0061 if the position doesn't select an existing array member
+ :)
+declare updating function j:insert-after(
+  $a as array(),
+  $pos as xs:integer,
+  $i as item()*) external;
+
+(:~
+ :
+ : @param $p
+ : @return
+ : @error j:JUDY0061 if the position doesn't select an existing array member
+ :)
+declare updating function j:insert-before(
+  $a as array(),
+  $pos as xs:integer,
+  $i as item()*) external;
+
+(:~
+ :
+ : @param $p
+ : @return
+ :)
+declare updating function j:insert-as-last(
+  $a as array(),
+  $i as item()*) external;
+
+(:~
+ :
+ : @param $p
+ : @return
+ :
+ : @error j:JUDY0061 if the selector doesn't select an existing pair or
+ :   array member
+ : @error j:JUDY0062 if the first argument is a pair
+ : @error j:JUDY0063 invalid type for second argument (must be xs:integer
+ :   if first argument is an array or xs:string if first argument is an object)
+ :)
+declare updating function j:delete(
+  $j as json-item(),
+  $selector as xs:anyAtomicType)
+{
+  try {
+    typeswitch ($j)
+    case $o as object()
+      return j:delete-pair($o, $selector treat as xs:string)
+    case $a as array()
+      return j:delete-member($a, $selector treat as xs:integer)
+    default return
+      fn:error(
+        fn:QName("http://www.jsoniq.org/errors", "JUDY0062"),
+        "first argument to delete function is pair() but must be array() or object()",
+        $j)
+   } catch err:XPDY0050 {
+     fn:error(
+       fn:QName("http://www.jsoniq.org/errors", "JUDY0063"),
+       concat(
+         schema:schema-type($selector),
+         ": invalid type for second argument; should be ",
+         typeswitch ($j)
+         case object() return "xs:string"
+         default return "xs:integer"
+       ),
+       $selector
+     )
+   }
+};
+
+(:~
+ :
+ : @param $p
+ : @return
+ :
+ : @error j:JUDY0061 if the key doesn't select an existing pair 
+ :)
+declare updating function j:delete-pair(
+  $o as object(),
+  $key as xs:string) external;
+
+(:~
+ :
+ : @param $p
+ : @return
+ :
+ : @error j:JUDY0061 if the position doesn't select an existing member 
+ :)
+declare updating function j:delete-member(
+  $a as array(),
+  $pos as xs:integer) external;
+
+(:~
+ :
+ : @param $p
+ : @return
+ :
+ : @error j:JUDY0061 if the position doesn't select an existing member 
+ :)
+declare updating function j:rename(
+  $p as object(),
+  $old-name as xs:string,
+  $new-name as xs:string) external;
+
+(:~
+ :
+ : @param $p
+ : @return
+ :)
+declare updating function j:replace-value(
+  $j as json-item(),
+  $selector as xs:anyAtomicType,
+  $new-val as item()) 
+{
+  try {
+    typeswitch ($j)
+    case $o as object()
+      return j:replace-value-in-object($o, $selector treat as xs:string, $new-val)
+    case $a as array()
+      return j:replace-value-in-array($a, $selector treat as xs:integer, $new-val)
+    default return
+      fn:error(
+        fn:QName("http://www.jsoniq.org/errors", "JUDY0062"),
+        "first argument to replace-value function is pair() but must be array() or object()",
+        $j)
+   } catch err:XPDY0050 {
+     fn:error(
+       fn:QName("http://www.jsoniq.org/errors", "JUDY0063"),
+       concat(
+         schema:schema-type($selector),
+         ": invalid type for second argument; should be ",
+         typeswitch ($j)
+         case object() return "xs:string"
+         default return "xs:integer"
+       ),
+       $selector
+     )
+   }
+};
+
+(:~
+ :
+ : @param $p
+ : @return
+ :)
+declare updating function j:replace-value-in-object(
+  $o as object(),
+  $key as xs:string,
+  $new-val as item()) external;
+
+(:~
+ :
+ : @param $p
+ : @return
+ :)
+declare updating function j:replace-value-in-array(
+  $a as array(),
+  $pos as xs:integer,
+  $new-val as item()) external;

=== added directory 'modules/org/jsoniq/www/pregenerated'
=== added file 'modules/org/jsoniq/www/pregenerated/errors.xq'
--- modules/org/jsoniq/www/pregenerated/errors.xq	1970-01-01 00:00:00 +0000
+++ modules/org/jsoniq/www/pregenerated/errors.xq	2012-02-07 00:26:21 +0000
@@ -0,0 +1,104 @@
+(:
+ : Copyright 2006-2011 The FLWOR Foundation.
+ :
+ : Licensed under the Apache License, Version 2.0 (the "License");
+ : you may not use this file except in compliance with the License.
+ : You may obtain a copy of the License at
+ :
+ : http://www.apache.org/licenses/LICENSE-2.0
+ :
+ : Unless required by applicable law or agreed to in writing, software
+ : distributed under the License is distributed on an "AS IS" BASIS,
+ : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ : See the License for the specific language governing permissions and
+ : limitations under the License.
+ :)
+ 
+ (:
+  : THIS FILE IS GENERATED.
+  : PLEASE DO NOT EDIT.
+  :)
+ (:~
+ : This module contains one declaration of a variable for each
+ : error of the http://www.jsoniq.org/errors namespace.
+ : The variables serves as documentation for the errors but can also
+ : be used in the code. For example, one useful scenario is to compare
+ : an error caught in the catch clause of a try-catch expression with one of
+ : the variables.
+ :
+ : @author Carlos Lopez
+ :
+ : @project error
+ :)
+
+xquery version '1.0';
+
+module namespace jerr = 'http://www.jsoniq.org/errors';
+
+declare variable $jerr:NS := 'http://www.jsoniq.org/errors';
+
+(:~
+:)
+declare variable $jerr:JSDY0001 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0001");
+
+(:~
+:)
+declare variable $jerr:JSDY0002 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0002");
+
+(:~
+ :error raised by object constructor
+:)
+declare variable $jerr:JSDY0003 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0003");
+
+
+declare variable $jerr:JSDY0020 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0020");
+
+(:~
+ :parser errors raised by the JSONIQLoader
+:)
+declare variable $jerr:JSDY0040 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0040");
+
+(:~
+ :error raised by insert-into
+:)
+declare variable $jerr:JUDY0060 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0060");
+
+(:~
+ :error raised by upd:delete, upd:insert-before/after
+:)
+declare variable $jerr:JUDY0061 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0061");
+
+(:~
+ :objects or arrays don't have a typed value
+:)
+declare variable $jerr:JSTY0001 as xs:QName := fn:QName($jerr:NS, "jerr:JSTY0001");
+
+(:~
+ :objects or arrays don't have a string value
+:)
+declare variable $jerr:JSTY0002 as xs:QName := fn:QName($jerr:NS, "jerr:JSTY0002");
+
+(:~
+ :error raised by upd:delete if the argument is not an object or array
+:)
+declare variable $jerr:JUDY0062 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0062");
+
+(:~
+ :error raised by upd:delete if the first argument is an
+ : object/array but second argument is not of type xs:string/xs:integer,
+ : respectively
+ : 
+:)
+declare variable $jerr:JUDY0063 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0063");
+
+(:~
+ :error raised by mergeUpdates. An insert-before or insert-last
+ : UP must not have the same target as any other insert-before, -last, -as-first, or -as-last UP
+ : 
+:)
+declare variable $jerr:JUDY0064 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0064");
+
+(:~
+ :error raised by upd:rename
+:)
+declare variable $jerr:JUDY0065 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0065");
\ No newline at end of file

=== modified file 'src/annotations/annotations.h'
--- src/annotations/annotations.h	2012-01-11 17:30:25 +0000
+++ src/annotations/annotations.h	2012-02-07 00:26:21 +0000
@@ -22,7 +22,7 @@
 
 #include "common/shared_types.h"
 
-#include "compiler/parsetree/parsenodes.h"
+//#include "compiler/parsetree/parsenodes.h"
 
 #include "zorbautils/hashmap_itemh.h"
 

=== modified file 'src/api/collectionimpl.cpp'
--- src/api/collectionimpl.cpp	2011-11-02 06:14:25 +0000
+++ src/api/collectionimpl.cpp	2012-02-07 00:26:21 +0000
@@ -429,12 +429,17 @@
 
     store::Store* lStore = & GENV_STORE;
 
-    store::Collection_t lColl = lStore->getCollection(lQName);
-
-    if (!lColl)
-    {
-      lColl = lStore->getCollection(lQName, true);
-    }
+    store::Collection_t lColl = lStore->getCollection(lQName, false, false);
+
+    if (!lColl)
+      lColl = lStore->getCollection(lQName, true, false);
+
+    if (!lColl)
+      lColl = lStore->getCollection(lQName, false, true);
+
+    if (!lColl)
+      lColl = lStore->getCollection(lQName, true, true);
+
     // must exist because otherwise we wouldn't have an instance of this class
     ZORBA_ASSERT(lColl);
 

=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp	2012-01-11 17:30:25 +0000
+++ src/api/dynamiccontextimpl.cpp	2012-02-07 00:26:21 +0000
@@ -429,7 +429,8 @@
     TypeManager* tm = theStaticContext->get_typemanager();
 
     xqtref_t lItemType = tm->create_named_type(lItem->getType(),
-                                               TypeConstants::QUANT_ONE);
+                                               TypeConstants::QUANT_ONE,
+                                               QueryLoc::null);
 
     if (!TypeOps::is_subtype(tm,
                              *lItemType,

=== modified file 'src/api/item.cpp'
--- src/api/item.cpp	2012-02-02 09:56:52 +0000
+++ src/api/item.cpp	2012-02-07 00:26:21 +0000
@@ -170,6 +170,18 @@
   return Item();
 }
 
+#ifdef ZORBA_WITH_JSON
+
+bool
+Item::isJSONItem() const
+{
+  ITEM_TRY
+    return m_item->isJSONItem();
+  ITEM_CATCH
+  return false;
+}
+
+#endif /* ZORBA_WITH_JSON */
 
 Iterator_t Item::getAtomizationValue() const
 {
@@ -448,6 +460,102 @@
   return -1;
 }
 
+#ifdef ZORBA_WITH_JSON
+
+store::StoreConsts::JSONItemKind
+Item::getJSONItemKind() const
+{
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+
+    return m_item->getJSONItemKind();
+  ITEM_CATCH
+  return store::StoreConsts::jsonItem;
+}
+
+Iterator_t
+Item::getObjectPairs() const
+{
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+
+    // TODO, we should have an error handler here
+    return new StoreIteratorImpl(m_item->getPairs(), nullptr);
+
+  ITEM_CATCH
+  return NULL;
+}
+
+Iterator_t
+Item::getArrayMembers() const
+{
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+
+    // TODO, we should have an error handler here
+    return new StoreIteratorImpl(m_item->getMembers(), nullptr);
+
+  ITEM_CATCH
+  return NULL;
+}
+
+Item
+Item::getObjectValue(String aName) const
+{
+  zstring& lName = Unmarshaller::getInternalString(aName);
+  store::Item_t lIndex;
+  if (!GENV_ITEMFACTORY->createString(lIndex, lName)) {
+    // QQQ probably should throw exception here
+    return Item();
+  }
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ););
+  store::Item_t lPair = m_item->getPair(lIndex);
+  if (lPair.isNull()) {
+    return Item();
+  }
+  return &*lPair->getValue();
+  ITEM_CATCH
+  return Item();
+}
+
+Item
+Item::getArrayMember(uint32_t aIndex) const
+{
+  store::Item_t lIndex;
+  if (!GENV_ITEMFACTORY->createInteger(lIndex, Integer(aIndex))) {
+    // QQQ probably should throw exception here
+    return Item();
+  }
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+      return &*m_item->getMember(lIndex);
+  ITEM_CATCH
+  return Item();
+}
+
+Item
+Item::getPairName() const
+{
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+    return &*m_item->getName();
+  ITEM_CATCH
+  return Item();
+}
+
+Item
+Item::getPairValue() const
+{
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+    return &*m_item->getValue();
+  ITEM_CATCH
+  return Item();
+}
+
+#endif /* ZORBA_WITH_JSON */
+
 bool
 Item::isStreamable() const
 {

=== modified file 'src/api/options.cpp'
--- src/api/options.cpp	2012-01-11 17:30:25 +0000
+++ src/api/options.cpp	2012-02-07 00:26:21 +0000
@@ -17,6 +17,7 @@
 
 #include <string.h>
 #include <zorba/options.h>
+#include "diagnostics/xquery_diagnostics.h"
 
 Zorba_CompilerHints::Zorba_CompilerHints()
   :
@@ -36,7 +37,11 @@
 
 Zorba_SerializerOptions::Zorba_SerializerOptions()
   :
+#ifdef ZORBA_WITH_JSON
+  ser_method(ZORBA_SERIALIZATION_METHOD_JSONIQ),
+#else
   ser_method(ZORBA_SERIALIZATION_METHOD_XML),
+#endif
   byte_order_mark(ZORBA_BYTE_ORDER_MARK_NO),
   escape_uri_attributes(ZORBA_ESCAPE_URI_ATTRIBUTES_NO),
   include_content_type(ZORBA_INCLUDE_CONTENT_TYPE_NO),
@@ -63,9 +68,15 @@
     else if (strcmp(value, "html") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_HTML;
     else if (strcmp(value, "xhtml") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_XHTML;
     else if (strcmp(value, "text") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_TEXT;
+    else if (strcmp(value, "binary") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_BINARY;
+#ifdef ZORBA_WITH_JSON
+    else if (strcmp(value, "json") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_JSON;
+    else if (strcmp(value, "jsoniq") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_JSONIQ;
+#endif
     else
     {
-      ; // TODO signal errors for incorrect values?
+      throw XQUERY_EXCEPTION
+          (err::SEPM0016, ERROR_PARAMS( value, "method", ZED( GoodValuesAreXMLEtc ) ));
     }
   }
   else if (strcmp(parameter, "byte-order-mark") == 0)

=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp	2012-01-11 17:30:25 +0000
+++ src/api/serialization/serializer.cpp	2012-02-07 00:26:21 +0000
@@ -18,7 +18,7 @@
 #include <sstream>
 
 #include <zorba/zorba_string.h>
-
+#include <zorbamisc/ns_consts.h>
 #include "zorbatypes/numconversions.h"
 #include "diagnostics/xquery_diagnostics.h"
 #include "diagnostics/assert.h"
@@ -39,7 +39,8 @@
 #include "store/api/iterator.h"
 #include "store/api/iterator_factory.h"
 #include "store/api/item.h"
-
+#include <store/api/item_factory.h>
+#include <store/api/copymode.h>
 
 namespace zorba {
 
@@ -194,9 +195,15 @@
       const unsigned char* temp = chars;
       unicode::code_point cp = utf8::next_char(temp);
 
-      // raise an error iff (1) the serialization format is XML 1.0 and (2) the given character is an invalid XML 1.0 character
-      if (ser && ser->method == PARAMETER_VALUE_XML && ser->version == "1.0" && !xml::is_valid(cp))
+      // raise an error iff (1) the serialization format is XML 1.0 and 
+      // (2) the given character is an invalid XML 1.0 character
+      if (ser &&
+          ser->method == PARAMETER_VALUE_XML &&
+          ser->version == "1.0" &&
+          !xml::is_valid(cp))
+      {
         throw XQUERY_EXCEPTION( err::FOCH0001, ERROR_PARAMS( cp ) );
+      }
 
       if (cp >= 0x10000 && cp <= 0x10FFFF)
       {
@@ -347,7 +354,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void serializer::emitter::emit_declaration_end()
+void serializer::emitter::emit_end()
 {
   // Do nothing in the default emitter
 }
@@ -393,6 +400,12 @@
 ********************************************************************************/
 void serializer::emitter::emit_item(store::Item* item)
 {
+#ifdef ZORBA_WITH_JSON
+  if (item->isJSONItem())
+  {
+    throw XQUERY_EXCEPTION(zerr::ZAPI0043_CANNOT_SERIALIZE_JSON_ITEM);
+  }
+#endif
   if (item->isAtomic())
   {
     if (previous_item == PREVIOUS_ITEM_WAS_TEXT)
@@ -764,7 +777,6 @@
   return false;
 }
 
-
 /*******************************************************************************
 
 ********************************************************************************/
@@ -809,7 +821,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
-//  XML Emitter                                                               //
+//  XML emitter                                                               //
 //                                                                            //
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -889,6 +901,325 @@
 }
 
 
+#ifdef ZORBA_WITH_JSON
+
+////////////////////////////////////////////////////////////////////////////////
+//                                                                            //
+//  JSON emitter                                                              //
+//                                                                            //
+////////////////////////////////////////////////////////////////////////////////
+
+serializer::json_emitter::json_emitter(
+  serializer* the_serializer,
+  transcoder& the_transcoder)
+  : emitter(the_serializer, the_transcoder),
+    theXMLStringStream(nullptr)
+{
+}
+
+serializer::json_emitter::~json_emitter()
+{
+  delete theXMLStringStream;
+}
+
+void serializer::json_emitter::emit_item(store::Item *item)
+{
+  if (!item->isJSONItem())
+  {
+    throw XQUERY_EXCEPTION(zerr::ZAPI0044_CANNOT_SERIALIZE_XML_ITEM);
+  }
+  emit_json_item(item, 0);
+}
+
+void serializer::json_emitter::emit_declaration()
+{
+}
+
+void serializer::json_emitter::emit_end()
+{
+}
+
+void serializer::json_emitter::emit_json_item(store::Item* item, int depth)
+{
+  // This is called for any item within a JSON array or object, or for a
+  // top-level JSON array or object. So JSON rules for simple types may
+  // apply here.
+  if (item->isJSONObject()) {
+    emit_json_object(item, depth);
+  }
+  else if (item->isJSONArray()) {
+    emit_json_array(item, depth);
+  }
+  else if (item->isJSONPair()) {
+    emit_json_pair(item, depth);
+  }
+  else if (item->isAtomic()) {
+    store::SchemaTypeCode type = item->getTypeCode();
+    switch (type) {
+    case store::XS_STRING:
+      emit_json_string(item->getStringValue());
+      break;
+
+    case store::XS_DOUBLE:
+    case store::XS_FLOAT:
+      if (item->isNaN()) {
+        emit_jsoniq_value("number", "NaN", depth);
+        break;
+      }
+      else if (item->isPosOrNegInf()) {
+        emit_jsoniq_value("number", "Infinity", depth);
+        break;
+      }
+      // else fall through
+    case store::XS_INTEGER:
+    case store::XS_DECIMAL:
+    case store::XS_NON_POSITIVE_INTEGER:
+    case store::XS_NEGATIVE_INTEGER:
+    case store::XS_LONG:
+    case store::XS_INT:
+    case store::XS_SHORT:
+    case store::XS_BYTE:
+    case store::XS_NON_NEGATIVE_INTEGER:
+    case store::XS_UNSIGNED_LONG:
+    case store::XS_UNSIGNED_INT:
+    case store::XS_UNSIGNED_SHORT:
+    case store::XS_UNSIGNED_BYTE:
+    case store::XS_POSITIVE_INTEGER:
+      // All numerics get serialized the same way
+      tr << item->getStringValue();
+      break;
+
+    case store::XS_BOOLEAN:
+      tr << (item->getBooleanValue() ? "true" : "false");
+      break;
+
+    case store::JDM_NULL:
+      tr << "null";
+      break;
+
+    default: {
+      emit_jsoniq_value(item->getType()->getStringValue(),
+                        item->getStringValue(), depth);
+      break;
+    }
+    }
+  }
+  else {
+    // OK, we've got a non-atomic non-JDM Item here, so serialize it as XML
+    // and output it as a "JSONiq value".
+    if (!theXMLEmitter) {
+      theXMLStringStream = new std::stringstream();
+      theXMLTranscoder = ser->create_transcoder(*theXMLStringStream);
+      theXMLEmitter = new serializer::xml_emitter(ser, *theXMLTranscoder);
+    }
+    theXMLEmitter->emit_item(item);
+    std::string xml = theXMLStringStream->str();
+    emit_jsoniq_value("XML", xml, depth);
+    theXMLStringStream->str("");
+  }
+}
+
+/*******************************************************************************
+
+********************************************************************************/
+void serializer::json_emitter::emit_json_object(store::Item* obj, int depth)
+{
+  store::Item_t pair;
+  store::Iterator_t it = obj->getPairs();
+  it->open();
+  bool first = true;
+  if (ser->indent) {
+    tr << "{" <<ser->END_OF_LINE;
+  }
+  else {
+    tr << "{ ";
+  }
+  depth++;
+  while (it->next(pair)) {
+    if (first) {
+      first = false;
+    }
+    else {
+      tr << ", ";
+      if (ser->indent) {
+        tr << ser->END_OF_LINE;
+      }
+    }
+    if (ser->indent) {
+      emit_indentation(depth);
+    }
+    emit_json_pair(pair, depth);
+  }
+  if (ser->indent) {
+    tr << ser->END_OF_LINE;
+    emit_indentation(depth-1);
+    tr << "}";
+  }
+  else {
+    tr << " }";
+  }
+}
+
+/*******************************************************************************
+
+********************************************************************************/
+void serializer::json_emitter::emit_json_array(store::Item* array, int depth)
+{
+  store::Item_t member;
+  store::Iterator_t it = array->getMembers();
+  it->open();
+  bool first = true;
+  tr << "[ ";
+  while (it->next(member)) {
+    if (first) {
+      first = false;
+    }
+    else {
+      tr << ", ";
+    }
+    emit_json_item(member, depth);
+  }
+  tr << " ]";
+}
+
+/*******************************************************************************
+
+********************************************************************************/
+void serializer::json_emitter::emit_json_pair(store::Item* pair, int depth)
+{
+  emit_json_item(pair->getName(), depth);
+  tr << " : ";
+  emit_json_item(pair->getValue(), depth);
+}
+
+/*******************************************************************************
+
+********************************************************************************/
+void serializer::json_emitter::emit_jsoniq_value
+    (zstring type, zstring value, int depth)
+{
+  // Create items for constant strings, if not already done
+  if (!theJsoniqValueName) {
+    zstring jsoniqvaluestring("JSONiq value");
+    zstring typestring("type");
+    zstring valuestring("value");
+    GENV_ITEMFACTORY->createString(theJsoniqValueName, jsoniqvaluestring);
+    GENV_ITEMFACTORY->createString(theTypeName, typestring);
+    GENV_ITEMFACTORY->createString(theValueName, valuestring);
+  }
+
+  // Create the inner JSON object
+  store::Item_t inner;
+  GENV_ITEMFACTORY->createJSONObject(inner);
+  // Inner object contains two pairs
+  store::Item_t typeitem, valueitem;
+  store::Item_t typepair, valuepair;
+  GENV_ITEMFACTORY->createString(typeitem, type);
+  GENV_ITEMFACTORY->createString(valueitem, value);
+  GENV_ITEMFACTORY->createJSONObjectPair(typepair, theTypeName, typeitem);
+  GENV_ITEMFACTORY->createJSONObjectPair(valuepair, theValueName, valueitem);
+
+  // "Copy" pairs into object
+  store::CopyMode noCopy;
+  noCopy.theDoCopy = false;
+  typepair->copy(inner.getp(), noCopy);
+  valuepair->copy(inner.getp(), noCopy);
+
+  // Create the outer JSON object with one pair
+  store::Item_t outer;
+  GENV_ITEMFACTORY->createJSONObject(outer);
+  store::Item_t outerpair;
+  GENV_ITEMFACTORY->createJSONObjectPair(outerpair, theJsoniqValueName, inner);
+  outerpair->copy(outer, noCopy);
+
+  emit_json_object(outer, depth);
+}
+
+void serializer::json_emitter::emit_json_string(zstring string)
+{
+  tr << '"';
+  zstring::const_iterator i = string.begin();
+  zstring::const_iterator end = string.end();
+  for (; i < end; i++) {
+    if (*i == '\\' || *i == '"' || (*i < 0x20)) {
+      tr << '\\';
+    }
+    tr << *i;
+  }
+  tr << '"';
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+//                                                                            //
+//  JSONiq emitter (auto-detects JSON or XML)                                 //
+//                                                                            //
+////////////////////////////////////////////////////////////////////////////////
+
+serializer::jsoniq_emitter::jsoniq_emitter(
+  serializer* the_serializer,
+  transcoder& the_transcoder)
+  :
+    emitter(the_serializer, the_transcoder),
+    theEmitterState(JESTATE_UNDETERMINED),
+    theEmitter(nullptr)
+{
+}
+
+serializer::jsoniq_emitter::~jsoniq_emitter()
+{
+  delete theEmitter;
+}
+
+void serializer::jsoniq_emitter::emit_declaration()
+{
+  // Probably I should set a flag here to note whether emit_declaration() has
+  // been called or not. However, I know that all serializer::serialize()
+  // methods DO call emit_declaration() and call it first, so there's no need.
+}
+
+void serializer::jsoniq_emitter::emit_item(store::Item *item)
+{
+  bool isJson = item->isJSONItem();
+
+  if (theEmitterState == JESTATE_UNDETERMINED) {
+    // Initialize theEmitter based on item type, passing through our serializer
+    // and transcoder.
+    if (isJson) {
+      theEmitterState = JESTATE_JDM;
+      theEmitter = new json_emitter(ser, tr);
+    }
+    else {
+      theEmitterState = JESTATE_XDM;
+      theEmitter = new xml_emitter(ser, tr);
+    }
+    // Since this was the first item, call emit_declaration().
+    theEmitter->emit_declaration();
+  }
+  else {
+    // Error checking
+    if ( (isJson && theEmitterState == JESTATE_XDM) ||
+         (!isJson && theEmitterState == JESTATE_JDM) ) {
+      throw XQUERY_EXCEPTION(zerr::ZAPI0045_CANNOT_SERIALIZE_MIXED_XDM_JDM);
+    }
+  }
+
+  // Pass through
+  theEmitter->emit_item(item);
+}
+
+void serializer::jsoniq_emitter::emit_end()
+{
+  // Not really clear what to do if we serialized no items and hence have
+  // no emitter yet, but doing nothing at all seems reasonable.
+  if (theEmitter) {
+    theEmitter->emit_end();
+  }
+}
+
+
+#endif /* ZORBA_WITH_JSON */
+
 ////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
 //  HTML Emitter                                                              //
@@ -1043,7 +1374,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void serializer::html_emitter::emit_declaration_end()
+void serializer::html_emitter::emit_end()
 {
 }
 
@@ -1439,7 +1770,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void serializer::sax2_emitter::emit_declaration_end()
+void serializer::sax2_emitter::emit_end()
 {
   theSAX2ContentHandler->endDocument();
 }
@@ -1893,7 +2224,6 @@
   }
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
 //  Serializer                                                                //
@@ -1940,7 +2270,12 @@
 
   media_type.clear();
 
+  // This default should match the default for ser_method in Zorba_SerializerOptions
+#ifdef ZORBA_WITH_JSON
+  method = PARAMETER_VALUE_JSONIQ;
+#else
   method = PARAMETER_VALUE_XML;
+#endif
 
   normalization_form.clear();
 
@@ -2032,6 +2367,12 @@
       method = PARAMETER_VALUE_TEXT;
     else if (!strcmp(aValue, "binary"))
       method = PARAMETER_VALUE_BINARY;
+#ifdef ZORBA_WITH_JSON
+    else if (!strcmp(aValue, "json"))
+      method = PARAMETER_VALUE_JSON;
+    else if (!strcmp(aValue, "jsoniq"))
+      method = PARAMETER_VALUE_JSONIQ;
+#endif
     else
       throw XQUERY_EXCEPTION(
         err::SEPM0016, ERROR_PARAMS( aValue, aName, ZED( GoodValuesAreXMLEtc ) )
@@ -2160,22 +2501,10 @@
 ********************************************************************************/
 bool serializer::setup(std::ostream& os)
 {
-  if (encoding == PARAMETER_VALUE_UTF_8)
-  {
-    tr = new transcoder(os, false);
-  }
-#ifndef ZORBA_NO_UNICODE
-  else if (encoding == PARAMETER_VALUE_UTF_16)
-  {
-    tr = new transcoder(os, true);
-  }
-#endif
-  else
-  {
-    ZORBA_ASSERT(0);
+  tr = create_transcoder(os);
+  if (!tr) {
     return false;
   }
-
   if (method == PARAMETER_VALUE_XML)
     e = new xml_emitter(this, *tr);
   else if (method == PARAMETER_VALUE_HTML)
@@ -2186,6 +2515,12 @@
     e = new text_emitter(this, *tr);
   else if (method == PARAMETER_VALUE_BINARY)
     e = new binary_emitter(this, *tr);
+#ifdef ZORBA_WITH_JSON
+  else if (method == PARAMETER_VALUE_JSON)
+    e = new json_emitter(this, *tr);
+  else if (method == PARAMETER_VALUE_JSONIQ)
+    e = new jsoniq_emitter(this, *tr);
+#endif
   else
   {
     ZORBA_ASSERT(0);
@@ -2204,6 +2539,24 @@
   return true;
 }
 
+transcoder* serializer::create_transcoder(std::ostream &os)
+{
+  if (encoding == PARAMETER_VALUE_UTF_8)
+  {
+    return new transcoder(os, false);
+  }
+#ifndef ZORBA_NO_UNICODE
+  else if (encoding == PARAMETER_VALUE_UTF_16)
+  {
+    return new transcoder(os, true);
+  }
+#endif
+  else
+  {
+    ZORBA_ASSERT(0);
+    return nullptr;
+  }
+}
 
 /*******************************************************************************
 
@@ -2265,7 +2618,7 @@
     e->emit_item(&*lItem);
   }
 //+  aObject->close();
-  e->emit_declaration_end();
+  e->emit_end();
 }
 
 
@@ -2311,7 +2664,7 @@
   }
  
   //object->close();
-  e->emit_declaration_end();
+  e->emit_end();
 }
 
 } // namespace zorba

=== modified file 'src/api/serialization/serializer.h'
--- src/api/serialization/serializer.h	2011-11-11 07:44:01 +0000
+++ src/api/serialization/serializer.h	2012-02-07 00:26:21 +0000
@@ -69,6 +69,10 @@
     PARAMETER_VALUE_XHTML,
     PARAMETER_VALUE_TEXT,
     PARAMETER_VALUE_BINARY,
+#ifdef ZORBA_WITH_JSON
+    PARAMETER_VALUE_JSON,
+    PARAMETER_VALUE_JSONIQ,
+#endif
 
     PARAMETER_VALUE_UTF_8
 #ifndef ZORBA_NO_UNICODE
@@ -168,6 +172,7 @@
 
   bool setup(std::ostream& os);
 
+  transcoder* create_transcoder(std::ostream& os);
 
   ///////////////////////////////////////////////////////////
   //                                                       //
@@ -198,8 +203,20 @@
     /**
      * Outputs the end of the serialized document.
      */
-    virtual void emit_declaration_end();
-
+    virtual void emit_end();
+
+    /**
+     * Serializes the given item, depending on its type, and its children. This
+     * will be called by serializer for each top-level item in the sequence.
+     *
+     * @param item the item to serialize
+     */
+    virtual void emit_item(store::Item* item);
+
+    // End of the "public" emitter API. All remaining methods are implementation
+    // details and will not be called from outside.
+
+  protected:
     /**
      * Outputs the doctype declaration. This function is not used by the
      * default emitter, it is intended to be defined by the XML, HTML and XHTML
@@ -208,13 +225,6 @@
     virtual void emit_doctype(const zstring& elementName);
 
     /**
-     * Serializes the given item, depending on its type, and its children.
-     *
-     * @param item the item to serialize
-     */
-    virtual void emit_item(store::Item* item);
-
-    /**
      * Serializes the given streamable item.
      *
      * @param item the item to serialize
@@ -270,7 +280,6 @@
      */
     void emit_indentation(int depth);
 
-  protected:
     bool haveBinding(std::pair<zstring, zstring>& nsBinding) const;
 
     bool havePrefix(const zstring& pre) const;
@@ -316,9 +325,94 @@
 
     virtual void emit_declaration();
 
+  protected:
     virtual void emit_doctype(const zstring& elementName);
   };
 
+  ///////////////////////////////////////////////////////////
+  //                                                       //
+  //  class json_emitter                                   //
+  //                                                       //
+  ///////////////////////////////////////////////////////////
+
+#ifdef ZORBA_WITH_JSON
+
+  class json_emitter : public emitter
+  {
+  public:
+    json_emitter(serializer* the_serializer, transcoder& the_transcoder);
+
+    virtual ~json_emitter();
+
+    virtual void emit_declaration();
+
+    virtual void emit_item(store::Item *item);
+
+    virtual void emit_end();
+
+  private:
+
+    /**
+     * Outputs a JSON item. This method is called both for top-level JSON
+     * items as well as any items within a JSON object or array, so it may
+     * output simple typed values differently than standard XML serialization.
+     */
+    void emit_json_item(store::Item* item, int depth);
+
+    void emit_json_object(store::Item* object, int depth);
+
+    void emit_json_array(store::Item* array, int depth);
+
+    void emit_json_pair(store::Item* pair, int depth);
+
+    void emit_json_value(store::Item* value, int depth);
+
+    void emit_jsoniq_value(zstring type, zstring value, int depth);
+
+    void emit_json_string(zstring string);
+
+    store::Item_t theJsoniqValueName;
+    store::Item_t theTypeName;
+    store::Item_t theValueName;
+
+    rchandle<emitter> theXMLEmitter;
+    rchandle<transcoder> theXMLTranscoder;
+    std::stringstream* theXMLStringStream;
+  };
+
+
+  ///////////////////////////////////////////////////////////
+  //                                                       //
+  //  class jsoniq_emitter (auto-detects JSON or XML)      //
+  //                                                       //
+  ///////////////////////////////////////////////////////////
+
+  class jsoniq_emitter : public emitter
+  {
+  public:
+    jsoniq_emitter(serializer* the_serializer, transcoder& the_transcoder);
+
+    virtual ~jsoniq_emitter();
+
+    virtual void emit_declaration();
+
+    virtual void emit_item(store::Item *item);
+
+    virtual void emit_end();
+
+  private:
+    enum JSONiqEmitterState {
+      JESTATE_UNDETERMINED,
+      JESTATE_JDM,
+      JESTATE_XDM
+    }                           theEmitterState;
+
+    serializer::emitter*        theEmitter;
+  };
+
+#endif /* ZORBA_WITH_JSON */
+
+
 
   ///////////////////////////////////////////////////////////
   //                                                       //
@@ -331,6 +425,7 @@
   public:
     xhtml_emitter(serializer* the_serializer, transcoder& the_transcoder);
 
+  protected:
     virtual void emit_node(const store::Item* item, int depth);
   };
 
@@ -347,7 +442,9 @@
     html_emitter(serializer* the_serializer, transcoder& the_transcoder);
 
     virtual void emit_declaration();
-    virtual void emit_declaration_end();
+    virtual void emit_end();
+
+  protected:
     virtual void emit_doctype(const zstring& elementName);
     virtual void emit_node(const store::Item* item, int depth);
   };
@@ -366,6 +463,9 @@
 
     virtual void emit_declaration();
 
+    virtual void emit_item(store::Item* item);
+
+  protected:
     virtual void emit_node(const store::Item* item, int depth);
 
     virtual int emit_node_children(
@@ -373,8 +473,6 @@
         int depth,
         bool perform_escaping = true);
 
-    virtual void emit_item(store::Item* item);
-
     virtual void emit_streamable_item(store::Item* item);
   };
 
@@ -400,16 +498,17 @@
           std::stringstream& aSStream,
           SAX2_ContentHandler* aSAX2ContentHandler);
 
+    void emit_declaration();
+    void emit_item(store::Item* item );
+    void emit_end();
+
+  protected:
     void emit_startPrefixMapping(
           const store::Item* item,
           store::NsBindings& nsBindings );
 
     void emit_endPrefixMapping(store::NsBindings& nsBindings );
 
-    void emit_declaration();
-
-    void emit_declaration_end();
-
     void emit_node(const store::Item* item, int depth);
 
     void emit_node(const store::Item* item);
@@ -427,8 +526,6 @@
     void emit_node_children(const store::Item* item);
 
     bool emit_bindings(const store::Item* item, int depth);
-
-    void emit_item(store::Item* item );
   };
 
 

=== modified file 'src/api/serializerimpl.cpp'
--- src/api/serializerimpl.cpp	2011-06-14 17:26:33 +0000
+++ src/api/serializerimpl.cpp	2012-02-07 00:26:21 +0000
@@ -20,8 +20,9 @@
 #include <zorba/singleton_item_sequence.h>
 #include <zorba/diagnostic_handler.h>
 
-#include "api/zorbaimpl.h"
-#include "api/unmarshaller.h"
+#include <diagnostics/assert.h>
+#include <api/zorbaimpl.h>
+#include <api/unmarshaller.h>
 
 #include "serializerimpl.h"
 
@@ -88,6 +89,8 @@
 {
   switch (theInternalSerializer.getSerializationMethod())
   {
+  case serializer::PARAMETER_VALUE_XML:
+    return ZORBA_SERIALIZATION_METHOD_XML;
   case serializer::PARAMETER_VALUE_HTML:
     return ZORBA_SERIALIZATION_METHOD_HTML;
   case serializer::PARAMETER_VALUE_XHTML:
@@ -96,8 +99,14 @@
     return ZORBA_SERIALIZATION_METHOD_TEXT;
   case serializer::PARAMETER_VALUE_BINARY:
     return ZORBA_SERIALIZATION_METHOD_BINARY;
+#ifdef ZORBA_WITH_JSON
+  case serializer::PARAMETER_VALUE_JSON:
+    return ZORBA_SERIALIZATION_METHOD_JSON;
+  case serializer::PARAMETER_VALUE_JSONIQ:
+    return ZORBA_SERIALIZATION_METHOD_JSONIQ;
+#endif
   default:
-    return ZORBA_SERIALIZATION_METHOD_XML;
+    ZORBA_ASSERT(0);
   }
 }
 
@@ -119,6 +128,12 @@
     aInternalSerializer.setParameter("method", "text"); break;
   case ZORBA_SERIALIZATION_METHOD_BINARY:
     aInternalSerializer.setParameter("method", "binary"); break;
+#ifdef ZORBA_WITH_JSON
+  case ZORBA_SERIALIZATION_METHOD_JSON:
+    aInternalSerializer.setParameter("method", "json"); break;
+  case ZORBA_SERIALIZATION_METHOD_JSONIQ:
+    aInternalSerializer.setParameter("method", "jsoniq"); break;
+#endif
   }
 
   switch (aSerializerOptions.byte_order_mark)

=== modified file 'src/api/typeidentimpl.cpp'
--- src/api/typeidentimpl.cpp	2011-09-15 11:46:01 +0000
+++ src/api/typeidentimpl.cpp	2012-02-07 00:26:21 +0000
@@ -23,13 +23,14 @@
 namespace zorba {
 
 TypeIdentifier::TypeIdentifier()
-    : m_kind(IdentTypes::INVALID_TYPE),
-    m_quantifier(IdentTypes::QUANT_ONE),
-    m_uri(""),
-    m_uriWildcard(false),
-    m_localName(""),
-    m_localNameWildcard(false),
-    m_contentType()
+  :
+  m_kind(IdentTypes::INVALID_TYPE),
+  m_quantifier(IdentTypes::QUANT_ONE),
+  m_uri(""),
+  m_uriWildcard(false),
+  m_localName(""),
+  m_localNameWildcard(false),
+  m_contentType()
 {
 }
 
@@ -188,6 +189,59 @@
 }
 
 
+#ifdef ZORBA_WITH_JSON
+
+TypeIdentifier_t TypeIdentifier::createStructuredItemType(IdentTypes::quantifier_t q)
+{
+  TypeIdentifier_t ti(new TypeIdentifier());
+  ti->m_kind = IdentTypes::STRUCTURED_ITEM_TYPE;
+  ti->m_quantifier = q;
+
+  return ti;
+}
+
+
+TypeIdentifier_t TypeIdentifier::createJSONItemType(IdentTypes::quantifier_t q)
+{
+  TypeIdentifier_t ti(new TypeIdentifier());
+  ti->m_kind = IdentTypes::JSON_ITEM_TYPE;
+  ti->m_quantifier = q;
+
+  return ti;
+}
+
+
+TypeIdentifier_t TypeIdentifier::createJSONObjectType(IdentTypes::quantifier_t q)
+{
+  TypeIdentifier_t ti(new TypeIdentifier());
+  ti->m_kind = IdentTypes::JSON_OBJECT_TYPE;
+  ti->m_quantifier = q;
+
+  return ti;
+}
+
+
+TypeIdentifier_t TypeIdentifier::createJSONArrayType(IdentTypes::quantifier_t q)
+{
+  TypeIdentifier_t ti(new TypeIdentifier());
+  ti->m_kind = IdentTypes::JSON_ARRAY_TYPE;
+  ti->m_quantifier = q;
+
+  return ti;
+}
+
+
+TypeIdentifier_t TypeIdentifier::createJSONPairType(IdentTypes::quantifier_t q)
+{
+  TypeIdentifier_t ti(new TypeIdentifier());
+  ti->m_kind = IdentTypes::JSON_PAIR_TYPE;
+  ti->m_quantifier = q;
+
+  return ti;
+}
+#endif
+
+
 TypeIdentifier_t TypeIdentifier::createItemType(IdentTypes::quantifier_t quantifier)
 {
   TypeIdentifier_t ti(new TypeIdentifier());

=== modified file 'src/compiler/codegen/plan_visitor.cpp'
--- src/compiler/codegen/plan_visitor.cpp	2012-01-11 17:30:25 +0000
+++ src/compiler/codegen/plan_visitor.cpp	2012-02-07 00:26:21 +0000
@@ -38,6 +38,7 @@
 #include "compiler/expression/flwor_expr.h"
 #include "compiler/expression/fo_expr.h"
 #include "compiler/expression/script_exprs.h"
+#include "compiler/expression/json_exprs.h"
 #include "compiler/expression/update_exprs.h"
 #ifndef ZORBA_NO_FULL_TEXT
 #include "compiler/expression/ft_expr.h"
@@ -57,10 +58,12 @@
 #include "runtime/visitors/printer_visitor_api.h"
 #include "runtime/visitors/iterprinter.h"
 #include "runtime/sequences/SequencesImpl.h"
+#include "runtime/sequences/sequences.h"
 #include "runtime/core/sequencetypes.h"
 #include "runtime/core/item_iterator.h"
 #include "runtime/core/var_iterators.h"
 #include "runtime/core/constructors.h"
+#include "runtime/json/json_constructors.h"
 #include "runtime/core/apply_updates.h"
 #include "runtime/core/path_iterators.h"
 #include "runtime/core/nodeid_iterators.h"
@@ -2781,10 +2784,13 @@
     axisItep->setDocTestKind(v.getDocTestKind());
     axisItep->setNodeKind(v.getNodeKind());
     axisItep->setQName(v.getQName());
-    store::Item *typeName = v.getTypeName();
+    store::Item* typeName = v.getTypeName();
     if (typeName != NULL) 
     {
-      axisItep->setType(sctx->get_typemanager()->create_named_type(typeName));
+      axisItep->setType(sctx->get_typemanager()->
+                        create_named_type(typeName,
+                                          TypeConstants::QUANT_ONE,
+                                          qloc));
     }
     axisItep->setNilledAllowed(v.getNilledAllowed());
   }
@@ -2985,25 +2991,26 @@
 {
   CODEGEN_TRACE_OUT("");
 
-  PlanIter_t content = pop_itstack ();
+  PlanIter_t content = pop_itstack();
 
   bool isRoot = false;
   theEnclosedContextStack.pop();
   expr* e = plan_visitor_ns::pop_stack(theConstructorsStack);
   ZORBA_ASSERT(e = &v);
+
   if (theConstructorsStack.empty() || is_enclosed_expr(theConstructorsStack.top()))
   {
     isRoot = true;
   }
 
-  switch (v.get_type ())
+  switch (v.get_type())
   {
   case text_expr::text_constructor:
-    push_itstack (new TextIterator(sctx, qloc, content, isRoot));
+    push_itstack(new TextIterator(sctx, qloc, content, isRoot));
     break;
 
   case text_expr::comment_constructor:
-    push_itstack (new CommentIterator (sctx, qloc, content, isRoot));
+    push_itstack(new CommentIterator(sctx, qloc, content, isRoot));
     break;
 
   default:
@@ -3042,6 +3049,103 @@
 }
 
 
+#ifdef ZORBA_WITH_JSON
+
+/*******************************************************************************
+
+  JSON Constructors
+
+********************************************************************************/
+bool begin_visit(json_pair_expr& v)
+{
+  CODEGEN_TRACE_IN("");