You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2015/04/21 13:50:20 UTC

[08/18] zest-sandbox git commit: Move Qi4j related projects in a `qi4j/` subfolder

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jgroups/licenses/commons-logging.license
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jgroups/licenses/commons-logging.license b/qi4j/extensions/entitystore-jgroups/licenses/commons-logging.license
new file mode 100644
index 0000000..f433b1a
--- /dev/null
+++ b/qi4j/extensions/entitystore-jgroups/licenses/commons-logging.license
@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jgroups/licenses/jgroups.license
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jgroups/licenses/jgroups.license b/qi4j/extensions/entitystore-jgroups/licenses/jgroups.license
new file mode 100644
index 0000000..e80ac68
--- /dev/null
+++ b/qi4j/extensions/entitystore-jgroups/licenses/jgroups.license
@@ -0,0 +1,458 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+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 this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jgroups/osgi.bundle
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jgroups/osgi.bundle b/qi4j/extensions/entitystore-jgroups/osgi.bundle
new file mode 100644
index 0000000..30d169e
--- /dev/null
+++ b/qi4j/extensions/entitystore-jgroups/osgi.bundle
@@ -0,0 +1,59 @@
+Bundle-Activator:
+
+Private-Package:
+
+Ignore-Package: bsh, \
+                com_cenqua_clover, \
+                junit.framework, \
+                junit.textui, \
+                org.jgroups.tests, \
+                org.jgroups.debug, \
+                org.bouncycastle.jce.provider
+
+Import-Package: javax.crypto, \
+                javax.crypto.spec, \
+                javax.jms, \
+                javax.management, \
+                javax.naming, \
+                javax.net, \
+                javax.net.ssl, \
+                javax.xml.parsers, \
+                org.apache.commons.logging, \
+                org.jgroups, \
+                org.jgroups.blocks, \
+                org.qi4j.api, \
+                org.qi4j.api.composite, \
+                org.qi4j.api.concern, \
+                org.qi4j.api.entity, \
+                org.qi4j.api.injection.scope, \
+                org.qi4j.api.io, \
+                org.qi4j.api.mixin, \
+                org.qi4j.api.service, \
+                org.qi4j.api.structure,\
+                org.qi4j.entitystore.map, \
+                org.qi4j.library.locking, \
+                org.qi4j.spi.composite, \
+                org.qi4j.spi.entity, \
+                org.qi4j.spi.entity.helpers, \
+                org.qi4j.spi.entitystore, \
+                org.qi4j.spi.serialization, \
+                org.qi4j.spi.service, \
+                org.w3c.dom
+
+Export-Package: org.qi4j.entitystore.jgroups, \
+                org.jgroups, \
+                org.jgroups.blocks, \
+                org.jgroups.conf, \
+                org.jgroups.jmx, \
+                org.jgroups.mux, \
+                org.jgroups.persistence, \
+                org.jgroups.stack, \
+                org.jgroups.util, \
+                org.jgroups.auth, \
+                org.jgroups.protocols, \
+                org.jgroups.protocols.pbcast
+
+Embed-Dependency: org.jgroups;scope=compile|runtime, \
+                  org.jgroups.*;scope=compile|runtime
+
+Embed-Transitive:  true

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jgroups/pom.xml
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jgroups/pom.xml b/qi4j/extensions/entitystore-jgroups/pom.xml
new file mode 100644
index 0000000..8e4c22a
--- /dev/null
+++ b/qi4j/extensions/entitystore-jgroups/pom.xml
@@ -0,0 +1,61 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.qi4j.sandbox</groupId>
+      <artifactId>qi4j-sandbox-extensions</artifactId>
+      <version>0-SNAPSHOT</version>
+   </parent>
+  <groupId>org.qi4j.extension</groupId>
+  <artifactId>qi4j-entitystore-jgroups</artifactId>
+  <name>Qi4j Extension - EntityStore - JGroups</name>
+  <packaging>jar</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>-Djava.net.preferIPv4Stack=true</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.qi4j.core</groupId>
+      <artifactId>org.qi4j.core.spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.qi4j.core</groupId>
+      <artifactId>org.qi4j.core.testsupport</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.qi4j.core</groupId>
+      <artifactId>org.qi4j.core.runtime</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.qi4j.library</groupId>
+      <artifactId>org.qi4j.library.locking</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jgroups</groupId>
+      <artifactId>jgroups</artifactId>
+      <version>2.6.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</version>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>jboss-repository</id>
+      <url>http://repository.jboss.org/maven2</url>
+    </repository>
+  </repositories>
+</project>

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jgroups/src/main/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jgroups/src/main/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreMixin.java b/qi4j/extensions/entitystore-jgroups/src/main/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreMixin.java
new file mode 100644
index 0000000..6997f0d
--- /dev/null
+++ b/qi4j/extensions/entitystore-jgroups/src/main/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreMixin.java
@@ -0,0 +1,148 @@
+/*  Copyright 2008 Rickard Öberg.
+ *
+ * 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.jgroups;
+
+import org.jgroups.JChannel;
+import org.jgroups.blocks.ReplicatedHashMap;
+import org.qi4j.api.entity.EntityReference;
+import org.qi4j.io.Input;
+import org.qi4j.io.Output;
+import org.qi4j.io.Receiver;
+import org.qi4j.io.Sender;
+import org.qi4j.spi.entitystore.EntityNotFoundException;
+import org.qi4j.spi.entitystore.EntityStoreException;
+
+import java.io.*;
+import org.qi4j.api.entity.EntityDescriptor;
+import org.qi4j.api.service.ServiceActivation;
+import org.qi4j.spi.entitystore.helpers.MapEntityStore;
+
+/**
+ * JGroups implementation of EntityStore
+ */
+public class JGroupsEntityStoreMixin
+        implements ServiceActivation, MapEntityStore
+{
+    private JChannel channel;
+    private ReplicatedHashMap<String, String> replicatedMap;
+
+    public void activateService() throws Exception
+    {
+        channel = new JChannel();
+        channel.connect( "entitystore" );
+        replicatedMap = new ReplicatedHashMap<String, String>( channel, false );
+        replicatedMap.setBlockingUpdates( true );
+    }
+
+    public void passivateService() throws Exception
+    {
+        channel.close();
+    }
+
+    public Reader get( EntityReference entityReference )
+            throws EntityStoreException
+    {
+        try
+        {
+            String data = replicatedMap.get( entityReference.identity() );
+            if (data == null)
+            {
+                throw new EntityNotFoundException( entityReference );
+            }
+            return new StringReader( data );
+        }
+        catch (RuntimeException e)
+        {
+            throw new EntityStoreException( e );
+        }
+    }
+
+    public Input<Reader, IOException> entityStates()
+    {
+        return new Input<Reader, IOException>()
+        {
+            public <ReceiverThrowableType extends Throwable> void transferTo( Output<? super Reader, ReceiverThrowableType> output )
+                throws IOException, ReceiverThrowableType
+            {
+                output.receiveFrom(
+                    new Sender<Reader, IOException>()
+                    {
+                        public <ReceiverThrowableType extends Throwable> void sendTo( Receiver<? super Reader, ReceiverThrowableType> receiver )
+                        throws ReceiverThrowableType, IOException
+                        {
+                            for( String json : replicatedMap.values() )
+                            {
+                                receiver.receive( new StringReader( json ) );
+                            }
+                        }
+                    }
+                );
+            }
+        };
+    }
+
+    public void applyChanges( MapChanges changes ) throws IOException
+    {
+        try
+        {
+            changes.visitMap( new MapChanger()
+            {
+                public Writer newEntity( final EntityReference ref, EntityDescriptor entityDescriptor ) throws IOException
+                {
+                    return new StringWriter( 1000 )
+                    {
+                        @Override
+                        public void close() throws IOException
+                        {
+                            super.close();
+                            String value = toString();
+                            String key = ref.identity();
+                            replicatedMap.put( key, value );
+                        }
+                    };
+                }
+
+                public Writer updateEntity( final EntityReference ref, EntityDescriptor entityDescriptor ) throws IOException
+                {
+                    return new StringWriter( 1000 )
+                    {
+                        @Override
+                        public void close() throws IOException
+                        {
+                            super.close();
+                            String value = toString();
+                            String key = ref.identity();
+                            replicatedMap.put( key, value );
+                        }
+                    };
+                }
+
+                public void removeEntity( EntityReference ref, EntityDescriptor entityDescriptor ) throws EntityNotFoundException
+                {
+                    replicatedMap.remove( ref.identity() );
+                }
+            } );
+        }
+        catch (RuntimeException e)
+        {
+            IOException exception = new IOException();
+            exception.initCause( e );
+            throw exception;
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jgroups/src/main/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreService.java
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jgroups/src/main/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreService.java b/qi4j/extensions/entitystore-jgroups/src/main/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreService.java
new file mode 100644
index 0000000..bf82584
--- /dev/null
+++ b/qi4j/extensions/entitystore-jgroups/src/main/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreService.java
@@ -0,0 +1,39 @@
+/*  Copyright 2008 Rickard Öberg.
+ *
+ * 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.jgroups;
+
+import org.qi4j.api.concern.Concerns;
+import org.qi4j.api.mixin.Mixins;
+import org.qi4j.api.service.ServiceActivation;
+import org.qi4j.library.locking.LockingAbstractComposite;
+import org.qi4j.spi.entitystore.ConcurrentModificationCheckConcern;
+import org.qi4j.spi.entitystore.EntityStore;
+import org.qi4j.spi.entitystore.StateChangeNotificationConcern;
+import org.qi4j.spi.entitystore.helpers.MapEntityStoreMixin;
+
+/**
+ * EntityStore service backed by JGroups store.
+ */
+
+@Concerns({ StateChangeNotificationConcern.class, ConcurrentModificationCheckConcern.class})
+@Mixins({ MapEntityStoreMixin.class, JGroupsEntityStoreMixin.class})
+public interface JGroupsEntityStoreService
+    extends EntityStore, ServiceActivation, LockingAbstractComposite
+
+{
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jgroups/src/test/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jgroups/src/test/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreTest.java b/qi4j/extensions/entitystore-jgroups/src/test/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreTest.java
new file mode 100644
index 0000000..d4f3423
--- /dev/null
+++ b/qi4j/extensions/entitystore-jgroups/src/test/java/org/qi4j/entitystore/jgroups/JGroupsEntityStoreTest.java
@@ -0,0 +1,252 @@
+/*  Copyright 2008 Rickard Öberg.
+ *
+ * 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.jgroups;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+import org.junit.Ignore;
+import org.qi4j.api.common.Optional;
+import org.qi4j.api.entity.EntityBuilder;
+import org.qi4j.api.entity.EntityComposite;
+import org.qi4j.api.association.Association;
+import org.qi4j.api.association.ManyAssociation;
+import org.qi4j.api.property.Immutable;
+import org.qi4j.api.property.Property;
+import org.qi4j.api.unitofwork.NoSuchEntityException;
+import org.qi4j.api.unitofwork.UnitOfWork;
+import org.qi4j.api.unitofwork.UnitOfWorkCompletionException;
+import org.qi4j.api.value.ValueBuilder;
+import org.qi4j.api.value.ValueComposite;
+import org.qi4j.api.value.ValueSerialization;
+import org.qi4j.bootstrap.AssemblyException;
+import org.qi4j.bootstrap.ModuleAssembly;
+import org.qi4j.bootstrap.SingletonAssembler;
+import org.qi4j.spi.uuid.UuidIdentityGeneratorService;
+import org.qi4j.test.AbstractQi4jTest;
+import org.qi4j.valueserialization.orgjson.OrgJsonValueSerializationService;
+
+/**
+ * Test of JGroups EntityStore backend.
+ */
+public class JGroupsEntityStoreTest
+    extends AbstractQi4jTest
+{
+    public void assemble( ModuleAssembly module ) throws AssemblyException
+    {
+        module.services( UuidIdentityGeneratorService.class );
+        module.services( OrgJsonValueSerializationService.class ).taggedWith( ValueSerialization.Formats.JSON );
+        module.entities( TestEntity.class );
+        module.values( TestValue.class );
+        module.services( JGroupsEntityStoreService.class );
+    }
+
+    @Test
+    @Ignore
+    public void whenNewEntityThenFindInReplica()
+        throws Exception
+    {
+        // Create first app
+        SingletonAssembler app1 = new SingletonAssembler()
+        {
+            public void assemble( ModuleAssembly module ) throws AssemblyException
+            {
+                module.services( OrgJsonValueSerializationService.class ).taggedWith( ValueSerialization.Formats.JSON );
+                module.services( JGroupsEntityStoreService.class, UuidIdentityGeneratorService.class ).instantiateOnStartup();
+                module.entities( TestEntity.class );
+            }
+        };
+
+        // Create second app
+        SingletonAssembler app2 = new SingletonAssembler()
+        {
+            public void assemble( ModuleAssembly module ) throws AssemblyException
+            {
+                module.services( OrgJsonValueSerializationService.class ).taggedWith( ValueSerialization.Formats.JSON );
+                module.services( JGroupsEntityStoreService.class, UuidIdentityGeneratorService.class ).instantiateOnStartup();
+                module.entities( TestEntity.class );
+            }
+        };
+
+        // Create entity in app 1
+        System.out.println( "Create entity" );
+        UnitOfWork app1Unit = app1.module().newUnitOfWork();
+        EntityBuilder<TestEntity> builder = app1Unit.newEntityBuilder( TestEntity.class );
+        TestEntity instance = builder.instance();
+        instance.name().set( "Foo" );
+        instance = builder.newInstance();
+        app1Unit.complete();
+
+//        Thread.sleep( 5000 );
+
+        // Find entity in app 2
+        System.out.println( "Find entity" );
+        UnitOfWork app2Unit = app2.module().newUnitOfWork();
+        instance = app2Unit.get( instance );
+
+        System.out.println( instance.name() );
+        app2Unit.discard();
+
+    }
+
+    @Test
+    @Ignore
+    public void whenNewEntityThenCanFindEntity()
+        throws Exception
+    {
+        try
+        {
+            UnitOfWork unitOfWork = module.newUnitOfWork();
+            try
+            {
+                TestEntity instance = createEntity( unitOfWork );
+                unitOfWork.complete();
+
+                // Find entity
+                unitOfWork = module.newUnitOfWork();
+                instance = unitOfWork.get( instance );
+
+                // Check state
+                assertThat( "property has correct value", instance.name().get(), equalTo( "Test" ) );
+                assertThat( "property has correct value", instance.unsetName().get(), equalTo( null ) );
+                assertThat( "association has correct value", instance.association().get(), equalTo( instance ) );
+                assertThat( "manyAssociation has correct value", instance.manyAssociation().iterator().next(), equalTo( instance ) );
+                unitOfWork.discard();
+            }
+            catch( UnitOfWorkCompletionException e )
+            {
+                unitOfWork.discard();
+                throw e;
+            }
+            catch( NoSuchEntityException e )
+            {
+                unitOfWork.discard();
+                throw e;
+            }
+            catch( RuntimeException e )
+            {
+                unitOfWork.discard();
+                throw e;
+            }
+
+        }
+        catch( Exception e )
+        {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    @Ignore
+    public void whenRemovedEntityThenCannotFindEntity()
+        throws Exception
+    {
+        UnitOfWork unitOfWork = module.newUnitOfWork();
+        try
+        {
+            TestEntity newInstance = createEntity( unitOfWork );
+            String identity = newInstance.identity().get();
+            unitOfWork.complete();
+
+            // Remove entity
+            unitOfWork = module.newUnitOfWork();
+            TestEntity instance = unitOfWork.get( newInstance );
+            unitOfWork.remove( instance );
+            unitOfWork.complete();
+
+            // Find entity
+            unitOfWork = module.newUnitOfWork();
+            try
+            {
+                instance = unitOfWork.get( TestEntity.class, identity );
+                fail( "Should not be able to find entity" );
+            }
+            catch( NoSuchEntityException e )
+            {
+                // Ok!
+            }
+            unitOfWork.discard();
+        }
+        catch( UnitOfWorkCompletionException e )
+        {
+            unitOfWork.discard();
+            throw e;
+        }
+        catch( NoSuchEntityException e )
+        {
+            unitOfWork.discard();
+            throw e;
+        }
+        catch( RuntimeException e )
+        {
+            unitOfWork.discard();
+            throw e;
+        }
+    }
+
+    protected TestEntity createEntity( UnitOfWork unitOfWork )
+        throws UnitOfWorkCompletionException
+    {
+        // Create entity
+        EntityBuilder<TestEntity> builder = unitOfWork.newEntityBuilder( TestEntity.class );
+        TestEntity instance = builder.newInstance();
+        String id = instance.identity().get();
+
+        instance.name().set( "Test" );
+        instance.association().set( instance );
+
+        ValueBuilder<TestValue> valueBuilder = module.newValueBuilder( TestValue.class );
+        TestValue state = valueBuilder.prototype();
+        state.someValue().set( "Foo" );
+        state.otherValue().set( 5 );
+
+        TestValue value = valueBuilder.newInstance();
+
+        instance.valueProperty().set( value );
+        instance.manyAssociation().add( instance );
+
+        return instance;
+    }
+
+    public interface TestEntity
+        extends EntityComposite
+    {
+        @Optional Property<String> name();
+
+        @Optional Property<String> unsetName();
+
+        @Optional Property<TestValue> valueProperty();
+
+        @Optional Association<TestEntity> association();
+
+        @Optional Association<TestEntity> unsetAssociation();
+
+        ManyAssociation<TestEntity> manyAssociation();
+    }
+
+    public interface TestValue extends ValueComposite
+    {
+        @Immutable Property<String> someValue();
+
+        @Immutable Property<Integer> otherValue();
+    }
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jndi/.gitignore
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jndi/.gitignore b/qi4j/extensions/entitystore-jndi/.gitignore
new file mode 100644
index 0000000..2f7896d
--- /dev/null
+++ b/qi4j/extensions/entitystore-jndi/.gitignore
@@ -0,0 +1 @@
+target/

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jndi/osgi.bundle
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jndi/osgi.bundle b/qi4j/extensions/entitystore-jndi/osgi.bundle
new file mode 100644
index 0000000..ddb1f77
--- /dev/null
+++ b/qi4j/extensions/entitystore-jndi/osgi.bundle
@@ -0,0 +1,30 @@
+Import-Package:\
+    javax.naming, \
+    javax.naming.directory, \
+    javax.naming.ldap, \
+    org.qi4j.api.common, \
+    org.qi4j.api.concern, \
+    org.qi4j.api.configuration, \
+    org.qi4j.api.entity, \
+    org.qi4j.api.injection.scope, \
+    org.qi4j.api.io, \
+    org.qi4j.api.mixin, \
+    org.qi4j.api.property, \
+    org.qi4j.api.service, \
+    org.qi4j.api.structure, \
+    org.qi4j.api.usecase, \
+    org.qi4j.bootstrap, \
+    org.qi4j.entitystore.memory, \
+    org.qi4j.library.locking, \
+    org.qi4j.spi.entity, \
+    org.qi4j.spi.entity.association, \
+    org.qi4j.spi.entity.helpers, \
+    org.qi4j.spi.entitystore,  \
+    org.qi4j.spi.property, \
+    org.qi4j.spi.structure, \
+    org.qi4j.spi.unitofwork, \
+    org.qi4j.spi.uuid
+    
+Export-Package:\
+    org.qi4j.entitystore.jndi
+

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jndi/pom.xml
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jndi/pom.xml b/qi4j/extensions/entitystore-jndi/pom.xml
new file mode 100644
index 0000000..c4ce324
--- /dev/null
+++ b/qi4j/extensions/entitystore-jndi/pom.xml
@@ -0,0 +1,50 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.qi4j.sandbox</groupId>
+      <artifactId>qi4j-sandbox-extensions</artifactId>
+      <version>0-SNAPSHOT</version>
+   </parent>
+  <groupId>org.qi4j.extension</groupId>
+  <artifactId>qi4j-entitystore-jndi</artifactId>
+  <name>Qi4j Extension - EntityStore - JNDI</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.qi4j.core</groupId>
+      <artifactId>org.qi4j.core.api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.qi4j.core</groupId>
+      <artifactId>org.qi4j.core.spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.qi4j.core</groupId>
+      <artifactId>org.qi4j.core.bootstrap</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.qi4j.library</groupId>
+      <artifactId>org.qi4j.library.locking</artifactId>
+    </dependency>
+
+    <!-- Tests -->
+    <dependency>
+      <groupId>org.qi4j.core</groupId>
+      <artifactId>org.qi4j.core.testsupport</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.qi4j.core</groupId>
+      <artifactId>org.qi4j.core.runtime</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.qi4j.library</groupId>
+      <artifactId>org.qi4j.library.ldap-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+</project>

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiConfiguration.java
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiConfiguration.java b/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiConfiguration.java
new file mode 100644
index 0000000..e3bd659
--- /dev/null
+++ b/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiConfiguration.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright 2008 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.jndi;
+
+import org.qi4j.api.common.Optional;
+import org.qi4j.api.common.UseDefaults;
+import org.qi4j.api.configuration.ConfigurationComposite;
+import org.qi4j.api.property.Property;
+
+/**
+ * Configuration for the JNDI EntityStore.
+ * <p>
+ * Many of the Property instances are passed on to the <code>javax.naming.InitialContext</code> as is, and the javadoc
+ * below mirrors the meaning found for the constants in the <code>javax.naming.Context</code> interface.
+ * </p>
+ */
+public interface JndiConfiguration extends ConfigurationComposite
+{
+
+    /**
+     * If set to read-only mode, then no creation and no updates of the EntityStore will be allowed.
+     *
+     * @return if true, then don't allow updates of the underlying store. Such operations will throw a
+     *         ReadOnlyEntityStoreException.
+     */
+    @UseDefaults Property<Boolean> readOnly();
+
+    /**
+     * Instance version property.
+     *
+     * If the EntityStore is NOT readonly, each entry must have an attribute to store the instance version. This
+     * Property names that attribute available in all entries.
+     *
+     * If not specified, the atttribute used will be "instanceVersion".
+     *
+     * @return The name of the attribute where to store the instance version number.
+     */
+    @Optional Property<String> versionAttribute();
+
+    /**
+     * Last modified property.
+     * If the EntityStore is NOT readonly, each entry must have an attribute to store the last modified date.
+     * This property names that attributes in all entries.
+     *
+     * If not specified, the attribute used will be "lastModifiedDate".
+     *
+     * @return The name of the attribute where to store the last modified date.
+     */
+    @Optional Property<String> lastModifiedDateAttribute();
+
+    /**
+     * QualifiedType attribute.
+     *
+     * If the EntityStore is going to support the Iterable interface, it must store the qualifiedType in an
+     * attribute in the entry. This is also required for non-readOnly stores.
+     *
+     * @return The name of the attribute where to store the qualifiedType.
+     */
+    @Optional Property<String> qualifiedTypeAttribute();
+
+    /**
+     * Whether Turbo Mode for serialization should be used or not.
+     *
+     * @return Whether turbo mode is enabled or not.
+     */
+    @UseDefaults Property<Boolean> turboMode();
+
+    /**
+     * The Distinguished Name of the base.
+     * All creation and retrieval will occur in this directory.
+     *
+     * @return The property of the DN to the directory of operation.
+     */
+    Property<String> baseDN();
+
+    /**
+     * This will provide the name of the attribute where the binary blob of the properties will be stored.
+     * <p>
+     * If there is no attribute name provided, each property will be stored in its own attribute, of the same
+     * name as the property itself.
+     * </p>
+     * <p>
+     * Note: Associations are always stored in attributes with the same name as the attribute itself. It doesn't
+     * allow for aggregated/collapsing of all into a single attribute as is possible for property data.
+     * </p>
+     *
+     * @return The property containing the attribute name, or empty if property collapsing should not occur.
+     */
+    @Optional Property<String> propertyAttribute();
+
+
+    /**
+     * The attribute to use for storing the identity in an entry.
+     *
+     * <p>
+     * If there is no attribute name provided, then use "uid" as the identity attribute in the entry.
+     * </p>
+     *
+     * @return
+     */
+    @UseDefaults Property<String> identityAttribute();
+
+    /**
+     * Property for specifying the authoritativeness of the service requested.
+     * <p>
+     * If the value of the property is the string "true", it means that the access is to the most authoritative
+     * source (i.e. bypass any cache or replicas). If the value is anything else, the source need not be (but may be)
+     * authoritative. If unspecified, the value defaults to "false".
+     * </p>
+     *
+     * @return The property containing the string "true" or "false", whether the source is authorative or not.
+     */
+    @Optional Property<String> authorative();
+
+    /**
+     * Property for specifying the batch size to use when returning data via the service's protocol.
+     * <p>
+     * This is a hint to the provider to return the results of operations in batches of the specified size, so the
+     * provider can optimize its performance and usage of resources. The value of the property is the string
+     * representation of an integer. If unspecified, the batch size is determined by the service provider.
+     *
+     * @return The property that contains the batch size.
+     */
+    @Optional Property<String> batchSize();
+
+    /**
+     * Property for specifying the list of control factories to use.
+     * <p>
+     * The value of the property should be a colon-separated list of the fully qualified class names of factory
+     * classes that will create a control given another control.
+     * </p>
+     *
+     * @return The property that possibly contains the control factory(ies) class names.
+     */
+    @Optional Property<String> controlFactories();
+
+    /**
+     * Property for specifying the DNS host and domain names to use for the JNDI URL context (for example,
+     * "dns://somehost/wiz.com").
+     *
+     * <p>
+     * This property may be specified in the environment, an applet parameter, a system property, or a resource file.
+     * If it is not specified in any of these sources and the program attempts to use a JNDI URL containing a DNS
+     * name, a ConfigurationException will be thrown.
+     * </p>
+     *
+     * @return
+     */
+    @Optional Property<String> dnsUrl();
+
+    /**
+     * Property for specifying the initial context factory to use.
+     * <p>
+     * The value of the property should be the fully qualified class name of the factory class that will create an
+     * initial context. If it is not specified in any of these sources, NoInitialContextException is thrown when an
+     * initial context is required to complete an operation.
+     * </p>
+     *
+     * @return
+     */
+    @Optional Property<String> initialContextFactory();
+
+    /**
+     * Property for specifying the preferred language to use with the service.
+     *
+     * <p>
+     * The value of the property is a colon-separated list of language tags as defined in RFC 1766. If this property
+     * is unspecified, the language preference is determined by the service provider.
+     * </p>
+     *
+     * @return
+     */
+    @Optional Property<String> language();
+
+    /**
+     * Property for specifying the list of object factories to use.
+     * <p>
+     * The value of the property should be a colon-separated list of the fully qualified class names of factory classes
+     * that will create an object given information about the object.
+     * </p>
+     *
+     * @return
+     */
+    @Optional Property<String> objectFactories();
+
+    /**
+     * The URL string to connect to the LDAP server.
+     *
+     * property for specifying configuration information for the service provider to use. The value of the property
+     * should contain a URL string (e.g. "ldap://somehost:389"). It may also contain connect arguments as query
+     * arguments in the URL.
+     *
+     * @return The connection string to use to connect.
+     */
+    Property<String> providerUrl();
+
+    /**
+     * A property to define how referrals should be dealt with.
+     * <p>
+     * The value of the property is one of the following strings:
+     * <code><pre>
+     * "follow" follow referrals automatically
+     * "ignore" ignore referrals
+     * "throw" throw ReferralException when a referral is encountered.
+     * If this property is not specified, the default is determined by the provider.
+     */
+    @Optional Property<String> referral();
+
+    /**
+     * What type of authentication should be used.
+     * <p>
+     * Its value is one of the following strings: "none", "simple", "strong". If this property is unspecified, the
+     * behaviour is determined by the service provider.
+     * </p>
+     *
+     * @return
+     */
+    @Optional Property<String> securityAuthentication();
+
+    /**
+     * The Principal passworf to log into the LDAP server.
+     *
+     * <p>
+     * The value of the property depends on the authentication scheme. For example, it could be a hashed password,
+     * clear-text password, key, certificate, and so on.
+     * </p>
+     *
+     * @return The password to use to log in.
+     */
+    Property<String> securityCredentials();
+
+    /**
+     * The Principal Name to log into the LDAP server.
+     *
+     * @return The username to use to log in.
+     */
+    Property<String> securityPrincipal();
+
+    /**
+     * The Security protocol, if any, to be used.
+     *
+     * @return The protocol that should be used, or null if defined by the provider.
+     */
+    @Optional Property<String> securityProtocol();
+
+    /**
+     * Property for specifying the list of state factories to use.
+     * <p>
+     * The value of the property should be a colon-separated list of the fully qualified class names of state factory
+     * classes that will be used to get an object's state given the object itself.
+     * </p>
+     *
+     * @return
+     */
+    @Optional Property<String> stateFactories();
+
+    /**
+     * Property for specifying the list of package prefixes to use when loading in URL context factories.
+     * <p>
+     * The value of the property should be a colon-separated list of package prefixes for the class name of the
+     * factory class that will create a URL context factory.
+     * The prefix com.sun.jndi.url is always appended to the possibly empty list of package prefixes.
+     * </p>
+     *
+     * @return
+     */
+    @Optional Property<String> urlPkgPrefixes();
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityState.java
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityState.java b/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityState.java
new file mode 100644
index 0000000..036995e
--- /dev/null
+++ b/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityState.java
@@ -0,0 +1,157 @@
+/*
+ * 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.jndi;
+
+import org.qi4j.api.entity.EntityDescriptor;
+import org.qi4j.spi.entity.EntityState;
+import org.qi4j.spi.entity.EntityStatus;
+import org.qi4j.api.entity.EntityReference;
+import org.qi4j.spi.entity.ManyAssociationState;
+import org.qi4j.api.common.QualifiedName;
+import java.util.Map;
+import java.util.List;
+import java.util.HashMap;
+
+public class JndiEntityState
+    implements EntityState
+{
+    private JndiUow unitOfWork;
+    protected EntityStatus status;
+    protected String version;
+    protected long lastModified;
+    private final EntityReference identity;
+
+    private final EntityDescriptor entityDescriptor;
+    protected final Map<QualifiedName, Object> properties;
+    protected final Map<QualifiedName, EntityReference> associations;
+    protected final Map<QualifiedName, List<EntityReference>> manyAssociations;
+
+    public JndiEntityState( JndiUow unitOfWork, EntityReference identity, EntityDescriptor entityDescriptor)
+    {
+        this( unitOfWork, "",
+              System.currentTimeMillis(),
+              identity,
+              EntityStatus.NEW,
+                entityDescriptor,
+              new HashMap<QualifiedName, Object>(),
+              new HashMap<QualifiedName, EntityReference>(),
+              new HashMap<QualifiedName, List<EntityReference>>() );
+    }
+
+    public JndiEntityState( JndiUow unitOfWork,
+                               String version,
+                               long lastModified,
+                               EntityReference identity,
+                               EntityStatus status,
+                               EntityDescriptor entityDescriptor,
+                               Map<QualifiedName, Object> properties,
+                               Map<QualifiedName, EntityReference> associations,
+                               Map<QualifiedName, List<EntityReference>> manyAssociations )
+    {
+        this.unitOfWork = unitOfWork;
+        this.version = version;
+        this.lastModified = lastModified;
+        this.identity = identity;
+        this.status = status;
+        this.entityDescriptor = entityDescriptor;
+        this.properties = properties;
+        this.associations = associations;
+        this.manyAssociations = manyAssociations;
+    }
+
+
+    public EntityReference identity()
+    {
+        return identity;
+    }
+
+    public String version()
+    {
+        return version;
+    }
+
+    public long lastModified()
+    {
+        return lastModified;
+    }
+
+    public void remove()
+    {
+    }
+
+    public EntityStatus status()
+    {
+        return status;
+    }
+
+    public boolean isAssignableTo( Class<?> type )
+    {
+        return false;
+    }
+
+    public EntityDescriptor entityDescriptor()
+    {
+        return entityDescriptor;
+    }
+
+    public Object propertyValueOf( QualifiedName stateName )
+    {
+        return properties.get( stateName );
+    }
+
+    public void setPropertyValue( QualifiedName stateName, Object json )
+    {
+        properties.put( stateName, json );
+    }
+
+    public EntityReference associationValueOf( QualifiedName stateName )
+    {
+        return associations.get( stateName );
+    }
+
+    public void setAssociationValue( QualifiedName stateName, EntityReference newEntity )
+    {
+        associations.put( stateName, newEntity );
+    }
+
+    public ManyAssociationState manyAssociationValueOf( QualifiedName stateName )
+    {
+        return null;
+    }
+
+    public void refresh()
+    {
+    }
+
+    public void hasBeenApplied()
+    {
+        status = EntityStatus.LOADED;
+        version = unitOfWork.identity();
+    }
+
+    @Override
+    public String toString()
+    {
+        return identity + "(" +
+               properties.size() + " properties, " +
+               associations.size() + " associations, " +
+               manyAssociations.size() + " many-associations)";
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreAssembler.java b/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreAssembler.java
new file mode 100644
index 0000000..0117834
--- /dev/null
+++ b/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreAssembler.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008 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.jndi;
+
+import org.qi4j.api.common.Visibility;
+import org.qi4j.bootstrap.Assembler;
+import org.qi4j.bootstrap.AssemblyException;
+import org.qi4j.bootstrap.ModuleAssembly;
+import org.qi4j.entitystore.memory.MemoryEntityStoreService;
+import org.qi4j.spi.uuid.UuidIdentityGeneratorService;
+
+public class JndiEntityStoreAssembler
+    implements Assembler
+{
+    private String configurationModuleName;
+
+    public JndiEntityStoreAssembler( String configurationModule )
+    {
+        this.configurationModuleName = configurationModule;
+    }
+
+    public void assemble( ModuleAssembly module ) throws AssemblyException
+    {
+        module.addServices( JndiEntityStoreService.class, UuidIdentityGeneratorService.class );
+        ModuleAssembly config = module.layer().module( configurationModuleName );
+        config.entities( JndiConfiguration.class ).visibleIn( Visibility.layer );
+        config.services( MemoryEntityStoreService.class );
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreMixin.java b/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreMixin.java
new file mode 100644
index 0000000..c20738a
--- /dev/null
+++ b/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreMixin.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2008 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.jndi;
+
+import org.qi4j.api.configuration.Configuration;
+import org.qi4j.api.injection.scope.This;
+import org.qi4j.io.Input;
+import org.qi4j.io.Output;
+import org.qi4j.api.property.Property;
+import org.qi4j.api.usecase.Usecase;
+import org.qi4j.spi.entity.EntityState;
+import org.qi4j.spi.entitystore.EntityStore;
+import org.qi4j.spi.entitystore.EntityStoreException;
+import org.qi4j.spi.entitystore.EntityStoreUnitOfWork;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.directory.InitialDirContext;
+import java.util.Hashtable;
+import org.qi4j.api.service.ServiceActivation;
+import org.qi4j.api.structure.Module;
+
+public class JndiEntityStoreMixin
+    implements ServiceActivation, EntityStore
+{
+    @This private Configuration<JndiConfiguration> configuration;
+    private JndiSetup setup;
+
+    public void activateService()
+        throws Exception
+    {
+        connect();
+    }
+
+    private void connect()
+        throws NamingException
+    {
+        JndiConfiguration conf = configuration.get();
+        setup = new JndiSetup();
+        setup.instanceVersionAttribute = conf.versionAttribute().get();
+        if( setup.instanceVersionAttribute == null )
+        {
+            setup.instanceVersionAttribute = "instanceVersion";
+        }
+        setup.lastModifiedDateAttribute = conf.lastModifiedDateAttribute().get();
+        if( setup.lastModifiedDateAttribute == null )
+        {
+            setup.lastModifiedDateAttribute = "lastModifiedDate";
+        }
+        setup.identityAttribute = conf.identityAttribute().get();
+        if( setup.identityAttribute == null )
+        {
+            setup.identityAttribute = "uid";
+        }
+        setup.qualifiedTypeAttribute = conf.qualifiedTypeAttribute().get();
+        setup.baseDn = conf.baseDN().get();
+        setup.isReadOnly = conf.readOnly().get();
+
+        Hashtable<String, String> env = new Hashtable<String, String>();
+        addToEnv( env, Context.AUTHORITATIVE, conf.authorative(), null );
+        addToEnv( env, Context.BATCHSIZE, conf.batchSize(), null );
+        addToEnv( env, Context.DNS_URL, conf.dnsUrl(), null );
+        addToEnv( env, Context.INITIAL_CONTEXT_FACTORY, conf.initialContextFactory(), "com.sun.jndi.ldap.LdapCtxFactory" );
+        addToEnv( env, Context.LANGUAGE, conf.language(), null );
+        addToEnv( env, Context.OBJECT_FACTORIES, conf.objectFactories(), null );
+        addToEnv( env, Context.PROVIDER_URL, conf.providerUrl(), null );
+        addToEnv( env, Context.REFERRAL, conf.referral(), null );
+        addToEnv( env, Context.SECURITY_AUTHENTICATION, conf.securityAuthentication(), null );
+        addToEnv( env, Context.SECURITY_CREDENTIALS, conf.securityCredentials(), null );
+        addToEnv( env, Context.SECURITY_PRINCIPAL, conf.securityPrincipal(), null );
+        addToEnv( env, Context.SECURITY_PROTOCOL, conf.securityProtocol(), null );
+        addToEnv( env, Context.STATE_FACTORIES, conf.stateFactories(), null );
+        addToEnv( env, Context.URL_PKG_PREFIXES, conf.urlPkgPrefixes(), null );
+        setup.context = new InitialDirContext( env );
+    }
+
+    private void addToEnv( Hashtable<String, String> env, String key, Property<String> property, String defaultValue )
+    {
+        String value = property.get();
+        if( value != null )
+        {
+            env.put( key, value );
+        }
+        else if( defaultValue != null )
+        {
+            env.put( key, defaultValue );
+        }
+    }
+
+    public void passivateService()
+        throws Exception
+    {
+        setup.context.close();
+        setup = null;
+    }
+
+    public EntityStoreUnitOfWork newUnitOfWork( Usecase usecase, Module module, long currentTime )
+    {
+        return new JndiUow( setup, usecase, module, currentTime );
+    }
+
+    public Input<EntityState, EntityStoreException> entityStates( Module module )
+    {
+        return new Input<EntityState, EntityStoreException>()
+        {
+            public <ReceiverThrowableType extends Throwable> void transferTo( Output<? super EntityState, ReceiverThrowableType> output )
+                throws EntityStoreException, ReceiverThrowableType
+            {
+                // TODO Actual iteration
+                throw new UnsupportedOperationException( "Not implemented yet!" );
+            }
+        };
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-sandbox/blob/d4dd9c17/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreService.java
----------------------------------------------------------------------
diff --git a/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreService.java b/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreService.java
new file mode 100644
index 0000000..f73d5ec
--- /dev/null
+++ b/qi4j/extensions/entitystore-jndi/src/main/java/org/qi4j/entitystore/jndi/JndiEntityStoreService.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008 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.jndi;
+
+import org.qi4j.api.concern.Concerns;
+import org.qi4j.api.configuration.Configuration;
+import org.qi4j.api.mixin.Mixins;
+import org.qi4j.api.service.ServiceActivation;
+import org.qi4j.api.service.ServiceComposite;
+import org.qi4j.library.locking.LockingAbstractComposite;
+import org.qi4j.spi.entitystore.ConcurrentModificationCheckConcern;
+import org.qi4j.spi.entitystore.EntityStore;
+
+@Concerns( ConcurrentModificationCheckConcern.class )
+@Mixins( JndiEntityStoreMixin.class )
+public interface JndiEntityStoreService extends ServiceActivation, EntityStore, ServiceComposite, LockingAbstractComposite, Configuration
+{
+}
\ No newline at end of file