You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2015/07/08 11:43:04 UTC

[01/11] zest-qi4j git commit: Replaced Qi4j with Zest in main documentation. Added trademark (tm) (™) to all Zest words.

Repository: zest-qi4j
Updated Branches:
  refs/heads/develop 2868e9f6b -> 5618cbd52


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt b/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
index 34f99c3..1d298c7 100644
--- a/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
+++ b/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
@@ -17,18 +17,18 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-[[ten-minutes-intro,Qi4j in 10 minutes]]
-= Qi4j in 10 minutes =
+[[ten-minutes-intro,Zest� in 10 minutes]]
+= Zest� in 10 minutes =
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Qi4j SDK sources]. You should start your favorite editor and find the code related to
+http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
 
-    * Qi4j does not introduce any new programming language, no additional compilers needed and all your existing tools
+    * Zest� does not introduce any new programming language, no additional compilers needed and all your existing tools
       work just like before. It is pure Java.
-    * Qi4j works with Composites.
-    * The equivalent of an Object instance in OOP, is a Composite instance in Qi4j.
+    * Zest� works with Composites.
+    * The equivalent of an Object instance in OOP, is a Composite instance in Zest�.
     * Composites are constructed from Fragments.
     * Fragments are Mixins, Concerns, Constraints and SideEffects.
     * Only Mixins carry Composite state. The others are shared between Composite instances.
@@ -62,14 +62,14 @@ tag=allClass
 
 Extending the ConcernOf is a convenience mechanism, instead of an explicit @ConcernFor annotation on a private field,
 which can be used in rare occasions when you are not able to extend. This base class defines the `next` field, which is
-set up by the Qi4j runtime and points to the next fragment in the call stack.
+set up by the Zest� runtime and points to the next fragment in the call stack.
 
-We can also see that the InventoryService is provided to the concern, which is done with dependency injection. Qi4j
+We can also see that the InventoryService is provided to the concern, which is done with dependency injection. Zest�
 also supports dependency injection via constructors and methods.
 
-The above example is obviously doing persistence, and we have no code handling this. But Qi4j supports persistence
-directly in its Core, and it is taken care of by Qi4j, since it is declared as an EntityComposite.
-Nothing else is needed, provided that the Qi4j Runtime has been setup with one or more persisted EntityStores. But
+The above example is obviously doing persistence, and we have no code handling this. But Zest� supports persistence
+directly in its Core, and it is taken care of by Zest�, since it is declared as an EntityComposite.
+Nothing else is needed, provided that the Zest� Runtime has been setup with one or more persisted EntityStores. But
 we have a naming convention that EntityComposites have "Entity" as the suffix in its name.
 
 There are other built-in Composite subtypes as well, such as ValueComposite and ServiceComposite. This distinction helps
@@ -93,10 +93,10 @@ tag=allClass
 -----------
 The MailService is dependency injected, as we have seen before.
 
-@This is telling Qi4j that the SideEffect needs a reference to the Composite instance that it belongs to.
+@This is telling Zest� that the SideEffect needs a reference to the Composite instance that it belongs to.
 
 By asking for both the HasCustomer and the HasLineItems types, we get type-safety and don't need to bother with casts.
-In fact, Qi4j will ensure that you can't even cast the `hasCustomer` instance to the HasLineItems type.
+In fact, Zest� will ensure that you can't even cast the `hasCustomer` instance to the HasLineItems type.
 
 By not referencing the aggregated interface OrderEntity, we reduce the coupling of this SideEffect and it can be used
 in any other Composite where the HasCustomer and HasLineItems combination is used, for instance in an InvoiceEntity.
@@ -105,5 +105,5 @@ So, build the report, send it via the MailService.
 
 == Conclusion ==
 
-In this short introduction, we have covered the essence of Qi4j. We have looked at what is a Composite, seen some of the
+In this short introduction, we have covered the essence of Zest�. We have looked at what is a Composite, seen some of the
 Fragments in action, and how simple it is to turn a Composite into a persisted Composite, known as an EntityComposite.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
index aa88345..80ad021 100644
--- a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
+++ b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
@@ -17,16 +17,16 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-[[thirty-minutes-intro,Qi4j in 30 minutes]]
-= Qi4j in 30 minutes =
+[[thirty-minutes-intro,Zest� in 30 minutes]]
+= Zest� in 30 minutes =
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Qi4j SDK sources]. You should start your favorite editor and find the code related to
+http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
 
-This introduction will deepen your understanding of Qi4j, as we touches on a couple of the common features of Qi4j. It
-is expected that you have gone through and understood the "Qi4j in 10 minutes" introduction.
+This introduction will deepen your understanding of Zest�, as we touches on a couple of the common features of Zest�. It
+is expected that you have gone through and understood the "Zest� in 10 minutes" introduction.
 
 If you want to reproduce what's explained in this tutorial, remember to depend on the Core Runtime artifact that depends
 on Core API, Core SPI, Core Bootstrap and Core Functional & I/O APIs:
@@ -56,8 +56,8 @@ source=tutorials/introduction/thirtyminutes/src/main/java/org/qi4j/demo/thirtymi
 tag=2
 -----------
 
-Quite a lot of Qi4j features are leveraged above;
-[1] Property is a first class citizen in Qi4j, instead of getters/setters naming convention to declare properties.
+Quite a lot of Zest� features are leveraged above;
+[1] Property is a first class citizen in Zest�, instead of getters/setters naming convention to declare properties.
 [2] ValueComposite for Action means that it is among other things Immutable.
 [3] The Action extends a Property. We call that Property subtyping and highly recommended.
 [4] The CompositeBuilder creates Immutable Action instances.
@@ -87,7 +87,7 @@ tag=4
 
 The above construct is called a Generic Concern, since it implements java.lang.reflect.InvocationHandler instead of the
 interface of the domain model. The ConcernOf baseclass will also need to be of InvocationHandler type, and the
-Qi4j Runtime will handle the chaining between domain model style and this generic style of interceptor call chain.
+Zest� Runtime will handle the chaining between domain model style and this generic style of interceptor call chain.
 
 Finally, we need to declare the Concern in the OrderEntity;
 
@@ -109,7 +109,7 @@ Glad you asked. It is done via the Query API. It is important to understand that
 the persistence concern of storage and retrieval. This enables many performance optimization opportunities as well as a
 more flexible Indexing strategy. The other thing to understand is that the Query API is using the domain model, in Java,
 and not some String based query language. We have made this choice to ensure refactoring safety. In rare cases, the
-Query API is not capable enough, in which case Qi4j still provides the ability to look up and execute native queries.
+Query API is not capable enough, in which case Zest� still provides the ability to look up and execute native queries.
 
 Let's say that we want to find a particular Order from its SequenceNumber.
 
@@ -152,13 +152,13 @@ This covers the most basic Query capabilities and how to use it. For Querying to
 assembled during bootstrap. At the time of this writing, only an RDF indexing subsystem exist, and is added most easily
 by assembly.addAssembler( new RdfNativeSesameStoreAssembler() ).
 
-It can be a bit confusing to see Qi4j use Java itself as a Query language, but since we have practically killed the
+It can be a bit confusing to see Zest� use Java itself as a Query language, but since we have practically killed the
 classes and only operate with interfaces, it is possible to do a lot of seemingly magic stuff. Just keep in mind that
 it is pure Java, albeit heavy use of dynamic proxies to capture the intent of the query.
 
 == Conclusion ==
 
-We have now explored a couple more intricate features of Qi4j, hopefully without being overwhelmed with details on how
-to create applications from scratch, how to structure applications, and how the entire Qi4j Extension system works.
+We have now explored a couple more intricate features of Zest�, hopefully without being overwhelmed with details on how
+to create applications from scratch, how to structure applications, and how the entire Zest� Extension system works.
 We have looked at how to add a Concern that uses a private Mixin, we have touched a bit on Generic Concerns, and
 finally a short introduction to the Query API.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/introduction/twohours/src/docs/two-hours.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/twohours/src/docs/two-hours.txt b/tutorials/introduction/twohours/src/docs/two-hours.txt
index bd84428..fa14f5d 100644
--- a/tutorials/introduction/twohours/src/docs/two-hours.txt
+++ b/tutorials/introduction/twohours/src/docs/two-hours.txt
@@ -17,12 +17,12 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-[[two-hours-intro,Qi4j in 2 hours]]
-= Qi4j in 2 hours =
+[[two-hours-intro,Zest� in 2 hours]]
+= Zest� in 2 hours =
 
 NOTE: This tutorial is not written yet. Learn how to contribute in <<community-docs>>.
 
-This introduction assumes that the "Qi4j in 10 minutes" and "Qi4j in 30 minutes" introductions has been read and
+This introduction assumes that the "Zest� in 10 minutes" and "Zest� in 30 minutes" introductions has been read and
 understood.
 
 In this introduction we will touch on the core concepts of UnitOfWork, Application structure and Bootstrap API.
@@ -34,7 +34,7 @@ interact with the underlying persistence system. This is done via EntitySessions
 
 - Application Structure -
 
-    * There are one Application per Qi4j instance.
+    * There are one Application per Zest� instance.
 
     * An Application consists of one or more Layers.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/introduction/twominutes/src/docs/two-minutes.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/twominutes/src/docs/two-minutes.txt b/tutorials/introduction/twominutes/src/docs/two-minutes.txt
index bc87861..a5c0c04 100644
--- a/tutorials/introduction/twominutes/src/docs/two-minutes.txt
+++ b/tutorials/introduction/twominutes/src/docs/two-minutes.txt
@@ -17,14 +17,14 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-[[two-minutes-intro,Qi4j in 2 minutes]]
-= Qi4j in 2 minutes =
+[[two-minutes-intro,Zest� in 2 minutes]]
+= Zest� in 2 minutes =
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Qi4j SDK sources]. You should start your favorite editor and find the code related to
+http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
-To show that Qi4j is not necessarily complex, not hard to get going with and easy to deploy, we are first showing the
+To show that Zest� is not necessarily complex, not hard to get going with and easy to deploy, we are first showing the
 classic HelloWorld, as small as it can get and still be Composite Oriented Programming and not only standard OOP.
 
 If you want to reproduce what's explained in this tutorial, remember to depend on the Core Runtime artifact that depends
@@ -64,7 +64,7 @@ source=tutorials/introduction/twominutes/src/main/java/org/qi4j/demo/twominute/M
 tag=documentation
 -----------
 
-. The SingletonAssembler is a convenience class that creates a Qi4j Runtime instance and an application with one layer
+. The SingletonAssembler is a convenience class that creates a Zest� Runtime instance and an application with one layer
   and one module in it.
 
 . We declare a TransientComposite of type `Speaker`.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/services/src/docs/step1.txt
----------------------------------------------------------------------
diff --git a/tutorials/services/src/docs/step1.txt b/tutorials/services/src/docs/step1.txt
index 7e6cbe9..21f72d2 100644
--- a/tutorials/services/src/docs/step1.txt
+++ b/tutorials/services/src/docs/step1.txt
@@ -23,13 +23,13 @@
 In this tutorial we start with basic Java classes, to simulate a very simple Library where you can borrow
 and return books.
 
-Qi4j relies heavily on the use of interfaces. This makes it possible for an object
+Zest� relies heavily on the use of interfaces. This makes it possible for an object
 to externally implement a number of interfaces which internally is backed by a number
 of Mixins, some of which you may have written yourself, and some of which may have been
 reused. This is also true for services, which we are to cover in this tutorial.
 
 The first task is therefore to refactor the code so that the methods are implemented from an
-interface instead, and to essentially make the identical "application" into a Qi4j application.
+interface instead, and to essentially make the identical "application" into a Zest� application.
 We also want the Book to be a ValueComposite.
     
 Steps for this tutorial:

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/services/src/docs/step2.txt
----------------------------------------------------------------------
diff --git a/tutorials/services/src/docs/step2.txt b/tutorials/services/src/docs/step2.txt
index 73c20d8..f0c5db0 100644
--- a/tutorials/services/src/docs/step2.txt
+++ b/tutorials/services/src/docs/step2.txt
@@ -21,7 +21,7 @@
 = Step 2 - Hooking into the Service Activation =
 
 Services can be "activated" and "passivated". Applications can be notified of this occurring
-by Qi4j runtime by assembling them with an Activator. 
+by Zest� runtime by assembling them with an Activator.
 
 Activators methods are called around "activation" and "passivation": beforeActivation,
 afterActivation, beforeActivation, afterPassivation. The

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/services/src/docs/step3.txt
----------------------------------------------------------------------
diff --git a/tutorials/services/src/docs/step3.txt b/tutorials/services/src/docs/step3.txt
index 9c471d3..62363ef 100644
--- a/tutorials/services/src/docs/step3.txt
+++ b/tutorials/services/src/docs/step3.txt
@@ -20,13 +20,13 @@
 [[tut-services-step3,Step 3 - Reading the Service Configuration]]
 = Step 3 - Reading the Service Configuration =
 
-Services typically have configuration. Configurations are directly supported in Qi4j. A
+Services typically have configuration. Configurations are directly supported in Zest�. A
 ConfigurationComposite is a subtype of EntityComposite. That is because
 configurations are stored in EntityStores, can be modified in runtime by client code and has
 the same semantics as regular entities.
 
-Qi4j also handles the bootstrapping of configuration for the services. If the ConfigurationComposite is
-not found in the configured entity store, then Qi4j will automatically locate a properties file for each
+Zest� also handles the bootstrapping of configuration for the services. If the ConfigurationComposite is
+not found in the configured entity store, then Zest� will automatically locate a properties file for each
 service instance, read those properties into a ConfigurationComposite instance, save that to the
 entity store and provide the values to the service. The properties file must be with the same name as
 the service instance with the extension "properties" in the same package as the service.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/services/src/docs/tut-services.txt
----------------------------------------------------------------------
diff --git a/tutorials/services/src/docs/tut-services.txt b/tutorials/services/src/docs/tut-services.txt
index 690cbfe..fc051d9 100644
--- a/tutorials/services/src/docs/tut-services.txt
+++ b/tutorials/services/src/docs/tut-services.txt
@@ -21,13 +21,13 @@
 = Services Composites Tutorial =
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Qi4j SDK sources]. You should start your favorite editor and find the code related to
+http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
 
 In this other set of tutorials it will be shown how to create and work with Service Composites, which are composites
 that extends from the ServiceComposite class. We will refactor one a very simple Library where you can borrow and
-return books to take advantage of the various features in Qi4j. These refactorings will benefit from automatic Service
+return books to take advantage of the various features in Zest�. These refactorings will benefit from automatic Service
 activation and Configuration Entities management.
 
 - <<tut-services-step1>>


[09/11] zest-qi4j git commit: Wrong encoding must have been used earlier. Changed to UTF-8 for all tradmarks ™, and merged in DocUpdate branch

Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/userguide/preface.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/preface.txt b/manual/src/docs/userguide/preface.txt
index fd47975..668d5b1 100644
--- a/manual/src/docs/userguide/preface.txt
+++ b/manual/src/docs/userguide/preface.txt
@@ -20,7 +20,7 @@
 [[preface, Preface]]
 = Preface =
 
-This is the reference manual for Zest� version {qi4j-version}, written by members of the Zest� Community.
+This is the reference manual for Zest™ version {qi4j-version}, written by members of the Zest™ Community.
 
 The main parts of the manual are:
 
@@ -28,11 +28,11 @@ The main parts of the manual are:
 * <<tutorials>> -- learn how to use Zest.
 * <<core-api>> -- detailed information on how to use Zest.
 * <<libraries>> -- detailed information on the many libraries available for Zest.
-* <<extensions>> -- detailed information each of the Zest� extensions, such as entity stores,
+* <<extensions>> -- detailed information each of the Zest™ extensions, such as entity stores,
 indexing, caching and runtime metrics.
 
 The material is practical, technical, and focused on answering specific questions. 
-It addresses how things work, what to do and what to avoid to successfully use Zest� in domain rich applications.
+It addresses how things work, what to do and what to avoid to successfully use Zest™ in domain rich applications.
  
 The goal is to be thumb-through and rule-of-thumb friendly.
 
@@ -40,7 +40,7 @@ Each section should stand on its own, so you can hop right to whatever interests
 When possible, the sections distill "rules of thumb" which you can keep in mind whenever you wander out of the house
 without this manual in your back pocket.
 
-The included code examples are executed when Zest� is built and tested.
+The included code examples are executed when Zest™ is built and tested.
 
 _Who should read this?_
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/userguide/tools.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/tools.txt b/manual/src/docs/userguide/tools.txt
index 2be9669..2a4b1e0 100644
--- a/manual/src/docs/userguide/tools.txt
+++ b/manual/src/docs/userguide/tools.txt
@@ -24,11 +24,11 @@
 
 == Overview ==
 
-The Zest� SDK comes with usefull development tools. Theses tools can come in
+The Zest™ SDK comes with usefull development tools. Theses tools can come in
 handy when assembled into your <<def-application>> in development
 <<def-application-mode>>.
 
-The tools are available in the +tools/+ directory of the Zest� SDK.
+The tools are available in the +tools/+ directory of the Zest™ SDK.
 
 :leveloffset: 2
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/website/samples.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/website/samples.txt b/manual/src/docs/website/samples.txt
index 5d09260..f029138 100644
--- a/manual/src/docs/website/samples.txt
+++ b/manual/src/docs/website/samples.txt
@@ -24,16 +24,16 @@
 
 == Overview ==
 
-The Zest� SDK comes with several sample applications. This is a very good place
+The Zest™ SDK comes with several sample applications. This is a very good place
 to look for code examples and recipes.
 
-The samples are available in the +samples/+ directory of the Zest� SDK.
+The samples are available in the +samples/+ directory of the Zest™ SDK.
 
 [[sample-dci, DCI Sample]]
 == DCI Sample ==
 
 Sample of how DCI (Data, Context & Interaction) pattern is implemented using
-Zest� core only.
+Zest™ core only.
 
 https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/dci[Browse Source]
 
@@ -41,7 +41,7 @@ https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/dci[Browse Source]
 == DCI Cargo Sample ==
 
 Sample of how DCI (Data, Context & Interaction) pattern is implemented with
-Zest�, for Eric Evans DDD sample.
+Zest™, for Eric Evans DDD sample.
 
 This sample, contributed by Marc Grue, is described in details on his
 website: http://marcgrue.com/
@@ -67,7 +67,7 @@ https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/rental[Browse Source]
 // [[sample-scala,Scala Sample]]
 // == Scala Sample ==
 //
-// Sample of how to use Scala with Zest�.
+// Sample of how to use Scala with Zest™.
 //
 // https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/scala[Browse Source]
 
@@ -76,7 +76,7 @@ https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/rental[Browse Source]
 
 NOTE: This sample use PostgreSQL and drop all of its data once run in order to be runnable multiple times.
 
-Sample of how to fully use Zest� SQL support : <<library-sql>>, <<extension-es-sql>> and <<extension-indexing-sql>>.
+Sample of how to fully use Zest™ SQL support : <<library-sql>>, <<extension-es-sql>> and <<extension-indexing-sql>>.
 
 https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/sql-support[Browse Source]
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/website/tutorials.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/website/tutorials.txt b/manual/src/docs/website/tutorials.txt
index 0214c98..8e2d9ce 100644
--- a/manual/src/docs/website/tutorials.txt
+++ b/manual/src/docs/website/tutorials.txt
@@ -25,15 +25,15 @@
 == Overview ==
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
+http://qi4j.org/downloads.html[Zest™ SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
-In this section you will find a comprehensive set of tutorials about Composite Oriented Programming using Zest�.
+In this section you will find a comprehensive set of tutorials about Composite Oriented Programming using Zest™.
 
-[[tutorials-intro,Zest� in 2 hours 42 minutes]]
-=== Zest� in 2 hours 42 minutes ===
+[[tutorials-intro,Zest™ in 2 hours 42 minutes]]
+=== Zest™ in 2 hours 42 minutes ===
 
-This quite long introduction to Zest� will start by brushing up an overview of the problems Zest� solve, teach you what
+This quite long introduction to Zest™ will start by brushing up an overview of the problems Zest™ solve, teach you what
 Composite Oriented Programming is and guide you through the process of writing a complete Application around an adapted
 Hello World example.
 
@@ -42,9 +42,9 @@ Hello World example.
 - <<thirty-minutes-intro>>
 - <<two-hours-intro>>
 
-=== Getting real with Zest� ===
+=== Getting real with Zest™ ===
 
-Throughout this set of tutorials it will be shown how to depend on Zest� in your build, how to assemble a complete
+Throughout this set of tutorials it will be shown how to depend on Zest™ in your build, how to assemble a complete
 application, how to create and work with Composites and Services, how to use contextual fragments and leverage
 properties.
 
@@ -67,10 +67,10 @@ typical application.
 - <<howto-configure-service>>
 - <<howto-use-io>>
 
-=== Zest� Development ===
+=== Zest™ Development ===
 
-This last set of tutorials you'll learn how to build the Zest� SDK from sources including this very documentation website
-, the Zest� manual, binaries and sources distributions.
+This last set of tutorials you'll learn how to build the Zest™ SDK from sources including this very documentation website
+, the Zest™ manual, binaries and sources distributions.
 
 - <<build-system>>
 - <<community-docs>>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/samples/dci-cargo/README.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/README.txt b/samples/dci-cargo/README.txt
index 4f71f53..b588156 100644
--- a/samples/dci-cargo/README.txt
+++ b/samples/dci-cargo/README.txt
@@ -1,7 +1,7 @@
 DCI Sample
 ==========
 
-This is a port of the DDD Sample application to the DCI paradigm using Java, Zest� and Wicket.
+This is a port of the DDD Sample application to the DCI paradigm using Java, Zest™ and Wicket.
 
 The code is licensed under the Apache Software License 2.0 and lastest revisions are
 available from https://github.com/dci.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tools/envisage/src/docs/envisage.txt
----------------------------------------------------------------------
diff --git a/tools/envisage/src/docs/envisage.txt b/tools/envisage/src/docs/envisage.txt
index 9ad460f..01551c0 100644
--- a/tools/envisage/src/docs/envisage.txt
+++ b/tools/envisage/src/docs/envisage.txt
@@ -20,7 +20,7 @@
 [[tools-envisage,Envisage Tool]]
 = Envisage =
 
-Envisage is a Swing based visualization tool for the Zest� Application model.
+Envisage is a Swing based visualization tool for the Zest™ Application model.
 Visualizations can be printed to PDFs.
 
 == Usage ==

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/composites/src/docs/step1.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step1.txt b/tutorials/composites/src/docs/step1.txt
index e49d127..df8ce5c 100644
--- a/tutorials/composites/src/docs/step1.txt
+++ b/tutorials/composites/src/docs/step1.txt
@@ -22,7 +22,7 @@
 
 == Initial Hello World ==
 
-This whole tutorial describes how to step-by-step modify a typical HelloWorld "application" into a full-fledged Zest�
+This whole tutorial describes how to step-by-step modify a typical HelloWorld "application" into a full-fledged Zest™
 Composite Oriented application. Here is the initial code of HelloWorld.
 
 [snippet,java]
@@ -36,7 +36,7 @@ tag=initial
 In this step we start with a basic Java class, which when invoked will concatenate the two properties "phrase" 
 and "name". If invoked with the properties set to "Hello" and "World" respectively it will hence return "Hello World".
 
-Zest� relies heavily on the use of interfaces. This makes it possible for an object to externally implement a number of
+Zest™ relies heavily on the use of interfaces. This makes it possible for an object to externally implement a number of
 interfaces which internally is backed by a number of Mixins, some of which you may have written yourself, and some of 
 which may have been reused. This also makes it easy to introduce Modifiers (aka "interceptors", aka "advice"), which 
 are Fragments which execute before and/or after the method on the Mixin is invoked.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/composites/src/docs/step2.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step2.txt b/tutorials/composites/src/docs/step2.txt
index 80b675c..1268ce1 100644
--- a/tutorials/composites/src/docs/step2.txt
+++ b/tutorials/composites/src/docs/step2.txt
@@ -29,8 +29,8 @@ Constraints. In this tutorial we will only use Mixins. When a TransientComposite
 framework will inspect the interface to determine what the TransientComposite instance should look like in terms of 
 used Fragments.
 
-In Zest� all method parameters are considered mandatory unless marked as @Optional. Therefore you can remove the null
-checks in the Mixin. If a null value is passed in an exception will be thrown by Zest�.
+In Zest™ all method parameters are considered mandatory unless marked as @Optional. Therefore you can remove the null
+checks in the Mixin. If a null value is passed in an exception will be thrown by Zest™.
 
 Steps for this tutorial:
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/composites/src/docs/step5.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step5.txt b/tutorials/composites/src/docs/step5.txt
index 79cdd0c..054d1ad 100644
--- a/tutorials/composites/src/docs/step5.txt
+++ b/tutorials/composites/src/docs/step5.txt
@@ -27,7 +27,7 @@ restriction we can make is to denote a type. Any other constraints on the input
 optional, integer ranges, string regular expressions, and so on, cannot be expressed, and so we have to put this into
 Javadoc, and then manually add these checks in the implementation class.
 
-In Zest� there is the option to use Constraints, which are further restrictions on the parameters. This is implemented
+In Zest™ there is the option to use Constraints, which are further restrictions on the parameters. This is implemented
 by having an annotation that describes what the Constraint does, and then an implementation class that checks whether a
 specific value fulfills the Constraint or not.
 
@@ -35,8 +35,8 @@ NOTE: The previous steps had a dependency to the <<core-api>> only. The constrai
 introduce a new dependency to the <<library-constraints>>, where all the constraint related classes reside. So
 update your classpath settings accordingly.
 
-There are a number of pre-written constraints in Zest� which you can use. The null check of the original HelloWorld
-version is already handled by default since Zest� considers method parameters to be mandatory if not explicitly marked
+There are a number of pre-written constraints in Zest™ which you can use. The null check of the original HelloWorld
+version is already handled by default since Zest™ considers method parameters to be mandatory if not explicitly marked
 with the @Optional annotation. So, instead of doing that check we will add other checks that are useful to make, such
 as ensuring that the passed in string is not empty.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/composites/src/docs/step7.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step7.txt b/tutorials/composites/src/docs/step7.txt
index 8f6e561..bdec58a 100644
--- a/tutorials/composites/src/docs/step7.txt
+++ b/tutorials/composites/src/docs/step7.txt
@@ -22,11 +22,11 @@
 
 Previous step was <<tut-composites-step6>>.
 
-One of the goals of Zest� is to give you domain modeling tools that allow you to more concisely use domain concepts in
+One of the goals of Zest™ is to give you domain modeling tools that allow you to more concisely use domain concepts in
 code. One of the things we do rather often is model Properties of objects as getters and setters. But this is a very 
 weak model, and does not give you any access to metadata about the property, and also makes common tasks like UI binding
 non-trivial. There is also a lot of repetition of code, which is unnecessary. Using JavaBeans conventions one typically 
-have to have code in five places for one property, whereas in Zest� the same thing can be achieved with one line of code.
+have to have code in five places for one property, whereas in Zest™ the same thing can be achieved with one line of code.
 
 But lets start out easy. To declare a property you have to make a method in a mixin type that returns a value of the 
 type Property, and which does not take any parameters. Here's a simple example:
@@ -43,14 +43,14 @@ For now you will be responsible for implementing these methods, but later on the
 reducing Properties to one-liners!
 
 In the Mixin implementation of the interface with the Property declaration you should have an injection of the Property, 
-which is created for you by Zest�. The injection can be done in a field like this:
+which is created for you by Zest™. The injection can be done in a field like this:
 
 [source,java]
 ----
 @State Property<String> name;
 ----
 
-The State dependency injection annotation means that Zest� will inject the Property for you. The field has the name
+The State dependency injection annotation means that Zest™ will inject the Property for you. The field has the name
 "name", which matches the name in the interface, and therefore that Property is injected. You can then implement the 
 method trivially by just returning the "name" field.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/composites/src/docs/step8.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step8.txt b/tutorials/composites/src/docs/step8.txt
index c41208f..90225ce 100644
--- a/tutorials/composites/src/docs/step8.txt
+++ b/tutorials/composites/src/docs/step8.txt
@@ -33,7 +33,7 @@ java.lang.proxy.InvocationHandler. This has a single "invoke" method which is pa
 TransientComposite in this case), the method, and the arguments. The Fragment is then allowed to implement the method 
 any way it wants.
 
-Since interfaces with only Properties is such a common case Zest� already has a generic Mixin that implements the
+Since interfaces with only Properties is such a common case Zest™ already has a generic Mixin that implements the
 Properties management described above, but for the builtin Property type instead of the getter/setter variant. The 
 class is aptly named PropertyMixin.
 
@@ -43,7 +43,7 @@ Steps for this tutorial:
 
 - Remove the HelloWorldStateMixin
 - Add a GenericPropertyMixin, and have it implement InvocationHandler
-- Inject "@State StateHolder state" in the mixin. The StateHolder interface will give you access to the Properties for the TransientComposite which Zest� manages for you
+- Inject "@State StateHolder state" in the mixin. The StateHolder interface will give you access to the Properties for the TransientComposite which Zest™ manages for you
 - On call to invoke(), delegate to the StateHolder interface to get the Property for the invoked method
 - Add an @AppliesTo annotation to the Mixin and implement the AppliesToFilter with a rule that matches only methods that return Property values.
 - Add the mixin to the TransientComposite.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/composites/src/docs/step9.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step9.txt b/tutorials/composites/src/docs/step9.txt
index 6addfd3..6e6047f 100644
--- a/tutorials/composites/src/docs/step9.txt
+++ b/tutorials/composites/src/docs/step9.txt
@@ -31,7 +31,7 @@ This forces the mixin to implement the TransientComposite type, which would norm
 implement all methods, including those found in the TransientComposite interface. However, since we are only really 
 interested in implementing the say() method we will mark this by declaring that the Mixin "implements" the 
 TransientComposite type, but is also "abstract". This, using pure Java semantics, makes it possible to avoid having to 
-implement all methods. Zest� will during the initialization phase detect that the Mixin only handles the say() method,
+implement all methods. Zest™ will during the initialization phase detect that the Mixin only handles the say() method,
 and therefore only map it to that specific method. In order to instantiate the Mixin it will generate a subclass which 
 implements the remaining methods in the TransientComposite type, as no-ops. These will never be called however, and is 
 there purely for the purpose of being able to instantiate the Mixin. The Mixin is considered to be an Abstract Fragment.
@@ -39,7 +39,7 @@ there purely for the purpose of being able to instantiate the Mixin. The Mixin i
 To hide the state from the client we need to use what is called Private Mixins. A Private Mixin is any mixin that is 
 referenced by another Mixin by using the @This injection, but which is not included in the TransientComposite type. As 
 long as there is a Mixin implementation declared for the interface specified by the @This injection it will work, since 
-Zest� can know how to implement the interface. But since it is not extended by the TransientComposite type there is no
+Zest™ can know how to implement the interface. But since it is not extended by the TransientComposite type there is no
 way for a user of the TransientComposite to access it. That Mixin becomes an implementation detail. This can be used 
 either for encapsulation purposes, or for referencing utility mixins that help the rest of the code implement some 
 interface, but which itself should not be exposed.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/composites/src/docs/tut-composites.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/tut-composites.txt b/tutorials/composites/src/docs/tut-composites.txt
index cb06854..1020d93 100644
--- a/tutorials/composites/src/docs/tut-composites.txt
+++ b/tutorials/composites/src/docs/tut-composites.txt
@@ -21,14 +21,14 @@
 = Transient Composites Tutorial =
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
+http://qi4j.org/downloads.html[Zest™ SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
 Throughout this set of tutorials it will be shown how to create and work with Composites, which
-is the basic element in Zest�. We will refactor one HelloWorld class to take advantage of the various
-features in Zest�. These refactorings will make it easier to reuse parts of the class,
+is the basic element in Zest™. We will refactor one HelloWorld class to take advantage of the various
+features in Zest™. These refactorings will make it easier to reuse parts of the class,
 and introduce new features without having to change existing code. We will also look
-at some of the existing classes, or Fragments, available in Zest� that you can reuse
+at some of the existing classes, or Fragments, available in Zest™ that you can reuse
 so that you don't have to write everything yourself.
 
 - <<tut-composites-step1>>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/introduction/src/docs/background.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/src/docs/background.txt b/tutorials/introduction/src/docs/background.txt
index a24f821..96fcb5f 100644
--- a/tutorials/introduction/src/docs/background.txt
+++ b/tutorials/introduction/src/docs/background.txt
@@ -19,22 +19,22 @@
 
 [[introduction-background,Background]]
 = Background =
-Zest� is the first Composite Oriented Programming implementation leveraging the Java 5 platform, so that everything you
-know from Java 5 still applies. You can mix Zest� with your ordinary Java code as much as you want. All your existing
-Java tools works just like before, and Zest� does not introduce any new programming language, no special development
+Zest™ is the first Composite Oriented Programming implementation leveraging the Java 5 platform, so that everything you
+know from Java 5 still applies. You can mix Zest™ with your ordinary Java code as much as you want. All your existing
+Java tools works just like before, and Zest™ does not introduce any new programming language, no special development
 tools needed and no XML is required.
 
 == Purpose ==
-Zest� addresses the programming problems from the top-down, starting with the Domain Model and Business Rules needs,
+Zest™ addresses the programming problems from the top-down, starting with the Domain Model and Business Rules needs,
 and let those requirements flow downwards in the software stack and dictate the requirements for underlying layers
 such as persistence, messaging, querying and more. This means that the business value developer is left to
 concentrate on the domain models and the actual application bringing the value, instead of creating massive amounts
 of glue code to tie underlying technologies together.
 
 == Problem Descriptions ==
-Zest� didn't appear out of the blue, when the founders of the project had nothing better to do. It is the result of
+Zest™ didn't appear out of the blue, when the founders of the project had nothing better to do. It is the result of
 observation of problems in real applications, and the experience from previous attempts to address or correct these
-problems, that has led to the Zest� vision.
+problems, that has led to the Zest™ vision.
 
 == Object Oriented Programming (OOP) ==
 How can OOP be a problem? We and others have observed that there is a fundamental flaw in the OOP model. In fact, we
@@ -117,4 +117,4 @@ ServerContextualInvoiceEntity, and then persist the changes.
 Composite Oriented Programming is heavily influenced by the book "Domain Driven Design" by Eric Evans. And we are
 trying to use his analysis of the problem to provide the mechanisms needed to get the job done quicker and more
 reliably. Mr Evans talks about Applications, Layers, Modules, Specifications, SideEffects and so forth, and all of
-these should be present in a Composite Oriented Programming implementation, and to a large extent it is in Zest�.
+these should be present in a Composite Oriented Programming implementation, and to a large extent it is in Zest™.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/introduction/src/docs/qi4j-cop.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/src/docs/qi4j-cop.txt b/tutorials/introduction/src/docs/qi4j-cop.txt
index 175ce7b..0726ab8 100644
--- a/tutorials/introduction/src/docs/qi4j-cop.txt
+++ b/tutorials/introduction/src/docs/qi4j-cop.txt
@@ -17,6 +17,6 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-[[qi4j-cop,COP with Java and Zest�]]
-= COP with Java and Zest� =
+[[qi4j-cop,COP with Java and Zest™]]
+= COP with Java and Zest™ =
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/introduction/src/docs/state-modeling.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/src/docs/state-modeling.txt b/tutorials/introduction/src/docs/state-modeling.txt
index 0dff931..0c5ec82 100644
--- a/tutorials/introduction/src/docs/state-modeling.txt
+++ b/tutorials/introduction/src/docs/state-modeling.txt
@@ -18,11 +18,11 @@
 ///////////////////////////////////////////////////////////////
 
 [[state-modeling,State Modeling]]
-= Zest� and state modeling =
+= Zest™ and state modeling =
 
 (From Rickard Oberg's blog, http://www.jroller.com/rickard/entry/qi4j_and_state_modeling, 2009-02-19)
 
-In the Zest� project we strive to being able to express our domain as directly as possible, with as little translation
+In the Zest™ project we strive to being able to express our domain as directly as possible, with as little translation
 as possible between how we think about a domain and how it is actually coded.
 This then affects our entire view of how application frameworks should be constructed, and what we consider good and
 bad ways of implementing certain features.
@@ -36,7 +36,7 @@ In Domain Driven Design terms, POJOs are not in our Ubiquitous Language.
 
 From a DDD perspective we want to talk about Entities and Values, Properties and Associations.
 If our code does not reflect this, then there is translation going on, and translation inevitably leads to information loss.
-In Zest�, where Composites and not Objects, are the basic construct, we have created specialized forms to model these
+In Zest™, where Composites and not Objects, are the basic construct, we have created specialized forms to model these
 concepts more explicitly.
 We have EntityComposites and ValueComposites, each with different ways of creating them and managing them.
 Both EntityComposites and ValueComposites can then have Properties, as first-class objects, but Properties in
@@ -93,7 +93,7 @@ For Collections they are set to empty collections of the type indicated.
 "@UseDefaults Property<List<String>> addresses();" would be initialized to an empty ArrayList, for example.
 
 In addition I have set surName() to be @Optional.
-In Zest� we have defined all properties to be not-null as the default, and the same goes for all parameters in method
+In Zest™ we have defined all properties to be not-null as the default, and the same goes for all parameters in method
 invocations.
 If you explicitly want to allow properties to be null, so that for example "Madonna" would be an acceptable name,
 then you can mark it as @Optional.
@@ -134,7 +134,7 @@ What should have been a neat and tidy little package is instead a anorectic litt
 around your code, looking all soggy and unappetizing.
 
 What to do about this?
-One of the great inventions of Zest�, I believe, is the notion of private mixins.
+One of the great inventions of Zest™, I believe, is the notion of private mixins.
 That we can have mixins in an object which are explicitly HIDDEN from usage outside of it.
 How can we use this for state modeling?
 What you'd want to do is to model the state of an Entity as a private mixin, which is hidden from clients, and then
@@ -164,10 +164,10 @@ Entity doesn't need the "Listable" interface the mixin will never be instantiate
 
 And so much more...
 
-The above is just a small taste of what you can do with state modeling in Zest�.
+The above is just a small taste of what you can do with state modeling in Zest™.
 There is also support for associations and many-associations, the notion of aggregates, and a complete pluggable
 system for persistence and indexing/querying of data.
-To end with, here's a sample of how some other state modeling concepts can be expressed in Zest�:
+To end with, here's a sample of how some other state modeling concepts can be expressed in Zest™:
 
 [snippet,java]
 -----------
@@ -177,5 +177,5 @@ tag=more
 
 I hope they are self-explanatory.
 
-My hope is that with Composite Oriented Programming and Zest� we can come one step closer to being able to express our
+My hope is that with Composite Oriented Programming and Zest™ we can come one step closer to being able to express our
 domain as clearly as possible in code.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/introduction/src/docs/whats-an-object.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/src/docs/whats-an-object.txt b/tutorials/introduction/src/docs/whats-an-object.txt
index 08009e0..11bb20d 100644
--- a/tutorials/introduction/src/docs/whats-an-object.txt
+++ b/tutorials/introduction/src/docs/whats-an-object.txt
@@ -47,7 +47,7 @@ is the OBSERVER of the object, meaning, the algorithm, that gets to decide what
 
 This is the same in real life. I don't get to decide how I communicate with you. I have to use english, and I have to
 use email, and I have to send it to a specific mailing list. It is the algorithm of the interaction between us, the
-Zest� dev mailing list, that has set these rules, not *I* as a participant in this interaction. The same should,
+Zest™ dev mailing list, that has set these rules, not *I* as a participant in this interaction. The same should,
 obviously, be the case for objects.
 
 So, with the understanding that algorithms should define roles for collaborating objects, and objects should then
@@ -63,7 +63,7 @@ This "solution", which is caused by this fundamental flaw in "class oriented pro
 causes a number of other problems, such as the "self schizophrenia" problem, whereby there is no way to tell where the
 object really is. There is no "this" pointer that has any relevant meaning.
 
-The Composite pattern, as implemented in COP and Zest�, gets around this by simply saying that the composite, as a
+The Composite pattern, as implemented in COP and Zest™, gets around this by simply saying that the composite, as a
 whole, is an object. Tada, we now have a "this" pointer, and a coherent way to deal with the object graph as though it
 was a single object. We are now able to get back to the strengths of the procedural approach, which allows the
 implementer of the algorithm to define the roles needed for the algorithm. The roles can either be specific to an
@@ -77,7 +77,7 @@ necessary to read composite code when trying to understand algorithms. The assum
 more algorithms than composites, therefore it has to be easy to ready algorithms, and only when necessary dive down into
 composite code.
 
-When talking about Composites as Objects in Zest� it is most relevant to look at Entities, since these represent physical
+When talking about Composites as Objects in Zest™ it is most relevant to look at Entities, since these represent physical
 objects in a model, rather than algorithms or services, or other non-instance-oriented things.
 
 If Entities should implement roles, via mixins, in order to interact with each other through algorithms, then the
@@ -134,7 +134,7 @@ code and read it. If we have read the mixin code once, and the same mixin is reu
 it easier for us to understand it the next time we see it being used in another algorithm.
 
 To summarize thus far, we have looked at why OOP so far has not worked out, why this is the case, and how COP deals
-with it, and how we can implement a better solution of Entities using Zest�. All is well!
+with it, and how we can implement a better solution of Entities using Zest™. All is well!
 
 The next step is to start using these Entities in algorithms. Algorithms are usually stateless, or at least they don't
 have any state that survives the execution of the algorithm. There is input, some calculation, and then output. In
@@ -189,15 +189,15 @@ The interaction method "delegate" is testable, both with mocks of the input, and
 roles. The implementations are also testable, and if the same mixin is used over and over for the implementation, then
 only one set of tests is needed for each role interface.
 
-To summarize we have in COP/Zest� a way to get the best from procedural and object-oriented programming. As we have seen
+To summarize we have in COP/Zest™ a way to get the best from procedural and object-oriented programming. As we have seen
 the functionality falls into three categories, the entities implementing objects, the services implementing
 interactions, and the user interface implementing the context. This also maps well to the ideas of ModelViewController,
 which in turn maps well to the new ideas from Mr Reenskaug (inventor of MVC) called DCI: Data-Context-Interaction. As a
-side-effect of this discussion we have therefore also seen how COP/Zest� can be used to implement DCI, which is an
+side-effect of this discussion we have therefore also seen how COP/Zest™ can be used to implement DCI, which is an
 important next step in understanding objects and their interactions, the fundamentals of which (I believe) are captured
 on this page.
 
 That's it. Well done if you've read this far :-)
 
 Comments and thoughts to qi4j-dev forum at Google Groups on this are highly appreciated. This is very very important topics,
-and crucial to understanding/explaining why COP/Zest� is so great! :-)
+and crucial to understanding/explaining why COP/Zest™ is so great! :-)

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt b/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
index 1d298c7..baca4b6 100644
--- a/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
+++ b/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
@@ -17,18 +17,18 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-[[ten-minutes-intro,Zest� in 10 minutes]]
-= Zest� in 10 minutes =
+[[ten-minutes-intro,Zest™ in 10 minutes]]
+= Zest™ in 10 minutes =
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
+http://qi4j.org/downloads.html[Zest™ SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
 
-    * Zest� does not introduce any new programming language, no additional compilers needed and all your existing tools
+    * Zest™ does not introduce any new programming language, no additional compilers needed and all your existing tools
       work just like before. It is pure Java.
-    * Zest� works with Composites.
-    * The equivalent of an Object instance in OOP, is a Composite instance in Zest�.
+    * Zest™ works with Composites.
+    * The equivalent of an Object instance in OOP, is a Composite instance in Zest™.
     * Composites are constructed from Fragments.
     * Fragments are Mixins, Concerns, Constraints and SideEffects.
     * Only Mixins carry Composite state. The others are shared between Composite instances.
@@ -62,14 +62,14 @@ tag=allClass
 
 Extending the ConcernOf is a convenience mechanism, instead of an explicit @ConcernFor annotation on a private field,
 which can be used in rare occasions when you are not able to extend. This base class defines the `next` field, which is
-set up by the Zest� runtime and points to the next fragment in the call stack.
+set up by the Zest™ runtime and points to the next fragment in the call stack.
 
-We can also see that the InventoryService is provided to the concern, which is done with dependency injection. Zest�
+We can also see that the InventoryService is provided to the concern, which is done with dependency injection. Zest™
 also supports dependency injection via constructors and methods.
 
-The above example is obviously doing persistence, and we have no code handling this. But Zest� supports persistence
-directly in its Core, and it is taken care of by Zest�, since it is declared as an EntityComposite.
-Nothing else is needed, provided that the Zest� Runtime has been setup with one or more persisted EntityStores. But
+The above example is obviously doing persistence, and we have no code handling this. But Zest™ supports persistence
+directly in its Core, and it is taken care of by Zest™, since it is declared as an EntityComposite.
+Nothing else is needed, provided that the Zest™ Runtime has been setup with one or more persisted EntityStores. But
 we have a naming convention that EntityComposites have "Entity" as the suffix in its name.
 
 There are other built-in Composite subtypes as well, such as ValueComposite and ServiceComposite. This distinction helps
@@ -93,10 +93,10 @@ tag=allClass
 -----------
 The MailService is dependency injected, as we have seen before.
 
-@This is telling Zest� that the SideEffect needs a reference to the Composite instance that it belongs to.
+@This is telling Zest™ that the SideEffect needs a reference to the Composite instance that it belongs to.
 
 By asking for both the HasCustomer and the HasLineItems types, we get type-safety and don't need to bother with casts.
-In fact, Zest� will ensure that you can't even cast the `hasCustomer` instance to the HasLineItems type.
+In fact, Zest™ will ensure that you can't even cast the `hasCustomer` instance to the HasLineItems type.
 
 By not referencing the aggregated interface OrderEntity, we reduce the coupling of this SideEffect and it can be used
 in any other Composite where the HasCustomer and HasLineItems combination is used, for instance in an InvoiceEntity.
@@ -105,5 +105,5 @@ So, build the report, send it via the MailService.
 
 == Conclusion ==
 
-In this short introduction, we have covered the essence of Zest�. We have looked at what is a Composite, seen some of the
+In this short introduction, we have covered the essence of Zest™. We have looked at what is a Composite, seen some of the
 Fragments in action, and how simple it is to turn a Composite into a persisted Composite, known as an EntityComposite.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
index 80ad021..55c9412 100644
--- a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
+++ b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
@@ -17,16 +17,16 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-[[thirty-minutes-intro,Zest� in 30 minutes]]
-= Zest� in 30 minutes =
+[[thirty-minutes-intro,Zest™ in 30 minutes]]
+= Zest™ in 30 minutes =
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
+http://qi4j.org/downloads.html[Zest™ SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
 
-This introduction will deepen your understanding of Zest�, as we touches on a couple of the common features of Zest�. It
-is expected that you have gone through and understood the "Zest� in 10 minutes" introduction.
+This introduction will deepen your understanding of Zest™, as we touches on a couple of the common features of Zest™. It
+is expected that you have gone through and understood the "Zest™ in 10 minutes" introduction.
 
 If you want to reproduce what's explained in this tutorial, remember to depend on the Core Runtime artifact that depends
 on Core API, Core SPI, Core Bootstrap and Core Functional & I/O APIs:
@@ -56,8 +56,8 @@ source=tutorials/introduction/thirtyminutes/src/main/java/org/qi4j/demo/thirtymi
 tag=2
 -----------
 
-Quite a lot of Zest� features are leveraged above;
-[1] Property is a first class citizen in Zest�, instead of getters/setters naming convention to declare properties.
+Quite a lot of Zest™ features are leveraged above;
+[1] Property is a first class citizen in Zest™, instead of getters/setters naming convention to declare properties.
 [2] ValueComposite for Action means that it is among other things Immutable.
 [3] The Action extends a Property. We call that Property subtyping and highly recommended.
 [4] The CompositeBuilder creates Immutable Action instances.
@@ -87,7 +87,7 @@ tag=4
 
 The above construct is called a Generic Concern, since it implements java.lang.reflect.InvocationHandler instead of the
 interface of the domain model. The ConcernOf baseclass will also need to be of InvocationHandler type, and the
-Zest� Runtime will handle the chaining between domain model style and this generic style of interceptor call chain.
+Zest™ Runtime will handle the chaining between domain model style and this generic style of interceptor call chain.
 
 Finally, we need to declare the Concern in the OrderEntity;
 
@@ -109,7 +109,7 @@ Glad you asked. It is done via the Query API. It is important to understand that
 the persistence concern of storage and retrieval. This enables many performance optimization opportunities as well as a
 more flexible Indexing strategy. The other thing to understand is that the Query API is using the domain model, in Java,
 and not some String based query language. We have made this choice to ensure refactoring safety. In rare cases, the
-Query API is not capable enough, in which case Zest� still provides the ability to look up and execute native queries.
+Query API is not capable enough, in which case Zest™ still provides the ability to look up and execute native queries.
 
 Let's say that we want to find a particular Order from its SequenceNumber.
 
@@ -152,13 +152,13 @@ This covers the most basic Query capabilities and how to use it. For Querying to
 assembled during bootstrap. At the time of this writing, only an RDF indexing subsystem exist, and is added most easily
 by assembly.addAssembler( new RdfNativeSesameStoreAssembler() ).
 
-It can be a bit confusing to see Zest� use Java itself as a Query language, but since we have practically killed the
+It can be a bit confusing to see Zest™ use Java itself as a Query language, but since we have practically killed the
 classes and only operate with interfaces, it is possible to do a lot of seemingly magic stuff. Just keep in mind that
 it is pure Java, albeit heavy use of dynamic proxies to capture the intent of the query.
 
 == Conclusion ==
 
-We have now explored a couple more intricate features of Zest�, hopefully without being overwhelmed with details on how
-to create applications from scratch, how to structure applications, and how the entire Zest� Extension system works.
+We have now explored a couple more intricate features of Zest™, hopefully without being overwhelmed with details on how
+to create applications from scratch, how to structure applications, and how the entire Zest™ Extension system works.
 We have looked at how to add a Concern that uses a private Mixin, we have touched a bit on Generic Concerns, and
 finally a short introduction to the Query API.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/introduction/twohours/src/docs/two-hours.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/twohours/src/docs/two-hours.txt b/tutorials/introduction/twohours/src/docs/two-hours.txt
index fa14f5d..5a6d066 100644
--- a/tutorials/introduction/twohours/src/docs/two-hours.txt
+++ b/tutorials/introduction/twohours/src/docs/two-hours.txt
@@ -17,12 +17,12 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-[[two-hours-intro,Zest� in 2 hours]]
-= Zest� in 2 hours =
+[[two-hours-intro,Zest™ in 2 hours]]
+= Zest™ in 2 hours =
 
 NOTE: This tutorial is not written yet. Learn how to contribute in <<community-docs>>.
 
-This introduction assumes that the "Zest� in 10 minutes" and "Zest� in 30 minutes" introductions has been read and
+This introduction assumes that the "Zest™ in 10 minutes" and "Zest™ in 30 minutes" introductions has been read and
 understood.
 
 In this introduction we will touch on the core concepts of UnitOfWork, Application structure and Bootstrap API.
@@ -34,7 +34,7 @@ interact with the underlying persistence system. This is done via EntitySessions
 
 - Application Structure -
 
-    * There are one Application per Zest� instance.
+    * There are one Application per Zest™ instance.
 
     * An Application consists of one or more Layers.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/introduction/twominutes/src/docs/two-minutes.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/twominutes/src/docs/two-minutes.txt b/tutorials/introduction/twominutes/src/docs/two-minutes.txt
index a5c0c04..8720aaf 100644
--- a/tutorials/introduction/twominutes/src/docs/two-minutes.txt
+++ b/tutorials/introduction/twominutes/src/docs/two-minutes.txt
@@ -17,14 +17,14 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-[[two-minutes-intro,Zest� in 2 minutes]]
-= Zest� in 2 minutes =
+[[two-minutes-intro,Zest™ in 2 minutes]]
+= Zest™ in 2 minutes =
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
+http://qi4j.org/downloads.html[Zest™ SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
-To show that Zest� is not necessarily complex, not hard to get going with and easy to deploy, we are first showing the
+To show that Zest™ is not necessarily complex, not hard to get going with and easy to deploy, we are first showing the
 classic HelloWorld, as small as it can get and still be Composite Oriented Programming and not only standard OOP.
 
 If you want to reproduce what's explained in this tutorial, remember to depend on the Core Runtime artifact that depends
@@ -64,7 +64,7 @@ source=tutorials/introduction/twominutes/src/main/java/org/qi4j/demo/twominute/M
 tag=documentation
 -----------
 
-. The SingletonAssembler is a convenience class that creates a Zest� Runtime instance and an application with one layer
+. The SingletonAssembler is a convenience class that creates a Zest™ Runtime instance and an application with one layer
   and one module in it.
 
 . We declare a TransientComposite of type `Speaker`.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/services/src/docs/step1.txt
----------------------------------------------------------------------
diff --git a/tutorials/services/src/docs/step1.txt b/tutorials/services/src/docs/step1.txt
index 21f72d2..761d324 100644
--- a/tutorials/services/src/docs/step1.txt
+++ b/tutorials/services/src/docs/step1.txt
@@ -23,13 +23,13 @@
 In this tutorial we start with basic Java classes, to simulate a very simple Library where you can borrow
 and return books.
 
-Zest� relies heavily on the use of interfaces. This makes it possible for an object
+Zest™ relies heavily on the use of interfaces. This makes it possible for an object
 to externally implement a number of interfaces which internally is backed by a number
 of Mixins, some of which you may have written yourself, and some of which may have been
 reused. This is also true for services, which we are to cover in this tutorial.
 
 The first task is therefore to refactor the code so that the methods are implemented from an
-interface instead, and to essentially make the identical "application" into a Zest� application.
+interface instead, and to essentially make the identical "application" into a Zest™ application.
 We also want the Book to be a ValueComposite.
     
 Steps for this tutorial:

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/services/src/docs/step2.txt
----------------------------------------------------------------------
diff --git a/tutorials/services/src/docs/step2.txt b/tutorials/services/src/docs/step2.txt
index f0c5db0..b3b9079 100644
--- a/tutorials/services/src/docs/step2.txt
+++ b/tutorials/services/src/docs/step2.txt
@@ -21,7 +21,7 @@
 = Step 2 - Hooking into the Service Activation =
 
 Services can be "activated" and "passivated". Applications can be notified of this occurring
-by Zest� runtime by assembling them with an Activator.
+by Zest™ runtime by assembling them with an Activator.
 
 Activators methods are called around "activation" and "passivation": beforeActivation,
 afterActivation, beforeActivation, afterPassivation. The

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/services/src/docs/step3.txt
----------------------------------------------------------------------
diff --git a/tutorials/services/src/docs/step3.txt b/tutorials/services/src/docs/step3.txt
index 62363ef..f81f3e1 100644
--- a/tutorials/services/src/docs/step3.txt
+++ b/tutorials/services/src/docs/step3.txt
@@ -20,13 +20,13 @@
 [[tut-services-step3,Step 3 - Reading the Service Configuration]]
 = Step 3 - Reading the Service Configuration =
 
-Services typically have configuration. Configurations are directly supported in Zest�. A
+Services typically have configuration. Configurations are directly supported in Zest™. A
 ConfigurationComposite is a subtype of EntityComposite. That is because
 configurations are stored in EntityStores, can be modified in runtime by client code and has
 the same semantics as regular entities.
 
-Zest� also handles the bootstrapping of configuration for the services. If the ConfigurationComposite is
-not found in the configured entity store, then Zest� will automatically locate a properties file for each
+Zest™ also handles the bootstrapping of configuration for the services. If the ConfigurationComposite is
+not found in the configured entity store, then Zest™ will automatically locate a properties file for each
 service instance, read those properties into a ConfigurationComposite instance, save that to the
 entity store and provide the values to the service. The properties file must be with the same name as
 the service instance with the extension "properties" in the same package as the service.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/tutorials/services/src/docs/tut-services.txt
----------------------------------------------------------------------
diff --git a/tutorials/services/src/docs/tut-services.txt b/tutorials/services/src/docs/tut-services.txt
index fc051d9..8edcdb7 100644
--- a/tutorials/services/src/docs/tut-services.txt
+++ b/tutorials/services/src/docs/tut-services.txt
@@ -21,13 +21,13 @@
 = Services Composites Tutorial =
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
+http://zest.apache.org/download.html[Zest™ SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
 
 In this other set of tutorials it will be shown how to create and work with Service Composites, which are composites
 that extends from the ServiceComposite class. We will refactor one a very simple Library where you can borrow and
-return books to take advantage of the various features in Zest�. These refactorings will benefit from automatic Service
+return books to take advantage of the various features in Zest™. These refactorings will benefit from automatic Service
 activation and Configuration Entities management.
 
 - <<tut-services-step1>>


[06/11] zest-qi4j git commit: ZEST-40 Javadoc Overview

Posted by ni...@apache.org.
ZEST-40 Javadoc Overview


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/92ee90f0
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/92ee90f0
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/92ee90f0

Branch: refs/heads/develop
Commit: 92ee90f088ad01da3b60ae649e8ac1c524c78063
Parents: f3fee43
Author: Paul Merlin <pa...@apache.org>
Authored: Tue Jul 7 15:08:44 2015 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Tue Jul 7 15:08:44 2015 +0200

----------------------------------------------------------------------
 buildSrc/src/javadoc/overview.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/92ee90f0/buildSrc/src/javadoc/overview.html
----------------------------------------------------------------------
diff --git a/buildSrc/src/javadoc/overview.html b/buildSrc/src/javadoc/overview.html
index ef7b586..e91fbd5 100644
--- a/buildSrc/src/javadoc/overview.html
+++ b/buildSrc/src/javadoc/overview.html
@@ -16,8 +16,8 @@
 -->
 <html>
     <body>
-        <h3>Welcome to the Qi4j SDK Javadoc.</h3>
-        <p>Qi4j is a framework for domain centric application development, including evolved concepts from AOP, DI and DDD.</p>
-        <p><a href="http://qi4j.org" target="_blank">qi4j.org</a></p>
+        <h3>Welcome to the Apache Zest (Java Edition) SDK Javadoc.</h3>
+        <p>Apache Zest is a framework for domain centric application development, including evolved concepts from AOP, DI and DDD.</p>
+        <p><a href="https://zest.apache.org" target="_blank">zest.apache.org</a></p>
     </body>
 </html>


[07/11] zest-qi4j git commit: Merge branch 'DocUpdate' into develop

Posted by ni...@apache.org.
Merge branch 'DocUpdate' into develop

Conflicts:
	src/bin-dist/NOTICE.txt
	src/bin-dist/README.txt


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/f6c764e3
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/f6c764e3
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/f6c764e3

Branch: refs/heads/develop
Commit: f6c764e31659b2e05db934ae985285902e3709a0
Parents: 2fb9eb1 72a43f3
Author: Niclas Hedhman <he...@betfair.com>
Authored: Wed Jul 8 12:07:11 2015 +0300
Committer: Niclas Hedhman <he...@betfair.com>
Committed: Wed Jul 8 12:07:11 2015 +0300

----------------------------------------------------------------------
 LICENSE.txt                                     | 10 ++---
 NOTICE.txt                                      |  2 +-
 README.txt                                      | 28 +++++++-------
 core/api/src/docs/api.txt                       |  2 +-
 core/api/src/docs/application.txt               | 14 +++----
 core/api/src/docs/composition.txt               | 10 ++---
 core/api/src/docs/concern.txt                   |  6 +--
 core/api/src/docs/configuration.txt             |  4 +-
 core/api/src/docs/entitycomposite.txt           |  2 +-
 core/api/src/docs/metrics.txt                   |  4 +-
 core/api/src/docs/mixin.txt                     | 10 ++---
 core/api/src/docs/reference/ref-api.txt         |  6 +--
 core/api/src/docs/servicecomposite.txt          | 10 ++---
 core/api/src/docs/structure.txt                 | 20 +++++-----
 core/api/src/docs/type-lookup.txt               |  2 +-
 core/api/src/docs/unitofwork.txt                |  4 +-
 core/api/src/docs/valuecomposite.txt            |  2 +-
 core/bootstrap/src/docs/bootstrap.txt           | 16 ++++----
 core/functional/src/docs/functional.txt         | 10 ++---
 core/io/src/docs/io.txt                         | 14 +++----
 core/spi/src/docs/spi.txt                       |  4 +-
 core/spi/src/docs/valueserialization.txt        |  2 +-
 core/testsupport/src/docs/testsupport.txt       |  8 ++--
 .../src/docs/es-voldemort.txt                   |  2 +-
 .../indexing-solr/src/docs/index-solr.txt       |  2 +-
 extensions/indexing-sql/instructions.txt        |  8 ++--
 libraries/alarm/src/docs/alarm.txt              |  4 +-
 .../circuitbreaker/src/docs/circuitbreaker.txt  |  6 +--
 libraries/constraints/src/docs/constraints.txt  |  2 +-
 libraries/fileconfig/src/docs/fileconfig.txt    |  2 +-
 libraries/http/src/docs/http.txt                |  4 +-
 libraries/jmx/src/docs/jmx.txt                  |  2 +-
 libraries/lang-beanshell/README.txt             |  2 +-
 libraries/lang-jruby/README.txt                 |  2 +-
 libraries/logging/src/docs/logging.txt          |  4 +-
 libraries/osgi/src/docs/osgi.txt                |  8 ++--
 libraries/rest-client/src/docs/primer.txt       |  6 +--
 libraries/scheduler/src/docs/scheduler.txt      |  2 +-
 libraries/servlet/src/docs/servlet.txt          |  6 +--
 libraries/shiro-core/src/docs/shiro.txt         | 14 +++----
 libraries/shiro-web/src/docs/shiro-web.txt      |  6 +--
 libraries/spring/src/docs/spring.txt            | 20 +++++-----
 libraries/sql/src/docs/sql.txt                  |  2 +-
 .../tutorials/howto-assembly-application.txt    | 16 ++++----
 .../src/docs/tutorials/howto-build-system.txt   | 30 +++++++--------
 .../docs/tutorials/howto-configure-service.txt  |  6 +--
 .../src/docs/tutorials/howto-create-concern.txt |  4 +-
 .../src/docs/tutorials/howto-create-entity.txt  | 14 +++----
 .../docs/tutorials/howto-create-sideeffect.txt  |  4 +-
 .../src/docs/tutorials/howto-depend-on-qi4j.txt | 34 ++++++++---------
 .../tutorials/howto-leverage-properties.txt     |  6 +--
 manual/src/docs/tutorials/howto-use-io.txt      |  6 +--
 .../src/docs/tutorials/howto-writing-docs.txt   |  2 +-
 manual/src/docs/userguide/core.txt              | 26 ++++++-------
 manual/src/docs/userguide/extensions.txt        |  4 +-
 manual/src/docs/userguide/faq.txt               |  4 +-
 manual/src/docs/userguide/glossary.txt          | 40 ++++++++++----------
 manual/src/docs/userguide/index.txt             |  2 +-
 manual/src/docs/userguide/libraries.txt         |  2 +-
 manual/src/docs/userguide/preface.txt           | 16 ++++----
 manual/src/docs/userguide/tools.txt             |  4 +-
 manual/src/docs/website/home.txt                | 24 +++++++-----
 manual/src/docs/website/related.txt             |  4 +-
 manual/src/docs/website/samples.txt             | 12 +++---
 manual/src/docs/website/tutorials.txt           | 20 +++++-----
 samples/dci-cargo/README.txt                    |  2 +-
 src/bin-dist/NOTICE.txt                         |  2 +-
 src/bin-dist/README.txt                         | 20 +++++-----
 tools/envisage/src/docs/envisage.txt            |  2 +-
 tutorials/composites/src/docs/step1.txt         |  4 +-
 tutorials/composites/src/docs/step2.txt         |  4 +-
 tutorials/composites/src/docs/step5.txt         |  6 +--
 tutorials/composites/src/docs/step7.txt         |  8 ++--
 tutorials/composites/src/docs/step8.txt         |  4 +-
 tutorials/composites/src/docs/step9.txt         |  4 +-
 .../composites/src/docs/tut-composites.txt      |  8 ++--
 tutorials/introduction/src/docs/background.txt  | 14 +++----
 tutorials/introduction/src/docs/highlights.txt  |  6 +--
 tutorials/introduction/src/docs/qi4j-cop.txt    |  4 +-
 .../introduction/src/docs/state-modeling.txt    | 16 ++++----
 .../what-is-composite-oriented-programming.txt  |  8 ++--
 .../introduction/src/docs/whats-an-object.txt   | 14 +++----
 .../tenminutes/src/docs/ten-minutes.txt         | 28 +++++++-------
 .../thirtyminutes/src/docs/thirty-minutes.txt   | 24 ++++++------
 .../twohours/src/docs/two-hours.txt             |  8 ++--
 .../twominutes/src/docs/two-minutes.txt         | 10 ++---
 tutorials/services/src/docs/step1.txt           |  4 +-
 tutorials/services/src/docs/step2.txt           |  2 +-
 tutorials/services/src/docs/step3.txt           |  6 +--
 tutorials/services/src/docs/tut-services.txt    |  4 +-
 90 files changed, 396 insertions(+), 390 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f6c764e3/libraries/lang-jruby/README.txt
----------------------------------------------------------------------
diff --cc libraries/lang-jruby/README.txt
index a78ec2a,1d47320..3b2dcf5
--- a/libraries/lang-jruby/README.txt
+++ b/libraries/lang-jruby/README.txt
@@@ -1,8 -1,8 +1,8 @@@
  
 -BeanShell is licensed under LGPL, and Apache Software Foundation
 +JRuby is licensed under LGPL, and Apache Software Foundation
  doesn't allow the use of LGPL in Apache projects.
  
- Therefor, Apache Zest had to drop this library component, but
+ Therefor, Apache Zest� had to drop this library component, but
  it is still available for separate download at
  
  https://github.com/Qi4j/qi4j-sdk

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f6c764e3/libraries/sql/src/docs/sql.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f6c764e3/manual/src/docs/website/tutorials.txt
----------------------------------------------------------------------


[10/11] zest-qi4j git commit: Wrong encoding must have been used earlier. Changed to UTF-8 for all tradmarks ™, and merged in DocUpdate branch

Posted by ni...@apache.org.
Wrong encoding must have been used earlier. Changed to UTF-8 for all tradmarks ™, and merged in DocUpdate branch


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/88b203bb
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/88b203bb
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/88b203bb

Branch: refs/heads/develop
Commit: 88b203bb6c676b7b9915c87a25f7c132ef23bf13
Parents: ee29929
Author: Niclas Hedhman <he...@betfair.com>
Authored: Wed Jul 8 12:42:20 2015 +0300
Committer: Niclas Hedhman <he...@betfair.com>
Committed: Wed Jul 8 12:42:20 2015 +0300

----------------------------------------------------------------------
 core/api/src/docs/composition.txt               |  4 +--
 core/api/src/docs/concern.txt                   |  4 +--
 core/api/src/docs/configuration.txt             |  2 +-
 core/api/src/docs/entitycomposite.txt           |  2 +-
 core/api/src/docs/metrics.txt                   |  4 +--
 core/api/src/docs/mixin.txt                     | 10 +++----
 core/api/src/docs/reference/ref-api.txt         |  6 ++--
 core/api/src/docs/servicecomposite.txt          |  6 ++--
 core/api/src/docs/structure.txt                 | 20 ++++++-------
 core/api/src/docs/type-lookup.txt               |  2 +-
 core/api/src/docs/unitofwork.txt                |  4 +--
 core/api/src/docs/valuecomposite.txt            |  2 +-
 core/bootstrap/src/docs/bootstrap.txt           | 14 ++++-----
 core/functional/src/docs/functional.txt         | 10 +++----
 core/io/src/docs/io.txt                         | 14 ++++-----
 core/spi/src/docs/spi.txt                       |  4 +--
 core/spi/src/docs/valueserialization.txt        |  2 +-
 core/testsupport/src/docs/testsupport.txt       |  8 +++---
 .../src/docs/es-voldemort.txt                   |  2 +-
 .../indexing-solr/src/docs/index-solr.txt       |  2 +-
 extensions/indexing-sql/instructions.txt        |  4 +--
 libraries/alarm/src/docs/alarm.txt              |  2 +-
 .../circuitbreaker/src/docs/circuitbreaker.txt  |  6 ++--
 libraries/constraints/src/docs/constraints.txt  |  2 +-
 .../src/docs/eventsourcing-jdbm.txt             |  1 -
 libraries/fileconfig/src/docs/fileconfig.txt    |  2 +-
 libraries/http/src/docs/http.txt                |  4 +--
 libraries/jmx/src/docs/jmx.txt                  |  2 +-
 libraries/lang-beanshell/README.txt             |  2 +-
 libraries/logging/src/docs/logging.txt          |  2 +-
 libraries/metrics/dev-status.xml                |  4 +--
 libraries/osgi/src/docs/osgi.txt                |  8 +++---
 libraries/rest-client/src/docs/primer.txt       |  4 +--
 libraries/servlet/src/docs/servlet.txt          |  6 ++--
 libraries/spring/src/docs/spring.txt            | 20 ++++++-------
 .../tutorials/howto-assembly-application.txt    | 12 ++++----
 .../src/docs/tutorials/howto-build-system.txt   | 30 ++++++++++----------
 .../docs/tutorials/howto-configure-service.txt  |  6 ++--
 .../src/docs/tutorials/howto-create-concern.txt |  4 +--
 .../src/docs/tutorials/howto-create-entity.txt  | 14 ++++-----
 .../docs/tutorials/howto-create-sideeffect.txt  |  4 +--
 .../tutorials/howto-leverage-properties.txt     |  2 +-
 .../src/docs/tutorials/howto-writing-docs.txt   |  2 +-
 manual/src/docs/userguide/extensions.txt        |  4 +--
 manual/src/docs/userguide/faq.txt               |  2 +-
 manual/src/docs/userguide/glossary.txt          | 26 ++++++++---------
 manual/src/docs/userguide/index.txt             |  2 +-
 manual/src/docs/userguide/libraries.txt         |  2 +-
 manual/src/docs/userguide/preface.txt           |  8 +++---
 manual/src/docs/userguide/tools.txt             |  4 +--
 manual/src/docs/website/samples.txt             | 12 ++++----
 manual/src/docs/website/tutorials.txt           | 20 ++++++-------
 samples/dci-cargo/README.txt                    |  2 +-
 tools/envisage/src/docs/envisage.txt            |  2 +-
 tutorials/composites/src/docs/step1.txt         |  4 +--
 tutorials/composites/src/docs/step2.txt         |  4 +--
 tutorials/composites/src/docs/step5.txt         |  6 ++--
 tutorials/composites/src/docs/step7.txt         |  8 +++---
 tutorials/composites/src/docs/step8.txt         |  4 +--
 tutorials/composites/src/docs/step9.txt         |  4 +--
 .../composites/src/docs/tut-composites.txt      |  8 +++---
 tutorials/introduction/src/docs/background.txt  | 14 ++++-----
 tutorials/introduction/src/docs/qi4j-cop.txt    |  4 +--
 .../introduction/src/docs/state-modeling.txt    | 16 +++++------
 .../introduction/src/docs/whats-an-object.txt   | 14 ++++-----
 .../tenminutes/src/docs/ten-minutes.txt         | 28 +++++++++---------
 .../thirtyminutes/src/docs/thirty-minutes.txt   | 24 ++++++++--------
 .../twohours/src/docs/two-hours.txt             |  8 +++---
 .../twominutes/src/docs/two-minutes.txt         | 10 +++----
 tutorials/services/src/docs/step1.txt           |  4 +--
 tutorials/services/src/docs/step2.txt           |  2 +-
 tutorials/services/src/docs/step3.txt           |  6 ++--
 tutorials/services/src/docs/tut-services.txt    |  4 +--
 73 files changed, 260 insertions(+), 261 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/composition.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/composition.txt b/core/api/src/docs/composition.txt
index a06c965..467fd7a 100644
--- a/core/api/src/docs/composition.txt
+++ b/core/api/src/docs/composition.txt
@@ -47,12 +47,12 @@ these, so the right meta type is used for the right purpose.
     * Service - Service is injectable to other composites and java objects. They are not persistable, but if
       referenced from an Entity or Value, a new reference to the Service will be injected when the Entity/Value is
       deserialized. Services are singletons. There are 'hosted' and 'imported' Services. The 'hosted' Service has
-      Configuration and its life cycle controlled by the Zest� runtime, whereas the 'imported' Services are external
+      Configuration and its life cycle controlled by the Zest™ runtime, whereas the 'imported' Services are external
       references.
     * Transient - Short-lived composites that are not persistable. Equals/hashCode/toString are forwarded to the
       Mixin Type declaring those methods explicitly.
 
-In versions of Zest� prior to 2.0 (then Qi4j), composite types had to extend one of these 4 meta types, but in 2.0 and later, the
+In versions of Zest™ prior to 2.0 (then Qi4j), composite types had to extend one of these 4 meta types, but in 2.0 and later, the
 meta type interface is added dynamically during <<core-bootstrap-assembly>>.
 We can therefor get rid of a lot of additional types, and use Zest-free interfaces directly;
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/concern.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/concern.txt b/core/api/src/docs/concern.txt
index 0b39a9c..3d6e36f 100644
--- a/core/api/src/docs/concern.txt
+++ b/core/api/src/docs/concern.txt
@@ -34,12 +34,12 @@ business domain, and can be used for many important things in the domain model,
 ensure that the state in the entire composite is valid), coordinating services, handling events and much more.
 
 Typed Concerns doesn't have to implement all the methods in the Mixin Type. By making the class abstract and only
-implementing the methods of interest, Zest� runtime will subclass the concern (otherwise not valid for the JVM), but the
+implementing the methods of interest, Zest™ runtime will subclass the concern (otherwise not valid for the JVM), but the
 generated methods will never be invoked.
 
 == Generic Concern ==
 In classic AOP, all advice are effectively _generic_. There is no type information in the advice implementation and the
-pointcut can be defined anywhere in the code, and the implementation uses proxy InvocationHandlers. Zest� supports this
+pointcut can be defined anywhere in the code, and the implementation uses proxy InvocationHandlers. Zest™ supports this
 construct as well, and we call it *Generic Concern*.
 
 Generic Concerns will be added to all methods that the AppliesToFilter evaluates to true. By default, that is all methods.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/configuration.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/configuration.txt b/core/api/src/docs/configuration.txt
index d61e0bd..75ce54d 100644
--- a/core/api/src/docs/configuration.txt
+++ b/core/api/src/docs/configuration.txt
@@ -15,7 +15,7 @@
 
 [[core-api-service-configuration,Service Configuration]]
 = Service Configuration =
-Configuration in Zest� is for Zest� <<core-api-service>> only. The Configuration is stored in a visible Entity
+Configuration in Zest™ is for Zest™ <<core-api-service>> only. The Configuration is stored in a visible Entity
 Store and is therefor runtime modifiable and not static in properties or XML files as in most other dependency
 injection frameworks.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/entitycomposite.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/entitycomposite.txt b/core/api/src/docs/entitycomposite.txt
index c926545..b445f4b 100644
--- a/core/api/src/docs/entitycomposite.txt
+++ b/core/api/src/docs/entitycomposite.txt
@@ -22,7 +22,7 @@ Hibernate (4+ somewhat incompatible versions) and many other less known. This se
 creating objects that survives over long periods of time is a difficult one.
 
 Eric Evans points out in his book that Entities is a very definite and distinct concept that needs to be handled
-explicitly. Composite Oriented Programming in general, and Zest� in particular, takes this point very seriously and
+explicitly. Composite Oriented Programming in general, and Zest™ in particular, takes this point very seriously and
 makes Entities a central part of the whole system. And likewise, we are convinced that it is not possible to develop
 domain-knowledge-rich applications without a conscious and well-defined strategy on Entities. So, instead of spending
 endless hours trying to get Hibernate mapping to do the right thing, we introduce a Composite meta type called

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/metrics.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/metrics.txt b/core/api/src/docs/metrics.txt
index 6bf8bac..65f80a7 100644
--- a/core/api/src/docs/metrics.txt
+++ b/core/api/src/docs/metrics.txt
@@ -15,7 +15,7 @@
 
 [[core-api-metrics, Metrics API]]
 = Metrics API =
-The Zest� platform defines an advanced Metrics SPI to capture runtime metrics of Zest's internals as well be used by
+The Zest™ platform defines an advanced Metrics SPI to capture runtime metrics of Zest's internals as well be used by
 application code (via this API) to provide production metrics for operations personnel, ensuring healthy state of
 the applications.
 
@@ -25,7 +25,7 @@ There are quite a lot of different Metrics components available, which are insta
 factory for each component type, to allow for additional components to be created in the future without breaking
 compatibility in the existing implementations.
 
-The MetricsProvider is a standard Zest� Service and simply acquired via the @Service annotation on a field or
+The MetricsProvider is a standard Zest™ Service and simply acquired via the @Service annotation on a field or
 constructor argument.
 
 [snippet,java]

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/mixin.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/mixin.txt b/core/api/src/docs/mixin.txt
index 241b35b..625f894 100644
--- a/core/api/src/docs/mixin.txt
+++ b/core/api/src/docs/mixin.txt
@@ -122,16 +122,16 @@ source=core/api/src/test/java/org/qi4j/api/mixin/partial/SpeedMixin.java
 tag=partial
 -----------
 
-Above the SpeedMixin only implements the accelerate() method, and Zest� will only map that method to this mixin. The
+Above the SpeedMixin only implements the accelerate() method, and Zest™ will only map that method to this mixin. The
 other method of the SpeedLocation interface is not satisfied as the example is written and will generate a runtime
 exception.
 
 == Private Mixins ==
-Public mixins expose their methods in the composite interface, and this is not always desirable. Zest� supports
+Public mixins expose their methods in the composite interface, and this is not always desirable. Zest™ supports
 _Private Mixins_, which are only visible within the composite itself. That means that other fragments in the composite
 can see/use it, but it is not visible to the clients of the composite.
 
-Private Mixins are handled automatically. When Zest� detects a +@This+ annotation referring to a type that is not defined
+Private Mixins are handled automatically. When Zest™ detects a +@This+ annotation referring to a type that is not defined
 in the Composite interface, then that is a Private Mixin. The Mixin implementation class, however, must exist in the
 list of Mixins in the @Mixins annotation. But often, the Private Mixin only list internal Property methods in the Mixin
 Type, which will be satisfied by the standard PropertyMixin and hence always available.
@@ -172,7 +172,7 @@ Typically, AppliesTo annotation is used to filter the methods that such Generic
 and sometimes Generic Mixin implementations are "last resort".
 
 Experience shows that Generic Mixin implementations are rare, and should only be used in extreme cases. They are
-less frequent than Generic Concern or Generic SideEffect implementations, but inside the Zest� API are a couple of
+less frequent than Generic Concern or Generic SideEffect implementations, but inside the Zest™ API are a couple of
 Generic Mixin implementations that are always present to make the life of the developer easier, such as PropertyMixin,
 AssociationMixin, ManyAssociationMixin, NoopMixin. The first 3 are declared on the Composite and EntityComposite
 interfaces and automatically included if needed. They also serve as excellent example of what they can be used for.
@@ -193,6 +193,6 @@ which seems to indicate that Generic Mixin implementations are likely to be used
 
 Typed Mixin implementations are much preferred in general business logic, as they will be first-class citizens of
 the IDE as well, for navigation, find usage, refactoring and many other common tasks. This is one of the main
-advantages of the Zest� way of doing AOP compared to AspectJ et al, where "weaving" is something bolted onto an
+advantages of the Zest™ way of doing AOP compared to AspectJ et al, where "weaving" is something bolted onto an
 application's classes via regular expressions and known naming conventions, which can change in an instance by a
 developer being unaware of which PointCuts applies to his code.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/reference/ref-api.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/reference/ref-api.txt b/core/api/src/docs/reference/ref-api.txt
index bafff6d..eec16ce 100644
--- a/core/api/src/docs/reference/ref-api.txt
+++ b/core/api/src/docs/reference/ref-api.txt
@@ -14,10 +14,10 @@
 //////////////////////
 
 [[ref-core-api, Core API]]
-= Zest� Core API =
+= Zest™ Core API =
 
-The Zest� Core API is main API that Zest� developers interact with. In fact, if you need to use classes/interfaces
-in the Zest� Core SPI or Zest� Core Runtime, then please contact the Zest� Community and explain your use-case.
+The Zest™ Core API is main API that Zest™ developers interact with. In fact, if you need to use classes/interfaces
+in the Zest™ Core SPI or Zest™ Core Runtime, then please contact the Zest™ Community and explain your use-case.
 
 The Core API is strictly layered, with no _spaghetti_ cross packages. The package list is fairly long, and
 we will look at each one in detail further down.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/servicecomposite.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/servicecomposite.txt b/core/api/src/docs/servicecomposite.txt
index 3f19a6c..0736d90 100644
--- a/core/api/src/docs/servicecomposite.txt
+++ b/core/api/src/docs/servicecomposite.txt
@@ -24,8 +24,8 @@ to encapsulate all the behavior together with the object's state, programmers le
 decoupling and re-use was to make the objects into data containers and deploy services that acted upon those data
 containers. Very much what functions did on structs back in the C and Pascal days.
 
-Zest� will bring a lot of the behavior back to the Composite itself, but we still need Services for cross-composite
-functionality. The Zest� Service model is fairly simple, yet powerful and flexible enough to accommodate most
+Zest™ will bring a lot of the behavior back to the Composite itself, but we still need Services for cross-composite
+functionality. The Zest™ Service model is fairly simple, yet powerful and flexible enough to accommodate most
 service-oriented patterns and ability to integrate well with external systems whether they are in-JVM or remote,
 such as Spring, OSGi, WS-*, Rest and others.
 
@@ -37,7 +37,7 @@ The characteristics of a ServiceComposite compared to other Composite meta types
     * It has an optional Configuration.
 
 
-_Services_ in Zest� are _singletons_, one instance per definition. That means that there may exist multiple instances
+_Services_ in Zest™ are _singletons_, one instance per definition. That means that there may exist multiple instances
 of the same service type, but they can not be created on the fly in runtime, but has to be explicitly defined during
 <<core-bootstrap-assembly>>.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/structure.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/structure.txt b/core/api/src/docs/structure.txt
index 9507633..ac4d81e 100644
--- a/core/api/src/docs/structure.txt
+++ b/core/api/src/docs/structure.txt
@@ -15,17 +15,17 @@
 
 [[core-api-structure,Structure]]
 = Structure =
-Zest� promotes a conventional view of application structure, that computer science has been using for decades.
+Zest™ promotes a conventional view of application structure, that computer science has been using for decades.
 
 The definition is as follows;
 
-    * One Application per Zest� runtime instance.
+    * One Application per Zest™ runtime instance.
     * One or more Layers per Application.
     * Zero, one or more Modules per Layer.
     * Zero, one or more Assemblies per Module.
 
 The principle of this Structure is to assist the programmer to create well modularized applications, that are easily
-extended and maintained. Zest� will restrict access between Modules, so that code can only reach Composites and Objects
+extended and maintained. Zest™ will restrict access between Modules, so that code can only reach Composites and Objects
 in Modules (including itself) of the same or lower Layers.
 
 Each Layer has to be declared which lower Layer(s) it uses, and it is not allowed that a lower Layer uses a higher
@@ -33,20 +33,20 @@ Layer, i.e. cyclic references.
 
 [[core-api-application,Application]]
 = Application =
-Every Zest� runtime has _one and only one_ Application in it. It is possible to run multiple Zest� runtimes in the same
-JVM, and it is even possible to embed a Zest� runtime within a Zest� Application, but there can only be one Application
-in a Zest� runtime.
+Every Zest™ runtime has _one and only one_ Application in it. It is possible to run multiple Zest™ runtimes in the same
+JVM, and it is even possible to embed a Zest™ runtime within a Zest™ Application, but there can only be one Application
+in a Zest™ runtime.
 
 An Application is then broken into layers and modules are placed within those layers. Composites are placed within
-modules. This forms the Application Structure and is enforced by the Zest� runtime.
+modules. This forms the Application Structure and is enforced by the Zest™ runtime.
 
 [[core-api-layer,Layer]]
 = Layer =
-A Zest� Application must consist of at least one layer. More layers are common, often dividing the application along the
+A Zest™ Application must consist of at least one layer. More layers are common, often dividing the application along the
 common architectural diagrams used on whiteboards, perhaps with a UI layer at the top, followed by a service or application
 layer, then with a domain layer and finally some persistence layer at the bottom.
 
-Zest� enforces this layering by requiring the <<core-bootstrap-assembly>> to declare which layer uses which other layer. And
+Zest™ enforces this layering by requiring the <<core-bootstrap-assembly>> to declare which layer uses which other layer. And
 <<core-api-visibility>> rules define that layers below can not locate composites in layers above. Also, defining that
 "Layer1 uses Layer2" and "Layer2 uses Layer3" does NOT imply that Layer1 has <<core-api-visibility>> to Layer3. If that
 is wanted, then it must be declared explicitly.
@@ -60,7 +60,7 @@ belongs to a single Layer, but many Modules can exist in the same Layer. Composi
     * Composites from Modules in the same Layer, with Visibility set to Visibility.layer
     * Composites from Modules in Layers below, with Visibility set to Visibility.application
 
-Modules contains a lot of the Zest� infrastructure, which are the enforcers of these wise modularization principles.
+Modules contains a lot of the Zest™ infrastructure, which are the enforcers of these wise modularization principles.
 
 It is not possible to modify the Modules, their resolution nor binding in any way after the application starts.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/type-lookup.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/type-lookup.txt b/core/api/src/docs/type-lookup.txt
index 100d480..2340fab 100644
--- a/core/api/src/docs/type-lookup.txt
+++ b/core/api/src/docs/type-lookup.txt
@@ -23,7 +23,7 @@
 Composite Types Lookup can occurs when you explicitely lookup for a Composite by Type
 (ex. ServiceFinder.findService(..) methods), when you ask for an injection or when you create a new composite instance.
 
-All theses type lookup start from a Module, are lazy, cached and obey the Zest� Visibility rules. Type Lookup works
+All theses type lookup start from a Module, are lazy, cached and obey the Zest™ Visibility rules. Type Lookup works
 equally accross Composite Types with some subtle differences when it comes to Services and Entities.
 
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/unitofwork.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/unitofwork.txt b/core/api/src/docs/unitofwork.txt
index 582aefe..d8ad3bc 100644
--- a/core/api/src/docs/unitofwork.txt
+++ b/core/api/src/docs/unitofwork.txt
@@ -19,7 +19,7 @@ A UnitOfWork is a bounded group of operations performed, typically on entities,
 to other threads until the UnitOfWork is completed. It is also possible to discard these operations, as if they were
 never executed.
 
-NOTE: UnitOfWork has many similarities with the Transaction concept used with RDBMSes. But since Zest� introduced several deviations to the common definitions of Transactions, we chose to use a different term.
+NOTE: UnitOfWork has many similarities with the Transaction concept used with RDBMSes. But since Zest™ introduced several deviations to the common definitions of Transactions, we chose to use a different term.
 
 There are several key characteristics of UnitOfWork;
 
@@ -44,5 +44,5 @@ and aborting the UnitOfWork is handled by the transaction boundary, often in the
 <<core-api-layer>>)
 
 Since it is very common to have all, or nearly all, methods in the _transaction boundary_ to handle the creation and
-completion, possibly with retry, in the same class, module or even layer, Zest� provides annotations to easily declare
+completion, possibly with retry, in the same class, module or even layer, Zest™ provides annotations to easily declare
 UnitOfWork concern: @UnitOfWorkPropagation, @UnitOfWorkDiscardOn and @UnitOfWorkRetry

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/api/src/docs/valuecomposite.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/valuecomposite.txt b/core/api/src/docs/valuecomposite.txt
index f080376..7f06ec7 100644
--- a/core/api/src/docs/valuecomposite.txt
+++ b/core/api/src/docs/valuecomposite.txt
@@ -21,7 +21,7 @@ immutable and can be compared by value instead of memory reference. Concurrency
 the value exists or it doesn't, no need for synchronization. Values are typically very easy to test and very robust to
 refactoring.
 
-Zest� defines values as a primary meta type through the ValueComposite, as we think the benefits of values are great.
+Zest™ defines values as a primary meta type through the ValueComposite, as we think the benefits of values are great.
 The ValueComposite is very light-weight compared to the EntityComposite, and its value can still be persisted as part
 of an EntityComposite via a Property.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/bootstrap/src/docs/bootstrap.txt
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/docs/bootstrap.txt b/core/bootstrap/src/docs/bootstrap.txt
index 7b500b7..56be2d0 100644
--- a/core/bootstrap/src/docs/bootstrap.txt
+++ b/core/bootstrap/src/docs/bootstrap.txt
@@ -22,7 +22,7 @@
 source=core/bootstrap/dev-status.xml
 --------------
 
-Zest� has a distinct bootstrap phase, also known as the _Assembly_ of an application, where the applications structure
+Zest™ has a distinct bootstrap phase, also known as the _Assembly_ of an application, where the applications structure
 is defined programmatically. Once all the layers, modules and all the composite types in each module have been defined
 the model is instantiated into an application. This enables the entire _structure_ system in Zest, where types "belongs"
 to a module and visibility rules define default behaviors, enforcement of architectural integrity and much more.
@@ -43,7 +43,7 @@ You can also;
     * Add additional interfaces to composites dynamically.
     * Add concerns, mixins, constraints and side effects dynamically.
     * Set _meta information_ on defined types.
-    * Import external services to be available as Zest� services.
+    * Import external services to be available as Zest™ services.
     * Tag services with markers
 
 include::../../build/docs/buildinfo/artifact.txt[]
@@ -168,7 +168,7 @@ tag=UsingAssembler
 [[core-bootstrap-assembly-layered,Layered Application Assembler]]
 == Layered Application Assembler (RECOMMENDED!) ==
 
-In 2.1, a new way to instantiate Zest� applications was introduced. It starts with subclassing the
+In 2.1, a new way to instantiate Zest™ applications was introduced. It starts with subclassing the
 +LayeredApplicationAssembler+, and implementing the +assembleLayers()+ method.
 
 In the +assembleLayers()+ method, one is epected to either call the +createLayer()+ method in the super class
@@ -206,7 +206,7 @@ For example code, see the tutorial <<howto-assemble-application>>.
 
 
 == Singleton Assembler ==
-Every Zest� runtime instance consist of One Application, with one or more Layers and one or more Modules in each Layer.
+Every Zest™ runtime instance consist of One Application, with one or more Layers and one or more Modules in each Layer.
 So the minimal application is still one layer with one module. This is not recommended other than for testing purposes
 and really trivial applications.
 
@@ -218,7 +218,7 @@ source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
 tag=singleton
 --------------
 
-Once the SingletonAssembler constructor returns, the Zest� application is up and running.
+Once the SingletonAssembler constructor returns, the Zest™ application is up and running.
 
 The SingletonAssembler also makes common system resources available from the bootstrap code, such as
 Module, UnitOfWorkFactory and others. This is possible since there is only one Module.
@@ -274,10 +274,10 @@ tag=pancake
 
 == Full Assembly ==
 Full Assembly means that you have the opportunity to create any layer/module hierarchy that are within the rules of the
-Zest� runtime. It requires more support in your code to be useful, and the example below is by no means a recommended way
+Zest™ runtime. It requires more support in your code to be useful, and the example below is by no means a recommended way
 to organize large application assemblies.
 
-In principle, you first start the Zest� runtime, call newApplication with an ApplicationAssembler instance and call
+In principle, you first start the Zest™ runtime, call newApplication with an ApplicationAssembler instance and call
 activate() on the returned application. The ApplicationAssembler instance will be called with an
 ApplicationAssemblyFactory, which is used to create an ApplicationAssembly describing the application structure.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/functional/src/docs/functional.txt
----------------------------------------------------------------------
diff --git a/core/functional/src/docs/functional.txt b/core/functional/src/docs/functional.txt
index 1b0c3f4..461e091 100644
--- a/core/functional/src/docs/functional.txt
+++ b/core/functional/src/docs/functional.txt
@@ -21,9 +21,9 @@
 source=core/functional/dev-status.xml
 --------------
 
-The Zest� Core Functional API is a generic package to work with Iterables in a "functional programming language" style.
+The Zest™ Core Functional API is a generic package to work with Iterables in a "functional programming language" style.
 
-This package is completely independent of everything else in Zest� and may be used on its own in any kind of environment
+This package is completely independent of everything else in Zest™ and may be used on its own in any kind of environment
 such as Spring or Java EE applications.
 
 include::../../build/docs/buildinfo/artifact.txt[]
@@ -38,7 +38,7 @@ source=core/functional/src/test/java/org/qi4j/functional/docsupport/FunctionalDo
 tag=func1
 -----------
 
-With the Zest� Core Functional API, you go about it in a different way. The code ends up looking like this;
+With the Zest™ Core Functional API, you go about it in a different way. The code ends up looking like this;
 
 [snippet,java]
 -----------
@@ -50,11 +50,11 @@ And this is just the tip of the iceberg.
 
 == The Big Picture ==
 
-The Zest� Core Functional API are divided a handful of powerful concepts, especially when used together;
+The Zest™ Core Functional API are divided a handful of powerful concepts, especially when used together;
 
    * *Iterables* - many methods to deal with Iterable data, so that the loops in your programs can largely be removed.
 
-   * *Functions* - f(x) and f(x,y) are well-know from mathematics and used in functional programming languages. Zest� is
+   * *Functions* - f(x) and f(x,y) are well-know from mathematics and used in functional programming languages. Zest™ is
      not capable of introducing lambda calculus due to limitations in Java itself, but we can simulate a lot to allow
      people to create more readable code.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/io/src/docs/io.txt
----------------------------------------------------------------------
diff --git a/core/io/src/docs/io.txt b/core/io/src/docs/io.txt
index a8b85a8..d8ffef8 100644
--- a/core/io/src/docs/io.txt
+++ b/core/io/src/docs/io.txt
@@ -21,10 +21,10 @@
 source=core/io/dev-status.xml
 --------------
 
-The Zest� Core I/O API is completely generic and not tied to the Zest� programming model as a whole. It can be used
-independently of Zest, together with the Zest� Core Functional API, which the Core I/O API depends on.
+The Zest™ Core I/O API is completely generic and not tied to the Zest™ programming model as a whole. It can be used
+independently of Zest, together with the Zest™ Core Functional API, which the Core I/O API depends on.
 
-The Zest� Core I/O API tries to address the problem around shuffling data around from various I/O inputs and outputs,
+The Zest™ Core I/O API tries to address the problem around shuffling data around from various I/O inputs and outputs,
 possibly with transformations and filtering along the way. It was identified that there is a general mix-up of concerns
 in the stereotypical I/O handling codebases that people deal with all the time. The reasoning around this, can be found
 in the <<howto-use-io>>, and is recommended reading.
@@ -44,7 +44,7 @@ source.copyTo( destination );
 
 It seems natural to do, yet it is not present for us. We need to involve FileInputStream/FileOutputStream, wrap them
 in Buffered versions of it, do our own looping, close the streams afterwards and what not. So, the java.io.File does
-not have this simple feature and in the Zest� Core API, we need to work around this limitation. We also want to
+not have this simple feature and in the Zest™ Core API, we need to work around this limitation. We also want to
 make the abstraction a little bit more encompassing than "just" files. So how does that look like then?
 
 == First Examples ==
@@ -60,7 +60,7 @@ tag=io1
 -----------
 
 Pretty much self-explanatory, wouldn't you say? But what happened to the handling of exceptions and closing of
-resources? It is all handled inside the Zest� Core I/O API. There is nothing you can forget to do.
+resources? It is all handled inside the Zest™ Core I/O API. There is nothing you can forget to do.
 
 Another simple example, where we want to count the number of lines in the text;
 
@@ -127,7 +127,7 @@ interface. For O/S resources, they are handled purely inside the Input and Outpu
 Sender/Receiver are effectively dealing with the data itself.
 
 == org.qi4j.io.Transforms ==
-The 3 component in the Zest� Core I/O API is the transformations that are possible. Interestingly enough, with the
+The 3 component in the Zest™ Core I/O API is the transformations that are possible. Interestingly enough, with the
 above separation of concerns, we don't need an InputOutput type that can both receive and send data. Instead, we
 simply need to prepare easy to use static factory methods, which are found in the org.qi4j.io.Transforms class. Again,
 it is fairly straight forward to create your own Transforms if you need something not provided here.
@@ -176,7 +176,7 @@ tag=progress
 
 It combines the Counter and the Log implementations, so that the count is forwarded to the Log at a given interval, such
 as every 1000 items. This may not be what you think a ProgressLog should look like, but it serves as a good example on
-how you can combine the general principles found in the Zest� Core API package.
+how you can combine the general principles found in the Zest™ Core API package.
 
 == How to write a filter specification? ==
 The filter transform takes a specification implementation which has a very simple method, isSatisfiedBy() (read more

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/spi/src/docs/spi.txt
----------------------------------------------------------------------
diff --git a/core/spi/src/docs/spi.txt b/core/spi/src/docs/spi.txt
index 5b000ea..32fc8b2 100644
--- a/core/spi/src/docs/spi.txt
+++ b/core/spi/src/docs/spi.txt
@@ -21,7 +21,7 @@
 source=core/spi/dev-status.xml
 --------------
 
-The Zest� Core Runtime has a number of extension points, which we call the _Qi4j Core Extension SPI_. These are defined
+The Zest™ Core Runtime has a number of extension points, which we call the _Qi4j Core Extension SPI_. These are defined
 interfaces used *only* by the Core Runtime and *never* directly by application code. <<extensions>> are assembled in
 applications during the bootstrap phase.
 
@@ -35,7 +35,7 @@ There are currently 5 Core SPI extensions;
     * <<core-spi-indexing>>
     * <<core-spi-metrics>>
 
-Zest� Runtime Extensions implementations may depend on Zest� Libraries, but Libraries are NOT ALLOWED to depend on
+Zest™ Runtime Extensions implementations may depend on Zest™ Libraries, but Libraries are NOT ALLOWED to depend on
 Extensions. Applications code is NOT ALLOWED to depend on extensions. And application code SHOULD NOT depend on the
 Core Extension SPI. If you think that is needed, please contact qi4j-dev forum at Google Groups, to see if your usecase
 can be solved in a support manner, or that we need to extend the Core API to support it.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/spi/src/docs/valueserialization.txt
----------------------------------------------------------------------
diff --git a/core/spi/src/docs/valueserialization.txt b/core/spi/src/docs/valueserialization.txt
index 1d4b650..fa5fb86 100644
--- a/core/spi/src/docs/valueserialization.txt
+++ b/core/spi/src/docs/valueserialization.txt
@@ -22,7 +22,7 @@
 
 == Overview ==
 
-The Zest� Core Runtime use ValueSerialization to provide string representation of ValueComposites via their `toString()`
+The Zest™ Core Runtime use ValueSerialization to provide string representation of ValueComposites via their `toString()`
 method, and, their instanciation from the very same representation via the `newValueFromSerializedState(..)` method of
 the ValueBuilderFactory API.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/core/testsupport/src/docs/testsupport.txt
----------------------------------------------------------------------
diff --git a/core/testsupport/src/docs/testsupport.txt b/core/testsupport/src/docs/testsupport.txt
index 82d6ed9..f3c9585 100644
--- a/core/testsupport/src/docs/testsupport.txt
+++ b/core/testsupport/src/docs/testsupport.txt
@@ -21,15 +21,15 @@
 source=core/testsupport/dev-status.xml
 --------------
 
-Zest� comes with classes to help with testing. For general development, only a couple of classes are of interest as the
+Zest™ comes with classes to help with testing. For general development, only a couple of classes are of interest as the
 others are mostly for EntityStore and Index/Query SPI implementations. There is also some mocking support, to allow
-some of Zest's unique aspects to be mocked, but since Zest� is so flexible at a fine-granular level, we have found that
+some of Zest's unique aspects to be mocked, but since Zest™ is so flexible at a fine-granular level, we have found that
 mocking is seldom, if ever, needed.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
 == Your First Testcase ==
-In most cases, you will probably use the AbstractQi4jTest class to simplify starting a Zest� test instance.
+In most cases, you will probably use the AbstractQi4jTest class to simplify starting a Zest™ test instance.
 
 [snippet,java]
 --------------
@@ -37,7 +37,7 @@ source=tutorials/hello/src/test/java/org/qi4j/tutorials/hello/HelloTest.java
 tag=step1
 --------------
 
-This will do all the initialization of a Zest� runtime instance and create a single layer with a single module in it.
+This will do all the initialization of a Zest™ runtime instance and create a single layer with a single module in it.
 What goes into that module is declared in the assembly() method;
 
 [snippet,java]

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/extensions/entitystore-voldemort/src/docs/es-voldemort.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-voldemort/src/docs/es-voldemort.txt b/extensions/entitystore-voldemort/src/docs/es-voldemort.txt
index 5837bd1..9d6d7b3 100644
--- a/extensions/entitystore-voldemort/src/docs/es-voldemort.txt
+++ b/extensions/entitystore-voldemort/src/docs/es-voldemort.txt
@@ -41,7 +41,7 @@ tag=assembly
 
 == Configuration ==
 
-Most of the configuration of Voldemort is available in the Zest� Configuration Entity.
+Most of the configuration of Voldemort is available in the Zest™ Configuration Entity.
 
 [snippet,java]
 ----

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/extensions/indexing-solr/src/docs/index-solr.txt
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/docs/index-solr.txt b/extensions/indexing-solr/src/docs/index-solr.txt
index 2f0ebd8..e964831 100644
--- a/extensions/indexing-solr/src/docs/index-solr.txt
+++ b/extensions/indexing-solr/src/docs/index-solr.txt
@@ -27,7 +27,7 @@ source=extensions/indexing-solr/dev-status.xml
 
 Index/Query services backed by an embedded http://lucene.apache.org/solr/[Apache Solr Search].
 
-WARNING: Solr Index/Query service do not support the Zest� Query API but only native Solr queries.
+WARNING: Solr Index/Query service do not support the Zest™ Query API but only native Solr queries.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/extensions/indexing-sql/instructions.txt
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/instructions.txt b/extensions/indexing-sql/instructions.txt
index 5bed896..3b38bca 100644
--- a/extensions/indexing-sql/instructions.txt
+++ b/extensions/indexing-sql/instructions.txt
@@ -20,7 +20,7 @@
 These instructions are for preparing your out-of-box PostgreSQL installation so it would be usable with PostgreSQL indexing of Zest.
 
 1. Creating login role and database
-1.1. Using pgAdmin, connect to PostgreSQL database, and create database you intend to use to store Zest� entity data, and login role for Zest� application to use when it connects to database.
+1.1. Using pgAdmin, connect to PostgreSQL database, and create database you intend to use to store Zest™ entity data, and login role for Zest™ application to use when it connects to database.
 1.1. Update these values into your .properties file, if necessary.
 
 2. Adding ltree as type
@@ -29,6 +29,6 @@ These instructions are for preparing your out-of-box PostgreSQL installation so
 2.3. This will open new window, erase any text which pgAdmin generates there for you.
 2.4. Then navigate to your PostgreSQL installation directory, then into 'share', and then into 'contrib'. Open file 'ltree.sql' in your favorite text editor.
 2.5. Select all text, copy it, and paste to SQL query window which you opened in stage 2.2.
-2.6. If you know what you are doing, you may change the line 'SET search_path = public;' to make search_path be 'pg_catalog', or name of schema that Zest� application will use ('qi4j' by default). It's ok to leave it to 'public' though.
+2.6. If you know what you are doing, you may change the line 'SET search_path = public;' to make search_path be 'pg_catalog', or name of schema that Zest™ application will use ('qi4j' by default). It's ok to leave it to 'public' though.
 2.7. Hit F5 or go Query -> Execute Query to execute the SQL. It should print some notices into output window but no errors nor warnings should be present.
 2.8. Ltree type should be now installed to your PostgreSQL installation.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/alarm/src/docs/alarm.txt
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/docs/alarm.txt b/libraries/alarm/src/docs/alarm.txt
index 996a9fe..c0c7a59 100644
--- a/libraries/alarm/src/docs/alarm.txt
+++ b/libraries/alarm/src/docs/alarm.txt
@@ -78,7 +78,7 @@ tag=documentation
 --------------
 
 == Alarm Models ==
-The Zest� Alarm library comes with 3 _Alarm Models_ which should be sufficient for most uses. These are based on decades
+The Zest™ Alarm library comes with 3 _Alarm Models_ which should be sufficient for most uses. These are based on decades
 of experience from the industrial automation industry and user feedback.
 
 == Simple Alarm Model ==

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/circuitbreaker/src/docs/circuitbreaker.txt
----------------------------------------------------------------------
diff --git a/libraries/circuitbreaker/src/docs/circuitbreaker.txt b/libraries/circuitbreaker/src/docs/circuitbreaker.txt
index 7b074a6..6706bd5 100644
--- a/libraries/circuitbreaker/src/docs/circuitbreaker.txt
+++ b/libraries/circuitbreaker/src/docs/circuitbreaker.txt
@@ -27,7 +27,7 @@ source=libraries/circuitbreaker/dev-status.xml
 
 The Circuit Breaker library provides a way to guard your application
 against faulty external systems (e.g. mail servers  being down, web
-services being down). It is used by many Zest� Extensions and Libraries.
+services being down). It is used by many Zest™ Extensions and Libraries.
 
 There's a couple of differences between this implementation and others
 seen on the net, but we've also heavily borrowed from others. The
@@ -54,7 +54,7 @@ track service levels and see exception messages, and trip/enable circuit
 breakers.
 
 Fourth, if an external system is unavailable due to a circuitbreaker
-tripping it should be possible to expose this to other Zest� services.
+tripping it should be possible to expose this to other Zest™ services.
 There is a standard implementation of the Availability interface that
 delegates to a circuit breaker and the Enabled configuration flag, which
 is what we'd suspect will be used in most cases where external systems
@@ -64,7 +64,7 @@ include::../../build/docs/buildinfo/artifact.txt[]
 
 == Direct usage ==
 
-The CircuitBreaker can be used directly, even without using anything else from the Zest� SDK.
+The CircuitBreaker can be used directly, even without using anything else from the Zest™ SDK.
 
 Here is a code snippet that demonstrate how to create a CircuitBreaker and how it behave:
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/constraints/src/docs/constraints.txt
----------------------------------------------------------------------
diff --git a/libraries/constraints/src/docs/constraints.txt b/libraries/constraints/src/docs/constraints.txt
index f0a7e59..c358f75 100644
--- a/libraries/constraints/src/docs/constraints.txt
+++ b/libraries/constraints/src/docs/constraints.txt
@@ -26,7 +26,7 @@ source=libraries/constraints/dev-status.xml
 --------------
 
 The Constraints library provide a bunch of often used Constraints based on the
-Zest� Constraints api described in <<def-constraint>>.
+Zest™ Constraints api described in <<def-constraint>>.
 
 Remember that you are not limited to constraints presents in this library, you
 are encouraged to write your own constraints. See <<howto-create-constraint>>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/eventsourcing-jdbm/src/docs/eventsourcing-jdbm.txt
----------------------------------------------------------------------
diff --git a/libraries/eventsourcing-jdbm/src/docs/eventsourcing-jdbm.txt b/libraries/eventsourcing-jdbm/src/docs/eventsourcing-jdbm.txt
index 2202240..a2ead6e 100644
--- a/libraries/eventsourcing-jdbm/src/docs/eventsourcing-jdbm.txt
+++ b/libraries/eventsourcing-jdbm/src/docs/eventsourcing-jdbm.txt
@@ -25,7 +25,6 @@
 source=libraries/eventsourcing-jdbm/dev-status.xml
 --------------
 
-Event Sourcing - JDBM Library
 
 NOTE: This Library has no documentation yet. Learn how to contribute in <<community-docs>>.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/fileconfig/src/docs/fileconfig.txt
----------------------------------------------------------------------
diff --git a/libraries/fileconfig/src/docs/fileconfig.txt b/libraries/fileconfig/src/docs/fileconfig.txt
index 5baa0a4..ac973e6 100644
--- a/libraries/fileconfig/src/docs/fileconfig.txt
+++ b/libraries/fileconfig/src/docs/fileconfig.txt
@@ -27,7 +27,7 @@ source=libraries/fileconfig/dev-status.xml
 
 The FileConfig library provide a service for accessing application-specific directories.
 
-A lot of the Zest� Libraries and Extensions make use of this library to locate files.
+A lot of the Zest™ Libraries and Extensions make use of this library to locate files.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/http/src/docs/http.txt
----------------------------------------------------------------------
diff --git a/libraries/http/src/docs/http.txt b/libraries/http/src/docs/http.txt
index 3c135dd..654220f 100644
--- a/libraries/http/src/docs/http.txt
+++ b/libraries/http/src/docs/http.txt
@@ -29,7 +29,7 @@ The HTTP library provides a Jetty based embedded HTTP service with support for e
 filters assembly as Services.
 
 It's an easy way to embedd a servlet container and reuse everything that can be run in it (JAX-*, Restlet, Wicket,
-Vaadin, GWT etc..). If instead you want to run a Zest� Application in a servlet container, see <<library-servlet>>.
+Vaadin, GWT etc..). If instead you want to run a Zest™ Application in a servlet container, see <<library-servlet>>.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
@@ -90,7 +90,7 @@ tag=jmx
 
 === Configuration ===
 
-Underlying Jetty engine configuration is exposed as a Zest� Service Configuration.
+Underlying Jetty engine configuration is exposed as a Zest™ Service Configuration.
 The only one that is mandatory is the port.
 
 See org.qi4j.library.http.JettyConfiguration for a reference of all available

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/jmx/src/docs/jmx.txt
----------------------------------------------------------------------
diff --git a/libraries/jmx/src/docs/jmx.txt b/libraries/jmx/src/docs/jmx.txt
index 4469048..b8421a4 100644
--- a/libraries/jmx/src/docs/jmx.txt
+++ b/libraries/jmx/src/docs/jmx.txt
@@ -25,7 +25,7 @@
 source=libraries/jmx/dev-status.xml
 --------------
 
-The JMX library provides a service that exposes a Zest� app in
+The JMX library provides a service that exposes a Zest™ app in
 JMX automatically, giving you an opportunity to inspect the app much as
 you would with the <<tools-envisage>> tool.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/lang-beanshell/README.txt
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/README.txt b/libraries/lang-beanshell/README.txt
index 1d47320..aeee619 100644
--- a/libraries/lang-beanshell/README.txt
+++ b/libraries/lang-beanshell/README.txt
@@ -2,7 +2,7 @@
 BeanShell is licensed under LGPL, and Apache Software Foundation
 doesn't allow the use of LGPL in Apache projects.
 
-Therefor, Apache Zest� had to drop this library component, but
+Therefor, Apache Zest™ had to drop this library component, but
 it is still available for separate download at
 
 https://github.com/Qi4j/qi4j-sdk

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/logging/src/docs/logging.txt
----------------------------------------------------------------------
diff --git a/libraries/logging/src/docs/logging.txt b/libraries/logging/src/docs/logging.txt
index dabe4e7..ed7f6b6 100644
--- a/libraries/logging/src/docs/logging.txt
+++ b/libraries/logging/src/docs/logging.txt
@@ -21,7 +21,7 @@
 source=libraries/logging/dev-status.xml
 --------------
 
-First of all, Zest� is taking a fresh look at all things that we take for granted. Logging is one such thing.
+First of all, Zest™ is taking a fresh look at all things that we take for granted. Logging is one such thing.
 
 It should (but is not) obvious that Logging are used for three very distinct purposes, and in our opinion the concepts
 are not related and should not be abstracted in the same fashion, as has been the norm in Log4j, JDK logging, Commons

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/metrics/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/metrics/dev-status.xml b/libraries/metrics/dev-status.xml
index 4ad3244..04d78d0 100644
--- a/libraries/metrics/dev-status.xml
+++ b/libraries/metrics/dev-status.xml
@@ -21,13 +21,13 @@
         http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
     <!--none,early,beta,stable,mature-->
-    <codebase>early</codebase>
+    <codebase>beta</codebase>
 
     <!-- none, brief, good, complete -->
     <documentation>brief</documentation>
 
     <!-- none, some, good, complete -->
-    <unittests>none</unittests>
+    <unittests>some</unittests>
   </status>
   <licenses>
     <license>ALv2</license>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/osgi/src/docs/osgi.txt
----------------------------------------------------------------------
diff --git a/libraries/osgi/src/docs/osgi.txt b/libraries/osgi/src/docs/osgi.txt
index cee2129..957bbfc 100644
--- a/libraries/osgi/src/docs/osgi.txt
+++ b/libraries/osgi/src/docs/osgi.txt
@@ -25,12 +25,12 @@
 source=libraries/osgi/dev-status.xml
 --------------
 
-OSGi Library allows you to import OSGi services as Zest� Services and to export Zest� Services as OSGi Services both
-leveraging the Zest� Availability and OSGi FallbackStrategy mechanisms.
+OSGi Library allows you to import OSGi services as Zest™ Services and to export Zest™ Services as OSGi Services both
+leveraging the Zest™ Availability and OSGi FallbackStrategy mechanisms.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
-== Export Zest� services to an OSGi Bundle ==
+== Export Zest™ services to an OSGi Bundle ==
 
 [snippet,java]
 ----
@@ -39,7 +39,7 @@ tag=export
 ----
 
 
-== Import OSGi services in a Zest� Module ==
+== Import OSGi services in a Zest™ Module ==
 
 [snippet,java]
 ----

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/rest-client/src/docs/primer.txt
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/docs/primer.txt b/libraries/rest-client/src/docs/primer.txt
index 6ed3a9d..62245bd 100644
--- a/libraries/rest-client/src/docs/primer.txt
+++ b/libraries/rest-client/src/docs/primer.txt
@@ -20,7 +20,7 @@
 [[library-rest-client-primer, HATEOAS Primer]]
 = ReST - HATEOAS Primer
 
-The Zest� ReST Client implements HATEOAS (Hypermedia As The Engine Of Application State) to the full extent intended
+The Zest™ ReST Client implements HATEOAS (Hypermedia As The Engine Of Application State) to the full extent intended
 by Roy Fielding. The ReST Client Library enables the creation of HATEOAS applications that are NOT using the URL space,
 and it is NOT about doing RPC calls over HTTP using a common exchange format (like JSON).
 
@@ -81,5 +81,5 @@ It becomes possible to blend general application and error handling logic with u
 That's basically it. This is where I want to go with support for REST, as a way to truly leverage the REST ideas and
 make it very easy to do REST applications *and* clients based on Zest, by keeping the application logic on the server.
 In the long run there would also be a JavaScript version of the client, with the same characteristics, so that you can
-easily build a jQuery UI for Zest� REST apps.
+easily build a jQuery UI for Zest™ REST apps.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/servlet/src/docs/servlet.txt
----------------------------------------------------------------------
diff --git a/libraries/servlet/src/docs/servlet.txt b/libraries/servlet/src/docs/servlet.txt
index 48974ee..4af90c1 100644
--- a/libraries/servlet/src/docs/servlet.txt
+++ b/libraries/servlet/src/docs/servlet.txt
@@ -25,16 +25,16 @@
 source=libraries/servlet/dev-status.xml
 --------------
 
-This library provide the necessary boilerplate code to bootstrap a Zest� Application in a Servlet container plus some
+This library provide the necessary boilerplate code to bootstrap a Zest™ Application in a Servlet container plus some
 facilities. It aims at a very simple need and is provided as an example integration.
 
-If instead you want to run a servlet container inside a Zest� Application, see <<library-http>>.
+If instead you want to run a servlet container inside a Zest™ Application, see <<library-http>>.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
 == Application Bootstrap ==
 
-Extends `AbstractQi4jServletBootstrap` to easily bind a Zest� `Application` activation/passivation to your webapp
+Extends `AbstractQi4jServletBootstrap` to easily bind a Zest™ `Application` activation/passivation to your webapp
 lifecycle.
 
 Use `Qi4jServletSupport#application(javax.servlet.ServletContext)` to get a handle on the `Application` from the

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/libraries/spring/src/docs/spring.txt
----------------------------------------------------------------------
diff --git a/libraries/spring/src/docs/spring.txt b/libraries/spring/src/docs/spring.txt
index 458eb99..12ec47e 100644
--- a/libraries/spring/src/docs/spring.txt
+++ b/libraries/spring/src/docs/spring.txt
@@ -27,14 +27,14 @@ source=libraries/spring/dev-status.xml
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
-== Using Spring Framework in Apache Zest� ==
-Zest� supports that Spring Application Context is imported into the Zest� runtime, and the declared Spring
-beans will be available as Zest� services. The most important things to remember are;
+== Using Spring Framework in Apache Zest™ ==
+Zest™ supports that Spring Application Context is imported into the Zest™ runtime, and the declared Spring
+beans will be available as Zest™ services. The most important things to remember are;
 
     1. Only Spring Singletons are currently supported.
-    2. One ApplicationContext per Zest� Module.
-    3. The Zest� service will be given the same name as the Spring Bean name.
-    4. Zest� Configuration is not reacbable from the Spring bean (kind of obvious).
+    2. One ApplicationContext per Zest™ Module.
+    3. The Zest™ service will be given the same name as the Spring Bean name.
+    4. Zest™ Configuration is not reacbable from the Spring bean (kind of obvious).
 
 [snippet,java]
 ----
@@ -42,10 +42,10 @@ source=libraries/spring/src/test/java/org/qi4j/library/spring/importer/Qi4jImpor
 tag=import
 ----
 
-== Using Apache Zest� in Spring Framework ==
-It is also possible to run a Zest� Application as a Spring Bean and export its Services to Spring.
+== Using Apache Zest™ in Spring Framework ==
+It is also possible to run a Zest™ Application as a Spring Bean and export its Services to Spring.
 
-Steps to export Zest� service:
+Steps to export Zest™ service:
 
     1. Create spring BeanFactory service of qi4j services to export.
     2. Create a class that extends Qi4jApplicationBootstrap.
@@ -54,7 +54,7 @@ Steps to export Zest
     5. Sets the identity of bean factory service. This identity is the spring bean name.
     6. Declare qi4j bootstrap in spring xml application context.
 
-To bootstrap the Zest� runtime in Spring, you should have a bootstrap bean that extends the
+To bootstrap the Zest™ runtime in Spring, you should have a bootstrap bean that extends the
 +org.qi4j.library.spring.bootstrap.Qi4jApplicationBootstrap+ and implement the
 +org.springframework.context.ApplicationContextAware+.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/tutorials/howto-assembly-application.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-assembly-application.txt b/manual/src/docs/tutorials/howto-assembly-application.txt
index 31a8e5b..e42a5cd 100644
--- a/manual/src/docs/tutorials/howto-assembly-application.txt
+++ b/manual/src/docs/tutorials/howto-assembly-application.txt
@@ -29,7 +29,7 @@ At runtime you will need the Core Runtime artifact too. See the <<howto-depend-o
 
 First let's recap the structural requirements of Zest;
 
-    * There is one and only one Application instance per Zest� Runtime.
+    * There is one and only one Application instance per Zest™ Runtime.
     * Every Application must contain one or more Layers.
     * All Composites must be declared in one or more Modules.
     * Each Module belong to a Layer.
@@ -40,7 +40,7 @@ Ok, that was quite a handful. Let's look at them one by one.
 
 == Application ==
 
-The first one means that for each Zest� Runtime you start, there will be exactly one application. As far as we know, Zest
+The first one means that for each Zest™ Runtime you start, there will be exactly one application. As far as we know, Zest
 is fully isolated, meaning there are no static members being populated and such.
 
 == Layers ==
@@ -58,7 +58,7 @@ that are both the top and bottom.
 
 == Modules ==
 
-The Module concept has also been around forever. And in Zest� we also makes the Modules explicit. Each Module belong to a
+The Module concept has also been around forever. And in Zest™ we also makes the Modules explicit. Each Module belong to a
 Layer, and for each Module you declare the Composite and Object types for that Module, together with a Visibility rule,
 one of; application, layer, module.
 
@@ -109,7 +109,7 @@ acting addiction).
 How to structure your code is beyond the scope of this section. If you are an experienced designer, you will have done
 that before, and you may have started out with good intentions at times only to find yourself in a spaghetti swamp
 later, or perhaps in the also famous "Clear as Clay" or "Ball (bowl?) of Mud". Either way, you need to draw on your
-experience and come up with good structure that Zest� lets you enforce.
+experience and come up with good structure that Zest™ lets you enforce.
 
 So, for the sake of education, we are going to look at an application that consists of many layers, each with a few
 modules. See picture below.
@@ -127,7 +127,7 @@ tag=main
 -----------
 
 The above is the basic setup on how to structure a real-world applicaton, unless you intend to mess with the
-implementations of various Zest� systems (yes there are hooks for that too), but that is definitely beyond the scope of
+implementations of various Zest™ systems (yes there are hooks for that too), but that is definitely beyond the scope of
 this tutorial.
 
 Now, the createXyzLayer() methods were excluded to keep the sample crisp and easy to follow. Let's take a look at what
@@ -158,5 +158,5 @@ source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java
 tag=shutdown
 -----------
 
-This concludes this tutorial. We have looked how to get the initial Zest� runtime going, how to declare the assembly
+This concludes this tutorial. We have looked how to get the initial Zest™ runtime going, how to declare the assembly
 for application model creation and finally the activation of the model itself.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/tutorials/howto-build-system.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-build-system.txt b/manual/src/docs/tutorials/howto-build-system.txt
index 79ab6e1..e0008eb 100644
--- a/manual/src/docs/tutorials/howto-build-system.txt
+++ b/manual/src/docs/tutorials/howto-build-system.txt
@@ -20,24 +20,24 @@
 [[build-system,Build System]]
 = Build System =
 
-This tutorial is intended for developpers who want to build the Zest� SDK themselves.
-It describe the Zest� SDK Build System from compilation to publication of artifacts for consumption by other
+This tutorial is intended for developpers who want to build the Zest™ SDK themselves.
+It describe the Zest™ SDK Build System from compilation to publication of artifacts for consumption by other
 applications.
 
-If instead you want to setup your project build system to depend on modules of the Zest� SDK see the
+If instead you want to setup your project build system to depend on modules of the Zest™ SDK see the
 <<howto-depend-on-qi4j,dedicated tutorial>>.
 
 
 == Gradle ==
 
 NOTE: All major Java IDEs have great Gradle support.
-Visit the http://www.gradle.org/tooling[Gradle Tooling] page to learn how to import the Zest� SDK build into your
+Visit the http://www.gradle.org/tooling[Gradle Tooling] page to learn how to import the Zest™ SDK build into your
 favorite IDE.
 
-Zest� community migrated away from Maven after several years of frustration, especially around release management,
+Zest™ community migrated away from Maven after several years of frustration, especially around release management,
 versioning and cross-module dependency resolution issues, in Feb 2011.
 The tool of choice is now Gradle, and it doesn't require any installation, there are +gradlew+ and +gradlew.bat+ in
-the root folder of the Zest� SDK that will bootstrap Gradle if not done so already.
+the root folder of the Zest™ SDK that will bootstrap Gradle if not done so already.
 
 If you are new to Gradle, you should keep the http://www.gradle.org/documentation[documentation] at hands.
 
@@ -48,7 +48,7 @@ http://gradle.org/docs/current/userguide/tutorial_this_and_that.html#sec:gradle_
 
 == Root project tasks ==
 
-The Zest� SDK root project has tasks that work with the whole SDK.
+The Zest™ SDK root project has tasks that work with the whole SDK.
 The default build, triggered when running gradle without any command line arguments, compiles the code and run the
 tests, but nothing else.
 A quick way to check that nothing broke.
@@ -109,7 +109,7 @@ To see all available tasks on a submodule issue the following command:
 ----
 
 This example will output all gradle tasks available in the +tests/performance+ module where you should find
-the +testPerf+ task that run the Zest� performance test suite.
+the +testPerf+ task that run the Zest™ performance test suite.
 
 
 == Versions ==
@@ -131,7 +131,7 @@ If a +version+ property is not defined, the build system will refuse to make a r
 
 == Tests ==
 
-NOTE: See the http://qi4j.org/community/ci.html[Zest� Continuous Integration] for current tests results
+NOTE: See the http://qi4j.org/community/ci.html[Zest™ Continuous Integration] for current tests results
 
 // TODO
 
@@ -144,7 +144,7 @@ They are not part of the default build.
 
 === Performance tests ===
 
-Performance tests provide performance mesurements for typical Zest� use cases.
+Performance tests provide performance mesurements for typical Zest™ use cases.
 They are not part of the default build.
 
 // TODO
@@ -179,12 +179,12 @@ We'll list here services that the unit tests will use if available.
 - MySQL for +extensions/entitystore-sql+ (need setup, see test source)
 
 
-== Releasing the Zest� SDK ==
+== Releasing the Zest™ SDK ==
 
 IMPORTANT: Remember that if a +version+ property is not defined, the build system will refuse to make a release and upload.
 
-The Zest� SDK build system is setup for an easy release process.
-This is very useful to the Zest� Core Team but can also be useful to third parties that want to cut a in-house release.
+The Zest™ SDK build system is setup for an easy release process.
+This is very useful to the Zest™ Core Team but can also be useful to third parties that want to cut a in-house release.
 In this regard, we try to make every aspect of the release process usable for such cases.
 
 The following sections describe various aspects of the release process.
@@ -193,12 +193,12 @@ By default you need to have a proper PGP setup, see below.
 
 === Release Criteria ===
 
-The Zest� SDK modules are of varying maturity level and we try to maintain a STATUS (+dev-status.xml+) file indicating
+The Zest™ SDK modules are of varying maturity level and we try to maintain a STATUS (+dev-status.xml+) file indicating
 how good the codebase, documentation and unit tests are for each of the modules. This is highly subjective and
 potentially different individuals will judge this differently, but at least it gives a ballpark idea of the situation
 for our users.
 
-The Zest� SDK build system use the values from the +dev-status.xml+ files to filter out non-releasable modules out for
+The Zest™ SDK build system use the values from the +dev-status.xml+ files to filter out non-releasable modules out for
 the +javadocs+ and +uploadArchives+ root project tasks.
 Moreover, the +release+ task ensure that no releasable module depends on module(s) that don't fit the release criteria
 and throw a detailed exception if need be.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/tutorials/howto-configure-service.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-configure-service.txt b/manual/src/docs/tutorials/howto-configure-service.txt
index e019d25..8776e79 100644
--- a/manual/src/docs/tutorials/howto-configure-service.txt
+++ b/manual/src/docs/tutorials/howto-configure-service.txt
@@ -15,10 +15,10 @@
 
 [[howto-configure-service,Configure a Service]]
 = Configure a Service =
-Zest� supports a Configuration system for services. The configuration instance itself is an Entity and is therefor
+Zest™ supports a Configuration system for services. The configuration instance itself is an Entity and is therefor
 readable, writeable and queryable, just like other Entities. This should make Configuration management much simpler,
 since you can easily build GUI tools to allow editing of these in runtime. However, to simplify the initial values of
-the Configuration instance, Zest� also does the initial bootstrapping of the Configuration entity for you. This HowTo is
+the Configuration instance, Zest™ also does the initial bootstrapping of the Configuration entity for you. This HowTo is
 going to show how.
 
 If you want to reproduce what's explained in this tutorial, remember to depend on the Core Bootstrap artifact:
@@ -139,7 +139,7 @@ tag=params
 File: org/qi4j/manual/travel/OrbitzService.properties
 
 == Changing Configuration in runtime ==
-Unlike most frameworks, the Configuration in Zest� is an active Entity, and once the properties file has been read once
+Unlike most frameworks, the Configuration in Zest™ is an active Entity, and once the properties file has been read once
 at the first(!) startup, it no longer serves any purpose. The Configuration will always be retrieved from the
 EntityStore. Changes to the properties file are not taken into consideration if the Configuration entity is found in the
 entity store.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/tutorials/howto-create-concern.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-create-concern.txt b/manual/src/docs/tutorials/howto-create-concern.txt
index 4438b4e..64cfde8 100644
--- a/manual/src/docs/tutorials/howto-create-concern.txt
+++ b/manual/src/docs/tutorials/howto-create-concern.txt
@@ -41,8 +41,8 @@ tag=allClass
 Note that we could have implemented the InventoryConcern as an abstract class if we were not interested in __all__ the methods in the Order interface.
 Extending the ConcernOf is a convenience mechanism, instead of an explicit @ConcernFor annotation on
 a private field, which can be used in rare occasions when you are not able to extend. This base class defines the next
-field, which is set up by the Zest� runtime and points to the next fragment in the call stack. We can also see that the
-InventoryService is provided to the concern, which is done with dependency injection. Zest� also supports dependency
+field, which is set up by the Zest™ runtime and points to the next fragment in the call stack. We can also see that the
+InventoryService is provided to the concern, which is done with dependency injection. Zest™ also supports dependency
 injection via constructors and methods.
 
 It can be used as follows;

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/tutorials/howto-create-entity.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-create-entity.txt b/manual/src/docs/tutorials/howto-create-entity.txt
index ec16fe4..70e3148 100644
--- a/manual/src/docs/tutorials/howto-create-entity.txt
+++ b/manual/src/docs/tutorials/howto-create-entity.txt
@@ -15,9 +15,9 @@
 
 [[howto-create-entity,Create an Entity]]
 = Create an Entity =
-One of the most common tasks in Zest� is the management of the life cycle of Entities. Since Zest� is capable of
+One of the most common tasks in Zest™ is the management of the life cycle of Entities. Since Zest™ is capable of
 delivering much higher performance than traditional Object-Relational Mapping technologies, we also expect that people
-use Entities more frequently in Zest� applications, so it is a very important topic to cover.
+use Entities more frequently in Zest™ applications, so it is a very important topic to cover.
 
 If you want to reproduce what's explained in this tutorial, remember to depend on the Core Bootstrap artifact:
 
@@ -39,7 +39,7 @@ Domain code typically don't need to know of the EntityComposite types directly,
 interface. The Visibility rules will be applied to associate the right EntityComposite when a domain type is requested.
 Ambiguities are not accepted and will result in runtime exceptions.
 
-Zest� supports that each entity instance can have more than one entity type, and it is managed per instance. This feature
+Zest™ supports that each entity instance can have more than one entity type, and it is managed per instance. This feature
 is beyond the scope of this HowTO and will be covered subsequently.
 
 == Good Practice ==
@@ -125,7 +125,7 @@ available as services.
 
 == The Entity Factory ==
 
-The entity factory is something you need to write yourself, but as with most things in Zest� it will end up being a
+The entity factory is something you need to write yourself, but as with most things in Zest™ it will end up being a
 fairly small implementation. So how is that done?
 
 [snippet,java]
@@ -134,7 +134,7 @@ source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactor
 tag=carFactory
 -----------
 
-That is just the domain interface. We now need to make the service interface, which Zest� needs to identify services and
+That is just the domain interface. We now need to make the service interface, which Zest™ needs to identify services and
 make it possible for the service injection later.
 
 [snippet,java]
@@ -151,7 +151,7 @@ source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactor
 tag=carFactoryMixin1
 -----------
 
-And doing that, first of all we need to request Zest� runtime to give us the Module
+And doing that, first of all we need to request Zest™ runtime to give us the Module
 that our code belongs to, and the UnitOfWork current context the execution is happening in.
 
 Injections that are related to the Visibility rules are handled by the @Structure annotation. And the easiest way for us
@@ -163,7 +163,7 @@ source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactor
 tag=carFactoryMixin2
 -----------
 
-Here Zest� will inject the member module with the correct Module. In case we only need the Module
+Here Zest™ will inject the member module with the correct Module. In case we only need the Module
 during the construction, we can also request it in the same manner as constructor argument.
 
 [snippet,java]

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/tutorials/howto-create-sideeffect.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-create-sideeffect.txt b/manual/src/docs/tutorials/howto-create-sideeffect.txt
index 5084a79..6e3b6f0 100644
--- a/manual/src/docs/tutorials/howto-create-sideeffect.txt
+++ b/manual/src/docs/tutorials/howto-create-sideeffect.txt
@@ -41,9 +41,9 @@ tag=allClass
 The MailNotifySideEffect is implemented as an abstract class, since we are not interested in the many other methods in
 the Confirmable interface. Extending the SideEffectOf is a convenience mechanism, instead of an explicit @SideEffectFor
 annotation on a private field, which can be used in rare occasions when you are not able to extend. This base class
-defines the next field, which is set up by the Zest� runtime and points to the next fragment in the call stack. We can
+defines the next field, which is set up by the Zest™ runtime and points to the next fragment in the call stack. We can
 also see that the MailService, HasLineItems and HasCustomer are provided to the side-effect, which is done with
-dependency injection. Zest� also supports dependency injection via constructors and methods.
+dependency injection. Zest™ also supports dependency injection via constructors and methods.
 
 It can be used as follows;
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/tutorials/howto-leverage-properties.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-leverage-properties.txt b/manual/src/docs/tutorials/howto-leverage-properties.txt
index 8637662..8cc1c7b 100644
--- a/manual/src/docs/tutorials/howto-leverage-properties.txt
+++ b/manual/src/docs/tutorials/howto-leverage-properties.txt
@@ -16,7 +16,7 @@
 [[howto-leverage-properties,Leverage Properties]]
 = Leverage Properties =
 
-Zest� does not follow the JavaBeans standard for property support. Instead, a much more explicit concept is in place. The
+Zest™ does not follow the JavaBeans standard for property support. Instead, a much more explicit concept is in place. The
 advantages are enormous, and the only real downside is that people are already destroyed, thinking in so called POJO
 terms.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/tutorials/howto-writing-docs.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-writing-docs.txt b/manual/src/docs/tutorials/howto-writing-docs.txt
index 5e7995b..14ed48c 100644
--- a/manual/src/docs/tutorials/howto-writing-docs.txt
+++ b/manual/src/docs/tutorials/howto-writing-docs.txt
@@ -18,7 +18,7 @@
 ///////////////////////////////////////////////////////////////
 
 [[community-docs,Writing Documentation]]
-= Writing Zest� Documentation =
+= Writing Zest™ Documentation =
 
 The documents use the asciidoc format, see:
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/userguide/extensions.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/extensions.txt b/manual/src/docs/userguide/extensions.txt
index 107f418..7866ff5 100644
--- a/manual/src/docs/userguide/extensions.txt
+++ b/manual/src/docs/userguide/extensions.txt
@@ -24,7 +24,7 @@
 
 == Overview ==
 
-We try to keep the Zest� Core Runtime as lean as possible, and a lot of the power to the Zest� Platform comes via its
+We try to keep the Zest™ Core Runtime as lean as possible, and a lot of the power to the Zest™ Platform comes via its
 Extension SPI, which defines clear ways to extend the platform. There are currently the following Extensions types,
 each with possibly more than one implementation;
 
@@ -37,7 +37,7 @@ each with possibly more than one implementation;
    * Migration
 
 This section will go through each of the available extensions.
-The Zest� Extensions are of varying maturity level and we try to maintain a STATUS (dev-status.xml) file indicating
+The Zest™ Extensions are of varying maturity level and we try to maintain a STATUS (dev-status.xml) file indicating
 how good the codebase, documentation and unit tests are for each of the libraries. This is highly subjective and
 potentially different individuals will judge this differently, but at least it gives a ballpark idea of the situation
 for our users.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/userguide/faq.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/faq.txt b/manual/src/docs/userguide/faq.txt
index 7aba95f..bd93829 100644
--- a/manual/src/docs/userguide/faq.txt
+++ b/manual/src/docs/userguide/faq.txt
@@ -21,6 +21,6 @@
 = Frequently Asked Questions =
 
 Is it possible to use Scala with Zest?::
-        Short Answer: Yes. Scala traits can be used as Zest� fragments, and Zest� composites can be used in Scala.
+        Short Answer: Yes. Scala traits can be used as Zest™ fragments, and Zest™ composites can be used in Scala.
 
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/userguide/glossary.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/glossary.txt b/manual/src/docs/userguide/glossary.txt
index 401b00b..38a1205 100644
--- a/manual/src/docs/userguide/glossary.txt
+++ b/manual/src/docs/userguide/glossary.txt
@@ -24,7 +24,7 @@
 
 == Glossary ==
 
-There are a lot of concepts in Zest� which may have different meanings in other contexts. So in true DDD-style
+There are a lot of concepts in Zest™ which may have different meanings in other contexts. So in true DDD-style
 ubiquitous language, we are here listing the definitions of the terms and concepts that are being used.
 
 [glossary]
@@ -34,7 +34,7 @@ ubiquitous language, we are here listing the definitions of the terms and concep
 An Abstract Mixin is an implementation of the <<def-mixin-type>> interface, but is an abstract class and has not
 implemented all the methods.
 
-The Zest� runtime can use multiple <<def-mixin,Mixins>> for each <<def-mixin-type>> interface. It is also possible to let
+The Zest™ runtime can use multiple <<def-mixin,Mixins>> for each <<def-mixin-type>> interface. It is also possible to let
 a <<def-generic-mixin>> handle the remaining missing methods.
 --
 
@@ -53,10 +53,10 @@ will not be part of the <<def-invocation-stack>> of those methods.
 [[def-application,Application]]Application::
 +
 --
-Application is the top level concept handled by the Zest� runtime instance. It holds the information about the
+Application is the top level concept handled by the Zest™ runtime instance. It holds the information about the
 <<def-layer,Layers>> in the application architecture. See <<def-structure>> for more information.
 
-There is one and only one Application instance per Zest� Runtime instance.
+There is one and only one Application instance per Zest™ Runtime instance.
 --
 
 
@@ -120,7 +120,7 @@ CompositeType is the Java interface that declares the composition, from which <<
 created.
 
 Composite Type interfaces must be a sub-type of one of the 5 <<def-composite-metatype,Composite Meta Types>> defined in
-Zest� otherwise it can not be instantiated.
+Zest™ otherwise it can not be instantiated.
 --
 
 
@@ -162,7 +162,7 @@ See <<howto-configure-service>> to learn how to use Configuration Composites.
 [[def-constraint,Constraint]]Constraint::
 +
 --
-Constraints are a kind of validators, which are consulted prior to invoking the method call. Zest� currently only
+Constraints are a kind of validators, which are consulted prior to invoking the method call. Zest™ currently only
 supports ParameterConstraints on methods and value constraints on <<def-property,Properties>>, but future versions will
 include Constraint types for checking complete method calls and return values.
 
@@ -235,11 +235,11 @@ For each method, Qi4J will create and re-use an Invocation Stack. It will be bui
 <<def-modifier,Modifiers>> and an end-point that will link into the stateful <<def-mixin>>.
 
 It is important to recognize that, for memory footprint reasons, Invocation Stacks are shared across
-<<def-composite,Composites>> of the same <<def-composite-type>>. They are however thread-safe, in that Zest� will never
+<<def-composite,Composites>> of the same <<def-composite-type>>. They are however thread-safe, in that Zest™ will never
 bind the same Invocation Stack to more than one <<def-composite>> instance during a method call, but that between method
 invocations the <<def-modifier,Modifiers>> in the Invocation Stack can not assume that it is bound to the same
 <<def-composite>> instance. Therefor, <<def-modifier,Modifiers>> are not expected to keep state between method
-invocations, and when it needs to do that, then it should reference a <<def-mixin>> via the @This annotation. Zest� will
+invocations, and when it needs to do that, then it should reference a <<def-mixin>> via the @This annotation. Zest™ will
 during the binding of the Invocation Stack to the <<def-composite>>, also ensure that all referenced
 <<def-mixin,Mixins>> are correctly injected in the Invocation Stack.
 --
@@ -248,7 +248,7 @@ during the binding of the Invocation Stack to the <<def-composite>>, also ensure
 [[def-layer,Layer]]Layer::
 +
 --
-Zest� promotes a Layered application design, where Layers can only access lower Layers and not higher Layers or Layers at
+Zest™ promotes a Layered application design, where Layers can only access lower Layers and not higher Layers or Layers at
 the same level.
 --
 
@@ -377,17 +377,17 @@ SideEffect is one of the 3 kinds of <<def-modifier,Modifiers>> defined in Zest.
 [[def-structure,Structure]]Structure::
 +
 --
-Zest� promotes a conventional view of application structure, that computer science has been using for decades.
+Zest™ promotes a conventional view of application structure, that computer science has been using for decades.
 
 The definition is as follows;
 
-* One <<def-application>> per Zest� runtime instance.
+* One <<def-application>> per Zest™ runtime instance.
 * One or more <<def-layer,Layers>> per <<def-application>>.
 * Zero, one or more <<def-module,Modules>> per <<def-layer>>.
 * Zero, one or more Assemblies per <<def-module>>.
 
 The principle of this Structure is to assist the programmer to create well modularized applications, that are easily
-extended and maintained. Zest� will restrict access between <<def-module,Modules>>, so that code can only reach
+extended and maintained. Zest™ will restrict access between <<def-module,Modules>>, so that code can only reach
 <<def-composite,Composites>> and Objects in <<def-module,Modules>> (including itself) of the same or lower
 <<def-layer,Layers>>.
 
@@ -424,7 +424,7 @@ immutable and can be compared by value instead of memory reference. Concurrency
 the value exists or it doesn't, no need for synchronization. Values are typically very easy to test and very robust to
 refactoring.
 
-Zest� defines values as a primary meta type through the ValueComposite, as we think the benefits of values are great.
+Zest™ defines values as a primary meta type through the ValueComposite, as we think the benefits of values are great.
 The ValueComposite is very light-weight compared to the <<def-entitycomposite>>, and its value can still be persisted as
 part of an <<def-entitycomposite>> via a <<def-property>>.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/userguide/index.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/index.txt b/manual/src/docs/userguide/index.txt
index e65328d..683dee0 100644
--- a/manual/src/docs/userguide/index.txt
+++ b/manual/src/docs/userguide/index.txt
@@ -17,7 +17,7 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-= Zest� v{revnumber} User Guide =
+= Zest™ v{revnumber} User Guide =
 
 :qi4j-version: {revnumber}
 :qi4j-buildnumber: {revnumber}

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/88b203bb/manual/src/docs/userguide/libraries.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/libraries.txt b/manual/src/docs/userguide/libraries.txt
index c6f26b8..284154d 100644
--- a/manual/src/docs/userguide/libraries.txt
+++ b/manual/src/docs/userguide/libraries.txt
@@ -24,7 +24,7 @@
 
 == Overview ==
 
-The Zest� Libraries are of varying maturity level and we try to maintain a STATUS (dev-status.xml) file indicating
+The Zest™ Libraries are of varying maturity level and we try to maintain a STATUS (dev-status.xml) file indicating
 how good the codebase, documentation and unit tests are for each of the libraries. This is highly subjective and
 potentially different individuals will judge this differently, but at least it gives a ballpark idea of the situation
 for our users.


[03/11] zest-qi4j git commit: Replaced Qi4j with Zest in main documentation. Added trademark (tm) (™) to all Zest words.

Posted by ni...@apache.org.
Replaced Qi4j with Zest in main documentation.
Added trademark (tm) (™) to all Zest words.


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/72a43f3c
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/72a43f3c
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/72a43f3c

Branch: refs/heads/develop
Commit: 72a43f3c1a5e260b9b341cfd5fc7c3e55e14add4
Parents: 5bb6dbf
Author: Niclas Hedhman <he...@betfair.com>
Authored: Mon Jul 6 17:54:18 2015 +0300
Committer: Niclas Hedhman <he...@betfair.com>
Committed: Mon Jul 6 17:54:18 2015 +0300

----------------------------------------------------------------------
 LICENSE.txt                                     | 10 ++---
 NOTICE.txt                                      |  2 +-
 README.txt                                      | 28 +++++++-------
 core/api/src/docs/api.txt                       |  2 +-
 core/api/src/docs/application.txt               | 14 +++----
 core/api/src/docs/composition.txt               | 10 ++---
 core/api/src/docs/concern.txt                   |  6 +--
 core/api/src/docs/configuration.txt             |  4 +-
 core/api/src/docs/entitycomposite.txt           |  2 +-
 core/api/src/docs/metrics.txt                   |  4 +-
 core/api/src/docs/mixin.txt                     | 10 ++---
 core/api/src/docs/reference/ref-api.txt         |  6 +--
 core/api/src/docs/servicecomposite.txt          | 10 ++---
 core/api/src/docs/structure.txt                 | 20 +++++-----
 core/api/src/docs/type-lookup.txt               |  2 +-
 core/api/src/docs/unitofwork.txt                |  4 +-
 core/api/src/docs/valuecomposite.txt            |  2 +-
 core/bootstrap/src/docs/bootstrap.txt           | 16 ++++----
 core/functional/src/docs/functional.txt         | 10 ++---
 core/io/src/docs/io.txt                         | 14 +++----
 core/spi/src/docs/spi.txt                       |  4 +-
 core/spi/src/docs/valueserialization.txt        |  2 +-
 core/testsupport/src/docs/testsupport.txt       |  8 ++--
 .../src/docs/es-voldemort.txt                   |  2 +-
 .../indexing-solr/src/docs/index-solr.txt       |  2 +-
 extensions/indexing-sql/instructions.txt        |  8 ++--
 libraries/alarm/src/docs/alarm.txt              |  4 +-
 .../circuitbreaker/src/docs/circuitbreaker.txt  |  6 +--
 libraries/constraints/src/docs/constraints.txt  |  2 +-
 libraries/fileconfig/src/docs/fileconfig.txt    |  2 +-
 libraries/http/src/docs/http.txt                |  4 +-
 libraries/jmx/src/docs/jmx.txt                  |  2 +-
 libraries/lang-beanshell/README.txt             |  2 +-
 libraries/lang-jruby/README.txt                 |  2 +-
 libraries/logging/src/docs/logging.txt          |  4 +-
 libraries/osgi/src/docs/osgi.txt                |  8 ++--
 libraries/rest-client/src/docs/primer.txt       |  6 +--
 libraries/scheduler/src/docs/scheduler.txt      |  2 +-
 libraries/servlet/src/docs/servlet.txt          |  6 +--
 libraries/shiro-core/src/docs/shiro.txt         | 14 +++----
 libraries/shiro-web/src/docs/shiro-web.txt      |  6 +--
 libraries/spring/src/docs/spring.txt            | 20 +++++-----
 libraries/sql/src/docs/sql.txt                  |  2 +-
 .../tutorials/howto-assembly-application.txt    | 16 ++++----
 .../src/docs/tutorials/howto-build-system.txt   | 30 +++++++--------
 .../docs/tutorials/howto-configure-service.txt  |  6 +--
 .../src/docs/tutorials/howto-create-concern.txt |  4 +-
 .../src/docs/tutorials/howto-create-entity.txt  | 14 +++----
 .../docs/tutorials/howto-create-sideeffect.txt  |  4 +-
 .../src/docs/tutorials/howto-depend-on-qi4j.txt | 34 ++++++++---------
 .../tutorials/howto-leverage-properties.txt     |  6 +--
 manual/src/docs/tutorials/howto-use-io.txt      |  6 +--
 .../src/docs/tutorials/howto-writing-docs.txt   |  2 +-
 manual/src/docs/userguide/core.txt              | 26 ++++++-------
 manual/src/docs/userguide/extensions.txt        |  4 +-
 manual/src/docs/userguide/faq.txt               |  4 +-
 manual/src/docs/userguide/glossary.txt          | 40 ++++++++++----------
 manual/src/docs/userguide/index.txt             |  2 +-
 manual/src/docs/userguide/libraries.txt         |  2 +-
 manual/src/docs/userguide/preface.txt           | 16 ++++----
 manual/src/docs/userguide/tools.txt             |  4 +-
 manual/src/docs/website/home.txt                | 24 +++++++-----
 manual/src/docs/website/related.txt             |  4 +-
 manual/src/docs/website/samples.txt             | 12 +++---
 manual/src/docs/website/tutorials.txt           | 20 +++++-----
 samples/dci-cargo/README.txt                    |  2 +-
 src/bin-dist/NOTICE.txt                         |  2 +-
 src/bin-dist/README.txt                         | 22 +++++------
 tools/envisage/src/docs/envisage.txt            |  2 +-
 tutorials/composites/src/docs/step1.txt         |  4 +-
 tutorials/composites/src/docs/step2.txt         |  4 +-
 tutorials/composites/src/docs/step5.txt         |  6 +--
 tutorials/composites/src/docs/step7.txt         |  8 ++--
 tutorials/composites/src/docs/step8.txt         |  4 +-
 tutorials/composites/src/docs/step9.txt         |  4 +-
 .../composites/src/docs/tut-composites.txt      |  8 ++--
 tutorials/introduction/src/docs/background.txt  | 14 +++----
 tutorials/introduction/src/docs/highlights.txt  |  6 +--
 tutorials/introduction/src/docs/qi4j-cop.txt    |  4 +-
 .../introduction/src/docs/state-modeling.txt    | 16 ++++----
 .../what-is-composite-oriented-programming.txt  |  8 ++--
 .../introduction/src/docs/whats-an-object.txt   | 14 +++----
 .../tenminutes/src/docs/ten-minutes.txt         | 28 +++++++-------
 .../thirtyminutes/src/docs/thirty-minutes.txt   | 24 ++++++------
 .../twohours/src/docs/two-hours.txt             |  8 ++--
 .../twominutes/src/docs/two-minutes.txt         | 10 ++---
 tutorials/services/src/docs/step1.txt           |  4 +-
 tutorials/services/src/docs/step2.txt           |  2 +-
 tutorials/services/src/docs/step3.txt           |  6 +--
 tutorials/services/src/docs/tut-services.txt    |  4 +-
 90 files changed, 397 insertions(+), 391 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 09fd2eb..83c4864 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -178,9 +178,9 @@
 
 =======================================================================
 
-Apache Zest Qi4j subcomponents:
+Apache Zest™ subcomponents:
 
-The Apache Zest Qi4j project contains subcomponents with separate copyright
+The Apache Zest™ project contains subcomponents with separate copyright
 notices and license terms. Your use of the source code for the these
 subcomponents is subject to the terms and conditions of the following
 licenses.
@@ -189,7 +189,7 @@ licenses.
  The MIT License
 -----------------------------------------------------------------------
 
-The Apache Zest Qi4j project bundles the following files under the MIT License:
+The Apache Zest™ project bundles the following files under the MIT License:
 
 - jQuery v1.6.4 (https://jquery.com/)
   Bundled in the documentation minisite.
@@ -225,14 +225,14 @@ THE SOFTWARE.
  The BSD 3-Clauses License
 -----------------------------------------------------------------------
 
-The Apache Zest Qi4j project bundles the following files under the BSD
+The Apache Zest™ project bundles the following files under the BSD
 3-Clauses License:
 
 -----------------------------------------------------------------------
  The W3C Software License
 -----------------------------------------------------------------------
 
-The Apache Zest Qi4j project bundles the following files under the W3C Software
+The Apache Zest™ project bundles the following files under the W3C Software
 License:
 
 - The "xml:" Namespace (http://www.w3.org/XML/1998/namespace)

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 0591ae7..fee2893 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,4 +1,4 @@
-Apache Zest Qi4j SDK
+Apache Zest� (Java Edition) SDK
 Copyright 2015 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index 24711c6..084b39d 100644
--- a/README.txt
+++ b/README.txt
@@ -1,14 +1,14 @@
 
-Welcome to the world of Apache Zest Qi4j
+Welcome to the world of Apache Zest
    - Composite Oriented Programming on the Java platform.
 
 
-This Apache Zest Qi4j Source Distribution contains everything you need to
-create Qi4j applications.
+This Apache Zest� Source Distribution contains everything you need to
+create Zest� applications.
 
 
-Qi4j started in 2007, and is still in heavy development under the umbrella of
-the Apache Zest project at the Apache Software Foundation. We would like
+Zest� started in 2007, and is still in heavy development under the umbrella of
+the Apache Zest� project at the Apache Software Foundation. We would like
 developers around the world to participate in the advancement of this
 cool, new and challenging technology. We are especially interested in
 people willing to help improve the SDK, samples, tutorials, documentation
@@ -19,20 +19,20 @@ Please see https://zest.apache.org for more information.
 
 Licensing
 ---------
-All Qi4j code is licensed under an Apache License.
+All Zest� code is licensed under an Apache License.
 
 Third-Party Dependencies may be licensed under other terms. The only
 required dependencies are SLF4J (MIT Licence), ASM (BSD Licence) and
 Joda-Time (Apache Licence).
 
-Finally, Qi4j TestSupport depends on JUnit 4.x and its dependencies, which
+Finally, Zest� TestSupport depends on JUnit 4.x and its dependencies, which
 is also not included in the SDK itself, as it is present among most Java
 developers.
 
 
 Dependencies not included
 -------------------------
-The source distribution contains Qi4j sources only to keep the download
+The source distribution contains Zest� sources only to keep the download
 size small. The Gradle build automatically downloads needed dependencies.
 If you need to go offline type `./gradlew gooffline` to ensure all needed
 dependencies are cached by Gradle.
@@ -41,17 +41,17 @@ If you prefer to use a dependency management system, go to:
 https://zest.apache.org/qi4j/latest/howto-depend-on-qi4j.html
 
 
-Building Apache Zest Qi4j
--------------------------
-To build Qi4j from sources you only need to have a valid Java JDK >= 7
+Building Apache Zest
+---------------------
+To build Zest� from sources you only need to have a valid Java JDK >= 7
 installation.
 
-This document the Qi4j build system and its usage:
+This document the Zest� build system and its usage:
 https://zest.apache.org/qi4j/latest/build-system.html
 
 
-Thank you for trying out Apache Zest Qi4j and Composite Oriented Programming.
+Thank you for trying out Apache Zest� and Composite Oriented Programming.
 
 
--- Apache Zest Qi4j Team
+-- Apache Zest� Team
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/api.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/api.txt b/core/api/src/docs/api.txt
index 4e0256e..6384db3 100644
--- a/core/api/src/docs/api.txt
+++ b/core/api/src/docs/api.txt
@@ -21,7 +21,7 @@
 source=core/api/dev-status.xml
 --------------
 
-The Qi4j Core API is the primary interface for client application code during the main execution phase, i.e. after the
+The Zest� Core API is the primary interface for client application code during the main execution phase, i.e. after the
 application has been activated.
 
 include::../../build/docs/buildinfo/artifact.txt[]

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/application.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/application.txt b/core/api/src/docs/application.txt
index e04653f..e38ffcb 100644
--- a/core/api/src/docs/application.txt
+++ b/core/api/src/docs/application.txt
@@ -15,13 +15,13 @@
 
 [[core-api-application,Application]]
 = Application =
-There is one and only one Application instance per Qi4j runtime instance. But there is nothing preventing code to
-create additional Qi4j Runtime instances inside the same JVM. However, these runtimes are isolated from each other.
+There is one and only one Application instance per Zest� runtime instance. But there is nothing preventing code to
+create additional Zest� Runtime instances inside the same JVM. However, these runtimes are isolated from each other.
 
 The main purpose of the Application structure artifact is to keep everything in the same box, and allowing us to
 navigate the Structure. So, from a client code perspective, the Application is of no use, other than being part of
-bring Qi4j to life. Qi4j doesn't start automatically and can be run in most environments, by requiring that the
-bootstrapping of Qi4j is done by client code. We call this the Bootstrap Phase. The code in the custom bootstrapper
+bring Zest� to life. Zest� doesn't start automatically and can be run in most environments, by requiring that the
+bootstrapping of Zest� is done by client code. We call this the Bootstrap Phase. The code in the custom bootstrapper
 will need to access additional Jars from the regular domain code, and we strongly recommend that you make this
 separation in your project as well.
 
@@ -49,7 +49,7 @@ Recap of sequence;
 
     * Create, obtain or lookup Assemblers.
     * Establish the application structures.
-    * Create a Qi4j Runtime instance.
+    * Create a Zest� Runtime instance.
     * Create an ApplicationAssemblyFactory.
     * Create an ApplicationFactory.
     * Call ApplicationFactory.newApplication() to create an ApplicationContext.
@@ -72,7 +72,7 @@ tag=application1
 = Single Module Layering =
 
 Behind the scenes of the SingletonAssembler a little bit more elaborate bootstrap sequence is happening. The code below
-shows what is the actual required sequence to start up Qi4j.
+shows what is the actual required sequence to start up Zest.
 
 [snippet,java]
 -----------
@@ -83,7 +83,7 @@ tag=actual
 In the above example we are only creating an Application with a single Layer and a single Module in that Layer. This is
 derived from the fact that the factory.newApplicationAssembly() method takes a single Assembler argument.
 
-The Assembler.assemble( ModuleAssembly assembly ) method is called when the Qi4j Runtime needs to populate the
+The Assembler.assemble( ModuleAssembly assembly ) method is called when the Zest� Runtime needs to populate the
 ModuleAssembly with its Composites, Objects, Services and other information.
 
 == "Pancake" Layering ==

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/composition.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/composition.txt b/core/api/src/docs/composition.txt
index fecece1..a06c965 100644
--- a/core/api/src/docs/composition.txt
+++ b/core/api/src/docs/composition.txt
@@ -20,14 +20,14 @@ Composition is at the heart of COP, and refers to two different levels of constr
 1. the ability to assemble (compose) objects from smaller pieces, called Fragments.
 2. the construction of applications by assembling Composites into Modules and Modules into Layers.
 
-In Qi4j, we use the term Assembly for the second case of composition. See separate chapter.
+In Zest, we use the term Assembly for the second case of composition. See separate chapter.
 
 Composition will allow library authors a new level of flexibility in how functionality is provided to client code. More
 on that later.
 
 == Fragments ==
 
-There are 4 types of Fragments in Qi4j;
+There are 4 types of Fragments in Zest;
 
     * <<core-api-mixin>> - The state carrying part of a Composite.
     * <<core-api-constraint>> - Rules for in and out arguments, typically used for validation.
@@ -47,14 +47,14 @@ these, so the right meta type is used for the right purpose.
     * Service - Service is injectable to other composites and java objects. They are not persistable, but if
       referenced from an Entity or Value, a new reference to the Service will be injected when the Entity/Value is
       deserialized. Services are singletons. There are 'hosted' and 'imported' Services. The 'hosted' Service has
-      Configuration and its life cycle controlled by the Qi4j runtime, whereas the 'imported' Services are external
+      Configuration and its life cycle controlled by the Zest� runtime, whereas the 'imported' Services are external
       references.
     * Transient - Short-lived composites that are not persistable. Equals/hashCode/toString are forwarded to the
       Mixin Type declaring those methods explicitly.
 
-In versions of Qi4j prior to 2.0, composite types had to extend one of these 4 meta types, but in 2.0 and later, the
+In versions of Zest� prior to 2.0 (then Qi4j), composite types had to extend one of these 4 meta types, but in 2.0 and later, the
 meta type interface is added dynamically during <<core-bootstrap-assembly>>.
-We can therefor get rid of a lot of additional types, and use Qi4j-free interfaces directly;
+We can therefor get rid of a lot of additional types, and use Zest-free interfaces directly;
 
 [snippet,java]
 -----------

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/concern.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/concern.txt b/core/api/src/docs/concern.txt
index 6a941fb..0b39a9c 100644
--- a/core/api/src/docs/concern.txt
+++ b/core/api/src/docs/concern.txt
@@ -34,12 +34,12 @@ business domain, and can be used for many important things in the domain model,
 ensure that the state in the entire composite is valid), coordinating services, handling events and much more.
 
 Typed Concerns doesn't have to implement all the methods in the Mixin Type. By making the class abstract and only
-implementing the methods of interest, Qi4j will subclass the concern (otherwise not valid for the JVM), but the generated
-methods will never be invoked.
+implementing the methods of interest, Zest� runtime will subclass the concern (otherwise not valid for the JVM), but the
+generated methods will never be invoked.
 
 == Generic Concern ==
 In classic AOP, all advice are effectively _generic_. There is no type information in the advice implementation and the
-pointcut can be defined anywhere in the code, and the implementation uses proxy InvocationHandlers. Qi4j supports this
+pointcut can be defined anywhere in the code, and the implementation uses proxy InvocationHandlers. Zest� supports this
 construct as well, and we call it *Generic Concern*.
 
 Generic Concerns will be added to all methods that the AppliesToFilter evaluates to true. By default, that is all methods.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/configuration.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/configuration.txt b/core/api/src/docs/configuration.txt
index 8483b52..d61e0bd 100644
--- a/core/api/src/docs/configuration.txt
+++ b/core/api/src/docs/configuration.txt
@@ -15,14 +15,14 @@
 
 [[core-api-service-configuration,Service Configuration]]
 = Service Configuration =
-Configuration in Qi4j is for Qi4j <<core-api-service>> only. The Configuration is stored in a visible Entity
+Configuration in Zest� is for Zest� <<core-api-service>> only. The Configuration is stored in a visible Entity
 Store and is therefor runtime modifiable and not static in properties or XML files as in most other dependency
 injection frameworks.
 
 The Configuration system itself will handle all the details with interfacing with reading and writing the configuration.
 The normal UnitOfWork management is used, but handled internally by the configuration system.
 
-In Qi4j, Configuration are strongly typed and refactoring-friendly. Configuration is read from the entity store, but if
+In Zest, Configuration are strongly typed and refactoring-friendly. Configuration is read from the entity store, but if
 it can not be found, then it will try to bootstrap it from a properties file, with the same name as the
 ServiceDescriptor.identifiedBy(), which is set during <<core-bootstrap-assembly>> and defaults to the fully qualified
 classname of the <<core-api-service>> type.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/entitycomposite.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/entitycomposite.txt b/core/api/src/docs/entitycomposite.txt
index e8b06a9..c926545 100644
--- a/core/api/src/docs/entitycomposite.txt
+++ b/core/api/src/docs/entitycomposite.txt
@@ -22,7 +22,7 @@ Hibernate (4+ somewhat incompatible versions) and many other less known. This se
 creating objects that survives over long periods of time is a difficult one.
 
 Eric Evans points out in his book that Entities is a very definite and distinct concept that needs to be handled
-explicitly. Composite Oriented Programming in general, and Qi4j in particular, takes this point very seriously and
+explicitly. Composite Oriented Programming in general, and Zest� in particular, takes this point very seriously and
 makes Entities a central part of the whole system. And likewise, we are convinced that it is not possible to develop
 domain-knowledge-rich applications without a conscious and well-defined strategy on Entities. So, instead of spending
 endless hours trying to get Hibernate mapping to do the right thing, we introduce a Composite meta type called

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/metrics.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/metrics.txt b/core/api/src/docs/metrics.txt
index e116d39..6bf8bac 100644
--- a/core/api/src/docs/metrics.txt
+++ b/core/api/src/docs/metrics.txt
@@ -15,7 +15,7 @@
 
 [[core-api-metrics, Metrics API]]
 = Metrics API =
-The Qi4j platform defines an advanced Metrics SPI to capture runtime metrics of Qi4j's internals as well be used by
+The Zest� platform defines an advanced Metrics SPI to capture runtime metrics of Zest's internals as well be used by
 application code (via this API) to provide production metrics for operations personnel, ensuring healthy state of
 the applications.
 
@@ -25,7 +25,7 @@ There are quite a lot of different Metrics components available, which are insta
 factory for each component type, to allow for additional components to be created in the future without breaking
 compatibility in the existing implementations.
 
-The MetricsProvider is a standard Qi4j Service and simply acquired via the @Service annotation on a field or
+The MetricsProvider is a standard Zest� Service and simply acquired via the @Service annotation on a field or
 constructor argument.
 
 [snippet,java]

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/mixin.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/mixin.txt b/core/api/src/docs/mixin.txt
index d5cbb89..241b35b 100644
--- a/core/api/src/docs/mixin.txt
+++ b/core/api/src/docs/mixin.txt
@@ -122,16 +122,16 @@ source=core/api/src/test/java/org/qi4j/api/mixin/partial/SpeedMixin.java
 tag=partial
 -----------
 
-Above the SpeedMixin only implements the accelerate() method, and Qi4j will only map that method to this mixin. The
+Above the SpeedMixin only implements the accelerate() method, and Zest� will only map that method to this mixin. The
 other method of the SpeedLocation interface is not satisfied as the example is written and will generate a runtime
 exception.
 
 == Private Mixins ==
-Public mixins expose their methods in the composite interface, and this is not always desirable. Qi4j supports
+Public mixins expose their methods in the composite interface, and this is not always desirable. Zest� supports
 _Private Mixins_, which are only visible within the composite itself. That means that other fragments in the composite
 can see/use it, but it is not visible to the clients of the composite.
 
-Private Mixins are handled automatically. When Qi4j detects a @This annotation referring to a type that is not defined
+Private Mixins are handled automatically. When Zest� detects a +@This+ annotation referring to a type that is not defined
 in the Composite interface, then that is a Private Mixin. The Mixin implementation class, however, must exist in the
 list of Mixins in the @Mixins annotation. But often, the Private Mixin only list internal Property methods in the Mixin
 Type, which will be satisfied by the standard PropertyMixin and hence always available.
@@ -172,7 +172,7 @@ Typically, AppliesTo annotation is used to filter the methods that such Generic
 and sometimes Generic Mixin implementations are "last resort".
 
 Experience shows that Generic Mixin implementations are rare, and should only be used in extreme cases. They are
-less frequent than Generic Concern or Generic SideEffect implementations, but inside the Qi4j API are a couple of
+less frequent than Generic Concern or Generic SideEffect implementations, but inside the Zest� API are a couple of
 Generic Mixin implementations that are always present to make the life of the developer easier, such as PropertyMixin,
 AssociationMixin, ManyAssociationMixin, NoopMixin. The first 3 are declared on the Composite and EntityComposite
 interfaces and automatically included if needed. They also serve as excellent example of what they can be used for.
@@ -193,6 +193,6 @@ which seems to indicate that Generic Mixin implementations are likely to be used
 
 Typed Mixin implementations are much preferred in general business logic, as they will be first-class citizens of
 the IDE as well, for navigation, find usage, refactoring and many other common tasks. This is one of the main
-advantages of the Qi4j way of doing AOP compared to AspectJ et al, where "weaving" is something bolted onto an
+advantages of the Zest� way of doing AOP compared to AspectJ et al, where "weaving" is something bolted onto an
 application's classes via regular expressions and known naming conventions, which can change in an instance by a
 developer being unaware of which PointCuts applies to his code.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/reference/ref-api.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/reference/ref-api.txt b/core/api/src/docs/reference/ref-api.txt
index 52458a5..bafff6d 100644
--- a/core/api/src/docs/reference/ref-api.txt
+++ b/core/api/src/docs/reference/ref-api.txt
@@ -14,10 +14,10 @@
 //////////////////////
 
 [[ref-core-api, Core API]]
-= Qi4j Core API =
+= Zest� Core API =
 
-The Qi4j Core API is main API that Qi4j developers interact with. In fact, if you need to use classes/interfaces
-in the Qi4j Core SPI or Qi4j Core Runtime, then please contact the Qi4j Community and explain your use-case.
+The Zest� Core API is main API that Zest� developers interact with. In fact, if you need to use classes/interfaces
+in the Zest� Core SPI or Zest� Core Runtime, then please contact the Zest� Community and explain your use-case.
 
 The Core API is strictly layered, with no _spaghetti_ cross packages. The package list is fairly long, and
 we will look at each one in detail further down.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/servicecomposite.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/servicecomposite.txt b/core/api/src/docs/servicecomposite.txt
index 4a870d1..3f19a6c 100644
--- a/core/api/src/docs/servicecomposite.txt
+++ b/core/api/src/docs/servicecomposite.txt
@@ -16,7 +16,7 @@
 [[core-api-service,ServiceComposite]]
 = Service Composite =
 Any service added, via the ModuleAssembly.addServices(), ModuleAssembly.services() and ModuleAssembly.importServices()
-methods, will have the ServiceComposite meta type added to it. In Qi4j, when we speak of _Services_ we mean instances
+methods, will have the ServiceComposite meta type added to it. In Zest, when we speak of _Services_ we mean instances
 of _ServiceComposite_.
 
 Most programmers are familiar with the term "Service", and after the failure of Object Oriented Programming's promise
@@ -24,8 +24,8 @@ to encapsulate all the behavior together with the object's state, programmers le
 decoupling and re-use was to make the objects into data containers and deploy services that acted upon those data
 containers. Very much what functions did on structs back in the C and Pascal days.
 
-Qi4j will bring a lot of the behavior back to the Composite itself, but we still need Services for cross-composite
-functionality. The Qi4j Service model is fairly simple, yet powerful and flexible enough to accommodate most
+Zest� will bring a lot of the behavior back to the Composite itself, but we still need Services for cross-composite
+functionality. The Zest� Service model is fairly simple, yet powerful and flexible enough to accommodate most
 service-oriented patterns and ability to integrate well with external systems whether they are in-JVM or remote,
 such as Spring, OSGi, WS-*, Rest and others.
 
@@ -37,7 +37,7 @@ The characteristics of a ServiceComposite compared to other Composite meta types
     * It has an optional Configuration.
 
 
-_Services_ in Qi4j are _singletons_, one instance per definition. That means that there may exist multiple instances
+_Services_ in Zest� are _singletons_, one instance per definition. That means that there may exist multiple instances
 of the same service type, but they can not be created on the fly in runtime, but has to be explicitly defined during
 <<core-bootstrap-assembly>>.
 
@@ -46,7 +46,7 @@ will not exist until someone calls a method. If a _Service_ needs to be instanti
 need to declare/call the instantiateOnStartup() method on the _ServiceDescriptor_ during the bootstrap.
 
 == Service Configuration ==
-The configuration for a service is well supported in Qi4j. See the <<core-api-service-configuration>> chapter for details.
+The configuration for a service is well supported in Zest. See the <<core-api-service-configuration>> chapter for details.
 
 == Service Activation ==
 Services are activated (injected and instantiated) either on application start-up, or upon first use. This is controlled

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/structure.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/structure.txt b/core/api/src/docs/structure.txt
index 1ab7687..9507633 100644
--- a/core/api/src/docs/structure.txt
+++ b/core/api/src/docs/structure.txt
@@ -15,17 +15,17 @@
 
 [[core-api-structure,Structure]]
 = Structure =
-Qi4j promotes a conventional view of application structure, that computer science has been using for decades.
+Zest� promotes a conventional view of application structure, that computer science has been using for decades.
 
 The definition is as follows;
 
-    * One Application per Qi4j runtime instance.
+    * One Application per Zest� runtime instance.
     * One or more Layers per Application.
     * Zero, one or more Modules per Layer.
     * Zero, one or more Assemblies per Module.
 
 The principle of this Structure is to assist the programmer to create well modularized applications, that are easily
-extended and maintained. Qi4j will restrict access between Modules, so that code can only reach Composites and Objects
+extended and maintained. Zest� will restrict access between Modules, so that code can only reach Composites and Objects
 in Modules (including itself) of the same or lower Layers.
 
 Each Layer has to be declared which lower Layer(s) it uses, and it is not allowed that a lower Layer uses a higher
@@ -33,20 +33,20 @@ Layer, i.e. cyclic references.
 
 [[core-api-application,Application]]
 = Application =
-Every Qi4j runtime has _one and only one_ Application in it. It is possible to run multiple Qi4j runtimes in the same
-JVM, and it is even possible to embed a Qi4j runtime within a Qi4j Application, but there can only be one Application
-in a Qi4j runtime.
+Every Zest� runtime has _one and only one_ Application in it. It is possible to run multiple Zest� runtimes in the same
+JVM, and it is even possible to embed a Zest� runtime within a Zest� Application, but there can only be one Application
+in a Zest� runtime.
 
 An Application is then broken into layers and modules are placed within those layers. Composites are placed within
-modules. This forms the Application Structure and is enforced by the Qi4j runtime.
+modules. This forms the Application Structure and is enforced by the Zest� runtime.
 
 [[core-api-layer,Layer]]
 = Layer =
-A Qi4j Application must consist of at least one layer. More layers are common, often dividing the application along the
+A Zest� Application must consist of at least one layer. More layers are common, often dividing the application along the
 common architectural diagrams used on whiteboards, perhaps with a UI layer at the top, followed by a service or application
 layer, then with a domain layer and finally some persistence layer at the bottom.
 
-Qi4j enforces this layering by requiring the <<core-bootstrap-assembly>> to declare which layer uses which other layer. And
+Zest� enforces this layering by requiring the <<core-bootstrap-assembly>> to declare which layer uses which other layer. And
 <<core-api-visibility>> rules define that layers below can not locate composites in layers above. Also, defining that
 "Layer1 uses Layer2" and "Layer2 uses Layer3" does NOT imply that Layer1 has <<core-api-visibility>> to Layer3. If that
 is wanted, then it must be declared explicitly.
@@ -60,7 +60,7 @@ belongs to a single Layer, but many Modules can exist in the same Layer. Composi
     * Composites from Modules in the same Layer, with Visibility set to Visibility.layer
     * Composites from Modules in Layers below, with Visibility set to Visibility.application
 
-Modules contains a lot of the Qi4j infrastructure, which are the enforcers of these wise modularization principles.
+Modules contains a lot of the Zest� infrastructure, which are the enforcers of these wise modularization principles.
 
 It is not possible to modify the Modules, their resolution nor binding in any way after the application starts.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/type-lookup.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/type-lookup.txt b/core/api/src/docs/type-lookup.txt
index 5e3f31e..100d480 100644
--- a/core/api/src/docs/type-lookup.txt
+++ b/core/api/src/docs/type-lookup.txt
@@ -23,7 +23,7 @@
 Composite Types Lookup can occurs when you explicitely lookup for a Composite by Type
 (ex. ServiceFinder.findService(..) methods), when you ask for an injection or when you create a new composite instance.
 
-All theses type lookup start from a Module, are lazy, cached and obey the Qi4j Visibility rules. Type Lookup works
+All theses type lookup start from a Module, are lazy, cached and obey the Zest� Visibility rules. Type Lookup works
 equally accross Composite Types with some subtle differences when it comes to Services and Entities.
 
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/unitofwork.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/unitofwork.txt b/core/api/src/docs/unitofwork.txt
index 04e4f26..582aefe 100644
--- a/core/api/src/docs/unitofwork.txt
+++ b/core/api/src/docs/unitofwork.txt
@@ -19,7 +19,7 @@ A UnitOfWork is a bounded group of operations performed, typically on entities,
 to other threads until the UnitOfWork is completed. It is also possible to discard these operations, as if they were
 never executed.
 
-NOTE: UnitOfWork has many similarities with the Transaction concept used with RDBMSes. But since Qi4j introduced several deviations to the common definitions of Transactions, we chose to use a different term.
+NOTE: UnitOfWork has many similarities with the Transaction concept used with RDBMSes. But since Zest� introduced several deviations to the common definitions of Transactions, we chose to use a different term.
 
 There are several key characteristics of UnitOfWork;
 
@@ -44,5 +44,5 @@ and aborting the UnitOfWork is handled by the transaction boundary, often in the
 <<core-api-layer>>)
 
 Since it is very common to have all, or nearly all, methods in the _transaction boundary_ to handle the creation and
-completion, possibly with retry, in the same class, module or even layer, Qi4j provides annotations to easily declare
+completion, possibly with retry, in the same class, module or even layer, Zest� provides annotations to easily declare
 UnitOfWork concern: @UnitOfWorkPropagation, @UnitOfWorkDiscardOn and @UnitOfWorkRetry

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/api/src/docs/valuecomposite.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/valuecomposite.txt b/core/api/src/docs/valuecomposite.txt
index cc7166e..f080376 100644
--- a/core/api/src/docs/valuecomposite.txt
+++ b/core/api/src/docs/valuecomposite.txt
@@ -21,7 +21,7 @@ immutable and can be compared by value instead of memory reference. Concurrency
 the value exists or it doesn't, no need for synchronization. Values are typically very easy to test and very robust to
 refactoring.
 
-Qi4j defines values as a primary meta type through the ValueComposite, as we think the benefits of values are great.
+Zest� defines values as a primary meta type through the ValueComposite, as we think the benefits of values are great.
 The ValueComposite is very light-weight compared to the EntityComposite, and its value can still be persisted as part
 of an EntityComposite via a Property.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/bootstrap/src/docs/bootstrap.txt
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/docs/bootstrap.txt b/core/bootstrap/src/docs/bootstrap.txt
index 22165c9..7b500b7 100644
--- a/core/bootstrap/src/docs/bootstrap.txt
+++ b/core/bootstrap/src/docs/bootstrap.txt
@@ -22,9 +22,9 @@
 source=core/bootstrap/dev-status.xml
 --------------
 
-Qi4j has a distinct bootstrap phase, also known as the _Assembly_ of an application, where the applications structure
+Zest� has a distinct bootstrap phase, also known as the _Assembly_ of an application, where the applications structure
 is defined programmatically. Once all the layers, modules and all the composite types in each module have been defined
-the model is instantiated into an application. This enables the entire _structure_ system in Qi4j, where types "belongs"
+the model is instantiated into an application. This enables the entire _structure_ system in Zest, where types "belongs"
 to a module and visibility rules define default behaviors, enforcement of architectural integrity and much more.
 
 The _assembly_ is preceeded by the creation of the _Qi4j Runtime_. The _assembly_ can be declared fully by defining
@@ -43,7 +43,7 @@ You can also;
     * Add additional interfaces to composites dynamically.
     * Add concerns, mixins, constraints and side effects dynamically.
     * Set _meta information_ on defined types.
-    * Import external services to be available as Qi4j services.
+    * Import external services to be available as Zest� services.
     * Tag services with markers
 
 include::../../build/docs/buildinfo/artifact.txt[]
@@ -168,7 +168,7 @@ tag=UsingAssembler
 [[core-bootstrap-assembly-layered,Layered Application Assembler]]
 == Layered Application Assembler (RECOMMENDED!) ==
 
-In 2.1, a new way to instantiate Qi4j applications was introduced. It starts with subclassing the
+In 2.1, a new way to instantiate Zest� applications was introduced. It starts with subclassing the
 +LayeredApplicationAssembler+, and implementing the +assembleLayers()+ method.
 
 In the +assembleLayers()+ method, one is epected to either call the +createLayer()+ method in the super class
@@ -206,7 +206,7 @@ For example code, see the tutorial <<howto-assemble-application>>.
 
 
 == Singleton Assembler ==
-Every Qi4j runtime instance consist of One Application, with one or more Layers and one or more Modules in each Layer.
+Every Zest� runtime instance consist of One Application, with one or more Layers and one or more Modules in each Layer.
 So the minimal application is still one layer with one module. This is not recommended other than for testing purposes
 and really trivial applications.
 
@@ -218,7 +218,7 @@ source=core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
 tag=singleton
 --------------
 
-Once the SingletonAssembler constructor returns, the Qi4j application is up and running.
+Once the SingletonAssembler constructor returns, the Zest� application is up and running.
 
 The SingletonAssembler also makes common system resources available from the bootstrap code, such as
 Module, UnitOfWorkFactory and others. This is possible since there is only one Module.
@@ -274,10 +274,10 @@ tag=pancake
 
 == Full Assembly ==
 Full Assembly means that you have the opportunity to create any layer/module hierarchy that are within the rules of the
-Qi4j runtime. It requires more support in your code to be useful, and the example below is by no means a recommended way
+Zest� runtime. It requires more support in your code to be useful, and the example below is by no means a recommended way
 to organize large application assemblies.
 
-In principle, you first start the Qi4j runtime, call newApplication with an ApplicationAssembler instance and call
+In principle, you first start the Zest� runtime, call newApplication with an ApplicationAssembler instance and call
 activate() on the returned application. The ApplicationAssembler instance will be called with an
 ApplicationAssemblyFactory, which is used to create an ApplicationAssembly describing the application structure.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/functional/src/docs/functional.txt
----------------------------------------------------------------------
diff --git a/core/functional/src/docs/functional.txt b/core/functional/src/docs/functional.txt
index 30a2a2b..1b0c3f4 100644
--- a/core/functional/src/docs/functional.txt
+++ b/core/functional/src/docs/functional.txt
@@ -21,9 +21,9 @@
 source=core/functional/dev-status.xml
 --------------
 
-The Qi4j Core Functional API is a generic package to work with Iterables in a "functional programming language" style.
+The Zest� Core Functional API is a generic package to work with Iterables in a "functional programming language" style.
 
-This package is completely independent of everything else in Qi4j and may be used on its own in any kind of environment
+This package is completely independent of everything else in Zest� and may be used on its own in any kind of environment
 such as Spring or Java EE applications.
 
 include::../../build/docs/buildinfo/artifact.txt[]
@@ -38,7 +38,7 @@ source=core/functional/src/test/java/org/qi4j/functional/docsupport/FunctionalDo
 tag=func1
 -----------
 
-With the Qi4j Core Functional API, you go about it in a different way. The code ends up looking like this;
+With the Zest� Core Functional API, you go about it in a different way. The code ends up looking like this;
 
 [snippet,java]
 -----------
@@ -50,11 +50,11 @@ And this is just the tip of the iceberg.
 
 == The Big Picture ==
 
-The Qi4j Core Functional API are divided a handful of powerful concepts, especially when used together;
+The Zest� Core Functional API are divided a handful of powerful concepts, especially when used together;
 
    * *Iterables* - many methods to deal with Iterable data, so that the loops in your programs can largely be removed.
 
-   * *Functions* - f(x) and f(x,y) are well-know from mathematics and used in functional programming languages. Qi4j is
+   * *Functions* - f(x) and f(x,y) are well-know from mathematics and used in functional programming languages. Zest� is
      not capable of introducing lambda calculus due to limitations in Java itself, but we can simulate a lot to allow
      people to create more readable code.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/io/src/docs/io.txt
----------------------------------------------------------------------
diff --git a/core/io/src/docs/io.txt b/core/io/src/docs/io.txt
index 6e02896..a8b85a8 100644
--- a/core/io/src/docs/io.txt
+++ b/core/io/src/docs/io.txt
@@ -21,10 +21,10 @@
 source=core/io/dev-status.xml
 --------------
 
-The Qi4j Core I/O API is completely generic and not tied to the Qi4j programming model as a whole. It can be used
-independently of Qi4j, together with the Qi4j Core Functional API, which the Core I/O API depends on.
+The Zest� Core I/O API is completely generic and not tied to the Zest� programming model as a whole. It can be used
+independently of Zest, together with the Zest� Core Functional API, which the Core I/O API depends on.
 
-The Qi4j Core I/O API tries to address the problem around shuffling data around from various I/O inputs and outputs,
+The Zest� Core I/O API tries to address the problem around shuffling data around from various I/O inputs and outputs,
 possibly with transformations and filtering along the way. It was identified that there is a general mix-up of concerns
 in the stereotypical I/O handling codebases that people deal with all the time. The reasoning around this, can be found
 in the <<howto-use-io>>, and is recommended reading.
@@ -44,7 +44,7 @@ source.copyTo( destination );
 
 It seems natural to do, yet it is not present for us. We need to involve FileInputStream/FileOutputStream, wrap them
 in Buffered versions of it, do our own looping, close the streams afterwards and what not. So, the java.io.File does
-not have this simple feature and in the Qi4j Core API, we need to work around this limitation. We also want to
+not have this simple feature and in the Zest� Core API, we need to work around this limitation. We also want to
 make the abstraction a little bit more encompassing than "just" files. So how does that look like then?
 
 == First Examples ==
@@ -60,7 +60,7 @@ tag=io1
 -----------
 
 Pretty much self-explanatory, wouldn't you say? But what happened to the handling of exceptions and closing of
-resources? It is all handled inside the Qi4j Core I/O API. There is nothing you can forget to do.
+resources? It is all handled inside the Zest� Core I/O API. There is nothing you can forget to do.
 
 Another simple example, where we want to count the number of lines in the text;
 
@@ -127,7 +127,7 @@ interface. For O/S resources, they are handled purely inside the Input and Outpu
 Sender/Receiver are effectively dealing with the data itself.
 
 == org.qi4j.io.Transforms ==
-The 3 component in the Qi4j Core I/O API is the transformations that are possible. Interestingly enough, with the
+The 3 component in the Zest� Core I/O API is the transformations that are possible. Interestingly enough, with the
 above separation of concerns, we don't need an InputOutput type that can both receive and send data. Instead, we
 simply need to prepare easy to use static factory methods, which are found in the org.qi4j.io.Transforms class. Again,
 it is fairly straight forward to create your own Transforms if you need something not provided here.
@@ -176,7 +176,7 @@ tag=progress
 
 It combines the Counter and the Log implementations, so that the count is forwarded to the Log at a given interval, such
 as every 1000 items. This may not be what you think a ProgressLog should look like, but it serves as a good example on
-how you can combine the general principles found in the Qi4j Core API package.
+how you can combine the general principles found in the Zest� Core API package.
 
 == How to write a filter specification? ==
 The filter transform takes a specification implementation which has a very simple method, isSatisfiedBy() (read more

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/spi/src/docs/spi.txt
----------------------------------------------------------------------
diff --git a/core/spi/src/docs/spi.txt b/core/spi/src/docs/spi.txt
index 305449f..5b000ea 100644
--- a/core/spi/src/docs/spi.txt
+++ b/core/spi/src/docs/spi.txt
@@ -21,7 +21,7 @@
 source=core/spi/dev-status.xml
 --------------
 
-The Qi4j Core Runtime has a number of extension points, which we call the _Qi4j Core Extension SPI_. These are defined
+The Zest� Core Runtime has a number of extension points, which we call the _Qi4j Core Extension SPI_. These are defined
 interfaces used *only* by the Core Runtime and *never* directly by application code. <<extensions>> are assembled in
 applications during the bootstrap phase.
 
@@ -35,7 +35,7 @@ There are currently 5 Core SPI extensions;
     * <<core-spi-indexing>>
     * <<core-spi-metrics>>
 
-Qi4j Runtime Extensions implementations may depend on Qi4j Libraries, but Libraries are NOT ALLOWED to depend on
+Zest� Runtime Extensions implementations may depend on Zest� Libraries, but Libraries are NOT ALLOWED to depend on
 Extensions. Applications code is NOT ALLOWED to depend on extensions. And application code SHOULD NOT depend on the
 Core Extension SPI. If you think that is needed, please contact qi4j-dev forum at Google Groups, to see if your usecase
 can be solved in a support manner, or that we need to extend the Core API to support it.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/spi/src/docs/valueserialization.txt
----------------------------------------------------------------------
diff --git a/core/spi/src/docs/valueserialization.txt b/core/spi/src/docs/valueserialization.txt
index c510d55..1d4b650 100644
--- a/core/spi/src/docs/valueserialization.txt
+++ b/core/spi/src/docs/valueserialization.txt
@@ -22,7 +22,7 @@
 
 == Overview ==
 
-The Qi4j Core Runtime use ValueSerialization to provide string representation of ValueComposites via their `toString()`
+The Zest� Core Runtime use ValueSerialization to provide string representation of ValueComposites via their `toString()`
 method, and, their instanciation from the very same representation via the `newValueFromSerializedState(..)` method of
 the ValueBuilderFactory API.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/core/testsupport/src/docs/testsupport.txt
----------------------------------------------------------------------
diff --git a/core/testsupport/src/docs/testsupport.txt b/core/testsupport/src/docs/testsupport.txt
index 251f338..82d6ed9 100644
--- a/core/testsupport/src/docs/testsupport.txt
+++ b/core/testsupport/src/docs/testsupport.txt
@@ -21,15 +21,15 @@
 source=core/testsupport/dev-status.xml
 --------------
 
-Qi4j comes with classes to help with testing. For general development, only a couple of classes are of interest as the
+Zest� comes with classes to help with testing. For general development, only a couple of classes are of interest as the
 others are mostly for EntityStore and Index/Query SPI implementations. There is also some mocking support, to allow
-some of Qi4j's unique aspects to be mocked, but since Qi4j is so flexible at a fine-granular level, we have found that
+some of Zest's unique aspects to be mocked, but since Zest� is so flexible at a fine-granular level, we have found that
 mocking is seldom, if ever, needed.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
 == Your First Testcase ==
-In most cases, you will probably use the AbstractQi4jTest class to simplify starting a Qi4j test instance.
+In most cases, you will probably use the AbstractQi4jTest class to simplify starting a Zest� test instance.
 
 [snippet,java]
 --------------
@@ -37,7 +37,7 @@ source=tutorials/hello/src/test/java/org/qi4j/tutorials/hello/HelloTest.java
 tag=step1
 --------------
 
-This will do all the initialization of a Qi4j runtime instance and create a single layer with a single module in it.
+This will do all the initialization of a Zest� runtime instance and create a single layer with a single module in it.
 What goes into that module is declared in the assembly() method;
 
 [snippet,java]

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/extensions/entitystore-voldemort/src/docs/es-voldemort.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-voldemort/src/docs/es-voldemort.txt b/extensions/entitystore-voldemort/src/docs/es-voldemort.txt
index d31e3d1..5837bd1 100644
--- a/extensions/entitystore-voldemort/src/docs/es-voldemort.txt
+++ b/extensions/entitystore-voldemort/src/docs/es-voldemort.txt
@@ -41,7 +41,7 @@ tag=assembly
 
 == Configuration ==
 
-Most of the configuration of Voldemort is available in the Qi4j Configuration Entity.
+Most of the configuration of Voldemort is available in the Zest� Configuration Entity.
 
 [snippet,java]
 ----

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/extensions/indexing-solr/src/docs/index-solr.txt
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/docs/index-solr.txt b/extensions/indexing-solr/src/docs/index-solr.txt
index d58c8a1..2f0ebd8 100644
--- a/extensions/indexing-solr/src/docs/index-solr.txt
+++ b/extensions/indexing-solr/src/docs/index-solr.txt
@@ -27,7 +27,7 @@ source=extensions/indexing-solr/dev-status.xml
 
 Index/Query services backed by an embedded http://lucene.apache.org/solr/[Apache Solr Search].
 
-WARNING: Solr Index/Query service do not support the Qi4j Query API but only native Solr queries.
+WARNING: Solr Index/Query service do not support the Zest� Query API but only native Solr queries.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/extensions/indexing-sql/instructions.txt
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/instructions.txt b/extensions/indexing-sql/instructions.txt
index 3df88d8..5bed896 100644
--- a/extensions/indexing-sql/instructions.txt
+++ b/extensions/indexing-sql/instructions.txt
@@ -17,18 +17,18 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-These instructions are for preparing your out-of-box PostgreSQL installation so it would be usable with PostgreSQL indexing of Qi4j.
+These instructions are for preparing your out-of-box PostgreSQL installation so it would be usable with PostgreSQL indexing of Zest.
 
 1. Creating login role and database
-1.1. Using pgAdmin, connect to PostgreSQL database, and create database you intend to use to store Qi4j entity data, and login role for Qi4j application to use when it connects to database.
+1.1. Using pgAdmin, connect to PostgreSQL database, and create database you intend to use to store Zest� entity data, and login role for Zest� application to use when it connects to database.
 1.1. Update these values into your .properties file, if necessary.
 
 2. Adding ltree as type
-2.1. Using pgAdmin, connect to PostgreSQL database, and navigate to database which is intended to be used for Qi4j. (Click on it)
+2.1. Using pgAdmin, connect to PostgreSQL database, and navigate to database which is intended to be used for Zest. (Click on it)
 2.2. Executing arbitary SQL queries should be possible, click that button (button with SQL text on it, next to trash bin).
 2.3. This will open new window, erase any text which pgAdmin generates there for you.
 2.4. Then navigate to your PostgreSQL installation directory, then into 'share', and then into 'contrib'. Open file 'ltree.sql' in your favorite text editor.
 2.5. Select all text, copy it, and paste to SQL query window which you opened in stage 2.2.
-2.6. If you know what you are doing, you may change the line 'SET search_path = public;' to make search_path be 'pg_catalog', or name of schema that Qi4j application will use ('qi4j' by default). It's ok to leave it to 'public' though.
+2.6. If you know what you are doing, you may change the line 'SET search_path = public;' to make search_path be 'pg_catalog', or name of schema that Zest� application will use ('qi4j' by default). It's ok to leave it to 'public' though.
 2.7. Hit F5 or go Query -> Execute Query to execute the SQL. It should print some notices into output window but no errors nor warnings should be present.
 2.8. Ltree type should be now installed to your PostgreSQL installation.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/alarm/src/docs/alarm.txt
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/docs/alarm.txt b/libraries/alarm/src/docs/alarm.txt
index 255cf07..996a9fe 100644
--- a/libraries/alarm/src/docs/alarm.txt
+++ b/libraries/alarm/src/docs/alarm.txt
@@ -34,7 +34,7 @@ consequences are to other systems when one fails. The _Alarm Point_ concepts bec
 world of today, where _Alarm Points_ allows for fine-grained notification and view into the health of one or more
 systems.
 
-In Qi4j, we are building upon this powerful abstraction, from decades of field experience.
+In Zest, we are building upon this powerful abstraction, from decades of field experience.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
@@ -78,7 +78,7 @@ tag=documentation
 --------------
 
 == Alarm Models ==
-The Qi4j Alarm library comes with 3 _Alarm Models_ which should be sufficient for most uses. These are based on decades
+The Zest� Alarm library comes with 3 _Alarm Models_ which should be sufficient for most uses. These are based on decades
 of experience from the industrial automation industry and user feedback.
 
 == Simple Alarm Model ==

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/circuitbreaker/src/docs/circuitbreaker.txt
----------------------------------------------------------------------
diff --git a/libraries/circuitbreaker/src/docs/circuitbreaker.txt b/libraries/circuitbreaker/src/docs/circuitbreaker.txt
index c06fa46..7b074a6 100644
--- a/libraries/circuitbreaker/src/docs/circuitbreaker.txt
+++ b/libraries/circuitbreaker/src/docs/circuitbreaker.txt
@@ -27,7 +27,7 @@ source=libraries/circuitbreaker/dev-status.xml
 
 The Circuit Breaker library provides a way to guard your application
 against faulty external systems (e.g. mail servers  being down, web
-services being down). It is used by many Qi4j Extensions and Libraries.
+services being down). It is used by many Zest� Extensions and Libraries.
 
 There's a couple of differences between this implementation and others
 seen on the net, but we've also heavily borrowed from others. The
@@ -54,7 +54,7 @@ track service levels and see exception messages, and trip/enable circuit
 breakers.
 
 Fourth, if an external system is unavailable due to a circuitbreaker
-tripping it should be possible to expose this to other Qi4j services.
+tripping it should be possible to expose this to other Zest� services.
 There is a standard implementation of the Availability interface that
 delegates to a circuit breaker and the Enabled configuration flag, which
 is what we'd suspect will be used in most cases where external systems
@@ -64,7 +64,7 @@ include::../../build/docs/buildinfo/artifact.txt[]
 
 == Direct usage ==
 
-The CircuitBreaker can be used directly, even without using anything else from the Qi4j SDK.
+The CircuitBreaker can be used directly, even without using anything else from the Zest� SDK.
 
 Here is a code snippet that demonstrate how to create a CircuitBreaker and how it behave:
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/constraints/src/docs/constraints.txt
----------------------------------------------------------------------
diff --git a/libraries/constraints/src/docs/constraints.txt b/libraries/constraints/src/docs/constraints.txt
index 2514cf9..f0a7e59 100644
--- a/libraries/constraints/src/docs/constraints.txt
+++ b/libraries/constraints/src/docs/constraints.txt
@@ -26,7 +26,7 @@ source=libraries/constraints/dev-status.xml
 --------------
 
 The Constraints library provide a bunch of often used Constraints based on the
-Qi4j Constraints api described in <<def-constraint>>.
+Zest� Constraints api described in <<def-constraint>>.
 
 Remember that you are not limited to constraints presents in this library, you
 are encouraged to write your own constraints. See <<howto-create-constraint>>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/fileconfig/src/docs/fileconfig.txt
----------------------------------------------------------------------
diff --git a/libraries/fileconfig/src/docs/fileconfig.txt b/libraries/fileconfig/src/docs/fileconfig.txt
index 3cc115d..5baa0a4 100644
--- a/libraries/fileconfig/src/docs/fileconfig.txt
+++ b/libraries/fileconfig/src/docs/fileconfig.txt
@@ -27,7 +27,7 @@ source=libraries/fileconfig/dev-status.xml
 
 The FileConfig library provide a service for accessing application-specific directories.
 
-A lot of the Qi4j Libraries and Extensions make use of this library to locate files.
+A lot of the Zest� Libraries and Extensions make use of this library to locate files.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/http/src/docs/http.txt
----------------------------------------------------------------------
diff --git a/libraries/http/src/docs/http.txt b/libraries/http/src/docs/http.txt
index fa8ecef..3c135dd 100644
--- a/libraries/http/src/docs/http.txt
+++ b/libraries/http/src/docs/http.txt
@@ -29,7 +29,7 @@ The HTTP library provides a Jetty based embedded HTTP service with support for e
 filters assembly as Services.
 
 It's an easy way to embedd a servlet container and reuse everything that can be run in it (JAX-*, Restlet, Wicket,
-Vaadin, GWT etc..). If instead you want to run a Qi4j Application in a servlet container, see <<library-servlet>>.
+Vaadin, GWT etc..). If instead you want to run a Zest� Application in a servlet container, see <<library-servlet>>.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
@@ -90,7 +90,7 @@ tag=jmx
 
 === Configuration ===
 
-Underlying Jetty engine configuration is exposed as a Qi4j Service Configuration.
+Underlying Jetty engine configuration is exposed as a Zest� Service Configuration.
 The only one that is mandatory is the port.
 
 See org.qi4j.library.http.JettyConfiguration for a reference of all available

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/jmx/src/docs/jmx.txt
----------------------------------------------------------------------
diff --git a/libraries/jmx/src/docs/jmx.txt b/libraries/jmx/src/docs/jmx.txt
index afb8493..4469048 100644
--- a/libraries/jmx/src/docs/jmx.txt
+++ b/libraries/jmx/src/docs/jmx.txt
@@ -25,7 +25,7 @@
 source=libraries/jmx/dev-status.xml
 --------------
 
-The JMX library provides a service that exposes a Qi4j app in
+The JMX library provides a service that exposes a Zest� app in
 JMX automatically, giving you an opportunity to inspect the app much as
 you would with the <<tools-envisage>> tool.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/lang-beanshell/README.txt
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/README.txt b/libraries/lang-beanshell/README.txt
index 4cb1b55..1d47320 100644
--- a/libraries/lang-beanshell/README.txt
+++ b/libraries/lang-beanshell/README.txt
@@ -2,7 +2,7 @@
 BeanShell is licensed under LGPL, and Apache Software Foundation
 doesn't allow the use of LGPL in Apache projects.
 
-Therefor, Apache Zest had to drop this library component, but
+Therefor, Apache Zest� had to drop this library component, but
 it is still available for separate download at
 
 https://github.com/Qi4j/qi4j-sdk

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/lang-jruby/README.txt
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/README.txt b/libraries/lang-jruby/README.txt
index 4cb1b55..1d47320 100644
--- a/libraries/lang-jruby/README.txt
+++ b/libraries/lang-jruby/README.txt
@@ -2,7 +2,7 @@
 BeanShell is licensed under LGPL, and Apache Software Foundation
 doesn't allow the use of LGPL in Apache projects.
 
-Therefor, Apache Zest had to drop this library component, but
+Therefor, Apache Zest� had to drop this library component, but
 it is still available for separate download at
 
 https://github.com/Qi4j/qi4j-sdk

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/logging/src/docs/logging.txt
----------------------------------------------------------------------
diff --git a/libraries/logging/src/docs/logging.txt b/libraries/logging/src/docs/logging.txt
index 06d823a..dabe4e7 100644
--- a/libraries/logging/src/docs/logging.txt
+++ b/libraries/logging/src/docs/logging.txt
@@ -21,7 +21,7 @@
 source=libraries/logging/dev-status.xml
 --------------
 
-First of all, Qi4j is taking a fresh look at all things that we take for granted. Logging is one such thing.
+First of all, Zest� is taking a fresh look at all things that we take for granted. Logging is one such thing.
 
 It should (but is not) obvious that Logging are used for three very distinct purposes, and in our opinion the concepts
 are not related and should not be abstracted in the same fashion, as has been the norm in Log4j, JDK logging, Commons
@@ -80,7 +80,7 @@ visible.
 == Tracing ==
 
 Tracing is the process of tracking all the methods that has been called. There are two levels of tracing available in
-Qi4j. Either Trace All or trace where a annotation has been given.
+Zest. Either Trace All or trace where a annotation has been given.
 
 If the TraceAllConcern is added to a composite, and there is a TraceService visible, then all method calls into that
 composite is traced.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/osgi/src/docs/osgi.txt
----------------------------------------------------------------------
diff --git a/libraries/osgi/src/docs/osgi.txt b/libraries/osgi/src/docs/osgi.txt
index 2ed99a1..cee2129 100644
--- a/libraries/osgi/src/docs/osgi.txt
+++ b/libraries/osgi/src/docs/osgi.txt
@@ -25,12 +25,12 @@
 source=libraries/osgi/dev-status.xml
 --------------
 
-OSGi Library allows you to import OSGi services as Qi4j Services and to export Qi4j Services as OSGi Services both
-leveraging the Qi4j Availability and OSGi FallbackStrategy mechanisms.
+OSGi Library allows you to import OSGi services as Zest� Services and to export Zest� Services as OSGi Services both
+leveraging the Zest� Availability and OSGi FallbackStrategy mechanisms.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
-== Export Qi4j services to an OSGi Bundle ==
+== Export Zest� services to an OSGi Bundle ==
 
 [snippet,java]
 ----
@@ -39,7 +39,7 @@ tag=export
 ----
 
 
-== Import OSGi services in a Qi4j Module ==
+== Import OSGi services in a Zest� Module ==
 
 [snippet,java]
 ----

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/rest-client/src/docs/primer.txt
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/docs/primer.txt b/libraries/rest-client/src/docs/primer.txt
index 35a1121..6ed3a9d 100644
--- a/libraries/rest-client/src/docs/primer.txt
+++ b/libraries/rest-client/src/docs/primer.txt
@@ -20,7 +20,7 @@
 [[library-rest-client-primer, HATEOAS Primer]]
 = ReST - HATEOAS Primer
 
-The Qi4j ReST Client implements HATEOAS (Hypermedia As The Engine Of Application State) to the full extent intended
+The Zest� ReST Client implements HATEOAS (Hypermedia As The Engine Of Application State) to the full extent intended
 by Roy Fielding. The ReST Client Library enables the creation of HATEOAS applications that are NOT using the URL space,
 and it is NOT about doing RPC calls over HTTP using a common exchange format (like JSON).
 
@@ -79,7 +79,7 @@ case, such as doing a signup for the website, login, redirects to other servers,
 It becomes possible to blend general application and error handling logic with use case specific handlers.
 
 That's basically it. This is where I want to go with support for REST, as a way to truly leverage the REST ideas and
-make it very easy to do REST applications *and* clients based on Qi4j, by keeping the application logic on the server.
+make it very easy to do REST applications *and* clients based on Zest, by keeping the application logic on the server.
 In the long run there would also be a JavaScript version of the client, with the same characteristics, so that you can
-easily build a jQuery UI for Qi4j REST apps.
+easily build a jQuery UI for Zest� REST apps.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/scheduler/src/docs/scheduler.txt
----------------------------------------------------------------------
diff --git a/libraries/scheduler/src/docs/scheduler.txt b/libraries/scheduler/src/docs/scheduler.txt
index 8b4b5ac..142907a 100644
--- a/libraries/scheduler/src/docs/scheduler.txt
+++ b/libraries/scheduler/src/docs/scheduler.txt
@@ -75,7 +75,7 @@ Tasks have a mandatory name property and an optional tags property. Theses prope
 each TimelineRecord created when the Timeline feature is activated.
 
 The run() method of Tasks is wrapped in a UnitOfWork when called by the Scheduler.
-Thanks to the UnitOfWork handling in Qi4j, you can split the work done in your Tasks in
+Thanks to the UnitOfWork handling in Zest, you can split the work done in your Tasks in
 several UnitOfWorks, the one around the Task#run() invocation will then be paused.
 
 Here is a simple example:

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/servlet/src/docs/servlet.txt
----------------------------------------------------------------------
diff --git a/libraries/servlet/src/docs/servlet.txt b/libraries/servlet/src/docs/servlet.txt
index 22b60b4..48974ee 100644
--- a/libraries/servlet/src/docs/servlet.txt
+++ b/libraries/servlet/src/docs/servlet.txt
@@ -25,16 +25,16 @@
 source=libraries/servlet/dev-status.xml
 --------------
 
-This library provide the necessary boilerplate code to bootstrap a Qi4j Application in a Servlet container plus some
+This library provide the necessary boilerplate code to bootstrap a Zest� Application in a Servlet container plus some
 facilities. It aims at a very simple need and is provided as an example integration.
 
-If instead you want to run a servlet container inside a Qi4j Application, see <<library-http>>.
+If instead you want to run a servlet container inside a Zest� Application, see <<library-http>>.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
 == Application Bootstrap ==
 
-Extends `AbstractQi4jServletBootstrap` to easily bind a Qi4j `Application` activation/passivation to your webapp
+Extends `AbstractQi4jServletBootstrap` to easily bind a Zest� `Application` activation/passivation to your webapp
 lifecycle.
 
 Use `Qi4jServletSupport#application(javax.servlet.ServletContext)` to get a handle on the `Application` from the

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/shiro-core/src/docs/shiro.txt
----------------------------------------------------------------------
diff --git a/libraries/shiro-core/src/docs/shiro.txt b/libraries/shiro-core/src/docs/shiro.txt
index 3fd16b6..a12a3e7 100644
--- a/libraries/shiro-core/src/docs/shiro.txt
+++ b/libraries/shiro-core/src/docs/shiro.txt
@@ -35,20 +35,20 @@ cryptography, and session management. With Shiro’s easy-to-understand API, you
 application – from the smallest mobile applications to the largest web and enterprise applications.'' says the Apache
 Shiro website.
 
-Altough Apache Shiro can be used as-is with Qi4j Applications, this library provides integrations that can come in
+Altough Apache Shiro can be used as-is with Zest™ Applications, this library provides integrations that can come in
 handy. If your use case do not fit any of theses integrations, look at their respective code. You should find out
 pretty easily how to compose the provided code to write your integration. Don't hesitate to contribute interesting
 integrations to this very library.
 
 We invite you to read the comprehensive http://shiro.apache.org/documentation.html[Apache Shiro documentation], we will
-mostly discuss Qi4j related matters here.
+mostly discuss Zest™ related matters here.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
 == Basic usage ==
 
 For standalone applications, you can use plain Shiro easily. The only thing to do is to register a configured
-SecurityManager when activating your Qi4j Application. It can be done outside the application, before its activation,
+SecurityManager when activating your Zest™ Application. It can be done outside the application, before its activation,
 "à là" by-hand ;
 
 [snippet,java]
@@ -78,7 +78,7 @@ tag=config
 
 Remember that this setup use a ThreadLocal SecurityManager singleton. Among other things it means that, althoug the
 IniSecurityManagerService is activated on Application activation, if you need to use Shiro in other Services that are
-activated on Application activation you should tell Qi4j about this dependency by injecting the SecurityManagerService
+activated on Application activation you should tell Zest™ about this dependency by injecting the SecurityManagerService
 in the laters.
 
 Once started you must remember to register the SecurityManager in Shiro's ThreadContext ;
@@ -116,10 +116,10 @@ Apache Shiro annotations:
 
 All the above is sufficient as long as you use the ini file to store user credentials and permissions or a Realm that
 has no dependency on your application code and can be specified in the ini file to be instanciated by Shiro outside the
-Qi4j scope.
+Zest™ scope.
 
 One usecase where it's not sufficient comes quickly as you would like to provide user credentials and permissions
-from Entities stored in an EntityStore or perform any custom logic involving your Qi4j Application.
+from Entities stored in an EntityStore or perform any custom logic involving your Zest™ Application.
 
 Let's look at a complete example using a Realm Service that extends one of the Shiro provided Realm which use in-memory
 credientials and configuring it ;
@@ -235,7 +235,7 @@ libraries. There's support for text files, simple JDBC, LDAP, CAS SSO, OAuth, Op
 
 Take the PasswordRealmService as a start and extend/rewrite it to suit your needs.
 
-If you happen to come with a Qi4j integration that could be valuable in this very library, don't hesitate to
+If you happen to come with a Zest™ integration that could be valuable in this very library, don't hesitate to
 contribute.
 
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/shiro-web/src/docs/shiro-web.txt
----------------------------------------------------------------------
diff --git a/libraries/shiro-web/src/docs/shiro-web.txt b/libraries/shiro-web/src/docs/shiro-web.txt
index 8797976..c92d9b8 100644
--- a/libraries/shiro-web/src/docs/shiro-web.txt
+++ b/libraries/shiro-web/src/docs/shiro-web.txt
@@ -37,16 +37,16 @@ application – from the smallest mobile applications to the largest web and ent
 Shiro website.
 
 We invite you to read the comprehensive http://shiro.apache.org/documentation.html[Apache Shiro documentation], we will
-mostly discuss Qi4j related matters here.
+mostly discuss Zest™ related matters here.
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
 == Servlet Context ==
 
-In a servlet context, being through the <<library-servlet>>, the <<library-http>> or your custom Qi4j application
+In a servlet context, being through the <<library-servlet>>, the <<library-http>> or your custom Zest™ application
 bootstrap, plain Shiro is usable. A WebEnvironment must be globally available and ShiroFilter must be registered.
 
-If you use a custom Qi4j application boostrap or the <<library-servlet>> you can directly use Shiro's provided
+If you use a custom Zest™ application boostrap or the <<library-servlet>> you can directly use Shiro's provided
 EnvironmentLoaderListener and ShiroFilter.
 
 If you use the <<library-http>> you can either directly use Shiro classes or use the assembly API as follows:

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/spring/src/docs/spring.txt
----------------------------------------------------------------------
diff --git a/libraries/spring/src/docs/spring.txt b/libraries/spring/src/docs/spring.txt
index 19c0cca..458eb99 100644
--- a/libraries/spring/src/docs/spring.txt
+++ b/libraries/spring/src/docs/spring.txt
@@ -27,14 +27,14 @@ source=libraries/spring/dev-status.xml
 
 include::../../build/docs/buildinfo/artifact.txt[]
 
-== Using Spring Framework in Apache Zest ==
-Zest supports that Spring Application Context is imported into the Zest runtime, and the declared Spring
-beans will be available as Zest services. The most important things to remember are;
+== Using Spring Framework in Apache Zest� ==
+Zest� supports that Spring Application Context is imported into the Zest� runtime, and the declared Spring
+beans will be available as Zest� services. The most important things to remember are;
 
     1. Only Spring Singletons are currently supported.
-    2. One ApplicationContext per Zest Module.
-    3. The Zest service will be given the same name as the Spring Bean name.
-    4. Zest Configuration is not reacbable from the Spring bean (kind of obvious).
+    2. One ApplicationContext per Zest� Module.
+    3. The Zest� service will be given the same name as the Spring Bean name.
+    4. Zest� Configuration is not reacbable from the Spring bean (kind of obvious).
 
 [snippet,java]
 ----
@@ -42,10 +42,10 @@ source=libraries/spring/src/test/java/org/qi4j/library/spring/importer/Qi4jImpor
 tag=import
 ----
 
-== Using Apache Zest in Spring Framework ==
-It is also possible to run a Zest Application as a Spring Bean and export its Services to Spring.
+== Using Apache Zest� in Spring Framework ==
+It is also possible to run a Zest� Application as a Spring Bean and export its Services to Spring.
 
-Steps to export Qi4j service:
+Steps to export Zest� service:
 
     1. Create spring BeanFactory service of qi4j services to export.
     2. Create a class that extends Qi4jApplicationBootstrap.
@@ -54,7 +54,7 @@ Steps to export Qi4j service:
     5. Sets the identity of bean factory service. This identity is the spring bean name.
     6. Declare qi4j bootstrap in spring xml application context.
 
-To bootstrap the Zest runtime in Spring, you should have a bootstrap bean that extends the
+To bootstrap the Zest� runtime in Spring, you should have a bootstrap bean that extends the
 +org.qi4j.library.spring.bootstrap.Qi4jApplicationBootstrap+ and implement the
 +org.springframework.context.ApplicationContextAware+.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/libraries/sql/src/docs/sql.txt
----------------------------------------------------------------------
diff --git a/libraries/sql/src/docs/sql.txt b/libraries/sql/src/docs/sql.txt
index abbac47..9116718 100644
--- a/libraries/sql/src/docs/sql.txt
+++ b/libraries/sql/src/docs/sql.txt
@@ -142,7 +142,7 @@ include::../test/resources/testds.properties[]
 
 === Importing an existing DataSource ===
 
-Importing an existing DataSource at assembly time is usefull when your Qi4j
+Importing an existing DataSource at assembly time is usefull when your Zest
 Application runs in an environment where DataSource are already provided.
 
 [snippet,java]

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/tutorials/howto-assembly-application.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-assembly-application.txt b/manual/src/docs/tutorials/howto-assembly-application.txt
index dcb520c..31a8e5b 100644
--- a/manual/src/docs/tutorials/howto-assembly-application.txt
+++ b/manual/src/docs/tutorials/howto-assembly-application.txt
@@ -27,9 +27,9 @@ At runtime you will need the Core Runtime artifact too. See the <<howto-depend-o
 
 == Basics ==
 
-First let's recap the structural requirements of Qi4j;
+First let's recap the structural requirements of Zest;
 
-    * There is one and only one Application instance per Qi4j Runtime.
+    * There is one and only one Application instance per Zest� Runtime.
     * Every Application must contain one or more Layers.
     * All Composites must be declared in one or more Modules.
     * Each Module belong to a Layer.
@@ -40,7 +40,7 @@ Ok, that was quite a handful. Let's look at them one by one.
 
 == Application ==
 
-The first one means that for each Qi4j Runtime you start, there will be exactly one application. As far as we know, Qi4j
+The first one means that for each Zest� Runtime you start, there will be exactly one application. As far as we know, Zest
 is fully isolated, meaning there are no static members being populated and such.
 
 == Layers ==
@@ -49,7 +49,7 @@ Layers are the super-structures of an application. We have been talking about th
 whiteboards (or even black boards for those old enough), and sometimes organized the codebases along such boundaries.
 But, there has been little effort to enforce the Layer mechanism in code, although it is an extremely powerful
 construct. First of all it implies directional dependency and a high degree of order, spagetti code is reduced if
-successfully implemented. For Qi4j, it means that we can restrict access to Composite and Object declarations, so that
+successfully implemented. For Zest, it means that we can restrict access to Composite and Object declarations, so that
 higher layers can not reach them incidentally. You can enforce architecture to a high degree. You can require all
 creation of composites to go through an exposed Factory, which doesn't require the Composite to be public. And so on.
 Layers have hierarchy, i.e. one layer is top of one or more layers, and is below one or more layers, except for the
@@ -58,7 +58,7 @@ that are both the top and bottom.
 
 == Modules ==
 
-The Module concept has also been around forever. And in Qi4j we also makes the Modules explicit. Each Module belong to a
+The Module concept has also been around forever. And in Zest� we also makes the Modules explicit. Each Module belong to a
 Layer, and for each Module you declare the Composite and Object types for that Module, together with a Visibility rule,
 one of; application, layer, module.
 
@@ -109,7 +109,7 @@ acting addiction).
 How to structure your code is beyond the scope of this section. If you are an experienced designer, you will have done
 that before, and you may have started out with good intentions at times only to find yourself in a spaghetti swamp
 later, or perhaps in the also famous "Clear as Clay" or "Ball (bowl?) of Mud". Either way, you need to draw on your
-experience and come up with good structure that Qi4j lets you enforce.
+experience and come up with good structure that Zest� lets you enforce.
 
 So, for the sake of education, we are going to look at an application that consists of many layers, each with a few
 modules. See picture below.
@@ -127,7 +127,7 @@ tag=main
 -----------
 
 The above is the basic setup on how to structure a real-world applicaton, unless you intend to mess with the
-implementations of various Qi4j systems (yes there are hooks for that too), but that is definitely beyond the scope of
+implementations of various Zest� systems (yes there are hooks for that too), but that is definitely beyond the scope of
 this tutorial.
 
 Now, the createXyzLayer() methods were excluded to keep the sample crisp and easy to follow. Let's take a look at what
@@ -158,5 +158,5 @@ source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java
 tag=shutdown
 -----------
 
-This concludes this tutorial. We have looked how to get the initial Qi4j runtime going, how to declare the assembly
+This concludes this tutorial. We have looked how to get the initial Zest� runtime going, how to declare the assembly
 for application model creation and finally the activation of the model itself.


[05/11] zest-qi4j git commit: ZEST-40 apply rename on build system

Posted by ni...@apache.org.
ZEST-40 apply rename on build system

JAR manifests mostly


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/f3fee433
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/f3fee433
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/f3fee433

Branch: refs/heads/develop
Commit: f3fee4336b9869e93d9efbaf90720fc4e7e7315a
Parents: 60fed40
Author: Paul Merlin <pa...@apache.org>
Authored: Tue Jul 7 11:59:55 2015 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Tue Jul 7 11:59:55 2015 +0200

----------------------------------------------------------------------
 build.gradle                                       | 14 +++++++-------
 core/api/build.gradle                              |  2 +-
 core/bootstrap/build.gradle                        |  2 +-
 core/functional/build.gradle                       |  2 +-
 core/io/build.gradle                               |  2 +-
 core/runtime/build.gradle                          |  2 +-
 core/spi/build.gradle                              |  2 +-
 core/testsupport/build.gradle                      |  2 +-
 extensions/cache-ehcache/build.gradle              |  4 ++--
 extensions/cache-memcache/build.gradle             |  4 ++--
 extensions/entitystore-file/build.gradle           |  2 +-
 extensions/entitystore-hazelcast/build.gradle      |  4 ++--
 extensions/entitystore-jclouds/build.gradle        |  4 ++--
 extensions/entitystore-jdbm/build.gradle           |  4 ++--
 extensions/entitystore-leveldb/build.gradle        |  4 ++--
 extensions/entitystore-memory/build.gradle         |  2 +-
 extensions/entitystore-mongodb/build.gradle        |  4 ++--
 extensions/entitystore-preferences/build.gradle    |  4 ++--
 extensions/entitystore-redis/build.gradle          |  4 ++--
 extensions/entitystore-riak/build.gradle           |  4 ++--
 extensions/entitystore-sql/build.gradle            |  4 ++--
 extensions/entitystore-voldemort/build.gradle      |  4 ++--
 extensions/indexing-elasticsearch/build.gradle     |  4 ++--
 extensions/indexing-rdf/build.gradle               |  4 ++--
 extensions/indexing-solr/build.gradle              |  4 ++--
 extensions/indexing-sql/build.gradle               |  4 ++--
 extensions/metrics-yammer/build.gradle             |  4 ++--
 extensions/migration/build.gradle                  |  4 ++--
 extensions/reindexer/build.gradle                  |  2 +-
 extensions/valueserialization-jackson/build.gradle |  4 ++--
 extensions/valueserialization-orgjson/build.gradle |  4 ++--
 extensions/valueserialization-stax/build.gradle    |  4 ++--
 libraries/alarm/build.gradle                       |  4 ++--
 libraries/circuitbreaker/build.gradle              |  4 ++--
 libraries/constraints/build.gradle                 |  4 ++--
 libraries/conversion/build.gradle                  |  4 ++--
 libraries/eventsourcing-jdbm/build.gradle          |  4 ++--
 libraries/eventsourcing-rest/build.gradle          |  4 ++--
 libraries/eventsourcing/build.gradle               |  4 ++--
 libraries/fileconfig/build.gradle                  |  4 ++--
 libraries/http/build.gradle                        |  4 ++--
 libraries/invocation-cache/build.gradle            |  4 ++--
 libraries/jmx/build.gradle                         |  4 ++--
 libraries/lang-groovy/build.gradle                 |  4 ++--
 libraries/lang-javascript/build.gradle             |  4 ++--
 libraries/lang-scala/build.gradle                  |  4 ++--
 libraries/locking/build.gradle                     |  4 ++--
 libraries/logging/build.gradle                     |  4 ++--
 libraries/metrics/build.gradle                     |  4 ++--
 libraries/osgi/build.gradle                        |  4 ++--
 libraries/rdf/build.gradle                         |  4 ++--
 libraries/rest-client/build.gradle                 |  4 ++--
 libraries/rest-common/build.gradle                 |  4 ++--
 libraries/rest-server/build.gradle                 |  4 ++--
 libraries/rest/build.gradle                        |  4 ++--
 libraries/scheduler/build.gradle                   |  4 ++--
 libraries/scripting/build.gradle                   |  4 ++--
 libraries/servlet/build.gradle                     |  4 ++--
 libraries/shiro-core/build.gradle                  |  4 ++--
 libraries/shiro-web/build.gradle                   |  4 ++--
 libraries/spring/build.gradle                      |  4 ++--
 libraries/sql-bonecp/build.gradle                  |  4 ++--
 libraries/sql-dbcp/build.gradle                    |  4 ++--
 libraries/sql-liquibase/build.gradle               |  4 ++--
 libraries/sql/build.gradle                         |  4 ++--
 libraries/uid/build.gradle                         |  4 ++--
 libraries/uowfile/build.gradle                     |  4 ++--
 manual/build.gradle                                |  2 +-
 samples/dci-cargo/dcisample_a/build.gradle         |  4 ++--
 samples/dci-cargo/dcisample_b/build.gradle         |  4 ++--
 samples/dci/build.gradle                           |  4 ++--
 samples/forum/build.gradle                         |  2 +-
 samples/rental/build.gradle                        |  2 +-
 samples/sql-support/build.gradle                   |  2 +-
 samples/swing/build.gradle                         |  2 +-
 tests/performance/build.gradle                     |  4 ++--
 tests/regression/build.gradle                      |  4 ++--
 tools/envisage/build.gradle                        |  4 ++--
 tools/model-detail/build.gradle                    |  4 ++--
 tools/qidea/build.gradle                           |  4 ++--
 tools/shell/build.gradle                           |  4 ++--
 tutorials/cargo/build.gradle                       |  4 ++--
 tutorials/composites/build.gradle                  |  4 ++--
 tutorials/hello/build.gradle                       |  4 ++--
 tutorials/introduction/build.gradle                |  4 ++--
 tutorials/introduction/tenminutes/build.gradle     |  4 ++--
 tutorials/introduction/thirtyminutes/build.gradle  |  4 ++--
 tutorials/introduction/twominutes/build.gradle     |  4 ++--
 tutorials/services/build.gradle                    |  4 ++--
 89 files changed, 168 insertions(+), 168 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 7ff01a1..923730f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,8 +18,8 @@
  */
 
 project.ext {
-  title = "Apache Zest Qi4j SDK"
-  description = "Apache Zest Qi4j™ is a framework for domain centric application development, including evolved concepts from AOP, DI and DDD."
+  title = "Apache Zest™ (Java Edition) SDK"
+  description = "Apache Zest™ (Java Edition) is a framework for domain centric application development, including evolved concepts from AOP, DI and DDD."
   testFailures = [ ]
   mainClassName = 'org.qi4j.container.Main'
   groovycMain_mx = "700m"
@@ -281,9 +281,9 @@ allprojects {
     jar {
       manifest {
         license = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-        docURL = 'http://www.qi4j.org'
-        description = project.description ?: 'Qi4j is a platform for Composite Oriented Programming'
-        vendor = 'Qi4j Community, http://www.qi4j.org'
+        docURL = 'https://zest.apache.org'
+        description = project.description ?: 'Apache Zest™ (Java Edition) is a platform for Composite Oriented Programming'
+        vendor = 'The Apache Software Foundation, https://www.apache.org'
         instruction '-debug', 'true'
       }
     }
@@ -448,7 +448,7 @@ task coverageReport {
       executiondata {
         coveredProjects.collect { p -> fileset( dir: "${p.buildDir.path}/jacoco" ) { include( name: '*.exec' ) } }
       }
-      structure( name: "Qi4j SDK" ) {
+      structure( name: "Apache Zest™ (Java Edition) SDK" ) {
         group( name: "Core" ) {
           classfiles { coreProjects.collect { p -> fileset dir: "${p.buildDir.path}/classes/main" } }
           sourcefiles { coreProjects.collect { p -> fileset dir: "${p.projectDir.path}/src/main/java" } }
@@ -476,7 +476,7 @@ task coverageReport {
       }
       csv  destfile: "${outputPath}/jacoco.csv", encoding: "UTF-8"
       xml  destfile: "${outputPath}/jacoco.xml", encoding: "UTF-8"
-      html destdir:  outputPath, encoding: "UTF-8", locale: "en", footer: "Qi4j SDK"
+      html destdir:  outputPath, encoding: "UTF-8", locale: "en", footer: "Apache Zest™ (Java Edition) SDK"
     }
   }
   inputs.dir subprojects.collect { p -> "${p.buildDir.path}/jacoco" }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/core/api/build.gradle
----------------------------------------------------------------------
diff --git a/core/api/build.gradle b/core/api/build.gradle
index ee3d9f6..ab89613 100644
--- a/core/api/build.gradle
+++ b/core/api/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-jar { manifest { name = "Qi4j Core API"}}
+jar { manifest { name = "Apache Zest™ Core API"}}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/core/bootstrap/build.gradle
----------------------------------------------------------------------
diff --git a/core/bootstrap/build.gradle b/core/bootstrap/build.gradle
index f9f406b..7f43cdc 100644
--- a/core/bootstrap/build.gradle
+++ b/core/bootstrap/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-jar { manifest { name = "Qi4j Core Bootstrap"}}
+jar { manifest { name = "Apache Zest™ Core Bootstrap"}}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/core/functional/build.gradle
----------------------------------------------------------------------
diff --git a/core/functional/build.gradle b/core/functional/build.gradle
index 4c5da96..e8408b3 100644
--- a/core/functional/build.gradle
+++ b/core/functional/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-jar { manifest { name = "Qi4j Functional"}}
+jar { manifest { name = "Apache Zest™ Functional"}}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/core/io/build.gradle
----------------------------------------------------------------------
diff --git a/core/io/build.gradle b/core/io/build.gradle
index adcc723..e67866f 100644
--- a/core/io/build.gradle
+++ b/core/io/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-jar { manifest { name = "Qi4j I/O"}}
+jar { manifest { name = "Apache Zest™ I/O"}}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/core/runtime/build.gradle
----------------------------------------------------------------------
diff --git a/core/runtime/build.gradle b/core/runtime/build.gradle
index e0e6bb9..1ddf701 100644
--- a/core/runtime/build.gradle
+++ b/core/runtime/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-jar { manifest { name = "Qi4j Core Runtime" } }
+jar { manifest { name = "Apache Zest™ Core Runtime" } }
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/core/spi/build.gradle
----------------------------------------------------------------------
diff --git a/core/spi/build.gradle b/core/spi/build.gradle
index 1b0b41a..3908bc6 100644
--- a/core/spi/build.gradle
+++ b/core/spi/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-jar { manifest { name = "Qi4j Core SPI"}}
+jar { manifest { name = "Apache Zest™ Core SPI"}}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/core/testsupport/build.gradle
----------------------------------------------------------------------
diff --git a/core/testsupport/build.gradle b/core/testsupport/build.gradle
index 849914f..7fc088a 100644
--- a/core/testsupport/build.gradle
+++ b/core/testsupport/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-jar { manifest { name = "Qi4j Core TestSupport"}}
+jar { manifest { name = "Apache Zest™ Core TestSupport"}}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/cache-ehcache/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/build.gradle b/extensions/cache-ehcache/build.gradle
index cfaddca..9d68d45 100644
--- a/extensions/cache-ehcache/build.gradle
+++ b/extensions/cache-ehcache/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Ehcache Cache Extension"
+description = "Apache Zest™ Ehcache Cache Extension"
 
-jar { manifest { name = "Qi4j Extension: EhCache"}}
+jar { manifest { name = "Apache Zest™ Extension: EhCache"}}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/cache-memcache/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/cache-memcache/build.gradle b/extensions/cache-memcache/build.gradle
index 49bf554..c78356f 100644
--- a/extensions/cache-memcache/build.gradle
+++ b/extensions/cache-memcache/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Memcache Cache Extension"
+description = "Apache Zest™ Memcache Cache Extension"
 
-jar { manifest { name = "Qi4j Extension - Cache - Memcache"}}
+jar { manifest { name = "Apache Zest™ Extension - Cache - Memcache"}}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-file/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/build.gradle b/extensions/entitystore-file/build.gradle
index 50357dc..5ce6f63 100644
--- a/extensions/entitystore-file/build.gradle
+++ b/extensions/entitystore-file/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-jar { manifest { name = "Qi4j Extension - EntityStore - File system" }}
+jar { manifest { name = "Apache Zest™ Extension - EntityStore - File system" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-hazelcast/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/build.gradle b/extensions/entitystore-hazelcast/build.gradle
index 0c420b1..edce38d 100644
--- a/extensions/entitystore-hazelcast/build.gradle
+++ b/extensions/entitystore-hazelcast/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Hazelcast EntityStore Extension"
+description = "Apache Zest™ Hazelcast EntityStore Extension"
 
-jar { manifest { name = "Qi4j Extension - EntityStore - Hazelcast" }}
+jar { manifest { name = "Apache Zest™ Extension - EntityStore - Hazelcast" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-jclouds/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/build.gradle b/extensions/entitystore-jclouds/build.gradle
index e560bba..94c7aa6 100644
--- a/extensions/entitystore-jclouds/build.gradle
+++ b/extensions/entitystore-jclouds/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j JClouds EntityStore Extension"
+description = "Apache Zest™ JClouds EntityStore Extension"
 
-jar { manifest { name = "Qi4j Extension - EntityStore - JClouds" } }
+jar { manifest { name = "Apache Zest™ Extension - EntityStore - JClouds" } }
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-jdbm/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/build.gradle b/extensions/entitystore-jdbm/build.gradle
index 728afae..c317c15 100644
--- a/extensions/entitystore-jdbm/build.gradle
+++ b/extensions/entitystore-jdbm/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j JDBM EntityStore Extension"
+description = "Apache Zest™ JDBM EntityStore Extension"
 
-jar { manifest {name = "Qi4j Extension - EntityStore - JDBM" }}
+jar { manifest {name = "Apache Zest™ Extension - EntityStore - JDBM" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-leveldb/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/build.gradle b/extensions/entitystore-leveldb/build.gradle
index 35bde16..de2a431 100644
--- a/extensions/entitystore-leveldb/build.gradle
+++ b/extensions/entitystore-leveldb/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j LevelDB EntityStore Extension"
+description = "Apache Zest™ LevelDB EntityStore Extension"
 
-jar { manifest { name = "Qi4j Extension - EntityStore - LevelDB" }}
+jar { manifest { name = "Apache Zest™ Extension - EntityStore - LevelDB" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-memory/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-memory/build.gradle b/extensions/entitystore-memory/build.gradle
index 016717c..97f1f31 100644
--- a/extensions/entitystore-memory/build.gradle
+++ b/extensions/entitystore-memory/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-jar { manifest { name = "Qi4j Extension - EntityStore - Memory" }}
+jar { manifest { name = "Apache Zest™ Extension - EntityStore - Memory" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-mongodb/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/build.gradle b/extensions/entitystore-mongodb/build.gradle
index 014fc26..9570a1f 100644
--- a/extensions/entitystore-mongodb/build.gradle
+++ b/extensions/entitystore-mongodb/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j MongoDB EntityStore Extension"
+description = "Apache Zest™ MongoDB EntityStore Extension"
 
-jar { manifest { name = "Qi4j Extension - EntityStore - MongoDB" }}
+jar { manifest { name = "Apache Zest™ Extension - EntityStore - MongoDB" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-preferences/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/build.gradle b/extensions/entitystore-preferences/build.gradle
index 331d197..5d52095 100644
--- a/extensions/entitystore-preferences/build.gradle
+++ b/extensions/entitystore-preferences/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Preferences EntityStore Extension"
+description = "Apache Zest™ Preferences EntityStore Extension"
 
-jar { manifest { name = "Qi4j Extension - EntityStore - Preferences" } }
+jar { manifest { name = "Apache Zest™ Extension - EntityStore - Preferences" } }
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-redis/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-redis/build.gradle b/extensions/entitystore-redis/build.gradle
index 488b33d..50e6c36 100644
--- a/extensions/entitystore-redis/build.gradle
+++ b/extensions/entitystore-redis/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Redis EntityStore Extension"
+description = "Apache Zest™ Redis EntityStore Extension"
 
-jar { manifest { name = "Qi4j Extension - EntityStore - Redis" }}
+jar { manifest { name = "Apache Zest™ Extension - EntityStore - Redis" }}
 
 dependencies {
     

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-riak/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/build.gradle b/extensions/entitystore-riak/build.gradle
index a5b047b..ebdef59 100644
--- a/extensions/entitystore-riak/build.gradle
+++ b/extensions/entitystore-riak/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Riak EntityStore Extension"
+description = "Apache Zest™ Riak EntityStore Extension"
 
-jar { manifest { name = "Qi4j Extension - EntityStore - Riak" } }
+jar { manifest { name = "Apache Zest™ Extension - EntityStore - Riak" } }
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-sql/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/build.gradle b/extensions/entitystore-sql/build.gradle
index 263c18d..f8a0849 100644
--- a/extensions/entitystore-sql/build.gradle
+++ b/extensions/entitystore-sql/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j SQL EntityStore Extension"
+description = "Apache Zest™ SQL EntityStore Extension"
 
-jar { manifest { name = "Qi4j Extension - EntityStore - SQL" }}
+jar { manifest { name = "Apache Zest™ Extension - EntityStore - SQL" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/entitystore-voldemort/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-voldemort/build.gradle b/extensions/entitystore-voldemort/build.gradle
index be0ef18..f0f2b0a 100644
--- a/extensions/entitystore-voldemort/build.gradle
+++ b/extensions/entitystore-voldemort/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Voldemort EntityStore Extension"
+description = "Apache Zest™ Voldemort EntityStore Extension"
 
-jar { manifest { name = "Qi4j Extension - EntityStore - Voldemort" }}
+jar { manifest { name = "Apache Zest™ Extension - EntityStore - Voldemort" }}
 
 repositories {
     maven { name 'clojars-repo'; url 'http://clojars.org/repo' }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/indexing-elasticsearch/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/build.gradle b/extensions/indexing-elasticsearch/build.gradle
index 4f03c4c..f413afd 100644
--- a/extensions/indexing-elasticsearch/build.gradle
+++ b/extensions/indexing-elasticsearch/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j ElasticSearch Index/Query Extension"
+description = "Apache Zest™ ElasticSearch Index/Query Extension"
 
-jar { manifest { name = "Qi4j Extension - Index/Query - ElasticSearch" } }
+jar { manifest { name = "Apache Zest™ Extension - Index/Query - ElasticSearch" } }
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/indexing-rdf/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/build.gradle b/extensions/indexing-rdf/build.gradle
index 71052b6..a612974 100644
--- a/extensions/indexing-rdf/build.gradle
+++ b/extensions/indexing-rdf/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j RDF Index/Query Extension"
+description = "Apache Zest™ RDF Index/Query Extension"
 
-jar { manifest { name = "Qi4j Extension - Index/Query - RDF" } }
+jar { manifest { name = "Apache Zest™ Extension - Index/Query - RDF" } }
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/indexing-solr/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/build.gradle b/extensions/indexing-solr/build.gradle
index 38689bc..944d851 100644
--- a/extensions/indexing-solr/build.gradle
+++ b/extensions/indexing-solr/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Solr Indexing Extension"
+description = "Apache Zest™ Solr Indexing Extension"
 
-jar { manifest {name = "Qi4j Extension - Indexing - Solr" }}
+jar { manifest {name = "Apache Zest™ Extension - Indexing - Solr" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/indexing-sql/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/build.gradle b/extensions/indexing-sql/build.gradle
index 9f22d21..9330210 100644
--- a/extensions/indexing-sql/build.gradle
+++ b/extensions/indexing-sql/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j SQL Indexing Extension"
+description = "Apache Zest™ SQL Indexing Extension"
 
-jar {manifest {name = "Qi4j Extension - Indexing - SQL"}}
+jar {manifest {name = "Apache Zest™ Extension - Indexing - SQL"}}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/metrics-yammer/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/metrics-yammer/build.gradle b/extensions/metrics-yammer/build.gradle
index 7ff1a00..c89eba1 100644
--- a/extensions/metrics-yammer/build.gradle
+++ b/extensions/metrics-yammer/build.gradle
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-description = "Qi4j Metrics Extension"
+description = "Apache Zest™ Metrics Extension"
 
-jar { manifest { name = "Qi4j Extension - Metrics" }}
+jar { manifest { name = "Apache Zest™ Extension - Metrics" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/migration/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/migration/build.gradle b/extensions/migration/build.gradle
index ae47df3..fa3072a 100644
--- a/extensions/migration/build.gradle
+++ b/extensions/migration/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Migration Extension"
+description = "Apache Zest™ Migration Extension"
 
-jar { manifest { name = "Qi4j Extension - Migration" }}
+jar { manifest { name = "Apache Zest™ Extension - Migration" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.spi"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/reindexer/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/reindexer/build.gradle b/extensions/reindexer/build.gradle
index 7dd6ee8..018ace0 100644
--- a/extensions/reindexer/build.gradle
+++ b/extensions/reindexer/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-jar { manifest { description = "Qi4j Reindexer Extension" }}
+jar { manifest { description = "Apache Zest™ Reindexer Extension" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.spi"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/valueserialization-jackson/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/valueserialization-jackson/build.gradle b/extensions/valueserialization-jackson/build.gradle
index 7bad111..f821472 100644
--- a/extensions/valueserialization-jackson/build.gradle
+++ b/extensions/valueserialization-jackson/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Jackson ValueSerialization Extension"
+description = "Apache Zest™ Jackson ValueSerialization Extension"
 
-jar { manifest { name = "Qi4j Extension - ValueSerialization - Jackson" } }
+jar { manifest { name = "Apache Zest™ Extension - ValueSerialization - Jackson" } }
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/valueserialization-orgjson/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/valueserialization-orgjson/build.gradle b/extensions/valueserialization-orgjson/build.gradle
index 4ad7ff3..a06c1de 100644
--- a/extensions/valueserialization-orgjson/build.gradle
+++ b/extensions/valueserialization-orgjson/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j org.json ValueSerialization Extension"
+description = "Apache Zest™ org.json ValueSerialization Extension"
 
-jar { manifest { name = "Qi4j Extension - ValueSerialization - org.json" } }
+jar { manifest { name = "Apache Zest™ Extension - ValueSerialization - org.json" } }
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/extensions/valueserialization-stax/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/valueserialization-stax/build.gradle b/extensions/valueserialization-stax/build.gradle
index 5ccd66c..c89c7a1 100644
--- a/extensions/valueserialization-stax/build.gradle
+++ b/extensions/valueserialization-stax/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j StaX ValueSerialization Extension"
+description = "Apache Zest™ StaX ValueSerialization Extension"
 
-jar { manifest { name = "Qi4j Extension - ValueSerialization - StaX" } }
+jar { manifest { name = "Apache Zest™ Extension - ValueSerialization - StaX" } }
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/alarm/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/alarm/build.gradle b/libraries/alarm/build.gradle
index 3bd7f23..72f0fb1 100644
--- a/libraries/alarm/build.gradle
+++ b/libraries/alarm/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Alarm Library provides industrial automation style alarm point workflow semantics."
+description = "Apache Zest™ Alarm Library provides industrial automation style alarm point workflow semantics."
 
-jar { manifest { name = "Qi4j Library - Alarm - APi" }}
+jar { manifest { name = "Apache Zest™ Library - Alarm - APi" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/circuitbreaker/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/circuitbreaker/build.gradle b/libraries/circuitbreaker/build.gradle
index 7bbb3ac..d91bfa8 100644
--- a/libraries/circuitbreaker/build.gradle
+++ b/libraries/circuitbreaker/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Circuit Breaker Library provides a framework for connecting external resources, so that they can be disabled during re-play of events."
+description = "Apache Zest™ Circuit Breaker Library provides a framework for connecting external resources, so that they can be disabled during re-play of events."
 
-jar { manifest {name = "Qi4j Library - Circuit Breaker"}}
+jar { manifest {name = "Apache Zest™ Library - Circuit Breaker"}}
 
 dependencies {
     compile project( ':org.qi4j.core:org.qi4j.core.api' )

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/constraints/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/constraints/build.gradle b/libraries/constraints/build.gradle
index 9a22241..826b73d 100644
--- a/libraries/constraints/build.gradle
+++ b/libraries/constraints/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Constraint Library provides common set of constraints."
+description = "Apache Zest™ Constraint Library provides common set of constraints."
 
-jar { manifest { name = "Qi4j Library - Constraints"}}
+jar { manifest { name = "Apache Zest™ Library - Constraints"}}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/conversion/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/conversion/build.gradle b/libraries/conversion/build.gradle
index d516248..83a7ad7 100644
--- a/libraries/conversion/build.gradle
+++ b/libraries/conversion/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Values Library has various generic services to manipulate Qi4j ValueComposites, such as converting an Entity to a Value."
+description = "Apache Zest™ Conversion Library has various generic services to manipulate Apache Zest™ ValueComposites, such as converting an Entity to a Value."
 
-jar { manifest { name = "Qi4j Library - Values" }}
+jar { manifest { name = "Apache Zest™ Library - Conversion" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/eventsourcing-jdbm/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/eventsourcing-jdbm/build.gradle b/libraries/eventsourcing-jdbm/build.gradle
index 193595c..f5d0f25 100644
--- a/libraries/eventsourcing-jdbm/build.gradle
+++ b/libraries/eventsourcing-jdbm/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Extension to the Qi4j Event Sourcing Library for providing a JDBM based event store."
+description = "Extension to the Apache Zest™ Event Sourcing Library for providing a JDBM based event store."
 
-jar { manifest { name = "Qi4j Library - Event Sourcing - JDBM" }}
+jar { manifest { name = "Apache Zest™ Library - Event Sourcing - JDBM" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/eventsourcing-rest/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/eventsourcing-rest/build.gradle b/libraries/eventsourcing-rest/build.gradle
index ea45d95..ea1286a 100644
--- a/libraries/eventsourcing-rest/build.gradle
+++ b/libraries/eventsourcing-rest/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Event Sourcing Library for Restful applications."
+description = "Apache Zest™ Event Sourcing Library for Restful applications."
 
-jar { manifest { name = "Qi4j Library - Event Sourcing - Rest" }}
+jar { manifest { name = "Apache Zest™ Library - Event Sourcing - Rest" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/eventsourcing/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/eventsourcing/build.gradle b/libraries/eventsourcing/build.gradle
index 4deaff5..05ed544 100644
--- a/libraries/eventsourcing/build.gradle
+++ b/libraries/eventsourcing/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Event Sourcing Library."
+description = "Apache Zest™ Event Sourcing Library."
 
-jar { manifest { name = "Qi4j Library - Event Sourcing" }}
+jar { manifest { name = "Apache Zest™ Library - Event Sourcing" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/fileconfig/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/fileconfig/build.gradle b/libraries/fileconfig/build.gradle
index 709ef26..830117a 100644
--- a/libraries/fileconfig/build.gradle
+++ b/libraries/fileconfig/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j File Configuration Library provides platform specific file locations."
+description = "Apache Zest™ File Configuration Library provides platform specific file locations."
 
-jar { manifest { name = "Qi4j Library - FileConfig" }}
+jar { manifest { name = "Apache Zest™ Library - FileConfig" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/http/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/http/build.gradle b/libraries/http/build.gradle
index 7113138..bf7489b 100644
--- a/libraries/http/build.gradle
+++ b/libraries/http/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Http Library provides embedded Jetty for Qi4j application use."
+description = "Apache Zest™ Http Library provides embedded Jetty for Apache Zest™ application use."
 
-jar { manifest { name = "Qi4j Library - Http" }}
+jar { manifest { name = "Apache Zest™ Library - Http" }}
 
 test {
   systemProperties 'networkaddress.cache.ttl': '0'

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/invocation-cache/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/invocation-cache/build.gradle b/libraries/invocation-cache/build.gradle
index 3ba468b..332d3d3 100644
--- a/libraries/invocation-cache/build.gradle
+++ b/libraries/invocation-cache/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Invocation Cache Library provides caching framework for methods."
+description = "Apache Zest™ Invocation Cache Library provides caching framework for methods."
 
-jar { manifest { name = "Qi4j Library - Invocation Cache" }}
+jar { manifest { name = "Apache Zest™ Library - Invocation Cache" }}
 
 dependencies {
   compile( project(":org.qi4j.core:org.qi4j.core.api") )

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/jmx/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/jmx/build.gradle b/libraries/jmx/build.gradle
index f5d064e..79193da 100644
--- a/libraries/jmx/build.gradle
+++ b/libraries/jmx/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j JMX Library provides Java Management Extension (JMX) integration for Qi4j applications."
+description = "Apache Zest™ JMX Library provides Java Management Extension (JMX) integration for Apache Zest™ applications."
 
-jar { manifest { name = "Qi4j Library - JMX" }}
+jar { manifest { name = "Apache Zest™ Library - JMX" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/lang-groovy/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/lang-groovy/build.gradle b/libraries/lang-groovy/build.gradle
index eff0a63..d273a17 100644
--- a/libraries/lang-groovy/build.gradle
+++ b/libraries/lang-groovy/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Groovy Library allows for Mixins to be implemented in Groovy scripts instead of directly in compiled Java."
+description = "Apache Zest™ Groovy Library allows for Mixins to be implemented in Groovy scripts instead of directly in compiled Java."
 
-jar { manifest { name = "Qi4j Library - Scripting - Groovy" }}
+jar { manifest { name = "Apache Zest™ Library - Scripting - Groovy" }}
 
 
 dependencies {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/lang-javascript/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/lang-javascript/build.gradle b/libraries/lang-javascript/build.gradle
index 7143fdd..7500b34 100644
--- a/libraries/lang-javascript/build.gradle
+++ b/libraries/lang-javascript/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j JavaScript Library allows for Mixins to be implemented in JavaScript instead of directly in compiled Java."
+description = "Apache Zest™ JavaScript Library allows for Mixins to be implemented in JavaScript instead of directly in compiled Java."
 
-jar { manifest { name = "Qi4j Library - Scripting - JavaScript" }}
+jar { manifest { name = "Apache Zest™ Library - Scripting - JavaScript" }}
 
 
 dependencies {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/lang-scala/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/lang-scala/build.gradle b/libraries/lang-scala/build.gradle
index bc61bac..2a13857 100644
--- a/libraries/lang-scala/build.gradle
+++ b/libraries/lang-scala/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j BeanShell Library allows for Mixins to be implemented in BeanShell (Java) scripts instead of directly in compiled Java."
+description = "Apache Zest™ Scala Library allows for Mixins to be implemented in Scala."
 
-jar { manifest { name = "Qi4j Library - Scripting - BeanShell" }}
+jar { manifest { name = "Apache Zest™ Library - Scripting - Scala" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/locking/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/locking/build.gradle b/libraries/locking/build.gradle
index f13092d..b31c2a4 100644
--- a/libraries/locking/build.gradle
+++ b/libraries/locking/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Locking Library provides lock management for methods."
+description = "Apache Zest™ Locking Library provides lock management for methods."
 
-jar { manifest { name = "Qi4j Library - Locking" }}
+jar { manifest { name = "Apache Zest™ Library - Locking" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.api"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/logging/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/logging/build.gradle b/libraries/logging/build.gradle
index 3639fcf..f2dde7e 100644
--- a/libraries/logging/build.gradle
+++ b/libraries/logging/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Logging Library provides an advanced logging framework which separates trace, debug and log systems."
+description = "Apache Zest™ Logging Library provides an advanced logging framework which separates trace, debug and log systems."
 
-jar { manifest { name = "Qi4j Library - Logging" }}
+jar { manifest { name = "Apache Zest™ Library - Logging" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/metrics/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/metrics/build.gradle b/libraries/metrics/build.gradle
index 38ea7e5..7c1ac09 100644
--- a/libraries/metrics/build.gradle
+++ b/libraries/metrics/build.gradle
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-description = "Qi4j Locking Library provides lock management for methods."
+description = "Apache Zest™ Metrics Library."
 
-jar { manifest { name = "Qi4j Library - Locking" }}
+jar { manifest { name = "Apache Zest™ Library - Metrics" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/osgi/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/osgi/build.gradle b/libraries/osgi/build.gradle
index e91fc2c..887f470 100644
--- a/libraries/osgi/build.gradle
+++ b/libraries/osgi/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j OSGi Library provides integration of OSGi and Qi4j, so that services in each system can be shared."
+description = "Apache Zest™ OSGi Library provides integration of OSGi and Apache Zest™, so that services in each system can be shared."
 
-jar { manifest { name = "Qi4j Library - OSGi Integration" }}
+jar { manifest { name = "Apache Zest™ Library - OSGi Integration" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.api"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/rdf/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rdf/build.gradle b/libraries/rdf/build.gradle
index f85de14..dff55b5 100644
--- a/libraries/rdf/build.gradle
+++ b/libraries/rdf/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j RDF Library provides commonalities of various RDF based services in Qi4j, such as RDF Indexing."
+description = "Apache Zest™ RDF Library provides commonalities of various RDF based services in Apache Zest™, such as RDF Indexing."
 
-jar { manifest { name = "Qi4j Library - RDF" }}
+jar { manifest { name = "Apache Zest™ Library - RDF" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.spi"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/rest-client/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rest-client/build.gradle b/libraries/rest-client/build.gradle
index a120e16..04b1ce9 100644
--- a/libraries/rest-client/build.gradle
+++ b/libraries/rest-client/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j REST Client Library provides a client library for the Qi4j REST Server library"
+description = "Apache Zest™ REST Client Library provides a client library for the Apache Zest™ REST Server library"
 
-jar { manifest { name = "Qi4j Library - REST Client" }}
+jar { manifest { name = "Apache Zest™ Library - REST Client" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/rest-common/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rest-common/build.gradle b/libraries/rest-common/build.gradle
index 84ef620..6678389 100644
--- a/libraries/rest-common/build.gradle
+++ b/libraries/rest-common/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j REST Library provides various Restlet resources that can be used to expose Qi4j entities and indexes. Mostly for debugging."
+description = "Apache Zest™ REST Library provides various Restlet resources that can be used to expose Apache Zest™ entities and indexes. Mostly for debugging."
 
-jar { manifest { name = "Qi4j Library - REST" }}
+jar { manifest { name = "Apache Zest™ Library - REST" }}
 
 dependencies {
   compile(project(":org.qi4j.libraries:org.qi4j.library.rdf"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/rest-server/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rest-server/build.gradle b/libraries/rest-server/build.gradle
index 8103aa7..b9d14cb 100644
--- a/libraries/rest-server/build.gradle
+++ b/libraries/rest-server/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j REST Server Library provides a server component for building REST API's based on usecases"
+description = "Apache Zest™ REST Server Library provides a server component for building REST API's based on usecases"
 
-jar { manifest { name = "Qi4j Library - REST server" }}
+jar { manifest { name = "Apache Zest™ Library - REST server" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.api"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/rest/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rest/build.gradle b/libraries/rest/build.gradle
index 91f375d..742a9a3 100644
--- a/libraries/rest/build.gradle
+++ b/libraries/rest/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j REST Library provides various Restlet resources that can be used to expose Qi4j entities and indexes. Mostly for debugging."
+description = "Apache Zest™ REST Library provides various Restlet resources that can be used to expose Apache Zest™ entities and indexes. Mostly for debugging."
 
-jar { manifest { name = "Qi4j Library - REST" }}
+jar { manifest { name = "Apache Zest™ Library - REST" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/scheduler/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/scheduler/build.gradle b/libraries/scheduler/build.gradle
index 7216263..bc426ce 100644
--- a/libraries/scheduler/build.gradle
+++ b/libraries/scheduler/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Schduler Library for long term timing functionalities."
+description = "Apache Zest™ Schduler Library for long term timing functionalities."
 
-jar { manifest { name = "Qi4j Library - Scheduler" }}
+jar { manifest { name = "Apache Zest™ Library - Scheduler" }}
 
 
 dependencies {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/scripting/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/scripting/build.gradle b/libraries/scripting/build.gradle
index 42e3714..2d65e32 100644
--- a/libraries/scripting/build.gradle
+++ b/libraries/scripting/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Common Scripting Library contains common classes across scripting implementations."
+description = "Apache Zest™ Common Scripting Library contains common classes across scripting implementations."
 
-jar { manifest { name = "Qi4j Library - Scripting - Common" }}
+jar { manifest { name = "Apache Zest™ Library - Scripting - Common" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.api"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/servlet/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/servlet/build.gradle b/libraries/servlet/build.gradle
index 40a5d22..130afdb 100644
--- a/libraries/servlet/build.gradle
+++ b/libraries/servlet/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Servlet Library provides integration of Qi4j into web applications."
+description = "Apache Zest™ Servlet Library provides integration of Apache Zest™ into web applications."
 
-jar { manifest { name = "Qi4j Library - Servlet" }}
+jar { manifest { name = "Apache Zest™ Library - Servlet" }}
 
 dependencies {
   compile( project(":org.qi4j.core:org.qi4j.core.bootstrap") )

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/shiro-core/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/shiro-core/build.gradle b/libraries/shiro-core/build.gradle
index b1f6a51..d57ac77 100644
--- a/libraries/shiro-core/build.gradle
+++ b/libraries/shiro-core/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Shiro Library integrates Apache Shiro security framework into Qi4j."
+description = "Apache Zest™ Shiro Library integrates Apache Shiro security framework into Apache Zest™."
 
-jar { manifest { name = "Qi4j Library - Shiro Core" }}
+jar { manifest { name = "Apache Zest™ Library - Shiro Core" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/shiro-web/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/shiro-web/build.gradle b/libraries/shiro-web/build.gradle
index 40a71d9..ebf7da3 100644
--- a/libraries/shiro-web/build.gradle
+++ b/libraries/shiro-web/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Shiro Library integrates Apache Shiro security framework into Qi4j. This bundle provides Servlet support."
+description = "Apache Zest™ Shiro Library integrates Apache Shiro security framework into Apache Zest™. This bundle provides Servlet support."
 
-jar { manifest { name = "Qi4j Library - Shiro Web" }}
+jar { manifest { name = "Apache Zest™ Library - Shiro Web" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/spring/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/spring/build.gradle b/libraries/spring/build.gradle
index 87f8ff0..f5b1613 100644
--- a/libraries/spring/build.gradle
+++ b/libraries/spring/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Spring Library allows for tight integration of Spring Framework and Qi4j applications."
+description = "Apache Zest™ Spring Library allows for tight integration of Spring Framework and Apache Zest™ applications."
 
-jar { manifest { name = "Qi4j Library - Spring" }}
+jar { manifest { name = "Apache Zest™ Library - Spring" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/sql-bonecp/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/sql-bonecp/build.gradle b/libraries/sql-bonecp/build.gradle
index 920faab..a503338 100644
--- a/libraries/sql-bonecp/build.gradle
+++ b/libraries/sql-bonecp/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j SQL BoneCP Library provides BoneCP support."
+description = "Apache Zest™ SQL BoneCP Library provides BoneCP support."
 
-jar { manifest { name = "Qi4j Library - SQL BoneCP" }}
+jar { manifest { name = "Apache Zest™ Library - SQL BoneCP" }}
 
 dependencies {
   compile(project(":org.qi4j.libraries:org.qi4j.library.sql"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/sql-dbcp/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/sql-dbcp/build.gradle b/libraries/sql-dbcp/build.gradle
index edb7c6f..51abe7c 100644
--- a/libraries/sql-dbcp/build.gradle
+++ b/libraries/sql-dbcp/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j SQL DBCP Library provides DBCP support."
+description = "Apache Zest™ SQL DBCP Library provides DBCP support."
 
-jar { manifest { name = "Qi4j Library - SQL DBCP" }}
+jar { manifest { name = "Apache Zest™ Library - SQL DBCP" }}
 
 dependencies {
   compile(project(":org.qi4j.libraries:org.qi4j.library.sql"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/sql-liquibase/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/sql-liquibase/build.gradle b/libraries/sql-liquibase/build.gradle
index 3d19278..f3a7305 100644
--- a/libraries/sql-liquibase/build.gradle
+++ b/libraries/sql-liquibase/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j SQL Liquibase Library provides Liquibase support."
+description = "Apache Zest™ SQL Liquibase Library provides Liquibase support."
 
-jar { manifest { name = "Qi4j Library - SQL Liquibase" }}
+jar { manifest { name = "Apache Zest™ Library - SQL Liquibase" }}
 
 dependencies {
   compile(project(":org.qi4j.libraries:org.qi4j.library.sql"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/sql/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/sql/build.gradle b/libraries/sql/build.gradle
index d9c62ea..dc3f76b 100644
--- a/libraries/sql/build.gradle
+++ b/libraries/sql/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j SQL Library provides SQL support."
+description = "Apache Zest™ SQL Library provides SQL support."
 
-jar { manifest { name = "Qi4j Library - SQL" }}
+jar { manifest { name = "Apache Zest™ Library - SQL" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/uid/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/uid/build.gradle b/libraries/uid/build.gradle
index 2ce283c..eb6dcfd 100644
--- a/libraries/uid/build.gradle
+++ b/libraries/uid/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j UID Library contains various Identity generation services."
+description = "Apache Zest™ UID Library contains various Identity generation services."
 
-jar { manifest { name = "Qi4j Library - UID" }}
+jar { manifest { name = "Apache Zest™ Library - UID" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/libraries/uowfile/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/uowfile/build.gradle b/libraries/uowfile/build.gradle
index e06647e..e0f3116 100644
--- a/libraries/uowfile/build.gradle
+++ b/libraries/uowfile/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j UoWFile Library provides file operations binding to UoWs."
+description = "Apache Zest™ UoWFile Library provides file operations binding to UoWs."
 
-jar { manifest { name = "Qi4j Library - UoWFile" }}
+jar { manifest { name = "Apache Zest™ Library - UoWFile" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/manual/build.gradle
----------------------------------------------------------------------
diff --git a/manual/build.gradle b/manual/build.gradle
index 0dbaaa9..aa6f030 100644
--- a/manual/build.gradle
+++ b/manual/build.gradle
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-description = "Qi4j Manuals and Website."
+description = "Apache Zest™ Manuals and Website."
 
 dependencies {
   compile( project( ":org.qi4j.core:org.qi4j.core.bootstrap" ) )

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/samples/dci-cargo/dcisample_a/build.gradle
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/build.gradle b/samples/dci-cargo/dcisample_a/build.gradle
index 28d45f8..7703f14 100644
--- a/samples/dci-cargo/dcisample_a/build.gradle
+++ b/samples/dci-cargo/dcisample_a/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Sample of how DCI (Data, Context & Interaction) pattern is implemented with Qi4j, for Eric Evans DDD sample."
+description = "Sample of how DCI (Data, Context & Interaction) pattern is implemented with Apache Zest™, for Eric Evans DDD sample."
 
-jar { manifest { name = "Qi4j Sample DCI Cargo - Sample A" }}
+jar { manifest { name = "Apache Zest™ Sample DCI Cargo - Sample A" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/samples/dci-cargo/dcisample_b/build.gradle
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/build.gradle b/samples/dci-cargo/dcisample_b/build.gradle
index 30d3a43..6b291b7 100644
--- a/samples/dci-cargo/dcisample_b/build.gradle
+++ b/samples/dci-cargo/dcisample_b/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Sample of how DCI (Data, Context & Interaction) pattern is implemented with Qi4j, for Eric Evans DDD sample."
+description = "Sample of how DCI (Data, Context & Interaction) pattern is implemented with Apache Zest™, for Eric Evans DDD sample."
 
-jar { manifest { name = "Qi4j Sample DCI Cargo - Sample B" }}
+jar { manifest { name = "Apache Zest™ Sample DCI Cargo - Sample B" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/samples/dci/build.gradle
----------------------------------------------------------------------
diff --git a/samples/dci/build.gradle b/samples/dci/build.gradle
index 36e972f..2d9ee86 100644
--- a/samples/dci/build.gradle
+++ b/samples/dci/build.gradle
@@ -18,9 +18,9 @@
  */
 
 
-description = "Sample of how DCI (Data, Context & Interaction) pattern is implemented with Qi4j."
+description = "Sample of how DCI (Data, Context & Interaction) pattern is implemented with Apache Zest™."
 
-jar { manifest { name = "Qi4j Sample - DCI" }}
+jar { manifest { name = "Apache Zest™ Sample - DCI" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/samples/forum/build.gradle
----------------------------------------------------------------------
diff --git a/samples/forum/build.gradle b/samples/forum/build.gradle
index 41d102d..c3e9ddd 100644
--- a/samples/forum/build.gradle
+++ b/samples/forum/build.gradle
@@ -19,7 +19,7 @@
 
 description = "Sample of how to build a web forum"
 
-jar { manifest { name = "Qi4j Sample - Forum" }}
+jar { manifest { name = "Apache Zest™ Sample - Forum" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/samples/rental/build.gradle
----------------------------------------------------------------------
diff --git a/samples/rental/build.gradle b/samples/rental/build.gradle
index a065815..6044b2b 100644
--- a/samples/rental/build.gradle
+++ b/samples/rental/build.gradle
@@ -27,7 +27,7 @@ apply plugin: 'jetty'
 // And then go to:
 //      http://localhost:8080/org.qi4j.sample.rental/rental/main
 
-jar { manifest { name = "Qi4j Sample - Car Rental" }}
+jar { manifest { name = "Apache Zest™ Sample - Car Rental" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/samples/sql-support/build.gradle
----------------------------------------------------------------------
diff --git a/samples/sql-support/build.gradle b/samples/sql-support/build.gradle
index 286e6fe..c48ff40 100644
--- a/samples/sql-support/build.gradle
+++ b/samples/sql-support/build.gradle
@@ -19,7 +19,7 @@
 
 description = "SQL Support Sample."
 
-jar { manifest { name = "Qi4j Sample - SQL Support" }}
+jar { manifest { name = "Apache Zest™ Sample - SQL Support" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/samples/swing/build.gradle
----------------------------------------------------------------------
diff --git a/samples/swing/build.gradle b/samples/swing/build.gradle
index ab44e2f..918363c 100644
--- a/samples/swing/build.gradle
+++ b/samples/swing/build.gradle
@@ -19,7 +19,7 @@
 
 description = "Sample of how to use the Swing bindings."
 
-jar { manifest { name = "Qi4j Sample - Swing Bindings" }}
+jar { manifest { name = "Apache Zest™ Sample - Swing Bindings" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tests/performance/build.gradle
----------------------------------------------------------------------
diff --git a/tests/performance/build.gradle b/tests/performance/build.gradle
index 1c54c29..8ebd698 100644
--- a/tests/performance/build.gradle
+++ b/tests/performance/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Performance Test Suite."
+description = "Apache Zest™ Performance Test Suite."
 
-jar { manifest { name = "Qi4j Tests - Performance" }}
+jar { manifest { name = "Apache Zest™ Tests - Performance" }}
 
 sourceSets {
     perf

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tests/regression/build.gradle
----------------------------------------------------------------------
diff --git a/tests/regression/build.gradle b/tests/regression/build.gradle
index e17cfb4..73bb428 100644
--- a/tests/regression/build.gradle
+++ b/tests/regression/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Qi4j Regression Tests are added by community members who find bugs and typically reported via Jira issues. These tests are not run as part of the normal build, but is accessible from './gradlew regression' to allow builds to still work."
+description = "Apache Zest™ Regression Tests are added by community members who find bugs and typically reported via Jira issues. These tests are not run as part of the normal build, but is accessible from './gradlew regression' to allow builds to still work."
 
-jar { manifest { name = "Qi4j Tests - Regression" }}
+jar { manifest { name = "Apache Zest™ Tests - Regression" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.api"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tools/envisage/build.gradle
----------------------------------------------------------------------
diff --git a/tools/envisage/build.gradle b/tools/envisage/build.gradle
index 5050e21..65cca01 100644
--- a/tools/envisage/build.gradle
+++ b/tools/envisage/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Visualizer of a Qi4j Application Structure."
+description = "Visualizer of a Apache Zest™ Application Structure."
 
-jar { manifest { name = "Qi4j Envisage" }}
+jar { manifest { name = "Apache Zest™ Envisage" }}
 
 dependencies {
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tools/model-detail/build.gradle
----------------------------------------------------------------------
diff --git a/tools/model-detail/build.gradle b/tools/model-detail/build.gradle
index 65b1685..2879371 100644
--- a/tools/model-detail/build.gradle
+++ b/tools/model-detail/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Detailled Model of a Qi4j Application Structure."
+description = "Detailled Model of a Apache Zest™ Application Structure."
 
-jar { manifest { name = "Qi4j Model Detail" }}
+jar { manifest { name = "Apache Zest™ Model Detail" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tools/qidea/build.gradle
----------------------------------------------------------------------
diff --git a/tools/qidea/build.gradle b/tools/qidea/build.gradle
index 53fe2ea..559acdb 100644
--- a/tools/qidea/build.gradle
+++ b/tools/qidea/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "IntelliJ IDEA Plugin for Qi4j development."
+description = "IntelliJ IDEA Plugin for Apache Zest™ development."
 
-jar { manifest { name = "Qi4j IDEA plugin" }}
+jar { manifest { name = "Apache Zest™ IDEA plugin" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tools/shell/build.gradle
----------------------------------------------------------------------
diff --git a/tools/shell/build.gradle b/tools/shell/build.gradle
index 6b1b31f..19d1ed7 100644
--- a/tools/shell/build.gradle
+++ b/tools/shell/build.gradle
@@ -19,10 +19,10 @@
 
 apply plugin: 'application'
 
-description = "Command line tools for building Qi4j applications."
+description = "Command line tools for building Apache Zest™ applications."
 mainClassName = "org.qi4j.tools.shell.Main"
 
-jar { manifest { name = "Qi4j Command Line" } }
+jar { manifest { name = "Apache Zest™ Command Line" } }
 
 dependencies {
   compile( project( ":org.qi4j.core:org.qi4j.core.bootstrap" ) )

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tutorials/cargo/build.gradle
----------------------------------------------------------------------
diff --git a/tutorials/cargo/build.gradle b/tutorials/cargo/build.gradle
index 498741b..9a301bb 100644
--- a/tutorials/cargo/build.gradle
+++ b/tutorials/cargo/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Tutorial on how to convert existing application into a Qi4j one, step-by-step."
+description = "Tutorial on how to convert existing application into a Apache Zest™ one, step-by-step."
 
-jar { manifest { name = "Qi4j Tutorial - Cargo" }}
+jar { manifest { name = "Apache Zest™ Tutorial - Cargo" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tutorials/composites/build.gradle
----------------------------------------------------------------------
diff --git a/tutorials/composites/build.gradle b/tutorials/composites/build.gradle
index c5ea69f..781615a 100644
--- a/tutorials/composites/build.gradle
+++ b/tutorials/composites/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Basic tutorial on how to covert a simple 'Hello World' application to Qi4j, using more and more features for each step."
+description = "Basic tutorial on how to covert a simple 'Hello World' application to Apache Zest™, using more and more features for each step."
 
-jar { manifest { name = "Qi4j Tutorial - Composites" }}
+jar { manifest { name = "Apache Zest™ Tutorial - Composites" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tutorials/hello/build.gradle
----------------------------------------------------------------------
diff --git a/tutorials/hello/build.gradle b/tutorials/hello/build.gradle
index a6533f2..2547c08 100644
--- a/tutorials/hello/build.gradle
+++ b/tutorials/hello/build.gradle
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-description = "Basic tutorial on how to covert a simple 'Hello World' application to Qi4j, using more and more features for each step."
+description = "Basic tutorial on how to covert a simple 'Hello World' application to Apache Zest™, using more and more features for each step."
 
-jar { manifest { name = "Qi4j Tutorial - Composites" }}
+jar { manifest { name = "Apache Zest™ Tutorial - Composites" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tutorials/introduction/build.gradle
----------------------------------------------------------------------
diff --git a/tutorials/introduction/build.gradle b/tutorials/introduction/build.gradle
index 827a8b4..730b370 100644
--- a/tutorials/introduction/build.gradle
+++ b/tutorials/introduction/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "An Introduction to Qi4j in its simplest form."
+description = "An Introduction to Apache Zest™ in its simplest form."
 
-jar { manifest { name = "Qi4j Tutorial - Introduction" }}
+jar { manifest { name = "Apache Zest™ Tutorial - Introduction" }}
 
 dependencies {
     compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tutorials/introduction/tenminutes/build.gradle
----------------------------------------------------------------------
diff --git a/tutorials/introduction/tenminutes/build.gradle b/tutorials/introduction/tenminutes/build.gradle
index 68d15a5..aa44049 100644
--- a/tutorials/introduction/tenminutes/build.gradle
+++ b/tutorials/introduction/tenminutes/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "A 10-minute Introduction Tutorial to Qi4j in its simplest form."
+description = "A 10-minute Introduction Tutorial to Apache Zest™ in its simplest form."
 
-jar { manifest { name = "Qi4j Tutorial - 10 minute Introduction" }}
+jar { manifest { name = "Apache Zest™ Tutorial - 10 minute Introduction" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tutorials/introduction/thirtyminutes/build.gradle
----------------------------------------------------------------------
diff --git a/tutorials/introduction/thirtyminutes/build.gradle b/tutorials/introduction/thirtyminutes/build.gradle
index a4ebdb8..83bcbc5 100644
--- a/tutorials/introduction/thirtyminutes/build.gradle
+++ b/tutorials/introduction/thirtyminutes/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "A 30-minute Introduction Tutorial to Qi4j in its simplest form."
+description = "A 30-minute Introduction Tutorial to Apache Zest™ in its simplest form."
 
-jar { manifest { name = "Qi4j Tutorial - 30 minute Introduction" }}
+jar { manifest { name = "Apache Zest™ Tutorial - 30 minute Introduction" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tutorials/introduction/twominutes/build.gradle
----------------------------------------------------------------------
diff --git a/tutorials/introduction/twominutes/build.gradle b/tutorials/introduction/twominutes/build.gradle
index 6183adb..25a9ab5 100644
--- a/tutorials/introduction/twominutes/build.gradle
+++ b/tutorials/introduction/twominutes/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "A 2-minute Introduction Tutorial to Qi4j in its simplest form."
+description = "A 2-minute Introduction Tutorial to Apache Zest™ in its simplest form."
 
-jar { manifest { name = "Qi4j Tutorial - 2 minute Introduction" }}
+jar { manifest { name = "Apache Zest™ Tutorial - 2 minute Introduction" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f3fee433/tutorials/services/build.gradle
----------------------------------------------------------------------
diff --git a/tutorials/services/build.gradle b/tutorials/services/build.gradle
index 647823b..5f8e4e6 100644
--- a/tutorials/services/build.gradle
+++ b/tutorials/services/build.gradle
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-description = "Tutorial on how to use Qi4j service concept."
+description = "Tutorial on how to use Apache Zest™ service concept."
 
-jar { manifest { name = "Qi4j Tutorial - Services" }}
+jar { manifest { name = "Apache Zest™ Tutorial - Services" }}
 
 dependencies {
   compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))


[08/11] zest-qi4j git commit: Merge branch 'DocUpdate' into develop

Posted by ni...@apache.org.
Merge branch 'DocUpdate' into develop

Conflicts:
	libraries/lang-scala/build.gradle


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/ee299296
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/ee299296
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/ee299296

Branch: refs/heads/develop
Commit: ee299296f7010f29ec6a66c4b67fc7a926526988
Parents: f6c764e 92ee90f
Author: Niclas Hedhman <he...@betfair.com>
Authored: Wed Jul 8 12:16:44 2015 +0300
Committer: Niclas Hedhman <he...@betfair.com>
Committed: Wed Jul 8 12:16:44 2015 +0300

----------------------------------------------------------------------
 NOTICE.txt                                      |  2 +-
 README.txt                                      | 22 ++++++++++----------
 build.gradle                                    | 14 ++++++-------
 buildSrc/src/javadoc/overview.html              |  6 +++---
 core/api/build.gradle                           |  2 +-
 core/bootstrap/build.gradle                     |  2 +-
 core/functional/build.gradle                    |  2 +-
 core/io/build.gradle                            |  2 +-
 core/runtime/build.gradle                       |  2 +-
 core/spi/build.gradle                           |  2 +-
 core/testsupport/build.gradle                   |  2 +-
 extensions/cache-ehcache/build.gradle           |  4 ++--
 extensions/cache-memcache/build.gradle          |  4 ++--
 extensions/entitystore-file/build.gradle        |  2 +-
 extensions/entitystore-hazelcast/build.gradle   |  4 ++--
 extensions/entitystore-jclouds/build.gradle     |  4 ++--
 extensions/entitystore-jdbm/build.gradle        |  4 ++--
 extensions/entitystore-leveldb/build.gradle     |  4 ++--
 extensions/entitystore-memory/build.gradle      |  2 +-
 extensions/entitystore-mongodb/build.gradle     |  4 ++--
 extensions/entitystore-preferences/build.gradle |  4 ++--
 extensions/entitystore-redis/build.gradle       |  4 ++--
 extensions/entitystore-riak/build.gradle        |  4 ++--
 extensions/entitystore-sql/build.gradle         |  4 ++--
 extensions/entitystore-voldemort/build.gradle   |  4 ++--
 extensions/indexing-elasticsearch/build.gradle  |  4 ++--
 extensions/indexing-rdf/build.gradle            |  4 ++--
 extensions/indexing-solr/build.gradle           |  4 ++--
 extensions/indexing-sql/build.gradle            |  4 ++--
 extensions/metrics-yammer/build.gradle          |  4 ++--
 extensions/migration/build.gradle               |  4 ++--
 extensions/reindexer/build.gradle               |  2 +-
 .../valueserialization-jackson/build.gradle     |  4 ++--
 .../valueserialization-orgjson/build.gradle     |  4 ++--
 extensions/valueserialization-stax/build.gradle |  4 ++--
 libraries/alarm/build.gradle                    |  4 ++--
 libraries/circuitbreaker/build.gradle           |  4 ++--
 libraries/constraints/build.gradle              |  4 ++--
 libraries/conversion/build.gradle               |  4 ++--
 libraries/eventsourcing-jdbm/build.gradle       |  4 ++--
 libraries/eventsourcing-rest/build.gradle       |  4 ++--
 libraries/eventsourcing/build.gradle            |  4 ++--
 libraries/fileconfig/build.gradle               |  4 ++--
 libraries/http/build.gradle                     |  4 ++--
 libraries/invocation-cache/build.gradle         |  4 ++--
 libraries/jmx/build.gradle                      |  4 ++--
 libraries/lang-groovy/build.gradle              |  4 ++--
 libraries/lang-javascript/build.gradle          |  4 ++--
 libraries/lang-scala/build.gradle               |  4 ++--
 libraries/locking/build.gradle                  |  4 ++--
 libraries/logging/build.gradle                  |  4 ++--
 libraries/metrics/build.gradle                  |  4 ++--
 libraries/osgi/build.gradle                     |  4 ++--
 libraries/rdf/build.gradle                      |  4 ++--
 libraries/rest-client/build.gradle              |  4 ++--
 libraries/rest-common/build.gradle              |  4 ++--
 libraries/rest-server/build.gradle              |  4 ++--
 libraries/rest/build.gradle                     |  4 ++--
 libraries/scheduler/build.gradle                |  4 ++--
 libraries/scripting/build.gradle                |  4 ++--
 libraries/servlet/build.gradle                  |  4 ++--
 libraries/shiro-core/build.gradle               |  4 ++--
 libraries/shiro-web/build.gradle                |  4 ++--
 libraries/spring/build.gradle                   |  4 ++--
 libraries/sql-bonecp/build.gradle               |  4 ++--
 libraries/sql-dbcp/build.gradle                 |  4 ++--
 libraries/sql-liquibase/build.gradle            |  4 ++--
 libraries/sql/build.gradle                      |  4 ++--
 libraries/uid/build.gradle                      |  4 ++--
 libraries/uowfile/build.gradle                  |  4 ++--
 manual/build.gradle                             |  2 +-
 samples/dci-cargo/dcisample_a/build.gradle      |  4 ++--
 samples/dci-cargo/dcisample_b/build.gradle      |  4 ++--
 samples/dci/build.gradle                        |  4 ++--
 samples/forum/build.gradle                      |  2 +-
 samples/rental/build.gradle                     |  2 +-
 samples/sql-support/build.gradle                |  2 +-
 samples/swing/build.gradle                      |  2 +-
 src/bin-dist/NOTICE.txt                         |  2 +-
 src/bin-dist/README.txt                         | 18 ++++++++--------
 tests/performance/build.gradle                  |  4 ++--
 tests/regression/build.gradle                   |  4 ++--
 tools/envisage/build.gradle                     |  4 ++--
 tools/model-detail/build.gradle                 |  4 ++--
 tools/qidea/build.gradle                        |  4 ++--
 tools/shell/build.gradle                        |  4 ++--
 tutorials/cargo/build.gradle                    |  4 ++--
 tutorials/composites/build.gradle               |  4 ++--
 tutorials/hello/build.gradle                    |  4 ++--
 tutorials/introduction/build.gradle             |  4 ++--
 tutorials/introduction/tenminutes/build.gradle  |  4 ++--
 .../introduction/thirtyminutes/build.gradle     |  4 ++--
 tutorials/introduction/twominutes/build.gradle  |  4 ++--
 tutorials/services/build.gradle                 |  4 ++--
 94 files changed, 193 insertions(+), 193 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/build.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/extensions/entitystore-jclouds/build.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/extensions/entitystore-voldemort/build.gradle
----------------------------------------------------------------------
diff --cc extensions/entitystore-voldemort/build.gradle
index cd24061,f0f2b0a..385bd62
--- a/extensions/entitystore-voldemort/build.gradle
+++ b/extensions/entitystore-voldemort/build.gradle
@@@ -17,10 -17,15 +17,10 @@@
   * under the License.
   */
  
- description = "Qi4j Voldemort EntityStore Extension"
+ description = "Apache Zest™ Voldemort EntityStore Extension"
  
- jar { manifest { name = "Qi4j Extension - EntityStore - Voldemort" }}
+ jar { manifest { name = "Apache Zest™ Extension - EntityStore - Voldemort" }}
  
 -repositories {
 -    maven { name 'clojars-repo'; url 'http://clojars.org/repo' }
 -    maven { name 'oracle-repo'; url 'http://download.oracle.com/maven' }
 -}
 -
  dependencies {
  
      compile project(":org.qi4j.core:org.qi4j.core.bootstrap")

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/libraries/lang-scala/build.gradle
----------------------------------------------------------------------
diff --cc libraries/lang-scala/build.gradle
index ee3b012,2a13857..962aa93
--- a/libraries/lang-scala/build.gradle
+++ b/libraries/lang-scala/build.gradle
@@@ -17,12 -17,10 +17,12 @@@
   * under the License.
   */
  
- description = "Qi4j Scala Library allows for Mixins to be implemented in Scala."
+ description = "Apache Zest™ Scala Library allows for Mixins to be implemented in Scala."
  
- jar { manifest { name = "Qi4j Library - Scripting - Scala" }}
+ jar { manifest { name = "Apache Zest™ Library - Scripting - Scala" }}
  
 +apply plugin: 'scala'
 +
  dependencies {
    compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
    compile(libraries.scala)

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/libraries/sql-liquibase/build.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/libraries/sql/build.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/manual/build.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/samples/sql-support/build.gradle
----------------------------------------------------------------------


[02/11] zest-qi4j git commit: Replaced Qi4j with Zest in main documentation. Added trademark (tm) (™) to all Zest words.

Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/tutorials/howto-build-system.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-build-system.txt b/manual/src/docs/tutorials/howto-build-system.txt
index cf6b7ea..79ab6e1 100644
--- a/manual/src/docs/tutorials/howto-build-system.txt
+++ b/manual/src/docs/tutorials/howto-build-system.txt
@@ -20,24 +20,24 @@
 [[build-system,Build System]]
 = Build System =
 
-This tutorial is intended for developpers who want to build the Qi4j SDK themselves.
-It describe the Qi4j SDK Build System from compilation to publication of artifacts for consumption by other
+This tutorial is intended for developpers who want to build the Zest� SDK themselves.
+It describe the Zest� SDK Build System from compilation to publication of artifacts for consumption by other
 applications.
 
-If instead you want to setup your project build system to depend on modules of the Qi4j SDK see the
+If instead you want to setup your project build system to depend on modules of the Zest� SDK see the
 <<howto-depend-on-qi4j,dedicated tutorial>>.
 
 
 == Gradle ==
 
 NOTE: All major Java IDEs have great Gradle support.
-Visit the http://www.gradle.org/tooling[Gradle Tooling] page to learn how to import the Qi4j SDK build into your
+Visit the http://www.gradle.org/tooling[Gradle Tooling] page to learn how to import the Zest� SDK build into your
 favorite IDE.
 
-Qi4j community migrated away from Maven after several years of frustration, especially around release management,
+Zest� community migrated away from Maven after several years of frustration, especially around release management,
 versioning and cross-module dependency resolution issues, in Feb 2011.
 The tool of choice is now Gradle, and it doesn't require any installation, there are +gradlew+ and +gradlew.bat+ in
-the root folder of the Qi4j SDK that will bootstrap Gradle if not done so already.
+the root folder of the Zest� SDK that will bootstrap Gradle if not done so already.
 
 If you are new to Gradle, you should keep the http://www.gradle.org/documentation[documentation] at hands.
 
@@ -48,7 +48,7 @@ http://gradle.org/docs/current/userguide/tutorial_this_and_that.html#sec:gradle_
 
 == Root project tasks ==
 
-The Qi4j SDK root project has tasks that work with the whole SDK.
+The Zest� SDK root project has tasks that work with the whole SDK.
 The default build, triggered when running gradle without any command line arguments, compiles the code and run the
 tests, but nothing else.
 A quick way to check that nothing broke.
@@ -109,7 +109,7 @@ To see all available tasks on a submodule issue the following command:
 ----
 
 This example will output all gradle tasks available in the +tests/performance+ module where you should find
-the +testPerf+ task that run the Qi4j performance test suite.
+the +testPerf+ task that run the Zest� performance test suite.
 
 
 == Versions ==
@@ -131,7 +131,7 @@ If a +version+ property is not defined, the build system will refuse to make a r
 
 == Tests ==
 
-NOTE: See the http://qi4j.org/community/ci.html[Qi4j Continuous Integration] for current tests results
+NOTE: See the http://qi4j.org/community/ci.html[Zest� Continuous Integration] for current tests results
 
 // TODO
 
@@ -144,7 +144,7 @@ They are not part of the default build.
 
 === Performance tests ===
 
-Performance tests provide performance mesurements for typical Qi4j use cases.
+Performance tests provide performance mesurements for typical Zest� use cases.
 They are not part of the default build.
 
 // TODO
@@ -179,12 +179,12 @@ We'll list here services that the unit tests will use if available.
 - MySQL for +extensions/entitystore-sql+ (need setup, see test source)
 
 
-== Releasing the Qi4j SDK ==
+== Releasing the Zest� SDK ==
 
 IMPORTANT: Remember that if a +version+ property is not defined, the build system will refuse to make a release and upload.
 
-The Qi4j SDK build system is setup for an easy release process.
-This is very useful to the Qi4j Core Team but can also be useful to third parties that want to cut a in-house release.
+The Zest� SDK build system is setup for an easy release process.
+This is very useful to the Zest� Core Team but can also be useful to third parties that want to cut a in-house release.
 In this regard, we try to make every aspect of the release process usable for such cases.
 
 The following sections describe various aspects of the release process.
@@ -193,12 +193,12 @@ By default you need to have a proper PGP setup, see below.
 
 === Release Criteria ===
 
-The Qi4j SDK modules are of varying maturity level and we try to maintain a STATUS (+dev-status.xml+) file indicating
+The Zest� SDK modules are of varying maturity level and we try to maintain a STATUS (+dev-status.xml+) file indicating
 how good the codebase, documentation and unit tests are for each of the modules. This is highly subjective and
 potentially different individuals will judge this differently, but at least it gives a ballpark idea of the situation
 for our users.
 
-The Qi4j SDK build system use the values from the +dev-status.xml+ files to filter out non-releasable modules out for
+The Zest� SDK build system use the values from the +dev-status.xml+ files to filter out non-releasable modules out for
 the +javadocs+ and +uploadArchives+ root project tasks.
 Moreover, the +release+ task ensure that no releasable module depends on module(s) that don't fit the release criteria
 and throw a detailed exception if need be.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/tutorials/howto-configure-service.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-configure-service.txt b/manual/src/docs/tutorials/howto-configure-service.txt
index 3022b33..e019d25 100644
--- a/manual/src/docs/tutorials/howto-configure-service.txt
+++ b/manual/src/docs/tutorials/howto-configure-service.txt
@@ -15,10 +15,10 @@
 
 [[howto-configure-service,Configure a Service]]
 = Configure a Service =
-Qi4j supports a Configuration system for services. The configuration instance itself is an Entity and is therefor
+Zest� supports a Configuration system for services. The configuration instance itself is an Entity and is therefor
 readable, writeable and queryable, just like other Entities. This should make Configuration management much simpler,
 since you can easily build GUI tools to allow editing of these in runtime. However, to simplify the initial values of
-the Configuration instance, Qi4j also does the initial bootstrapping of the Configuration entity for you. This HowTo is
+the Configuration instance, Zest� also does the initial bootstrapping of the Configuration entity for you. This HowTo is
 going to show how.
 
 If you want to reproduce what's explained in this tutorial, remember to depend on the Core Bootstrap artifact:
@@ -139,7 +139,7 @@ tag=params
 File: org/qi4j/manual/travel/OrbitzService.properties
 
 == Changing Configuration in runtime ==
-Unlike most frameworks, the Configuration in Qi4j is an active Entity, and once the properties file has been read once
+Unlike most frameworks, the Configuration in Zest� is an active Entity, and once the properties file has been read once
 at the first(!) startup, it no longer serves any purpose. The Configuration will always be retrieved from the
 EntityStore. Changes to the properties file are not taken into consideration if the Configuration entity is found in the
 entity store.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/tutorials/howto-create-concern.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-create-concern.txt b/manual/src/docs/tutorials/howto-create-concern.txt
index f5fc6d0..4438b4e 100644
--- a/manual/src/docs/tutorials/howto-create-concern.txt
+++ b/manual/src/docs/tutorials/howto-create-concern.txt
@@ -41,8 +41,8 @@ tag=allClass
 Note that we could have implemented the InventoryConcern as an abstract class if we were not interested in __all__ the methods in the Order interface.
 Extending the ConcernOf is a convenience mechanism, instead of an explicit @ConcernFor annotation on
 a private field, which can be used in rare occasions when you are not able to extend. This base class defines the next
-field, which is set up by the Qi4j runtime and points to the next fragment in the call stack. We can also see that the
-InventoryService is provided to the concern, which is done with dependency injection. Qi4j also supports dependency
+field, which is set up by the Zest� runtime and points to the next fragment in the call stack. We can also see that the
+InventoryService is provided to the concern, which is done with dependency injection. Zest� also supports dependency
 injection via constructors and methods.
 
 It can be used as follows;

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/tutorials/howto-create-entity.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-create-entity.txt b/manual/src/docs/tutorials/howto-create-entity.txt
index 1b69e14..ec16fe4 100644
--- a/manual/src/docs/tutorials/howto-create-entity.txt
+++ b/manual/src/docs/tutorials/howto-create-entity.txt
@@ -15,9 +15,9 @@
 
 [[howto-create-entity,Create an Entity]]
 = Create an Entity =
-One of the most common tasks in Qi4j is the management of the life cycle of Entities. Since Qi4j is capable of
+One of the most common tasks in Zest� is the management of the life cycle of Entities. Since Zest� is capable of
 delivering much higher performance than traditional Object-Relational Mapping technologies, we also expect that people
-use Entities more frequently in Qi4j applications, so it is a very important topic to cover.
+use Entities more frequently in Zest� applications, so it is a very important topic to cover.
 
 If you want to reproduce what's explained in this tutorial, remember to depend on the Core Bootstrap artifact:
 
@@ -39,7 +39,7 @@ Domain code typically don't need to know of the EntityComposite types directly,
 interface. The Visibility rules will be applied to associate the right EntityComposite when a domain type is requested.
 Ambiguities are not accepted and will result in runtime exceptions.
 
-Qi4j supports that each entity instance can have more than one entity type, and it is managed per instance. This feature
+Zest� supports that each entity instance can have more than one entity type, and it is managed per instance. This feature
 is beyond the scope of this HowTO and will be covered subsequently.
 
 == Good Practice ==
@@ -125,7 +125,7 @@ available as services.
 
 == The Entity Factory ==
 
-The entity factory is something you need to write yourself, but as with most things in Qi4j it will end up being a
+The entity factory is something you need to write yourself, but as with most things in Zest� it will end up being a
 fairly small implementation. So how is that done?
 
 [snippet,java]
@@ -134,7 +134,7 @@ source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactor
 tag=carFactory
 -----------
 
-That is just the domain interface. We now need to make the service interface, which Qi4j needs to identify services and
+That is just the domain interface. We now need to make the service interface, which Zest� needs to identify services and
 make it possible for the service injection later.
 
 [snippet,java]
@@ -151,7 +151,7 @@ source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactor
 tag=carFactoryMixin1
 -----------
 
-And doing that, first of all we need to request Qi4j runtime to give us the Module
+And doing that, first of all we need to request Zest� runtime to give us the Module
 that our code belongs to, and the UnitOfWork current context the execution is happening in.
 
 Injections that are related to the Visibility rules are handled by the @Structure annotation. And the easiest way for us
@@ -163,7 +163,7 @@ source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactor
 tag=carFactoryMixin2
 -----------
 
-Here Qi4j will inject the member module with the correct Module. In case we only need the Module
+Here Zest� will inject the member module with the correct Module. In case we only need the Module
 during the construction, we can also request it in the same manner as constructor argument.
 
 [snippet,java]

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/tutorials/howto-create-sideeffect.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-create-sideeffect.txt b/manual/src/docs/tutorials/howto-create-sideeffect.txt
index cd8ea72..5084a79 100644
--- a/manual/src/docs/tutorials/howto-create-sideeffect.txt
+++ b/manual/src/docs/tutorials/howto-create-sideeffect.txt
@@ -41,9 +41,9 @@ tag=allClass
 The MailNotifySideEffect is implemented as an abstract class, since we are not interested in the many other methods in
 the Confirmable interface. Extending the SideEffectOf is a convenience mechanism, instead of an explicit @SideEffectFor
 annotation on a private field, which can be used in rare occasions when you are not able to extend. This base class
-defines the next field, which is set up by the Qi4j runtime and points to the next fragment in the call stack. We can
+defines the next field, which is set up by the Zest� runtime and points to the next fragment in the call stack. We can
 also see that the MailService, HasLineItems and HasCustomer are provided to the side-effect, which is done with
-dependency injection. Qi4j also supports dependency injection via constructors and methods.
+dependency injection. Zest� also supports dependency injection via constructors and methods.
 
 It can be used as follows;
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/tutorials/howto-depend-on-qi4j.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-depend-on-qi4j.txt b/manual/src/docs/tutorials/howto-depend-on-qi4j.txt
index 7295648..938ce0c 100644
--- a/manual/src/docs/tutorials/howto-depend-on-qi4j.txt
+++ b/manual/src/docs/tutorials/howto-depend-on-qi4j.txt
@@ -17,8 +17,8 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-[[howto-depend-on-qi4j,Depend on Qi4j in your build]]
-= Depend on Qi4j in your build =
+[[howto-depend-on-qi4j,Depend on Zest™ in your build]]
+= Depend on Zest™ in your build =
 
 NOTE: Some of the <<libraries>> and <<extensions>> depend on artifacts that are not deployed in central, you'll need to
 add other repositories to your build scripts accordingly.
@@ -41,7 +41,7 @@ http://qi4j.org/downloads.html[download] the SDK distribution.
 
 == Using Maven ==
 
-First you need to register the Qi4j repositories:
+First you need to register the Zest™ repositories:
 
 [source,xml]
 ----
@@ -59,7 +59,7 @@ First you need to register the Qi4j repositories:
 </repositories>
 ----
 
-After that you can declare dependencies on Qi4j artifacts:
+After that you can declare dependencies on Zest™ artifacts:
 
 [source,xml]
 ----
@@ -84,11 +84,11 @@ After that you can declare dependencies on Qi4j artifacts:
 </dependencies>
 ----
 
-Where `QI4J_VERSION` is the Qi4j version you want to use.
+Where `QI4J_VERSION` is the Zest™ version you want to use.
 
 == Using Gradle ==
 
-First you need to register the Qi4j repositories:
+First you need to register the Zest™ repositories:
 
 [source,groovy]
 ----
@@ -98,7 +98,7 @@ repositories {
 }
 ----
 
-After that you can declare dependencies on Qi4j artifacts:
+After that you can declare dependencies on Zest™ artifacts:
 
 [source,groovy]
 ----
@@ -109,11 +109,11 @@ dependencies {
 }
 ----
 
-Where `QI4J_VERSION` is the Qi4j version you want to use.
+Where `QI4J_VERSION` is the Zest™ version you want to use.
 
 == Using Buildr ==
 
-First you need to register the Qi4j repositories:
+First you need to register the Zest™ repositories:
 
 [source,ruby]
 ----
@@ -121,7 +121,7 @@ repositories.remote << 'https://repository-qi4j.forge.cloudbees.com/release/'
 repositories.remote << 'https://repository-qi4j.forge.cloudbees.com/snapshot/'
 ----
 
-After that you can declare dependencies on Qi4j artifacts:
+After that you can declare dependencies on Zest™ artifacts:
 
 [source,ruby]
 ----
@@ -130,11 +130,11 @@ package(:war).with :libs => 'org.qi4j.core:org.qi4j.core.runtime:QI4J_VERSION'
 test.with 'org.qi4j.core:org.qi4j.core.testsupport:QI4J_VERSION'
 ----
 
-Where `QI4J_VERSION` is the Qi4j version you want to use.
+Where `QI4J_VERSION` is the Zest™ version you want to use.
 
 == Using SBT ==
 
-First you need to register the Qi4j repositories:
+First you need to register the Zest™ repositories:
 
 [source,scala]
 ----
@@ -143,7 +143,7 @@ resolvers += "qi4j-releases" at "https://repository-qi4j.forge.cloudbees.com/rel
 resolvers += "qi4j-snapshots" at "https://repository-qi4j.forge.cloudbees.com/snapshot/"
 ----
 
-After that you can declare dependencies on Qi4j artifacts:
+After that you can declare dependencies on Zest™ artifacts:
 
 [source,scala]
 ----
@@ -158,11 +158,11 @@ libraryDependencies += \
     withSources() withJavadoc()
 ----
 
-Where `QI4J_VERSION` is the Qi4j version you want to use.
+Where `QI4J_VERSION` is the Zest™ version you want to use.
 
 == Using Ivy ==
 
-First you need to register the Qi4j repositories in a `ivysettings.xml` file:
+First you need to register the Zest™ repositories in a `ivysettings.xml` file:
 
 [source,xml]
 ----
@@ -179,7 +179,7 @@ First you need to register the Qi4j repositories in a `ivysettings.xml` file:
 </ivysettings>
 ----
 
-After that you can declare dependencies on Qi4j artifacts:
+After that you can declare dependencies on Zest™ artifacts:
 
 [source,xml]
 ----
@@ -195,5 +195,5 @@ After that you can declare dependencies on Qi4j artifacts:
 </ivy-module>
 ----
 
-Where `QI4J_VERSION` is the Qi4j version you want to use.
+Where `QI4J_VERSION` is the Zest™ version you want to use.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/tutorials/howto-leverage-properties.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-leverage-properties.txt b/manual/src/docs/tutorials/howto-leverage-properties.txt
index 24bde2c..8637662 100644
--- a/manual/src/docs/tutorials/howto-leverage-properties.txt
+++ b/manual/src/docs/tutorials/howto-leverage-properties.txt
@@ -16,7 +16,7 @@
 [[howto-leverage-properties,Leverage Properties]]
 = Leverage Properties =
 
-Qi4j does not follow the JavaBeans standard for property support. Instead, a much more explicit concept is in place. The
+Zest� does not follow the JavaBeans standard for property support. Instead, a much more explicit concept is in place. The
 advantages are enormous, and the only real downside is that people are already destroyed, thinking in so called POJO
 terms.
 
@@ -26,7 +26,7 @@ include::../../../../core/api/build/docs/buildinfo/artifact.txt[]
 
 At runtime you will need the Core Runtime artifact too. See the <<howto-depend-on-qi4j>> tutorial for details.
 
-So in Qi4j, instead of writing;
+So in Zest, instead of writing;
 
 [snippet,java]
 -----------
@@ -70,7 +70,7 @@ tag=create
 
 == Persistence ==
 
-The Property concept also allows a much better defined persistence model. In Qi4j, only Property and Association
+The Property concept also allows a much better defined persistence model. In Zest, only Property and Association
 instances are persisted, and that makes the semantics around the persistence system very clear.
 
 Properties reference values only, and these values must be Serializable, which means that Properties can not contain

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/tutorials/howto-use-io.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-use-io.txt b/manual/src/docs/tutorials/howto-use-io.txt
index ac1ae10..6d307cc 100644
--- a/manual/src/docs/tutorials/howto-use-io.txt
+++ b/manual/src/docs/tutorials/howto-use-io.txt
@@ -245,10 +245,10 @@ Inputs.text( source ).transferTo( Transforms.map(counter, Outputs.text(destinati
 System.out.println("Nr of lines:"+counter.getCount())
 --------------
 
-== Usage in the Qi4j SPI ==
+== Usage in the Zest™ SPI ==
 
 Now I can finally get back to my initial problem that led me to look into this: how to implement a good way to access
-EntityStates in a Qi4j EntityStore, and perform restores of backups. The current version of accessing EntityStates look
+EntityStates in a Zest™ EntityStore, and perform restores of backups. The current version of accessing EntityStates look
 like this:
 
 [source,java]
@@ -322,5 +322,5 @@ things properly it becomes easier to perform these tasks in a scalable, performa
 allowing these tasks to be decorated with extra features when needed.
 
 This article has outlined one way to do this, and the API and helpers that I've described are available in the current
-Qi4j Core 1.3-SNAPSHOT in Git (see Qi4j homepage for access details). The idea is to start using it throughout Qi4j
+Zest™ Core 1.3-SNAPSHOT in Git (see Zest™ homepage for access details). The idea is to start using it throughout Zest
 wherever we need to do I/O of the type described here.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/tutorials/howto-writing-docs.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-writing-docs.txt b/manual/src/docs/tutorials/howto-writing-docs.txt
index 2f501b5..5e7995b 100644
--- a/manual/src/docs/tutorials/howto-writing-docs.txt
+++ b/manual/src/docs/tutorials/howto-writing-docs.txt
@@ -18,7 +18,7 @@
 ///////////////////////////////////////////////////////////////
 
 [[community-docs,Writing Documentation]]
-= Writing Qi4j Documentation =
+= Writing Zest� Documentation =
 
 The documents use the asciidoc format, see:
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/userguide/core.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/core.txt b/manual/src/docs/userguide/core.txt
index 54ab652..6f046c8 100644
--- a/manual/src/docs/userguide/core.txt
+++ b/manual/src/docs/userguide/core.txt
@@ -24,20 +24,20 @@
 
 == Overview ==
 
-The Qi4j Core is composed of several artifacts described in this section.
+The Zest™ Core is composed of several artifacts described in this section.
 
 The following figure show the Core artifacts alongside <<libraries,libraries>> and <<extensions,extensions>>, and, in green,
 typical applications artifacts. This is not a full code dependency graph but should give you a good overview of how the
-pieces fit together. Find out more about each of the Qi4j Core artifacts below.
+pieces fit together. Find out more about each of the Zest™ Core artifacts below.
 
-.Qi4j Core Overview
+.Zest™ Core Overview
 image::core-overview.png[]
 
 //*<<core-api,Core API>>*
 === Core API ===
 
 //____
-The Qi4j Core API is the primary interface for client application code during the main execution phase, i.e. after the
+The Zest™ Core API is the primary interface for client application code during the main execution phase, i.e. after the
 application has been activated.
 
 <<core-api,Learn more>>
@@ -46,9 +46,9 @@ application has been activated.
 //*<<core-bootstrap-assembly,Core Bootstrap>>*
 === Core Bootstrap ===
 //____
-Qi4j has a distinct bootstrap phase, also known as the _Assembly_ of an application, where the applications structure
+Zest™ has a distinct bootstrap phase, also known as the _Assembly_ of an application, where the applications structure
 is defined programmatically. Once all the layers, modules and all the composite types in each module have been defined
-the model is instantiated into an application. This enables the entire _structure_ system in Qi4j, where types "belongs"
+the model is instantiated into an application. This enables the entire _structure_ system in Zest, where types "belongs"
 to a module and visibility rules define default behaviors, enforcement of architectural integrity and much more.
 
 <<core-bootstrap-assembly,Learn more>>
@@ -57,8 +57,8 @@ to a module and visibility rules define default behaviors, enforcement of archit
 //*<<core-testsupport,Core Test Support>>*
 === Core Test Support ===
 //____
-Qi4j comes with classes to help with testing. There is also some mocking support, to allow some of Qi4j’s unique
-aspects to be mocked, but since Qi4j is so flexible at a fine-granular level, we have found that mocking is seldom,
+Zest™ comes with classes to help with testing. There is also some mocking support, to allow some of Zest’s unique
+aspects to be mocked, but since Zest™ is so flexible at a fine-granular level, we have found that mocking is seldom,
 if ever, needed.
 
 <<core-testsupport,Learn more>>
@@ -67,9 +67,9 @@ if ever, needed.
 //*<<core-functional,Core Functional API>>*
 === Core Functional API ===
 //____
-The Qi4j Core Functional API is a generic package to work with Iterables in a "functional programming language" style.
+The Zest™ Core Functional API is a generic package to work with Iterables in a "functional programming language" style.
 
-This package is completely independent of everything else in Qi4j and may be used on its own in any kind of environment
+This package is completely independent of everything else in Zest™ and may be used on its own in any kind of environment
 such as Spring or Java EE applications.
 
 <<core-functional,Learn more>>
@@ -78,7 +78,7 @@ such as Spring or Java EE applications.
 //*<<core-io,Core I/O API>>*
 === Core I/O API ===
 //____
-The Qi4j Core I/O API tries to address the problem around shuffling data around from various I/O inputs and outputs,
+The Zest™ Core I/O API tries to address the problem around shuffling data around from various I/O inputs and outputs,
 possibly with transformations and filtering along the way.
 
 <<core-io,Learn more>>
@@ -87,7 +87,7 @@ possibly with transformations and filtering along the way.
 //*<<core-spi,Core Extension SPI>>*
 === Core Extension SPI ===
 //____
-The Qi4j Core Runtime has a number of extension points, which we call the _Qi4j Core Extension SPI_. These are defined
+The Zest™ Core Runtime has a number of extension points, which we call the _Qi4j Core Extension SPI_. These are defined
 interfaces used *only* by the Core Runtime and *never* directly by application code. <<extensions>> are assembled in
 applications during the bootstrap phase.
 
@@ -97,7 +97,7 @@ applications during the bootstrap phase.
 //*<<core-spi,Core Runtime>>*
 === Core Runtime ===
 //____
-Your code should *never*, *ever*, have a dependency on Qi4j Core Runtime. If you think you need this, you should
+Your code should *never*, *ever*, have a dependency on Zest™ Core Runtime. If you think you need this, you should
 probably contact qi4j-dev forum at Google Groups and see if your usecase can either be solved in a existing way or
 perhaps that a new Core Extension SPI is needed.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/userguide/extensions.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/extensions.txt b/manual/src/docs/userguide/extensions.txt
index 2a6c3ef..107f418 100644
--- a/manual/src/docs/userguide/extensions.txt
+++ b/manual/src/docs/userguide/extensions.txt
@@ -24,7 +24,7 @@
 
 == Overview ==
 
-We try to keep the Qi4j Core Runtime as lean as possible, and a lot of the power to the Qi4j Platform comes via its
+We try to keep the Zest� Core Runtime as lean as possible, and a lot of the power to the Zest� Platform comes via its
 Extension SPI, which defines clear ways to extend the platform. There are currently the following Extensions types,
 each with possibly more than one implementation;
 
@@ -37,7 +37,7 @@ each with possibly more than one implementation;
    * Migration
 
 This section will go through each of the available extensions.
-The Qi4j Extensions are of varying maturity level and we try to maintain a STATUS (dev-status.xml) file indicating
+The Zest� Extensions are of varying maturity level and we try to maintain a STATUS (dev-status.xml) file indicating
 how good the codebase, documentation and unit tests are for each of the libraries. This is highly subjective and
 potentially different individuals will judge this differently, but at least it gives a ballpark idea of the situation
 for our users.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/userguide/faq.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/faq.txt b/manual/src/docs/userguide/faq.txt
index 3323466..7aba95f 100644
--- a/manual/src/docs/userguide/faq.txt
+++ b/manual/src/docs/userguide/faq.txt
@@ -20,7 +20,7 @@
 [[faq,FAQ]]
 = Frequently Asked Questions =
 
-Is it possible to use Scala with Qi4j?::
-        Short Answer: Yes. Scala traits can be used as Qi4j fragments, and Qi4j composites can be used in Scala.
+Is it possible to use Scala with Zest?::
+        Short Answer: Yes. Scala traits can be used as Zest� fragments, and Zest� composites can be used in Scala.
 
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/userguide/glossary.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/glossary.txt b/manual/src/docs/userguide/glossary.txt
index 9c59dc1..401b00b 100644
--- a/manual/src/docs/userguide/glossary.txt
+++ b/manual/src/docs/userguide/glossary.txt
@@ -24,7 +24,7 @@
 
 == Glossary ==
 
-There are a lot of concepts in Qi4j which may have different meanings in other contexts. So in true DDD-style
+There are a lot of concepts in Zest� which may have different meanings in other contexts. So in true DDD-style
 ubiquitous language, we are here listing the definitions of the terms and concepts that are being used.
 
 [glossary]
@@ -34,7 +34,7 @@ ubiquitous language, we are here listing the definitions of the terms and concep
 An Abstract Mixin is an implementation of the <<def-mixin-type>> interface, but is an abstract class and has not
 implemented all the methods.
 
-The Qi4j runtime can use multiple <<def-mixin,Mixins>> for each <<def-mixin-type>> interface. It is also possible to let
+The Zest� runtime can use multiple <<def-mixin,Mixins>> for each <<def-mixin-type>> interface. It is also possible to let
 a <<def-generic-mixin>> handle the remaining missing methods.
 --
 
@@ -53,10 +53,10 @@ will not be part of the <<def-invocation-stack>> of those methods.
 [[def-application,Application]]Application::
 +
 --
-Application is the top level concept handled by the Qi4j runtime instance. It holds the information about the
+Application is the top level concept handled by the Zest� runtime instance. It holds the information about the
 <<def-layer,Layers>> in the application architecture. See <<def-structure>> for more information.
 
-There is one and only one Application instance per Qi4j Runtime instance.
+There is one and only one Application instance per Zest� Runtime instance.
 --
 
 
@@ -102,7 +102,7 @@ by the thread boundaries. Use-cases for this include user credentials on which b
 [[def-composite-metatype,Composite Meta Type]]Composite Meta Type::
 +
 --
-There are 5 Composite Meta Types defined in Qi4j, which each share the composition features but have distinct
+There are 5 Composite Meta Types defined in Zest, which each share the composition features but have distinct
 semantic differences.
 
 * <<def-entitycomposite>>
@@ -120,7 +120,7 @@ CompositeType is the Java interface that declares the composition, from which <<
 created.
 
 Composite Type interfaces must be a sub-type of one of the 5 <<def-composite-metatype,Composite Meta Types>> defined in
-Qi4j otherwise it can not be instantiated.
+Zest� otherwise it can not be instantiated.
 --
 
 
@@ -140,7 +140,7 @@ involves;
 
 Concerns are established by the use of the @Concerns annotation on composites.
 
-Concern is one of the 3 kinds of <<def-modifier,Modifiers>> defined in Qi4j.
+Concern is one of the 3 kinds of <<def-modifier,Modifiers>> defined in Zest.
 --
 
 
@@ -153,7 +153,7 @@ stored permanently in configured Entity Stores. Configuration Composites are als
 properties files first time. Note that on consequent start-ups the properties file is not read, as the configuration is
 read from the EntityStore.
 
-ConfigurationComposite is one of the 5 <<def-composite-metatype,Composite Meta Types>> defined in Qi4j.
+ConfigurationComposite is one of the 5 <<def-composite-metatype,Composite Meta Types>> defined in Zest.
 
 See <<howto-configure-service>> to learn how to use Configuration Composites.
 --
@@ -162,7 +162,7 @@ See <<howto-configure-service>> to learn how to use Configuration Composites.
 [[def-constraint,Constraint]]Constraint::
 +
 --
-Constraints are a kind of validators, which are consulted prior to invoking the method call. Qi4j currently only
+Constraints are a kind of validators, which are consulted prior to invoking the method call. Zest� currently only
 supports ParameterConstraints on methods and value constraints on <<def-property,Properties>>, but future versions will
 include Constraint types for checking complete method calls and return values.
 
@@ -172,7 +172,7 @@ See <<library-constraints>> for ready to use Constraints.
 
 See <<howto-create-constraint>> to learn how to write your own Constraints.
 
-Constraint is one of the 3 kinds of <<def-modifier,Modifiers>> defined in Qi4j.
+Constraint is one of the 3 kinds of <<def-modifier,Modifiers>> defined in Zest.
 --
 
 
@@ -182,7 +182,7 @@ Constraint is one of the 3 kinds of <<def-modifier,Modifiers>> defined in Qi4j.
 An Entity Composite, or just Entity for short, is a persisted composite with an <<def-identity>>. An entity only has
 scope within an <<def-unitofwork>> and is therefor inherently thread-safe.
 
-EntityComposite is one of the 5 <<def-composite-metatype,Composite Meta Types>> defined in Qi4j.
+EntityComposite is one of the 5 <<def-composite-metatype,Composite Meta Types>> defined in Zest.
 --
 
 
@@ -235,11 +235,11 @@ For each method, Qi4J will create and re-use an Invocation Stack. It will be bui
 <<def-modifier,Modifiers>> and an end-point that will link into the stateful <<def-mixin>>.
 
 It is important to recognize that, for memory footprint reasons, Invocation Stacks are shared across
-<<def-composite,Composites>> of the same <<def-composite-type>>. They are however thread-safe, in that Qi4j will never
+<<def-composite,Composites>> of the same <<def-composite-type>>. They are however thread-safe, in that Zest� will never
 bind the same Invocation Stack to more than one <<def-composite>> instance during a method call, but that between method
 invocations the <<def-modifier,Modifiers>> in the Invocation Stack can not assume that it is bound to the same
 <<def-composite>> instance. Therefor, <<def-modifier,Modifiers>> are not expected to keep state between method
-invocations, and when it needs to do that, then it should reference a <<def-mixin>> via the @This annotation. Qi4j will
+invocations, and when it needs to do that, then it should reference a <<def-mixin>> via the @This annotation. Zest� will
 during the binding of the Invocation Stack to the <<def-composite>>, also ensure that all referenced
 <<def-mixin,Mixins>> are correctly injected in the Invocation Stack.
 --
@@ -248,7 +248,7 @@ during the binding of the Invocation Stack to the <<def-composite>>, also ensure
 [[def-layer,Layer]]Layer::
 +
 --
-Qi4j promotes a Layered application design, where Layers can only access lower Layers and not higher Layers or Layers at
+Zest� promotes a Layered application design, where Layers can only access lower Layers and not higher Layers or Layers at
 the same level.
 --
 
@@ -345,7 +345,7 @@ See the <<howto-leverage-properties>> how-to.
 --
 Service Composite is a subtype of <<def-composite>>, and has a range of features built into it.
 
-ServiceComposite is one of the 5 <<def-composite-metatype,Composite Meta Types>> defined in Qi4j.
+ServiceComposite is one of the 5 <<def-composite-metatype,Composite Meta Types>> defined in Zest.
 
 See the <<core-api-service,Service Composite chapter>>.
 --
@@ -370,24 +370,24 @@ involves;
 
 SideEffects are established by the use of the @SideEffects annotation on composites.
 
-SideEffect is one of the 3 kinds of <<def-modifier,Modifiers>> defined in Qi4j.
+SideEffect is one of the 3 kinds of <<def-modifier,Modifiers>> defined in Zest.
 --
 
 
 [[def-structure,Structure]]Structure::
 +
 --
-Qi4j promotes a conventional view of application structure, that computer science has been using for decades.
+Zest� promotes a conventional view of application structure, that computer science has been using for decades.
 
 The definition is as follows;
 
-* One <<def-application>> per Qi4j runtime instance.
+* One <<def-application>> per Zest� runtime instance.
 * One or more <<def-layer,Layers>> per <<def-application>>.
 * Zero, one or more <<def-module,Modules>> per <<def-layer>>.
 * Zero, one or more Assemblies per <<def-module>>.
 
 The principle of this Structure is to assist the programmer to create well modularized applications, that are easily
-extended and maintained. Qi4j will restrict access between <<def-module,Modules>>, so that code can only reach
+extended and maintained. Zest� will restrict access between <<def-module,Modules>>, so that code can only reach
 <<def-composite,Composites>> and Objects in <<def-module,Modules>> (including itself) of the same or lower
 <<def-layer,Layers>>.
 
@@ -424,7 +424,7 @@ immutable and can be compared by value instead of memory reference. Concurrency
 the value exists or it doesn't, no need for synchronization. Values are typically very easy to test and very robust to
 refactoring.
 
-Qi4j defines values as a primary meta type through the ValueComposite, as we think the benefits of values are great.
+Zest� defines values as a primary meta type through the ValueComposite, as we think the benefits of values are great.
 The ValueComposite is very light-weight compared to the <<def-entitycomposite>>, and its value can still be persisted as
 part of an <<def-entitycomposite>> via a <<def-property>>.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/userguide/index.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/index.txt b/manual/src/docs/userguide/index.txt
index a236d54..e65328d 100644
--- a/manual/src/docs/userguide/index.txt
+++ b/manual/src/docs/userguide/index.txt
@@ -17,7 +17,7 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-= Qi4j v{revnumber} User Guide =
+= Zest� v{revnumber} User Guide =
 
 :qi4j-version: {revnumber}
 :qi4j-buildnumber: {revnumber}

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/userguide/libraries.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/libraries.txt b/manual/src/docs/userguide/libraries.txt
index 1efdcde..c6f26b8 100644
--- a/manual/src/docs/userguide/libraries.txt
+++ b/manual/src/docs/userguide/libraries.txt
@@ -24,7 +24,7 @@
 
 == Overview ==
 
-The Qi4j Libraries are of varying maturity level and we try to maintain a STATUS (dev-status.xml) file indicating
+The Zest� Libraries are of varying maturity level and we try to maintain a STATUS (dev-status.xml) file indicating
 how good the codebase, documentation and unit tests are for each of the libraries. This is highly subjective and
 potentially different individuals will judge this differently, but at least it gives a ballpark idea of the situation
 for our users.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/userguide/preface.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/preface.txt b/manual/src/docs/userguide/preface.txt
index 2d7442f..fd47975 100644
--- a/manual/src/docs/userguide/preface.txt
+++ b/manual/src/docs/userguide/preface.txt
@@ -20,19 +20,19 @@
 [[preface, Preface]]
 = Preface =
 
-This is the reference manual for Qi4j version {qi4j-version}, written by members of the Qi4j Community.
+This is the reference manual for Zest� version {qi4j-version}, written by members of the Zest� Community.
 
 The main parts of the manual are:
 
-* <<introduction>> -- introducing Composite Oriented Programming concepts and Qi4j.
-* <<tutorials>> -- learn how to use Qi4j.
-* <<core-api>> -- detailed information on how to use Qi4j.
-* <<libraries>> -- detailed information on the many libraries available for Qi4j.
-* <<extensions>> -- detailed information each of the Qi4j extensions, such as entity stores,
+* <<introduction>> -- introducing Composite Oriented Programming concepts and Zest.
+* <<tutorials>> -- learn how to use Zest.
+* <<core-api>> -- detailed information on how to use Zest.
+* <<libraries>> -- detailed information on the many libraries available for Zest.
+* <<extensions>> -- detailed information each of the Zest� extensions, such as entity stores,
 indexing, caching and runtime metrics.
 
 The material is practical, technical, and focused on answering specific questions. 
-It addresses how things work, what to do and what to avoid to successfully use Qi4j in domain rich applications.
+It addresses how things work, what to do and what to avoid to successfully use Zest� in domain rich applications.
  
 The goal is to be thumb-through and rule-of-thumb friendly.
 
@@ -40,7 +40,7 @@ Each section should stand on its own, so you can hop right to whatever interests
 When possible, the sections distill "rules of thumb" which you can keep in mind whenever you wander out of the house
 without this manual in your back pocket.
 
-The included code examples are executed when Qi4j is built and tested.
+The included code examples are executed when Zest� is built and tested.
 
 _Who should read this?_
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/userguide/tools.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/tools.txt b/manual/src/docs/userguide/tools.txt
index 982f6d6..2be9669 100644
--- a/manual/src/docs/userguide/tools.txt
+++ b/manual/src/docs/userguide/tools.txt
@@ -24,11 +24,11 @@
 
 == Overview ==
 
-The Qi4j SDK comes with usefull development tools. Theses tools can come in
+The Zest� SDK comes with usefull development tools. Theses tools can come in
 handy when assembled into your <<def-application>> in development
 <<def-application-mode>>.
 
-The tools are available in the +tools/+ directory of the Qi4j SDK.
+The tools are available in the +tools/+ directory of the Zest� SDK.
 
 :leveloffset: 2
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/website/home.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/website/home.txt b/manual/src/docs/website/home.txt
index 56341e1..36cb6d2 100644
--- a/manual/src/docs/website/home.txt
+++ b/manual/src/docs/website/home.txt
@@ -19,24 +19,31 @@
 
 :leveloffset: 1
 
-[[home,Qi4j Home Page]]
-= Qi4j =
+[[home,Zest™ Home Page]]
+= Zest™ =
 
-IMPORTANT: This is the documentation for *Qi4j {revnumber}*. Use the version switcher on the left to browse other
+IMPORTANT: This is the documentation for *Zest™ {revnumber}*. Use the version switcher on the left to browse other
 versions documentation.
 
-== What is Qi4j™? ==
-The short answer is that Qi4j™ is a framework for domain centric application development, including evolved concepts
-from http://en.wikipedia.org/wiki/Aspect-oriented_programming[AOP],
+== What is Apache Zest™ ? ==
+The short answer is that Apache Zest™ is a framework for domain centric application development, including evolved
+concepts from http://en.wikipedia.org/wiki/Aspect-oriented_programming[AOP],
 http://en.wikipedia.org/wiki/Dependency_injection[DI] and http://en.wikipedia.org/wiki/Domain-driven_design[DDD].
 
-Qi4j™ is an implementation of Composite Oriented Programming, using the standard Java platform, without the use of
+Zest™ is an implementation of Composite Oriented Programming, using the standard Java platform, without the use of
 any pre-processors or new language elements. Everything you know from Java still applies and you can leverage both
 your experience and toolkits to become more productive with Composite Oriented Programming today.
 
-Moreover, Qi4j™ enables Composite Oriented Programming on the Java platform, including both Java and Scala as primary
+Moreover, Zest™ enables Composite Oriented Programming on the Java platform, including both Java and Scala as primary
 languages as well as many of the plethora of languages running on the JVM as bridged languages.
 
+We strongly recommend the <<intro, introduction>> section.
+
+== Brief History ==
+Apache Zest™ started its life in 2007 as Qi4j™, initially at OPS4J's infrastructure and later on GitHub.
+In March 2015, Apache Zest™ was created with the Qi4j™ codebase as the base, existing Apache Members as the
+bootstrap Project Management Committee (PMC).
+
 image:intro-qi.png["Qi",align="center"]
 
 Qi4j™ is pronounced "chee for jay". This website is out of scope to explain the many
@@ -44,4 +51,3 @@ facets and history of Qi, so we refer the interested to read the http://en.wikip
 Wikipedia. For us, Qi is the force/energy within the body, in this case the Java platform. Something that makes Java
 so much better, if it is found and channeled into a greater good.
 
-We strongly recommend the <<intro, introduction>> section.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/website/related.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/website/related.txt b/manual/src/docs/website/related.txt
index d49d5d0..453d078 100644
--- a/manual/src/docs/website/related.txt
+++ b/manual/src/docs/website/related.txt
@@ -20,9 +20,9 @@
 [[related,Related publications and projects]]
 = Related publications & projects =
 
-Qi4j addresses a wide range of concepts, the related publications and projects you'll find in this section span accross
+Zest™ addresses a wide range of concepts, the related publications and projects you'll find in this section span accross
 all theses concepts. Please note that this is not an exhaustive list but only some pointers to help you understand which
-principles Qi4j is based on.
+principles Zest™ is based on.
 
 
 == Publications ==

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/website/samples.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/website/samples.txt b/manual/src/docs/website/samples.txt
index 94737a4..5d09260 100644
--- a/manual/src/docs/website/samples.txt
+++ b/manual/src/docs/website/samples.txt
@@ -24,16 +24,16 @@
 
 == Overview ==
 
-The Qi4j SDK comes with several sample applications. This is a very good place
+The Zest� SDK comes with several sample applications. This is a very good place
 to look for code examples and recipes.
 
-The samples are available in the +samples/+ directory of the Qi4j SDK.
+The samples are available in the +samples/+ directory of the Zest� SDK.
 
 [[sample-dci, DCI Sample]]
 == DCI Sample ==
 
 Sample of how DCI (Data, Context & Interaction) pattern is implemented using
-Qi4j core only.
+Zest� core only.
 
 https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/dci[Browse Source]
 
@@ -41,7 +41,7 @@ https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/dci[Browse Source]
 == DCI Cargo Sample ==
 
 Sample of how DCI (Data, Context & Interaction) pattern is implemented with
-Qi4j, for Eric Evans DDD sample.
+Zest�, for Eric Evans DDD sample.
 
 This sample, contributed by Marc Grue, is described in details on his
 website: http://marcgrue.com/
@@ -67,7 +67,7 @@ https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/rental[Browse Source]
 // [[sample-scala,Scala Sample]]
 // == Scala Sample ==
 //
-// Sample of how to use Scala with Qi4j.
+// Sample of how to use Scala with Zest�.
 //
 // https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/scala[Browse Source]
 
@@ -76,7 +76,7 @@ https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/rental[Browse Source]
 
 NOTE: This sample use PostgreSQL and drop all of its data once run in order to be runnable multiple times.
 
-Sample of how to fully use Qi4j SQL support : <<library-sql>>, <<extension-es-sql>> and <<extension-indexing-sql>>.
+Sample of how to fully use Zest� SQL support : <<library-sql>>, <<extension-es-sql>> and <<extension-indexing-sql>>.
 
 https://github.com/Qi4j/qi4j-sdk/tree/develop/samples/sql-support[Browse Source]
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/manual/src/docs/website/tutorials.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/website/tutorials.txt b/manual/src/docs/website/tutorials.txt
index a028411..274c700 100644
--- a/manual/src/docs/website/tutorials.txt
+++ b/manual/src/docs/website/tutorials.txt
@@ -25,15 +25,15 @@
 == Overview ==
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Qi4j SDK sources]. You should start your favorite editor and find the code related to
+http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
-In this section you will find a comprehensive set of tutorials about Composite Oriented Programming using Qi4j.
+In this section you will find a comprehensive set of tutorials about Composite Oriented Programming using Zest�.
 
-[[tutorials-intro,Qi4j in 2 hours 42 minutes]]
-=== Qi4j in 2 hours 42 minutes ===
+[[tutorials-intro,Zest� in 2 hours 42 minutes]]
+=== Zest� in 2 hours 42 minutes ===
 
-This quite long introduction to Qi4j will start by brushing up an overview of the problems Qi4j solve, teach you what
+This quite long introduction to Zest� will start by brushing up an overview of the problems Zest� solve, teach you what
 Composite Oriented Programming is and guide you through the process of writing a complete Application around an adapted
 Hello World example.
 
@@ -42,9 +42,9 @@ Hello World example.
 - <<thirty-minutes-intro>>
 - <<two-hours-intro>>
 
-=== Getting real with Qi4j ===
+=== Getting real with Zest� ===
 
-Throughout this set of tutorials it will be shown how to depend on Qi4j in your build, how to assemble a complete
+Throughout this set of tutorials it will be shown how to depend on Zest� in your build, how to assemble a complete
 application, how to create and work with Composites and Services, how to use contextual fragments and leverage
 properties.
 
@@ -67,10 +67,10 @@ typical application.
 - <<howto-configure-service>>
 - <<howto-use-io>>
 
-=== Qi4j Development ===
+=== Zest� Development ===
 
-This last set of tutorials you'll learn how to build the Qi4j SDK from sources including this very documentation website
-, the Qi4j manual, binaries and sources distributions.
+This last set of tutorials you'll learn how to build the Zest� SDK from sources including this very documentation website
+, the Zest� manual, binaries and sources distributions.
 
 - <<build-system>>
 - <<community-docs>>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/samples/dci-cargo/README.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/README.txt b/samples/dci-cargo/README.txt
index 24f12fc..4f71f53 100644
--- a/samples/dci-cargo/README.txt
+++ b/samples/dci-cargo/README.txt
@@ -1,7 +1,7 @@
 DCI Sample
 ==========
 
-This is a port of the DDD Sample application to the DCI paradigm using Java, Qi4j and Wicket.
+This is a port of the DDD Sample application to the DCI paradigm using Java, Zest� and Wicket.
 
 The code is licensed under the Apache Software License 2.0 and lastest revisions are
 available from https://github.com/dci.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/src/bin-dist/NOTICE.txt
----------------------------------------------------------------------
diff --git a/src/bin-dist/NOTICE.txt b/src/bin-dist/NOTICE.txt
index 7a0eb20..b16082a 100644
--- a/src/bin-dist/NOTICE.txt
+++ b/src/bin-dist/NOTICE.txt
@@ -1,4 +1,4 @@
-Apache Zest Qi4j SDK Binary Distribution
+Apache Zest� (Java Edition) SDK Binary Distribution
 Copyright 2015 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/src/bin-dist/README.txt
----------------------------------------------------------------------
diff --git a/src/bin-dist/README.txt b/src/bin-dist/README.txt
index 259f7ee..b29c306 100644
--- a/src/bin-dist/README.txt
+++ b/src/bin-dist/README.txt
@@ -1,14 +1,14 @@
 
-Welcome to the world of Apache Zest Qi4j
+Welcome to the world of Apache Zest
    - Composite Oriented Programming on the Java platform.
 
 
-This Apache Zest Qi4j Binary Distribution contains everything you need to
-create Qi4j applications.
+This Apache Zest� Binary Distribution contains everything you need to
+create Zest� applications.
 
 
-Qi4j started in 2007, and is still in heavy development under the umbrella of
-the Apache Zest project at the Apache Software Foundation. We would like
+Zest� (then Zest�) started in 2007, and is still in heavy development
+at the Apache Software Foundation. We would like
 developers around the world to participate in the advancement of this
 cool, new and challenging technology. We are especially interested in
 people willing to help improve the SDK, samples, tutorials, documentation
@@ -19,21 +19,21 @@ Please see https://zest.apache.org for more information.
 
 Licensing
 ---------
-All Apache Zest Qi4j code is licensed under an Apache License.
+All Apache Zest� code is licensed under an Apache License.
 
 Third-Party Dependencies may be licensed under other terms. The only
 required dependencies are SLF4J (MIT Licence), ASM (BSD Licence) and
 Joda-Time (Apache Licence).
 
-Finally, Qi4j TestSupport depends on JUnit 4.x and its dependencies, which
+Finally, Zest� TestSupport depends on JUnit 4.x and its dependencies, which
 is also not included in the SDK itself, as it is present among most Java
 developers.
 
 
 Dependencies not included
 -------------------------
-The binary distributions contains Qi4j artifacts only to keep the download
-size small. Each Qi4j artifact comes with a file prefixed ..-runtime-deps.txt
+The binary distributions contains Zest� artifacts only to keep the download
+size small. Each Zest� artifact comes with a file prefixed ..-runtime-deps.txt
 that contains the list of its dependencies. Moreover, at the binary
 distribution's root, you'll find both Maven (go-offline.pom) and Gradle
 (go-offline.gradle) build files whoses sole purpose is to easily download all
@@ -43,8 +43,8 @@ If you prefer to use a dependency management system, go to:
 https://zest.apache.org/qi4j/latest/howto-depend-on-qi4j.html
 
 
-Thank you for trying out Apache Zest Qi4j and Composite Oriented Programming.
+Thank you for trying out Apache Zest� and Composite Oriented Programming.
 
 
--- Apache Zest Qi4j Team
+-- Apache Zest� Team
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tools/envisage/src/docs/envisage.txt
----------------------------------------------------------------------
diff --git a/tools/envisage/src/docs/envisage.txt b/tools/envisage/src/docs/envisage.txt
index c9bcb88..9ad460f 100644
--- a/tools/envisage/src/docs/envisage.txt
+++ b/tools/envisage/src/docs/envisage.txt
@@ -20,7 +20,7 @@
 [[tools-envisage,Envisage Tool]]
 = Envisage =
 
-Envisage is a Swing based visualization tool for the Qi4j Application model.
+Envisage is a Swing based visualization tool for the Zest� Application model.
 Visualizations can be printed to PDFs.
 
 == Usage ==

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/composites/src/docs/step1.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step1.txt b/tutorials/composites/src/docs/step1.txt
index 8ba0a1a..e49d127 100644
--- a/tutorials/composites/src/docs/step1.txt
+++ b/tutorials/composites/src/docs/step1.txt
@@ -22,7 +22,7 @@
 
 == Initial Hello World ==
 
-This whole tutorial describes how to step-by-step modify a typical HelloWorld "application" into a full-fledged Qi4j 
+This whole tutorial describes how to step-by-step modify a typical HelloWorld "application" into a full-fledged Zest�
 Composite Oriented application. Here is the initial code of HelloWorld.
 
 [snippet,java]
@@ -36,7 +36,7 @@ tag=initial
 In this step we start with a basic Java class, which when invoked will concatenate the two properties "phrase" 
 and "name". If invoked with the properties set to "Hello" and "World" respectively it will hence return "Hello World".
 
-Qi4j relies heavily on the use of interfaces. This makes it possible for an object to externally implement a number of 
+Zest� relies heavily on the use of interfaces. This makes it possible for an object to externally implement a number of
 interfaces which internally is backed by a number of Mixins, some of which you may have written yourself, and some of 
 which may have been reused. This also makes it easy to introduce Modifiers (aka "interceptors", aka "advice"), which 
 are Fragments which execute before and/or after the method on the Mixin is invoked.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/composites/src/docs/step2.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step2.txt b/tutorials/composites/src/docs/step2.txt
index 0e55043..80b675c 100644
--- a/tutorials/composites/src/docs/step2.txt
+++ b/tutorials/composites/src/docs/step2.txt
@@ -29,8 +29,8 @@ Constraints. In this tutorial we will only use Mixins. When a TransientComposite
 framework will inspect the interface to determine what the TransientComposite instance should look like in terms of 
 used Fragments.
 
-In Qi4j all method parameters are considered mandatory unless marked as @Optional. Therefore you can remove the null 
-checks in the Mixin. If a null value is passed in an exception will be thrown by Qi4j.
+In Zest� all method parameters are considered mandatory unless marked as @Optional. Therefore you can remove the null
+checks in the Mixin. If a null value is passed in an exception will be thrown by Zest�.
 
 Steps for this tutorial:
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/composites/src/docs/step5.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step5.txt b/tutorials/composites/src/docs/step5.txt
index ba52b8c..79cdd0c 100644
--- a/tutorials/composites/src/docs/step5.txt
+++ b/tutorials/composites/src/docs/step5.txt
@@ -27,7 +27,7 @@ restriction we can make is to denote a type. Any other constraints on the input
 optional, integer ranges, string regular expressions, and so on, cannot be expressed, and so we have to put this into
 Javadoc, and then manually add these checks in the implementation class.
 
-In Qi4j there is the option to use Constraints, which are further restrictions on the parameters. This is implemented
+In Zest� there is the option to use Constraints, which are further restrictions on the parameters. This is implemented
 by having an annotation that describes what the Constraint does, and then an implementation class that checks whether a
 specific value fulfills the Constraint or not.
 
@@ -35,8 +35,8 @@ NOTE: The previous steps had a dependency to the <<core-api>> only. The constrai
 introduce a new dependency to the <<library-constraints>>, where all the constraint related classes reside. So
 update your classpath settings accordingly.
 
-There are a number of pre-written constraints in Qi4j which you can use. The null check of the original HelloWorld
-version is already handled by default since Qi4j considers method parameters to be mandatory if not explicitly marked
+There are a number of pre-written constraints in Zest� which you can use. The null check of the original HelloWorld
+version is already handled by default since Zest� considers method parameters to be mandatory if not explicitly marked
 with the @Optional annotation. So, instead of doing that check we will add other checks that are useful to make, such
 as ensuring that the passed in string is not empty.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/composites/src/docs/step7.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step7.txt b/tutorials/composites/src/docs/step7.txt
index 2d97ad9..8f6e561 100644
--- a/tutorials/composites/src/docs/step7.txt
+++ b/tutorials/composites/src/docs/step7.txt
@@ -22,11 +22,11 @@
 
 Previous step was <<tut-composites-step6>>.
 
-One of the goals of Qi4j is to give you domain modeling tools that allow you to more concisely use domain concepts in 
+One of the goals of Zest� is to give you domain modeling tools that allow you to more concisely use domain concepts in
 code. One of the things we do rather often is model Properties of objects as getters and setters. But this is a very 
 weak model, and does not give you any access to metadata about the property, and also makes common tasks like UI binding
 non-trivial. There is also a lot of repetition of code, which is unnecessary. Using JavaBeans conventions one typically 
-have to have code in five places for one property, whereas in Qi4j the same thing can be achieved with one line of code.
+have to have code in five places for one property, whereas in Zest� the same thing can be achieved with one line of code.
 
 But lets start out easy. To declare a property you have to make a method in a mixin type that returns a value of the 
 type Property, and which does not take any parameters. Here's a simple example:
@@ -43,14 +43,14 @@ For now you will be responsible for implementing these methods, but later on the
 reducing Properties to one-liners!
 
 In the Mixin implementation of the interface with the Property declaration you should have an injection of the Property, 
-which is created for you by Qi4j. The injection can be done in a field like this:
+which is created for you by Zest�. The injection can be done in a field like this:
 
 [source,java]
 ----
 @State Property<String> name;
 ----
 
-The State dependency injection annotation means that Qi4j will inject the Property for you. The field has the name 
+The State dependency injection annotation means that Zest� will inject the Property for you. The field has the name
 "name", which matches the name in the interface, and therefore that Property is injected. You can then implement the 
 method trivially by just returning the "name" field.
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/composites/src/docs/step8.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step8.txt b/tutorials/composites/src/docs/step8.txt
index 636bf38..c41208f 100644
--- a/tutorials/composites/src/docs/step8.txt
+++ b/tutorials/composites/src/docs/step8.txt
@@ -33,7 +33,7 @@ java.lang.proxy.InvocationHandler. This has a single "invoke" method which is pa
 TransientComposite in this case), the method, and the arguments. The Fragment is then allowed to implement the method 
 any way it wants.
 
-Since interfaces with only Properties is such a common case Qi4j already has a generic Mixin that implements the 
+Since interfaces with only Properties is such a common case Zest� already has a generic Mixin that implements the
 Properties management described above, but for the builtin Property type instead of the getter/setter variant. The 
 class is aptly named PropertyMixin.
 
@@ -43,7 +43,7 @@ Steps for this tutorial:
 
 - Remove the HelloWorldStateMixin
 - Add a GenericPropertyMixin, and have it implement InvocationHandler
-- Inject "@State StateHolder state" in the mixin. The StateHolder interface will give you access to the Properties for the TransientComposite which Qi4j manages for you
+- Inject "@State StateHolder state" in the mixin. The StateHolder interface will give you access to the Properties for the TransientComposite which Zest� manages for you
 - On call to invoke(), delegate to the StateHolder interface to get the Property for the invoked method
 - Add an @AppliesTo annotation to the Mixin and implement the AppliesToFilter with a rule that matches only methods that return Property values.
 - Add the mixin to the TransientComposite.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/composites/src/docs/step9.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/step9.txt b/tutorials/composites/src/docs/step9.txt
index 19d7453..6addfd3 100644
--- a/tutorials/composites/src/docs/step9.txt
+++ b/tutorials/composites/src/docs/step9.txt
@@ -31,7 +31,7 @@ This forces the mixin to implement the TransientComposite type, which would norm
 implement all methods, including those found in the TransientComposite interface. However, since we are only really 
 interested in implementing the say() method we will mark this by declaring that the Mixin "implements" the 
 TransientComposite type, but is also "abstract". This, using pure Java semantics, makes it possible to avoid having to 
-implement all methods. Qi4j will during the initialization phase detect that the Mixin only handles the say() method, 
+implement all methods. Zest� will during the initialization phase detect that the Mixin only handles the say() method,
 and therefore only map it to that specific method. In order to instantiate the Mixin it will generate a subclass which 
 implements the remaining methods in the TransientComposite type, as no-ops. These will never be called however, and is 
 there purely for the purpose of being able to instantiate the Mixin. The Mixin is considered to be an Abstract Fragment.
@@ -39,7 +39,7 @@ there purely for the purpose of being able to instantiate the Mixin. The Mixin i
 To hide the state from the client we need to use what is called Private Mixins. A Private Mixin is any mixin that is 
 referenced by another Mixin by using the @This injection, but which is not included in the TransientComposite type. As 
 long as there is a Mixin implementation declared for the interface specified by the @This injection it will work, since 
-Qi4j can know how to implement the interface. But since it is not extended by the TransientComposite type there is no 
+Zest� can know how to implement the interface. But since it is not extended by the TransientComposite type there is no
 way for a user of the TransientComposite to access it. That Mixin becomes an implementation detail. This can be used 
 either for encapsulation purposes, or for referencing utility mixins that help the rest of the code implement some 
 interface, but which itself should not be exposed.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/composites/src/docs/tut-composites.txt
----------------------------------------------------------------------
diff --git a/tutorials/composites/src/docs/tut-composites.txt b/tutorials/composites/src/docs/tut-composites.txt
index 239bc48..cb06854 100644
--- a/tutorials/composites/src/docs/tut-composites.txt
+++ b/tutorials/composites/src/docs/tut-composites.txt
@@ -21,14 +21,14 @@
 = Transient Composites Tutorial =
 
 TIP: Theses tutorials are based on actual code found in the `tutorials/` directory of the
-http://qi4j.org/downloads.html[Qi4j SDK sources]. You should start your favorite editor and find the code related to
+http://qi4j.org/downloads.html[Zest� SDK sources]. You should start your favorite editor and find the code related to
 this tutorial, run it and play with it.
 
 Throughout this set of tutorials it will be shown how to create and work with Composites, which
-is the basic element in Qi4j. We will refactor one HelloWorld class to take advantage of the various
-features in Qi4j. These refactorings will make it easier to reuse parts of the class,
+is the basic element in Zest�. We will refactor one HelloWorld class to take advantage of the various
+features in Zest�. These refactorings will make it easier to reuse parts of the class,
 and introduce new features without having to change existing code. We will also look
-at some of the existing classes, or Fragments, available in Qi4j that you can reuse
+at some of the existing classes, or Fragments, available in Zest� that you can reuse
 so that you don't have to write everything yourself.
 
 - <<tut-composites-step1>>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/introduction/src/docs/background.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/src/docs/background.txt b/tutorials/introduction/src/docs/background.txt
index f68e419..a24f821 100644
--- a/tutorials/introduction/src/docs/background.txt
+++ b/tutorials/introduction/src/docs/background.txt
@@ -19,22 +19,22 @@
 
 [[introduction-background,Background]]
 = Background =
-Qi4j is the first Composite Oriented Programming implementation leveraging the Java 5 platform, so that everything you
-know from Java 5 still applies. You can mix Qi4j with your ordinary Java code as much as you want. All your existing
-Java tools works just like before, and Qi4j does not introduce any new programming language, no special development
+Zest� is the first Composite Oriented Programming implementation leveraging the Java 5 platform, so that everything you
+know from Java 5 still applies. You can mix Zest� with your ordinary Java code as much as you want. All your existing
+Java tools works just like before, and Zest� does not introduce any new programming language, no special development
 tools needed and no XML is required.
 
 == Purpose ==
-Qi4j addresses the programming problems from the top-down, starting with the Domain Model and Business Rules needs,
+Zest� addresses the programming problems from the top-down, starting with the Domain Model and Business Rules needs,
 and let those requirements flow downwards in the software stack and dictate the requirements for underlying layers
 such as persistence, messaging, querying and more. This means that the business value developer is left to
 concentrate on the domain models and the actual application bringing the value, instead of creating massive amounts
 of glue code to tie underlying technologies together.
 
 == Problem Descriptions ==
-Qi4j didn't appear out of the blue, when the founders of the project had nothing better to do. It is the result of
+Zest� didn't appear out of the blue, when the founders of the project had nothing better to do. It is the result of
 observation of problems in real applications, and the experience from previous attempts to address or correct these
-problems, that has led to the Qi4j vision.
+problems, that has led to the Zest� vision.
 
 == Object Oriented Programming (OOP) ==
 How can OOP be a problem? We and others have observed that there is a fundamental flaw in the OOP model. In fact, we
@@ -117,4 +117,4 @@ ServerContextualInvoiceEntity, and then persist the changes.
 Composite Oriented Programming is heavily influenced by the book "Domain Driven Design" by Eric Evans. And we are
 trying to use his analysis of the problem to provide the mechanisms needed to get the job done quicker and more
 reliably. Mr Evans talks about Applications, Layers, Modules, Specifications, SideEffects and so forth, and all of
-these should be present in a Composite Oriented Programming implementation, and to a large extent it is in Qi4j.
+these should be present in a Composite Oriented Programming implementation, and to a large extent it is in Zest�.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/introduction/src/docs/highlights.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/src/docs/highlights.txt b/tutorials/introduction/src/docs/highlights.txt
index 0eeea51..263096b 100644
--- a/tutorials/introduction/src/docs/highlights.txt
+++ b/tutorials/introduction/src/docs/highlights.txt
@@ -83,11 +83,11 @@ irrelevant to the domain model, introduced by the underlying framework, from the
 
 image:classes-are-dead.gif[]
 
-Qi4j™ is trying to address the flaws of OOP and introduce Composite Oriented Programming to the world, without
+Zest™ is trying to address the flaws of OOP and introduce Composite Oriented Programming to the world, without
 introducing new programming languages, or awkward constructs. Heck, we don't even use any XML.
 
-Qi4j™ is not a framework. It is a new way to write code. Other people might create frameworks using Qi4j™, or create a
-framework optimized for Qi4j™, but here at Qi4j™ we concentrate to make Qi4j™ behave well in existing frameworks,
+Zest™ is not a framework. It is a new way to write code. Other people might create frameworks using Zest™, or create a
+framework optimized for Zest™, but here at Zest™ we concentrate to make Zest™ behave well in existing frameworks,
 application servers, platforms and environments.
 
 You are to embark on a new journey. Enjoy!

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/introduction/src/docs/qi4j-cop.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/src/docs/qi4j-cop.txt b/tutorials/introduction/src/docs/qi4j-cop.txt
index b1dc78b..175ce7b 100644
--- a/tutorials/introduction/src/docs/qi4j-cop.txt
+++ b/tutorials/introduction/src/docs/qi4j-cop.txt
@@ -17,6 +17,6 @@
  * under the License.
 ///////////////////////////////////////////////////////////////
 
-[[qi4j-cop,COP with Java and Qi4j]]
-= COP with Java and Qi4j =
+[[qi4j-cop,COP with Java and Zest�]]
+= COP with Java and Zest� =
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/introduction/src/docs/state-modeling.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/src/docs/state-modeling.txt b/tutorials/introduction/src/docs/state-modeling.txt
index 26d8a74..0dff931 100644
--- a/tutorials/introduction/src/docs/state-modeling.txt
+++ b/tutorials/introduction/src/docs/state-modeling.txt
@@ -18,11 +18,11 @@
 ///////////////////////////////////////////////////////////////
 
 [[state-modeling,State Modeling]]
-= Qi4j and state modeling =
+= Zest� and state modeling =
 
 (From Rickard Oberg's blog, http://www.jroller.com/rickard/entry/qi4j_and_state_modeling, 2009-02-19)
 
-In the Qi4j project we strive to being able to express our domain as directly as possible, with as little translation
+In the Zest� project we strive to being able to express our domain as directly as possible, with as little translation
 as possible between how we think about a domain and how it is actually coded.
 This then affects our entire view of how application frameworks should be constructed, and what we consider good and
 bad ways of implementing certain features.
@@ -36,7 +36,7 @@ In Domain Driven Design terms, POJOs are not in our Ubiquitous Language.
 
 From a DDD perspective we want to talk about Entities and Values, Properties and Associations.
 If our code does not reflect this, then there is translation going on, and translation inevitably leads to information loss.
-In Qi4j, where Composites and not Objects, are the basic construct, we have created specialized forms to model these
+In Zest�, where Composites and not Objects, are the basic construct, we have created specialized forms to model these
 concepts more explicitly.
 We have EntityComposites and ValueComposites, each with different ways of creating them and managing them.
 Both EntityComposites and ValueComposites can then have Properties, as first-class objects, but Properties in
@@ -93,7 +93,7 @@ For Collections they are set to empty collections of the type indicated.
 "@UseDefaults Property<List<String>> addresses();" would be initialized to an empty ArrayList, for example.
 
 In addition I have set surName() to be @Optional.
-In Qi4j we have defined all properties to be not-null as the default, and the same goes for all parameters in method
+In Zest� we have defined all properties to be not-null as the default, and the same goes for all parameters in method
 invocations.
 If you explicitly want to allow properties to be null, so that for example "Madonna" would be an acceptable name,
 then you can mark it as @Optional.
@@ -134,7 +134,7 @@ What should have been a neat and tidy little package is instead a anorectic litt
 around your code, looking all soggy and unappetizing.
 
 What to do about this?
-One of the great inventions of Qi4j, I believe, is the notion of private mixins.
+One of the great inventions of Zest�, I believe, is the notion of private mixins.
 That we can have mixins in an object which are explicitly HIDDEN from usage outside of it.
 How can we use this for state modeling?
 What you'd want to do is to model the state of an Entity as a private mixin, which is hidden from clients, and then
@@ -164,10 +164,10 @@ Entity doesn't need the "Listable" interface the mixin will never be instantiate
 
 And so much more...
 
-The above is just a small taste of what you can do with state modeling in Qi4j.
+The above is just a small taste of what you can do with state modeling in Zest�.
 There is also support for associations and many-associations, the notion of aggregates, and a complete pluggable
 system for persistence and indexing/querying of data.
-To end with, here's a sample of how some other state modeling concepts can be expressed in Qi4j:
+To end with, here's a sample of how some other state modeling concepts can be expressed in Zest�:
 
 [snippet,java]
 -----------
@@ -177,5 +177,5 @@ tag=more
 
 I hope they are self-explanatory.
 
-My hope is that with Composite Oriented Programming and Qi4j we can come one step closer to being able to express our
+My hope is that with Composite Oriented Programming and Zest� we can come one step closer to being able to express our
 domain as clearly as possible in code.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/introduction/src/docs/what-is-composite-oriented-programming.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/src/docs/what-is-composite-oriented-programming.txt b/tutorials/introduction/src/docs/what-is-composite-oriented-programming.txt
index 93ffa08..f1493c3 100644
--- a/tutorials/introduction/src/docs/what-is-composite-oriented-programming.txt
+++ b/tutorials/introduction/src/docs/what-is-composite-oriented-programming.txt
@@ -24,7 +24,7 @@ We found this very well written blog entry on the Internet, which very well desc
 Programming really is.
 
 The article uses C# and a "show by example" approach to explaining COP, and this shows clearly that COP is not
-Java specific, and although Qi4j was (to our knowledge) first to introduce the name, it applies across languages and
+Java specific, and although Zest™ was (to our knowledge) first to introduce the name, it applies across languages and
 potentially deserves one or more languages on its own.
 
 
@@ -41,7 +41,7 @@ We would like to thank Fredrik Kalseth for his explicit approval as well.
 
 I've written a series of post on AOP lately (here, here and here), and in the last part I promised to tackle mixins
 and introductions in a future post. When I was doing my research for just that, I came cross a Java framework (just
-humor me :p) called Qi4j (that's 'chee for jay'), written by Swedish Richard Öberg, pioneering the idea of Composite
+humor me :p) called Zest™ (that's 'chee for jay'), written by Swedish Richard Öberg, pioneering the idea of Composite
 Oriented Programming, which instantly put a spell on me. Essentially, it takes the concepts from Aspect Oriented
 Programming to the extreme, and for the past week I’ve dug into it with a passion. This post is the first fruits of
 my labor.
@@ -49,7 +49,7 @@ my labor.
 === OOP is Not Object Oriented! ===
 
 One of the things that Richard Öberg argues, is that OOP is not really object oriented at all, but rather class
-oriented. As the Qi4j website proclaims, "class is the first class citizen that objects are derived from. Not objects
+oriented. As the Zest™ website proclaims, "class is the first class citizen that objects are derived from. Not objects
 being the first-class citizen to which one or many classes are assigned". Composite oriented programming (COP) then,
 tries to work around this limitation by building on a set of core principles; that behavior depends on context, that
 decoupling is a virtue, and that business rules matter more. For a short and abstract explanation of COP,
@@ -324,5 +324,5 @@ I hope this post has whet your appetite for more on this subject, as I will cert
 posts. I’ve already implemented a prototype framework that supports the above examples, which builds on my
 http://www.iridescence.no/Posts/Implementing-an-AOP-Framework-Part-2.aspx[previously posted AOP framework], and I’ll
 post the source code for that soon. If you want to dig deeper right now (and don’t mind
-a bit of Java), then I suggest you head over to the Qi4j website and poke about there.
+a bit of Java), then I suggest you head over to the Zest™ website and poke about there.
 http://rickardoberg.wordpress.com/[Richard Öbergs blog] also provides great insight.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72a43f3c/tutorials/introduction/src/docs/whats-an-object.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/src/docs/whats-an-object.txt b/tutorials/introduction/src/docs/whats-an-object.txt
index a3a7e98..08009e0 100644
--- a/tutorials/introduction/src/docs/whats-an-object.txt
+++ b/tutorials/introduction/src/docs/whats-an-object.txt
@@ -47,7 +47,7 @@ is the OBSERVER of the object, meaning, the algorithm, that gets to decide what
 
 This is the same in real life. I don't get to decide how I communicate with you. I have to use english, and I have to
 use email, and I have to send it to a specific mailing list. It is the algorithm of the interaction between us, the
-Qi4j dev mailing list, that has set these rules, not *I* as a participant in this interaction. The same should,
+Zest� dev mailing list, that has set these rules, not *I* as a participant in this interaction. The same should,
 obviously, be the case for objects.
 
 So, with the understanding that algorithms should define roles for collaborating objects, and objects should then
@@ -63,7 +63,7 @@ This "solution", which is caused by this fundamental flaw in "class oriented pro
 causes a number of other problems, such as the "self schizophrenia" problem, whereby there is no way to tell where the
 object really is. There is no "this" pointer that has any relevant meaning.
 
-The Composite pattern, as implemented in COP and Qi4j, gets around this by simply saying that the composite, as a
+The Composite pattern, as implemented in COP and Zest�, gets around this by simply saying that the composite, as a
 whole, is an object. Tada, we now have a "this" pointer, and a coherent way to deal with the object graph as though it
 was a single object. We are now able to get back to the strengths of the procedural approach, which allows the
 implementer of the algorithm to define the roles needed for the algorithm. The roles can either be specific to an
@@ -77,7 +77,7 @@ necessary to read composite code when trying to understand algorithms. The assum
 more algorithms than composites, therefore it has to be easy to ready algorithms, and only when necessary dive down into
 composite code.
 
-When talking about Composites as Objects in Qi4j it is most relevant to look at Entities, since these represent physical
+When talking about Composites as Objects in Zest� it is most relevant to look at Entities, since these represent physical
 objects in a model, rather than algorithms or services, or other non-instance-oriented things.
 
 If Entities should implement roles, via mixins, in order to interact with each other through algorithms, then the
@@ -134,7 +134,7 @@ code and read it. If we have read the mixin code once, and the same mixin is reu
 it easier for us to understand it the next time we see it being used in another algorithm.
 
 To summarize thus far, we have looked at why OOP so far has not worked out, why this is the case, and how COP deals
-with it, and how we can implement a better solution of Entities using Qi4j. All is well!
+with it, and how we can implement a better solution of Entities using Zest�. All is well!
 
 The next step is to start using these Entities in algorithms. Algorithms are usually stateless, or at least they don't
 have any state that survives the execution of the algorithm. There is input, some calculation, and then output. In
@@ -189,15 +189,15 @@ The interaction method "delegate" is testable, both with mocks of the input, and
 roles. The implementations are also testable, and if the same mixin is used over and over for the implementation, then
 only one set of tests is needed for each role interface.
 
-To summarize we have in COP/Qi4j a way to get the best from procedural and object-oriented programming. As we have seen
+To summarize we have in COP/Zest� a way to get the best from procedural and object-oriented programming. As we have seen
 the functionality falls into three categories, the entities implementing objects, the services implementing
 interactions, and the user interface implementing the context. This also maps well to the ideas of ModelViewController,
 which in turn maps well to the new ideas from Mr Reenskaug (inventor of MVC) called DCI: Data-Context-Interaction. As a
-side-effect of this discussion we have therefore also seen how COP/Qi4j can be used to implement DCI, which is an
+side-effect of this discussion we have therefore also seen how COP/Zest� can be used to implement DCI, which is an
 important next step in understanding objects and their interactions, the fundamentals of which (I believe) are captured
 on this page.
 
 That's it. Well done if you've read this far :-)
 
 Comments and thoughts to qi4j-dev forum at Google Groups on this are highly appreciated. This is very very important topics,
-and crucial to understanding/explaining why COP/Qi4j is so great! :-)
+and crucial to understanding/explaining why COP/Zest� is so great! :-)


[04/11] zest-qi4j git commit: ZEST-40 README & NOTICE properly UTF-8 encoded

Posted by ni...@apache.org.
ZEST-40 README & NOTICE properly UTF-8 encoded


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/60fed40b
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/60fed40b
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/60fed40b

Branch: refs/heads/develop
Commit: 60fed40bfdf5f8e72a73cedfdb1a5163563c39e4
Parents: 72a43f3
Author: Paul Merlin <pa...@apache.org>
Authored: Tue Jul 7 11:33:19 2015 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Tue Jul 7 11:33:19 2015 +0200

----------------------------------------------------------------------
 NOTICE.txt              |  2 +-
 README.txt              | 22 +++++++++++-----------
 src/bin-dist/NOTICE.txt |  2 +-
 src/bin-dist/README.txt | 18 +++++++++---------
 4 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/60fed40b/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index fee2893..abdd654 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,4 +1,4 @@
-Apache Zest� (Java Edition) SDK
+Apache Zest™ (Java Edition) SDK
 Copyright 2015 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/60fed40b/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index 084b39d..b29fa2d 100644
--- a/README.txt
+++ b/README.txt
@@ -3,12 +3,12 @@ Welcome to the world of Apache Zest
    - Composite Oriented Programming on the Java platform.
 
 
-This Apache Zest� Source Distribution contains everything you need to
-create Zest� applications.
+This Apache Zest™ Source Distribution contains everything you need to
+create Zest™ applications.
 
 
-Zest� started in 2007, and is still in heavy development under the umbrella of
-the Apache Zest� project at the Apache Software Foundation. We would like
+Zest™ started in 2007, and is still in heavy development under the umbrella of
+the Apache Zest™ project at the Apache Software Foundation. We would like
 developers around the world to participate in the advancement of this
 cool, new and challenging technology. We are especially interested in
 people willing to help improve the SDK, samples, tutorials, documentation
@@ -19,20 +19,20 @@ Please see https://zest.apache.org for more information.
 
 Licensing
 ---------
-All Zest� code is licensed under an Apache License.
+All Zest™ code is licensed under an Apache License.
 
 Third-Party Dependencies may be licensed under other terms. The only
 required dependencies are SLF4J (MIT Licence), ASM (BSD Licence) and
 Joda-Time (Apache Licence).
 
-Finally, Zest� TestSupport depends on JUnit 4.x and its dependencies, which
+Finally, Zest™ TestSupport depends on JUnit 4.x and its dependencies, which
 is also not included in the SDK itself, as it is present among most Java
 developers.
 
 
 Dependencies not included
 -------------------------
-The source distribution contains Zest� sources only to keep the download
+The source distribution contains Zest™ sources only to keep the download
 size small. The Gradle build automatically downloads needed dependencies.
 If you need to go offline type `./gradlew gooffline` to ensure all needed
 dependencies are cached by Gradle.
@@ -43,15 +43,15 @@ https://zest.apache.org/qi4j/latest/howto-depend-on-qi4j.html
 
 Building Apache Zest
 ---------------------
-To build Zest� from sources you only need to have a valid Java JDK >= 7
+To build Zest™ from sources you only need to have a valid Java JDK >= 7
 installation.
 
-This document the Zest� build system and its usage:
+This document the Zest™ build system and its usage:
 https://zest.apache.org/qi4j/latest/build-system.html
 
 
-Thank you for trying out Apache Zest� and Composite Oriented Programming.
+Thank you for trying out Apache Zest™ and Composite Oriented Programming.
 
 
--- Apache Zest� Team
+-- Apache Zest™ Team
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/60fed40b/src/bin-dist/NOTICE.txt
----------------------------------------------------------------------
diff --git a/src/bin-dist/NOTICE.txt b/src/bin-dist/NOTICE.txt
index b16082a..9f7b1a6 100644
--- a/src/bin-dist/NOTICE.txt
+++ b/src/bin-dist/NOTICE.txt
@@ -1,4 +1,4 @@
-Apache Zest� (Java Edition) SDK Binary Distribution
+Apache Zest™ (Java Edition) SDK Binary Distribution
 Copyright 2015 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/60fed40b/src/bin-dist/README.txt
----------------------------------------------------------------------
diff --git a/src/bin-dist/README.txt b/src/bin-dist/README.txt
index b29c306..48d7cbd 100644
--- a/src/bin-dist/README.txt
+++ b/src/bin-dist/README.txt
@@ -3,11 +3,11 @@ Welcome to the world of Apache Zest
    - Composite Oriented Programming on the Java platform.
 
 
-This Apache Zest� Binary Distribution contains everything you need to
-create Zest� applications.
+This Apache Zest™ Binary Distribution contains everything you need to
+create Zest™ applications.
 
 
-Zest� (then Zest�) started in 2007, and is still in heavy development
+Zest™ (then Zest™) started in 2007, and is still in heavy development
 at the Apache Software Foundation. We would like
 developers around the world to participate in the advancement of this
 cool, new and challenging technology. We are especially interested in
@@ -19,21 +19,21 @@ Please see https://zest.apache.org for more information.
 
 Licensing
 ---------
-All Apache Zest� code is licensed under an Apache License.
+All Apache Zest™ code is licensed under an Apache License.
 
 Third-Party Dependencies may be licensed under other terms. The only
 required dependencies are SLF4J (MIT Licence), ASM (BSD Licence) and
 Joda-Time (Apache Licence).
 
-Finally, Zest� TestSupport depends on JUnit 4.x and its dependencies, which
+Finally, Zest™ TestSupport depends on JUnit 4.x and its dependencies, which
 is also not included in the SDK itself, as it is present among most Java
 developers.
 
 
 Dependencies not included
 -------------------------
-The binary distributions contains Zest� artifacts only to keep the download
-size small. Each Zest� artifact comes with a file prefixed ..-runtime-deps.txt
+The binary distributions contains Zest™ artifacts only to keep the download
+size small. Each Zest™ artifact comes with a file prefixed ..-runtime-deps.txt
 that contains the list of its dependencies. Moreover, at the binary
 distribution's root, you'll find both Maven (go-offline.pom) and Gradle
 (go-offline.gradle) build files whoses sole purpose is to easily download all
@@ -43,8 +43,8 @@ If you prefer to use a dependency management system, go to:
 https://zest.apache.org/qi4j/latest/howto-depend-on-qi4j.html
 
 
-Thank you for trying out Apache Zest� and Composite Oriented Programming.
+Thank you for trying out Apache Zest™ and Composite Oriented Programming.
 
 
--- Apache Zest� Team
+-- Apache Zest™ Team
 


[11/11] zest-qi4j git commit: Merge remote-tracking branch 'origin/develop' into develop

Posted by ni...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/5618cbd5
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/5618cbd5
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/5618cbd5

Branch: refs/heads/develop
Commit: 5618cbd52f41c8ee7193d26ad61a8e6635f68e06
Parents: 88b203b 2868e9f
Author: Niclas Hedhman <he...@betfair.com>
Authored: Wed Jul 8 12:42:52 2015 +0300
Committer: Niclas Hedhman <he...@betfair.com>
Committed: Wed Jul 8 12:42:52 2015 +0300

----------------------------------------------------------------------
 manual/src/resources/images/logo-standard.png | Bin 11108 -> 20153 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------