polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [5/6] zest-qi4j git commit: ZEST-40, renaming all the Qi4j names to Zest in javadocs and other comments.
Date Wed, 08 Jul 2015 08:15:15 GMT
ZEST-40, renaming all the Qi4j names to Zest in javadocs and other comments.


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

Branch: refs/heads/develop
Commit: f4218ec03faa204a31ffbcb3cd1a6b524d04af40
Parents: f7e0991
Author: Niclas Hedhman <hedmann@betfair.com>
Authored: Wed Jul 8 11:13:16 2015 +0300
Committer: Niclas Hedhman <hedmann@betfair.com>
Committed: Wed Jul 8 11:13:16 2015 +0300

----------------------------------------------------------------------
 core/api/src/main/java/org/qi4j/api/Qi4j.java   |  2 +-
 .../org/qi4j/api/activation/Activation.java     |  2 +-
 .../qi4j/api/activation/ActivationEvent.java    |  2 +-
 .../api/association/AssociationWrapper.java     |  2 +-
 .../api/association/ManyAssociationWrapper.java |  2 +-
 .../association/NamedAssociationWrapper.java    |  2 +-
 .../java/org/qi4j/api/common/AppliesTo.java     |  2 +-
 .../org/qi4j/api/common/AppliesToFilter.java    |  6 +++---
 .../main/java/org/qi4j/api/common/Optional.java |  6 +++---
 .../java/org/qi4j/api/common/QualifiedName.java |  2 +-
 .../java/org/qi4j/api/common/Visibility.java    |  2 +-
 .../qi4j/api/configuration/Configuration.java   |  6 +++---
 .../java/org/qi4j/api/entity/Lifecycle.java     |  6 +++---
 .../org/qi4j/api/metrics/MetricsProvider.java   |  2 +-
 .../org/qi4j/api/property/PropertyWrapper.java  |  2 +-
 .../org/qi4j/api/query/QueryExpressions.java    |  2 +-
 .../java/org/qi4j/api/service/Availability.java |  2 +-
 .../org/qi4j/api/service/ServiceFinder.java     |  2 +-
 .../org/qi4j/api/structure/Application.java     |  2 +-
 .../api/structure/ApplicationDescriptor.java    |  2 +-
 .../main/java/org/qi4j/api/structure/Layer.java |  2 +-
 .../unitofwork/EntityTypeNotFoundException.java |  2 +-
 .../activation/PassivationExceptionTest.java    |  4 ++--
 .../bootstrap/ApplicationAssemblyFactory.java   |  2 +-
 .../main/java/org/qi4j/bootstrap/Assembler.java |  2 +-
 .../org/qi4j/bootstrap/BindingException.java    |  2 +-
 .../java/org/qi4j/bootstrap/Energy4Java.java    |  4 ++--
 .../org/qi4j/bootstrap/InjectionException.java  |  2 +-
 .../bootstrap/InvalidInjectionException.java    |  2 +-
 .../java/org/qi4j/bootstrap/Qi4jRuntime.java    |  2 +-
 .../java/org/qi4j/bootstrap/RuntimeFactory.java |  8 ++++----
 .../org/qi4j/bootstrap/ServiceDeclaration.java  |  2 +-
 .../org/qi4j/bootstrap/SingletonAssembler.java  |  2 +-
 .../layered/LayeredApplicationAssembler.java    |  8 ++++----
 .../qi4j/bootstrap/DocumentationSupport.java    |  2 +-
 .../builder/ApplicationBuilderTest.java         |  8 ++++----
 .../java/org/qi4j/runtime/Qi4jRuntimeImpl.java  |  5 +----
 .../runtime/activation/ActivatorsInstance.java  |  2 +-
 .../runtime/bootstrap/ModuleAssemblyImpl.java   |  2 +-
 .../qi4j/runtime/composite/CompactLevel.java    |  4 ++--
 .../runtime/composite/FragmentClassLoader.java  |  4 ++--
 .../composite/FragmentInvocationHandler.java    |  2 +-
 .../runtime/composite/TransientClassLoader.java |  2 +-
 .../org/qi4j/runtime/entity/EntityModel.java    |  2 +-
 .../runtime/structure/ApplicationInstance.java  |  2 +-
 .../qi4j/runtime/structure/LayerInstance.java   |  2 +-
 .../qi4j/runtime/structure/ModuleInstance.java  |  2 +-
 .../runtime/structure/ModuleUnitOfWork.java     |  2 +-
 .../unitofwork/EntityBuilderInstance.java       |  2 +-
 .../injection/StructureInjectionTest.java       |  4 ++--
 .../spi/src/main/java/org/qi4j/spi/Qi4jSPI.java |  9 +--------
 .../main/java/org/qi4j/spi/cache/CachePool.java |  4 ++--
 .../orgjson/OrgJsonValueSerialization.java      |  2 +-
 .../org/qi4j/test/AbstractQi4jBaseTest.java     |  2 +-
 .../org/qi4j/test/AbstractQi4jScenarioTest.java |  4 ++--
 ...AbstractValueCompositeSerializationTest.java |  2 +-
 .../qi4j/cache/ehcache/EhCachePoolMixin.java    |  2 +-
 .../riak/RiakHttpMapEntityStoreTest.java        |  2 +-
 .../riak/RiakProtobufMapEntityStoreTest.java    |  2 +-
 .../solr/internal/SingleTokenTokenizer.java     |  1 +
 .../solr/internal/SolrEntityIndexerMixin.java   |  4 +++-
 .../index/sql/internal/SQLEntityFinder.java     |  4 ++--
 .../qi4j/index/sql/support/api/SQLQuerying.java | 12 ++++++------
 .../sql/support/common/RebuildingStrategy.java  |  2 +-
 .../support/skeletons/AbstractSQLIndexing.java  |  3 +--
 .../reindexer/internal/ReindexerMixin.java      |  2 +-
 .../library/alarm/AlarmHistoryImplTest.java     |  2 +-
 .../conversion/values/ValueToEntityMixin.java   |  2 +-
 .../factory/DomainEventFactoryService.java      |  2 +-
 .../fileconfig/FileConfigurationService.java    |  2 +-
 .../library/jmx/ApplicationManagerService.java  |  8 ++++----
 .../java/org/qi4j/library/jmx/Qi4jMBeans.java   |  4 ++--
 .../debug/service/DebugOnConsoleSideEffect.java |  2 +-
 .../debug/service/DebuggingServiceMixin.java    |  2 +-
 .../log/service/LoggingServiceMixin.java        |  2 +-
 .../qi4j/library/osgi/OSGiServiceExporter.java  |  2 +-
 .../qi4j/library/osgi/OSGiServiceImporter.java  |  2 +-
 .../java/org/qi4j/library/rdf/Qi4jEntity.java   |  2 +-
 .../org/qi4j/library/rdf/Qi4jEntityType.java    |  2 +-
 .../main/java/org/qi4j/library/rdf/Qi4jRdf.java |  2 +-
 .../qi4j/library/rest/client/RssReaderTest.java |  2 +-
 .../library/rest/admin/Qi4jServerServlet.java   |  2 +-
 .../library/servlet/Qi4jServletSupport.java     |  2 +-
 .../lifecycle/AbstractQi4jServletBootstrap.java |  8 ++++----
 .../bootstrap/Qi4jApplicationBootstrap.java     |  4 ++--
 .../Qi4jBootstrapBeanDefinitionParser.java      |  2 +-
 .../internal/service/ServiceFactoryBean.java    |  2 +-
 .../importer/SpringImporterAssembler.java       |  4 ++--
 .../DataSourceConfigurationManagerService.java  |  2 +-
 .../org/qi4j/manual/recipes/assemble/Main.java  |  4 ++--
 .../bootstrap/DCISampleApplication_a.java       |  2 +-
 .../sample_a/bootstrap/assembly/Assembler.java  |  8 ++++----
 .../communication/query/BookingQueries.java     |  2 +-
 .../infrastructure/WicketQi4jApplication.java   | 20 ++++++++++----------
 .../infrastructure/model/QueryModel.java        |  4 ++--
 .../infrastructure/model/ReadOnlyModel.java     |  2 +-
 .../bootstrap/DCISampleApplication_b.java       |  2 +-
 .../sample_b/bootstrap/assembly/Assembler.java  |  6 +++---
 .../communication/query/BookingQueries.java     |  2 +-
 .../communication/query/dto/CargoDTO.java       |  2 +-
 .../query/dto/HandlingEventDTO.java             |  2 +-
 .../infrastructure/WicketQi4jApplication.java   | 20 ++++++++++----------
 .../sample_b/infrastructure/conversion/DTO.java |  2 +-
 .../infrastructure/model/EntityModel.java       |  4 ++--
 .../infrastructure/model/QueryModel.java        |  4 ++--
 .../infrastructure/model/ReadOnlyModel.java     |  2 +-
 .../qi4j/sample/rental/web/QuikitServlet.java   |  4 ++--
 .../java/org/qi4j/sample/sqlsupport/Main.java   |  2 +-
 .../CompositeCreationPerformanceTest.java       |  2 +-
 .../plugin/idea/common/facet/Qi4jFacetType.java |  2 +-
 .../common/facet/ui/Qi4jFacetEditorTab.java     |  2 +-
 .../main/java/org/qi4j/tools/shell/Main.java    |  2 +-
 .../composites/tutorial2/HelloWorldState.java   |  2 +-
 .../composites/tutorial3/HelloWorldMixin.java   |  2 +-
 .../composites/tutorial3/HelloWorldState.java   |  2 +-
 .../composites/tutorial4/HelloWorldState.java   |  2 +-
 .../tutorial8/HelloWorldBehaviourMixin.java     |  2 +-
 117 files changed, 186 insertions(+), 194 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/Qi4j.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/Qi4j.java b/core/api/src/main/java/org/qi4j/api/Qi4j.java
