Mailing-List: contact commits-help@zest.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@zest.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: niclas@apache.org
To: commits@zest.apache.org
Date: Wed, 10 Jun 2015 04:21:40 -0000
Message-Id: <94a29c0239e24040b22e1435922c83be@git.apache.org>
In-Reply-To: <532db60551d54f8693751ce9f50295f6@git.apache.org>
References: <532db60551d54f8693751ce9f50295f6@git.apache.org>
Subject: [3/6] zest-qi4j git commit: * Removed Google AppEngine EntityStore
 and associated test. * Removed Neo4j, both Entity Store and Library,
 due to lacking response from Neo Technologis regarding the GPLv3 'pollution'.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/licenses/neo4j-opensource.license
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/licenses/neo4j-opensource.license b/extensions/entitystore-neo4j/licenses/neo4j-opensource.license
deleted file mode 100644
index 4ec8c3f..0000000
--- a/extensions/entitystore-neo4j/licenses/neo4j-opensource.license
+++ /dev/null
@@ -1,619 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/src/docs/es-neo4j.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/src/docs/es-neo4j.txt b/extensions/entitystore-neo4j/src/docs/es-neo4j.txt
deleted file mode 100644
index ae3692d..0000000
--- a/extensions/entitystore-neo4j/src/docs/es-neo4j.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-[[extension-es-neo4j, Neo4j EntityStore]]
-= Neo4j EntityStore =
-
-[devstatus]
---------------
-source=extensions/entitystore-neo4j/dev-status.xml
---------------
-
-EntityStore service backed by the http://neo4j.org/[Neo4j] Graph Database.
-
-It uses the embeddable Neo4j and not currently able to utilize the networked one, nor the Cypher query language that is present in more recent versions of Neo4j.
-
-include::../../build/docs/buildinfo/artifact.txt[]
-
-== Assembly ==
-
-There is currently no provided Assembler, and one has to declare the use explicitly. Note that we recommend
-[snippet,java]
-----
-source=extensions/entitystore-neo4j/src/test/java/org/qi4j/entitystore/neo4j/test/SimpleNeoStoreTest.java
-tag=assembly
-----
-
-== Configuration ==
-
-There is currently only a single configuration property for the Neo4j Entity Store.
-
-[snippet,java]
-----
-source=extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoConfiguration.java
-tag=config
-----
-
-+path+ the full path on the file system where the Neo4j embedded database will be written to. The default value is 'build/neodb' and tailored for the build system and should not be used. The default value may change to a more sensible value in the future. 
-

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoConfiguration.java b/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoConfiguration.java
deleted file mode 100644
index b59fffe..0000000
--- a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoConfiguration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2009 Niclas Hedhman.
- *
- * 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.
- */
-
-package org.qi4j.entitystore.neo4j;
-
-import org.qi4j.api.common.Optional;
-import org.qi4j.api.configuration.ConfigurationComposite;
-import org.qi4j.api.property.Property;
-
-// START SNIPPET: config
-public interface NeoConfiguration
-    extends ConfigurationComposite
-{
-    /** The absolute location of the embedded database. */
-    @Optional
-    Property<String> path();
-}
-// END SNIPPET: config

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityState.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityState.java b/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityState.java
deleted file mode 100644
index 340f52f..0000000
--- a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityState.java
+++ /dev/null
@@ -1,293 +0,0 @@
-package org.qi4j.entitystore.neo4j;
-
-import org.neo4j.graphdb.Direction;
-import org.neo4j.graphdb.DynamicRelationshipType;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.graphdb.RelationshipType;
-import org.qi4j.api.common.QualifiedName;
-import org.qi4j.api.entity.EntityDescriptor;
-import org.qi4j.api.entity.EntityReference;
-import org.qi4j.api.property.PropertyDescriptor;
-import org.qi4j.api.type.ValueType;
-import org.qi4j.api.value.ValueSerialization;
-import org.qi4j.api.value.ValueSerializationException;
-import org.qi4j.spi.entity.EntityState;
-import org.qi4j.spi.entity.EntityStatus;
-import org.qi4j.spi.entity.ManyAssociationState;
-import org.qi4j.spi.entity.NamedAssociationState;
-import org.qi4j.spi.entitystore.EntityStoreException;
-import org.qi4j.spi.entitystore.EntityStoreUnitOfWork;
-
-public class NeoEntityState
-    implements EntityState
-{
-
-    static final String ENTITY_ID = "entity_id";
-    static final String VERSION = "version";
-    static final String MODIFIED = "modified";
-    private final NeoEntityStoreUnitOfWork uow;
-    private final ValueSerialization valueSerialization;
-    private final Node underlyingNode;
-    private EntityStatus status;
-
-    NeoEntityState( ValueSerialization valueSerialization, NeoEntityStoreUnitOfWork work, Node node,
-                    EntityStatus status )
-    {
-        this.valueSerialization = valueSerialization;
-        this.uow = work;
-        this.underlyingNode = node;
-        this.status = status;
-    }
-
-    protected void setUpdated()
-    {
-        if( status == EntityStatus.LOADED )
-        {
-            status = EntityStatus.UPDATED;
-            Long version = (Long) underlyingNode.getProperty( VERSION );
-            underlyingNode.setProperty( VERSION, version + 1 );
-            underlyingNode.setProperty( MODIFIED, uow.currentTime() );
-        }
-    }
-
-    static RelationshipType namedAssociation( QualifiedName stateName )
-    {
-        return DynamicRelationshipType.withName( "named_association::" + stateName.toString() );
-    }
-
-    static RelationshipType manyAssociation( QualifiedName stateName )
-    {
-        return DynamicRelationshipType.withName( "many_association::" + stateName.toString() );
-    }
-
-    static RelationshipType association( QualifiedName stateName )
-    {
-        return DynamicRelationshipType.withName( "association::" + stateName.toString() );
-    }
-
-    @Override
-    public NamedAssociationState namedAssociationValueOf( QualifiedName stateName )
-    {
-        RelationshipType namedAssociation = namedAssociation( stateName );
-        Relationship rel = underlyingNode.getSingleRelationship( namedAssociation, Direction.OUTGOING );
-        if( rel != null )
-        {
-            return new NeoNamedAssociationState( uow, this, rel.getEndNode() );
-        }
-        Node node = uow.getNeo().createNode();
-        node.setProperty( NeoNamedAssociationState.COUNT, 0 );
-        underlyingNode.createRelationshipTo( node, namedAssociation );
-        return new NeoNamedAssociationState( uow, this, node );
-    }
-    
-    @Override
-    public ManyAssociationState manyAssociationValueOf( QualifiedName stateName )
-    {
-        RelationshipType manyAssociation = manyAssociation( stateName );
-        Relationship rel = underlyingNode.getSingleRelationship( manyAssociation, Direction.OUTGOING );
-        if( rel != null )
-        {
-            return new NeoManyAssociationState( uow, this, rel.getEndNode() );
-        }
-        Node node = uow.getNeo().createNode();
-        node.setProperty( NeoManyAssociationState.COUNT, 0 );
-        underlyingNode.createRelationshipTo( node, manyAssociation );
-        return new NeoManyAssociationState( uow, this, node );
-    }
-
-    @Override
-    public EntityReference associationValueOf( QualifiedName stateName )
-    {
-        Relationship rel = underlyingNode.getSingleRelationship( association( stateName ), Direction.OUTGOING );
-        if( rel != null )
-        {
-            String entityId = (String) rel.getEndNode().getProperty( ENTITY_ID );
-            return new EntityReference( entityId );
-        }
-        return null;
-    }
-
-    @Override
-    public void setAssociationValue( QualifiedName stateName, EntityReference newEntity )
-    {
-        RelationshipType association = association( stateName );
-        Relationship rel = underlyingNode.getSingleRelationship( association, Direction.OUTGOING );
-        if( rel != null )
-        {
-            Node otherNode = rel.getEndNode();
-            if( otherNode.getProperty( ENTITY_ID ).equals( identity().identity() ) )
-            {
-                otherNode.delete();
-            }
-            rel.delete();
-        }
-        if( newEntity != null )
-        {
-            Node otherNode = uow.getEntityStateNode( newEntity );
-            if( otherNode.equals( underlyingNode ) )
-            {
-                // create a blank node for self reference
-                otherNode = uow.getNeo().createNode();
-                otherNode.setProperty( ENTITY_ID, identity().identity() );
-            }
-            underlyingNode.createRelationshipTo( otherNode, association );
-        }
-    }
-
-    @Override
-    public Object propertyValueOf( QualifiedName stateName )
-    {
-        try
-        {
-            PropertyDescriptor persistentProperty = entityDescriptor().state().findPropertyModelByQualifiedName( stateName );
-            Object prop = underlyingNode.getProperty( "prop::" + stateName.toString(), null );
-            if( prop == null )
-            {
-                return null;
-            }
-            else if( ValueType.isPrimitiveValueType( persistentProperty.valueType() ) )
-            {
-                return prop;
-            }
-            else
-            {
-                return valueSerialization.deserialize( persistentProperty.valueType(), prop.toString() );
-            }
-        }
-        catch( ValueSerializationException e )
-        {
-            throw new EntityStoreException( e );
-        }
-    }
-
-    @Override
-    public void setPropertyValue( QualifiedName stateName, Object prop )
-    {
-        try
-        {
-            if( prop != null )
-            {
-                PropertyDescriptor persistentProperty = entityDescriptor().state().findPropertyModelByQualifiedName( stateName );
-                if( ValueType.isPrimitiveValueType( persistentProperty.valueType() ) )
-                {
-                    underlyingNode.setProperty( "prop::" + stateName.toString(), prop );
-                }
-                else
-                {
-                    String jsonString = valueSerialization.serialize( prop );
-                    underlyingNode.setProperty( "prop::" + stateName.toString(), jsonString );
-                }
-            }
-            else
-            {
-                underlyingNode.removeProperty( stateName.toString() );
-            }
-            setUpdated();
-        }
-        catch( ValueSerializationException e )
-        {
-            throw new EntityStoreException( e );
-        }
-    }
-
-    @Override
-    public void remove()
-    {
-        // Apparently remove should just force remove associations instead
-        // of throwing exception if the entity has incomming associations
-//            if ( underlyingNode.hasRelationship( Direction.INCOMING ) )
-//            {
-//                throw new IllegalStateException(
-//                    "Cannot remove entity with reference: " + identity()
-//                    + ". It has incoming associtaions.");
-//            }
-        // remove of all incomming associations
-        for( Relationship rel : underlyingNode.getRelationships( Direction.INCOMING ) )
-        {
-            rel.delete();
-        }
-        uow.getIndexService().removeIndex( underlyingNode,
-                                           NeoEntityStoreUnitOfWork.ENTITY_STATE_ID,
-                                           underlyingNode.getProperty( ENTITY_ID ) );
-
-        for( Relationship rel : underlyingNode.getRelationships( Direction.OUTGOING ) )
-        {
-            Node endNode = rel.getEndNode();
-            boolean manyAssocNode = false, namedAssocNode = false;
-            for( Relationship manyRel : endNode.getRelationships( RelTypes.MANY_ASSOCIATION, Direction.OUTGOING ) )
-            {
-                manyRel.delete();
-                manyAssocNode = true;
-            }
-            for( Relationship namedRel : endNode.getRelationships( RelTypes.NAMED_ASSOCIATION, Direction.OUTGOING ) )
-            {
-                namedRel.delete();
-                namedAssocNode = true;
-            }
-            if( manyAssocNode || namedAssocNode )
-            {
-                endNode.delete();
-            }
-            rel.delete();
-        }
-        underlyingNode.delete();
-        status = EntityStatus.REMOVED;
-    }
-
-    @Override
-    public EntityDescriptor entityDescriptor()
-    {
-        Node typeNode = underlyingNode.getSingleRelationship( RelTypes.IS_OF_TYPE, Direction.OUTGOING ).getEndNode();
-        String type = (String) typeNode.getProperty( NeoEntityStoreUnitOfWork.ENTITY_TYPE );
-        return uow.getEntityDescriptor( type );
-    }
-
-    public void hasBeenApplied()
-    {
-        // TODO
-    }
-
-    @Override
-    public EntityReference identity()
-    {
-        return new EntityReference( (String) underlyingNode.getProperty( ENTITY_ID ) );
-    }
-
-    @Override
-    public boolean isAssignableTo( Class<?> type )
-    {
-        Node typeNode = underlyingNode.getSingleRelationship( RelTypes.IS_OF_TYPE, Direction.OUTGOING ).getEndNode();
-        String typeName = (String) typeNode.getProperty( NeoEntityStoreUnitOfWork.ENTITY_TYPE );
-        return typeName.equals( type.getName() );
-    }
-
-    @Override
-    public long lastModified()
-    {
-        long modified = (Long) underlyingNode.getProperty( MODIFIED );
-        return modified;
-    }
-
-    @Override
-    public EntityStatus status()
-    {
-        return status;
-    }
-
-    @Override
-    public String version()
-    {
-        long version = (Long) underlyingNode.getProperty( VERSION );
-        if( status == EntityStatus.UPDATED )
-        {
-            version--;
-        }
-        return "" + version;
-    }
-
-    public EntityStoreUnitOfWork unitOfWork()
-    {
-        return uow;
-    }
-}

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreMixin.java b/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreMixin.java
deleted file mode 100644
index dd04f3a..0000000
--- a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreMixin.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.qi4j.entitystore.neo4j;
-
-import java.io.File;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.neo4j.graphdb.Direction;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.index.IndexService;
-import org.neo4j.index.lucene.LuceneIndexService;
-import org.neo4j.kernel.EmbeddedGraphDatabase;
-import org.qi4j.api.common.Optional;
-import org.qi4j.api.configuration.Configuration;
-import org.qi4j.api.entity.EntityDescriptor;
-import org.qi4j.api.entity.EntityReference;
-import org.qi4j.api.injection.scope.Service;
-import org.qi4j.api.injection.scope.This;
-import org.qi4j.api.service.ServiceActivation;
-import org.qi4j.api.service.qualifier.Tagged;
-import org.qi4j.api.structure.Module;
-import org.qi4j.api.usecase.Usecase;
-import org.qi4j.api.value.ValueSerialization;
-import org.qi4j.io.Input;
-import org.qi4j.io.Output;
-import org.qi4j.io.Receiver;
-import org.qi4j.io.Sender;
-import org.qi4j.library.fileconfig.FileConfiguration;
-import org.qi4j.spi.entity.EntityState;
-import org.qi4j.spi.entity.EntityStatus;
-import org.qi4j.spi.entitystore.*;
-
-public class NeoEntityStoreMixin
-        implements ServiceActivation, EntityStore, EntityStoreSPI
-{
-   @Optional
-   @Service
-   FileConfiguration fileConfiguration;
-   @Service
-   @Tagged( ValueSerialization.Formats.JSON )
-   private ValueSerialization valueSerialization;
-
-   @This
-   private Configuration<NeoConfiguration> config;
-
-   private EmbeddedGraphDatabase neo;
-   private IndexService indexService;
-
-   private AtomicInteger count = new AtomicInteger(0);
-   private String uuid;
-
-   @Override
-   public void activateService()
-           throws Exception
-   {
-      String path = config.get().path().get();
-      if (path == null)
-      {
-         if (fileConfiguration != null)
-            path = new File(fileConfiguration.dataDirectory(), config.get().identity().get()).getAbsolutePath();
-         else
-            path = "build/neodb";
-      }
-      neo = new EmbeddedGraphDatabase(path);
-      indexService = new LuceneIndexService(neo);
-      uuid = UUID.randomUUID().toString() + "-";
-   }
-
-   @Override
-   public void passivateService()
-           throws Exception
-   {
-      indexService.shutdown();
-      neo.shutdown();
-   }
-
-    @Override
-   public EntityStoreUnitOfWork newUnitOfWork( Usecase usecase, Module module, long currentTime )
-   {
-      return new NeoEntityStoreUnitOfWork(neo, indexService, valueSerialization, newUnitOfWorkId(), module, currentTime);
-   }
-
-    @Override
-   public Input<EntityState, EntityStoreException> entityStates(final Module module)
-   {
-      return new Input<EntityState, EntityStoreException>()
-      {
-         @Override
-         public <ReceiverThrowableType extends Throwable> void transferTo(Output<? super EntityState, ReceiverThrowableType> output) throws EntityStoreException, ReceiverThrowableType
-         {
-            output.receiveFrom(new Sender<EntityState, EntityStoreException>()
-            {
-               @Override
-               public <ReceiverThrowableType extends Throwable> void sendTo(Receiver<? super EntityState, ReceiverThrowableType> receiver) throws ReceiverThrowableType, EntityStoreException
-               {
-                  NeoEntityStoreUnitOfWork uow = new NeoEntityStoreUnitOfWork(neo, indexService, valueSerialization, newUnitOfWorkId(), module, System.currentTimeMillis());
-
-                  try
-                  {
-                     Iterable<Relationship> relationships =
-                             neo.getReferenceNode().getRelationships(RelTypes.ENTITY_TYPE_REF, Direction.OUTGOING);
-
-                     for (Relationship entityTypeRel : relationships)
-                     {
-                        Node entityType = entityTypeRel.getEndNode();
-                        for (Relationship entityRel : entityType.getRelationships(RelTypes.IS_OF_TYPE, Direction.INCOMING))
-                        {
-                           Node entityNode = entityRel.getStartNode();
-                           NeoEntityState entityState = new NeoEntityState( valueSerialization, uow, entityNode, EntityStatus.LOADED);
-                           receiver.receive(entityState);
-                        }
-                     }
-                  } finally
-                  {
-                     uow.discard();
-                  }
-               }
-            });
-         }
-      };
-   }
-
-    @Override
-   public StateCommitter applyChanges( EntityStoreUnitOfWork unitofwork, Iterable<EntityState> state )
-   {
-      for (EntityState firstState : state)
-      {
-         if (firstState instanceof NeoEntityState)
-         {
-            return ((NeoEntityState) firstState).unitOfWork().applyChanges();
-         }
-      }
-      return null;
-   }
-
-    @Override
-   public EntityState entityStateOf( EntityStoreUnitOfWork unitOfWork, EntityReference identity )
-   {
-      return unitOfWork.entityStateOf( identity );
-   }
-
-    @Override
-   public EntityState newEntityState( EntityStoreUnitOfWork uow, EntityReference ref, EntityDescriptor descriptor )
-   {
-      return uow.newEntityState(ref, descriptor);
-   }
-
-   private String newUnitOfWorkId()
-   {
-      return uuid + Integer.toHexString(count.incrementAndGet());
-   }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreService.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreService.java b/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreService.java
deleted file mode 100644
index 592ddec..0000000
--- a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.qi4j.entitystore.neo4j;
-
-import org.qi4j.api.mixin.Mixins;
-import org.qi4j.api.service.ServiceActivation;
-import org.qi4j.api.service.ServiceComposite;
-import org.qi4j.spi.entitystore.EntityStateVersions;
-import org.qi4j.spi.entitystore.EntityStore;
-
-@Mixins( NeoEntityStoreMixin.class )
-public interface NeoEntityStoreService
-    extends EntityStore, ServiceComposite, EntityStateVersions, ServiceActivation
-{
-}

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreUnitOfWork.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreUnitOfWork.java b/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreUnitOfWork.java
deleted file mode 100644
index b372355..0000000
--- a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoEntityStoreUnitOfWork.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package org.qi4j.entitystore.neo4j;
-
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import org.neo4j.graphdb.Node;
-import org.neo4j.index.IndexService;
-import org.neo4j.kernel.EmbeddedGraphDatabase;
-import org.qi4j.api.entity.EntityDescriptor;
-import org.qi4j.api.entity.EntityReference;
-import org.qi4j.api.structure.Module;
-import org.qi4j.api.value.ValueSerialization;
-import org.qi4j.spi.entity.EntityState;
-import org.qi4j.spi.entity.EntityStatus;
-import org.qi4j.spi.entitystore.*;
-
-import static org.qi4j.functional.Iterables.first;
-
-public class NeoEntityStoreUnitOfWork
-    implements EntityStoreUnitOfWork,
-               StateCommitter
-{
-    static final String ENTITY_STATE_ID = "entity_state_id";
-    static final String ENTITY_TYPE = "entity_type";
-
-    private final EmbeddedGraphDatabase neo;
-    private final IndexService indexService;
-    private final ValueSerialization valueSerialization;
-    private long currentTime;
-    private final TransactionManager tm;
-
-    private final Transaction transaction;
-    private final String identity;
-    private final Module module;
-
-    NeoEntityStoreUnitOfWork( EmbeddedGraphDatabase neo, IndexService indexService, ValueSerialization valueSerialization,
-                              String identity, Module module,
-                              long currentTime )
-    {
-        this.neo = neo;
-        this.indexService = indexService;
-        this.valueSerialization = valueSerialization;
-        this.currentTime = currentTime;
-        this.tm = this.neo.getConfig().getTxModule().getTxManager();
-        this.transaction = beginTransaction();
-        this.identity = identity;
-        this.module = module;
-    }
-
-    @Override
-    public StateCommitter applyChanges()
-        throws EntityStoreException
-    {
-        return this;
-    }
-
-    @Override
-    public long currentTime()
-    {
-        return currentTime;
-    }
-
-    @Override
-    public void discard()
-    {
-        cancel();
-    }
-
-    Node getEntityStateNode( EntityReference anIdentity )
-    {
-        Node node = indexService.getSingleNode( ENTITY_STATE_ID,
-                                                anIdentity.identity() );
-        if( node == null )
-        {
-            throw new EntityNotFoundException( anIdentity );
-        }
-        return node;
-    }
-
-    @Override
-    public EntityState entityStateOf( EntityReference anIdentity )
-        throws EntityStoreException, EntityNotFoundException
-    {
-        return new NeoEntityState( valueSerialization, this, getEntityStateNode( anIdentity ),
-                                   EntityStatus.LOADED );
-    }
-
-    @Override
-    public EntityState newEntityState( EntityReference anIdentity,
-                                       EntityDescriptor entityDescriptor
-    )
-        throws EntityStoreException
-    {
-        String type = first(entityDescriptor.types()).getName();
-        Node typeNode = indexService.getSingleNode( ENTITY_TYPE, type );
-        if( typeNode == null )
-        {
-            typeNode = createEntityType( type );
-        }
-        Node node = indexService.getSingleNode( ENTITY_STATE_ID,
-                                                anIdentity.identity() );
-        if( node != null )
-        {
-            throw new EntityAlreadyExistsException( anIdentity );
-        }
-        node = neo.createNode();
-        node.setProperty( NeoEntityState.VERSION, 0l );
-        node.setProperty( NeoEntityState.MODIFIED, currentTime );
-        node.createRelationshipTo( typeNode, RelTypes.IS_OF_TYPE );
-        node.setProperty( NeoEntityState.ENTITY_ID, anIdentity.identity() );
-        indexService.index( node, ENTITY_STATE_ID, anIdentity.identity() );
-        return new NeoEntityState( valueSerialization, this, node, EntityStatus.NEW );
-    }
-
-    @Override
-    public void cancel()
-    {
-        try
-        {
-            tm.rollback();
-        }
-        catch( Exception e )
-        {
-            throw new EntityStoreException(
-                "Failed to rollback transaction.", e );
-        }
-    }
-
-    @Override
-    public void commit()
-    {
-        try
-        {
-            tm.commit();
-        }
-        catch( Exception e )
-        {
-            throw new EntityStoreException(
-                "Failed to commit transaction.", e );
-        }
-    }
-
-    private Transaction beginTransaction()
-    {
-        try
-        {
-            tm.begin();
-            return tm.getTransaction();
-        }
-        catch( Exception e )
-        {
-            throw new EntityStoreException( "Failed to begin transaction.", e );
-        }
-    }
-
-    void suspend()
-    {
-        try
-        {
-            Transaction txRunning = tm.getTransaction();
-            if( txRunning != null && txRunning == transaction )
-            {
-                tm.suspend();
-            }
-        }
-        catch( Exception e )
-        {
-            throw new EntityStoreException( "Failed to suspend " +
-                                            transaction, e );
-        }
-    }
-
-    void resume()
-    {
-        try
-        {
-            tm.resume( transaction );
-        }
-        catch( Exception e )
-        {
-            throw new EntityStoreException( "Failed to resume " +
-                                            transaction, e );
-        }
-    }
-
-    EmbeddedGraphDatabase getNeo()
-    {
-        return neo;
-    }
-
-    IndexService getIndexService()
-    {
-        return indexService;
-    }
-
-    @Override
-    public String identity()
-    {
-        return identity;
-    }
-
-    private Node createEntityType( String type )
-    {
-        Node typeNode = neo.createNode();
-        neo.getReferenceNode().createRelationshipTo( typeNode,
-                                                     RelTypes.ENTITY_TYPE_REF );
-        typeNode.setProperty( ENTITY_TYPE, type );
-        indexService.index( typeNode, ENTITY_TYPE, type );
-        return typeNode;
-    }
-
-    EntityDescriptor getEntityDescriptor( String type )
-    {
-        return ( (Module) module ).entityDescriptor( type );
-    }
-
-    Module getModule()
-    {
-        return module;
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoManyAssociationState.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoManyAssociationState.java b/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoManyAssociationState.java
deleted file mode 100644
index 9457aca..0000000
--- a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoManyAssociationState.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.qi4j.entitystore.neo4j;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.neo4j.graphdb.Direction;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Relationship;
-import org.qi4j.api.entity.EntityReference;
-import org.qi4j.spi.entity.ManyAssociationState;
-
-public class NeoManyAssociationState
-    implements ManyAssociationState
-{
-    private static final String INDEX = "index";
-    static final String COUNT = "count";
-
-    private final Node underlyingNode;
-    private final NeoEntityState entity;
-    private final NeoEntityStoreUnitOfWork uow;
-
-    NeoManyAssociationState( NeoEntityStoreUnitOfWork uow,
-                             NeoEntityState entity, Node node
-    )
-    {
-        this.uow = uow;
-        this.entity = entity;
-        this.underlyingNode = node;
-    }
-
-    @Override
-    public boolean add( int index, EntityReference entityReference )
-    {
-        if( index < 0 || index > count() )
-        {
-            throw new IllegalArgumentException( "Illegal index: " + index );
-        }
-        Node entityNode = uow.getEntityStateNode( entityReference );
-        for( Relationship rel : underlyingNode.getRelationships(
-            RelTypes.MANY_ASSOCIATION, Direction.OUTGOING ) )
-        {
-            int relIndex = getRelationshipIndex( rel );
-            if( relIndex >= index )
-            {
-                setRelationshipIndex( rel, relIndex + 1 );
-            }
-            if( rel.getEndNode().equals( entityNode ) )
-            {
-                return false;
-            }
-        }
-        Relationship rel = underlyingNode.createRelationshipTo( entityNode,
-                                                                RelTypes.MANY_ASSOCIATION );
-        setRelationshipIndex( rel, index );
-        incrementCount();
-        entity.setUpdated();
-        return true;
-    }
-
-    private int getRelationshipIndex( Relationship rel )
-    {
-        return (Integer) rel.getProperty( INDEX );
-    }
-
-    private void setRelationshipIndex( Relationship rel, int newIndex )
-    {
-        rel.setProperty( INDEX, newIndex );
-    }
-
-    private void incrementCount()
-    {
-        int count = (Integer) underlyingNode.getProperty( "count" );
-        underlyingNode.setProperty( COUNT, count + 1 );
-    }
-
-    private void decrementCount()
-    {
-        int count = (Integer) underlyingNode.getProperty( "count" );
-        underlyingNode.setProperty( COUNT, --count );
-    }
-
-    @Override
-    public boolean contains( EntityReference entityReference )
-    {
-        Node entityNode = uow.getEntityStateNode( entityReference );
-        for( Relationship rel : underlyingNode.getRelationships(
-            RelTypes.MANY_ASSOCIATION, Direction.OUTGOING ) )
-        {
-            if( rel.getEndNode().equals( entityNode ) )
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public int count()
-    {
-        return (Integer) underlyingNode.getProperty( COUNT );
-    }
-
-    @Override
-    public EntityReference get( int index )
-    {
-        if( index < 0 || index > count() )
-        {
-            throw new IllegalArgumentException( "Illegal index: " + index );
-        }
-        for( Relationship rel : underlyingNode.getRelationships(
-            RelTypes.MANY_ASSOCIATION, Direction.OUTGOING ) )
-        {
-            int relIndex = getRelationshipIndex( rel );
-            if( relIndex == index )
-            {
-                String id = (String) rel.getEndNode().getProperty(
-                    NeoEntityState.ENTITY_ID );
-                return new EntityReference( id );
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public boolean remove( EntityReference entityReference )
-    {
-        Node entityNode = uow.getEntityStateNode( entityReference );
-        int indexDeleted = -1;
-        for( Relationship rel : entityNode.getRelationships(
-            RelTypes.MANY_ASSOCIATION, Direction.INCOMING ) )
-        {
-            if( rel.getStartNode().equals( underlyingNode ) )
-            {
-                indexDeleted = getRelationshipIndex( rel );
-                rel.delete();
-                break;
-            }
-        }
-        if( indexDeleted == -1 )
-        {
-            return false;
-        }
-        for( Relationship rel : underlyingNode.getRelationships(
-            RelTypes.MANY_ASSOCIATION, Direction.OUTGOING ) )
-        {
-            int relIndex = getRelationshipIndex( rel );
-            if( relIndex > indexDeleted )
-            {
-                setRelationshipIndex( rel, relIndex - 1 );
-            }
-        }
-        decrementCount();
-        entity.setUpdated();
-        return true;
-    }
-
-    @Override
-    public Iterator<EntityReference> iterator()
-    {
-        List<EntityReference> list = new ArrayList<EntityReference>( count() );
-        for( Relationship rel : underlyingNode.getRelationships(
-            RelTypes.MANY_ASSOCIATION, Direction.OUTGOING ) )
-        {
-            String id = (String) rel.getEndNode().getProperty(
-                NeoEntityState.ENTITY_ID );
-            list.add( new EntityReference( id ) );
-        }
-        return list.iterator();
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoNamedAssociationState.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoNamedAssociationState.java b/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoNamedAssociationState.java
deleted file mode 100644
index bc74cc7..0000000
--- a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/NeoNamedAssociationState.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.qi4j.entitystore.neo4j;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.neo4j.graphdb.Direction;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Relationship;
-import org.qi4j.api.entity.EntityReference;
-import org.qi4j.spi.entity.NamedAssociationState;
-
-public class NeoNamedAssociationState
-    implements NamedAssociationState
-{
-    private static final String NAME = "name";
-    static final String COUNT = "count";
-
-    private final Node underlyingNode;
-    private final NeoEntityState entity;
-    private final NeoEntityStoreUnitOfWork uow;
-
-    NeoNamedAssociationState( NeoEntityStoreUnitOfWork uow,
-                              NeoEntityState entity, Node node
-    )
-    {
-        this.uow = uow;
-        this.entity = entity;
-        this.underlyingNode = node;
-    }
-
-    @Override
-    public boolean put( String name, EntityReference entityReference )
-    {
-        Node entityNode = uow.getEntityStateNode( entityReference );
-        for( Relationship rel : underlyingNode.getRelationships( RelTypes.NAMED_ASSOCIATION, Direction.OUTGOING ) )
-        {
-            String relName = getRelationshipName( rel );
-            if( relName.equals( name ) )
-            {
-                if( rel.getEndNode().equals( entityNode ) )
-                {
-                    return false;
-                }
-                rel.delete();
-                decrementCount();
-                break;
-            }
-        }
-        Relationship rel = underlyingNode.createRelationshipTo( entityNode, RelTypes.NAMED_ASSOCIATION );
-        setRelationshipName( rel, name );
-        incrementCount();
-        entity.setUpdated();
-        return true;
-    }
-
-    private String getRelationshipName( Relationship rel )
-    {
-        return (String) rel.getProperty( NAME );
-    }
-
-    private void setRelationshipName( Relationship rel, String newName )
-    {
-        rel.setProperty( NAME, newName );
-    }
-
-    private void incrementCount()
-    {
-        int count = (Integer) underlyingNode.getProperty( "count" );
-        underlyingNode.setProperty( COUNT, count + 1 );
-    }
-
-    private void decrementCount()
-    {
-        int count = (Integer) underlyingNode.getProperty( "count" );
-        underlyingNode.setProperty( COUNT, --count );
-    }
-
-    @Override
-    public boolean containsName( String name )
-    {
-        for( Relationship rel : underlyingNode.getRelationships( RelTypes.NAMED_ASSOCIATION, Direction.OUTGOING ) )
-        {
-            if( getRelationshipName( rel ).equals( name ) )
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public int count()
-    {
-        return (Integer) underlyingNode.getProperty( COUNT );
-    }
-
-    @Override
-    public EntityReference get( String name )
-    {
-        for( Relationship rel : underlyingNode.getRelationships( RelTypes.NAMED_ASSOCIATION, Direction.OUTGOING ) )
-        {
-            if( getRelationshipName( rel ).equals( name ) )
-            {
-                String id = (String) rel.getEndNode().getProperty( NeoEntityState.ENTITY_ID );
-                return new EntityReference( id );
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public boolean remove( String name )
-    {
-        for( Relationship rel : underlyingNode.getRelationships( RelTypes.NAMED_ASSOCIATION, Direction.OUTGOING ) )
-        {
-            if( getRelationshipName( rel ).equals( name ) )
-            {
-                rel.delete();
-                decrementCount();
-                entity.setUpdated();
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public Iterator<String> iterator()
-    {
-        List<String> list = new ArrayList<>();
-        for( Relationship rel : underlyingNode.getRelationships( RelTypes.NAMED_ASSOCIATION, Direction.OUTGOING ) )
-        {
-            list.add( getRelationshipName( rel ) );
-        }
-        return list.iterator();
-    }
-
-    @Override
-    public String nameOf( EntityReference entityReference )
-    {
-        Node entityNode = uow.getEntityStateNode( entityReference );
-        for( Relationship rel : underlyingNode.getRelationships( RelTypes.NAMED_ASSOCIATION, Direction.OUTGOING ) )
-        {
-            if( rel.getEndNode().equals( entityNode ) )
-            {
-                return getRelationshipName( rel );
-            }
-        }
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/RelTypes.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/RelTypes.java b/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/RelTypes.java
deleted file mode 100644
index cd3aae7..0000000
--- a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/RelTypes.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.qi4j.entitystore.neo4j;
-
-import org.neo4j.graphdb.RelationshipType;
-
-enum RelTypes
-    implements RelationshipType
-{
-    ENTITY_TYPE_REF,
-    IS_OF_TYPE,
-    MANY_ASSOCIATION,
-    NAMED_ASSOCIATION
-}

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/package.html
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/package.html b/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/package.html
deleted file mode 100644
index 7f8ec25..0000000
--- a/extensions/entitystore-neo4j/src/main/java/org/qi4j/entitystore/neo4j/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-    <body>
-        <h2>Neo4j EntityStore.</h2>
-    </body>
-</html>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/entitystore-neo4j/src/test/java/org/qi4j/entitystore/neo4j/test/SimpleNeoStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-neo4j/src/test/java/org/qi4j/entitystore/neo4j/test/SimpleNeoStoreTest.java b/extensions/entitystore-neo4j/src/test/java/org/qi4j/entitystore/neo4j/test/SimpleNeoStoreTest.java
deleted file mode 100644
index 7f0e9f5..0000000
--- a/extensions/entitystore-neo4j/src/test/java/org/qi4j/entitystore/neo4j/test/SimpleNeoStoreTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.qi4j.entitystore.neo4j.test;
-
-import org.qi4j.api.common.Visibility;
-import org.qi4j.bootstrap.AssemblyException;
-import org.qi4j.bootstrap.ModuleAssembly;
-import org.qi4j.entitystore.neo4j.NeoConfiguration;
-import org.qi4j.entitystore.neo4j.NeoEntityStoreService;
-import org.qi4j.library.fileconfig.FileConfigurationService;
-import org.qi4j.test.EntityTestAssembler;
-import org.qi4j.test.entity.AbstractEntityStoreTest;
-import org.qi4j.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
-
-public class SimpleNeoStoreTest
-    extends AbstractEntityStoreTest
-{
-// START SNIPPET: assembly
-    public void assemble( ModuleAssembly module )
-        throws AssemblyException
-    {
-// END SNIPPET: assembly
-        module.layer().application().setName( "SimpleNeoTest" );
-
-        super.assemble( module );
-// START SNIPPET: assembly
-        module.services( FileConfigurationService.class );
-
-        module.services( NeoEntityStoreService.class );
-
-        ModuleAssembly configModule = module.layer().module( "config" );
-        configModule.entities( NeoConfiguration.class ).visibleIn( Visibility.layer );
-        new OrgJsonValueSerializationAssembler().assemble( module );
-// END SNIPPET: assembly
-        new EntityTestAssembler().assemble( configModule );
-    }
-
-    @Override
-    public void givenConcurrentUnitOfWorksWhenUoWCompletesThenCheckConcurrentModification()
-    {
-    }
-}

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/extensions/metrics-yammer/src/main/java/org/qi4j/metrics/yammer/YammerMetricsMixin.java
----------------------------------------------------------------------
diff --git a/extensions/metrics-yammer/src/main/java/org/qi4j/metrics/yammer/YammerMetricsMixin.java b/extensions/metrics-yammer/src/main/java/org/qi4j/metrics/yammer/YammerMetricsMixin.java
index 419cb26..16a8091 100644
--- a/extensions/metrics-yammer/src/main/java/org/qi4j/metrics/yammer/YammerMetricsMixin.java
+++ b/extensions/metrics-yammer/src/main/java/org/qi4j/metrics/yammer/YammerMetricsMixin.java
@@ -137,7 +137,7 @@ public class YammerMetricsMixin extends MetricsProviderAdapter
                         return gauge.value();
                     }
                 } );
-                return new YammerGauge<T>( yammer );
+                return new YammerGauge<>( yammer );
             }
 
             @Override

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/libraries/lang-beanshell/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/dev-status.xml b/libraries/lang-beanshell/dev-status.xml
index 654d3aa..cefc98a 100644
--- a/libraries/lang-beanshell/dev-status.xml
+++ b/libraries/lang-beanshell/dev-status.xml
@@ -8,7 +8,7 @@
     <codebase>beta</codebase>
 
     <!-- none, brief, good, complete -->
-    <documentation>none</documentation>
+    <documentation>brief</documentation>
 
     <!-- none, some, good, complete -->
     <unittests>some</unittests>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectArrivedCargo.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectArrivedCargo.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectArrivedCargo.java
index 563d637..ba90b17 100644
--- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectArrivedCargo.java
+++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectArrivedCargo.java
@@ -42,7 +42,7 @@ import static org.qi4j.sample.dcicargo.sample_b.data.structure.handling.Handling
 /**
  * Inspect Arrived Cargo (subfunction use case)
  *
- * This is one the variations of the {@link com.marcgrue.dcisample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
+ * This is one the variations of the {@link org.qi4j.sample.dcicargo.sample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
  */
 public class InspectArrivedCargo extends Context
 {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectCargoInCustoms.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectCargoInCustoms.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectCargoInCustoms.java
index 8b67067..1bbfb78 100644
--- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectCargoInCustoms.java
+++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectCargoInCustoms.java
@@ -41,7 +41,7 @@ import static org.qi4j.sample.dcicargo.sample_b.data.structure.handling.Handling
 /**
  * Inspect Cargo In Customs (subfunction use case)
  *
- * This is one the variations of the {@link com.marcgrue.dcisample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
+ * This is one the variations of the {@link org.qi4j.sample.dcicargo.sample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
  *
  * Can the cargo get handled by customs only in the current port location?! Nothing now prevents
  * an unexpected cargo in customs in some random location. A domain expert is needed to explain

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectClaimedCargo.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectClaimedCargo.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectClaimedCargo.java
index 110a441..f009140 100644
--- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectClaimedCargo.java
+++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectClaimedCargo.java
@@ -39,7 +39,7 @@ import static org.qi4j.sample.dcicargo.sample_b.data.structure.handling.Handling
 /**
  * Inspect Claimed Cargo (subfunction use case)
  *
- * This is one the variations of the {@link com.marcgrue.dcisample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
+ * This is one the variations of the {@link org.qi4j.sample.dcicargo.sample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
  *
  * NOTE: We don't throw any misrouted/misdirected exceptions even though the cargo might not have
  * followed the original itinerary. The cargo has been delivered at destination and claimed by

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectReceivedCargo.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectReceivedCargo.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectReceivedCargo.java
index 3caa509..1914636 100644
--- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectReceivedCargo.java
+++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectReceivedCargo.java
@@ -44,7 +44,7 @@ import static org.qi4j.sample.dcicargo.sample_b.data.structure.handling.Handling
 /**
  * Inspect Received Cargo (subfunction use case)
  *
- * This is one the variations of the {@link com.marcgrue.dcisample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
+ * This is one the variations of the {@link org.qi4j.sample.dcicargo.sample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
  *
  * Note that we consider the cargo still on track if it's received in cargo origin regardless of routing status!
  */

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectUnhandledCargo.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectUnhandledCargo.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectUnhandledCargo.java
index 476586c..ff667c1 100644
--- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectUnhandledCargo.java
+++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectUnhandledCargo.java
@@ -39,7 +39,7 @@ import static org.qi4j.sample.dcicargo.sample_b.data.structure.handling.Handling
 /**
  * Inspect Unhandled Cargo (subfunction use case)
  *
- * This is one the variations of the {@link com.marcgrue.dcisample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
+ * This is one the variations of the {@link org.qi4j.sample.dcicargo.sample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
  *
  * Here we can check a cargo that hasn't been received in origin yet.
  */

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectUnloadedCargo.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectUnloadedCargo.java b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectUnloadedCargo.java
index fe64e12..6893c59 100644
--- a/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectUnloadedCargo.java
+++ b/samples/dci-cargo/dcisample_b/src/main/java/org/qi4j/sample/dcicargo/sample_b/context/interaction/handling/inspection/event/InspectUnloadedCargo.java
@@ -46,7 +46,7 @@ import static org.qi4j.sample.dcicargo.sample_b.data.structure.handling.Handling
 /**
  * Inspect Unloaded Cargo (subfunction use case)
  *
- * This is one the variations of the {@link com.marcgrue.dcisample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
+ * This is one the variations of the {@link org.qi4j.sample.dcicargo.sample_b.context.interaction.handling.inspection.InspectCargoDeliveryStatus} use case.
  */
 public class InspectUnloadedCargo extends Context
 {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/70f25289/samples/forum/build.gradle
----------------------------------------------------------------------
diff --git a/samples/forum/build.gradle b/samples/forum/build.gradle
index a136e30..0e4a0e5 100644
--- a/samples/forum/build.gradle
+++ b/samples/forum/build.gradle
@@ -7,7 +7,7 @@ dependencies {
   compile project( ":org.qi4j.core:org.qi4j.core.bootstrap" )
   compile project( ":org.qi4j.libraries:org.qi4j.library.rest-server" )
   compile project( ":org.qi4j.libraries:org.qi4j.library.fileconfig" )
-  compile project( ":org.qi4j.extensions:org.qi4j.extension.entitystore-neo4j" )
+  compile project( ":org.qi4j.extensions:org.qi4j.extension.entitystore-file" )
   compile project( ":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson" )
   compile libraries.servlet_api