index 0b40c4a..cfd8a89 100644
--- a/core/api/src/main/java/org/qi4j/api/Qi4j.java
+++ b/core/api/src/main/java/org/qi4j/api/Qi4j.java
@@ -34,7 +34,7 @@ import org.qi4j.api.value.ValueDescriptor;
 import org.qi4j.functional.Function;
 
 /**
- * Encapsulation of the Qi4j API.
+ * Encapsulation of the Zest API.
  */
 public interface Qi4j
 {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/activation/Activation.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/activation/Activation.java b/core/api/src/main/java/org/qi4j/api/activation/Activation.java
index 5b413dc..32f26e4 100644
--- a/core/api/src/main/java/org/qi4j/api/activation/Activation.java
+++ b/core/api/src/main/java/org/qi4j/api/activation/Activation.java
@@ -18,7 +18,7 @@ package org.qi4j.api.activation;
 /**
  * Interface used by Structure elements and Services that can be activated and passivated.
  * <p>Application and Layer expose this interface so you can activate and passivate them.</p>
- * <p>Module and ServiceComposite activation/passivation is handled by the Qi4j runtime.</p>
+ * <p>Module and ServiceComposite activation/passivation is handled by the Zest runtime.</p>
  */
 public interface Activation
 {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/activation/ActivationEvent.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/activation/ActivationEvent.java b/core/api/src/main/java/org/qi4j/api/activation/ActivationEvent.java
index e3fdf70..1852251 100644
--- a/core/api/src/main/java/org/qi4j/api/activation/ActivationEvent.java
+++ b/core/api/src/main/java/org/qi4j/api/activation/ActivationEvent.java
@@ -15,7 +15,7 @@
 package org.qi4j.api.activation;
 
 /**
- * ActivationEvents are fired during activation and passivation of instances in Qi4j.
+ * ActivationEvents are fired during activation and passivation of instances in Zest.
  */
 public final class ActivationEvent
 {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/association/AssociationWrapper.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/association/AssociationWrapper.java b/core/api/src/main/java/org/qi4j/api/association/AssociationWrapper.java
index dac006f..68777b3 100644
--- a/core/api/src/main/java/org/qi4j/api/association/AssociationWrapper.java
+++ b/core/api/src/main/java/org/qi4j/api/association/AssociationWrapper.java
@@ -22,7 +22,7 @@ import org.qi4j.api.entity.EntityReference;
 
 /**
  * If you want to catch getting and setting association, then create a GenericConcern
- * that wraps the Qi4j-supplied Association instance with AssociationWrappers. Override
+ * that wraps the Zest-supplied Association instance with AssociationWrappers. Override
  * get() and/or set() to perform your custom code.
  */
 public class AssociationWrapper

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/association/ManyAssociationWrapper.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/association/ManyAssociationWrapper.java b/core/api/src/main/java/org/qi4j/api/association/ManyAssociationWrapper.java
index c10203a..aee7804 100644
--- a/core/api/src/main/java/org/qi4j/api/association/ManyAssociationWrapper.java
+++ b/core/api/src/main/java/org/qi4j/api/association/ManyAssociationWrapper.java
@@ -25,7 +25,7 @@ import org.qi4j.api.entity.EntityReference;
 
 /**
  * If you want to catch calls to ManyAssociations, then create a GenericConcern
- * that wraps the Qi4j-supplied ManyAssociation instance with ManyAssociationWrappers. Override
+ * that wraps the Zest-supplied ManyAssociation instance with ManyAssociationWrappers. Override
  * methods to perform your custom code.
  */
 public class ManyAssociationWrapper

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/association/NamedAssociationWrapper.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/association/NamedAssociationWrapper.java b/core/api/src/main/java/org/qi4j/api/association/NamedAssociationWrapper.java
index 5e243ef..814644a 100644
--- a/core/api/src/main/java/org/qi4j/api/association/NamedAssociationWrapper.java
+++ b/core/api/src/main/java/org/qi4j/api/association/NamedAssociationWrapper.java
@@ -24,7 +24,7 @@ import org.qi4j.api.entity.EntityReference;
 
 /**
  * If you want to catch calls to NamedAssociations, then create a GenericConcern
- * that wraps the Qi4j-supplied NamedAssociations instance with NamedAssociationsWrapper. Override
+ * that wraps the Zest-supplied NamedAssociations instance with NamedAssociationsWrapper. Override
  * methods to perform your custom code.
  */
 public class NamedAssociationWrapper

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/common/AppliesTo.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/common/AppliesTo.java b/core/api/src/main/java/org/qi4j/api/common/AppliesTo.java
index ccdff03..b23f204 100644
--- a/core/api/src/main/java/org/qi4j/api/common/AppliesTo.java
+++ b/core/api/src/main/java/org/qi4j/api/common/AppliesTo.java
@@ -38,7 +38,7 @@ import java.lang.annotation.Target;
  * </p>
  * <pre><code>
  *
- * &#64;AppliesTo( Sessional.class )   // Tells Qi4j to apply this concern on methods with &#64;Sessional annotation
+ * &#64;AppliesTo( Sessional.class )   // Tells Zest to apply this concern on methods with &#64;Sessional annotation
  * public class SessionConcern extends GenericConcern
  * {
  *     public Object invoke( Object proxy, Method method, Object[] args )

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/common/AppliesToFilter.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/common/AppliesToFilter.java b/core/api/src/main/java/org/qi4j/api/common/AppliesToFilter.java
index 2a07c00..f356cf4 100644
--- a/core/api/src/main/java/org/qi4j/api/common/AppliesToFilter.java
+++ b/core/api/src/main/java/org/qi4j/api/common/AppliesToFilter.java
@@ -19,9 +19,9 @@ import java.lang.reflect.Method;
 /**
  * Implementations of this interface can be specified in the &#64;AppliesTo.
  * <p>
- * AppliesTo filters are one of the driving technologies in Qi4j. They allow you to apply fragments (Mixins,
+ * AppliesTo filters are one of the driving technologies in Zest. They allow you to apply fragments (Mixins,
  * Concerns, SideEffects), often generic ones, depending on the context that they are evaluated under. This
- * mechanism is heavily used internally in Qi4j to achieve many other features.
+ * mechanism is heavily used internally in Zest to achieve many other features.
  * </p>
  * <p>
  * The starting point is the basic use of AppliesToFilter, where the &#64;AppliesTo annotation is given an
@@ -57,7 +57,7 @@ public interface AppliesToFilter
      * fragment.
      * <p>
      * There is no reason for user code to use this AppliesToFilter directly, and should be perceived as an
-     * internal class in Qi4j.
+     * internal class in Zest.
      * </p>
      */
     AppliesToFilter ALWAYS = new AppliesToFilter()

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/common/Optional.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/common/Optional.java b/core/api/src/main/java/org/qi4j/api/common/Optional.java
index 0a85b32..3a070c3 100644
--- a/core/api/src/main/java/org/qi4j/api/common/Optional.java
+++ b/core/api/src/main/java/org/qi4j/api/common/Optional.java
@@ -37,8 +37,8 @@ import java.lang.annotation.Target;
  * </li>
  * </ul>
  * <p>
- * Optionality is not the default in Qi4j, and if injections, property values and parameters in methods are not
- * non-null, the Qi4j runtime will throw an {@link org.qi4j.api.constraint.ConstraintViolationException}, indicating
+ * Optionality is not the default in Zest, and if injections, property values and parameters in methods are not
+ * non-null, the Zest runtime will throw an {@link org.qi4j.api.constraint.ConstraintViolationException}, indicating
  * which field/property/parameter in which composite and mixin the problem has been detected.
  * </p>
  * <p>
@@ -51,7 +51,7 @@ import java.lang.annotation.Target;
  *
  * &#64;Service
  * YourService other;   // If no YourService instance is declared and visible to this service injection point
- *                      // the Qi4j runtime will throw a ConstraintViolationException.
+ *                      // the Zest runtime will throw a ConstraintViolationException.
  *
  * </code></pre>
  */

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/common/QualifiedName.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/common/QualifiedName.java b/core/api/src/main/java/org/qi4j/api/common/QualifiedName.java
index cb66205..a869791 100644
--- a/core/api/src/main/java/org/qi4j/api/common/QualifiedName.java
+++ b/core/api/src/main/java/org/qi4j/api/common/QualifiedName.java
@@ -27,7 +27,7 @@ import org.qi4j.api.util.NullArgumentException;
  * </p>
  * <p>
  * <strong>NOTE: Unless you do very generic libraries, entity stores and other extensions that is deeply coupled into
- * the Qi4j runtime, it is very unlikely you will need to use this class directly.</strong>
+ * the Zest runtime, it is very unlikely you will need to use this class directly.</strong>
  * </p>
  * <p>
  * It is also important to notice that the QualifiedName needs to be long-term stable, as the names are written

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/common/Visibility.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/common/Visibility.java b/core/api/src/main/java/org/qi4j/api/common/Visibility.java
index a910a80..0f38f36 100644
--- a/core/api/src/main/java/org/qi4j/api/common/Visibility.java
+++ b/core/api/src/main/java/org/qi4j/api/common/Visibility.java
@@ -14,7 +14,7 @@
 package org.qi4j.api.common;
 
 /**
- * Visibility is a core concept in the Qi4j structure system. It defines the locale of composites and objects, i.e.
+ * Visibility is a core concept in the Zest structure system. It defines the locale of composites and objects, i.e.
  * how far they can be 'seen' and therefor be used.
  * <p>
  * When a Composite or Object is declared in the assembly phase, and no visibility is set, only other

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/configuration/Configuration.java b/core/api/src/main/java/org/qi4j/api/configuration/Configuration.java
index 6207ce2..a9154ae 100644
--- a/core/api/src/main/java/org/qi4j/api/configuration/Configuration.java
+++ b/core/api/src/main/java/org/qi4j/api/configuration/Configuration.java
@@ -62,7 +62,7 @@ import static org.qi4j.functional.Iterables.first;
  * a request.
  * </p>
  * <p>
- * The Configuration will be automatically refreshed when the Service is activated by the Qi4j runtime.
+ * The Configuration will be automatically refreshed when the Service is activated by the Zest runtime.
  * Any refreshes at other points will have to be done manually or triggered through some other
  * mechanism.
  * </p>
@@ -116,7 +116,7 @@ public interface Configuration<T>
     /**
      * Retrieves the user configuration instance managed by this Configuration.
      * <p>
-     * Even if the user configuration is initialized from properties file, the consistency rules of Qi4j composites
+     * Even if the user configuration is initialized from properties file, the consistency rules of Zest composites
      * still applies. If the the properties file is missing a value, then the initialization will fail with a
      * RuntimeException. If Constraints has been defined, those will need to be satisfied as well. The user
      * configuration instance returned will fulfill the constraints and consistency normal to all composites, and
@@ -142,7 +142,7 @@ public interface Configuration<T>
     /**
      * Implementation of Configuration.
      * <p>
-     * This is effectively an internal class in Qi4j and should never be used directly by user code.
+     * This is effectively an internal class in Zest and should never be used directly by user code.
      * </p>
      *
      * @param <T>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/entity/Lifecycle.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/entity/Lifecycle.java b/core/api/src/main/java/org/qi4j/api/entity/Lifecycle.java
index 650f456..3eabd78 100644
--- a/core/api/src/main/java/org/qi4j/api/entity/Lifecycle.java
+++ b/core/api/src/main/java/org/qi4j/api/entity/Lifecycle.java
@@ -17,7 +17,7 @@ package org.qi4j.api.entity;
 /**
  * Lifecycle interface for all Composites.
  * <p>
- * This Lifecycle interface is a built-in feature of the Qi4j runtime, similar to the Initializable interface.
+ * This Lifecycle interface is a built-in feature of the Zest runtime, similar to the Initializable interface.
  * Any Mixin that implements this interface AND is part of an EntityComposite will have these two methods called
  * upon creation/removal of the EntityComposite instance to/from the EntityStore. Meaning, the create method is called
  * only when the identifiable EntityComposite is created the first time, and not when it is read from its persisted
@@ -64,7 +64,7 @@ public interface Lifecycle
     /**
      * Creation callback method.
      * <p>
-     * Called by the Qi4j runtime before the newInstance of the entity completes, before the constraints are checked,
+     * Called by the Zest runtime before the newInstance of the entity completes, before the constraints are checked,
      * allowing for additional initialization.
      * </p>
      * @throws LifecycleException if the entity could not be created
@@ -75,7 +75,7 @@ public interface Lifecycle
     /**
      * Removal callback method.
      * <p>
-     * Called by the Qi4j runtime before the entity is removed from the system, allowing
+     * Called by the Zest runtime before the entity is removed from the system, allowing
      * for clean-up operations.
      * </p>
      * @throws LifecycleException if the entity could not be removed

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/metrics/MetricsProvider.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/metrics/MetricsProvider.java b/core/api/src/main/java/org/qi4j/api/metrics/MetricsProvider.java
index d7cd063..c11996b 100644
--- a/core/api/src/main/java/org/qi4j/api/metrics/MetricsProvider.java
+++ b/core/api/src/main/java/org/qi4j/api/metrics/MetricsProvider.java
@@ -19,7 +19,7 @@ package org.qi4j.api.metrics;
 /**
  * Metrics Provider SPI.
  * <p>
- * The Qi4j Runtime will automatically ook for a service that implements the MetricsProvider interdace
+ * The Zest Runtime will automatically ook for a service that implements the MetricsProvider interdace
  * and use it for internal Runtime metrics, such as the UnitOfWork measuring the time from creation to close.
  * </p>
  * <p>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/property/PropertyWrapper.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/property/PropertyWrapper.java b/core/api/src/main/java/org/qi4j/api/property/PropertyWrapper.java
index 7f56571..dc2259d 100644
--- a/core/api/src/main/java/org/qi4j/api/property/PropertyWrapper.java
+++ b/core/api/src/main/java/org/qi4j/api/property/PropertyWrapper.java
@@ -20,7 +20,7 @@ package org.qi4j.api.property;
 
 /**
  * If you want to catch getting and setting properties, then create a GenericConcern
- * that wraps the Qi4j-supplied Property instance with PropertyWrappers. Override
+ * that wraps the Zest-supplied Property instance with PropertyWrappers. Override
  * get() and/or set() to perform your custom code.
  */
 public class PropertyWrapper

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/query/QueryExpressions.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/query/QueryExpressions.java b/core/api/src/main/java/org/qi4j/api/query/QueryExpressions.java
index 75276a0..45501ee 100644
--- a/core/api/src/main/java/org/qi4j/api/query/QueryExpressions.java
+++ b/core/api/src/main/java/org/qi4j/api/query/QueryExpressions.java
@@ -85,7 +85,7 @@ public final class QueryExpressions
         }
         catch( NoSuchMethodException e )
         {
-            throw new InternalError( "Qi4j Core API codebase is corrupted. Contact Qi4j team: QueryExpressions" );
+            throw new InternalError( "Zest Core API codebase is corrupted. Contact Zest team: QueryExpressions" );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/service/Availability.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/service/Availability.java b/core/api/src/main/java/org/qi4j/api/service/Availability.java
index 8125ebc..3905a1d 100644
--- a/core/api/src/main/java/org/qi4j/api/service/Availability.java
+++ b/core/api/src/main/java/org/qi4j/api/service/Availability.java
@@ -15,7 +15,7 @@
 package org.qi4j.api.service;
 
 /**
- * Services can implement this interface in order to allow Qi4j to ask
+ * Services can implement this interface in order to allow Zest to ask
  * it whether it is currently available for use or not. This is accessed
  * by clients through the ServiceReference of the service. Services that do not
  * implement this are always considered to be available.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/service/ServiceFinder.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/service/ServiceFinder.java b/core/api/src/main/java/org/qi4j/api/service/ServiceFinder.java
index efaaff9..3ffb213 100644
--- a/core/api/src/main/java/org/qi4j/api/service/ServiceFinder.java
+++ b/core/api/src/main/java/org/qi4j/api/service/ServiceFinder.java
@@ -30,7 +30,7 @@ import java.lang.reflect.Type;
  * should be included</li>
  * </ol>
  * <p>
- * Both native Qi4j services and imported services are considered, with preference to native services.
+ * Both native Zest services and imported services are considered, with preference to native services.
  * </p>
  */
 public interface ServiceFinder

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/structure/Application.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/structure/Application.java b/core/api/src/main/java/org/qi4j/api/structure/Application.java
index 0e57fff..6023942 100644
--- a/core/api/src/main/java/org/qi4j/api/structure/Application.java
+++ b/core/api/src/main/java/org/qi4j/api/structure/Application.java
@@ -18,7 +18,7 @@ import org.qi4j.api.activation.Activation;
 import org.qi4j.api.activation.ActivationEventListenerRegistration;
 
 /**
- * The Application represents a whole Qi4j application.
+ * The Application represents a whole Zest application.
  */
 public interface Application
     extends ActivationEventListenerRegistration, Activation, MetaInfoHolder

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/structure/ApplicationDescriptor.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/structure/ApplicationDescriptor.java b/core/api/src/main/java/org/qi4j/api/structure/ApplicationDescriptor.java
index 42e7b61..b33f134 100644
--- a/core/api/src/main/java/org/qi4j/api/structure/ApplicationDescriptor.java
+++ b/core/api/src/main/java/org/qi4j/api/structure/ApplicationDescriptor.java
@@ -24,7 +24,7 @@ public interface ApplicationDescriptor
 {
     /**
      * Create a new instance of the Application.
-     * @param runtime Qi4j Runtime
+     * @param runtime Zest Runtime
      * @param importedServiceInstances Imported Services instances
      * @return a new instance of the Application.
      */

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/structure/Layer.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/structure/Layer.java b/core/api/src/main/java/org/qi4j/api/structure/Layer.java
index fbde8c4..4268764 100644
--- a/core/api/src/main/java/org/qi4j/api/structure/Layer.java
+++ b/core/api/src/main/java/org/qi4j/api/structure/Layer.java
@@ -19,7 +19,7 @@ import org.qi4j.api.activation.Activation;
 import org.qi4j.api.activation.ActivationEventListenerRegistration;
 
 /**
- * The Layer represents a single layer in a Qi4j application.
+ * The Layer represents a single layer in a Zest application.
  */
 public interface Layer
     extends ActivationEventListenerRegistration, Activation, MetaInfoHolder

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/main/java/org/qi4j/api/unitofwork/EntityTypeNotFoundException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/unitofwork/EntityTypeNotFoundException.java b/core/api/src/main/java/org/qi4j/api/unitofwork/EntityTypeNotFoundException.java
index 5f51e65..39765fd 100644
--- a/core/api/src/main/java/org/qi4j/api/unitofwork/EntityTypeNotFoundException.java
+++ b/core/api/src/main/java/org/qi4j/api/unitofwork/EntityTypeNotFoundException.java
@@ -20,7 +20,7 @@ import org.qi4j.functional.Function;
 import static org.qi4j.functional.Iterables.fold;
 
 /**
- * Qi4j exception to be thrown in case that an entity composite
+ * Zest exception to be thrown in case that an entity composite
  * was not found during a lookup call.
  */
 public class EntityTypeNotFoundException

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/api/src/test/java/org/qi4j/api/activation/PassivationExceptionTest.java
----------------------------------------------------------------------
diff --git a/core/api/src/test/java/org/qi4j/api/activation/PassivationExceptionTest.java b/core/api/src/test/java/org/qi4j/api/activation/PassivationExceptionTest.java
index 46ae026..348e32d 100644
--- a/core/api/src/test/java/org/qi4j/api/activation/PassivationExceptionTest.java
+++ b/core/api/src/test/java/org/qi4j/api/activation/PassivationExceptionTest.java
@@ -113,7 +113,7 @@ public class PassivationExceptionTest
         {
             Module moduleA = app.findModule( "Layer 1", "Module A" );
             TestService service = moduleA.findService( TestService.class ).get();
-            assertThat( service.hello(), equalTo( "Hello Qi4j!" ) );
+            assertThat( service.hello(), equalTo( "Hello Zest!" ) );
         }
         finally
         {
@@ -158,7 +158,7 @@ public class PassivationExceptionTest
             public String hello()
             {
                 module.name();
-                return "Hello Qi4j!";
+                return "Hello Zest!";
             }
         }
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/main/java/org/qi4j/bootstrap/ApplicationAssemblyFactory.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/qi4j/bootstrap/ApplicationAssemblyFactory.java b/core/bootstrap/src/main/java/org/qi4j/bootstrap/ApplicationAssemblyFactory.java
index 977627c..5d86bf9 100644
--- a/core/bootstrap/src/main/java/org/qi4j/bootstrap/ApplicationAssemblyFactory.java
+++ b/core/bootstrap/src/main/java/org/qi4j/bootstrap/ApplicationAssemblyFactory.java
@@ -19,7 +19,7 @@
 package org.qi4j.bootstrap;
 
 /**
- * Factory for creating new Qi4j application assemblies. Typically
+ * Factory for creating new Zest application assemblies. Typically
  * you will implement one or more Assemblers, wrap them in an ApplicationAssembler,
  * which then uses this factory to assemble and create applications.
  */

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/main/java/org/qi4j/bootstrap/Assembler.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/qi4j/bootstrap/Assembler.java b/core/bootstrap/src/main/java/org/qi4j/bootstrap/Assembler.java
index 5914a87..b2ffe34 100644
--- a/core/bootstrap/src/main/java/org/qi4j/bootstrap/Assembler.java
+++ b/core/bootstrap/src/main/java/org/qi4j/bootstrap/Assembler.java
@@ -18,7 +18,7 @@ package org.qi4j.bootstrap;
  * ModuleAssemblies are configured by Assemblers. This
  * is the interface you would implement in order to provide
  * all configuration and additional metainfo that is needed
- * to instantiate a Qi4j application.
+ * to instantiate a Zest application.
  */
 public interface Assembler
 {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/main/java/org/qi4j/bootstrap/BindingException.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/qi4j/bootstrap/BindingException.java b/core/bootstrap/src/main/java/org/qi4j/bootstrap/BindingException.java
index c3d9004..dbadbfd 100644
--- a/core/bootstrap/src/main/java/org/qi4j/bootstrap/BindingException.java
+++ b/core/bootstrap/src/main/java/org/qi4j/bootstrap/BindingException.java
@@ -15,7 +15,7 @@
 package org.qi4j.bootstrap;
 
 /**
- * Thrown by the Qi4j runtime if a dependency can not be bound.
+ * Thrown by the Zest runtime if a dependency can not be bound.
  */
 public class BindingException
     extends Exception

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/main/java/org/qi4j/bootstrap/Energy4Java.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/qi4j/bootstrap/Energy4Java.java b/core/bootstrap/src/main/java/org/qi4j/bootstrap/Energy4Java.java
index 71dd525..d9cdc18 100644
--- a/core/bootstrap/src/main/java/org/qi4j/bootstrap/Energy4Java.java
+++ b/core/bootstrap/src/main/java/org/qi4j/bootstrap/Energy4Java.java
@@ -24,7 +24,7 @@ import org.qi4j.api.structure.ApplicationDescriptor;
 import org.qi4j.spi.Qi4jSPI;
 
 /**
- * Main bootstrap class for starting Qi4j and creating new applications.
+ * Main bootstrap class for starting Zest and creating new applications.
  * <p>
  * Instantiate this and call one of the factory methods to get started.
  * </p>
@@ -51,7 +51,7 @@ public final class Energy4Java
     {
         if( runtime == null )
         {
-            throw new BootstrapException( "Can not create Qi4j without a Qi4j Runtime." );
+            throw new BootstrapException( "Can not create Zest without a Zest Runtime." );
         }
         this.runtime = runtime;
     }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/main/java/org/qi4j/bootstrap/InjectionException.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/qi4j/bootstrap/InjectionException.java b/core/bootstrap/src/main/java/org/qi4j/bootstrap/InjectionException.java
index a2ed3b6..bb0d782 100644
--- a/core/bootstrap/src/main/java/org/qi4j/bootstrap/InjectionException.java
+++ b/core/bootstrap/src/main/java/org/qi4j/bootstrap/InjectionException.java
@@ -15,7 +15,7 @@
 package org.qi4j.bootstrap;
 
 /**
- * Thrown by the Qi4j runtime if a dependency can not be injected.
+ * Thrown by the Zest runtime if a dependency can not be injected.
  */
 public class InjectionException
     extends RuntimeException

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/main/java/org/qi4j/bootstrap/InvalidInjectionException.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/qi4j/bootstrap/InvalidInjectionException.java b/core/bootstrap/src/main/java/org/qi4j/bootstrap/InvalidInjectionException.java
index 8a8dce8..d3f18d9 100644
--- a/core/bootstrap/src/main/java/org/qi4j/bootstrap/InvalidInjectionException.java
+++ b/core/bootstrap/src/main/java/org/qi4j/bootstrap/InvalidInjectionException.java
@@ -19,7 +19,7 @@
 package org.qi4j.bootstrap;
 
 /**
- * Thrown by the Qi4j runtime if a dependency injection declaration is invalid.
+ * Thrown by the Zest runtime if a dependency injection declaration is invalid.
  */
 public class InvalidInjectionException
     extends Exception

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/main/java/org/qi4j/bootstrap/Qi4jRuntime.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/qi4j/bootstrap/Qi4jRuntime.java b/core/bootstrap/src/main/java/org/qi4j/bootstrap/Qi4jRuntime.java
index fcf4d1c..76e6130 100644
--- a/core/bootstrap/src/main/java/org/qi4j/bootstrap/Qi4jRuntime.java
+++ b/core/bootstrap/src/main/java/org/qi4j/bootstrap/Qi4jRuntime.java
@@ -18,7 +18,7 @@ import org.qi4j.api.Qi4j;
 import org.qi4j.spi.Qi4jSPI;
 
 /**
- * This interface has to be implemented by Qi4j runtimes.
+ * This interface has to be implemented by Zest runtimes.
  */
 public interface Qi4jRuntime
 {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/main/java/org/qi4j/bootstrap/RuntimeFactory.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/qi4j/bootstrap/RuntimeFactory.java b/core/bootstrap/src/main/java/org/qi4j/bootstrap/RuntimeFactory.java
index fa19c21..b4efd24 100644
--- a/core/bootstrap/src/main/java/org/qi4j/bootstrap/RuntimeFactory.java
+++ b/core/bootstrap/src/main/java/org/qi4j/bootstrap/RuntimeFactory.java
@@ -19,14 +19,14 @@
 package org.qi4j.bootstrap;
 
 /**
- * Qi4j runtime factory.
+ * Zest runtime factory.
  */
 public interface RuntimeFactory
 {
     Qi4jRuntime createRuntime();
 
     /**
-     * Standalone application Qi4j runtime factory.
+     * Standalone application Zest runtime factory.
      */
     public final class StandaloneApplicationRuntimeFactory
         implements RuntimeFactory
@@ -42,11 +42,11 @@ public interface RuntimeFactory
             }
             catch( ClassNotFoundException e )
             {
-                System.err.println( "Qi4j Runtime jar is not present in the classpath." );
+                System.err.println( "Zest Runtime jar is not present in the classpath." );
             }
             catch( InstantiationException | IllegalAccessException e )
             {
-                System.err.println( "Invalid Qi4j Runtime class. If you are providing your own Qi4j Runtime, please " +
+                System.err.println( "Invalid Zest Runtime class. If you are providing your own Zest Runtime, please " +
                                     "contact qi4j-dev at Google Groups for assistance." );
             }
             return null;

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/main/java/org/qi4j/bootstrap/ServiceDeclaration.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/qi4j/bootstrap/ServiceDeclaration.java b/core/bootstrap/src/main/java/org/qi4j/bootstrap/ServiceDeclaration.java
index bdbdeea..c566c59 100644
--- a/core/bootstrap/src/main/java/org/qi4j/bootstrap/ServiceDeclaration.java
+++ b/core/bootstrap/src/main/java/org/qi4j/bootstrap/ServiceDeclaration.java
@@ -23,7 +23,7 @@ import org.qi4j.api.activation.Activator;
 import org.qi4j.api.common.Visibility;
 
 /**
- * Fluent API for declaring services hosted in Qi4j. Instances
+ * Fluent API for declaring services hosted in Zest. Instances
  * of this API are acquired by calling {@link ModuleAssembly#services(Class[])}.
  */
 public interface ServiceDeclaration

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/main/java/org/qi4j/bootstrap/SingletonAssembler.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/qi4j/bootstrap/SingletonAssembler.java b/core/bootstrap/src/main/java/org/qi4j/bootstrap/SingletonAssembler.java
index 255bd29..7d2542d 100644
--- a/core/bootstrap/src/main/java/org/qi4j/bootstrap/SingletonAssembler.java
+++ b/core/bootstrap/src/main/java/org/qi4j/bootstrap/SingletonAssembler.java
@@ -35,7 +35,7 @@ public abstract class SingletonAssembler
     private final Module moduleInstance;
 
     /**
-     * Creates a Qi4j Runtime instance containing one Layer with one Module.
+     * Creates a Zest Runtime instance containing one Layer with one Module.
      * The Layer will be named "Layer 1" and the Module will be named "Module 1". It is possible to add
      * additional layers and modules via the Assembler interface that must be implemented in the subclass of this
      * class.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/main/java/org/qi4j/bootstrap/layered/LayeredApplicationAssembler.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/qi4j/bootstrap/layered/LayeredApplicationAssembler.java b/core/bootstrap/src/main/java/org/qi4j/bootstrap/layered/LayeredApplicationAssembler.java
index 4c4cad7..b399711 100644
--- a/core/bootstrap/src/main/java/org/qi4j/bootstrap/layered/LayeredApplicationAssembler.java
+++ b/core/bootstrap/src/main/java/org/qi4j/bootstrap/layered/LayeredApplicationAssembler.java
@@ -62,16 +62,16 @@ public abstract class LayeredApplicationAssembler
     }
 
     /**
-     * This method is called from the constructor to instantiate the Qi4j application from the application model.
+     * This method is called from the constructor to instantiate the Zest application from the application model.
      *
      * <p>
      * The default implementation simply calls;
+     * </p>
      * <pre><code>
      *   application = model.newInstance( qi4j.spi() );
      * </code></pre>
-     * </p>
      *
-     * @param qi4j  The Qi4j runtime engine.
+     * @param qi4j  The Zest runtime engine.
      * @param model The application model descriptor.
      */
     protected void instantiateApplication( Energy4Java qi4j, ApplicationDescriptor model )
@@ -80,7 +80,7 @@ public abstract class LayeredApplicationAssembler
     }
 
     /**
-     * This method is called after the Application Model has been created, before the instantiation of the Qi4j
+     * This method is called after the Application Model has been created, before the instantiation of the Zest
      * application.
      *
      * <p>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java b/core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
index 6ac7ade..ae57305 100644
--- a/core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
+++ b/core/bootstrap/src/test/java/org/qi4j/bootstrap/DocumentationSupport.java
@@ -327,7 +327,7 @@ public class DocumentationSupport
         public static void main( String[] args )
                 throws Exception
         {
-            // Create a Qi4j Runtime
+            // Create a Zest Runtime
             qi4j = new Energy4Java();
             application = qi4j.newApplication( new ApplicationAssembler()
             {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/bootstrap/src/test/java/org/qi4j/bootstrap/builder/ApplicationBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/test/java/org/qi4j/bootstrap/builder/ApplicationBuilderTest.java b/core/bootstrap/src/test/java/org/qi4j/bootstrap/builder/ApplicationBuilderTest.java
index 2533f05..56f17f7 100644
--- a/core/bootstrap/src/test/java/org/qi4j/bootstrap/builder/ApplicationBuilderTest.java
+++ b/core/bootstrap/src/test/java/org/qi4j/bootstrap/builder/ApplicationBuilderTest.java
@@ -51,7 +51,7 @@ public class ApplicationBuilderTest
         Application application = builder.newApplication();
         Module module = application.findModule( "layer3", "test module" );
         TestService service = module.findService( TestService.class ).get();
-        assertThat( service.sayHello(), equalTo( "Hello Qi4j!" ) );
+        assertThat( service.sayHello(), equalTo( "Hello Zest!" ) );
     }
 
     @Test
@@ -62,7 +62,7 @@ public class ApplicationBuilderTest
         Application application = builder.newApplication();
         Module module = application.findModule( "layer3", "test module" );
         TestService service = module.findService( TestService.class ).get();
-        assertThat( service.sayHello(), equalTo( "Hello Qi4j!" ) );
+        assertThat( service.sayHello(), equalTo( "Hello Zest!" ) );
     }
 
     @Test
@@ -74,7 +74,7 @@ public class ApplicationBuilderTest
         Application application = builder.newApplication();
         Module module = application.findModule( "layer3", "test module" );
         TestService service = module.findService( TestService.class ).get();
-        assertThat( service.sayHello(), equalTo( "Hello Qi4j!" ) );
+        assertThat( service.sayHello(), equalTo( "Hello Zest!" ) );
     }
 
 
@@ -126,7 +126,7 @@ public class ApplicationBuilderTest
             @Override
             public String sayHello()
             {
-                return "Hello Qi4j!";
+                return "Hello Zest!";
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/Qi4jRuntimeImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/Qi4jRuntimeImpl.java b/core/runtime/src/main/java/org/qi4j/runtime/Qi4jRuntimeImpl.java
index 6869dae..232ad6f 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/Qi4jRuntimeImpl.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/Qi4jRuntimeImpl.java
@@ -35,7 +35,6 @@ import org.qi4j.api.composite.TransientDescriptor;
 import org.qi4j.api.entity.EntityComposite;
 import org.qi4j.api.entity.EntityDescriptor;
 import org.qi4j.api.entity.EntityReference;
-import org.qi4j.api.object.ObjectDescriptor;
 import org.qi4j.api.property.Property;
 import org.qi4j.api.property.PropertyDescriptor;
 import org.qi4j.api.property.PropertyWrapper;
@@ -63,18 +62,16 @@ import org.qi4j.runtime.property.PropertyInstance;
 import org.qi4j.runtime.service.ImportedServiceReferenceInstance;
 import org.qi4j.runtime.service.ServiceInstance;
 import org.qi4j.runtime.service.ServiceReferenceInstance;
-import org.qi4j.runtime.structure.ModuleInstance;
 import org.qi4j.runtime.structure.ModuleUnitOfWork;
 import org.qi4j.runtime.value.ValueInstance;
 import org.qi4j.spi.Qi4jSPI;
 import org.qi4j.spi.entity.EntityState;
-import org.qi4j.spi.module.ModelModule;
 
 import static java.lang.reflect.Proxy.getInvocationHandler;
 import static org.qi4j.runtime.composite.TransientInstance.compositeInstanceOf;
 
 /**
- * Incarnation of Qi4j.
+ * Incarnation of Zest.
  */
 public final class Qi4jRuntimeImpl
     implements Qi4jSPI, Qi4jRuntime

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/activation/ActivatorsInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/activation/ActivatorsInstance.java b/core/runtime/src/main/java/org/qi4j/runtime/activation/ActivatorsInstance.java
index 26eebbd..2059e1e 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/activation/ActivatorsInstance.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/activation/ActivatorsInstance.java
@@ -21,7 +21,7 @@ import org.qi4j.api.activation.PassivationException;
 import org.qi4j.functional.Iterables;
 
 /**
- * Instance of a Qi4j Activators of one Activation target. Contains ordered
+ * Instance of a Zest Activators of one Activation target. Contains ordered
  * Activators and roll the Activation on the target.
  *
  * @param <ActivateeType> Type of the activation target

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/bootstrap/ModuleAssemblyImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/bootstrap/ModuleAssemblyImpl.java b/core/runtime/src/main/java/org/qi4j/runtime/bootstrap/ModuleAssemblyImpl.java
index eb038eb..a06bb9f 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/bootstrap/ModuleAssemblyImpl.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/bootstrap/ModuleAssemblyImpl.java
@@ -263,7 +263,7 @@ public final class ModuleAssemblyImpl
         {
             if( objectType.isInterface() )
             {
-                throw new AssemblyException( "Interfaces can not be Qi4j Objects." );
+                throw new AssemblyException( "Interfaces can not be Zest Objects." );
             }
             if( objectAssemblies.containsKey( objectType ) )
             {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/composite/CompactLevel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/composite/CompactLevel.java b/core/runtime/src/main/java/org/qi4j/runtime/composite/CompactLevel.java
index 49b812c..199fd4f 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/composite/CompactLevel.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/composite/CompactLevel.java
@@ -19,10 +19,10 @@ package org.qi4j.runtime.composite;
  *
  * <pre>
  * <b>off</b>       = Do not modify the stack trace.
- * <b>proxy</b>     = Remove all Qi4j internal classes and all JDK internal classes from
+ * <b>proxy</b>     = Remove all Zest internal classes and all JDK internal classes from
  *             the originating method call.
  * <b>semi</b>      = Remove all JDK internal classes on the entire stack.
- * <b>extensive</b> = Remove all Qi4j internal and JDK internal classes from the entire stack.
+ * <b>extensive</b> = Remove all Zest internal and JDK internal classes from the entire stack.
  * </pre>
  *
  * <p>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/composite/FragmentClassLoader.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/composite/FragmentClassLoader.java b/core/runtime/src/main/java/org/qi4j/runtime/composite/FragmentClassLoader.java
index 996357d..4cf4439 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/composite/FragmentClassLoader.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/composite/FragmentClassLoader.java
@@ -147,7 +147,7 @@ public class FragmentClassLoader
             return defineClass( name, b, 0, b.length, baseClass.getProtectionDomain() );
         }
 
-        // Try the classloader of this classloader -> get classes in Qi4j such as CompositeInvoker
+        // Try the classloader of this classloader -> get classes in Zest such as CompositeInvoker
         return getClass().getClassLoader().loadClass( name );
     }
 
@@ -484,7 +484,7 @@ public class FragmentClassLoader
             //noinspection RedundantIfStatement
             if( isInternalQi4jMethod( method, baseClass ) )
             {
-                return false; // Skip methods in Qi4j-internal interfaces
+                return false; // Skip methods in Zest-internal interfaces
             }
             else
             {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/composite/FragmentInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/composite/FragmentInvocationHandler.java b/core/runtime/src/main/java/org/qi4j/runtime/composite/FragmentInvocationHandler.java
index ffd4a8f..ec656ab 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/composite/FragmentInvocationHandler.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/composite/FragmentInvocationHandler.java
@@ -51,7 +51,7 @@ abstract class FragmentInvocationHandler
 
         StackTraceElement[] trace = throwable.getStackTrace();
 
-        // Check if exception originated within Qi4j or JDK - if so then skip compaction
+        // Check if exception originated within Zest or JDK - if so then skip compaction
         if( trace.length == 0 || !isApplicationClass( trace[ 0 ].getClassName() ) )
         {
             return throwable;

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/composite/TransientClassLoader.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/composite/TransientClassLoader.java b/core/runtime/src/main/java/org/qi4j/runtime/composite/TransientClassLoader.java
index c9daa31..154dee1 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/composite/TransientClassLoader.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/composite/TransientClassLoader.java
@@ -145,7 +145,7 @@ import static org.qi4j.api.util.Classes.interfacesOf;
             return defineClass( name, b, 0, b.length, baseClass.getProtectionDomain() );
         }
 
-        // Try the classloader of this classloader -> get classes in Qi4j such as CompositeInvoker
+        // Try the classloader of this classloader -> get classes in Zest such as CompositeInvoker
         return getClass().getClassLoader().loadClass( name );
     }
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/entity/EntityModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/entity/EntityModel.java b/core/runtime/src/main/java/org/qi4j/runtime/entity/EntityModel.java
index ff0b633..8637034 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/entity/EntityModel.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/entity/EntityModel.java
@@ -62,7 +62,7 @@ public final class EntityModel
         }
         catch( NoSuchMethodException e )
         {
-            throw new InternalError( "Qi4j Core Runtime codebase is corrupted. Contact Qi4j team: ModuleUnitOfWork" );
+            throw new InternalError( "Zest Core Runtime codebase is corrupted. Contact Zest team: ModuleUnitOfWork" );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/structure/ApplicationInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/structure/ApplicationInstance.java b/core/runtime/src/main/java/org/qi4j/runtime/structure/ApplicationInstance.java
index 8d220fb..0af1092 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/structure/ApplicationInstance.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/structure/ApplicationInstance.java
@@ -28,7 +28,7 @@ import org.qi4j.bootstrap.Qi4jRuntime;
 import org.qi4j.runtime.activation.ActivationDelegate;
 
 /**
- * Instance of a Qi4j application. Contains a list of layers which are managed by this application
+ * Instance of a Zest application. Contains a list of layers which are managed by this application
  */
 public class ApplicationInstance
     implements Application

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/structure/LayerInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/structure/LayerInstance.java b/core/runtime/src/main/java/org/qi4j/runtime/structure/LayerInstance.java
index 9e678e8..49d83cc 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/structure/LayerInstance.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/structure/LayerInstance.java
@@ -34,7 +34,7 @@ import static org.qi4j.functional.Iterables.flattenIterables;
 import static org.qi4j.functional.Iterables.map;
 
 /**
- * Instance of a Qi4j application layer. Contains a list of modules which are managed by this layer.
+ * Instance of a Zest application layer. Contains a list of modules which are managed by this layer.
  */
 public class LayerInstance
     implements Layer

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/structure/ModuleInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/structure/ModuleInstance.java b/core/runtime/src/main/java/org/qi4j/runtime/structure/ModuleInstance.java
index 97addf3..1612089 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/structure/ModuleInstance.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/structure/ModuleInstance.java
@@ -116,7 +116,7 @@ import static org.qi4j.functional.Iterables.map;
 import static org.qi4j.functional.Iterables.toList;
 
 /**
- * Instance of a Qi4j Module. Contains the various composites for this Module.
+ * Instance of a Zest Module. Contains the various composites for this Module.
  */
 public class ModuleInstance
     implements Module, ModuleSpi, Activation

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/structure/ModuleUnitOfWork.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/structure/ModuleUnitOfWork.java b/core/runtime/src/main/java/org/qi4j/runtime/structure/ModuleUnitOfWork.java
index 77aebc5..f964991 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/structure/ModuleUnitOfWork.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/structure/ModuleUnitOfWork.java
@@ -92,7 +92,7 @@ public class ModuleUnitOfWork
         }
         catch( NoSuchMethodException e )
         {
-            throw new InternalError( "Qi4j Core Runtime codebase is corrupted. Contact Qi4j team: ModuleUnitOfWork" );
+            throw new InternalError( "Zest Core Runtime codebase is corrupted. Contact Zest team: ModuleUnitOfWork" );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/main/java/org/qi4j/runtime/unitofwork/EntityBuilderInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/unitofwork/EntityBuilderInstance.java b/core/runtime/src/main/java/org/qi4j/runtime/unitofwork/EntityBuilderInstance.java
index 4ca81d9..f5f39dd 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/unitofwork/EntityBuilderInstance.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/unitofwork/EntityBuilderInstance.java
@@ -54,7 +54,7 @@ public final class EntityBuilderInstance<T>
         }
         catch( NoSuchMethodException e )
         {
-            throw new InternalError( "Qi4j Core Runtime codebase is corrupted. Contact Qi4j team: EntityBuilderInstance" );
+            throw new InternalError( "Zest Core Runtime codebase is corrupted. Contact Zest team: EntityBuilderInstance" );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/runtime/src/test/java/org/qi4j/runtime/injection/StructureInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/qi4j/runtime/injection/StructureInjectionTest.java b/core/runtime/src/test/java/org/qi4j/runtime/injection/StructureInjectionTest.java
index f446493..cbc8858 100644
--- a/core/runtime/src/test/java/org/qi4j/runtime/injection/StructureInjectionTest.java
+++ b/core/runtime/src/test/java/org/qi4j/runtime/injection/StructureInjectionTest.java
@@ -96,13 +96,13 @@ public class StructureInjectionTest
     }
 
     /**
-     * Tests injected mixin for a Qi4j annotated with {@link @org.qi4j.composite.scope.Structure}.
+     * Tests injected mixin for a Zest annotated with {@link @org.qi4j.composite.scope.Structure}.
      */
     @Test
     public void injectedStructureForQi4j()
     {
         StructureInjectionComposite sic = module.newTransient( StructureInjectionComposite.class );
-        assertThat( "Injected Qi4j", sic.getQi4j(), is( notNullValue() ) );
+        assertThat( "Injected Zest", sic.getQi4j(), is( notNullValue() ) );
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/spi/src/main/java/org/qi4j/spi/Qi4jSPI.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/qi4j/spi/Qi4jSPI.java b/core/spi/src/main/java/org/qi4j/spi/Qi4jSPI.java
index cfd82b2..eb44d6d 100644
--- a/core/spi/src/main/java/org/qi4j/spi/Qi4jSPI.java
+++ b/core/spi/src/main/java/org/qi4j/spi/Qi4jSPI.java
@@ -21,21 +21,14 @@ import org.qi4j.api.association.AssociationStateHolder;
 import org.qi4j.api.association.ManyAssociation;
 import org.qi4j.api.association.NamedAssociation;
 import org.qi4j.api.composite.TransientComposite;
-import org.qi4j.api.composite.TransientDescriptor;
 import org.qi4j.api.entity.EntityComposite;
-import org.qi4j.api.entity.EntityDescriptor;
 import org.qi4j.api.entity.EntityReference;
-import org.qi4j.api.object.ObjectDescriptor;
 import org.qi4j.api.property.StateHolder;
-import org.qi4j.api.service.ServiceDescriptor;
-import org.qi4j.api.structure.Module;
 import org.qi4j.api.value.ValueComposite;
-import org.qi4j.api.value.ValueDescriptor;
 import org.qi4j.spi.entity.EntityState;
-import org.qi4j.spi.module.ModelModule;
 
 /**
- * Encapsulation of the Qi4j SPI. This is implemented by the runtime.
+ * Encapsulation of the Zest SPI. This is implemented by the runtime.
  */
 public interface Qi4jSPI
     extends Qi4j

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/spi/src/main/java/org/qi4j/spi/cache/CachePool.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/qi4j/spi/cache/CachePool.java b/core/spi/src/main/java/org/qi4j/spi/cache/CachePool.java
index e892514..c4ee5ac 100644
--- a/core/spi/src/main/java/org/qi4j/spi/cache/CachePool.java
+++ b/core/spi/src/main/java/org/qi4j/spi/cache/CachePool.java
@@ -20,8 +20,8 @@ package org.qi4j.spi.cache;
 /**
  * A CachePool is a service that manages the Persistence Caches.
  * <p>
- * The CachePool is typically implemented as a Qi4j Extension, and is an optional extension in the persistence
- * subsystem of Qi4j. If a Cache Extension is not provided, caching will be turned off. However, since caching
+ * The CachePool is typically implemented as a Zest Extension, and is an optional extension in the persistence
+ * subsystem of Zest. If a Cache Extension is not provided, caching will be turned off. However, since caching
  * operate on EntityStore level, and is an optional component at that, just because you have defined a Cache
  * Extension does not necessary mean that your system will use it. Check the EntityStore implementations for
  * details if they are Cache enabled. Most EntityStore implementations has this enabled, often via the MapEntityStore

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/spi/src/main/java/org/qi4j/valueserialization/orgjson/OrgJsonValueSerialization.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/qi4j/valueserialization/orgjson/OrgJsonValueSerialization.java b/core/spi/src/main/java/org/qi4j/valueserialization/orgjson/OrgJsonValueSerialization.java
index 0c758fa..2e5413f 100644
--- a/core/spi/src/main/java/org/qi4j/valueserialization/orgjson/OrgJsonValueSerialization.java
+++ b/core/spi/src/main/java/org/qi4j/valueserialization/orgjson/OrgJsonValueSerialization.java
@@ -29,7 +29,7 @@ import org.qi4j.functional.Function2;
  * ValueSerialization producing and consuming JSON documents using org.json.
  *
  * <p>
- *     This class is used internally by the Qi4j Runtime to provide default ValueSerialization when no
+ *     This class is used internally by the Zest Runtime to provide default ValueSerialization when no
  *     ValueSerialization Service is available.
  * </p>
  * <p>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jBaseTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jBaseTest.java b/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jBaseTest.java
index b321f0a..949dca3 100644
--- a/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jBaseTest.java
+++ b/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jBaseTest.java
@@ -97,7 +97,7 @@ public abstract class AbstractQi4jBaseTest
     }
 
     /**
-     * This method is called when there was an AssemblyException in the creation of the Qi4j application model.
+     * This method is called when there was an AssemblyException in the creation of the Zest application model.
      * <p>
      * Override this method to catch valid failures to place into satisfiedBy suites.
      * </p>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jScenarioTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jScenarioTest.java b/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jScenarioTest.java
index 0d2ceff..27948f6 100644
--- a/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jScenarioTest.java
+++ b/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jScenarioTest.java
@@ -30,7 +30,7 @@ import org.qi4j.bootstrap.Energy4Java;
 import org.qi4j.spi.Qi4jSPI;
 
 /**
- * Base class for Qi4j scenario tests. This will create one Qi4j application per class instead of per test.
+ * Base class for Zest scenario tests. This will create one Zest application per class instead of per test.
  */
 public abstract class AbstractQi4jScenarioTest
     implements Assembler
@@ -92,7 +92,7 @@ public abstract class AbstractQi4jScenarioTest
     }
 
     /**
-     * This method is called when there was an AssemblyException in the creation of the Qi4j application model.
+     * This method is called when there was an AssemblyException in the creation of the Zest application model.
      * <p>
      * Override this method to catch valid failures to place into satisfiedBy suites.
      * </p>

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java b/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java
index 2a09e1f..ce4b45c 100644
--- a/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java
+++ b/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java
@@ -152,7 +152,7 @@ public abstract class AbstractValueCompositeSerializationTest
         AnotherValue anotherValue = valueBuilder.newInstance();
 
         // FIXME Some Control Chars are not supported in JSON nor in XML, what should we do about it?
-        // Should Qi4j Core ensure the chars used in strings are supported by the whole stack?
+        // Should Zest Core ensure the chars used in strings are supported by the whole stack?
         // proto.string().set( "Foo\"Bar\"\nTest\f\t\b" );
         proto.string().set( "Foo\"Bar\"\nTest\t" );
         proto.string2().set( "/Foo/bar" );

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/extensions/cache-ehcache/src/main/java/org/qi4j/cache/ehcache/EhCachePoolMixin.java
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/src/main/java/org/qi4j/cache/ehcache/EhCachePoolMixin.java b/extensions/cache-ehcache/src/main/java/org/qi4j/cache/ehcache/EhCachePoolMixin.java
index 03822de..41a81f5 100644
--- a/extensions/cache-ehcache/src/main/java/org/qi4j/cache/ehcache/EhCachePoolMixin.java
+++ b/extensions/cache-ehcache/src/main/java/org/qi4j/cache/ehcache/EhCachePoolMixin.java
@@ -110,7 +110,7 @@ public abstract class EhCachePoolMixin
         String name = conf.cacheManagerName().get();
         if( name == null )
         {
-            name = "Qi4j Cache Extension";
+            name = "Zest Cache Extension";
         }
         configuration.setName( name );
         String diskStorePath = conf.diskStorePath().get();

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakHttpMapEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakHttpMapEntityStoreTest.java b/extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakHttpMapEntityStoreTest.java
index 407e204..3ab6bd5 100644
--- a/extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakHttpMapEntityStoreTest.java
+++ b/extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakHttpMapEntityStoreTest.java
@@ -69,7 +69,7 @@ public class RiakHttpMapEntityStoreTest
     public void tearDown()
         throws Exception
     {
-        // Riak don't expose bucket deletion in its API so we empty the Qi4j Entities bucket.
+        // Riak don't expose bucket deletion in its API so we empty the Zest Entities bucket.
         Bucket bucket = riakClient.fetchBucket( bucketKey ).execute();
         for( String key : bucket.keys() )
         {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakProtobufMapEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakProtobufMapEntityStoreTest.java b/extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakProtobufMapEntityStoreTest.java
index 8147bde..ef94011 100644
--- a/extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakProtobufMapEntityStoreTest.java
+++ b/extensions/entitystore-riak/src/test/java/org/qi4j/entitystore/riak/RiakProtobufMapEntityStoreTest.java
@@ -69,7 +69,7 @@ public class RiakProtobufMapEntityStoreTest
     public void tearDown()
         throws Exception
     {
-        // Riak don't expose bucket deletion in its API so we empty the Qi4j Entities bucket.
+        // Riak don't expose bucket deletion in its API so we empty the Zest Entities bucket.
         Bucket bucket = riakClient.fetchBucket( bucketKey ).execute();
         for( String key : bucket.keys() )
         {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/extensions/indexing-solr/src/main/java/org/qi4j/index/solr/internal/SingleTokenTokenizer.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/main/java/org/qi4j/index/solr/internal/SingleTokenTokenizer.java b/extensions/indexing-solr/src/main/java/org/qi4j/index/solr/internal/SingleTokenTokenizer.java
index 39665f3..d0dc646 100644
--- a/extensions/indexing-solr/src/main/java/org/qi4j/index/solr/internal/SingleTokenTokenizer.java
+++ b/extensions/indexing-solr/src/main/java/org/qi4j/index/solr/internal/SingleTokenTokenizer.java
@@ -20,6 +20,7 @@ package org.qi4j.index.solr.internal;
 
 import org.apache.lucene.analysis.WhitespaceTokenizer;
 import org.apache.lucene.util.AttributeSource;
+import org.apache.lucene.util.AttributeSource.AttributeFactory;  // required by Javadocs!!!
 
 import java.io.Reader;
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/extensions/indexing-solr/src/main/java/org/qi4j/index/solr/internal/SolrEntityIndexerMixin.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/main/java/org/qi4j/index/solr/internal/SolrEntityIndexerMixin.java b/extensions/indexing-solr/src/main/java/org/qi4j/index/solr/internal/SolrEntityIndexerMixin.java
index e038a4e..824354b 100644
--- a/extensions/indexing-solr/src/main/java/org/qi4j/index/solr/internal/SolrEntityIndexerMixin.java
+++ b/extensions/indexing-solr/src/main/java/org/qi4j/index/solr/internal/SolrEntityIndexerMixin.java
@@ -181,7 +181,9 @@ public abstract class SolrEntityIndexerMixin
                     input.addField( name, value );
                 } else if( statement.getObject() instanceof BNode )
                 {
-                    Iterator<Statement> seq = graph.match( (Resource) statement.getObject(), new URIImpl( "http://www.w3.org/1999/02/22-rdf-syntax-ns#li" ), null, (Resource) null );
+                    Resource resource = (Resource) statement.getObject();
+                    URIImpl uri = new URIImpl( "http://www.w3.org/1999/02/22-rdf-syntax-ns#li" );
+                    Iterator<Statement> seq = graph.match( resource, uri, null, (Resource) null );
                     while( seq.hasNext() )
                     {
                         Statement seqStatement = seq.next();

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/internal/SQLEntityFinder.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/internal/SQLEntityFinder.java b/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/internal/SQLEntityFinder.java
index 375b119..7036afd 100644
--- a/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/internal/SQLEntityFinder.java
+++ b/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/internal/SQLEntityFinder.java
@@ -100,8 +100,8 @@ public class SQLEntityFinder
                                                    Map<String, Object> variables )
         throws EntityFinderException
     {
-        // TODO what is Qi4j's policy on negative firstResult and/or maxResults? JDBC has its own way of interpreting
-        // these values - does it match with Qi4j's way?
+        // TODO what is Zest's policy on negative firstResult and/or maxResults? JDBC has its own way of interpreting
+        // these values - does it match with Zest's way?
         Iterable<EntityReference> result;
         if( maxResults == null || maxResults > 0 )
         {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/api/SQLQuerying.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/api/SQLQuerying.java b/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/api/SQLQuerying.java
index de9b61c..351b822 100644
--- a/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/api/SQLQuerying.java
+++ b/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/api/SQLQuerying.java
@@ -27,7 +27,7 @@ import org.qi4j.functional.Specification;
 import org.qi4j.spi.query.EntityFinderException;
 
 /**
- * This interface provides parsing support from Qi4j queries to SQL queries. The idea is that this interface produces
+ * This interface provides parsing support from Zest queries to SQL queries. The idea is that this interface produces
  * SQL which can be used when creating a {@link PreparedStatement}.
  *
  * @author Stanislav Muhametsin
@@ -35,13 +35,13 @@ import org.qi4j.spi.query.EntityFinderException;
 public interface SQLQuerying
 {
     /**
-     * This method will be called when parsing needs to be done from Qi4j query to SQL query. This method is supposed to
+     * This method will be called when parsing needs to be done from Zest query to SQL query. This method is supposed to
      * return one single SQL query, which can be used with {@link PreparedStatement}.
      *
-     * @param resultType The result type of Qi4j query.
-     * @param whereClause The where clause of Qi4j query.
-     * @param orderBySegments The order by segments of Qi4j query.
-     * @param firstResult The first result index of Qi4j query.
+     * @param resultType The result type of Zest query.
+     * @param whereClause The where clause of Zest query.
+     * @param orderBySegments The order by segments of Zest query.
+     * @param firstResult The first result index of Zest query.
      * @param maxResults The max amount of returned results.
      * @param values Values to put into {@link PreparedStatement}, in the order of the list. This List is created from
      *            the outside and this method is supposed to fill it with necessary values, if any.

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/common/RebuildingStrategy.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/common/RebuildingStrategy.java b/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/common/RebuildingStrategy.java
index 19005d9..c897a9c 100644
--- a/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/common/RebuildingStrategy.java
+++ b/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/common/RebuildingStrategy.java
@@ -46,7 +46,7 @@ public interface RebuildingStrategy
 
     /**
      * The re-building strategy which NEVER re-builds the database schema. Useful when current
-     * Qi4j-related database schema structure must be preserved at all costs.
+     * Zest-related database schema structure must be preserved at all costs.
      */
     public class NeverNeed
         implements RebuildingStrategy

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/skeletons/AbstractSQLIndexing.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/skeletons/AbstractSQLIndexing.java b/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/skeletons/AbstractSQLIndexing.java
index 5f3457a..3a4a1d9 100644
--- a/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/skeletons/AbstractSQLIndexing.java
+++ b/extensions/indexing-sql/src/main/java/org/qi4j/index/sql/support/skeletons/AbstractSQLIndexing.java
@@ -47,7 +47,6 @@ import org.qi4j.api.service.ServiceDescriptor;
 import org.qi4j.api.structure.Application;
 import org.qi4j.api.value.ValueComposite;
 import org.qi4j.api.value.ValueDescriptor;
-import org.qi4j.functional.Function;
 import org.qi4j.functional.Iterables;
 import org.qi4j.functional.Specification;
 import org.qi4j.index.sql.support.api.SQLIndexing;
@@ -368,7 +367,7 @@ public abstract class AbstractSQLIndexing
                                  Lazy<PreparedStatement, SQLException> queryPKPS )
         throws SQLException
     {
-        // TODO build cache: Qi4j Identity -> PK
+        // TODO build cache: Zest Identity -> PK
         Long entityPK = null;
         PreparedStatement ps = queryPKPS.getValue();
         ps.setString( 1, state.identity().identity() );

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/extensions/reindexer/src/main/java/org/qi4j/index/reindexer/internal/ReindexerMixin.java
----------------------------------------------------------------------
diff --git a/extensions/reindexer/src/main/java/org/qi4j/index/reindexer/internal/ReindexerMixin.java b/extensions/reindexer/src/main/java/org/qi4j/index/reindexer/internal/ReindexerMixin.java
index 40f52d9..5638cd3 100644
--- a/extensions/reindexer/src/main/java/org/qi4j/index/reindexer/internal/ReindexerMixin.java
+++ b/extensions/reindexer/src/main/java/org/qi4j/index/reindexer/internal/ReindexerMixin.java
@@ -51,7 +51,7 @@ public class ReindexerMixin
         }
         catch( NoSuchMethodException e )
         {
-            throw new InternalError( "Qi4j Core Runtime codebase is corrupted. Contact Qi4j team: ReindexerMixin" );
+            throw new InternalError( "Zest Core Runtime codebase is corrupted. Contact Zest team: ReindexerMixin" );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/alarm/src/test/java/org/qi4j/library/alarm/AlarmHistoryImplTest.java
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/test/java/org/qi4j/library/alarm/AlarmHistoryImplTest.java b/libraries/alarm/src/test/java/org/qi4j/library/alarm/AlarmHistoryImplTest.java
index 794347d..58db8d9 100644
--- a/libraries/alarm/src/test/java/org/qi4j/library/alarm/AlarmHistoryImplTest.java
+++ b/libraries/alarm/src/test/java/org/qi4j/library/alarm/AlarmHistoryImplTest.java
@@ -254,7 +254,7 @@ public class AlarmHistoryImplTest
         int maxsize = hist.maxSize().get();
         assertEquals( 30, maxsize );
 
-        hist.maxSize().set( 3 );    // The Qi4j version doesn't intercept the maxSize().set() method and purge the old
+        hist.maxSize().set( 3 );    // The Zest version doesn't intercept the maxSize().set() method and purge the old
         underTest.trigger( AlarmPoint.TRIGGER_ACTIVATE ); // so we do another event to purge.
         assertEquals( 3, hist.allAlarmEvents().get().size() );
 

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/conversion/src/main/java/org/qi4j/library/conversion/values/ValueToEntityMixin.java
----------------------------------------------------------------------
diff --git a/libraries/conversion/src/main/java/org/qi4j/library/conversion/values/ValueToEntityMixin.java b/libraries/conversion/src/main/java/org/qi4j/library/conversion/values/ValueToEntityMixin.java
index 7bfc17d..0433ea8 100644
--- a/libraries/conversion/src/main/java/org/qi4j/library/conversion/values/ValueToEntityMixin.java
+++ b/libraries/conversion/src/main/java/org/qi4j/library/conversion/values/ValueToEntityMixin.java
@@ -70,7 +70,7 @@ public class ValueToEntityMixin
         }
         catch( NoSuchMethodException e )
         {
-            throw new InternalError( "Qi4j Core Runtime codebase is corrupted. Contact Qi4j team: ValueToEntityMixin" );
+            throw new InternalError( "Zest Core Runtime codebase is corrupted. Contact Zest team: ValueToEntityMixin" );
         }
         MANY_ASSOC_TO_ENTITY_REF_ITERABLE = new Function<ManyAssociation<?>, Iterable<EntityReference>>()
         {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/eventsourcing/src/main/java/org/qi4j/library/eventsourcing/domain/factory/DomainEventFactoryService.java
----------------------------------------------------------------------
diff --git a/libraries/eventsourcing/src/main/java/org/qi4j/library/eventsourcing/domain/factory/DomainEventFactoryService.java b/libraries/eventsourcing/src/main/java/org/qi4j/library/eventsourcing/domain/factory/DomainEventFactoryService.java
index 9194ba1..00dafb8 100644
--- a/libraries/eventsourcing/src/main/java/org/qi4j/library/eventsourcing/domain/factory/DomainEventFactoryService.java
+++ b/libraries/eventsourcing/src/main/java/org/qi4j/library/eventsourcing/domain/factory/DomainEventFactoryService.java
@@ -54,7 +54,7 @@ public interface DomainEventFactoryService
 
             DomainEventValue prototype = builder.prototype();
             prototype.name().set( name );
-            prototype.entityType().set( first(Qi4j.FUNCTION_DESCRIPTOR_FOR.map( entity ).types()).getName() );
+            prototype.entityType().set( first( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( entity ).types()).getName() );
             prototype.entityId().set( entity.identity().get() );
 
             // JSON-ify parameters

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/fileconfig/src/main/java/org/qi4j/library/fileconfig/FileConfigurationService.java
----------------------------------------------------------------------
diff --git a/libraries/fileconfig/src/main/java/org/qi4j/library/fileconfig/FileConfigurationService.java b/libraries/fileconfig/src/main/java/org/qi4j/library/fileconfig/FileConfigurationService.java
index d0690a8..9bc1941 100644
--- a/libraries/fileconfig/src/main/java/org/qi4j/library/fileconfig/FileConfigurationService.java
+++ b/libraries/fileconfig/src/main/java/org/qi4j/library/fileconfig/FileConfigurationService.java
@@ -129,7 +129,7 @@ public interface FileConfigurationService
 
             data.user().set( new File( user ) );
 
-            // Set application name. This is taken from the Qi4j application but can be overriden by a system property
+            // Set application name. This is taken from the Zest application but can be overriden by a system property
             String application = System.getProperty( "application", app.name() );
 
             if ( !app.mode().equals( Application.Mode.production ) ) {

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f4218ec0/libraries/jmx/src/main/java/org/qi4j/library/jmx/ApplicationManagerService.java
----------------------------------------------------------------------
diff --git a/libraries/jmx/src/main/java/org/qi4j/library/jmx/ApplicationManagerService.java b/libraries/jmx/src/main/java/org/qi4j/library/jmx/ApplicationManagerService.java
index 58062f8..1eda279 100644
--- a/libraries/jmx/src/main/java/org/qi4j/library/jmx/ApplicationManagerService.java
+++ b/libraries/jmx/src/main/java/org/qi4j/library/jmx/ApplicationManagerService.java
@@ -45,17 +45,17 @@ import org.qi4j.functional.Iterables;
 import static org.qi4j.functional.Iterables.first;
 
 /**
- * Expose the Qi4j app as a "tree" of MBeans.
+ * Expose the Zest app as a "tree" of MBeans.
  *
  * Other services should reuse the object names and create
  * nodes under the ones created here. For example:
  * <pre>
- * Qi4j:application=MyApp,layer=Application,module=MyModule,class=Service,service=MyService
+ * Zest:application=MyApp,layer=Application,module=MyModule,class=Service,service=MyService
  * </pre>
  * is exported by this service, so another exporter showing some aspect related to this service should
  * use this as base for the ObjectName, and add their own properties. Example:
  * <pre>
- * Qi4j:application=MyApp,layer=Application,module=MyModule,class=Service,service=MyService,name=Configuration
+ * Zest:application=MyApp,layer=Application,module=MyModule,class=Service,service=MyService,name=Configuration
  * </pre>
  * Use the following snippet to find the ObjectName of a service with a given identity:
  * <pre>
@@ -125,7 +125,7 @@ public interface ApplicationManagerService
                         layer = application.findLayer( layerDescriptor.name() );
 
                         LayerBean layerBean = new LayerBean( layer, layerDescriptor );
-                        ObjectName objectName = new ObjectName( "Qi4j:application=" + application.name() + ",layer=" + layer
+                        ObjectName objectName = new ObjectName( "Zest:application=" + application.name() + ",layer=" + layer
                             .name() );
                         names.push( objectName );
 


Mime
View raw message